paperclip 3.5.2 → 3.5.3

data/test/io_adapters/abstract_adapter_test.rb

@@ -32,7 +32,7 @@ class AbstractAdapterTest < Test::Unit::TestCase
       @adapter.tempfile = stub("Tempfile")
     end
 
-    [:close, :closed?, :eof?, :path, :rewind, :unlink].each do |method|
+    [:binmode, :binmode?, :close, :close!, :closed?, :eof?, :path, :rewind, :unlink].each do |method|
       should "delegate #{method} to @tempfile" do
         @adapter.tempfile.stubs(method)
         @adapter.public_send(method)

data/test/io_adapters/attachment_adapter_test.rb

@@ -1,4 +1,5 @@
 require './test/helper'
+require 'pp'
 
 class AttachmentAdapterTest < Test::Unit::TestCase
 
@@ -19,6 +20,7 @@ class AttachmentAdapterTest < Test::Unit::TestCase
 
     teardown do
       @file.close
+      @subject.close
     end
 
     should "get the right filename" do
@@ -58,8 +60,8 @@ class AttachmentAdapterTest < Test::Unit::TestCase
 
   context "for a file with restricted characters in the name" do
     setup do
-      file_contents = File.new(fixture_file("animated.gif"))
-      @file = StringIO.new(file_contents.read)
+      file_contents = IO.read(fixture_file("animated.gif"))
+      @file = StringIO.new(file_contents)
       @file.stubs(:original_filename).returns('image:restricted.gif')
       @file.binmode
 
@@ -69,7 +71,7 @@ class AttachmentAdapterTest < Test::Unit::TestCase
     end
 
     teardown do
-      @file.close
+      @subject.close
     end
 
     should "not generate paths that include restricted characters" do
@@ -98,6 +100,7 @@ class AttachmentAdapterTest < Test::Unit::TestCase
     teardown do
       @file.close
       @thumb.close
+      @subject.close
     end
 
     should "get the original filename" do

data/test/io_adapters/data_uri_adapter_test.rb

@@ -1,6 +1,13 @@
 require './test/helper'
 
 class DataUriAdapterTest < Test::Unit::TestCase
+
+  def teardown
+    if @subject
+      @subject.close
+    end
+  end
+
   context "a new instance" do
     setup do
       @contents = "data:image/png;base64,#{original_base64_content}"

data/test/io_adapters/empty_string_adapter_test.rb

@@ -1,6 +1,7 @@
 require './test/helper'
 
 class EmptyStringAdapterTest < Test::Unit::TestCase
+
   context 'a new instance' do
     setup do
       @subject = Paperclip.io_adapters.for('')

data/test/io_adapters/file_adapter_test.rb

@@ -6,49 +6,58 @@ class FileAdapterTest < Test::Unit::TestCase
       setup do
         @file = File.new(fixture_file("5k.png"))
         @file.binmode
-        @subject = Paperclip.io_adapters.for(@file)
       end
 
-      teardown { @file.close }
-
-      should "get the right filename" do
-        assert_equal "5k.png", @subject.original_filename
+      teardown do
+        @file.close
+        @subject.close if @subject
       end
 
-      should "force binmode on tempfile" do
-        assert @subject.instance_variable_get("@tempfile").binmode?
-      end
+      context 'doing normal things' do
+        setup do
+          @subject = Paperclip.io_adapters.for(@file)
+        end
 
-      should "get the content type" do
-        assert_equal "image/png", @subject.content_type
-      end
+        should "get the right filename" do
+          assert_equal "5k.png", @subject.original_filename
+        end
 
-      should "return content type as a string" do
-        assert_kind_of String, @subject.content_type
-      end
+        should "force binmode on tempfile" do
+          assert @subject.instance_variable_get("@tempfile").binmode?
+        end
 
-      should "get the file's size" do
-        assert_equal 4456, @subject.size
-      end
+        should "get the content type" do
+          assert_equal "image/png", @subject.content_type
+        end
 
-      should "return false for a call to nil?" do
-        assert ! @subject.nil?
-      end
+        should "return content type as a string" do
+          assert_kind_of String, @subject.content_type
+        end
 
-      should "generate a MD5 hash of the contents" do
-        expected = Digest::MD5.file(@file.path).to_s
-        assert_equal expected, @subject.fingerprint
-      end
+        should "get the file's size" do
+          assert_equal 4456, @subject.size
+        end
+
+        should "return false for a call to nil?" do
+          assert ! @subject.nil?
+        end
 
-      should "read the contents of the file" do
-        expected = @file.read
-        assert expected.length > 0
-        assert_equal expected, @subject.read
+        should "generate a MD5 hash of the contents" do
+          expected = Digest::MD5.file(@file.path).to_s
+          assert_equal expected, @subject.fingerprint
+        end
+
+        should "read the contents of the file" do
+          expected = @file.read
+          assert expected.length > 0
+          assert_equal expected, @subject.read
+        end
       end
 
       context "file with multiple possible content type" do
         setup do
           MIME::Types.stubs(:type_for).returns([MIME::Type.new('image/x-png'), MIME::Type.new('image/png')])
+          @subject = Paperclip.io_adapters.for(@file)
         end
 
         should "prefer officially registered mime type" do
@@ -86,13 +95,17 @@ class FileAdapterTest < Test::Unit::TestCase
 
     context "filename with restricted characters" do
       setup do
-        file_contents = File.new(fixture_file("animated.gif"))
-        @file = StringIO.new(file_contents.read)
+        @file = File.open(fixture_file("animated.gif")) do |file|
+          StringIO.new(file.read)
+        end
         @file.stubs(:original_filename).returns('image:restricted.gif')
         @subject = Paperclip.io_adapters.for(@file)
       end
 
-      teardown { @file.close }
+      teardown do
+        @file.close
+        @subject.close
+      end
 
       should "not generate filenames that include restricted characters" do
         assert_equal 'image_restricted.gif', @subject.original_filename
@@ -109,7 +122,10 @@ class FileAdapterTest < Test::Unit::TestCase
         @subject = Paperclip.io_adapters.for(@file)
       end
 
-      teardown { @file.close }
+      teardown do
+        @file.close
+        @subject.close
+      end
 
       should "provide correct mime-type" do
         assert_match %r{.*/x-empty}, @subject.content_type

data/test/storage/fog_test.rb

@@ -309,11 +309,31 @@ 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/, @dummy.avatar.url
+          assert_match(/^https:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png/, @dummy.avatar.url)
         end
 
         should "provide an url that expires in subdomain style" do
-          assert_match /^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url
+          assert_match(/^http:\/\/papercliptests.s3.amazonaws.com\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
+        end
+      end
+
+      context "generating an expiring url" do
+        should "generate the same url when using Times and Integer offsets" do
+          rebuild_model(@options)
+          dummy = Dummy.new
+          dummy.avatar = StringIO.new('.')
+
+          assert_equal dummy.avatar.expiring_url(1234), dummy.avatar.expiring_url(Time.now + 1234)
+        end
+
+        should 'match the default url if there is no assignment' do
+          dummy = Dummy.new
+          assert_equal dummy.avatar.url, dummy.avatar.expiring_url
+        end
+
+        should 'match the default url when given a style if there is no assignment' do
+          dummy = Dummy.new
+          assert_equal dummy.avatar.url(:thumb), dummy.avatar.expiring_url(3600, :thumb)
         end
       end
 
@@ -333,11 +353,11 @@ class FogTest < Test::Unit::TestCase
         end
 
         should "provide an url in folder style" do
-          assert_match /^https:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?\d*$/, @dummy.avatar.url
+          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
+          assert_match(/^http:\/\/s3.amazonaws.com\/this_is_invalid\/avatars\/5k.png\?AWSAccessKeyId=.+$/, @dummy.avatar.expiring_url)
         end
 
       end
@@ -368,7 +388,7 @@ class FogTest < Test::Unit::TestCase
         end
 
         should "provide a public url" do
-          assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.url
+          assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.url)
         end
 
       end
@@ -382,11 +402,11 @@ class FogTest < Test::Unit::TestCase
         end
 
         should "provide a public url" do
-          assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.url
+          assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.url)
         end
 
         should "provide an expiring url" do
-          assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url
+          assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url)
         end
 
         context "with an invalid bucket name for a subdomain" do
@@ -398,7 +418,7 @@ class FogTest < Test::Unit::TestCase
           end
 
           should "provide an expiring url" do
-            assert_match /http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url
+            assert_match(/http:\/\/dynamicfoghost\.com/, @dummy.avatar.expiring_url)
           end
         end
 

data/test/storage/s3_test.rb

@@ -548,6 +548,14 @@ class S3Test < Test::Unit::TestCase
       should "return the default URL" do
         assert_equal(@dummy.avatar.url, @dummy.avatar.expiring_url)
       end
+
+      should 'generate a url for a style when a file does not exist' do
+        assert_equal(@dummy.avatar.url(:thumb), @dummy.avatar.expiring_url(3600, :thumb))
+      end
+    end
+
+    should "generate the same url when using Times and Integer offsets" do
+      assert_equal @dummy.avatar.expiring_url(1234), @dummy.avatar.expiring_url(Time.now + 1234)
     end
   end
 

data/test/tempfile_factory_test.rb

@@ -10,4 +10,8 @@ class Paperclip::TempfileFactoryTest < Test::Unit::TestCase
   should "be able to generate a tempfile with the right name with a tilde at the end" do
     file = subject.generate("omg.png~")
   end
+  should "be able to generate a tempfile from a file with a really long name" do
+    filename = "#{"longfilename" * 100}.txt"
+    file = subject.generate(filename)
+  end
 end

data/test/validators/attachment_content_type_validator_test.rb

@@ -4,6 +4,7 @@ class AttachmentContentTypeValidatorTest < Test::Unit::TestCase
   def setup
     rebuild_model
     @dummy = Dummy.new
+    super
   end
 
   def build_validator(options)

data/test/validators_test.rb

@@ -29,4 +29,33 @@ class ValidatorsTest < Test::Unit::TestCase
       assert_raise(RuntimeError){ dummy.valid? }
     end
   end
+
+  context "using the helper with a conditional" do
+    setup do
+      Dummy.validates_attachment :avatar, :presence => true,
+                                 :content_type => { :content_type => "image/jpeg" },
+                                 :size => { :in => 0..10.kilobytes },
+                                 :if => :title_present?
+    end
+
+    should "validate the attachment if title is present" do
+      Dummy.class_eval do
+        def title_present?
+          true
+        end
+      end
+      dummy = Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      assert_equal [:avatar_content_type, :avatar, :avatar_file_size], dummy.errors.keys
+    end
+
+    should "not validate attachment if tile is not present" do
+      Dummy.class_eval do
+        def title_present?
+          false
+        end
+      end
+      dummy = Dummy.new(:avatar => File.new(fixture_file("12k.png")))
+      assert_equal [], dummy.errors.keys
+    end
+  end
 end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.5.2
-  prerelease: 
+  version: 3.5.3
 platform: ruby
 authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,119 +55,104 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.7
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -206,39 +181,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -246,7 +216,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -254,23 +223,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -278,7 +244,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -286,81 +251,71 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: Easy upload management for ActiveRecord
@@ -534,35 +489,27 @@ files:
 homepage: https://github.com/thoughtbot/paperclip
 licenses:
 - MIT
-post_install_message: ! "##################################################\n#  NOTE
-  FOR UPGRADING FROM PRE-3.0 VERSION       #\n##################################################\n\nPaperclip
-  3.0 introduces a non-backward compatible change in your attachment\npath. This will
-  help to prevent attachment name clashes when you have\nmultiple attachments with
-  the same name. If you didn't alter your\nattachment's path and are using Paperclip's
-  default, you'll have to add\n`:path` and `:url` to your `has_attached_file` definition.
-  For example:\n\n    has_attached_file :avatar,\n      :path => \":rails_root/public/system/:attachment/:id/:style/:filename\",\n
-  \     :url => \"/system/:attachment/:id/:style/:filename\"\n\n"
+metadata: {}
+post_install_message: 
 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
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: File attachments as attributes for ActiveRecord
 test_files:
 - features/basic_integration.feature