cloudinary 1.0.40 → 1.0.41

data/lib/cloudinary.rb

@@ -19,6 +19,14 @@ require "cloudinary/railtie" if defined?(Rails) && defined?(Rails::Railtie)
 require "cloudinary/engine" if defined?(Rails) && defined?(Rails::Engine)
 
 module Cloudinary  
+  FORMAT_ALIASES = {
+    "jpeg" => "jpg",
+    "jpe" => "jpg",
+    "tif" => "tiff",
+    "ps" => "eps",
+    "ept" => "eps"
+  }
+  
   @@config = nil
   
   def self.config(new_config=nil)
@@ -45,6 +53,7 @@ module Cloudinary
   end
   
   def self.config_from_url(url)
+    @@config ||= OpenStruct.new
     uri = URI.parse(url)
     set_config(
       "cloud_name" => uri.host,

data/lib/cloudinary/api.rb

@@ -47,14 +47,20 @@ class Cloudinary::Api
     resource_type = options[:resource_type] || "image"
     type = options[:type] || "upload"    
     uri = "resources/#{resource_type}/#{type}"
-    call_api(:delete, uri, {:public_ids=>public_ids}, options)      
+    call_api(:delete, uri, {:public_ids=>public_ids}.merge(only(options, :keep_original)), options)      
   end
 
   def self.delete_resources_by_prefix(prefix, options={})
     resource_type = options[:resource_type] || "image"
     type = options[:type] || "upload"    
     uri = "resources/#{resource_type}/#{type}"
-    call_api(:delete, uri, {:prefix=>prefix}, options)      
+    call_api(:delete, uri, {:prefix=>prefix}.merge(only(options, :keep_original)), options)      
+  end
+  
+  def self.delete_resources_by_tag(tag, options={})
+    resource_type = options[:resource_type] || "image"
+    uri = "resources/#{resource_type}/tags/#{tag}"
+    call_api(:delete, uri, only(options, :keep_original), options)    
   end
   
   def self.delete_derived_resources(derived_resource_ids, options={})

data/lib/cloudinary/carrier_wave/process.rb

@@ -141,6 +141,7 @@ module Cloudinary::CarrierWave
       format = Cloudinary::CarrierWave.split_format(original_filename || "").last
       format ||= "png" # TODO Default format? 
     end
-    format.to_s.downcase
+    format = format.to_s.downcase
+    Cloudinary::FORMAT_ALIASES[format] || format
   end
 end

data/lib/cloudinary/utils.rb

@@ -52,8 +52,9 @@ class Cloudinary::Utils
     if border.is_a?(Hash)
       border = "#{border[:width] || 2}px_solid_#{(border[:color] || "black").sub(/^#/, 'rgb:')}"
     end
+    flags = build_array(options.delete(:flags)).join(".")
     
-    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border}
+    params = {:w=>width, :h=>height, :t=>named_transformation, :c=>crop, :b=>background, :e=>effect, :a=>angle, :bo=>border, :fl=>flags}
     { :x=>:x, :y=>:y, :r=>:radius, :d=>:default_image, :g=>:gravity, :q=>:quality, :cs=>:color_space,
       :p=>:prefix, :l=>:overlay, :u=>:underlay, :f=>:fetch_format, :dn=>:density, :pg=>:page, :dl=>:delay
     }.each do

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.40"
+  VERSION = "1.0.41"
 end

data/spec/api_spec.rb

@@ -78,6 +78,22 @@ describe Cloudinary::Api do
     lambda{@api.resource("api_test3")}.should raise_error(Cloudinary::Api::NotFound)
   end
 
+  it "should allow deleting resources by prefix" do
+    Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test_by_prefix")
+    resource = @api.resource("api_test_by_prefix")
+    resource.should_not be_blank
+    @api.delete_resources_by_prefix("api_test_by")
+    lambda{@api.resource("api_test_by_prefix")}.should raise_error(Cloudinary::Api::NotFound)
+  end
+
+  it "should allow deleting resources by tags" do
+    Cloudinary::Uploader.upload("spec/logo.png", :public_id=>"api_test4", :tags=>["api_test_tag_for_delete"])
+    resource = @api.resource("api_test4")
+    resource.should_not be_blank
+    @api.delete_resources_by_tag("api_test_tag_for_delete")
+    lambda{@api.resource("api_test4")}.should raise_error(Cloudinary::Api::NotFound)
+  end
+
   it "should allow listing tags" do
     tags = @api.tags()["tags"]
     tags.should include('api_test_tag')

data/spec/utils_spec.rb

@@ -324,4 +324,15 @@ describe Cloudinary::Utils do
     options.should == {}
     result.should == "http://res.cloudinary.com/test123/image/upload/bo_1px_solid_blue/test"     
   end
+  
+  it "should support flags" do
+    options = {"flags"=>"abc"}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/fl_abc/test"     
+    options = {"flags"=>["abc", "def"]}
+    result = Cloudinary::Utils.cloudinary_url("test", options)
+    options.should == {}
+    result.should == "http://res.cloudinary.com/test123/image/upload/fl_abc.def/test"     
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.0.40
+  version: 1.0.41
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-10 00:00:00.000000000 Z
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client