dm-paperclip 2.4.1 → 2.5.0

data/test/interpolations_test.rb

@@ -0,0 +1,150 @@
+require './test/helper'
+
+class InterpolationsTest < Test::Unit::TestCase
+  should "return all methods but the infrastructure when sent #all" do
+    methods = Paperclip::Interpolations.all
+    assert ! methods.include?(:[])
+    assert ! methods.include?(:[]=)
+    assert ! methods.include?(:all)
+    methods.each do |m|
+      assert Paperclip::Interpolations.respond_to?(m)
+    end
+  end
+
+  should "return the Rails.root" do
+    assert_equal Rails.root, Paperclip::Interpolations.rails_root(:attachment, :style)
+  end
+
+  should "return the Rails.env" do
+    assert_equal Rails.env, Paperclip::Interpolations.rails_env(:attachment, :style)
+  end
+
+  should "return the class of the Interpolations module when called with no params" do
+    assert_equal Module, Paperclip::Interpolations.class
+  end
+
+  should "return the class of the instance" do
+    attachment = mock
+    attachment.expects(:instance).returns(attachment)
+    attachment.expects(:class).returns("Thing")
+    assert_equal "things", Paperclip::Interpolations.class(attachment, :style)
+  end
+
+  should "return the basename of the file" do
+    attachment = mock
+    attachment.expects(:original_filename).returns("one.jpg").times(2)
+    assert_equal "one", Paperclip::Interpolations.basename(attachment, :style)
+  end
+
+  should "return the extension of the file" do
+    attachment = mock
+    attachment.expects(:original_filename).returns("one.jpg")
+    attachment.expects(:styles).returns({})
+    assert_equal "jpg", Paperclip::Interpolations.extension(attachment, :style)
+  end
+
+  should "return the extension of the file as the format if defined in the style" do
+    attachment = mock
+    attachment.expects(:original_filename).never
+    attachment.expects(:styles).returns({:style => {:format => "png"}})
+    assert_equal "png", Paperclip::Interpolations.extension(attachment, :style)
+  end
+
+  should "return the id of the attachment" do
+    attachment = mock
+    attachment.expects(:id).returns(23)
+    attachment.expects(:instance).returns(attachment)
+    assert_equal 23, Paperclip::Interpolations.id(attachment, :style)
+  end
+
+  should "return the partitioned id of the attachment" do
+    attachment = mock
+    attachment.expects(:id).returns(23)
+    attachment.expects(:instance).returns(attachment)
+    assert_equal "000/000/023", Paperclip::Interpolations.id_partition(attachment, :style)
+  end
+
+  should "return the name of the attachment" do
+    attachment = mock
+    attachment.expects(:name).returns("file")
+    assert_equal "files", Paperclip::Interpolations.attachment(attachment, :style)
+  end
+
+  should "return the style" do
+    assert_equal :style, Paperclip::Interpolations.style(:attachment, :style)
+  end
+
+  should "return the default style" do
+    attachment = mock
+    attachment.expects(:default_style).returns(:default_style)
+    assert_equal :default_style, Paperclip::Interpolations.style(attachment, nil)
+  end
+
+  should "reinterpolate :url" do
+    attachment = mock
+    attachment.expects(:url).with(:style, false).returns("1234")
+    assert_equal "1234", Paperclip::Interpolations.url(attachment, :style)
+  end
+
+  should "raise if infinite loop detcted reinterpolating :url" do
+    attachment = Object.new
+    class << attachment
+      def url(*args)
+        Paperclip::Interpolations.url(self, :style)
+      end
+    end
+    assert_raises(Paperclip::InfiniteInterpolationError){ Paperclip::Interpolations.url(attachment, :style) }
+  end
+
+  should "return the filename as basename.extension" do
+    attachment = mock
+    attachment.expects(:styles).returns({})
+    attachment.expects(:original_filename).returns("one.jpg").times(3)
+    assert_equal "one.jpg", Paperclip::Interpolations.filename(attachment, :style)
+  end
+
+  should "return the filename as basename.extension when format supplied" do
+    attachment = mock
+    attachment.expects(:styles).returns({:style => {:format => :png}})
+    attachment.expects(:original_filename).returns("one.jpg").times(2)
+    assert_equal "one.png", Paperclip::Interpolations.filename(attachment, :style)
+  end
+
+  #should "return the timestamp" do
+  #  now = Time.now
+  #  zone = 'UTC'
+  #  attachment = mock
+  #  attachment.expects(:instance_read).with(:updated_at).returns(now)
+  #  attachment.expects(:time_zone).returns(zone)
+  #  assert_equal now.in_time_zone(zone).to_s, Paperclip::Interpolations.timestamp(attachment, :style)
+  #end
+
+  should "return the timestamp" do
+    now = Time.now
+    attachment = mock
+    attachment.expects(:instance_read).with(:updated_at).returns(now)
+    assert_equal now.to_s, Paperclip::Interpolations.timestamp(attachment, :style)
+  end
+
+  should "return updated_at" do
+    attachment = mock
+    seconds_since_epoch = 1234567890
+    attachment.expects(:updated_at).returns(seconds_since_epoch)
+    assert_equal seconds_since_epoch, Paperclip::Interpolations.updated_at(attachment, :style)
+  end
+
+  should "return hash" do
+    attachment = mock
+    fake_hash = "a_wicked_secure_hash"
+    attachment.expects(:hash).returns(fake_hash)
+    assert_equal fake_hash, Paperclip::Interpolations.hash(attachment, :style)
+  end
+
+  should "call all expected interpolations with the given arguments" do
+    Paperclip::Interpolations.expects(:id).with(:attachment, :style).returns(1234)
+    Paperclip::Interpolations.expects(:attachment).with(:attachment, :style).returns("attachments")
+    Paperclip::Interpolations.expects(:notreal).never
+    value = Paperclip::Interpolations.interpolate(":notreal/:id/:attachment", :attachment, :style)
+    assert_equal ":notreal/1234/attachments", value
+  end
+end

data/test/iostream_test.rb

@@ -1,14 +1,7 @@
-require 'test/helper'
+require File.expand_path("./helper", File.dirname(__FILE__))
 
 class IOStreamTest < Test::Unit::TestCase
-  context "IOStream" do
-    should "be included in IO, File, Tempfile, and StringIO" do
-      [IO, File, Tempfile, StringIO].each do |klass|
-        assert klass.included_modules.include?(IOStream), "Not in #{klass}"
-      end
-    end
-  end
-
+  include IOStream
   context "A file" do
     setup do
       @file = File.new(File.join(File.dirname(__FILE__), "fixtures", "5k.png"), 'rb')
@@ -21,7 +14,7 @@ class IOStreamTest < Test::Unit::TestCase
       context "and given a String" do
         setup do
           FileUtils.mkdir_p(File.join(ROOT, 'tmp'))
-          assert @result = @file.stream_to(File.join(ROOT, 'tmp', 'iostream.string.test'))
+          assert @result = stream_to(@file, File.join(ROOT, 'tmp', 'iostream.string.test'))
         end
 
         should "return a File" do
@@ -38,7 +31,7 @@ class IOStreamTest < Test::Unit::TestCase
         setup do
           tempfile = Tempfile.new('iostream.test')
           tempfile.binmode
-          assert @result = @file.stream_to(tempfile)
+          assert @result = stream_to(@file, tempfile)
         end
 
         should "return a Tempfile" do
@@ -53,9 +46,9 @@ class IOStreamTest < Test::Unit::TestCase
 
     end
 
-    context "that is sent #to_tempfile" do
+    context "that is converted #to_tempfile" do
       setup do
-        assert @tempfile = @file.to_tempfile
+        assert @tempfile = to_tempfile(@file)
       end
 
       should "convert it to a Paperclip Tempfile" do
@@ -66,7 +59,7 @@ class IOStreamTest < Test::Unit::TestCase
         name = File.basename(@file.path)
         extension = File.extname(name)
         basename = File.basename(name, extension)
-        assert_match %r[^#{Regexp.quote(basename)}.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
+        assert_match %r[^stream.*?#{Regexp.quote(extension)}], File.basename(@tempfile.path)
       end
 
       should "have the Tempfile contain the same data as the file" do
@@ -75,4 +68,4 @@ class IOStreamTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/paperclip_test.rb

@@ -1,12 +1,86 @@
-require 'test/helper.rb'
+require File.expand_path("./helper", File.dirname(__FILE__))
 
 class PaperclipTest < Test::Unit::TestCase
+  context "Calling Paperclip.run" do
+    setup do
+      Paperclip.options[:image_magick_path] = nil
+      Paperclip.options[:command_path]      = nil
+      Paperclip::CommandLine.stubs(:'`')
+    end
+
+    should "execute the right command with :image_magick_path" do
+      Paperclip.options[:image_magick_path] = "/usr/bin"
+      Paperclip.expects(:log).with(includes('[DEPRECATION]'))
+      Paperclip.expects(:log).with(regexp_matches(%r{/usr/bin/convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip::CommandLine.expects(:"`").with(regexp_matches(%r{/usr/bin/convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip.run("convert", ":one :two", :one => "one.jpg", :two => "two.jpg")
+    end
+
+    should "execute the right command with :command_path" do
+      Paperclip.options[:command_path] = "/usr/bin"
+      Paperclip::CommandLine.expects(:"`").with(regexp_matches(%r{/usr/bin/convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip.run("convert", ":one :two", :one => "one.jpg", :two => "two.jpg")
+    end
+
+    should "execute the right command with no path" do
+      Paperclip::CommandLine.expects(:"`").with(regexp_matches(%r{convert ['"]one.jpg['"] ['"]two.jpg['"]}))
+      Paperclip.run("convert", ":one :two", :one => "one.jpg", :two => "two.jpg")
+    end
+
+    should "tell you the command isn't there if the shell returns 127" do
+      with_exitstatus_returning(127) do
+        assert_raises(Paperclip::CommandNotFoundError) do
+          Paperclip.run("command")
+        end
+      end
+    end
+
+    should "tell you the command isn't there if an ENOENT is raised" do
+      assert_raises(Paperclip::CommandNotFoundError) do
+        Paperclip::CommandLine.stubs(:"`").raises(Errno::ENOENT)
+        Paperclip.run("command")
+      end
+    end
+  end
+
+  context "Paperclip.each_instance_with_attachment" do
+    setup do
+      @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
+      DataMapper.finalize
+      d1 = Dummy.create(:avatar => @file)
+      d2 = Dummy.create
+      d3 = Dummy.create(:avatar => @file)
+      @expected = [d1, d3]
+    end
+    should "yield every instance of a model that has an attachment" do
+      actual = []
+      Paperclip.each_instance_with_attachment("Dummy", "avatar") do |instance|
+        actual << instance
+      end
+      assert_same_elements @expected, actual
+    end
+  end
+
+  should "raise when sent #processor and the name of a class that exists but isn't a subclass of Processor" do
+    assert_raises(Paperclip::PaperclipError){ Paperclip.processor(:attachment) }
+  end
+
+  should "raise when sent #processor and the name of a class that doesn't exist" do
+    assert_raises(NameError){ Paperclip.processor(:boogey_man) }
+  end
+
+  should "return a class when sent #processor and the name of a class under Paperclip" do
+    assert_equal ::Paperclip::Thumbnail, Paperclip.processor(:thumbnail)
+  end
+
   context "A DataMapper model with an 'avatar' attachment" do
     setup do
       rebuild_model :path => "tmp/:class/omg/:style.:extension"
-      @file = File.new(File.join(FIXTURES_DIR, "5k.png"))
+      @file = File.new(File.join(FIXTURES_DIR, "5k.png"), 'rb')
     end
 
+    teardown { @file.close }
+
     should "not error when trying to also create a 'blah' attachment" do
       assert_nothing_raised do
         Dummy.class_eval do
@@ -21,7 +95,7 @@ class PaperclipTest < Test::Unit::TestCase
         include DataMapper::Resource
         include DataMapper::Validate
         include Paperclip::Resource
-        property :id, DataMapper::Types::Serial
+        property :id, DataMapper::Property::Serial
         property :other, String
         has_attached_file :file
       end
@@ -34,30 +108,31 @@ class PaperclipTest < Test::Unit::TestCase
       assert_equal [:avatar], Dummy.attachment_definitions.keys
     end
 
-    context "that is write protected" do
-      setup do
-        Dummy.class_eval do
-          has_attached_file :image, { :protected => true }
-        end
-        @dummy = Dummy.new
-      end
+    #TODO: Check this test
+    # context "that is write protected" do
+    #   setup do
+    #     Dummy.class_eval do
+    #       has_attached_file :image, { :protected => true }
+    #     end
+    #     @dummy = Dummy.new
+    #   end
 
-      should "not assign the avatar on mass-set" do
-        @dummy.attributes = { :other => "I'm set!" } #,
-                              #:image => @file }
-        
-        assert_equal "I'm set!", @dummy.other
-        assert ! @dummy.image?
-      end
+    #   should "not assign the avatar on mass-set" do
+    #     @dummy.attributes = { :other => "I'm set!",
+    #                           :avatar => @file }
 
-      should "still allow assigment on normal set" do
-        @dummy.other  = "I'm set!"
-        @dummy.image = @file
-        
-        assert_equal "I'm set!", @dummy.other
-        assert @dummy.image?
-      end
-    end
+    #     assert_equal "I'm set!", @dummy.other
+    #     assert ! @dummy.avatar?
+    #   end
+
+    #   should "still allow assigment on normal set" do
+    #     @dummy.other  = "I'm set!"
+    #     @dummy.avatar = @file
+
+    #     assert_equal "I'm set!", @dummy.other
+    #     assert @dummy.avatar?
+    #   end
+    # end
 
     context "with a subclass" do
       setup do
@@ -66,12 +141,13 @@ class PaperclipTest < Test::Unit::TestCase
 
       should "be able to use the attachment from the subclass" do
         assert_nothing_raised do
-          @subdummy = SubDummy.create(:avatar => @file)
+          @subdummy = Dummy.create(:avatar => @file)
         end
       end
 
       should "be able to see the attachment definition from the subclass's class" do
-        assert_equal "tmp/:class/omg/:style.:extension", SubDummy.attachment_definitions[:avatar][:path]
+        assert_equal "tmp/:class/omg/:style.:extension",
+                     SubDummy.attachment_definitions[:avatar][:path]
       end
 
       teardown do
@@ -96,68 +172,145 @@ class PaperclipTest < Test::Unit::TestCase
       should "be valid" do
         assert @dummy.valid?
       end
+    end
+
+    context "a validation with an if guard clause" do
+      setup do
+        Dummy.send(:"validates_attachment_presence", :avatar, :if => lambda{|i| i.foo })
+        @dummy = Dummy.new
+        @dummy.stubs(:avatar_file_name).returns(nil)
+      end
+
+      should "attempt validation if the guard returns true" do
+        @dummy.expects(:foo).returns(true)
+        assert ! @dummy.valid?
+      end
+
+      should "not attempt validation if the guard returns false" do
+        @dummy.expects(:foo).returns(false)
+        assert @dummy.valid?
+      end
+    end
+
+    context "a validation with an unless guard clause" do
+      setup do
+        Dummy.send(:"validates_attachment_presence", :avatar, :unless => lambda{|i| i.foo })
+        @dummy = Dummy.new
+        @dummy.stubs(:avatar_file_name).returns(nil)
+      end
+
+      should "attempt validation if the guard returns true" do
+        @dummy.expects(:foo).returns(false)
+        assert ! @dummy.valid?
+      end
+
+      should "not attempt validation if the guard returns false" do
+        @dummy.expects(:foo).returns(true)
+        assert @dummy.valid?
+      end
+    end
 
-      context "then has a validation added that makes it invalid" do
+    def self.should_validate validation, options, valid_file, invalid_file
+      context "with #{validation} validation and #{options.inspect} options" do
         setup do
-          assert @dummy.save
-          Dummy.class_eval do
-            validates_attachment_content_type :avatar, :content_type => ["text/plain"]
+          rebuild_class
+          Dummy.send(:"validates_attachment_#{validation}", :avatar, options)
+          @dummy = Dummy.new
+        end
+        context "and assigning nil" do
+          setup do
+            @dummy.avatar = nil
+            @dummy.valid?
+          end
+          if validation == :presence
+            should "have an error on the attachment" do
+              assert @dummy.errors[:avatar_file_name]
+            end
+          else
+            should "not have an error on the attachment" do
+              assert Paperclip::Ext.blank?(@dummy.errors), @dummy.errors.full_messages.join(", ")
+            end
           end
-          @dummy2 = Dummy.get(@dummy.id)
         end
-
-        should "be invalid when reloaded" do
-          assert ! @dummy2.valid?, @dummy2.errors.inspect
+        context "and assigned a valid file" do
+          setup do
+            @dummy.avatar = valid_file
+            @dummy.valid?
+          end
+          should "not have an error when assigned a valid file" do
+            assert_equal 0, @dummy.errors.length, @dummy.errors.full_messages.join(", ")
+          end
         end
-
-        should "be able to call #valid? twice without having duplicate errors" do
-          @dummy2.avatar.valid?
-          first_errors = @dummy2.avatar.errors
-          @dummy2.avatar.valid?
-          assert_equal first_errors, @dummy2.avatar.errors
+        context "and assigned an invalid file" do
+          setup do
+            @dummy.avatar = invalid_file
+            @dummy.valid?
+          end
+          should "have an error when assigned a valid file" do
+            assert @dummy.errors.length > 0
+          end
         end
       end
     end
 
-    [[:presence,      nil,                             "5k.png",   nil],
+    [[:presence,      {},                              "5k.png",   nil],
      [:size,          {:in => 1..10240},               "5k.png",   "12k.png"],
-     [:size2,         {:in => 1..10240},               nil,        "12k.png"],
-     [:content_type1, {:content_type => "image/png"},  "5k.png",   "text.txt"],
-     [:content_type2, {:content_type => "text/plain"}, "text.txt", "5k.png"],
-     [:content_type3, {:content_type => %r{image/.*}}, "5k.png",   "text.txt"],
-     [:content_type4, {:content_type => "image/png"},  nil,        "text.txt"]].each do |args|
-      context "with #{args[0]} validations" do
+     [:size,          {:less_than => 10240},           "5k.png",   "12k.png"],
+     [:size,          {:greater_than => 8096},         "12k.png",  "5k.png"],
+     [:content_type,  {:content_type => "image/png"},  "5k.png",   "text.txt"],
+     [:content_type,  {:content_type => "text/plain"}, "text.txt", "5k.png"],
+     [:content_type,  {:content_type => %r{image/.*}}, "5k.png",   "text.txt"]].each do |args|
+      validation, options, valid_file, invalid_file = args
+      valid_file   &&= File.open(File.join(FIXTURES_DIR, valid_file), "rb")
+      invalid_file &&= File.open(File.join(FIXTURES_DIR, invalid_file), "rb")
+
+      should_validate validation, options, valid_file, invalid_file
+    end
+
+    context "with content_type validation and lambda message" do
+      context "and assigned an invalid file" do
         setup do
-          Dummy.class_eval do
-            send(*[:"validates_attachment_#{args[0].to_s[/[a-z_]*/]}", :avatar, args[1]].compact)
-          end
+          Dummy.send(:"validates_attachment_content_type", :avatar, :content_type => %r{image/.*}, :message => lambda { |resource, property| 'lambda content type message' })
           @dummy = Dummy.new
+          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "text.txt"), "rb")
+          @dummy.valid?
         end
 
-        context "and a valid file" do
-          setup do
-            @file = args[2] && File.new(File.join(FIXTURES_DIR, args[2]))
-          end
+        should "have a content type error message" do
+          assert [@dummy.errors[:avatar]].flatten.any?{|error| error =~ %r/lambda content type message/ }
+        end
+      end
+    end
 
-          should "not have any errors" do
-            @dummy.avatar = @file
-            assert @dummy.valid?
-            assert_equal 0, @dummy.errors.length
-          end
+    context "with size validation and less_than 10240 option" do
+      context "and assigned an invalid file" do
+        setup do
+          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240)
+          @dummy = Dummy.new
+          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
+          @dummy.valid?
         end
 
-        context "and an invalid file" do
-          setup do
-            @file = args[3] && File.new(File.join(FIXTURES_DIR, args[3]))
-          end
+        should "have a file size min/max error message" do
+          assert [@dummy.errors[:avatar]].flatten.any?{|error| error =~ %r/less than 10240 bytes/ }
+        end
+      end
+    end
 
-          should "have errors" do
-            @dummy.avatar = @file
-            assert ! @dummy.valid?
-            assert_equal 1, @dummy.errors.length
-          end
+    context "with size validation and less_than 10240 option with lambda message" do
+      context "and assigned an invalid file" do
+        setup do
+          Dummy.send(:"validates_attachment_size", :avatar, :less_than => 10240, :message => lambda { |resource, property| 'lambda between 0 and 10240 bytes' })
+          @dummy = Dummy.new
+          @dummy.avatar &&= File.open(File.join(FIXTURES_DIR, "12k.png"), "rb")
+          @dummy.valid?
+        end
+
+        should "have a file size min/max error message" do
+          assert [@dummy.errors[:avatar]].flatten.any?{|error| error =~ %r/lambda between 0 and 10240 bytes/ }
         end
       end
     end
+
   end
 end