bulldog 0.1.1 → 0.2.0

data/spec/spec_helper.rb

@@ -16,10 +16,10 @@ ROOT = File.dirname( File.dirname(__FILE__) )
 require 'helpers/time_travel'
 require 'helpers/temporary_models'
 require 'helpers/temporary_values'
-require 'helpers/temporary_directory'
-require 'helpers/test_upload_files'
+require 'helpers/files'
 require 'helpers/image_creation'
 require 'matchers/file_operations'
+require 'macros/attachment/has_dimensions_spec'
 
 class Time
   #
@@ -68,8 +68,7 @@ Spec::Runner.configure do |config|
   config.include TimeTravel
   config.include TemporaryModels
   config.include TemporaryValues
-  config.include TemporaryDirectory
-  config.include TestUploadFiles
+  config.include Files
   config.include ImageCreation
   config.include Matchers
   config.include SpecHelper

data/spec/unit/attachment/base_spec.rb

@@ -33,7 +33,7 @@ describe Attachment::Base do
     end
 
     it "should return the path of the given style, interpolated from the path template" do
-      @thing.photo = test_image_file
+      @thing.photo = uploaded_file('test.jpg')
       @thing.stubs(:id).returns(5)
       @thing.photo.path(:original).should == original_path
       @thing.photo.path(:small).should == small_path
@@ -45,7 +45,7 @@ describe Attachment::Base do
         Thing.attachment_reflections[:photo].configure do
           path "#{spec.temporary_directory}/:style.:extension"
         end
-        @thing.photo = test_image_file
+        @thing.photo = uploaded_file('test.jpg')
       end
 
       it "should use the extension of the original file for the original style" do
@@ -62,7 +62,7 @@ describe Attachment::Base do
         Thing.attachment_reflections[:photo].configure do
           path "#{spec.temporary_directory}/:style.xyz"
         end
-        @thing.photo = test_image_file
+        @thing.photo = uploaded_file('test.jpg')
       end
 
       it "should use the extension of the path template for the original style" do
@@ -82,7 +82,7 @@ describe Attachment::Base do
       end
 
       it "should default to the attachment's default style" do
-        @thing.photo = test_image_file
+        @thing.photo = uploaded_file('test.jpg')
         @thing.photo.path.should == "/tmp/small.jpg"
       end
     end
@@ -99,7 +99,7 @@ describe Attachment::Base do
     end
 
     it "should return the url of the given style, interpolated from the url template" do
-      @thing.photo = test_image_file
+      @thing.photo = uploaded_file('test.jpg')
       @thing.photo.url(:original).should == "/assets/original.jpg"
       @thing.photo.url(:small).should == "/assets/small.jpg"
     end
@@ -111,7 +111,7 @@ describe Attachment::Base do
           path "/tmp/:style.:extension"
           url "/assets/:style.:extension"
         end
-        @thing.photo = test_image_file
+        @thing.photo = uploaded_file('test.jpg')
       end
 
       it "should use the extension of the original file for the original style" do
@@ -130,7 +130,7 @@ describe Attachment::Base do
           path "/tmp/:style.xyz"
           url "/assets/:style.xyz"
         end
-        @thing.photo = test_image_file
+        @thing.photo = uploaded_file('test.jpg')
       end
 
       it "should use the extension of the url template for the original style" do
@@ -150,7 +150,7 @@ describe Attachment::Base do
       end
 
       it "should default to the attachment's default style" do
-        @thing.photo = test_image_file
+        @thing.photo = uploaded_file('test.jpg')
         @thing.photo.url.should == "/assets/small.jpg"
       end
     end
@@ -168,22 +168,12 @@ describe Attachment::Base do
       "#{temporary_directory}/#{@thing.id}.original.jpg"
     end
 
-    def with_temporary_file(path, content)
-      FileUtils.mkdir_p File.dirname(path)
-      open(path, 'w'){|f| f.print '...'}
-      begin
-        yield path
-      ensure
-        File.delete(path)
-      end
-    end
-
     before do
-      @thing = Thing.new(:photo => test_image_file)
+      @thing = Thing.new(:photo => uploaded_file('test.jpg'))
     end
 
     it "should return the size of the file" do
-      @thing.photo.file_size.should == File.size(test_image_path)
+      @thing.photo.file_size.should == File.size("#{ROOT}/spec/data/test.jpg")
     end
   end
 
@@ -200,22 +190,12 @@ describe Attachment::Base do
       "#{temporary_directory}/#{@thing.id}.original.jpg"
     end
 
-    def with_temporary_file(path, content)
-      FileUtils.mkdir_p File.dirname(path)
-      open(path, 'w'){|f| f.print '...'}
-      begin
-        yield path
-      ensure
-        File.delete(path)
-      end
-    end
-
     before do
-      @thing = Thing.new(:photo => test_image_file)
+      @thing = Thing.new(:photo => uploaded_file('test.jpg'))
     end
 
     it "should return the original base name of the file" do
-      @thing.photo.file_name.should == File.basename(test_image_path)
+      @thing.photo.file_name.should == File.basename("#{ROOT}/spec/data/test.jpg")
     end
   end
 
@@ -245,7 +225,7 @@ describe Attachment::Base do
           context = self
         end
       end
-      thing = Thing.new(:photo => test_image_file)
+      thing = Thing.new(:photo => uploaded_file('test.jpg'))
       thing.photo.stubs(:default_processor_type).returns(:test)
       thing.photo.process(:test_event)
       context.should be_a(Processor::Test)
@@ -259,7 +239,7 @@ describe Attachment::Base do
           context = self
         end
       end
-      thing = Thing.new(:photo => test_image_file)
+      thing = Thing.new(:photo => uploaded_file('test.jpg'))
       thing.photo.process(:test_event)
       context.should be_a(Processor::Test)
     end
@@ -286,7 +266,7 @@ describe Attachment::Base do
           styles = self.styles
         end
       end
-      thing = Thing.new(:photo => test_image_file)
+      thing = Thing.new(:photo => uploaded_file('test.jpg'))
       thing.photo.process(:test_event)
       styles.should be_a(StyleSet)
       styles.map(&:name).should == [:small]
@@ -298,7 +278,7 @@ describe Attachment::Base do
           style :one
           process(:on => :event, :with => :test){}
         end
-        thing = Thing.new(:attachment => test_empty_file)
+        thing = Thing.new(:attachment => uploaded_file('empty.txt'))
         thing.attachment.process(:event).should be_true
       end
     end
@@ -309,7 +289,7 @@ describe Attachment::Base do
           style :one
           process(:on => :event, :with => :test){}
         end
-        thing = Thing.new(:attachment => test_empty_file)
+        thing = Thing.new(:attachment => uploaded_file('empty.txt'))
         thing.attachment.process(:event).should be_false
       end
     end
@@ -324,7 +304,7 @@ describe Attachment::Base do
           style :one
           process :on => :event, :with => :test
         end
-        thing = Thing.new(:attachment => test_empty_file)
+        thing = Thing.new(:attachment => uploaded_file('empty.txt'))
         lambda{thing.attachment.process!(:event)}.should raise_error(ActiveRecord::RecordInvalid)
       end
     end
@@ -335,7 +315,7 @@ describe Attachment::Base do
           style :one
           process :on => :event, :with => :test
         end
-        thing = Thing.new(:attachment => test_empty_file)
+        thing = Thing.new(:attachment => uploaded_file('empty.txt'))
         lambda{thing.attachment.process!(:event)}.should_not raise_error(ActiveRecord::RecordInvalid)
       end
     end
@@ -350,7 +330,7 @@ describe Attachment::Base do
             styles = self.styles.map(&:name)
           end
         end
-        thing = Thing.new(:attachment => test_empty_file)
+        thing = Thing.new(:attachment => uploaded_file('empty.txt'))
         thing.attachment.process!(:event, :styles => [:one])
         styles.should == [:one]
       end
@@ -365,13 +345,13 @@ describe Attachment::Base do
 
     before do
       Thing.has_attachment :photo
-      @thing = Thing.new(:photo => uploaded_file_with_content('test.jpg', "\xff\xd8"))
+      @thing = Thing.new(:photo => uploaded_file('test.jpg'))
     end
 
     it "should set the stored attributes on assignment" do
       @thing.photo_file_name.should == 'test.jpg'
-      @thing.photo_file_size.should == 2
-      @thing.photo_content_type.should =~ /image\/jpeg/
+      @thing.photo_file_size.should == File.size('spec/data/test.jpg')
+      @thing.photo_content_type.should include('image/jpeg')
     end
 
     it "should successfully roundtrip the stored attributes" do
@@ -379,8 +359,8 @@ describe Attachment::Base do
       @thing.save
       @thing = Thing.find(@thing.id)
       @thing.photo_file_name.should == 'test.jpg'
-      @thing.photo_file_size.should == 2
-      @thing.photo_content_type.should =~ /image\/jpeg/
+      @thing.photo_file_size.should == File.size('spec/data/test.jpg')
+      @thing.photo_content_type.should include('image/jpeg')
     end
   end
 end

data/spec/unit/attachment/image_spec.rb

@@ -1,199 +1,76 @@
 require 'spec_helper'
 
 describe Attachment::Image do
-  def run(command)
-    `#{command}`
-    $?.success? or
-      raise "command failed: #{command}"
-  end
-
-  describe "when file attributes are not stored" do
-    use_model_class(:Thing, :photo_file_name => :string)
-
-    describe "#dimensions" do
-      it "should return 1x1 if the file is missing" do
-        Thing.has_attachment :photo do
-          type :image
-          style :double, :size => '80x60'
-          style :filled, :size => '60x60', :filled => true
-          style :unfilled, :size => '120x120'
-          default_style :double
-        end
-        @thing = Thing.new(:photo => test_image_file)
-        @thing.save.should be_true
-        File.unlink(@thing.photo.path(:original))
-        @thing = Thing.find(@thing.id)
-        @thing.photo.is_a?(Attachment::Image)  # sanity check
-        @thing.photo.stream.missing?           # sanity check
-        @thing.photo.dimensions(:original).should == [1, 1]
-      end
-    end
-  end
+  it_should_behave_like_an_attachment_with_dimensions(
+    :type => :image,
+    :missing_dimensions => [1, 1],
+    :file_40x30 => 'test-40x30.jpg',
+    :file_20x10 => 'test-20x10.jpg'
+  )
 
-  describe "when file attributes are stored" do
-    use_model_class(:Thing,
-                    :photo_file_name => :string,
-                    :photo_width => :integer,
-                    :photo_height => :integer,
-                    :photo_aspect_ratio => :float,
-                    :photo_dimensions => :string)
+  describe "#process" do
+    use_model_class(:Thing, :attachment_file_name => :string)
 
     before do
-      Thing.has_attachment :photo do
-        style :double, :size => '80x60'
-        style :filled, :size => '60x60', :filled => true
-        style :unfilled, :size => '120x120'
-        default_style :double
-      end
-      @thing = Thing.new(:photo => test_image_file)
+      Thing.has_attachment :attachment
+      @thing = Thing.new(:attachment => uploaded_file('test.jpg'))
     end
 
-    describe "#dimensions" do
-      it "should return the width and height of the default style if no style name is given" do
-        @thing.photo.dimensions.should == [80, 60]
-      end
-
-      it "should return the width and height of the given style" do
-        @thing.photo.dimensions(:original).should == [40, 30]
-        @thing.photo.dimensions(:double).should == [80, 60]
-      end
-
-      it "should return the calculated width according to style filledness" do
-        @thing.photo.dimensions(:filled).should == [60, 60]
-        @thing.photo.dimensions(:unfilled).should == [120, 90]
-      end
-
-      describe "when an exif:Orientation header is set" do
-        before do
-          @path = create_image("#{temporary_directory}/test.jpg", :size => '40x30')
-          @rotated_path = "#{temporary_directory}/rotated-test.jpg"
-        end
-
-        attr_reader :path, :rotated_path
-
-        def set_header(value)
-          run "exif --create-exif --ifd=EXIF --tag=Orientation --set-value=#{value} --output=#{rotated_path} #{path}"
-        end
-
-        it "should not swap the dimensions if the value is between 1 and 4" do
-          (1..4).each do |value|
-            set_header value
-            open(rotated_path) do |file|
-              @thing.photo = file
-              @thing.photo.dimensions(:original).should == [40, 30]
-            end
-          end
-        end
-
-        it "should swap the dimensions if the value is between 5 and 8" do
-          (5..8).each do |value|
-            set_header value
-            open(rotated_path) do |file|
-              @thing.photo = file
-              @thing.photo.dimensions(:original).should == [30, 40]
-            end
-          end
+    it "should process with ImageMagick by default" do
+      context = nil
+      Thing.has_attachment :attachment do
+        style :output
+        process :on => :event do
+          context = self
         end
       end
 
-      it "should only invoke identify once"
-      it "should log the result"
+      @thing.attachment.process(:event)
+      context.should be_a(Processor::ImageMagick)
     end
+  end
 
-    describe "#width" do
-      it "should return the width of the default style if no style name is given" do
-        @thing.photo.width.should == 80
-      end
+  describe "when an exif:Orientation header is set" do
+    use_model_class(:Thing, :attachment_file_name => :string)
 
-      it "should return the width of the given style" do
-        @thing.photo.width(:original).should == 40
-        @thing.photo.width(:double).should == 80
-      end
+    before do
+      Thing.has_attachment :attachment
     end
 
-    describe "#height" do
-      it "should return the height of the default style if no style name is given" do
-        @thing.photo.height.should == 60
-      end
-
-      it "should return the height of the given style" do
-        @thing.photo.height(:original).should == 30
-        @thing.photo.height(:double).should == 60
-      end
+    before do
+      @path = temporary_path('test-40x30.jpg')
+      @thing = Thing.new
     end
 
-    describe "#aspect_ratio" do
-      it "should return the aspect ratio of the default style if no style name is given" do
-        @thing.photo.aspect_ratio.should be_close(4.0/3, 1e-5)
-      end
-
-      it "should return the aspect ratio of the given style" do
-        @thing.photo.aspect_ratio(:original).should be_close(4.0/3, 1e-5)
-        @thing.photo.aspect_ratio(:filled).should be_close(1, 1e-5)
-      end
+    def run(command)
+      output = `#{command} 2>&1`
+      $?.success? or
+        raise "command failed: #{command}\noutput: #{output}"
     end
 
-    describe "storable attributes" do
-      it "should set the stored attributes on assignment" do
-        @thing.photo_width.should == 40
-        @thing.photo_height.should == 30
-        @thing.photo_aspect_ratio.should be_close(4.0/3, 1e-5)
-        @thing.photo_dimensions.should == '40x30'
-      end
-
-      describe "after roundtripping through the database" do
-        before do
-          @thing.save
-          @thing = Thing.find(@thing.id)
-        end
-
-        it "should restore the stored attributes" do
-          @thing.photo_width.should == 40
-          @thing.photo_height.should == 30
-          @thing.photo_aspect_ratio.should be_close(4.0/3, 1e-5)
-          @thing.photo_dimensions.should == '40x30'
-        end
+    def set_header(path, value)
+      tmp = "#{temporary_directory}/exif-tmp.jpg"
+      run "exif --create-exif --ifd=EXIF --tag=Orientation --set-value=#{value} --output=#{tmp} #{path}"
+      File.rename(tmp, path)
+    end
 
-        it "should recalculate the dimensions correctly" do
-          @thing.photo.dimensions(:filled).should == [60, 60]
-          @thing.photo.dimensions(:unfilled).should == [120, 90]
+    it "should not swap the dimensions if the value is between 1 and 4" do
+      (1..4).each do |value|
+        set_header @path, value
+        open(@path) do |file|
+          @thing.attachment = file
+          @thing.attachment.dimensions(:original).should == [40, 30]
         end
       end
     end
 
-    describe "#reload" do
-      before do
-        thing = Thing.create(:photo => test_image_file('test.jpg'))
-        @thing = Thing.find(thing.id)
-      end
-
-      it "should update the stored attributes from the file" do
-        # Prime the cached values.
-        @thing.photo_width.should == 40
-        @thing.photo_height.should == 30
-        @thing.photo_aspect_ratio.should be_close(4.0/3, 1e-5)
-        @thing.photo_dimensions.should == '40x30'
-
-        FileUtils.cp(test_path('test2.jpg'), @thing.photo.path(:original))
-        @thing.photo.reload
-        @thing.photo_width.should == 2
-        @thing.photo_height.should == 2
-        @thing.photo_aspect_ratio.should == 1
-        @thing.photo_dimensions.should == '2x2'
-      end
-
-      it "should update the original dimensions from the file" do
-        @thing.photo.dimensions(:original).should == [40, 30]
-        FileUtils.cp(test_path('test2.jpg'), @thing.photo.path(:original))
-        @thing.photo.reload
-        @thing.photo.dimensions(:original).should == [2, 2]
-      end
-
-      it "should update the dimensions for each style from the file" do
-        @thing.photo.dimensions(:double).should == [80, 60]
-        FileUtils.cp(test_path('test2.jpg'), @thing.photo.path(:original))
-        @thing.photo.reload
-        @thing.photo.dimensions(:double).should == [60, 60]
+    it "should swap the dimensions if the value is between 5 and 8" do
+      (5..8).each do |value|
+        set_header @path, value
+        open(@path) do |file|
+          @thing.attachment = file
+          @thing.attachment.dimensions(:original).should == [30, 40]
+        end
       end
     end
   end