shrine-cloudinary 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0a65cec872c9e53cd6e760407333608c4ab7cef
-  data.tar.gz: 4bee964dc688c03e8065ab278d14a248a799eed0
+  metadata.gz: 6de8b3f92d35c28abfc92a7ee58478c31aae9e97
+  data.tar.gz: a1ff3ab50a88b2342c3ca5d844a6301338986025
 SHA512:
-  metadata.gz: 0c8a99b7cf9e1ed644715101652a50ed97d5e3c61b1a86cece3b16b0649ad8d4506a68762685e2ab3b02fd3a5b592012358f8c7754d062e2ad2bd7e32ecee922
-  data.tar.gz: b0fb81334fb1f5bc14862cb4a67c283f1a7de3a2af5d79fefed864a4cc60dc6da494c0196e57af69b849f1e92a13833a8b7408e2529f759fe68ada6f9b520959
+  metadata.gz: 2367680d167b65e6b267423be706fa5377d555d130e7479c4dbef8bc32720d8cce2b1a10c5ba5a90fe22ae6af85421aca80a46c8aa73f2619fd407b01c38d6e7
+  data.tar.gz: cc68b4752f574e4873b09c896e906da02815aac77844e3eea1023de5688a47914d2187ed723fde038f339eee281a45fea1624545c1ccc5e74a6b105a48a32fbe

data/README.md

@@ -63,44 +63,34 @@ specify `:upload_options`:
 Shrine::Storage::Cloudinary.new(upload_options: {type: "authenticated"})
 ```
 
-### Transformations
-
-Cloudinary allows you to do incoming and eager file transformations, which means
-it's possible to trigger file processing on upload. In Shrine you can leverage
-that by adding `"cloudinary"` metadata, which you can do by overriding
-`Shrine#extract_metadata`:
+You can also apply upload options dynamically per upload using the
+`upload_options` plugin, which is especially useful for doing incoming and
+eager transformations:
 
 ```rb
 class MyUploader < Shrine
-  def extract_metadata(io, context)
-    metadata = super
-    metadata["cloudinary"] = {
+  plugin :upload_options, store: ->(io, context) do
+    {
       format: "png",
       eager: [
-        {transformation: "small"},
-        {transformation: "medium"},
-        {transformation: "large"},
+        {width: 500, height: 500, crop: :scale},
+        {width: 300, height: 300, crop: :crop, gravity: :south},
       ]
     }
-    metadata
   end
 end
 ```
 
-The above example will trigger named transformations "small", "medium" and
-"large", which can be configured in the Cloudinary management console. This
-means that you can have different thumbnails of an image, and it's all taken
-care of by Cloudinary. When displaying the URL the view, you just need to pass
-in the version name to the uploaded file:
+### URLs
+
+You can pass transformation options to the URLs:
 
 ```rb
-user.avatar_url(transformation: "small")
-user.avatar_url(transformation: "medium")
-user.avatar_url(transformation: "large")
+user.avatar_url(width: 100, height: 100)
+user.avatar_url(width: 0.2, crop: :scale)
 ```
 
-Read [this Cloudinary section](http://cloudinary.com/documentation/rails_image_manipulation)
-for all URL options you can pass in.
+See [Rails image manipulation] for all URL options you can pass in.
 
 ### Large files
 
@@ -157,6 +147,9 @@ user.avatar.metadata["cloudinary"] #=>
 # }
 ```
 
+If you're using the storage directly, `Shrine::Storage::Cloudinary#upload` will
+return this hash.
+
 ### Clearing storage
 
 You can delete all files from the Cloudinary storage in the same way as you do
@@ -192,3 +185,4 @@ $ bundle exec rake test
 [Cloudinary]: http://cloudinary.com/
 [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

data/lib/shrine/storage/cloudinary.rb

@@ -1,3 +1,4 @@
+require "shrine"
 require "cloudinary"
 require "down"
 
@@ -19,22 +20,12 @@ class Shrine
         options.update(upload_options)
         options.update(metadata.delete("cloudinary") || {})
 
-        chunk_size = options.delete(:chunk_size)
-
-        result =
-          if remote?(io)
-            uploader.upload(io.storage.url(io.id), **options)
-          else
-            io = io.download if io.is_a?(UploadedFile)
-            if large?(io)
-              uploader.upload_large(io, chunk_size: chunk_size, **options)
-            else
-              uploader.upload(io, **options)
-            end
-          end
+        result = store(io, **options)
 
         update_id!(result, id)
         update_metadata!(result, metadata)
+
+        result
       end
 
       def download(id)
@@ -100,6 +91,19 @@ class Shrine
 
       private
 
+      def store(io, chunk_size: nil, **options)
+        if remote?(io)
+          uploader.upload(io.storage.url(io.id), **options)
+        else
+          io = io.download if io.is_a?(UploadedFile)
+          if large?(io)
+            uploader.upload_large(io, chunk_size: chunk_size, **options)
+          else
+            uploader.upload(io, **options)
+          end
+        end
+      end
+
       def type
         upload_options[:type] || "upload"
       end

data/shrine-cloudinary.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-cloudinary"
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
 
   gem.required_ruby_version = ">= 2.1"
 
@@ -13,11 +13,11 @@ 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 "cloudinary"
-  gem.add_dependency "down", ">= 1.0.3"
+  gem.add_dependency "down", ">= 1.0.5"
 
   gem.add_development_dependency "rake"
-  gem.add_development_dependency "shrine"
   gem.add_development_dependency "minitest"
   gem.add_development_dependency "dotenv"
 end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: shrine-cloudinary
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: cloudinary
+  name: shrine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: down
+  name: cloudinary
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: down
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.0.5
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
-  name: shrine
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="