paperclip 2.7.1 → 2.7.2

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.7.1" unless defined? Paperclip::VERSION
+  VERSION = "2.7.2" unless defined? Paperclip::VERSION
 end

data/paperclip.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('aruba')
   s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
-  s.add_development_dependency('cocaine', '~> 0.2')
+  s.add_development_dependency('cocaine', '~> 0.3.0')
   s.add_development_dependency('fog')
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')

data/test/style_test.rb

@@ -96,40 +96,46 @@ class StyleTest < Test::Unit::TestCase
   end
 
   context "An attachment with :convert_options" do
-    setup do
+    should "not have called extra_options_for(:thumb/:large) on initialization" do
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
+      @attachment.expects(:extra_options_for).never
       @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
 
-    before_should "not have called extra_options_for(:thumb/:large) on initialization" do
-      @attachment.expects(:extra_options_for).never
-    end
-
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {:thumb => "100x100", :large => "400x400"},
+                               :convert_options => {:all => "-do_stuff", :thumb => "-thumbnailize"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
       @attachment.expects(:extra_options_for).with(:thumb)
       @attachment.styles[:thumb].convert_options
     end
   end
 
   context "An attachment with :source_file_options" do
-    setup do
+    should "not have called extra_source_file_options_for(:thumb/:large) on initialization" do
       @attachment = attachment :path => ":basename.:extension",
                                :styles => {:thumb => "100x100", :large => "400x400"},
                                :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
+      @attachment.expects(:extra_source_file_options_for).never
       @style = @attachment.styles[:thumb]
       @file = StringIO.new("...")
       @file.stubs(:original_filename).returns("file.jpg")
     end
 
-    before_should "not have called extra_source_file_options_for(:thumb/:large) on initialization" do
-      @attachment.expects(:extra_source_file_options_for).never
-    end
-
     should "call extra_options_for(:thumb/:large) when convert options are requested" do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {:thumb => "100x100", :large => "400x400"},
+                               :source_file_options => {:all => "-density 400", :thumb => "-depth 8"}
+      @style = @attachment.styles[:thumb]
+      @file = StringIO.new("...")
+      @file.stubs(:original_filename).returns("file.jpg")
       @attachment.expects(:extra_source_file_options_for).with(:thumb)
       @attachment.styles[:thumb].source_file_options
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-28 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement