paperclip 2.7.5 → 2.8.0

data/NEWS

@@ -1,22 +1,3 @@
-New in 2.7.5:
-
-* Feature: :s3_host_name can be a proc
-
-New in 2.7.4:
-
-* Feature: Allow :escape_url as an option in the defaults
-* Bug fix: Correcting some PATH-based tests.
-* Compatability: Cucumber tests work for Rails 3.2.8
-
-New in 2.7.2
-
-* Bug fix: Ensured the correct cocaine version.
-* Bug fix: Fixed some tests that shouldn't have been passing.
-
-New in 2.7.1:
-
-* Bug fix: Fixed the problem with E2BIG errors and an ever-expanding path
-
 New in 2.7.0:
 
 * Bug fix: Checking the existence of a file on S3 handles all AWS errors.

data/features/basic_integration.feature

@@ -12,8 +12,8 @@ Feature: Rails integration
     Given I add this snippet to the User model:
       """
       has_attached_file :attachment
+      attr_protected
       """
-    And I add attr_accessible to a Rails 3.2 application
     And I start the rails application
     When I go to the new user page
     And I fill in "Name" with "something"
@@ -30,8 +30,8 @@ Feature: Rails integration
                         :storage => :s3,
                         :path => "/:attachment/:id/:style/:filename",
                         :s3_credentials => Rails.root.join("config/s3.yml")
+      attr_protected
       """
-    And I add attr_accessible to a Rails 3.2 application
     And I write to "config/s3.yml" with:
       """
       bucket: paperclip

data/features/rake_tasks.feature

@@ -6,7 +6,6 @@ Feature: Rake tasks
     And I run a paperclip generator to add a paperclip "attachment" to the "User" model
     And I run a migration
     And I add the paperclip rake task to a Rails 2.3 application
-    And I add attr_accessible to a Rails 3.2 application
     And I add this snippet to the User model:
       """
       has_attached_file :attachment, :path => ":rails_root/public/system/:attachment/:style/:filename"
@@ -18,7 +17,6 @@ Feature: Rake tasks
       has_attached_file :attachment, :path => ":rails_root/public/system/:attachment/:style/:filename",
                                      :styles => { :medium => "200x200#" }
       """
-    And I add attr_accessible to a Rails 3.2 application
     And I upload the fixture "5k.png"
     Then the attachment "medium/5k.png" should have a dimension of 200x200
     When I modify my attachment definition to:
@@ -26,7 +24,6 @@ Feature: Rake tasks
       has_attached_file :attachment, :path => ":rails_root/public/system/:attachment/:style/:filename",
                                      :styles => { :medium => "100x100#" }
       """
-    And I add attr_accessible to a Rails 3.2 application
     When I successfully run `bundle exec rake paperclip:refresh:thumbnails CLASS=User --trace`
     Then the attachment "original/5k.png" should exist
     And the attachment "medium/5k.png" should have a dimension of 100x100
@@ -47,7 +44,6 @@ Feature: Rake tasks
       has_attached_file :attachment, :path => ":rails_root/public/system/:attachment/:style/:filename",
                                      :styles => { :medium => "200x200#" }
       """
-    And I add attr_accessible to a Rails 3.2 application
     When I successfully run `bundle exec rake paperclip:refresh:missing_styles --trace`
     Then the attachment file "original/5k.png" should exist
     And the attachment file "medium/5k.png" should exist
@@ -62,7 +58,6 @@ Feature: Rake tasks
       has_attached_file :attachment, :path => ":rails_root/public/system/:attachment/:style/:filename"
       validates_attachment_size :attachment, :less_than => 10.kilobytes
       """
-    And I add attr_accessible to a Rails 3.2 application
     And I successfully run `bundle exec rake paperclip:clean CLASS=User --trace`
     Then the attachment file "original/5k.png" should exist
     But the attachment file "original/12k.png" should not exist

data/features/step_definitions/rails_steps.rb

@@ -71,7 +71,11 @@ Given /^I update my user view to include the attachment$/ do
 end
 
 Given /^I add this snippet to the User model:$/ do |snippet|
-  insert_snippet_into_file("app/models/user.rb", snippet)
+  file_name = "app/models/user.rb"
+  in_current_dir do
+    content = File.read(file_name)
+    File.open(file_name, 'w') { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
+  end
 end
 
 Given /^I start the rails application$/ do
@@ -109,12 +113,6 @@ Given /^I update my application to use Bundler$/ do
   end
 end
 
-Given /^I add attr_accessible to a Rails 3.2 application$/ do
-  if framework_version?("3.2")
-    insert_snippet_into_file("app/models/user.rb", "attr_accessible :attachment\n")
-  end
-end
-
 Given /^I add the paperclip rake task to a Rails 2.3 application$/ do
   if framework_version?("2.3")
     require 'fileutils'
@@ -159,14 +157,6 @@ When /^I comment out the gem "([^"]*)" from the Gemfile$/ do |gemname|
 end
 
 module FileHelpers
-  def insert_snippet_into_file(file_name, snippet)
-    in_current_dir do
-      content = File.read(file_name)
-      File.open(file_name, 'w') { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
-      content = File.read(file_name)
-    end
-  end
-
   def append_to(path, contents)
     in_current_dir do
       File.open(path, "a") do |file|

data/lib/paperclip.rb

@@ -92,14 +92,14 @@ module Paperclip
     #
     #   :swallow_stderr -> Set to true if you don't care what happens on STDERR.
     #
-    def run(cmd, arguments = "", local_options = {})
+    def run(cmd, arguments = "", interpolation_values = {}, local_options = {})
       if options[:image_magick_path]
         Paperclip.log("[DEPRECATION] :image_magick_path is deprecated and will be removed. Use :command_path instead")
       end
       command_path = options[:command_path] || options[:image_magick_path]
       Cocaine::CommandLine.path = [Cocaine::CommandLine.path, command_path].flatten.compact.uniq
       local_options = local_options.merge(:logger => logger) if logging? && (options[:log_command] || local_options[:log_command])
-      Cocaine::CommandLine.new(cmd, arguments, local_options).run
+      Cocaine::CommandLine.new(cmd, arguments, local_options).run(interpolation_values)
     end
 
     def processor(name) #:nodoc:

data/lib/paperclip/attachment.rb

@@ -14,7 +14,6 @@ module Paperclip
         :convert_options       => {},
         :default_style         => :original,
         :default_url           => "/:attachment/:style/missing.png",
-        :escape_url            => true,
         :restricted_characters => /[&$+,\/:;=?@<>\[\]\{\}\|\\\^~%# ]/,
         :hash_data             => ":class/:attachment/:id/:style/:updated_at",
         :hash_digest           => "SHA1",
@@ -63,7 +62,6 @@ module Paperclip
     # +preserve_files+ - whether to keep files on the filesystem when deleting to clearing the attachment. Defaults to false
     # +interpolator+ - the object used to interpolate filenames and URLs. Defaults to Paperclip::Interpolations
     # +url_generator+ - the object used to generate URLs, using the interpolator. Defaults to Paperclip::UrlGenerator
-    # +escape_url+ - Perform URI escaping to URLs. Defaults to true
     def initialize(name, instance, options = {})
       @name              = name
       @instance          = instance
@@ -151,7 +149,7 @@ module Paperclip
     # +#new(Paperclip::Attachment, options_hash)+
     # +#for(style_name, options_hash)+
     def url(style_name = default_style, options = {})
-      default_options = {:timestamp => @options[:use_timestamp], :escape => @options[:escape_url]}
+      default_options = {:timestamp => @options[:use_timestamp], :escape => true}
 
       if options == true || options == false # Backwards compatibility.
         @url_generator.for(style_name, default_options.merge(:timestamp => options))

data/lib/paperclip/storage/s3.rb

@@ -150,10 +150,7 @@ module Paperclip
       end
 
       def s3_host_name
-        host_name = @options[:s3_host_name]
-        host_name = host_name.call(self) if host_name.is_a?(Proc)
-
-        host_name || s3_credentials[:s3_host_name] || "s3.amazonaws.com"
+        @options[:s3_host_name] || s3_credentials[:s3_host_name] || "s3.amazonaws.com"
       end
 
       def s3_host_alias

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency('activerecord', '>= 2.3.0')
   s.add_dependency('activesupport', '>= 2.3.2')
-  s.add_dependency('cocaine', '~> 0.3.0')
+  s.add_dependency('cocaine', '>= 0.0.2')
   s.add_dependency('mime-types')
 
   s.add_development_dependency('shoulda')
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('aruba')
   s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
-  s.add_development_dependency('cocaine', '~> 0.3.0')
+  s.add_development_dependency('cocaine', '~> 0.4.0')
   s.add_development_dependency('fog')
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')

data/test/attachment_test.rb

@@ -95,28 +95,6 @@ class AttachmentTest < Test::Unit::TestCase
     assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true, :timestamp => true)
   end
 
-  should "pass the option :escape => true if :escape_url is true and :escape is not passed" do
-    mock_url_generator_builder = MockUrlGeneratorBuilder.new
-    attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :escape_url => true)
-
-    attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => true)
-  end
-
-  should "pass the option :escape => false if :escape_url is false and :escape is not passed" do
-    mock_url_generator_builder = MockUrlGeneratorBuilder.new
-    attachment = Paperclip::Attachment.new(:name,
-                                           :instance,
-                                           :url_generator => mock_url_generator_builder,
-                                           :escape_url => false)
-
-    attachment.url(:style_name)
-    assert mock_url_generator_builder.has_generated_url_with_options?(:escape => false)
-  end
-
   should "return the path based on the url by default" do
     @attachment = attachment :url => "/:class/:id/:basename"
     @model = @attachment.instance

data/test/storage/s3_test.rb

@@ -176,26 +176,6 @@ class S3Test < Test::Unit::TestCase
     end
   end
 
-  context "dynamic s3_host_name" do
-    setup do
-      rebuild_model :storage => :s3,
-                    :s3_credentials => {},
-                    :bucket => "bucket",
-                    :path => ":attachment/:basename.:extension",
-                    :s3_host_name => lambda {|a| a.instance.value }
-      @dummy = Dummy.new
-      class << @dummy
-        attr_accessor :value
-      end
-      @dummy.avatar = StringIO.new(".")
-    end
-
-    should "use s3_host_name as a proc if available" do
-      @dummy.value = "s3.something.com"
-      assert_equal "http://s3.something.com/bucket/avatars/stringio.txt", @dummy.avatar.url(:original, :timestamp => false)
-    end
-  end
-
   context "An attachment that uses S3 for storage and has styles that return different file types" do
     setup do
       rebuild_model :styles  => { :large => ['500x500#', :jpg] },

data/test/thumbnail_test.rb

@@ -76,9 +76,9 @@ class ThumbnailTest < Test::Unit::TestCase
       should "let us know when a command isn't found versus a processing error" do
         old_path = ENV['PATH']
         begin
+          ENV['PATH'] = ''
           Cocaine::CommandLine.path = ''
           Paperclip.options[:command_path] = ''
-          ENV['PATH'] = ''
           assert_raises(Paperclip::CommandNotFoundError) do
             @thumb.make
           end
@@ -204,8 +204,6 @@ class ThumbnailTest < Test::Unit::TestCase
         should "let us know when a command isn't found versus a processing error" do
           old_path = ENV['PATH']
           begin
-            Cocaine::CommandLine.path = ''
-            Paperclip.options[:command_path] = ''
             ENV['PATH'] = ''
             assert_raises(Paperclip::CommandNotFoundError) do
               @thumb.make

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -417,7 +417,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord