paperclip 2.3.1.1 → 2.3.2

data/test/storage_test.rb

@@ -4,7 +4,7 @@ require 'aws/s3'
 class StorageTest < Test::Unit::TestCase
   def rails_env(env)
     silence_warnings do
-      Object.const_set(:RAILS_ENV, env)
+      Object.const_set(:Rails, stub('Rails', :env => env))
     end
   end
 
@@ -17,12 +17,6 @@ class StorageTest < Test::Unit::TestCase
 
       @dummy = Dummy.new
       @avatar = @dummy.avatar
-
-      @current_env = RAILS_ENV
-    end
-
-    teardown do
-      rails_env(@current_env)
     end
 
     should "get the correct credentials when RAILS_ENV is production" do
@@ -97,6 +91,33 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "Generating a url with an expiration" do
+    setup do
+      AWS::S3::Base.stubs(:establish_connection!)
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {
+                      :production   => { :bucket => "prod_bucket" },
+                      :development  => { :bucket => "dev_bucket" }
+                    },
+                    :s3_host_alias => "something.something.com",
+                    :path => ":attachment/:basename.:extension",
+                    :url => ":s3_alias_url"
+
+      rails_env("production")
+
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+
+      AWS::S3::S3Object.expects(:url_for).with("avatars/stringio.txt", "prod_bucket", { :expires_in => 3600 })
+
+      @dummy.avatar.expiring_url
+    end
+
+    should "should succeed" do
+      assert true
+    end
+  end
+
   context "Parsing S3 credentials with a bucket in them" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -106,11 +127,8 @@ class StorageTest < Test::Unit::TestCase
                       :development  => { :bucket => "dev_bucket" }
                     }
       @dummy = Dummy.new
-      @old_env = RAILS_ENV
     end
 
-    teardown{ rails_env(@old_env) }
-
     should "get the right bucket in production" do
       rails_env("production")
       assert_equal "prod_bucket", @dummy.avatar.bucket_name
@@ -166,7 +184,7 @@ class StorageTest < Test::Unit::TestCase
           assert true
         end
       end
-      
+
       context "and remove" do
         setup do
           AWS::S3::S3Object.stubs(:exists?).returns(true)
@@ -180,7 +198,7 @@ class StorageTest < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "An attachment with S3 storage and bucket defined as a Proc" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -188,7 +206,7 @@ class StorageTest < Test::Unit::TestCase
                     :bucket => lambda { |attachment| "bucket_#{attachment.instance.other}" },
                     :s3_credentials => {:not => :important}
     end
-    
+
     should "get the right bucket name" do
       assert "bucket_a", Dummy.new(:other => 'a').avatar.bucket_name
       assert "bucket_b", Dummy.new(:other => 'b').avatar.bucket_name
@@ -236,6 +254,28 @@ class StorageTest < Test::Unit::TestCase
     end
   end
 
+  context "with S3 credentials supplied as Pathname" do
+     setup do
+       ENV['S3_KEY']    = 'pathname_key'
+       ENV['S3_BUCKET'] = 'pathname_bucket'
+       ENV['S3_SECRET'] = 'pathname_secret'
+
+       rails_env('test')
+
+       rebuild_model :storage        => :s3,
+                     :s3_credentials => Pathname.new(File.join(File.dirname(__FILE__))).join("fixtures/s3.yml")
+
+       Dummy.delete_all
+       @dummy = Dummy.new
+     end
+
+     should "parse the credentials" do
+       assert_equal 'pathname_bucket', @dummy.avatar.bucket_name
+       assert_equal 'pathname_key', AWS::S3::Base.connection.options[:access_key_id]
+       assert_equal 'pathname_secret', AWS::S3::Base.connection.options[:secret_access_key]
+     end
+  end
+
   context "with S3 credentials in a YAML file" do
     setup do
       ENV['S3_KEY']    = 'env_key'

data/test/style_test.rb

@@ -0,0 +1,141 @@
+# encoding: utf-8
+require 'test/helper'
+
+class StyleTest < Test::Unit::TestCase
+
+  context "A style rule" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => { :foo => {:geometry => "100x100#", :format => :png} }
+      @style = @attachment.styles[:foo]
+    end
+
+    should "be held as a Style object" do
+      assert_kind_of Paperclip::Style, @style
+    end
+
+    should "get processors from the attachment definition" do
+      assert_equal [:thumbnail], @style.processors
+    end
+
+    should "have the right geometry" do
+      assert_equal "100x100#", @style.geometry
+    end
+
+    should "be whiny if the attachment is" do
+      @attachment.expects(:whiny).returns(true)
+      assert @style.whiny?
+    end
+
+    should "respond to hash notation" do
+      assert_equal [:thumbnail], @style[:processors]
+      assert_equal "100x100#", @style[:geometry]
+    end
+  end
+
+  context "A style rule with properties supplied as procs" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :whiny_thumbnails => true,
+                               :processors => lambda {|a| [:test]},
+                               :styles => {
+                                 :foo => lambda{|a| "300x300#"},
+                                 :bar => {
+                                   :geometry => lambda{|a| "300x300#"}
+                                 }
+                               }
+    end
+
+    should "defer processing of procs until they are needed" do
+      assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@geometry")
+      assert_kind_of Proc, @attachment.styles[:bar].instance_variable_get("@geometry")
+      assert_kind_of Proc, @attachment.instance_variable_get("@processors")
+    end
+
+    should "call procs when they are needed" do
+      assert_equal "300x300#", @attachment.styles[:foo].geometry
+      assert_equal "300x300#", @attachment.styles[:bar].geometry
+      assert_equal [:test], @attachment.styles[:foo].processors
+      assert_equal [:test], @attachment.styles[:bar].processors
+    end
+  end
+
+  context "An attachment with style rules in various forms" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {
+                                 :aslist => ["100x100", :png],
+                                 :ashash => {:geometry => "100x100", :format => :png},
+                                 :asstring => "100x100"
+                                }
+    end
+    should "have the right number of styles" do
+      assert_kind_of Hash, @attachment.styles
+      assert_equal 3, @attachment.styles.size
+    end
+
+    should "have styles as Style objects" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_kind_of Paperclip::Style, @attachment.styles[s]
+      end
+    end
+
+    should "have the right geometries" do
+      [:aslist, :ashash, :aslist].each do |s|
+        assert_equal @attachment.styles[s].geometry, "100x100"
+      end
+    end
+
+    should "have the right formats" do
+      assert_equal @attachment.styles[:aslist].format, :png
+      assert_equal @attachment.styles[:ashash].format, :png
+      assert_nil @attachment.styles[:asstring].format
+    end
+
+  end
+
+  context "An attachment with :convert_options" do
+    setup 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")
+    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.expects(:extra_options_for).with(:thumb)
+      @attachment.styles[:thumb].convert_options
+    end
+  end
+
+  context "A style rule with its own :processors" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {
+                                 :foo => {
+                                   :geometry => "100x100#",
+                                   :format => :png,
+                                   :processors => [:test]
+                                  }
+                                },
+                               :processors => [:thumbnail]
+      @style = @attachment.styles[:foo]
+    end
+
+    should "not get processors from the attachment" do
+      @attachment.expects(:processors).never
+      assert_not_equal [:thumbnail], @style.processors
+    end
+
+    should "report its own processors" do
+      assert_equal [:test], @style.processors
+    end
+
+  end
+end

data/test/thumbnail_test.rb

@@ -47,7 +47,7 @@ class ThumbnailTest < Test::Unit::TestCase
         end
 
         should "start with dimensions of 434x66" do
-          cmd = %Q[identify -format "%wx%h" "#{@file.path}"] 
+          cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
           assert_equal "434x66", `#{cmd}`.chomp
         end
 
@@ -61,7 +61,7 @@ class ThumbnailTest < Test::Unit::TestCase
           end
 
           should "be the size we expect it to be" do
-            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"] 
+            cmd = %Q[identify -format "%wx%h" "#{@thumb_result.path}"]
             assert_equal args[1], `#{cmd}`.chomp
           end
         end
@@ -85,14 +85,14 @@ class ThumbnailTest < Test::Unit::TestCase
       should "have whiny turned on by default" do
         assert @thumb.whiny
       end
-      
+
       should "have convert_options set to nil by default" do
         assert_equal nil, @thumb.convert_options
       end
 
       should "send the right command to convert when sent #make" do
         Paperclip.expects(:"`").with do |arg|
-          arg.match %r{convert\s+"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+\"x50\"\s+-crop\s+\"100x50\+114\+0\"\s+\+repage\s+".*?"}
+          arg.match %r{convert '#{File.expand_path(@thumb.file.path)}\[0\]' '-resize' 'x50' '-crop' '100x50\+114\+0' '\+repage' '.*?'}
         end
         @thumb.make
       end
@@ -102,7 +102,7 @@ class ThumbnailTest < Test::Unit::TestCase
         assert_match /100x50/, `identify "#{dst.path}"`
       end
     end
-    
+
     context "being thumbnailed with source file options set" do
       setup do
         @thumb = Paperclip::Thumbnail.new(@file,
@@ -111,12 +111,12 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "have source_file_options value set" do
-        assert_equal "-strip", @thumb.source_file_options
+        assert_equal ["-strip"], @thumb.source_file_options
       end
 
       should "send the right command to convert when sent #make" do
         Paperclip.expects(:"`").with do |arg|
-          arg.match %r{convert\s+-strip\s+"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+"x50"\s+-crop\s+"100x50\+114\+0"\s+\+repage\s+".*?"}
+          arg.match %r{convert '-strip' '#{File.expand_path(@thumb.file.path)}\[0\]' '-resize' 'x50' '-crop' '100x50\+114\+0' '\+repage' '.*?'}
         end
         @thumb.make
       end
@@ -125,7 +125,7 @@ class ThumbnailTest < Test::Unit::TestCase
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
-      
+
       context "redefined to have bad source_file_options setting" do
         setup do
           @thumb = Paperclip::Thumbnail.new(@file,
@@ -138,7 +138,7 @@ class ThumbnailTest < Test::Unit::TestCase
             @thumb.make
           end
         end
-      end      
+      end
     end
 
     context "being thumbnailed with convert options set" do
@@ -149,12 +149,12 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "have convert_options value set" do
-        assert_equal "-strip -depth 8", @thumb.convert_options
+        assert_equal %w"-strip -depth 8", @thumb.convert_options
       end
 
       should "send the right command to convert when sent #make" do
         Paperclip.expects(:"`").with do |arg|
-          arg.match %r{convert\s+"#{File.expand_path(@thumb.file.path)}\[0\]"\s+-resize\s+"x50"\s+-crop\s+"100x50\+114\+0"\s+\+repage\s+-strip\s+-depth\s+8\s+".*?"}
+          arg.match %r{convert '#{File.expand_path(@thumb.file.path)}\[0\]' '-resize' 'x50' '-crop' '100x50\+114\+0' '\+repage' '-strip' '-depth' '8' '.*?'}
         end
         @thumb.make
       end
@@ -163,7 +163,7 @@ class ThumbnailTest < Test::Unit::TestCase
         dst = @thumb.make
         assert_match /100x50/, `identify "#{dst.path}"`
       end
-      
+
       context "redefined to have bad convert_options setting" do
         setup do
           @thumb = Paperclip::Thumbnail.new(@file,
@@ -176,18 +176,18 @@ class ThumbnailTest < Test::Unit::TestCase
             @thumb.make
           end
         end
-      end      
+      end
     end
-    
+
     context "being thumbnailed with a blank geometry string" do
       setup do
         @thumb = Paperclip::Thumbnail.new(@file,
                                           :geometry        => "",
                                           :convert_options => "-gravity center -crop \"300x300+0-0\"")
       end
-      
+
       should "not get resized by default" do
-        assert_no_match(/-resize/, @thumb.transformation_command)
+        assert !@thumb.transformation_command.include?("-resize")
       end
     end
   end
@@ -200,7 +200,7 @@ class ThumbnailTest < Test::Unit::TestCase
     teardown { @file.close }
 
     should "start with two pages with dimensions 612x792" do
-      cmd = %Q[identify -format "%wx%h" "#{@file.path}"] 
+      cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
       assert_equal "612x792"*2, `#{cmd}`.chomp
     end
 

data/test/upfile_test.rb

@@ -25,4 +25,12 @@ class UpfileTest < Test::Unit::TestCase
       end
     end
   end
+
+  should "return a content_type of text/plain on a real file whose content_type is determined with the file command" do
+    file = File.new(File.join(File.dirname(__FILE__), "..", "LICENSE"))
+    class << file
+      include Paperclip::Upfile
+    end
+    assert_equal 'text/plain', file.content_type
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  version: 2.3.1.1
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Jon Yurek
@@ -9,70 +14,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 -04:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: activerecord
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jferris-mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.5.0.1241126838
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: aws-s3
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-description: 
+  type: :development
+  version_requirements: *id006
+description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
 
@@ -85,9 +102,9 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- generators/paperclip/paperclip_generator.rb
-- generators/paperclip/templates/paperclip_migration.rb.erb
-- generators/paperclip/USAGE
+- lib/generators/paperclip/paperclip_generator.rb
+- lib/generators/paperclip/templates/paperclip_migration.rb.erb
+- lib/generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatability.rb
 - lib/paperclip/geometry.rb
@@ -99,11 +116,14 @@ files:
 - lib/paperclip/matchers/validate_attachment_size_matcher.rb
 - lib/paperclip/matchers.rb
 - lib/paperclip/processor.rb
+- lib/paperclip/railtie.rb
 - lib/paperclip/storage.rb
+- lib/paperclip/style.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
+- lib/paperclip/version.rb
 - lib/paperclip.rb
-- tasks/paperclip_tasks.rake
+- lib/tasks/paperclip.rake
 - test/attachment_test.rb
 - test/database.yml
 - test/fixtures/12k.png
@@ -125,8 +145,13 @@ files:
 - test/paperclip_test.rb
 - test/processor_test.rb
 - test/storage_test.rb
+- test/style_test.rb
 - test/thumbnail_test.rb
 - test/upfile_test.rb
+- rails/init.rb
+- generators/paperclip/paperclip_generator.rb
+- generators/paperclip/templates/paperclip_migration.rb.erb
+- generators/paperclip/USAGE
 - shoulda_macros/paperclip.rb
 has_rdoc: true
 homepage: http://www.thoughtbot.com/projects/paperclip
@@ -142,18 +167,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord