Store compression count.

Author: rolftimmermans

src/class-tiny-compress-client.php

@@ -29,11 +29,13 @@
 }
 
 class Tiny_Compress_Client extends Tiny_Compress {
+	private $last_error_code = 0;
+	private $last_message = '';
+	private $proxy;
+
 	protected function __construct($api_key, $after_compress_callback) {
 		parent::__construct( $after_compress_callback );
 
-		$this->last_error_code = 0;
-		$this->last_message = '';
 		$this->proxy = new WP_HTTP_Proxy();
 
 		\Tinify\setAppIdentifier( self::identifier() );

src/class-tiny-compress-fopen.php

@@ -19,14 +19,17 @@
 */
 
 class Tiny_Compress_Fopen extends Tiny_Compress {
+	private $last_error_code = 0;
+	private $compression_count;
+	private $api_key;
+
 	protected static function identifier() {
 		parent::identifier() . ' fopen';
 	}
 
 	protected function __construct($api_key, $after_compress_callback) {
 		parent::__construct( $after_compress_callback );
 
-		$this->last_error_code = 0;
 		$this->api_key = $api_key;
 	}
 
@@ -35,7 +38,7 @@ public function can_create_key() {
 	}
 
 	public function get_compression_count() {
-		return null;
+		return $this->compression_count;
 	}
 
 	public function get_key() {
@@ -152,6 +155,10 @@ private function request($params, $url = Tiny_Config::URL) {
 		$status_code = $this->parse_status_code( $headers );
 		$headers = $this->parse_headers( $headers );
 
+		if ( isset( $headers['compression-count'] ) ) {
+			$this->compression_count = intval( $headers['compression-count'] );
+		}
+
 		$this->last_error_code = $status_code;
 
 		$response = stream_get_contents( $request );

test/helpers/mock-tinify-client.php

@@ -16,6 +16,12 @@ public function request($method, $url, $body = null, $header = array() ) {
 			$body = isset( $handler['body'] ) ? $handler['body'] : '';
 			$headers = isset( $handler['headers'] ) ? $handler['headers'] : array();
 
+			if ( isset( $headers["compression-count"] ) ) {
+				\Tinify\Tinify::setCompressionCount(
+					intval( $headers["compression-count"] )
+				);
+			}
+
 			$isError = $status <= 199 || $status >= 300;
 			$isJson = true;
 

test/unit/TinyCompressSharedTestCase.php

@@ -265,4 +265,40 @@ public function test_compress_file_should_return_unauthorized_status() {
 		$this->setExpectedException( 'Tiny_Exception' );
 		throw $exception;
 	}
+
+	public function test_get_compression_count_should_return_null_before_compresion() {
+		$this->assertSame( null, $this->compressor->get_compression_count() );
+	}
+
+	public function test_get_compression_count_should_return_count() {
+		$this->register( 'POST', '/shrink', array(
+			'status' => 201,
+			'headers' => array(
+				'location' => 'https://api.tinify.com/output/compressed.png',
+				'content-type' => 'application/json',
+				'compression-count' => 12,
+			),
+			'body' => '{}',
+		));
+
+		$handler = array(
+			'status' => 200,
+			'headers' => array(
+				'content-type' => 'image/png',
+				'content-length' => 9,
+				'image-width' => 10,
+				'image-height' => 15,
+				'compression-count' => 12,
+			),
+			'body' => 'optimized',
+		);
+
+		$this->register( 'GET', '/output/compressed.png', $handler );
+		$this->register( 'POST', '/output/compressed.png', $handler );
+
+		file_put_contents( $this->vfs->url() . '/image.png', 'unoptimized' );
+		$this->compressor->compress_file( $this->vfs->url() . '/image.png' );
+
+		$this->assertSame( 12, $this->compressor->get_compression_count() );
+	}
 }