paperclip 2.4.0 → 2.4.1

data/README.md

@@ -49,7 +49,7 @@ well with gems.
 
 Include the gem in your Gemfile:
 
-    gem "paperclip", "~> 2.3"
+    gem "paperclip", "~> 2.4"
 
 Or, if you don't use Bundler (though you probably should, even in Rails 2), with config.gem
 
@@ -57,7 +57,7 @@ Or, if you don't use Bundler (though you probably should, even in Rails 2), with
     ...
     Rails::Initializer.run do |config|
       ...
-      config.gem "paperclip", :version => "~> 2.3"
+      config.gem "paperclip", :version => "~> 2.4"
       ...
     end
 

data/Rakefile

@@ -5,6 +5,7 @@ require 'bundler/setup'
 require 'rake'
 require 'rake/testtask'
 require 'rdoc/task'
+require 'cucumber/rake/task'
 
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 require 'paperclip'
@@ -14,7 +15,7 @@ task :default => [:clean, 'appraisal:install', :all]
 
 desc 'Test the paperclip plugin under all supported Rails versions.'
 task :all do |t|
-  exec('rake appraisal test')
+  exec('rake appraisal test cucumber')
 end
 
 desc 'Test the paperclip plugin.'
@@ -24,6 +25,11 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+desc 'Run integration test'
+Cucumber::Rake::Task.new do |t|
+  t.cucumber_opts = %w{--format progress}
+end
+
 desc 'Start an IRB session with all necessary files required.'
 task :shell do |t|
   chdir File.dirname(__FILE__)

data/lib/paperclip.rb

@@ -142,7 +142,7 @@ module Paperclip
       end
     end
 
-    # Log a paperclip-specific line. Uses ActiveRecord::Base.logger
+    # Log a paperclip-specific line. This will logs to STDOUT
     # by default. Set Paperclip.options[:log] to false to turn off.
     def log message
       logger.info("[paperclip] #{message}") if logging?

data/lib/paperclip/railtie.rb

@@ -19,6 +19,8 @@ module Paperclip
     def self.insert
       ActiveRecord::Base.send(:include, Paperclip::Glue)
       File.send(:include, Paperclip::Upfile)
+
+      Paperclip.options[:logger] = defined?(ActiveRecord) ? ActiveRecord::Base.logger : Rails.logger
     end
   end
 end

data/lib/paperclip/storage/s3.rb

@@ -122,8 +122,8 @@ module Paperclip
         @bucket
       end
 
-      def s3_host_name 
-        @s3_host_name || "s3.amazonaws.com" 
+      def s3_host_name
+        @s3_host_name || "s3.amazonaws.com"
       end
 
       def set_permissions permissions
@@ -153,7 +153,7 @@ module Paperclip
         end
       end
 
-      def s3_protocol(style)
+      def s3_protocol(style = default_style)
         if @s3_protocol.is_a?(Proc)
           @s3_protocol.call(style)
         else

data/lib/paperclip/upfile.rb

@@ -25,7 +25,7 @@ module Paperclip
     def type_from_file_command
     #  On BSDs, `file` doesn't give a result code of 1 if the file doesn't exist.
       type = (self.original_filename.match(/\.(\w+)$/)[1] rescue "octet-stream").downcase
-      mime_type = (Paperclip.run("file", "-b --mime-type :file", :file => self.path).split(':').last.strip rescue "application/x-#{type}")
+      mime_type = (Paperclip.run("file", "-b --mime :file", :file => self.path).split(/[:;]\s+/)[0] rescue "application/x-#{type}")
       mime_type = "application/x-#{type}" if mime_type.match(/\(.*?\)/)
       mime_type
     end

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.4.0" unless defined? Paperclip::VERSION
+  VERSION = "2.4.1" unless defined? Paperclip::VERSION
 end

data/shoulda_macros/paperclip.rb

@@ -109,8 +109,14 @@ if defined?(ActionController::Integration::Session)
   end
 end
 
-class Factory
-  include Paperclip::Shoulda  #:nodoc:
+if defined?(FactoryGirl::Factory)
+  class FactoryGirl::Factory
+    include Paperclip::Shoulda  #:nodoc:
+  end
+else
+  class Factory
+    include Paperclip::Shoulda  #:nodoc:
+  end
 end
 
 class Test::Unit::TestCase #:nodoc:

data/test/attachment_test.rb

@@ -1060,7 +1060,7 @@ class AttachmentTest < Test::Unit::TestCase
       assert File.exists?(@path)
     end
 
-    should "not delete the file when model is destroy" do
+    should "not delete the file when model is destroyed" do
       @dummy.destroy
       assert File.exists?(@path)
     end

data/test/fixtures/text.txt

@@ -0,0 +1 @@
+paperclip!

data/test/helper.rb

@@ -48,6 +48,7 @@ FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
+Paperclip.options[:logger] = ActiveRecord::Base.logger
 
 def reset_class class_name
   ActiveRecord::Base.send(:include, Paperclip::Glue)

data/test/upfile_test.rb

@@ -24,14 +24,6 @@ class UpfileTest < Test::Unit::TestCase
 
         assert_equal content_type, file.content_type
       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
   end
 
@@ -42,4 +34,20 @@ class UpfileTest < Test::Unit::TestCase
     end
     assert_equal 'text/plain', file.content_type
   end
+
+  { '5k.png'       => 'image/png',
+    'animated.gif' => 'image/gif',
+    'text.txt'     => 'text/plain',
+    'twopage.pdf'  => 'application/pdf'
+  }.each do |filename, content_type|
+    should "return a content type of #{content_type} from a file command for file #{filename}" do
+      file = File.new(File.join(File.dirname(__FILE__), "fixtures", filename))
+      class << file
+        include Paperclip::Upfile
+      end
+
+      assert_equal content_type, file.type_from_file_command
+    end
+  end
+
 end

metadata

@@ -1,262 +1,236 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclip
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 2.4.1
   prerelease: 
-  segments: 
-  - 2
-  - 4
-  - 0
-  version: 2.4.0
 platform: ruby
-authors: 
+authors:
 - Jon Yurek
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-31 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-09-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70313204575540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  name: activerecord
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70313204575540
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70313204575020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.2
-  name: activesupport
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70313204575020
+- !ruby/object:Gem::Dependency
+  name: cocaine
+  requirement: &70313204574560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.2
-  name: cocaine
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: mime-types
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70313204574560
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: &70313204574180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: shoulda
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70313204574180
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70313204573700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: appraisal
-  prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70313204573700
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: &70313204573280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70313204573280
+- !ruby/object:Gem::Dependency
   name: mocha
+  requirement: &70313204572860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70313204572860
+- !ruby/object:Gem::Dependency
+  name: aws-s3
+  requirement: &70313204572440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70313204572440
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70313204572020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: aws-s3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70313204572020
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70313204571600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70313204571600
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &70313204571180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: sqlite3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *70313204571180
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - LICENSE
 - Rakefile
 - init.rb
-- lib/paperclip/storage/fog.rb
-- lib/paperclip/storage/s3.rb
-- lib/paperclip/storage/filesystem.rb
-- lib/paperclip/storage.rb
+- lib/generators/paperclip/paperclip_generator.rb
+- lib/generators/paperclip/templates/paperclip_migration.rb.erb
+- lib/generators/paperclip/USAGE
 - lib/paperclip/attachment.rb
 - lib/paperclip/callback_compatibility.rb
-- lib/paperclip/matchers/have_attached_file_matcher.rb
-- lib/paperclip/matchers/validate_attachment_size_matcher.rb
-- lib/paperclip/matchers/validate_attachment_presence_matcher.rb
-- lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
-- lib/paperclip/thumbnail.rb
-- lib/paperclip/processor.rb
 - lib/paperclip/geometry.rb
+- lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.rb
-- lib/paperclip/missing_attachment_styles.rb
+- lib/paperclip/matchers/have_attached_file_matcher.rb
+- lib/paperclip/matchers/validate_attachment_content_type_matcher.rb
+- lib/paperclip/matchers/validate_attachment_presence_matcher.rb
+- lib/paperclip/matchers/validate_attachment_size_matcher.rb
 - lib/paperclip/matchers.rb
-- lib/paperclip/upfile.rb
-- lib/paperclip/interpolations.rb
-- lib/paperclip/version.rb
+- lib/paperclip/missing_attachment_styles.rb
+- lib/paperclip/processor.rb
 - lib/paperclip/railtie.rb
+- lib/paperclip/storage/filesystem.rb
+- lib/paperclip/storage/fog.rb
+- lib/paperclip/storage/s3.rb
+- lib/paperclip/storage.rb
 - lib/paperclip/style.rb
-- lib/tasks/paperclip.rake
-- lib/generators/paperclip/USAGE
-- lib/generators/paperclip/paperclip_generator.rb
-- lib/generators/paperclip/templates/paperclip_migration.rb.erb
+- lib/paperclip/thumbnail.rb
+- lib/paperclip/upfile.rb
+- lib/paperclip/version.rb
 - lib/paperclip.rb
-- test/processor_test.rb
-- test/paperclip_test.rb
-- test/upfile_test.rb
-- test/paperclip_missing_attachment_styles_test.rb
-- test/matchers/have_attached_file_matcher_test.rb
-- test/matchers/validate_attachment_presence_matcher_test.rb
-- test/matchers/validate_attachment_size_matcher_test.rb
-- test/matchers/validate_attachment_content_type_matcher_test.rb
-- test/storage_test.rb
-- test/style_test.rb
-- test/fixtures/fog.yml
-- test/fixtures/s3.yml
-- test/fixtures/50x50.png
+- lib/tasks/paperclip.rake
+- test/attachment_test.rb
+- test/database.yml
 - test/fixtures/12k.png
-- test/fixtures/animated.gif
-- test/fixtures/uppercase.PNG
-- test/fixtures/twopage.pdf
-- test/fixtures/text.txt
+- test/fixtures/50x50.png
 - test/fixtures/5k.png
+- test/fixtures/animated.gif
 - test/fixtures/bad.png
-- test/geometry_test.rb
+- test/fixtures/fog.yml
+- test/fixtures/s3.yml
+- test/fixtures/text.txt
+- test/fixtures/twopage.pdf
+- test/fixtures/uppercase.PNG
 - test/fog_test.rb
-- test/attachment_test.rb
+- test/geometry_test.rb
 - test/helper.rb
-- test/interpolations_test.rb
-- test/thumbnail_test.rb
 - test/integration_test.rb
+- test/interpolations_test.rb
 - test/iostream_test.rb
-- test/database.yml
+- test/matchers/have_attached_file_matcher_test.rb
+- test/matchers/validate_attachment_content_type_matcher_test.rb
+- test/matchers/validate_attachment_presence_matcher_test.rb
+- test/matchers/validate_attachment_size_matcher_test.rb
+- test/paperclip_missing_attachment_styles_test.rb
+- test/paperclip_test.rb
+- test/processor_test.rb
+- test/storage_test.rb
+- test/style_test.rb
+- test/thumbnail_test.rb
+- test/upfile_test.rb
 - rails/init.rb
-- generators/paperclip/USAGE
 - generators/paperclip/paperclip_generator.rb
 - generators/paperclip/templates/paperclip_migration.rb.erb
+- generators/paperclip/USAGE
 - shoulda_macros/paperclip.rb
-has_rdoc: true
 homepage: https://github.com/thoughtbot/paperclip
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1991530113411237677
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord
 test_files: []
-