paperclip-cloudfiles 2.3.1.1.6 → 2.3.2

data/test/interpolations_test.rb

@@ -11,12 +11,12 @@ class InterpolationsTest < Test::Unit::TestCase
     end
   end
 
-  should "return the RAILS_ROOT" do
-    assert_equal RAILS_ROOT, Paperclip::Interpolations.rails_root(:attachment, :style)
+  should "return the Rails.root" do
+    assert_equal Rails.root, Paperclip::Interpolations.rails_root(:attachment, :style)
   end
 
-  should "return the RAILS_ENV" do
-    assert_equal RAILS_ENV, Paperclip::Interpolations.rails_env(:attachment, :style)
+  should "return the Rails.env" do
+    assert_equal Rails.env, Paperclip::Interpolations.rails_env(:attachment, :style)
   end
 
   should "return the class of the Interpolations module when called with no params" do

data/test/iostream_test.rb

@@ -66,7 +66,7 @@ class IOStreamTest < Test::Unit::TestCase
         name = File.basename(@file.path)
         extension = File.extname(name)
         basename = File.basename(name, extension)
-        assert_match %r[^#{Regexp.quote(basename)}.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
+        assert_match %r[^stream.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
       end
 
       should "have the Tempfile contain the same data as the file" do

data/test/matchers/have_attached_file_matcher_test.rb

@@ -8,14 +8,17 @@ class HaveAttachedFileMatcherTest < Test::Unit::TestCase
       @matcher     = self.class.have_attached_file(:avatar)
     end
 
-    should "reject a class with no attachment" do
-      assert_rejects @matcher, @dummy_class
+    context "given a class with no attachment" do
+      should_reject_dummy_class
     end
 
-    should "accept a class with an attachment" do
-      modify_table("dummies"){|d| d.string :avatar_file_name }
-      @dummy_class.has_attached_file :avatar
-      assert_accepts @matcher, @dummy_class
+    context "given a class with an attachment" do
+      setup do
+        modify_table("dummies"){|d| d.string :avatar_file_name }
+        @dummy_class.has_attached_file :avatar
+      end
+
+      should_accept_dummy_class
     end
   end
 end

data/test/matchers/validate_attachment_content_type_matcher_test.rb

@@ -14,18 +14,24 @@ class ValidateAttachmentContentTypeMatcherTest < Test::Unit::TestCase
                        rejecting(%w(audio/mp3 application/octet-stream))
     end
 
-    should "reject a class with no validation" do
-      assert_rejects @matcher, @dummy_class
+    context "given a class with no validation" do
+      should_reject_dummy_class
     end
 
-    should "reject a class with a validation that doesn't match" do
-      @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
-      assert_rejects @matcher, @dummy_class
+    context "given a class with a validation that doesn't match" do
+      setup do
+        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{audio/.*}
+      end
+
+      should_reject_dummy_class
     end
 
-    should "accept a class with a validation" do
-      @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
-      assert_accepts @matcher, @dummy_class
+    context "given a class with a matching validation" do
+      setup do
+        @dummy_class.validates_attachment_content_type :avatar, :content_type => %r{image/.*}
+      end
+
+      should_accept_dummy_class
     end
   end
 end

data/test/matchers/validate_attachment_presence_matcher_test.rb

@@ -11,13 +11,16 @@ class ValidateAttachmentPresenceMatcherTest < Test::Unit::TestCase
       @matcher     = self.class.validate_attachment_presence(:avatar)
     end
 
-    should "reject a class with no validation" do
-      assert_rejects @matcher, @dummy_class
+    context "given a class with no validation" do
+      should_reject_dummy_class
     end
 
-    should "accept a class with a validation" do
-      @dummy_class.validates_attachment_presence :avatar
-      assert_accepts @matcher, @dummy_class
+    context "given a class with a matching validation" do
+      setup do
+        @dummy_class.validates_attachment_presence :avatar
+      end
+
+      should_accept_dummy_class
     end
   end
 end

data/test/matchers/validate_attachment_size_matcher_test.rb

@@ -14,37 +14,37 @@ class ValidateAttachmentSizeMatcherTest < Test::Unit::TestCase
     context "of limited size" do
       setup{ @matcher = self.class.validate_attachment_size(:avatar).in(256..1024) }
 
-      should "reject a class with no validation" do
-        assert_rejects @matcher, @dummy_class
+      context "given a class with no validation" do
+        should_reject_dummy_class
       end
 
-      should "reject a class with a validation that's too high" do
-        @dummy_class.validates_attachment_size :avatar, :in => 256..2048
-        assert_rejects @matcher, @dummy_class
+      context "given a class with a validation that's too high" do
+        setup { @dummy_class.validates_attachment_size :avatar, :in => 256..2048 }
+        should_reject_dummy_class
       end
 
-      should "reject a class with a validation that's too low" do
-        @dummy_class.validates_attachment_size :avatar, :in => 0..1024
-        assert_rejects @matcher, @dummy_class
+      context "given a class with a validation that's too low" do
+        setup { @dummy_class.validates_attachment_size :avatar, :in => 0..1024 }
+        should_reject_dummy_class
       end
 
-      should "accept a class with a validation that matches" do
-        @dummy_class.validates_attachment_size :avatar, :in => 256..1024
-        assert_accepts @matcher, @dummy_class
+      context "given a class with a validation that matches" do
+        setup { @dummy_class.validates_attachment_size :avatar, :in => 256..1024 }
+        should_accept_dummy_class
       end
     end
 
     context "validates_attachment_size with infinite range" do
       setup{ @matcher = self.class.validate_attachment_size(:avatar) }
 
-      should "accept a class with an upper limit" do
-        @dummy_class.validates_attachment_size :avatar, :less_than => 1
-        assert_accepts @matcher, @dummy_class
+      context "given a class with an upper limit" do
+        setup { @dummy_class.validates_attachment_size :avatar, :less_than => 1 }
+        should_accept_dummy_class
       end
 
-      should "accept a class with no upper limit" do
-        @dummy_class.validates_attachment_size :avatar, :greater_than => 1
-        assert_accepts @matcher, @dummy_class
+      context "given a class with no upper limit" do
+        setup { @dummy_class.validates_attachment_size :avatar, :greater_than => 1 }
+        should_accept_dummy_class
       end
     end
   end

data/test/paperclip_test.rb

@@ -16,8 +16,8 @@ class PaperclipTest < Test::Unit::TestCase
       should "execute the right command" do
         Paperclip.expects(:path_for_command).with("convert").returns("/usr/bin/convert")
         Paperclip.expects(:bit_bucket).returns("/dev/null")
-        Paperclip.expects(:"`").with("/usr/bin/convert one.jpg two.jpg 2>/dev/null")
-        Paperclip.run("convert", "one.jpg two.jpg")
+        Paperclip.expects(:"`").with("/usr/bin/convert 'one.jpg' 'two.jpg' 2>/dev/null")
+        Paperclip.run("convert", "one.jpg", "two.jpg")
       end
     end
   end
@@ -35,43 +35,42 @@ class PaperclipTest < Test::Unit::TestCase
     should "execute the right command" do
       Paperclip.expects(:path_for_command).with("convert").returns("convert")
       Paperclip.expects(:bit_bucket).returns("/dev/null")
-      Paperclip.expects(:"`").with("convert one.jpg two.jpg 2>/dev/null")
-      Paperclip.run("convert", "one.jpg two.jpg")
+      Paperclip.expects(:"`").with("convert 'one.jpg' 'two.jpg' 2>/dev/null")
+      Paperclip.run("convert", "one.jpg", "two.jpg")
     end
   end
 
   context "Calling Paperclip.run and logging" do
-    setup do
+    should "log the command when :log_command is true" do
       Paperclip.options[:image_magick_path] = nil
       Paperclip.options[:command_path]      = nil
       Paperclip.stubs(:bit_bucket).returns("/dev/null")
-      Paperclip.stubs(:log)
-      Paperclip.stubs(:"`").with("this is the command 2>/dev/null")
-    end
-
-    should "log the command when :log_command is true" do
+      Paperclip.expects(:log).with("this 'is the command' 2>/dev/null")
+      Paperclip.expects(:"`").with("this 'is the command' 2>/dev/null")
       Paperclip.options[:log_command] = true
       Paperclip.run("this","is the command")
-      assert_received(Paperclip, :log) do |p|
-        p.with("this is the command 2>/dev/null")
-      end
-      assert_received(Paperclip, :`) do |p|
-        p.with("this is the command 2>/dev/null")
-      end
     end
 
     should "not log the command when :log_command is false" do
+      Paperclip.options[:image_magick_path] = nil
+      Paperclip.options[:command_path]      = nil
+      Paperclip.stubs(:bit_bucket).returns("/dev/null")
+      Paperclip.expects(:log).with("this 'is the command' 2>/dev/null").never
+      Paperclip.expects(:"`").with("this 'is the command' 2>/dev/null")
       Paperclip.options[:log_command] = false
       Paperclip.run("this","is the command")
-      assert_received(Paperclip, :log) do |p|
-        p.with("this is the command 2>/dev/null").never
-      end
-      assert_received(Paperclip, :`) do |p|
-        p.with("this is the command 2>/dev/null")
-      end
     end
   end
 
+  should "prevent dangerous characters in the command via quoting" do
+    Paperclip.options[:image_magick_path] = nil
+    Paperclip.options[:command_path]      = nil
+    Paperclip.options[:log_command]       = false
+    Paperclip.options[:swallow_stderr]    = false
+    Paperclip.expects(:"`").with(%q[this 'is' 'jack'\''s' '`command`' 'line!'])
+    Paperclip.run("this", "is", "jack's", "`command`", "line!")
+  end
+
   context "Paperclip.bit_bucket" do
     context "on systems without /dev/null" do
       setup do
@@ -257,11 +256,11 @@ class PaperclipTest < Test::Unit::TestCase
           end
           if validation == :presence
             should "have an error on the attachment" do
-              assert @dummy.errors.on(:avatar_file_name)
+              assert @dummy.errors[:avatar_file_name]
             end
           else
             should "not have an error on the attachment" do
-              assert_nil @dummy.errors.on(:avatar_file_name), @dummy.errors.full_messages.join(", ")
+              assert @dummy.errors[:avatar_file_name].blank?, @dummy.errors.full_messages.join(", ")
             end
           end
         end
@@ -310,7 +309,7 @@ class PaperclipTest < Test::Unit::TestCase
         end
         
         should "have a file size min/max error message" do
-          assert_match %r/between 0 and 10240 bytes/, @dummy.errors.on(:avatar_file_size)
+          assert @dummy.errors[:avatar_file_size].any?{|e| e.match %r/between 0 and 10240 bytes/ }
         end
       end
     end

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
@@ -100,7 +94,7 @@ class StorageTest < Test::Unit::TestCase
       assert_match %r{^http://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
     end
   end
-  c0045182.cdn.cloudfiles.rackspacecloud.com
+
   context "" do
     setup do
       container = mock
@@ -161,7 +155,7 @@ class StorageTest < Test::Unit::TestCase
       assert_match %r{^http://something.something.com/avatars/stringio.txt}, @dummy.avatar.url
     end
   end
-  
+
   context "Generating a url with an expiration" do
     setup do
       AWS::S3::Base.stubs(:establish_connection!)
@@ -173,17 +167,17 @@ class StorageTest < Test::Unit::TestCase
                     :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
@@ -198,11 +192,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
@@ -285,7 +276,7 @@ class StorageTest < Test::Unit::TestCase
           assert true
         end
       end
-      
+
       context "and remove" do
         setup do
           AWS::S3::S3Object.stubs(:exists?).returns(true)
@@ -376,7 +367,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
@@ -439,6 +430,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/thumbnail_test.rb

@@ -92,7 +92,7 @@ class ThumbnailTest < Test::Unit::TestCase
 
       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
@@ -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
@@ -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
@@ -187,7 +187,7 @@ class ThumbnailTest < Test::Unit::TestCase
       end
       
       should "not get resized by default" do
-        assert_no_match(/-resize/, @thumb.transformation_command)
+        assert !@thumb.transformation_command.include?("-resize")
       end
     end
   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,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-cloudfiles
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 2
   - 3
-  - 1
-  - 1
-  - 6
-  version: 2.3.1.1.6
+  - 2
+  version: 2.3.2
 platform: ruby
 authors: 
 - Jon Yurek
@@ -17,44 +16,46 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 -05:00
+date: 2010-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: jferris-mocha
+  name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
-        - 9
-        - 5
-        - 0
-        - 1241126838
-        version: 0.9.5.0.1241126838
+        version: "0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: aws-s3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -64,53 +65,59 @@ dependencies:
   name: cloudfiles
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 1
-        - 4
-        - 4
-        version: 1.4.4
+        - 0
+        version: "0"
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: active_record
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: active_support
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id007
-description: A fork of the Thoughtbot Paperclip gem/plugin, adding support for Rackspace Cloud Files.  This fork is maintained by H. Wade Minter <minter@lunenburg.org>
+description: Easy upload management for ActiveRecord with Rackspace Cloud Files support
 email: 
 - jyurek@thoughtbot.com
 - minter@lunenburg.org
@@ -182,23 +189,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord with Rackspace Cloud Files support