cloudinary 1.0.80 → 1.0.81

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 5238e148e2fa359ac4736ba85dd244cf72b9fbc5
-  data.tar.gz: cd495901ce6334177179ebfd39036959dce421d4
+  metadata.gz: 22f7163efe3beefab6b2653a0c3e440f45907eee
+  data.tar.gz: 4a446807c4be6d7769384adebc9a2b08fe910d1c
 SHA512: 
-  metadata.gz: be187c5e89b243c0ba3fad8efafe605898e12a23758fa4e0a9526f79928ce2028eeadf7da3136a0d481200d5f39564cb4c3c2aaf3d09fecb71d2ee6a3c120433
-  data.tar.gz: e5b09d564ce2e161311bf555559857d36e51d08b9e15294fbb9a78b11c18e7baa4f6727d37d2093b921ced8547ad94a31a8eb15c221e1e265581bceff0331251
+  metadata.gz: 70ea68172f8e246e74049e87ce49e49af856dc7428fdc68b635a3fa6f886c32c656fe625fa31051665da3c2037e7bac85f17e710d973bdbcb586e9969235b433
+  data.tar.gz: 3663bde9f91c9d51b6760e1383f200d731425c63aad59520b508f6cd333f4793875bd79a361e5f1be126a65291c57833539054302fc6991cc56be6275a391109

data/CHANGELOG

@@ -1,3 +1,6 @@
+= Version 1.0.81 - 2015-01-08
+  * CarrierWave - support default_format if format is unknown, support arbitrary format for resource_type raw.
+
 = Version 1.0.80 - 2015-01-01
   * Support upload_chunked direct upload for large raw files.
 

data/lib/cloudinary/carrier_wave.rb

@@ -60,7 +60,7 @@ module Cloudinary::CarrierWave
 
   def filename
     return nil if self.blank?
-    return [self.full_public_id, self.format].join(".")
+    return [self.full_public_id, self.format].reject(&:blank?).join(".")
   end
 
   # default public_id to use if no uploaded file. Override with public_id of an uploaded image if you want a default image.
@@ -176,8 +176,12 @@ module Cloudinary::CarrierWave
     return Cloudinary::PreloadedFile.split_format(identifier)
   end
 
+  def default_format
+    "png"
+  end
+
   def resource_type
-    Cloudinary::Utils.resource_type_for_format(self.filename || self.format)
+    Cloudinary::Utils.resource_type_for_format(requested_format || original_filename || default_format)
   end
   
   # For the given methods - versions should call the main uploader method

data/lib/cloudinary/carrier_wave/process.rb

@@ -135,7 +135,7 @@ module Cloudinary::CarrierWave
     @tags
   end
 
-  def format
+  def requested_format
     format_processor = self.all_processors.find{|processor| processor[0] == :convert}
     if format_processor
       # Explicit format is given
@@ -146,11 +146,15 @@ module Cloudinary::CarrierWave
       # No local format. The reset should be handled by main uploader
       uploader = self.model.send(self.mounted_as)
       format = uploader.format
-    else
-      # Try to auto-detect format
-      format = Cloudinary::PreloadedFile.split_format(original_filename || "").last
-      format ||= "png" # TODO Default format?
     end
+    format
+  end
+
+  def format
+    format = Cloudinary::PreloadedFile.split_format(original_filename || "").last
+    return format || "" if resource_type == "raw"
+    format = requested_format || format || default_format
+ 
     format = format.to_s.downcase
     Cloudinary::FORMAT_ALIASES[format] || format
   end

data/lib/cloudinary/carrier_wave/storage.rb

@@ -35,7 +35,6 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
       params[:type]=uploader.class.storage_type
 
       params[:resource_type] ||= :auto
-
       uploader.metadata = Cloudinary::Uploader.upload(data, params)
       if uploader.metadata["error"]
         raise Cloudinary::CarrierWave::UploadError.new(uploader.metadata["error"]["message"], uploader.metadata["error"]["http_code"])

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.80"
+  VERSION = "1.0.81"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudinary
 version: !ruby/object:Gem::Version 
-  version: 1.0.80
+  version: 1.0.81
 platform: ruby
 authors: 
 - Nadav Soferman
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-01 00:00:00 Z
+date: 2015-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client