paperclip 3.3.1 → 3.4.0

data/test/storage/s3_test.rb

@@ -924,7 +924,7 @@ class S3Test < Test::Unit::TestCase
           object.expects(:write).with(anything,
                                       :content_type => "image/png",
                                       :acl => :public_read,
-                                      'x-amz-server-side-encryption' => 'AES256')
+                                      :server_side_encryption => 'AES256')
           @dummy.save
         end
 

data/test/style_test.rb

@@ -96,40 +96,44 @@ 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"}
-      @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
+      @style = @attachment.styles[:thumb]
     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"}
-      @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
+      @style = @attachment.styles[:thumb]
     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

data/test/thumbnail_test.rb

@@ -128,6 +128,16 @@ class ThumbnailTest < Test::Unit::TestCase
       end
     end
 
+    should 'properly crop a EXIF-rotated image' do
+      file = File.new(fixture_file('rotated.jpg'))
+      thumb = Paperclip::Thumbnail.new(file, :geometry => "50x50#")
+
+      output_file = thumb.make
+
+      command = Cocaine::CommandLine.new("identify", "-format %wx%h :file")
+      assert_equal "50x50", command.run(:file => output_file.path).strip
+    end
+
     context "being thumbnailed with source file options set" do
       setup do
         @thumb = Paperclip::Thumbnail.new(@file,
@@ -306,62 +316,6 @@ class ThumbnailTest < Test::Unit::TestCase
     end
   end
 
-  context "An image with exif orientation" do
-    setup do
-      @file = File.new(fixture_file("rotated.jpg"), 'rb')
-    end
-
-    teardown { @file.close }
-
-    context "With :auto_orient => false" do
-      setup do
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50", :auto_orient => false)
-      end
-
-      should "send the right command to convert when sent #make" do
-        @thumb.expects(:convert).with do |*arg|
-          arg[0] == ':source -resize "100x50" :dest' &&
-              arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
-        end
-        @thumb.make
-      end
-
-      should "create the thumbnail when sent #make" do
-        dst = @thumb.make
-        assert_match /75x50/, `identify "#{dst.path}"`
-      end
-
-      should "not touch the orientation information" do
-        dst = @thumb.make
-        assert_match /exif:Orientation=6/, `identify -format "%[EXIF:*]" "#{dst.path}"`
-      end
-    end
-
-    context "Without :auto_orient => false" do
-      setup do
-        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50")
-      end
-
-      should "send the right command to convert when sent #make" do
-        @thumb.expects(:convert).with do |*arg|
-          arg[0] == ':source -auto-orient -resize "100x50" :dest' &&
-              arg[1][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
-        end
-        @thumb.make
-      end
-
-      should "create the thumbnail when sent #make" do
-        dst = @thumb.make
-        assert_match /33x50/, `identify "#{dst.path}"`
-      end
-
-      should "remove the orientation information" do
-        dst = @thumb.make
-        assert_match /exif:Orientation=1/, `identify -format "%[EXIF:*]" "#{dst.path}"`
-      end
-    end
-  end
-
   context "A multipage PDF" do
     setup do
       @file = File.new(fixture_file("twopage.pdf"), 'rb')

data/test/validators/attachment_content_type_validator_test.rb

@@ -76,93 +76,189 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
     end
   end
 
-  context "with an allowed type" do
-    context "as a string" do
-      setup do
-        build_validator :content_type => "image/jpg"
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
-      end
+  context "whitelist format" do
+    context "with an allowed type" do
+      context "as a string" do
+        setup do
+          build_validator :content_type => "image/jpg"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
 
-      should "not set an error message" do
-        assert @dummy.errors[:avatar_content_type].blank?
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
-    end
 
-    context "as an regexp" do
-      setup do
-        build_validator :content_type => /^image\/.*/
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
+      context "as an regexp" do
+        setup do
+          build_validator :content_type => /^image\/.*/
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
 
-      should "not set an error message" do
-        assert @dummy.errors[:avatar_content_type].blank?
+      context "as a list" do
+        setup do
+          build_validator :content_type => ["image/png", "image/jpg", "image/jpeg"]
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
     end
 
-    context "as a list" do
-      setup do
-        build_validator :content_type => ["image/png", "image/jpg", "image/jpeg"]
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
+    context "with a disallowed type" do
+      context "as a string" do
+        setup do
+          build_validator :content_type => "image/png"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        end
       end
 
-      should "not set an error message" do
-        assert @dummy.errors[:avatar_content_type].blank?
+      context "as a regexp" do
+        setup do
+          build_validator :content_type => /^text\/.*/
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        end
+      end
+
+      context "with :message option" do
+        context "without interpolation" do
+          setup do
+            build_validator :content_type => "image/png", :message => "should be a PNG image"
+            @dummy.stubs(:avatar_content_type => "image/jpg")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should be a PNG image"
+          end
+        end
+
+        context "with interpolation" do
+          setup do
+            build_validator :content_type => "image/png", :message => "should have content type %{types}"
+            @dummy.stubs(:avatar_content_type => "image/jpg")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should have content type image/png"
+          end
+        end
       end
     end
   end
 
-  context "with a disallowed type" do
-    context "as a string" do
-      setup do
-        build_validator :content_type => "image/png"
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
-      end
+  context "blacklist format" do
+    context "with an allowed type" do
+      context "as a string" do
+        setup do
+          build_validator :not => "image/gif"
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
 
-      should "set a correct default error message" do
-        assert @dummy.errors[:avatar_content_type].present?
-        assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
-    end
 
-    context "as a regexp" do
-      setup do
-        build_validator :content_type => /^text\/.*/
-        @dummy.stubs(:avatar_content_type => "image/jpg")
-        @validator.validate(@dummy)
+      context "as an regexp" do
+        setup do
+          build_validator :not => /^text\/.*/
+          @dummy.stubs(:avatar_content_type => "image/jpg")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
 
-      should "set a correct default error message" do
-        assert @dummy.errors[:avatar_content_type].present?
-        assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+      context "as a list" do
+        setup do
+          build_validator :not => ["image/png", "image/jpg", "image/jpeg"]
+          @dummy.stubs(:avatar_content_type => "image/gif")
+          @validator.validate(@dummy)
+        end
+
+        should "not set an error message" do
+          assert @dummy.errors[:avatar_content_type].blank?
+        end
       end
     end
 
-    context "with :message option" do
-      context "without interpolation" do
+    context "with a disallowed type" do
+      context "as a string" do
         setup do
-          build_validator :content_type => "image/png", :message => "should be a PNG image"
-          @dummy.stubs(:avatar_content_type => "image/jpg")
+          build_validator :not => "image/png"
+          @dummy.stubs(:avatar_content_type => "image/png")
           @validator.validate(@dummy)
         end
 
-        should "set a correct error message" do
-          assert_includes @dummy.errors[:avatar_content_type], "should be a PNG image"
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
         end
       end
 
-      context "with interpolation" do
+      context "as a regexp" do
         setup do
-          build_validator :content_type => "image/png", :message => "should have content type %{types}"
-          @dummy.stubs(:avatar_content_type => "image/jpg")
+          build_validator :not => /^text\/.*/
+          @dummy.stubs(:avatar_content_type => "text/plain")
           @validator.validate(@dummy)
         end
 
-        should "set a correct error message" do
-          assert_includes @dummy.errors[:avatar_content_type], "should have content type image/png"
+        should "set a correct default error message" do
+          assert @dummy.errors[:avatar_content_type].present?
+          assert_includes @dummy.errors[:avatar_content_type], "is invalid"
+        end
+      end
+
+      context "with :message option" do
+        context "without interpolation" do
+          setup do
+            build_validator :not => "image/png", :message => "should not be a PNG image"
+            @dummy.stubs(:avatar_content_type => "image/png")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should not be a PNG image"
+          end
+        end
+
+        context "with interpolation" do
+          setup do
+            build_validator :not => "image/png", :message => "should not have content type %{types}"
+            @dummy.stubs(:avatar_content_type => "image/png")
+            @validator.validate(@dummy)
+          end
+
+          should "set a correct error message" do
+            assert_includes @dummy.errors[:avatar_content_type], "should not have content type image/png"
+          end
         end
       end
     end
@@ -185,8 +281,12 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
       end
     end
 
-    should "not raise arguemnt error if :content_type was given" do
+    should "not raise argument error if :content_type was given" do
       build_validator :content_type => "image/jpg"
     end
+
+    should "not raise argument error if :not was given" do
+      build_validator :not => "image/jpg"
+    end
   end
 end

metadata

@@ -1,292 +1,290 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.3.1
   prerelease: 
+  version: 3.4.0
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  name: activerecord
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  name: activemodel
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
+  name: activesupport
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: cocaine
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
+    none: false
+  name: cocaine
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: mime-types
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: shoulda
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: appraisal
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: mocha
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: aws-sdk
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
+    none: false
+  name: aws-sdk
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bourne
-  requirement: !ruby/object:Gem::Requirement
+        version: 1.2.0
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: bourne
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
+    none: false
+  name: sqlite3
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
+    none: false
+  name: cucumber
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: aruba
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: nokogiri
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: capybara
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: bundler
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: cocaine
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+    none: false
+  name: cocaine
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: fog
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -294,10 +292,11 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 1.7.0
+    none: false
+  name: fog
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -305,102 +304,103 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 1.7.0
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: pry
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: launchy
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: fakeweb
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: railties
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: actionmailer
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: actionmailer
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: Easy upload management for ActiveRecord
 email:
 - jyurek@thoughtbot.com
@@ -450,7 +450,10 @@ files:
 - lib/paperclip/callbacks.rb
 - lib/paperclip/content_type_detector.rb
 - lib/paperclip/errors.rb
+- lib/paperclip/file_command_content_type_detector.rb
 - lib/paperclip/geometry.rb
+- lib/paperclip/geometry_detector_factory.rb
+- lib/paperclip/geometry_parser_factory.rb
 - lib/paperclip/glue.rb
 - lib/paperclip/helpers.rb
 - lib/paperclip/instance_methods.rb
@@ -493,9 +496,11 @@ files:
 - paperclip.gemspec
 - shoulda_macros/paperclip.rb
 - test/attachment_options_test.rb
+- test/attachment_processing_test.rb
 - test/attachment_test.rb
 - test/content_type_detector_test.rb
 - test/database.yml
+- test/file_command_content_type_detector_test.rb
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
@@ -511,6 +516,8 @@ files:
 - test/fixtures/twopage.pdf
 - test/fixtures/uppercase.PNG
 - test/generator_test.rb
+- test/geometry_detector_test.rb
+- test/geometry_parser_test.rb
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
@@ -563,17 +570,17 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements:
 - ImageMagick
 rubyforge_project: paperclip
@@ -600,9 +607,11 @@ test_files:
 - features/support/rails.rb
 - features/support/selectors.rb
 - test/attachment_options_test.rb
+- test/attachment_processing_test.rb
 - test/attachment_test.rb
 - test/content_type_detector_test.rb
 - test/database.yml
+- test/file_command_content_type_detector_test.rb
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
@@ -618,6 +627,8 @@ test_files:
 - test/fixtures/twopage.pdf
 - test/fixtures/uppercase.PNG
 - test/generator_test.rb
+- test/geometry_detector_test.rb
+- test/geometry_parser_test.rb
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
@@ -656,4 +667,3 @@ test_files:
 - test/validators/attachment_presence_validator_test.rb
 - test/validators/attachment_size_validator_test.rb
 - test/validators_test.rb
-has_rdoc: