cloudinary 1.0.45 → 1.0.46

data/lib/cloudinary/api.rb

@@ -30,7 +30,7 @@ class Cloudinary::Api
     type = options[:type]
     uri = "resources/#{resource_type}"
     uri += "/#{type}" if !type.blank?
-    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix), options)    
+    call_api(:get, uri, only(options, :next_cursor, :max_results, :prefix, :tags), options)    
   end
   
   def self.resources_by_tag(tag, options={})

data/lib/cloudinary/carrier_wave/storage.rb

@@ -48,7 +48,11 @@ class Cloudinary::CarrierWave::Storage < ::CarrierWave::Storage::Abstract
     column = uploader.model.send(:_mounter, uploader.mounted_as).send(:serialization_column)
     if defined?(ActiveRecord::Base) && uploader.model.is_a?(ActiveRecord::Base)
       primary_key = model_class.primary_key.to_sym
-      model_class.update_all({column=>name}, {primary_key=>uploader.model.send(primary_key)})
+      if Rails.version >= "3.0"
+        model_class.where(primary_key=>uploader.model.send(primary_key)).update_all(column=>name)
+      else
+        model_class.update_all({column=>name}, {primary_key=>uploader.model.send(primary_key)})
+      end
       uploader.model.send :write_attribute, column, name
     elsif defined?(Mongoid::Document) && uploader.model.is_a?(Mongoid::Document)
       # Mongoid support

data/lib/cloudinary/helper.rb

@@ -214,15 +214,17 @@ ActionView::Base.send :include, CloudinaryHelper
 
 begin
   require 'sass-rails'
-  class Sass::Rails::Resolver
-    alias :original_image_path :image_path
-    def image_path(img)
-      if Cloudinary.config.enhance_image_tag
-        original_image_path(Cloudinary::Utils.cloudinary_url(img, :type=>:asset))
-      else
-        original_image_path(img)
+  if defined?(Sass::Rails::Resolver)
+    class Sass::Rails::Resolver
+      alias :original_image_path :image_path
+      def image_path(img)
+        if Cloudinary.config.enhance_image_tag
+          original_image_path(Cloudinary::Utils.cloudinary_url(img, :type=>:asset))
+        else
+          original_image_path(img)
+        end      
       end      
-    end      
+    end
   end  
 rescue LoadError
   # no sass rails support. Ignore.

data/lib/cloudinary/version.rb

@@ -1,4 +1,4 @@
 # Copyright Cloudinary
 module Cloudinary
-  VERSION = "1.0.45"
+  VERSION = "1.0.46"
 end

data/spec/api_spec.rb

@@ -36,8 +36,9 @@ describe Cloudinary::Api do
 
 
   it "should allow listing resources by type" do
-    resource = @api.resources(:type=>"upload")["resources"].find{|resource| resource["public_id"] == "api_test"}
+    resource = @api.resources(:type=>"upload", :tags=>true)["resources"].find{|resource| resource["public_id"] == "api_test"}
     resource.should_not be_blank
+    resource["tags"].should == ["api_test_tag"]
   end
 
   it "should allow listing resources by prefix" do
@@ -154,4 +155,4 @@ describe Cloudinary::Api do
     lambda{@api.transformation("c_scale,w_100")}.should raise_error(Cloudinary::Api::NotFound)
   end
 
-end
+end

metadata

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