paperclip-cloudinary 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26170d304fef36a6ea287a5f1bef2559cf029c7e
-  data.tar.gz: 6b16e4ae21c1d61cc6f30e491ddc9e6911f6ed92
+  metadata.gz: 991caf710e11807bfa06aae6188801216d9358c1
+  data.tar.gz: d1367fd08d75492adb8c958ee1ebf1ad7bff9bdf
 SHA512:
-  metadata.gz: 23d63a198657b36b713021d3e01ab6be53b7f99f192a5293d10ccdd630e9663ea9bbc08033811035431d21bce6a2615aa255f7b920947d43d08c744edd23a3cf
-  data.tar.gz: eb40b01ba53f7660f4671c8d9f07ce93374887c24b7d0f4331d38cbb33c115189034b7f44c867602b15a82eb836544708caeb28ed7f648ff6c4f086d74fc66d3
+  metadata.gz: 75319debfce96d914576815c8c4f564da17a5ce89e269a9c979091fa82247283b0b7b7f38997dfef9f55f45bd1a4216955e78203472363f30f597c4c06faf72c
+  data.tar.gz: c6aa1be805712f6bf7e350cb0ad0935d66a17711d9e76d715384d36a474d4de02103c0991b45f0d0bcce59562ee1e176f51dd6da816c47b0ccf0da3dbfafc6df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperclip-cloudinary (1.1.0)
+    paperclip-cloudinary (1.2.0)
       cloudinary (~> 1.1)
 
 GEM

data/README.md

@@ -114,8 +114,7 @@ has_attached_file :image,
                 ]
             }
         }
-      }
-  }
+    }
 ```
 
 Here, all image versions would be uploaded with a caption taken from the model's caption parameter and 
@@ -126,6 +125,46 @@ facial recognition features.
 
 The gem-provided default options can not be overridden.
 
+### URL Options
+
+One of Cloudinary's biggest draws is the ability to manipulate images
+on the fly via URL parameters. You can specify the URL options in your
+attachment configuration as well as in-line.  See the Cloudinary
+documentation for a list of all supported parameters.
+
+#### Attachment Configuration
+
+```ruby
+has_attached_file :image
+    :storage => :cloudinary,
+    :styles => { :avatar => '200x200>' },
+    :cloudinary_url_options => {
+        :default => {
+            :secure => true
+        },
+        :styles => {
+            :avatar => {
+                :resource_type => 'raw'
+            }
+        }
+    }
+```
+
+Like upload options, the default options (optional) will be used first
+for all calls, then the style-specific ones, if applicable.
+
+#### In-line Configuration
+
+```ruby
+model.image.url(:avatar, :cloudinary => { :secure => true,
+:resource_type => 'raw' }
+```
+
+These can be use in addition to the URL options provided in the
+attachment configuration, or they can be used standalone. Options
+provided in-line will override any options specified in the attachment
+configuration.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/GoGoCarl/paperclip-cloudinary.

data/lib/paperclip/cloudinary/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Cloudinary
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/paperclip/storage/cloudinary.rb

@@ -45,7 +45,7 @@ module Paperclip
 
       def flush_deletes
         @queued_for_delete.each do |path|
-          ::Cloudinary::Uploader.destroy path
+          ::Cloudinary::Uploader.destroy path[0..-(File.extname(path).length + 1)]
         end
 
         @queued_for_delete.clear
@@ -68,7 +68,8 @@ module Paperclip
         else
           style = style_or_options
         end
-        ::Cloudinary::Utils.cloudinary_url path(style)
+        inline_opts = options[:cloudinary] || {}
+        ::Cloudinary::Utils.cloudinary_url path(style), cloudinary_url_options(style, inline_opts)
       end
 
       def public_id style
@@ -102,6 +103,21 @@ module Paperclip
 
       private
 
+      def cloudinary_url_options style_name, inline_opts={}
+        url_opts     = @options[:cloudinary_url_options] || {}
+        default_opts = url_opts[:default] || {}
+        style_opts   = url_opts[:styles].try(:[], style_name) || {}
+
+        options = {}
+        [default_opts, style_opts, inline_opts].each do |opts|
+          options.deep_merge!(opts) do |key, existing_value, new_value|
+            new_value.try(:call, style_name, self) || new_value
+          end
+        end
+        options.merge! default_opts
+        options
+      end
+
       def find_credentials creds
         case creds
         when File

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Carl Scott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-23 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudinary