shrine-cloudinary 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6de8b3f92d35c28abfc92a7ee58478c31aae9e97
-  data.tar.gz: a1ff3ab50a88b2342c3ca5d844a6301338986025
+  metadata.gz: 40214d8c6cb86f477773409ad1b2bd939c9cb781
+  data.tar.gz: e17dc751f371937e136ba2f915a6df65be6ed2e9
 SHA512:
-  metadata.gz: 2367680d167b65e6b267423be706fa5377d555d130e7479c4dbef8bc32720d8cce2b1a10c5ba5a90fe22ae6af85421aca80a46c8aa73f2619fd407b01c38d6e7
-  data.tar.gz: cc68b4752f574e4873b09c896e906da02815aac77844e3eea1023de5688a47914d2187ed723fde038f339eee281a45fea1624545c1ccc5e74a6b105a48a32fbe
+  metadata.gz: 9d57b2b9cb32ae0ad2f49084039ec26bc97143b657c06236f7fd452905d440b08cb983f0c2bbd12c99cb667f65abac9cd10900fc4e4a50d5998480bfdbda4b6d
+  data.tar.gz: fe772efa20d956fd9c867ba511276d8ec394d774b379aaa203802a756efce23465a6cfe7f41ea106f1b6a3fd1e7c5a3ff658698f75538c709587d9dfd6039ce1

data/README.md

@@ -1,4 +1,4 @@
-# Shrine::Cloudinary
+# Shrine::Storage::Cloudinary
 
 Provides [Cloudinary] storage for [Shrine].
 
@@ -92,27 +92,6 @@ user.avatar_url(width: 0.2, crop: :scale)
 
 See [Rails image manipulation] for all URL options you can pass in.
 
-### Large files
-
-If you're uploading large files with Cloudinary (like videos), you can take
-advantage of Cloudinary's special "chunked" upload API, by passing the filesize
-threshold after which the special API will be used:
-
-```rb
-# Upload files larger than 100 MB using the "chunked" upload API
-Shrine::Storage::Cloudinary.new(large: 100*1024*1024)
-```
-
-The default chunk size is 20 MB, but you can change that by passing
-`:chunk_size` to `:upload_options`:
-
-```rb
-Shrine::Storage::Cloudinary.new(
-  large: 100*1024*1024                      # 100 MB
-  upload_options: {chunk_size: 5*1024*1204} # 5 MB
-)
-```
-
 ### Metadata
 
 If you decide to do incoming transformations (processing on upload),
@@ -147,8 +126,42 @@ user.avatar.metadata["cloudinary"] #=>
 # }
 ```
 
-If you're using the storage directly, `Shrine::Storage::Cloudinary#upload` will
-return this hash.
+This is especially useful for saving [responsive breakpoints]. If you're using
+the storage directly, `Shrine::Storage::Cloudinary#upload` will return this
+hash.
+
+### Large files
+
+If you're uploading large files with Cloudinary (like videos), you can take
+advantage of Cloudinary's special "chunked" upload API, by passing the filesize
+threshold after which the special API will be used:
+
+```rb
+# Upload files larger than 100 MB using the "chunked" upload API
+Shrine::Storage::Cloudinary.new(large: 100*1024*1024)
+```
+
+The default chunk size is 20 MB, but you can change that by passing
+`:chunk_size` to `:upload_options`:
+
+```rb
+Shrine::Storage::Cloudinary.new(
+  large: 100*1024*1024                      # 100 MB
+  upload_options: {chunk_size: 5*1024*1204} # 5 MB
+)
+```
+
+### Updating
+
+Sometimes you may want to apply actions to already uploaded files, e.g.
+regenerate tranformations. This storage provides the `#update` method which
+delegates to Cloudinary's [explicit API]:
+
+```rb
+cloudinary = Shrine::Storage::Cloudinary.new
+# ...
+cloudinary.update("image.jpg", eager: {...})
+```
 
 ### Clearing storage
 
@@ -186,3 +199,5 @@ $ bundle exec rake test
 [Shrine]: https://github.com/janko-m/shrine
 [Cloudinary options]: http://cloudinary.com/documentation/upload_images#remote_upload
 [Rails image manipulation]: http://cloudinary.com/documentation/rails_image_manipulation
+[responsive breakpoints]: http://cloudinary.com/blog/introducing_intelligent_responsive_image_breakpoints_solutions
+[explicit API]: http://cloudinary.com/documentation/image_upload_api_reference#explicit

data/lib/shrine/storage/cloudinary.rb

@@ -15,15 +15,15 @@ class Shrine
         @store_data = store_data
       end
 
-      def upload(io, id, metadata = {})
+      def upload(io, id, shrine_metadata: {}, **upload_options)
         options = {public_id: public_id(id)}
+        options.update(@upload_options)
         options.update(upload_options)
-        options.update(metadata.delete("cloudinary") || {})
 
         result = store(io, **options)
 
         update_id!(result, id)
-        update_metadata!(result, metadata)
+        update_metadata!(result, shrine_metadata)
 
         result
       end
@@ -32,6 +32,10 @@ class Shrine
         Down.download(url(id))
       end
 
+      def update(id, **options)
+        uploader.explicit(public_id(id), resource_type: resource_type, type: type, **options)
+      end
+
       def move(io, id, metadata = {})
         uploader.rename(io.storage.public_id(io.id), public_id(id), resource_type: resource_type)
       end
@@ -66,8 +70,7 @@ class Shrine
         utils.cloudinary_url(path(id), resource_type: resource_type, type: type, **options)
       end
 
-      def clear!(confirm = nil, **options)
-        raise Shrine::Confirm unless confirm == :confirm
+      def clear!(**options)
         if prefix
           api.delete_resources_by_prefix(prefix, resource_type: resource_type, **options)
         else
@@ -93,7 +96,7 @@ class Shrine
 
       def store(io, chunk_size: nil, **options)
         if remote?(io)
-          uploader.upload(io.storage.url(io.id), **options)
+          uploader.upload(io.url, **options)
         else
           io = io.download if io.is_a?(UploadedFile)
           if large?(io)
@@ -109,7 +112,7 @@ class Shrine
       end
 
       def remote?(io)
-        io.is_a?(UploadedFile) && io.storage.url(io.id) =~ /^ftp:|^https?:/
+        io.is_a?(UploadedFile) && io.url.to_s =~ /^ftp:|^https?:/
       end
 
       def large?(io)
@@ -117,7 +120,11 @@ class Shrine
       end
 
       def update_id!(result, id)
-        id.gsub!(/#{File.extname(id)}$/, ".#{result.fetch("format")}") unless resource_type == "raw"
+        uploaded_id  = result.fetch("public_id")
+        uploaded_id  = uploaded_id.match("#{prefix}/").post_match if prefix
+        uploaded_id += ".#{result["format"]}" if result["format"]
+
+        id.replace(uploaded_id)
       end
 
       def update_metadata!(result, metadata)

data/shrine-cloudinary.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-cloudinary"
-  gem.version       = "0.2.1"
+  gem.version       = "0.3.0"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.files        = Dir["README.md", "LICENSE.txt", "lib/**/*.rb", "shrine-cloudinary.gemspec"]
   gem.require_path = "lib"
 
-  gem.add_dependency "shrine", "~> 1.1"
+  gem.add_dependency "shrine", "~> 2.0"
   gem.add_dependency "cloudinary"
   gem.add_dependency "down", ">= 1.0.5"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-cloudinary
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-27 00:00:00.000000000 Z
+date: 2016-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shrine
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cloudinary
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Provides Cloudinary storage for Shrine.