paperclip 3.0.3 → 3.5.1

data/test/geometry_parser_test.rb

@@ -0,0 +1,73 @@
+require './test/helper'
+
+class GeometryParserTest < Test::Unit::TestCase
+  should 'identify an image and extract its dimensions with no orientation' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '73',
+      :width => '434',
+      :modifier => nil,
+      :orientation => nil
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("434x73")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions with an empty orientation' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '73',
+      :width => '434',
+      :modifier => nil,
+      :orientation => ''
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("434x73,")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions and orientation' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '200',
+      :width => '300',
+      :modifier => nil,
+      :orientation => '6'
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("300x200,6")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions and modifier' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '64',
+      :width => '64',
+      :modifier => '#',
+      :orientation => nil
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("64x64#")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+
+  should 'identify an image and extract its dimensions, orientation, and modifier' do
+    Paperclip::Geometry.stubs(:new).with(
+      :height => '50',
+      :width => '100',
+      :modifier => '>',
+      :orientation => '7'
+    ).returns(:correct)
+    factory = Paperclip::GeometryParser.new("100x50,7>")
+
+    output = factory.make
+
+    assert_equal :correct, output
+  end
+end

data/test/geometry_test.rb

@@ -49,6 +49,30 @@ class GeometryTest < Test::Unit::TestCase
       assert_nil @geo.modifier
     end
 
+    should "recognize an EXIF orientation and not rotate with auto_orient if not necessary" do
+      geo = Paperclip::Geometry.new(:width => 1024, :height => 768, :orientation => 1)
+      assert geo
+      assert_equal 1024, geo.width
+      assert_equal 768, geo.height
+
+      geo.auto_orient
+
+      assert_equal 1024, geo.width
+      assert_equal 768, geo.height
+    end
+
+    should "recognize an EXIF orientation and rotate with auto_orient if necessary" do
+      geo = Paperclip::Geometry.new(:width => 1024, :height => 768, :orientation => 6)
+      assert geo
+      assert_equal 1024, geo.width
+      assert_equal 768, geo.height
+
+      geo.auto_orient
+
+      assert_equal 768, geo.width
+      assert_equal 1024, geo.height
+    end
+
     should "treat x and X the same in geometries" do
       @lower = Paperclip::Geometry.parse("123x456")
       @upper = Paperclip::Geometry.parse("123X456")
@@ -104,15 +128,23 @@ class GeometryTest < Test::Unit::TestCase
       file = fixture_file("5k.png")
       file = File.new(file, 'rb')
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
-      assert @geo.height > 0
-      assert @geo.width > 0
+      assert_equal 66, @geo.height
+      assert_equal 434, @geo.width
     end
 
     should "be generated from a file path" do
       file = fixture_file("5k.png")
       assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
-      assert @geo.height > 0
-      assert @geo.width > 0
+      assert_equal 66, @geo.height
+      assert_equal 434, @geo.width
+    end
+
+    should 'calculate an EXIF-rotated image dimensions from a path' do
+      file = fixture_file("rotated.jpg")
+      assert_nothing_raised{ @geo = Paperclip::Geometry.from_file(file) }
+      @geo.auto_orient
+      assert_equal 300, @geo.height
+      assert_equal 200, @geo.width
     end
 
     should "not generate from a bad file" do
@@ -202,5 +234,24 @@ class GeometryTest < Test::Unit::TestCase
         end
       end
     end
+
+    [['256x256', {'150x150!' => [150, 150], '150x150#' => [150, 150], '150x150>' => [150, 150], '150x150<' => [256, 256], '150x150' => [150, 150]}],
+     ['256x256', {'512x512!' => [512, 512], '512x512#' => [512, 512], '512x512>' => [256, 256], '512x512<' => [512, 512], '512x512' => [512, 512]}],
+     ['600x400', {'512x512!' => [512, 512], '512x512#' => [512, 512], '512x512>' => [512, 341], '512x512<' => [600, 400], '512x512' => [512, 341]}]].each do |original_size, options|
+      options.each_pair do |size, dimensions|
+        context "#{original_size} resize_to #{size}" do
+          setup do
+            @source = Paperclip::Geometry.parse original_size
+            @new_geometry = @source.resize_to size
+          end
+          should "have #{dimensions.first} width" do
+            assert_equal dimensions.first, @new_geometry.width
+          end
+          should "have #{dimensions.last} height" do
+            assert_equal dimensions.last, @new_geometry.height
+          end
+        end
+      end
+    end
   end
 end

data/test/has_attached_file_test.rb

@@ -0,0 +1,125 @@
+require './test/helper'
+require 'paperclip/has_attached_file'
+
+class HasAttachedFileTest < Test::Unit::TestCase
+  context '#define_on' do
+    should 'define a setter on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar=')
+    end
+
+    should 'define a getter on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar')
+    end
+
+    should 'define a query on the class object' do
+      assert_adding_attachment('avatar').defines_method('avatar?')
+    end
+
+    should 'define a method on the class to get all of its attachments' do
+      assert_adding_attachment('avatar').defines_class_method('attachment_definitions')
+    end
+
+    should 'flush errors as part of validations' do
+      assert_adding_attachment('avatar').defines_validation
+    end
+
+    should 'register the attachment with Paperclip::AttachmentRegistry' do
+      assert_adding_attachment('avatar').registers_attachment
+    end
+
+    should 'define an after_save callback' do
+      assert_adding_attachment('avatar').defines_callback('after_save')
+    end
+
+    should 'define a before_destroy callback' do
+      assert_adding_attachment('avatar').defines_callback('before_destroy')
+    end
+
+    should 'define an after_destroy callback' do
+      assert_adding_attachment('avatar').defines_callback('after_destroy')
+    end
+
+    should 'define the Paperclip-specific callbacks' do
+      assert_adding_attachment('avatar').defines_callback('define_paperclip_callbacks')
+    end
+  end
+
+  private
+
+  def assert_adding_attachment(attachment_name)
+    AttachmentAdder.new(attachment_name)
+  end
+
+  class AttachmentAdder
+    include Mocha::API
+    include Test::Unit::Assertions
+
+    def initialize(attachment_name)
+      @attachment_name = attachment_name
+    end
+
+    def defines_method(method_name)
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, :define_method) do |expect|
+        expect.with(method_name)
+      end
+    end
+
+    def defines_class_method(method_name)
+      a_class = stub_class
+      a_class.class.stubs(:define_method)
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, :extend) do |expect|
+        expect.with(Paperclip::HasAttachedFile::ClassMethods)
+      end
+    end
+
+    def defines_validation
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, :validates_each) do |expect|
+        expect.with(@attachment_name)
+      end
+    end
+
+    def registers_attachment
+      a_class = stub_class
+      Paperclip::AttachmentRegistry.stubs(:register)
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {size: 1})
+
+      assert_received(Paperclip::AttachmentRegistry, :register) do |expect|
+        expect.with(a_class, @attachment_name, {size: 1})
+      end
+    end
+
+    def defines_callback(callback_name)
+      a_class = stub_class
+
+      Paperclip::HasAttachedFile.define_on(a_class, @attachment_name, {})
+
+      assert_received(a_class, callback_name.to_sym)
+    end
+
+    private
+
+    def stub_class
+      stub('class',
+           validates_each: nil,
+           define_method: nil,
+           after_save: nil,
+           before_destroy: nil,
+           after_destroy: nil,
+           define_paperclip_callbacks: nil,
+           extend: nil,
+           name: 'Billy')
+    end
+  end
+end

data/test/helper.rb

@@ -2,18 +2,18 @@ require 'rubygems'
 require 'tempfile'
 require 'pathname'
 require 'test/unit'
-
-require 'shoulda'
-require 'mocha'
-require 'bourne'
-
 require 'active_record'
 require 'active_record/version'
 require 'active_support'
 require 'active_support/core_ext'
+require 'shoulda'
+require 'mocha/setup'
+require 'bourne'
+require 'shoulda/context'
 require 'mime/types'
 require 'pathname'
 require 'ostruct'
+require 'pry'
 
 puts "Testing against version #{ActiveRecord::VERSION::STRING}"
 
@@ -47,10 +47,14 @@ require './shoulda_macros/paperclip'
 
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
-ActiveRecord::Base.logger = ActiveSupport::BufferedLogger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
 ActiveRecord::Base.establish_connection(config['test'])
 Paperclip.options[:logger] = ActiveRecord::Base.logger
 
+def using_protected_attributes?
+  ActiveRecord::VERSION::MAJOR < 4
+end
+
 def require_everything_in_directory(directory_name)
   Dir[File.join(File.dirname(__FILE__), directory_name, '*')].each do |f|
     require f
@@ -103,6 +107,13 @@ def rebuild_class options = {}
   end
 end
 
+def rebuild_meta_class_of obj, options = {}
+  (class << obj; self; end).tap do |metaklass|
+    metaklass.has_attached_file :avatar, options
+    Paperclip.reset_duplicate_clash_check!
+  end
+end
+
 class FakeModel
   attr_accessor :avatar_file_name,
                 :avatar_file_size,
@@ -117,6 +128,10 @@ class FakeModel
 
   def run_paperclip_callbacks name, *args
   end
+
+  def valid?
+    errors.empty?
+  end
 end
 
 def attachment(options={})
@@ -161,7 +176,7 @@ def with_exitstatus_returning(code)
 end
 
 def fixture_file(filename)
- File.join(File.dirname(__FILE__), 'fixtures', filename)
+  File.join(File.dirname(__FILE__), 'fixtures', filename)
 end
 
 def assert_success_response(url)
@@ -177,3 +192,19 @@ def assert_not_found_response(url)
       "Expected HTTP response code 404, got #{response.code}"
   end
 end
+
+def assert_file_exists(path)
+  assert File.exists?(path), %(Expect "#{path}" to be exists.)
+end
+
+def assert_file_not_exists(path)
+  assert !File.exists?(path), %(Expect "#{path}" to not exists.)
+end
+
+def assert_frame_dimensions(range, frames)
+  frames.each_with_index do |frame, frame_index|
+    frame.split('x').each_with_index do |dimension, dimension_index |
+      assert range.include?(dimension.to_i), "Frame #{frame_index}[#{dimension_index}] should have been within #{range.inspect}, but was #{dimension}"
+    end
+  end
+end