Remove empty width and height from URL

junaidbhura · Mar 5, 2018 · 1b181dc · 1b181dc · junaidbhura · Mar 5, 2018
1 parent e40b372
commit 1b181dc
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 1 deletion.
diff --git a/inc/class-core.php b/inc/class-core.php
@@ -144,6 +144,20 @@ public function get_domain() {
 		return $this->_urls[ $this->_url_counter - 1 ];
 	}
 
+	/**
+	 * Check if the value is valid.
+	 *
+	 * @param string $key
+	 * @param string $value
+	 * @return bool
+	 */
+	public function valid_value( $key = '', $value = '' ) {
+		if ( ( 'w' === $key || 'h' === $key ) && empty( $value ) ) {
+			return false;
+		}
+		return true;
+	}
+
 	/**
 	 * Build a Cloudinary transformation slug from arguments.
 	 *
@@ -196,7 +210,7 @@ public function build_transformation_slug( $args = array() ) {
 
 		$slug = array();
 		foreach ( $args as $key => $value ) {
-			if ( array_key_exists( $key, $cloudinary_params ) ) {
+			if ( array_key_exists( $key, $cloudinary_params ) && $this->valid_value( $cloudinary_params[ $key ], $value ) ) {
 				$slug[] = $cloudinary_params[ $key ] . '_' . $value;
 			}
 		}

diff --git a/tests/test-plugin.php b/tests/test-plugin.php
@@ -291,4 +291,61 @@ function test_filters() {
 		$this->assertEquals( $src[0], 'https://res-3.cloudinary.com/test-cloud/c_scale,w_1024,h_576,g_face/test-auto-folder' . $this->get_image_path(), 'Incorrect SRC.' );
 	}
 
+	/**
+	 * @covers \JB\Cloudinary\Core::valid_value()
+	 */
+	function test_invalid_values() {
+		$this->assertEquals(
+			cloudinary_url( self::$_image_id, array(
+				'transform' => array(
+					'width'   => 0,
+					'height'  => 0,
+					'crop'    => 'fill',
+					'gravity' => 'face',
+				),
+			) ),
+			'https://res-1.cloudinary.com/test-cloud/c_fill,g_face/test-auto-folder' . $this->get_image_path(),
+			'Incorrect value.'
+		);
+
+		$this->assertEquals(
+			cloudinary_url( self::$_image_id, array(
+				'transform' => array(
+					'width'   => 100,
+					'height'  => 0,
+					'crop'    => 'fill',
+					'gravity' => 'face',
+				),
+			) ),
+			'https://res-2.cloudinary.com/test-cloud/w_100,c_fill,g_face/test-auto-folder' . $this->get_image_path(),
+			'Incorrect value.'
+		);
+
+		$this->assertEquals(
+			cloudinary_url( self::$_image_id, array(
+				'transform' => array(
+					'width'   => 0,
+					'height'  => 100,
+					'crop'    => 'fill',
+					'gravity' => 'face',
+				),
+			) ),
+			'https://res-3.cloudinary.com/test-cloud/h_100,c_fill,g_face/test-auto-folder' . $this->get_image_path(),
+			'Incorrect value.'
+		);
+
+		$this->assertEquals(
+			cloudinary_url( self::$_image_id, array(
+				'transform' => array(
+					'width'   => '',
+					'height'  => '',
+					'crop'    => 'fill',
+					'gravity' => 'face',
+				),
+			) ),
+			'https://res-1.cloudinary.com/test-cloud/c_fill,g_face/test-auto-folder' . $this->get_image_path(),
+			'Incorrect value.'
+		);
+	}
+
 }