paperclip 3.2.1 → 3.3.0

data/NEWS

@@ -4,7 +4,7 @@ New in 3.2.0:
 * Bug fix: The rake task respects the updated_at column.
 * Bug fix: Strip newline from content type.
 * Feature: Fog file visibility can be specified per style.
-* Feature: Autonatically rotate images.
+* Feature: Automatically rotate images.
 * Feature: Reduce class-oriented programming of the attachment definitions.
 
 New in 3.1.4:

data/README.md

@@ -616,5 +616,5 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Paperclip is Copyright © 2008-2011 thoughtbot. It is free software, and may be
+Paperclip is Copyright © 2008-2012 thoughtbot. It is free software, and may be
 redistributed under the terms specified in the MIT-LICENSE file.

data/lib/paperclip/attachment.rb

@@ -294,6 +294,7 @@ module Paperclip
       saved_only_process, @options[:only_process] = @options[:only_process], style_args
       begin
         assign(self)
+        save
         instance.save
       rescue Errno::EACCES => e
         warn "#{e} - skipping file."
@@ -321,19 +322,18 @@ module Paperclip
     # "avatar_file_name" field (assuming the attachment is called avatar).
     def instance_write(attr, value)
       setter = :"#{name}_#{attr}="
-      responds = instance.respond_to?(setter)
-      self.instance_variable_set("@_#{setter.to_s.chop}", value)
-      instance.send(setter, value) if responds || attr.to_s == "file_name"
+      if instance.respond_to?(setter)
+        instance.send(setter, value)
+      end
     end
 
     # Reads the attachment-specific attribute on the instance. See instance_write
     # for more details.
     def instance_read(attr)
       getter = :"#{name}_#{attr}"
-      responds = instance.respond_to?(getter)
-      cached = self.instance_variable_get("@_#{getter}")
-      return cached if cached
-      instance.send(getter) if responds || attr.to_s == "file_name"
+      if instance.respond_to?(getter)
+        instance.send(getter)
+      end
     end
 
     private

data/lib/paperclip/helpers.rb

@@ -22,11 +22,13 @@ 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 = {})
       command_path = options[:command_path]
-      Cocaine::CommandLine.path = ( Cocaine::CommandLine.path ? [Cocaine::CommandLine.path].flatten | [command_path] : command_path )
-      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.path = [Cocaine::CommandLine.path, command_path].flatten.compact.uniq
+      if logging? && (options[:log_command] || local_options[:log_command])
+        local_options = local_options.merge(:logger => logger)
+      end
+      Cocaine::CommandLine.new(cmd, arguments, local_options).run(interpolation_values)
     end
 
     # Find all instances of the given Active Record model +klass+ with attachment +name+.
@@ -39,7 +41,11 @@ module Paperclip
 
     def class_for(class_name)
       class_name.split('::').inject(Object) do |klass, partial_class_name|
-        klass.const_defined?(partial_class_name) ? klass.const_get(partial_class_name, false) : klass.const_missing(partial_class_name)
+        if klass.const_defined?(partial_class_name)
+          klass.const_get(partial_class_name, false)
+        else
+          klass.const_missing(partial_class_name)
+        end
       end
     end
 

data/lib/paperclip/version.rb

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

data/paperclip.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activerecord', '>= 3.0.0')
   s.add_dependency('activemodel', '>= 3.0.0')
   s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('cocaine', '>= 0.0.2')
+  s.add_dependency('cocaine', '~> 0.4.0')
   s.add_dependency('mime-types')
 
   s.add_development_dependency('shoulda')
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('nokogiri')
   s.add_development_dependency('capybara')
   s.add_development_dependency('bundler')
-  s.add_development_dependency('cocaine', '~> 0.3.2')
+  s.add_development_dependency('cocaine', '~> 0.2')
   s.add_development_dependency('fog', '~> 1.4.0')
   s.add_development_dependency('pry')
   s.add_development_dependency('launchy')

data/test/attachment_test.rb

@@ -1083,16 +1083,8 @@ class AttachmentTest < Test::Unit::TestCase
       assert_nothing_raised { @dummy.avatar = @file }
     end
 
-    should "return the time when sent #avatar_updated_at" do
-      now = Time.now
-      Time.stubs(:now).returns(now)
+    should "not return the time when sent #avatar_updated_at" do
       @dummy.avatar = @file
-      assert_equal now.to_i, @dummy.avatar.updated_at.to_i
-    end
-
-    should "return nil when reloaded and sent #avatar_updated_at" do
-      @dummy.save
-      @dummy.reload
       assert_nil @dummy.avatar.updated_at
     end
 

data/test/integration_test.rb

@@ -465,7 +465,9 @@ class IntegrationTest < Test::Unit::TestCase
       setup do
         @dummy.avatar.options[:styles][:mini] = "25x25#"
         @dummy.avatar.instance_variable_set :@normalized_styles, nil
-        @dummy.avatar.reprocess! 'mini'
+        Time.stubs(:now => Time.now + 10)
+        @dummy.avatar.reprocess!
+        @dummy.reload
       end
 
       should "make all the styles accessible" do

data/test/paperclip_test.rb

@@ -33,6 +33,14 @@ class PaperclipTest < Test::Unit::TestCase
     end
   end
 
+  should 'not raise errors when doing a lot of running' do
+    Paperclip.options[:command_path] = ["/usr/local/bin"] * 1024
+    Cocaine::CommandLine.path = "/something/else"
+    100.times do |x|
+      Paperclip.run("echo", x.to_s)
+    end
+  end
+
   context "Calling Paperclip.log without options[:logger] set" do
     setup do
       Paperclip.logger = nil

data/test/thumbnail_test.rb

@@ -80,6 +80,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::Errors::CommandNotFoundError) do
             silence_stream(STDERR) do
@@ -209,6 +211,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::Errors::CommandNotFoundError) do
               silence_stream(STDERR) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -64,17 +64,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -274,7 +274,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -282,7 +282,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement