cloudinary 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7614adaac6c80b6af25b391e1224a492c609fde8
-  data.tar.gz: 726d2520ec2adbb6d91b5ec6b1bceb46071d58e9
+  metadata.gz: 07e321996ca2cae3a8eec12d27de1aed453853e7
+  data.tar.gz: 579c2b752735619c42ae516c9cbec268136ddbbe
 SHA512:
-  metadata.gz: 760b8e34412a2e4272edc42032aa6abf92cb655472dccd4c35e39126adbce44660b44a0210956ebf28708bc5bb234504f17799023b7062bf6812c257d7aca072
-  data.tar.gz: 9b8869009e05cb9ee5b100cd5652a49e653aedd992dc350a55375a527dff0b5209d0fdadce221d8c7253a3c4b7dca66d2e5b8bcfcd1fb469b8bfa692d562604a
+  metadata.gz: 4f0bdc46e84bf87fb80a1ea3a3934088b2079d910f4dfcdbe192f1318c760d386b639d66d902d5ccdfedba3a90827483c96c0c7ff6cc2ad50fd594e389b2b8e8
+  data.tar.gz: 1b80560e163319804899b0aa6fb378fcdedc260ae087977938a3de172d88b0ffff762dfa0b8b9688a9cbfde2facfe956ce1b67e6eada52d874ababd16ceb5176

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 
+1.8.1 / 2017-05-16
+==================
+
+  * Fix `image_path`. Fixes #257
+  * Add Auto Gravity modes tests.
+  * Use correct values in Search tests
+
 1.8.0 / 2017-05-01
 ==================
 

data/lib/cloudinary/static.rb

@@ -77,19 +77,14 @@ class Cloudinary::Static
 
     # ## Cloudinary::Utils support ###
     def public_id_and_resource_type_from_path(path)
-      metadata = build_metadata
+      @metadata ||= build_metadata
       path = path.sub(/^\//, '')
-      data = metadata[path]
-      unless data
-        public_prefixes.each do |prefix|
-          if metadata[File.join(prefix, path)]
-            data = metadata[File.join(prefix, path)]
-            break
-          end
-        end
+      prefix = public_prefixes.find {|prefix| @metadata[File.join(prefix, path)]}
+      if prefix
+        [@metadata[File.join(prefix, path)]['public_id'], resource_type(path)]
+      else
+        nil
       end
-      return unless data
-      [data['public_id'], resource_type(path)]
     end
 
     private

data/lib/cloudinary/utils.rb

@@ -375,20 +375,16 @@ class Cloudinary::Utils
     resource_type ||= "image"
     source = source.to_s
     if !force_remote
+      static_support = Cloudinary.config.static_file_support || Cloudinary.config.static_image_support
+      return original_source if !static_support && type == "asset"
       return original_source if (type.nil? || type == "asset") && source.match(%r(^https?:/)i)
+      return original_source if source.match(%r(^/(?!images/).*)) # starts with / but not /images/
+
+      source = source.sub(%r(^/images/), '') # remove /images/ prefix  - backwards compatibility
       if type == "asset"
-        # config.static_image_support left for backwards compatibility
-        if (Cloudinary.config.static_file_support || Cloudinary.config.static_image_support) && defined?(Cloudinary::Static)
-          source, resource_type = Cloudinary::Static.public_id_and_resource_type_from_path(source)
-        end
-        return original_source unless source
-        source += File.extname(original_source) if !format
-      elsif source.start_with?("/")
-        if source.start_with?("/images/")
-          source = source.sub(%r(/images/), '')
-        else
-          return original_source
-        end
+        source, resource_type = Cloudinary::Static.public_id_and_resource_type_from_path(source)
+        return original_source unless source # asset not found in Static
+        source += File.extname(original_source) unless format
       end
     end
 

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.8.0"
+  VERSION = "1.8.1"
 end

data/spec/cloudinary_helper_spec.rb

@@ -141,4 +141,50 @@ RSpec.describe CloudinaryHelper do
     end
 
   end
+  describe "image_path" do
+
+    before :all do
+      class Cloudinary::Static
+        class << self
+          def reset_metadata
+            @metadata = nil
+            @static_file_config = nil
+            @public_prefixes = nil
+          end
+        end
+      end
+    end
+
+    before :each do
+      @static_support = Cloudinary.config.static_image_support
+      @static_file = Cloudinary::Static::METADATA_FILE
+      Cloudinary::Static.reset_metadata
+    end
+
+    after :each do
+      Cloudinary.config.static_image_support = @static_support
+      Cloudinary::Static::METADATA_FILE = @static_file
+      Cloudinary::Static.reset_metadata
+    end
+
+    context 'type=="asset"' do
+      it "should not transform images staring with /" do
+        expect(helper.image_path('/bar')).to eq('/bar')
+      end
+      it "should not transform images staring with /images unless asset is found and static_support is true" do
+        Cloudinary.config.static_image_support = false
+        expect(helper.image_path('/images/foo.jpg')).to eq('/images/foo.jpg')
+        expect(helper.image_path('some-folder/foo.gif')).to eq("/images/some-folder/foo.gif")
+        Cloudinary::Static::METADATA_FILE = "spec/sample_asset_file.tsv"
+        Cloudinary::Static.reset_metadata
+        expect(helper.image_path('/images/foo.jpg'))
+            .to eq("/images/foo.jpg")
+        expect(helper.image_path('some-folder/foo.gif')).to eq("/images/some-folder/foo.gif")
+        Cloudinary.config.static_image_support = true
+        expect(helper.image_path('/images/foo.jpg')).to eq("http://res.cloudinary.com/sdk-test/image/asset/images-foo.jpg")
+        expect(helper.image_path('foo.jpg')).to eq("http://res.cloudinary.com/sdk-test/image/asset/images-foo.jpg")
+        expect(helper.image_path('some-folder/foo.gif')).to eq('/images/some-folder/foo.gif')
+      end
+    end
+  end
 end

data/spec/rake_spec.rb

@@ -89,15 +89,31 @@ describe 'cloudinary:sync_static' do
 
   context 'Cloudinary::Utils.cloudinary_url' do
     def all_asset_forms_of(public_id)
-      [public_id, "/#{public_id}", public_id.split('/').last]
+      [ "/#{public_id}", public_id.split('/').last]
     end
 
     RSpec::Matchers.define :be_asset_mapped_by_cloudinary_url_to do |expected|
       match do |actual|
+        actual = [actual] unless actual.respond_to? :all?
         actual.all? do |public_path|
-          Cloudinary::Utils.cloudinary_url(public_path, :cloud_name => 'test', :type => 'asset') == expected
+          @public_path = public_path
+          @actual = Cloudinary::Utils.cloudinary_url(public_path, :cloud_name => 'test', :type => 'asset')
+          @actual == expected
         end
       end
+      failure_message do |actual|
+        "URL for '#{@public_path}' should have been '#{expected}' but was '#{@actual}'.#{ differ.diff_as_string(@actual, expected)}"
+      end
+      failure_message_when_negated do |actual|
+        "URL for '#{@public_path}' should not have been '#{expected}'."
+      end
+      def differ
+        RSpec::Support::Differ.new(
+            :object_preparer => lambda { |object| RSpec::Matchers::Composable.surface_descriptions_in(object) },
+            :color => RSpec::Matchers.configuration.color?
+        )
+      end
+
     end
 
     before(:each) do
@@ -122,9 +138,12 @@ describe 'cloudinary:sync_static' do
       allow(Cloudinary.config).to receive(:static_file_support).and_return(true)
       subject.invoke
 
-      expect(all_asset_forms_of('images/logo1.png')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
-      expect(all_asset_forms_of('javascripts/1.js')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-b01de57adb485efdde843154d030644e.js')
-      expect(all_asset_forms_of('stylesheets/1.css')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-f24cc6123afd401ab86d8596cabc619f.css')
+      expect(['logo1.png', '/images/logo1.png']).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
+      expect('images/logo1.png').not_to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
+      expect('1.js').to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-b01de57adb485efdde843154d030644e.js')
+      expect(['javascripts/1.js', '/javascripts/1.js']).not_to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-b01de57adb485efdde843154d030644e.js')
+      expect('1.css').to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-f24cc6123afd401ab86d8596cabc619f.css')
+      expect(['stylesheets/1.css', '/stylesheets/1.css']).not_to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/raw/asset/1-f24cc6123afd401ab86d8596cabc619f.css')
 
       # without :type => 'asset'
       expect(Cloudinary::Utils.cloudinary_url('logo1.png')).not_to include('7dc60722d4653261648038b579fdb89e')
@@ -134,7 +153,7 @@ describe 'cloudinary:sync_static' do
       allow(Cloudinary.config).to receive(:static_image_support).and_return(true)
       subject.invoke
 
-      expect(all_asset_forms_of('images/logo1.png')).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
+      expect(['logo1.png', '/images/logo1.png']).to be_asset_mapped_by_cloudinary_url_to('http://res.cloudinary.com/test/image/asset/logo1-7dc60722d4653261648038b579fdb89e.png')
     end
   end
 

data/spec/sample_asset_file.tsv

@@ -0,0 +1,4 @@
+public_path	public_id	upload_time.to_i	version	width	height
+stylesheets/foo.css	css-foo	123	1	100	100
+javascripts/bar.js	bar	123	1	100	100
+images/foo.jpg	images-foo	123	1	100	100

data/spec/search_spec.rb

@@ -27,13 +27,13 @@ describe Cloudinary::Search do
     end
 
     it 'should add max_results to query' do
-      query = Cloudinary::Search.max_results('format:jpg').to_h
-      expect(query).to eq(max_results: 'format:jpg')
+      query = Cloudinary::Search.max_results(10).to_h
+      expect(query).to eq(max_results: 10)
     end
 
     it 'should add next_cursor to query' do
-      query = Cloudinary::Search.next_cursor('format:jpg').to_h
-      expect(query).to eq(next_cursor: 'format:jpg')
+      query = Cloudinary::Search.next_cursor('ASDFIUHASF9832HAFSOF').to_h
+      expect(query).to eq(next_cursor: 'ASDFIUHASF9832HAFSOF')
     end
 
     it 'should add aggregations arguments as array to query' do

data/spec/spec_helper.rb

@@ -2,6 +2,9 @@ require 'rspec'
 require 'rexml/parsers/ultralightparser'
 require 'rspec/version'
 require 'rest_client'
+require 'cloudinary'
+
+Cloudinary.config.enhance_image_tag = true
 
 TEST_IMAGE_URL = "http://cloudinary.com/images/old_logo.png"
 TEST_IMG = "spec/logo.png"

data/spec/utils_spec.rb

@@ -252,6 +252,40 @@ describe Cloudinary::Utils do
       .to produce_url("#{upload_path}/c_crop,g_auto,w_0.5/test")
             .and empty_options
   end
+
+  describe "gravity" do
+    it "should support auto" do
+      expect(["test", {width: 100, height: 100, crop: 'crop', gravity: 'auto'}])
+          .to produce_url("http://res.cloudinary.com/#{cloud_name}/image/upload/c_crop,g_auto,h_100,w_100/test")
+                  .and mutate_options_to({width: 100, height: 100})
+      expect(["test", {width: 100, height: 100, crop: 'crop', gravity: 'auto'}])
+          .to produce_url("http://res.cloudinary.com/#{cloud_name}/image/upload/c_crop,g_auto,h_100,w_100/test")
+                  .and mutate_options_to({width: 100, height: 100})
+    end
+    it "should support focal gravity" do
+      ["adv_face", "adv_faces", "adv_eyes", "face", "faces", "body", "no_faces"].each do |focal|
+        expect(["test", {width: 100, height: 100, crop: 'crop', gravity: "auto:#{focal}"}])
+            .to produce_url("http://res.cloudinary.com/#{cloud_name}/image/upload/c_crop,g_auto:#{focal},h_100,w_100/test")
+                    .and mutate_options_to({width: 100, height: 100})
+      end
+    end
+    it "should support auto level with thumb cropping" do
+      [0, 10, 100].each do |level|
+        expect(["test", {width: 100, height: 100, crop: 'thumb', gravity: "auto:#{level}"}])
+            .to produce_url("http://res.cloudinary.com/#{cloud_name}/image/upload/c_thumb,g_auto:#{level},h_100,w_100/test")
+                    .and mutate_options_to({width: 100, height: 100})
+        expect(["test", {width: 100, height: 100, crop: 'thumb', gravity: "auto:adv_faces:#{level}"}])
+            .to produce_url("http://res.cloudinary.com/#{cloud_name}/image/upload/c_thumb,g_auto:adv_faces:#{level},h_100,w_100/test")
+                    .and mutate_options_to({width: 100, height: 100})
+      end
+    end
+    it "should support custom_no_override" do
+      expect(["test", {width: 100, height: 100, crop: 'crop', gravity: "auto:custom_no_override"}])
+          .to produce_url("http://res.cloudinary.com/#{cloud_name}/image/upload/c_crop,g_auto:custom_no_override,h_100,w_100/test")
+                  .and mutate_options_to({width: 100, height: 100})
+    end
+  end
+
   describe ":quality" do
     it "support a percent value" do
       expect(["test", { :x => 1, :y => 2, :radius => 3, :gravity => :center, :quality => 80, :prefix => "a" }])
@@ -270,6 +304,7 @@ describe Cloudinary::Utils do
 
     end
   end
+
   describe ":transformation" do
     it "should support named tranformation" do
       expect(["test", { :transformation => "blip" }])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer
@@ -181,6 +181,7 @@ files:
 - spec/favicon.ico
 - spec/logo.png
 - spec/rake_spec.rb
+- spec/sample_asset_file.tsv
 - spec/search_spec.rb
 - spec/spec_helper.rb
 - spec/streaminig_profiles_api_spec.rb
@@ -223,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: cloudinary
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Client library for easily using the Cloudinary service
@@ -240,6 +241,7 @@ test_files:
 - spec/favicon.ico
 - spec/logo.png
 - spec/rake_spec.rb
+- spec/sample_asset_file.tsv
 - spec/search_spec.rb
 - spec/spec_helper.rb
 - spec/streaminig_profiles_api_spec.rb