cloudinary 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 994a732239924e9e97be2b2f6a77aa95e9b91ef3
-  data.tar.gz: f6385d224deba5c1a9f9c452c89535a4ea0a734d
+  metadata.gz: 58c3479c59e20893f65ba55c52498183ebce293a
+  data.tar.gz: 45b5a9f416a2522b820ebd2f5229024bb5e055a2
 SHA512:
-  metadata.gz: 37af802a5e9f09fd81935c87003c25049b3aebdd534dec781592efd00426a2906d95eb0e6210ed2c47b76db64941d7e5590d2f7b35c27f5df0eebc0c717382ad
-  data.tar.gz: 6538886c89dc87eb99432d43a4b1c6a90dfdd5626e49aef97176c8b21d9a302e2698848d128b044cb0b774b9d470a8f9db6cefb09989d033caaf0eb0f19c0d6b
+  metadata.gz: fd74bfe3c3f91408cfdb0de65add6249c51c8828d61ea3bb3831efcb02219551ccabbf67b99e3a47c6cbfc8d1540974f75aa8e40aad67b51c33177b1bb58954f
+  data.tar.gz: 36ff909b5ef5903ef1ffec3ba61ec21f7807d27f0e933ca0b807bb653551f858ded73a9f3ad8d7f49f2e3f6c95e9767f38ce0652b37fe576417de9a48b0d0f09

data/CHANGELOG.md

@@ -1,4 +1,10 @@
 
+1.1.6 / 2016-04-20
+==================
+
+  * Fix CarrierWave integration - update without new upload saves identifier with resource_type and type
+  * Fixed tests
+
 1.1.5 / 2016-04-12
 ==================
 

data/lib/cloudinary/carrier_wave.rb

@@ -164,6 +164,10 @@ module Cloudinary::CarrierWave
       @resource_type ||= Cloudinary::Utils.resource_type_for_format(@filename)      
       @public_id, @format = Cloudinary::PreloadedFile.split_format(@filename)      
     end
+
+    def storage_identifier
+      identifier
+    end
     
     def delete
       public_id = @resource_type == "raw" ? self.filename : self.public_id

data/lib/cloudinary/carrier_wave/storage.rb

@@ -52,6 +52,10 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     nil
   end
 
+  def identifier
+    uploader.file.respond_to?(:storage_identifier) ? uploader.file.storage_identifier : super
+  end
+
   # Updates the model mounter identifier with version information.
   #
   # Carrierwave uses hooks when integrating with ORMs so it's important to

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/spec/uploader_spec.rb

@@ -73,7 +73,7 @@ describe Cloudinary::Uploader do
 
 
   it "should support explicit" do
-    result = Cloudinary::Uploader.explicit("sample", :type=>"upload", :eager=>[{:crop=>"scale", :width=>"2.0"}], :tags => TEST_TAG)
+    result = Cloudinary::Uploader.explicit("sample", :type=>"upload", :eager=>[{:crop=>"scale", :width=>"2.0"}])
     url = Cloudinary::Utils.cloudinary_url("sample", :type=>"upload", :crop=>"scale", :width=>"2.0", :format=>"jpg", :version=>result["version"])
     expect(result["eager"][0]["url"]).to eq(url)
   end

data/spec/utils_spec.rb

@@ -464,8 +464,8 @@ describe Cloudinary::Utils do
         ]
         layers_options.each do |name, options, result|
           it "should support #{name}" do
-            expect(["sample", { param => options }]).to produce_url("#{upload_path}/#{short}_#{result}/sample").and empty_options
-            expect("#{upload_path}/#{short}_#{result}/sample").to be_served_by_cloudinary
+            expect(["sample.jpg", { param => options }]).to produce_url("#{upload_path}/#{short}_#{result}/sample.jpg").and empty_options
+            expect("#{upload_path}/#{short}_#{result}/sample.jpg").to be_served_by_cloudinary
           end
           unless options.is_a? String
             op        = Hash.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Nadav Soferman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws_cf_signer