Everything: Unit tests. Rename Api class to Client since that makes more sense.

Author: marknotfound

.gitignore

@@ -1,2 +1,4 @@
-
 .DS_Store
+vendor
+composer.lock
+coverage

README.md

@@ -29,7 +29,7 @@ Usage
 ``` php
 require_once( './vendor/autoload.php' );
 
-$client = new Behance\Api( $client_id );
+$client = new Behance\Client( $client_id );
 
 // User data
 $client->getUser( 'bryan' );

composer.json

@@ -23,9 +23,12 @@
         }
     ],
     "require": {
-        "php": ">=5.2.0",
+        "php": ">=5.3.3",
         "ext-curl": "*"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.3.*"
+    },
     "autoload": {
         "psr-4": {"Behance\\": "src/"}
     }

phpunit.xml.dist

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./tests/bootstrap.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         forceCoversAnnotation="false"
+         mapTestClassNameToCoveredClassName="false"
+         printerClass="PHPUnit_TextUI_ResultPrinter"
+         processIsolation="false"
+         stopOnError="false"
+         stopOnFailure="false"
+         stopOnIncomplete="false"
+         stopOnSkipped="false"
+         strict="false"
+         verbose="true">
+
+  <testsuites>
+    <testsuite name="Unit Tests">
+      <directory suffix=".php">./tests</directory>
+    </testsuite>
+  </testsuites>
+
+  <php>
+    <ini name="memory_limit" value="-1"/>
+  </php>
+
+  <filter>
+    <blacklist>
+      <directory>./vendor</directory>
+      <directory>./tests</directory>
+    </blacklist>
+  </filter>
+
+</phpunit>

src/Api.php src/Client.phpsrc/Api.php renamed to src/Client.php

@@ -15,7 +15,7 @@
  * @link     http://be.net/dev
  *
  */
-class Api {
+class Client {
 
   const API_ROOT               = 'https://www.behance.net/v2';
   const ENDPOINT_PROJECTS      = '/projects';
@@ -48,10 +48,6 @@ class Api {
    */
   public function __construct( $client_id, $debug = false ) {
 
-    if ( !extension_loaded( 'curl' ) ) {
-      throw new ApiException( 'cURL module is required' );
-    }
-
     $this->_client_id = $client_id;
     $this->_debug     = $debug;
 
@@ -197,28 +193,6 @@ public function getUserFollowers( $id_or_username, $options = array(), $assoc =
 
   } // getUserFollowers
 
-  /**
-   * Retrieves a list of users in the given user's feedback circle
-   *
-   * @param  int|string $id_or_username : user
-   * @param  bool       $assoc          : return objects will be converted to associative arrays
-   * @param  array      $options        : search options
-   *
-   * @return array                       stdClass objects or associative arrays, based on $assoc
-   */
-  public function getUserFeedbackCircle( $id_or_username, $options = array(), $assoc = false ) {
-
-    $endpoint = self::ENDPOINT_USERS . '/' . $id_or_username . '/feedback';
-
-    $results  = $this->_getDecodedJson( $endpoint, $options, 'feedback_circlezz', $assoc );
-
-    // IMPORTANT: Ensure this will always return an array
-    return ( empty( $results ) )
-           ? array()
-           : $results;
-
-  } // getUserFeedbackCircle
-
   /**
    * Retrieves a list of $id_or_username's works in progress
    *
@@ -549,129 +523,69 @@ protected function _makeFullURL( $endpoint, array $query_params = array() ) {
    */
   protected function _executeRequest( $method, $url, $request_body = false, $curl_params = array() ) {
 
+    if ( !$this->_isCurlLoaded() ) {
+      throw new ApiException( 'cURL module is required' );
+    }
+
     $user_agent          = "Behance API/PHP (App {$this->_client_id})";
     $default_curl_params = array(
         CURLOPT_HTTPHEADER => array(
             'Accept: application/json',
             'Content-Type: multipart/form-data',
             'Expect:'
         ),
-        CURLOPT_TIMEOUT         => self::TIMEOUT_DEFAULT_SEC,
-        CURLOPT_USERAGENT       => $user_agent,
-        CURLOPT_RETURNTRANSFER  => true,
-        CURLOPT_BINARYTRANSFER  => true,
-        CURLOPT_HEADER          => true,
-        CURLOPT_SSL_VERIFYPEER  => false
+        CURLOPT_TIMEOUT        => self::TIMEOUT_DEFAULT_SEC,
+        CURLOPT_USERAGENT      => $user_agent,
+        CURLOPT_RETURNTRANSFER => true,
+        CURLOPT_BINARYTRANSFER => true,
+        CURLOPT_SSL_VERIFYPEER => false,
+        CURLOPT_POST           => false,
+        CURLOPT_HTTPGET        => true
     );
 
-    // Replace recursive will knock this *into* an array afterwards
-    if ( !empty( $curl_params[ CURLOPT_HTTPHEADER ] ) ) {
-      unset( $default_curl_params[ CURLOPT_HTTPHEADER ] );
-    }
-
     $curl_params = array_replace_recursive( $default_curl_params, $curl_params );
-    $method      = strtoupper( $method );
-
-    switch ( $method ) {
-
-      case 'GET':
-
-        $curl_params[ CURLOPT_HTTPGET ] = true;
-        $curl_params[ CURLOPT_POST ]    = false;
-        break;
-
-      case 'POST':
-
-        $curl_params[ CURLOPT_HTTPGET ] = false;
-        $curl_params[ CURLOPT_POST ]    = true;
-
-        // IMPORTANT: Since @ is used to signify files in arrays passed to this option,
-        // pre-encode this array to prevent this from attempting to read a file
-        // if ( is_array( $request_body ) )
-        //   $request_body = http_build_query( $request_body );
-
-        // $curl_params[ CURLOPT_HTTPHEADER ][] = 'Content-Length: ' . strlen( $request_body );
-        $curl_params[ CURLOPT_POSTFIELDS ] = $request_body;
-        break;
-
-      case 'PUT':
-
-        $curl_params[ CURLOPT_HTTPGET ]       = false;
-        $curl_params[ CURLOPT_POST ]          = false;
-        $curl_params[ CURLOPT_CUSTOMREQUEST ] = 'PUT';
-
-        // IMPORTANT: Since @ is used to signify files in arrays passed to this option,
-        // pre-encode this array to prevent this from attempting to read a file
-        if ( is_array( $request_body ) ) {
-          $request_body = http_build_query( $request_body );
-        }
-
-        $curl_params[ CURLOPT_HTTPHEADER ][] = 'Content-Length: ' . strlen( $request_body );
-        $curl_params[ CURLOPT_POSTFIELDS ]   = $request_body;
-        break;
-
-      case 'DELETE':
-
-        $curl_params[ CURLOPT_HTTPGET ]       = false;
-        $curl_params[ CURLOPT_CUSTOMREQUEST ] = 'DELETE';
-
-        // IMPORTANT: Since @ is used to signify files in arrays passed to this option,
-        // pre-encode this array to prevent this from attempting to read a file
-        if ( is_array( $request_body ) ) {
-          $request_body = http_build_query( $request_body );
-        }
-
-        $curl_params[ CURLOPT_POSTFIELDS ] = $request_body;
-        break;
-
-      default:
-        throw new ApiException( "Unhandled method: [{$method}]" );
-
-    } // switch method
 
     $ch = curl_init( $url );
 
     curl_setopt_array( $ch, $curl_params );
 
-    $request_response = curl_exec( $ch );
-
-    $request_info  = curl_getinfo( $ch );
-    $response_code = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
+    list( $response_body, $request_info, $response_code ) = $this->_executeCurl( $ch );
 
     curl_close( $ch );
 
-    $response_body = false;
-
-    if ( $request_info['download_content_length'] <= 0 ) {
+    // @throws ApiException on response non-2xx (success) responses from service
+    if ( (int)round( $response_code, -2 ) !== 200 ) {
+      throw new ApiException( "Unsuccessful Request, response ({$response_code}): " . ( empty( $response_body ) ? '' : ": {$response_body} " ) );
+    }
 
-      $exploded = explode( "\r\n\r\n", $request_response );
+    return $response_body;
 
-      while ( $exploded[0] == 'HTTP/1.1 100 Continue' ) {
-        array_shift( $exploded );
-      }
+  } // _executeRequest
 
-      $response_body = ( isset( $exploded[1] ) )
-                       ? $exploded[1]
-                       : '';
+  /**
+   * @codeCoverageIgnore
+   *
+   * @return boolean
+   */
+  protected function _isCurlLoaded() {
 
-    } // if download_content_length = 0
+    return extension_loaded( 'curl' );
 
-    else {
-      $response_body = substr( $request_response, -$request_info['download_content_length'] );
-    } // else
+  } // _isCurlLoaded
 
-    // Unless array_shift completely solves headers in body problem, leave this line in
-    if ( substr( $response_body, 0, 4 ) == 'HTTP' ) {
-      throw new ApiException( "Malformed response_body: " . var_export( $response_body, 1 ) );
-    }
+  /**
+   * @codeCoverageIgnore
+   *
+   * @return array
+   */
+  protected function _executeCurl( $ch ) {
 
-    // @throws ApiException on response non-2xx (success) responses from service
-    if ( (int)round( $response_code, -2 ) !== 200 ) {
-      throw new ApiException( "Unsuccessful Request, response ({$response_code}): " . ( empty( $response_body ) ? '' : ": {$response_body} " ) );
-    }
+    $request_response = curl_exec( $ch );
+    $request_info     = curl_getinfo( $ch );
+    $response_code    = curl_getinfo( $ch, CURLINFO_HTTP_CODE );
 
-    return $response_body;
+    return array( $request_response, $request_info, $response_code );
 
-  } // _executeRequest
+  } // _executeCurl
 
-} // Api
+} // Client