tweeper.php: make it clearer that getUrlContents is a static method

[tweeper.git] / tweeper.php

diff --git a/tweeper.php b/tweeper.php
index 3e250b7..1836a2a 100644 (file)
--- a/tweeper.php
+++ b/tweeper.php
@@ -65,6 +65,15 @@ class Tweeper {
   }
 
   /**
   }
 
   /**

+   * Convert string to UpperCamelCase.
+   */
+  public static function toUpperCamelCase($str, $delim = ' ') {
+    $str_upper = ucwords($str, $delim);
+    $str_camel_case = str_replace($delim, '', $str_upper);
+    return $str_camel_case;
+  }
+
+  /**

    * Get the contents from a URL.
    */
   private static function getUrlContents($url) {
    * Get the contents from a URL.
    */
   private static function getUrlContents($url) {


@@ -196,7 +205,7 @@ class Tweeper {
       return NULL;
     }
 
       return NULL;
     }
 

-    $stylesheet_contents = $this->getUrlContents($stylesheet);
+    $stylesheet_contents = Tweeper::getUrlContents($stylesheet);

 
     $xslDoc = new DOMDocument();
     $xslDoc->loadXML($stylesheet_contents);
 
     $xslDoc = new DOMDocument();
     $xslDoc->loadXML($stylesheet_contents);


@@ -243,7 +252,7 @@ class Tweeper {
   /**
    * Convert the Instagram content to XML.
    */
   /**
    * Convert the Instagram content to XML.
    */

-  private function get_xml_instagram_com($html) {
+  private function getXmlInstagramCom($html) {

     // Extract the json data from the html code.
     $json_match_expr = '/window._sharedData = (.*);/';
     $ret = preg_match($json_match_expr, $html, $matches);
     // Extract the json data from the html code.
     $json_match_expr = '/window._sharedData = (.*);/';
     $ret = preg_match($json_match_expr, $html, $matches);


@@ -258,7 +267,7 @@ class Tweeper {
   /**
    * Make the Facebook HTML processable.
    */
   /**
    * Make the Facebook HTML processable.
    */

-  private function preprocess_html_facebook_com($html) {
+  private function preprocessHtmlFacebookCom($html) {

     $html = str_replace('<!--', '', $html);
     $html = str_replace('-->', '', $html);
     return $html;
     $html = str_replace('<!--', '', $html);
     $html = str_replace('-->', '', $html);
     return $html;


@@ -274,7 +283,7 @@ class Tweeper {
     $xml_errors_value = libxml_use_internal_errors(TRUE);
 
     // If there is a host-specific method to get the xml data, use it!
     $xml_errors_value = libxml_use_internal_errors(TRUE);
 
     // If there is a host-specific method to get the xml data, use it!

-    $get_xml_host_method = 'get_xml_' . str_replace(".", "_", $host);
+    $get_xml_host_method = 'getXml' . Tweeper::toUpperCamelCase($host, '.');

     if (method_exists($this, $get_xml_host_method)) {
       $xml_data = call_user_func_array(array($this, $get_xml_host_method), array($html));
       $xmlDoc->loadXML($xml_data);
     if (method_exists($this, $get_xml_host_method)) {
       $xml_data = call_user_func_array(array($this, $get_xml_host_method), array($html));
       $xmlDoc->loadXML($xml_data);


@@ -310,12 +319,12 @@ class Tweeper {
       return NULL;
     }
 
       return NULL;
     }
 

-    $html = $this->getUrlContents($src_url);
+    $html = Tweeper::getUrlContents($src_url);

     if (FALSE === $html) {
       return NULL;
     }
 
     if (FALSE === $html) {
       return NULL;
     }
 

-    $preprocess_html_host_method = 'preprocess_html_' . str_replace(".", "_", $host);
+    $preprocess_html_host_method = 'preprocessHtml' . Tweeper::toUpperCamelCase($host, '.');

     if (method_exists($this, $preprocess_html_host_method)) {
       $html = call_user_func_array(array($this, $preprocess_html_host_method), array($html));
     }
     if (method_exists($this, $preprocess_html_host_method)) {
       $html = call_user_func_array(array($this, $preprocess_html_host_method), array($html));
     }


@@ -413,15 +422,15 @@ function parse_options_query_string() {
 
 if (is_cli()) {
   $options = parse_options_cli($argv, $argc);
 
 if (is_cli()) {
   $options = parse_options_cli($argv, $argc);

-  $ERROR_STREAM = fopen('php://stderr', 'w');
+  $error_stream = fopen('php://stderr', 'w');

 }
 else {
   $options = parse_options_query_string();
 }
 else {
   $options = parse_options_query_string();

-  $ERROR_STREAM = fopen('php://output', 'w');
+  $error_stream = fopen('php://output', 'w');

 }
 
 if (!isset($options['src_url'])) {
 }
 
 if (!isset($options['src_url'])) {

-  fwrite($ERROR_STREAM, usage(is_cli() ? $argv : NULL));
+  fwrite($error_stream, usage(is_cli() ? $argv : NULL));

   exit(1);
 }
 
   exit(1);
 }