shrine-cloudinary 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12d3db82804fda919a833b89c383245be1231462
-  data.tar.gz: b6445028d38f2702ce59a5e47c8f1dbbc9e7a8ca
+  metadata.gz: 705e20f18504b9412177cdb7fa61da3460d9f54d
+  data.tar.gz: a3848b2726032c48c48dd0f8430c476100ab14ab
 SHA512:
-  metadata.gz: 3683b89aa2464558e29ee230fd16a7aee44cca885b9fc988c453955dfcaade3508baddcf4a94b99c4b017d7e8023e8a7459eff3ddcdb4017fdfc63f4fbd50c87
-  data.tar.gz: fc48706b308d4170b3161c4c1fa468129af7181c8df22c90363fcd043867f68ee62ae64cbb5d05373d776fd82065675e2c77a001478b381cd22afd5a284cf6f7
+  metadata.gz: ac24a2656d36fc87a70473ad498ea7b744a52d4616caf161fc97464bdd7d96b7f0a09493ca5301f5345b1303419b9112788f8189d468f733f1aa8367d5cd35b4
+  data.tar.gz: 07901084386db42a2fe37e1a2090fe730e697097444cb04e5b3f2b8ce78e7950af70dbe88d0be3ee6726ffdec0b6e11549c136f4ae462d35c3c2bb1847efcc49

data/README.md

@@ -3,7 +3,7 @@
 Provides [Cloudinary] storage for [Shrine].
 
 Cloudinary provides storage and advanced processing for images and videos, both
-on-demand and on upload.
+on-demand and on upload, and an HTML widget for direct uploads.
 
 ## Installation
 
@@ -134,7 +134,7 @@ end
 You can pass transformation options to the URLs:
 
 ```rb
-user.avatar_url(width: 100, height: 100, crop: :fit) # :crop is mandatory here
+user.avatar_url(width: 100, height: 100, crop: :fit) # :crop is mandatory with :width or :height
 ```
 
 See [Rails image manipulation] for all URL options you can pass in.

data/lib/shrine/storage/cloudinary.rb

@@ -47,7 +47,7 @@ class Shrine
       end
 
       def open(id)
-        download(id)
+        Down.open(url(id))
       end
 
       def read(id)
@@ -114,27 +114,15 @@ class Shrine
         if remote?(io)
           ::Cloudinary::Uploader.upload(io.url, **options)
         else
-          to_file(io) do |file|
-            if large?(file)
-              ::Cloudinary::Uploader.upload_large(file, chunk_size: chunk_size, **options)
-            else
-              ::Cloudinary::Uploader.upload(file, **options)
-            end
+          make_rest_client_recognize_as_file!(io)
+          if large?(io)
+            ::Cloudinary::Uploader.upload_large(io, chunk_size: chunk_size, **options)
+          else
+            ::Cloudinary::Uploader.upload(io, **options)
           end
         end
       end
 
-      def to_file(io)
-        if io.is_a?(UploadedFile)
-          file = io.download
-          result = yield file
-          file.delete
-          result
-        else
-          yield io
-        end
-      end
-
       def remote?(io)
         io.is_a?(UploadedFile) && io.url.to_s =~ /^ftp:|^https?:/
       end
@@ -147,6 +135,11 @@ class Shrine
         {resource_type: resource_type, type: type}
       end
 
+      def make_rest_client_recognize_as_file!(io)
+        io.instance_eval { def path; "file"; end } unless io.respond_to?(:path)
+        io.instance_eval { def original_filename; "file"; end } if io.respond_to?(:original_filename)
+      end
+
       def update_id!(result, id)
         uploaded_id  = result.fetch("public_id")
         uploaded_id  = uploaded_id.match("#{prefix}/").post_match if prefix

data/shrine-cloudinary.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-cloudinary"
-  gem.version       = "0.4.1"
+  gem.version       = "0.4.2"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -10,12 +10,12 @@ Gem::Specification.new do |gem|
   gem.email        = ["janko.marohnic@gmail.com"]
   gem.license      = "MIT"
 
-  gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine-cloudinary.gemspec"]
+  gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "*.gemspec"]
   gem.require_path = "lib"
 
   gem.add_dependency "shrine", "~> 2.0"
-  gem.add_dependency "cloudinary"
-  gem.add_dependency "down", ">= 1.0.5"
+  gem.add_dependency "cloudinary", ">= 1.1.7", "< 2"
+  gem.add_dependency "down", ">= 2.3.3"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-cloudinary
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -30,28 +30,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.7
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.5
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement