paperclip 2.3.11 → 2.3.12

data/test/style_test.rb

@@ -138,4 +138,26 @@ class StyleTest < Test::Unit::TestCase
     end
 
   end
+  
+  context "A style rule with :processors supplied as procs" do
+    setup do
+      @attachment = attachment :path => ":basename.:extension",
+                               :styles => {
+                                 :foo => {
+                                   :geometry => "100x100#",
+                                   :format => :png,
+                                   :processors => lambda{|a| [:test]}
+                                  }
+                                },
+                               :processors => [:thumbnail]
+    end
+
+    should "defer processing of procs until they are needed" do
+      assert_kind_of Proc, @attachment.styles[:foo].instance_variable_get("@processors")
+    end
+
+    should "call procs when they are needed" do
+      assert_equal [:test], @attachment.styles[:foo].processors
+    end
+  end
 end

data/test/thumbnail_test.rb

@@ -73,6 +73,18 @@ class ThumbnailTest < Test::Unit::TestCase
         @thumb = Paperclip::Thumbnail.new(@file, :geometry => "100x50#")
       end
 
+      should "let us know when a command isn't found versus a processing error" do
+        old_path = ENV['PATH']
+        begin
+          ENV['PATH'] = ''
+          assert_raises(Paperclip::CommandNotFoundError) do
+            @thumb.make
+          end
+        ensure
+          ENV['PATH'] = old_path
+        end
+      end
+
       should "report its correct current and target geometries" do
         assert_equal "100x50#", @thumb.target_geometry.to_s
         assert_equal "434x66", @thumb.current_geometry.to_s
@@ -91,8 +103,10 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip::CommandLine.expects(:"`").with do |arg|
-          arg.match %r{convert ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage ["'].*?["']}
+        Paperclip.expects(:run).with do |*arg|
+          arg[0] == 'convert' &&
+          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -115,8 +129,10 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip::CommandLine.expects(:"`").with do |arg|
-          arg.match %r{convert -strip ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage ["'].*?["']}
+        Paperclip.expects(:run).with do |*arg|
+          arg[0] == 'convert' &&
+          arg[1] == '-strip :source -resize "x50" -crop "100x50+114+0" +repage :dest' &&
+          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -153,8 +169,10 @@ class ThumbnailTest < Test::Unit::TestCase
       end
 
       should "send the right command to convert when sent #make" do
-        Paperclip::CommandLine.expects(:"`").with do |arg|
-          arg.match %r{convert ["']#{File.expand_path(@thumb.file.path)}\[0\]["'] -resize ["']x50["'] -crop ["']100x50\+114\+0["'] \+repage -strip -depth 8 ["'].*?["']}
+        Paperclip.expects(:run).with do |*arg|
+          arg[0] == 'convert' &&
+          arg[1] == ':source -resize "x50" -crop "100x50+114+0" +repage -strip -depth 8 :dest' &&
+          arg[2][:source] == "#{File.expand_path(@thumb.file.path)}[0]"
         end
         @thumb.make
       end
@@ -176,6 +194,18 @@ class ThumbnailTest < Test::Unit::TestCase
             @thumb.make
           end
         end
+
+        should "let us know when a command isn't found versus a processing error" do
+          old_path = ENV['PATH']
+          begin
+            ENV['PATH'] = ''
+            assert_raises(Paperclip::CommandNotFoundError) do
+              @thumb.make
+            end
+          ensure
+            ENV['PATH'] = old_path
+          end
+        end
       end
     end
 
@@ -224,4 +254,53 @@ class ThumbnailTest < Test::Unit::TestCase
       end
     end
   end
+
+  context "An animated gif" do
+    setup do
+      @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "animated.gif"), 'rb')
+    end
+
+    teardown { @file.close }
+
+    should "start with 12 frames with size 100x100" do
+      cmd = %Q[identify -format "%wx%h" "#{@file.path}"]
+      assert_equal "100x100"*12, `#{cmd}`.chomp
+    end
+
+    context "with static output" do
+      setup do
+       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50", :format => :jpg)
+      end
+
+      should "create the single frame thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        assert_equal "50x50", `#{cmd}`.chomp
+      end
+    end
+
+    context "with animated output format" do
+      setup do
+       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50", :format => :gif)
+      end
+
+      should "create the 12 frames thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        assert_equal "50x50"*12, `#{cmd}`.chomp
+      end
+    end
+
+    context "with omitted output format" do
+      setup do
+       @thumb = Paperclip::Thumbnail.new(@file, :geometry => "50x50")
+      end
+
+      should "create the 12 frames thumbnail when sent #make" do
+        dst = @thumb.make
+        cmd = %Q[identify -format "%wx%h" "#{dst.path}"]
+        assert_equal "50x50"*12, `#{cmd}`.chomp
+      end
+    end
+  end
 end

data/test/upfile_test.rb

@@ -6,6 +6,7 @@ class UpfileTest < Test::Unit::TestCase
     %w(png)          => 'image/png',
     %w(gif)          => 'image/gif',
     %w(bmp)          => 'image/bmp',
+    %w(svg)          => 'image/svg+xml',
     %w(txt)          => 'text/plain',
     %w(htm html)     => 'text/html',
     %w(csv)          => 'text/csv',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: 
   segments: 
   - 2
   - 3
-  - 11
-  version: 2.3.11
+  - 12
+  version: 2.3.12
 platform: ruby
 authors: 
 - Jon Yurek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -04:00
+date: 2011-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,21 +51,23 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: cocaine
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 27
         segments: 
         - 0
-        version: "0"
-  type: :development
+        - 0
+        - 2
+        version: 0.0.2
+  type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: appraisal
+  name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -79,7 +81,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: appraisal
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -93,7 +95,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: aws-s3
+  name: mocha
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -107,7 +109,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: aws-s3
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -120,6 +122,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
 description: Easy upload management for ActiveRecord
 email: jyurek@thoughtbot.com
 executables: []
@@ -133,66 +149,64 @@ files:
 - LICENSE
 - Rakefile
 - init.rb
-- lib/generators/paperclip/paperclip_generator.rb
-- lib/generators/paperclip/templates/paperclip_migration.rb.erb
-- lib/generators/paperclip/USAGE
+- lib/paperclip.rb
 - lib/paperclip/attachment.rb
-- lib/paperclip/callback_compatability.rb
-- lib/paperclip/command_line.rb
+- lib/paperclip/callback_compatibility.rb
 - lib/paperclip/geometry.rb
 - lib/paperclip/interpolations.rb
 - lib/paperclip/iostream.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/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/paperclip/thumbnail.rb
 - lib/paperclip/upfile.rb
 - lib/paperclip/version.rb
-- lib/paperclip.rb
 - lib/tasks/paperclip.rake
+- 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/storage/filesystem.rb
+- lib/paperclip/storage/fog.rb
+- lib/paperclip/storage/s3.rb
+- lib/generators/paperclip/paperclip_generator.rb
+- lib/generators/paperclip/USAGE
+- lib/generators/paperclip/templates/paperclip_migration.rb.erb
 - test/attachment_test.rb
-- test/command_line_test.rb
 - test/database.yml
-- test/fixtures/12k.png
-- test/fixtures/50x50.png
-- test/fixtures/5k.png
-- test/fixtures/bad.png
-- test/fixtures/s3.yml
-- test/fixtures/text.txt
-- test/fixtures/twopage.pdf
-- test/fixtures/uppercase.PNG
 - test/fog_test.rb
 - test/geometry_test.rb
 - test/helper.rb
 - test/integration_test.rb
 - test/interpolations_test.rb
 - test/iostream_test.rb
-- 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_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
+- test/fixtures/12k.png
+- test/fixtures/50x50.png
+- test/fixtures/5k.png
+- test/fixtures/animated.gif
+- test/fixtures/bad.png
+- test/fixtures/s3.yml
+- test/fixtures/text.txt
+- test/fixtures/twopage.pdf
+- test/fixtures/uppercase.PNG
+- 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
 - generators/paperclip/paperclip_generator.rb
-- generators/paperclip/templates/paperclip_migration.rb.erb
 - generators/paperclip/USAGE
+- generators/paperclip/templates/paperclip_migration.rb.erb
 - shoulda_macros/paperclip.rb
 has_rdoc: true
-homepage: http://www.thoughtbot.com/projects/paperclip
+homepage: https://github.com/thoughtbot/paperclip
 licenses: []
 
 post_install_message: 
@@ -222,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - ImageMagick
 rubyforge_project: paperclip
-rubygems_version: 1.4.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: File attachments as attributes for ActiveRecord

data/lib/paperclip/command_line.rb

@@ -1,86 +0,0 @@
-module Paperclip
-  class CommandLine
-    class << self
-      attr_accessor :path
-    end
-
-    def initialize(binary, params = "", options = {})
-      @binary            = binary.dup
-      @params            = params.dup
-      @options           = options.dup
-      @swallow_stderr    = @options.has_key?(:swallow_stderr) ? @options.delete(:swallow_stderr) : Paperclip.options[:swallow_stderr]
-      @expected_outcodes = @options.delete(:expected_outcodes)
-      @expected_outcodes ||= [0]
-    end
-
-    def command
-      cmd = []
-      cmd << full_path(@binary)
-      cmd << interpolate(@params, @options)
-      cmd << bit_bucket if @swallow_stderr
-      cmd.join(" ")
-    end
-
-    def run
-      Paperclip.log(command)
-      begin
-        output = self.class.send(:'`', command)
-      rescue Errno::ENOENT
-        raise Paperclip::CommandNotFoundError
-      end
-      if $?.exitstatus == 127
-        raise Paperclip::CommandNotFoundError
-      end
-      unless @expected_outcodes.include?($?.exitstatus)
-        raise Paperclip::PaperclipCommandLineError, "Command '#{command}' returned #{$?.exitstatus}. Expected #{@expected_outcodes.join(", ")}"
-      end
-      output
-    end
-
-    private
-
-    def full_path(binary)
-      [self.class.path, binary].compact.join("/")
-    end
-
-    def interpolate(pattern, vars)
-      # interpolates :variables and :{variables}
-      pattern.gsub(%r#:(?:\w+|\{\w+\})#) do |match|
-        key = match[1..-1]
-        key = key[1..-2] if key[0,1] == '{'
-        if invalid_variables.include?(key)
-          raise PaperclipCommandLineError,
-            "Interpolation of #{key} isn't allowed."
-        end
-        interpolation(vars, key) || match
-      end
-    end
-
-    def invalid_variables
-      %w(expected_outcodes swallow_stderr)
-    end
-
-    def interpolation(vars, key)
-      if vars.key?(key.to_sym)
-        shell_quote(vars[key.to_sym])
-      end
-    end
-
-    def shell_quote(string)
-      return "" if string.nil? or string.blank?
-      if self.class.unix?
-        string.split("'").map{|m| "'#{m}'" }.join("\\'")
-      else
-        %{"#{string}"}
-      end
-    end
-
-    def bit_bucket
-      self.class.unix? ? "2>/dev/null" : "2>NUL"
-    end
-
-    def self.unix?
-      File.exist?("/dev/null")
-    end
-  end
-end