paperclip 3.0.4 → 3.1.0

data/test/storage/filesystem_test.rb

@@ -19,12 +19,27 @@ class FileSystemTest < Test::Unit::TestCase
 
       should "store the original" do
         @dummy.save
-        assert File.exists?(@dummy.avatar.path)
+        assert_file_exists(@dummy.avatar.path)
       end
 
       should "store the thumbnail" do
         @dummy.save
-        assert File.exists?(@dummy.avatar.path(:thumbnail))
+        assert_file_exists(@dummy.avatar.path(:thumbnail))
+      end
+
+      should "be rewinded after flush_writes" do
+        @dummy.avatar.instance_eval "def after_flush_writes; end"
+
+        files = @dummy.avatar.queued_for_write.values
+        @dummy.save
+        assert files.none?(&:eof?), "Expect all the files to be rewinded."
+      end
+
+      should "be removed after after_flush_writes" do
+        paths = @dummy.avatar.queued_for_write.values.map(&:path)
+        @dummy.save
+        assert paths.none?{ |path| File.exists?(path) },
+          "Expect all the files to be deleted."
       end
     end
 
@@ -41,7 +56,7 @@ class FileSystemTest < Test::Unit::TestCase
       teardown { @file.close }
 
       should "store the file" do
-        assert File.exists?(@dummy.avatar.path)
+        assert_file_exists(@dummy.avatar.path)
       end
 
       should "return a replaced version for path" do

data/test/storage/fog_test.rb

@@ -111,6 +111,21 @@ class FogTest < Test::Unit::TestCase
         directory.destroy
       end
 
+      should "be rewinded after flush_writes" do
+        @dummy.avatar.instance_eval "def after_flush_writes; end"
+
+        files = @dummy.avatar.queued_for_write.values
+        @dummy.save
+        assert files.none?(&:eof?), "Expect all the files to be rewinded."
+      end
+
+      should "be removed after after_flush_writes" do
+        paths = @dummy.avatar.queued_for_write.values.map(&:path)
+        @dummy.save
+        assert paths.none?{ |path| File.exists?(path) },
+          "Expect all the files to be deleted."
+      end
+
       should "pass the content type to the Fog::Storage::AWS::Files instance" do
         Fog::Storage::AWS::Files.any_instance.expects(:create).with do |hash|
           hash[:content_type]
@@ -196,7 +211,19 @@ class FogTest < Test::Unit::TestCase
 
       context "with a valid bucket name for a subdomain" do
         should "provide an url in subdomain style" do
-          assert_match /^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
+          # The following line is the correct one when this pull request in Fog is released:
+          # https://github.com/fog/fog/pull/857
+          # assert_match /^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
+          # For now, use this passing one:
+          assert_match /^https:\/\/papercliptests.\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
+        end
+
+        should "provide an url that expires in subdomain style" do
+          # The following line is the correct one when this pull request in Fog is released:
+          # https://github.com/fog/fog/pull/857
+          # assert_match /^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
+          # For now, use this passing one:
+          assert_match /^http:\/\/papercliptests.\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
         end
       end
 
@@ -219,6 +246,10 @@ class FogTest < Test::Unit::TestCase
           assert_match /^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
         end
 
+        should "provide a url that expires in folder style" do
+          assert_match /^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
+        end
+
       end
 
       context "with a proc for a bucket name evaluating a model method" do
@@ -249,6 +280,38 @@ class FogTest < Test::Unit::TestCase
         should "provide a public url" do
           assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.url
         end
+
+      end
+
+      context "with a custom fog_host" do
+        setup do
+          rebuild_model(@options.merge(:fog_host => "http://dynamicfoghost.com"))
+          @dummy = Dummy.new
+          @dummy.avatar = @file
+          @dummy.save
+        end
+
+        should "provide a public url" do
+          assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.url
+        end
+
+        should "provide an expiring url" do
+          assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url
+        end
+
+        context "with an invalid bucket name for a subdomain" do
+          setup do
+            rebuild_model(@options.merge({:fog_directory => "this_is_invalid", :fog_host => "http://dynamicfoghost.com"}))
+            @dummy = Dummy.new
+            @dummy.avatar = @file
+            @dummy.save
+          end
+
+          should "provide an expiring url" do
+            assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url
+          end
+        end
+
       end
 
       context "with a proc for the fog_credentials evaluating a model method" do

data/test/storage/s3_test.rb

@@ -144,6 +144,22 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
+  context ":s3_protocol => :https" do
+    setup do
+      rebuild_model :storage => :s3,
+                    :s3_credentials => {},
+                    :s3_protocol => :https,
+                    :bucket => "bucket",
+                    :path => ":attachment/:basename.:extension"
+      @dummy = Dummy.new
+      @dummy.avatar = StringIO.new(".")
+    end
+
+    should "return a url based on an S3 path" do
+      assert_match %r{^https://s3.amazonaws.com/bucket/avatars/stringio.txt}, @dummy.avatar.url
+    end
+  end
+
   context ":s3_protocol => ''" do
     setup do
       rebuild_model :storage => :s3,
@@ -276,8 +292,13 @@ class S3Test < Test::Unit::TestCase
                       'secret_access_key' => "54321"
                     }
 
-      file = Paperclip.io_adapters.for(StringIO.new("."))
-      file.original_filename = "question?mark.png"
+      stringio = StringIO.new(".")
+      class << stringio
+        def original_filename
+          "question?mark.png"
+        end
+      end
+      file = Paperclip.io_adapters.for(stringio)
       @dummy = Dummy.new
       @dummy.avatar = file
       @dummy.save
@@ -564,6 +585,21 @@ class S3Test < Test::Unit::TestCase
         assert_match %r{^http://s3\.amazonaws\.com/testing/avatars/original/5k\.png}, @dummy.avatar.url
       end
 
+      should "be rewinded after flush_writes" do
+        @dummy.avatar.instance_eval "def after_flush_writes; end"
+
+        files = @dummy.avatar.queued_for_write.values.each(&:read)
+        @dummy.save
+        assert files.none?(&:eof?), "Expect all the files to be rewinded."
+      end
+
+      should "be removed after after_flush_writes" do
+        paths = @dummy.avatar.queued_for_write.values.map(&:path)
+        @dummy.save
+        assert paths.none?{ |path| File.exists?(path) },
+          "Expect all the files to be deleted."
+      end
+
       context "and saved" do
         setup do
           object = stub

data/test/tempfile_factory_test.rb

@@ -0,0 +1,13 @@
+require './test/helper'
+
+class Paperclip::TempfileFactoryTest < Test::Unit::TestCase
+  should "be able to generate a tempfile with the right name" do
+    file = subject.generate("omg.png")
+  end
+  should "be able to generate a tempfile with the right name with a tilde at the beginning" do
+    file = subject.generate("~omg.png")
+  end
+  should "be able to generate a tempfile with the right name with a tilde at the end" do
+    file = subject.generate("omg.png~")
+  end
+end

data/test/thumbnail_test.rb

@@ -234,6 +234,17 @@ class ThumbnailTest < Test::Unit::TestCase
       end
     end
 
+    context "being thumbnailed with default animated option (true)" do
+      should "call identify to check for animated images when sent #make" do
+        thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#")
+        thumb.expects(:identify).at_least_once.with do |*arg|
+          arg[0] == '-format %m :file' &&
+          arg[1][:file] == "#{File.expand_path(thumb.file.path)}[0]"
+        end
+        thumb.make
+      end
+    end
+
     context "passing a custom file geometry parser" do
       teardown do
         self.class.send(:remove_const, :GeoParser)
@@ -380,6 +391,40 @@ class ThumbnailTest < Test::Unit::TestCase
       end
     end
 
+    context "with unidentified source format" do
+      setup do
+        @unidentified_file = File.new(fixture_file("animated.unknown"), 'rb')
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "60x60")
+      end
+
+      should "create the 12 frames thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        assert_equal "60x60"*12, `#{cmd}`.chomp
+      end
+
+      should "use the -coalesce option" do
+        assert_equal @thumb.transformation_command.first, "-coalesce"
+      end
+    end
+
+    context "with no source format" do
+      setup do
+        @unidentified_file = File.new(fixture_file("animated"), 'rb')
+        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "70x70")
+      end
+
+      should "create the 12 frames thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        assert_equal "70x70"*12, `#{cmd}`.chomp
+      end
+
+      should "use the -coalesce option" do
+        assert_equal @thumb.transformation_command.first, "-coalesce"
+      end
+    end
+
     context "with animated option set to false" do
       setup do
        @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50", :animated => false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-18 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -384,6 +384,7 @@ files:
 - UPGRADING
 - cucumber/paperclip_steps.rb
 - features/basic_integration.feature
+- features/migration.feature
 - features/rake_tasks.feature
 - features/step_definitions/attachment_steps.rb
 - features/step_definitions/html_steps.rb
@@ -393,7 +394,6 @@ files:
 - features/support/env.rb
 - features/support/fakeweb.rb
 - features/support/file_helpers.rb
-- features/support/fixtures/.boot_config.rb.swo
 - features/support/fixtures/boot_config.txt
 - features/support/fixtures/gemfile.txt
 - features/support/fixtures/preinitializer.txt
@@ -403,13 +403,10 @@ files:
 - gemfiles/3.0.gemfile
 - gemfiles/3.1.gemfile
 - gemfiles/3.2.gemfile
-- images.rake
-- lib/.DS_Store
 - lib/generators/paperclip/USAGE
 - lib/generators/paperclip/paperclip_generator.rb
 - lib/generators/paperclip/templates/paperclip_migration.rb.erb
 - lib/paperclip.rb
-- lib/paperclip/.DS_Store
 - lib/paperclip/attachment.rb
 - lib/paperclip/attachment_options.rb
 - lib/paperclip/callbacks.rb
@@ -419,6 +416,7 @@ files:
 - lib/paperclip/helpers.rb
 - lib/paperclip/instance_methods.rb
 - lib/paperclip/interpolations.rb
+- lib/paperclip/io_adapters/abstract_adapter.rb
 - lib/paperclip/io_adapters/attachment_adapter.rb
 - lib/paperclip/io_adapters/file_adapter.rb
 - lib/paperclip/io_adapters/identity_adapter.rb
@@ -443,6 +441,7 @@ files:
 - lib/paperclip/storage/s3.rb
 - lib/paperclip/style.rb
 - lib/paperclip/tempfile.rb
+- lib/paperclip/tempfile_factory.rb
 - lib/paperclip/thumbnail.rb
 - lib/paperclip/url_generator.rb
 - lib/paperclip/validators.rb
@@ -459,7 +458,9 @@ files:
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
+- test/fixtures/animated
 - test/fixtures/animated.gif
+- test/fixtures/animated.unknown
 - test/fixtures/bad.png
 - test/fixtures/fog.yml
 - test/fixtures/s3.yml
@@ -472,6 +473,7 @@ files:
 - test/helper.rb
 - test/integration_test.rb
 - test/interpolations_test.rb
+- test/io_adapters/abstract_adapter_test.rb
 - test/io_adapters/attachment_adapter_test.rb
 - test/io_adapters/file_adapter_test.rb
 - test/io_adapters/identity_adapter_test.rb
@@ -496,6 +498,7 @@ files:
 - test/support/mock_interpolator.rb
 - test/support/mock_model.rb
 - test/support/mock_url_generator_builder.rb
+- test/tempfile_factory_test.rb
 - test/thumbnail_test.rb
 - test/url_generator_test.rb
 - test/validators/attachment_content_type_validator_test.rb
@@ -536,6 +539,7 @@ specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files:
 - features/basic_integration.feature
+- features/migration.feature
 - features/rake_tasks.feature
 - features/step_definitions/attachment_steps.rb
 - features/step_definitions/html_steps.rb
@@ -545,7 +549,6 @@ test_files:
 - features/support/env.rb
 - features/support/fakeweb.rb
 - features/support/file_helpers.rb
-- features/support/fixtures/.boot_config.rb.swo
 - features/support/fixtures/boot_config.txt
 - features/support/fixtures/gemfile.txt
 - features/support/fixtures/preinitializer.txt
@@ -558,7 +561,9 @@ test_files:
 - test/fixtures/12k.png
 - test/fixtures/50x50.png
 - test/fixtures/5k.png
+- test/fixtures/animated
 - test/fixtures/animated.gif
+- test/fixtures/animated.unknown
 - test/fixtures/bad.png
 - test/fixtures/fog.yml
 - test/fixtures/s3.yml
@@ -571,6 +576,7 @@ test_files:
 - test/helper.rb
 - test/integration_test.rb
 - test/interpolations_test.rb
+- test/io_adapters/abstract_adapter_test.rb
 - test/io_adapters/attachment_adapter_test.rb
 - test/io_adapters/file_adapter_test.rb
 - test/io_adapters/identity_adapter_test.rb
@@ -595,6 +601,7 @@ test_files:
 - test/support/mock_interpolator.rb
 - test/support/mock_model.rb
 - test/support/mock_url_generator_builder.rb
+- test/tempfile_factory_test.rb
 - test/thumbnail_test.rb
 - test/url_generator_test.rb
 - test/validators/attachment_content_type_validator_test.rb

data/images.rake

@@ -1,21 +0,0 @@
-namespace :images do
-  desc "Regenerate images"
-  task :regenerate => :environment do
-    require 'open-uri'
-    OpportunityPhoto.all.each do |photo|
-      begin
-        old_name = photo.image_file_name
-        new_image = open(photo.image.url(:original, escape: false))
-        class << new_image
-          def original_filename; @original_filename; end
-          def original_filename=(name); @original_filename = name; end
-        end
-        new_image.original_filename = old_name
-        photo.image = new_image
-        photo.save
-      rescue => e
-        puts "ERROR: #{e.message} while processing #{photo.id}"
-      end
-    end
-  end
-end