paperclip 2.7.2 → 2.7.4

data/features/basic_integration.feature

@@ -13,6 +13,7 @@ Feature: Rails integration
       """
       has_attached_file :attachment
       """
+    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,6 +31,7 @@ Feature: Rails integration
                         :path => "/:attachment/:id/:style/:filename",
                         :s3_credentials => Rails.root.join("config/s3.yml")
       """
+    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,6 +6,7 @@ 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"
@@ -17,6 +18,7 @@ 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:
@@ -24,6 +26,7 @@ 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
@@ -44,6 +47,7 @@ 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
@@ -58,6 +62,7 @@ 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,11 +71,7 @@ Given /^I update my user view to include the attachment$/ do
 end
 
 Given /^I add this snippet to the User model:$/ do |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
+  insert_snippet_into_file("app/models/user.rb", snippet)
 end
 
 Given /^I start the rails application$/ do
@@ -113,6 +109,12 @@ 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'
@@ -157,6 +159,14 @@ 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/attachment.rb

@@ -14,6 +14,7 @@ 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",
@@ -62,6 +63,7 @@ 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
@@ -149,7 +151,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 => true}
+      default_options = {:timestamp => @options[:use_timestamp], :escape => @options[:escape_url]}
 
       if options == true || options == false # Backwards compatibility.
         @url_generator.for(style_name, default_options.merge(:timestamp => options))

data/lib/paperclip/version.rb

@@ -1,3 +1,3 @@
 module Paperclip
-  VERSION = "2.7.2" unless defined? Paperclip::VERSION
+  VERSION = "2.7.4" 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.0.2')
+  s.add_dependency('cocaine', '~> 0.3.0')
   s.add_dependency('mime-types')
 
   s.add_development_dependency('shoulda')

data/test/attachment_test.rb

@@ -95,6 +95,28 @@ 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/thumbnail_test.rb

@@ -76,6 +76,8 @@ 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
@@ -202,6 +204,8 @@ 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.2
+  version: 2.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-11-08 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.0.2
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement