paperclip-cloudinary 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 991caf710e11807bfa06aae6188801216d9358c1
-  data.tar.gz: d1367fd08d75492adb8c958ee1ebf1ad7bff9bdf
+  metadata.gz: 1777407449495c90962cd0540d3e9dc826a4fb03
+  data.tar.gz: ecb3b29dee07e50ea59d7e799c68d9444e553e96
 SHA512:
-  metadata.gz: 75319debfce96d914576815c8c4f564da17a5ce89e269a9c979091fa82247283b0b7b7f38997dfef9f55f45bd1a4216955e78203472363f30f597c4c06faf72c
-  data.tar.gz: c6aa1be805712f6bf7e350cb0ad0935d66a17711d9e76d715384d36a474d4de02103c0991b45f0d0bcce59562ee1e176f51dd6da816c47b0ccf0da3dbfafc6df
+  metadata.gz: e918d3aadcd2aacc8ba207951b4b9463fde67c749b7a262077e86a957b9f1070c367e500509129124304a431d85b6573a7412528f7df0149587cc18dca39795f
+  data.tar.gz: 815561dcf263b692bdded9a65f80932247b0754d663a909d35248cd7aa1dd84bb677d67eb1d18d285d7b540ee07696d73be7d96baa7f1d80244c8632298b5528

data/Gemfile.lock

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

data/README.md

@@ -70,6 +70,28 @@ has_attached_file :image,
 The `cloudinary_credentials` can be a file location, a file, or a Hash
 of options.
 
+### Resource Types
+
+Cloudinary supports a number of resource types for your attachments, including:
+
+* image
+* audio
+* video
+* raw
+
+By default, this gem assumes that your resource type is an image, but if
+you are uploading other resources, such as videos, you can specify the
+resource type in your configuration:
+
+```ruby
+has_attached_file :video,
+  :storage => :cloudinary,
+  :cloudinary_resource_type => :video
+```
+
+Cloudinary has recently introduced auto-detection features that may soon
+be integrated with this gem to make this step optional.
+
 ### Upload Options
 
 Cloudinary supports a host of [upload
@@ -144,7 +166,8 @@ has_attached_file :image
         },
         :styles => {
             :avatar => {
-                :resource_type => 'raw'
+                :quality => 75,
+                :transformation => [ { :angle => 20 } ]
             }
         }
     }
@@ -155,9 +178,12 @@ for all calls, then the style-specific ones, if applicable.
 
 #### In-line Configuration
 
+The same URL options provided for the avatar above can also be expressed as
+in-line configuration options:
+
 ```ruby
-model.image.url(:avatar, :cloudinary => { :secure => true,
-:resource_type => 'raw' }
+model.image.url(:avatar, :cloudinary => { :secure => true, :quality =>
+75, :transformation => [ { :angle => 20 } ] })
 ```
 
 These can be use in addition to the URL options provided in the

data/lib/paperclip/cloudinary/version.rb

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

data/lib/paperclip/storage/cloudinary.rb

@@ -19,6 +19,7 @@ module Paperclip
         @queued_for_write.each do |style_name, file|
           defaults = {
             public_id: public_id(style_name),
+            resource_type: resource_type,
             use_filename: true,
             unique_filename: false,
             overwrite: true,
@@ -45,7 +46,11 @@ module Paperclip
 
       def flush_deletes
         @queued_for_delete.each do |path|
-          ::Cloudinary::Uploader.destroy path[0..-(File.extname(path).length + 1)]
+          defaults = {
+            resource_type: resource_type,
+            invalidate: true
+          }
+          ::Cloudinary::Uploader.destroy public_id_for_path(path), defaults
         end
 
         @queued_for_delete.clear
@@ -53,12 +58,12 @@ module Paperclip
 
       def copy_to_local_file style, local_dest_path
         File.open(local_dest_path, 'wb') do |file|
-          file.write ::Cloudinary::Downloader.download(path(style))
+          file.write ::Cloudinary::Downloader.download(url(style))
         end
       end
 
       def exists? style = default_style
-        ::Cloudinary::Uploader.exists? path(style)
+        ::Cloudinary::Uploader.exists? public_id(style), cloudinary_url_options(style)
       end
 
       def url style_or_options = default_style, options = {}
@@ -73,10 +78,18 @@ module Paperclip
       end
 
       def public_id style
-        s = path style
+        public_id_for_path(path style)
+      end
+
+      def public_id_for_path s
         s[0..-(File.extname(s).length + 1)]
       end
 
+      def resource_type
+        type = @options[:cloudinary_resource_type] || 'image'
+        %w{image raw video audio}.include?(type.to_s) ? type.to_s : 'image'
+      end
+
       def cloud_name
         cloudinary_credentials[:cloud_name]
       end
@@ -90,7 +103,7 @@ module Paperclip
       end
 
       def cloudinary_credentials
-        @cloudinary_credentials ||= parse_credentials(@options[:cloudinary_credentials] || Rails.root.join("config/cloudinary.yml"))
+        @cloudinary_credentials ||= parse_credentials(@options[:cloudinary_credentials] || find_default_config_path)
         @cloudinary_credentials
       end
 
@@ -108,6 +121,8 @@ module Paperclip
         default_opts = url_opts[:default] || {}
         style_opts   = url_opts[:styles].try(:[], style_name) || {}
 
+        default_opts[:resource_type] = resource_type
+
         options = {}
         [default_opts, style_opts, inline_opts].each do |opts|
           options.deep_merge!(opts) do |key, existing_value, new_value|
@@ -118,6 +133,15 @@ module Paperclip
         options
       end
 
+      def find_default_config_path
+        config_path = Rails.root.join("config/cloudinary.yml")
+        if File.exist? config_path
+          return config_path
+        else
+          return Rails.root.join("config/cloudinary.yaml")
+        end
+      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.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Carl Scott
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudinary