shrine-cloudinary 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41dea0917908eed7217824a177712ab780ac44d8
-  data.tar.gz: 6413d85af1e21214988f7cd5201dbf13d6a535fe
+  metadata.gz: b0a65cec872c9e53cd6e760407333608c4ab7cef
+  data.tar.gz: 4bee964dc688c03e8065ab278d14a248a799eed0
 SHA512:
-  metadata.gz: a39bd818d6e1a60bcbaf5d5d8a8d6253e2ce8d924bdd228efc5fdc5150ebf78594343ab23fa9d9f11632ef5050b8be7c120eb8fbc6835c53645e55d371f9316e
-  data.tar.gz: 727ad30490548dd17429afa49b0e1528b4d3d2bbaeb89a5a18a0ae52cb0baee1f4163f56693cf150f63dbc2968c29679bc1511741835e26e3794887b976d8c21
+  metadata.gz: 0c8a99b7cf9e1ed644715101652a50ed97d5e3c61b1a86cece3b16b0649ad8d4506a68762685e2ab3b02fd3a5b592012358f8c7754d062e2ad2bd7e32ecee922
+  data.tar.gz: b0fb81334fb1f5bc14862cb4a67c283f1a7de3a2af5d79fefed864a4cc60dc6da494c0196e57af69b849f1e92a13833a8b7408e2529f759fe68ada6f9b520959

data/README.md

@@ -125,9 +125,37 @@ Shrine::Storage::Cloudinary.new(
 
 ### Metadata
 
-If you decide to do incoming transformations (processing which is done on the
-main file before it is saved to Cloudinary), shrine-cloudinary will automatically
-update format, size, width and height metadata for the uploaded file.
+If you decide to do incoming transformations (processing on upload),
+shrine-cloudinary will automatically update the extension, size, MIME type,
+width and height metadata for the uploaded file.
+
+You can choose to save the whole Cloudinary response to metadata by setting
+`:store_data` to true:
+
+```rb
+Shrine::Storage::Cloudinary.new(store_data: true, **cloudinary_options)
+```
+```rb
+user = User.create(avatar: image_file)
+user.avatar.metadata["cloudinary"] #=>
+# {
+#   "public_id" => "foo",
+#   "version" => 1450294102,
+#   "signature" => "379ab45c743951abaea38d6a18ee631af599763f",
+#   "width" => 100,
+#   "height" => 67,
+#   "format" => "jpg",
+#   "resource_type" => "image",
+#   "created_at" => "2015-12-16T19:28:22Z",
+#   "tags" => [],
+#   "bytes" => 6147,
+#   "type" => "upload",
+#   "etag" => "54b5d33d07b1dc4084d7694825371cd7",
+#   "url" => "http://res.cloudinary.com/dkjm0biaa/image/upload/v14502\n94102/foo.jpg",
+#   "secure_url" => "https://res.cloudinary.com/dkjm0biaa/image/upload/v1450294102/foo.jpg",
+#   "original_filename" => "image"
+# }
+```
 
 ### Clearing storage
 

data/lib/shrine/storage/cloudinary.rb

@@ -6,11 +6,12 @@ class Shrine
     class Cloudinary
       attr_reader :prefix, :resource_type, :upload_options
 
-      def initialize(prefix: nil, large: nil, resource_type: "image", upload_options: {})
+      def initialize(prefix: nil, large: nil, resource_type: "image", store_data: nil, upload_options: {})
         @prefix = prefix
         @large = large
         @resource_type = resource_type
         @upload_options = upload_options.merge(resource_type: resource_type)
+        @store_data = store_data
       end
 
       def upload(io, id, metadata = {})
@@ -112,20 +113,52 @@ class Shrine
       end
 
       def update_id!(result, id)
-        unless resource_type == "raw" || id.frozen?
-          id.gsub!(/#{File.extname(id)}$/, ".#{result.fetch("format")}")
-        end
+        id.gsub!(/#{File.extname(id)}$/, ".#{result.fetch("format")}") unless resource_type == "raw"
       end
 
       def update_metadata!(result, metadata)
-        size, width, height = result.values_at("bytes", "width", "height")
-        metadata.update("size" => size)
-        metadata.update("width" => width, "height" => height) if resource_type == "image"
+        retrieved_metadata = {
+          "size"      => result["bytes"],
+          "mime_type" => MIME_TYPES[result["format"]],
+          "width"     => result["width"],
+          "height"    => result["height"],
+        }
+        retrieved_metadata["cloudinary"] = result if @store_data
+        retrieved_metadata.reject! { |key, value| value.nil? }
+
+        metadata.update(retrieved_metadata)
       end
 
       [:Uploader, :Downloader, :Utils, :Api].each do |name|
         define_method(name.downcase) { ::Cloudinary.const_get(name) }
       end
+
+      MIME_TYPES = {
+        # Images
+        "jpg"  => "image/jpeg",
+        "png"  => "image/png",
+        "gif"  => "image/gif",
+        "bmp"  => "image/bmp",
+        "tiff" => "image/tiff",
+        "ico"  => "image/x-icon",
+        "pdf"  => "application/pdf",
+        "eps"  => "application/postscript",
+        "psd"  => "application/octet-stream",
+        "svg"  => "image/svg+xml",
+        "webp" => "image/webp",
+
+        # Videos
+        "mp4"  => "video/mp4",
+        "flv"  => "video/x-flv",
+        "mov"  => "video/quicktime",
+        "ogv"  => "video/ogg",
+        "webm" => "video/webm",
+        "3gp"  => "video/3gpp",
+        "3g2"  => "video/3gpp2",
+        "wmv"  => "video/x-ms-wmv",
+        "mpeg" => "video/mpeg",
+        "avi"  => "video/x-msvideo",
+      }
     end
   end
 end

data/shrine-cloudinary.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |gem|
   gem.name          = "shrine-cloudinary"
-  gem.version       = "0.1.1"
+  gem.version       = "0.2.0"
 
   gem.required_ruby_version = ">= 2.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-cloudinary
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cloudinary