bulldog 0.1.1 → 0.2.0

data/spec/unit/attachment_spec.rb

@@ -30,7 +30,7 @@ describe Attachment do
 
       describe "when the stream is not nil" do
         before do
-          @stream = Stream.new(test_image_file)
+          @stream = Stream.new(temporary_file('test.jpg'))
         end
 
         it "should return a Base attachment" do

data/spec/unit/has_attachment_spec.rb

@@ -13,9 +13,8 @@ describe HasAttachment do
     it "should provide a query method for the attachment" do
       Thing.has_attachment :photo
       thing = Thing.new
-      file = uploaded_file
       thing.photo?.should be_false
-      thing.photo = file
+      thing.photo = uploaded_file('test.jpg')
       thing.photo?.should be_true
     end
 
@@ -71,7 +70,7 @@ describe HasAttachment do
           style :normal
           process(:on => :my_event){calls << 1}
         end
-        thing = Thing.new(:photo => uploaded_file)
+        thing = Thing.new(:photo => uploaded_file('test.jpg'))
         thing.process_attachment(:photo, :my_event)
         calls.should == [1]
       end
@@ -108,7 +107,7 @@ describe HasAttachment do
           style :normal
           process(:on => :my_event, :with => :test){context = self}
         end
-        thing = Thing.new(:photo => uploaded_file)
+        thing = Thing.new(:photo => uploaded_file('test.jpg'))
         thing.process_attachment(:photo, :my_event)
         context.should be_a(Processor::Test)
       end
@@ -120,13 +119,17 @@ describe HasAttachment do
         style :normal
         process(:on => :my_event){context = self}
       end
-      thing = Thing.new(:photo => uploaded_file)
+      thing = Thing.new(:photo => uploaded_file('test.jpg'))
       thing.process_attachment(:photo, :my_event)
       context.should be_a(Processor::Base)
     end
   end
 
   describe "object lifecycle" do
+    def test_image_file
+      uploaded_file('test.jpg')
+    end
+
     outline "building a record" do
       with_model_class :Thing do
         spec = self
@@ -200,7 +203,7 @@ describe HasAttachment do
       use_model_class(:Thing)
 
       before do
-        @file = uploaded_file('test.jpg', 'test.jpg')
+        @file = uploaded_file('test.jpg')
       end
 
       def configure(&block)
@@ -295,7 +298,7 @@ describe HasAttachment do
         describe "when the record already exists" do
           describe "when a file name is set, and the original file exists" do
             def instantiate
-              file = uploaded_file('test.jpg', 'test.jpg')
+              file = uploaded_file('test.jpg')
               thing = Thing.create(:photo => file)
               @thing = Thing.find(thing.id)
             end
@@ -304,7 +307,7 @@ describe HasAttachment do
               instantiate
               @thing.photo_file_name.should == 'test.jpg'
               @thing.photo_content_type.split(/;/).first.should == "image/jpeg"
-              @thing.photo_file_size.should == File.size(test_path('test.jpg'))
+              @thing.photo_file_size.should == File.size("#{ROOT}/spec/data/test.jpg")
             end
           end
 
@@ -323,7 +326,7 @@ describe HasAttachment do
 
           describe "when a file name is set, but the original file is missing" do
             def instantiate
-              file = uploaded_file('test.jpg', 'test.jpg')
+              file = uploaded_file('test.jpg')
               @thing = Thing.create(:photo => file)
               File.unlink(original_path)
               @thing = Thing.find(@thing.id)
@@ -333,7 +336,7 @@ describe HasAttachment do
               instantiate
               @thing.photo_file_name.should == 'test.jpg'
               @thing.photo_content_type == "image/jpeg"
-              @thing.photo_file_size.should == File.size(test_path('test.jpg'))
+              @thing.photo_file_size.should == File.size("#{ROOT}/spec/data/test.jpg")
             end
 
             describe "when the record is saved" do
@@ -357,14 +360,14 @@ describe HasAttachment do
 
           describe "when an attachment is assigned" do
             before do
-              @file = uploaded_file('test.jpg', 'test.jpg')
+              @file = uploaded_file('test.jpg')
             end
 
             it "should set the stored attributes" do
               @thing.photo = @file
               @thing.photo_file_name.should == 'test.jpg'
               @thing.photo_content_type.split(/;/).first.should == "image/jpeg"
-              @thing.photo_file_size.should == File.size(test_path('test.jpg'))
+              @thing.photo_file_size.should == File.size("#{ROOT}/spec/data/test.jpg")
             end
 
             it "should not create the original file" do
@@ -389,7 +392,7 @@ describe HasAttachment do
 
         describe "when the record exists and there is an attachment" do
           before do
-            @old_file = test_file('test.jpg')
+            @old_file = uploaded_file('test.jpg')
             thing = Thing.create(:photo => @old_file)
             @thing = Thing.find(thing.id)
           end
@@ -406,14 +409,14 @@ describe HasAttachment do
 
           describe "when a new attachment is assigned" do
             before do
-              @new_file = test_file('test.png')
+              @new_file = uploaded_file('test.png')
             end
 
             it "should set the stored attributes" do
               @thing.photo = @new_file
               @thing.photo_file_name.should == 'test.png'
               @thing.photo_content_type.split(/;/).first.should == 'image/png'
-              @thing.photo_file_size.should == File.size(test_path('test.png'))
+              @thing.photo_file_size.should == File.size("#{ROOT}/spec/data/test.png")
             end
 
             it "should not create the new original file yet" do
@@ -499,7 +502,7 @@ describe HasAttachment do
       describe "#destroy" do
         describe "when the record is new" do
           before do
-            file = uploaded_file('test.jpg', 'test.jpg')
+            file = uploaded_file('test.jpg')
             @thing = Thing.new(:photo => file)
           end
 
@@ -526,7 +529,7 @@ describe HasAttachment do
 
         describe "when the record existed and had an attachment" do
           before do
-            file = uploaded_file('test.jpg', 'test.jpg')
+            file = uploaded_file('test.jpg')
             thing = Thing.create(:photo => file)
             @thing = Thing.find(thing.id)
           end
@@ -567,7 +570,7 @@ describe HasAttachment do
       Thing.has_attachment :photo do
         path "#{spec.temporary_directory}/:id.jpg"
       end
-      thing = Thing.create(:name => 'old', :photo => uploaded_file)
+      thing = Thing.create(:name => 'old', :photo => uploaded_file('test.jpg'))
       @thing = Thing.find(thing.id)
     end
 
@@ -586,7 +589,7 @@ describe HasAttachment do
       end
 
       it "should return true if a new value has been assigned to the attachment" do
-        @thing.photo = uploaded_file
+        @thing.photo = uploaded_file('test.jpg')
         @thing.photo_changed?.should be_true
       end
     end
@@ -599,7 +602,7 @@ describe HasAttachment do
 
       it "should return a clone of the original value after assignment" do
         original_photo = @thing.photo
-        @thing.photo = uploaded_file
+        @thing.photo = uploaded_file('test.jpg')
         @thing.photo_was.should_not equal(original_photo)
         @thing.photo_was.should == original_photo
       end
@@ -609,7 +612,7 @@ describe HasAttachment do
       it "should return attachment changes along with other attribute changes" do
         old_photo = @thing.photo
         @thing.name = 'new'
-        @thing.photo = uploaded_file
+        @thing.photo = uploaded_file('test.jpg')
         @thing.changes.should == {
           'name' => ['old', 'new'],
           'photo' => [old_photo, @thing.photo],
@@ -619,7 +622,7 @@ describe HasAttachment do
 
     describe "when the record is saved and only attachments have been modified" do
       before do
-        @thing.photo = uploaded_file
+        @thing.photo = uploaded_file('test.jpg')
       end
 
       it "should not hit the database"
@@ -634,7 +637,7 @@ describe HasAttachment do
     describe "#save" do
       before do
         @thing.name = 'new'
-        @thing.photo = uploaded_file
+        @thing.photo = uploaded_file('test.jpg')
       end
 
       it "should clear all changes" do
@@ -674,7 +677,7 @@ describe HasAttachment do
 
         describe "when a file was assigned to the attachment" do
           it "should update ATTACHMENT_updated_at" do
-            @thing.photo = uploaded_file
+            @thing.photo = uploaded_file('test.jpg')
             @thing.save.should be_true
             @thing.photo_updated_at.should == Time.now
           end
@@ -683,7 +686,7 @@ describe HasAttachment do
 
       describe "when the record already exists" do
         before do
-          thing = Thing.create(:photo => uploaded_file('test.jpg', 'test.jpg'))
+          thing = Thing.create(:photo => uploaded_file('test.jpg'))
           @thing = Thing.find(thing.id)
         end
 
@@ -699,7 +702,7 @@ describe HasAttachment do
         describe "when a new file was assigned to the attachment" do
           it "should update ATTACHMENT_updated_at" do
             warp_ahead 1.minute
-            @thing.photo = uploaded_file('test.jpg', 'test.jpg')
+            @thing.photo = uploaded_file('test.jpg')
             @thing.save.should be_true
             @thing.photo_updated_at.should == Time.now
           end

data/spec/unit/interpolation_spec.rb

@@ -43,7 +43,7 @@ describe Interpolation do
           style :small
           store_attributes :file_name => nil
         end
-        @thing = Thing.new(:photo => test_image_file('test.jpg'))
+        @thing = Thing.new(:photo => uploaded_file('test.jpg'))
         @style = Thing.attachment_reflections[:photo].styles[:small]
       end
 
@@ -132,7 +132,7 @@ describe Interpolation do
           store_attributes :file_name => :photo_file_name
         end
 
-        @thing = Thing.new(:photo => test_image_file('test.jpg'))
+        @thing = Thing.new(:photo => uploaded_file('test.jpg'))
         @style = Thing.attachment_reflections[:photo].styles[:small]
       end
 

data/spec/unit/processor/ffmpeg_spec.rb

@@ -17,7 +17,7 @@ describe Processor::Ffmpeg do
       end
     end
 
-    thing = Thing.create(:video => test_video_file('test.mov'))
+    thing = Thing.create(:video => uploaded_file('test.mov'))
     @thing = Thing.find(thing.id)
   end
 
@@ -187,9 +187,9 @@ describe Processor::Ffmpeg do
 
       describe "when the frame attachment already exists" do
         before do
-          thing = Thing.create(:frame => test_image_file('test.jpg'))
+          thing = Thing.create(:frame => uploaded_file('test.jpg'))
           @thing = Thing.find(thing.id)
-          @thing.video = test_video_file('test.mov')
+          @thing.video = uploaded_file('test.mov')
           @thing.video.stubs(:duration).returns(1)
         end
 

data/spec/unit/processor/image_magick_spec.rb

@@ -8,7 +8,7 @@ describe Processor::ImageMagick do
     Thing.has_attachment :attachment do
       path "#{spec.temporary_directory}/attachment.:style.:extension"
     end
-    thing = Thing.create(:attachment => test_image_file('test.jpg'))
+    thing = Thing.create(:attachment => uploaded_file('test.jpg'))
     @thing = Thing.find(thing.id)
   end
 

data/spec/unit/processor/one_shot_spec.rb

@@ -5,7 +5,7 @@ describe Processor::OneShot do
 
   before do
     Thing.has_attachment :attachment
-    @thing = Thing.create(:attachment => test_empty_file)
+    @thing = Thing.create(:attachment => uploaded_file('empty.txt'))
   end
 
   def configure(&block)

data/spec/unit/stream_spec.rb

@@ -93,8 +93,8 @@ describe Stream do
         end
 
         it "should make #content_type return the new content type of the file" do
-          jpg_data = File.read(test_path('test.jpg'))
-          png_data = File.read(test_path('test.png'))
+          jpg_data = File.read("#{ROOT}/spec/data/test.jpg")
+          png_data = File.read("#{ROOT}/spec/data/test.png")
           stream = stream(jpg_data)
           stream.content_type.should =~ %r'\Aimage/jpeg'
           update_target(stream, png_data)
@@ -109,7 +109,7 @@ describe Stream do
         end
 
         it "should not change the result of #content_type" do
-          jpg_data = File.read(test_path('test.jpg'))
+          jpg_data = File.read("#{ROOT}/spec/data/test.jpg")
           stream = stream(jpg_data)
           stream.reload
           stream.content_type.should =~ %r'\Aimage/jpeg'

data/spec/unit/style_spec.rb

@@ -48,4 +48,44 @@ describe Style do
       style.inspect.should == "#<Style :big {:size=>\"100x100\"}>"
     end
   end
+
+  describe "#dimensions" do
+    it "should return nil if there is no :size attribute" do
+      style = Style.new(:dimensionless)
+      style.dimensions.should be_nil
+    end
+
+    it "should return the value parsed from the :size attribute" do
+      style = Style.new(:dimensionless, :size => '40x30')
+      style.dimensions.should == [40, 30]
+    end
+
+    describe "when the :size attribute is updated" do
+      before do
+        @style = Style.new(:dimensionless, :size => '40x30')
+      end
+
+      it "should return nil if it was set to nil" do
+        @style[:size] = nil
+        @style.dimensions.should be_nil
+      end
+
+      it "should return the value parsed from the new :size attribute" do
+        @style[:size] = '80x60'
+        @style.dimensions.should == [80, 60]
+      end
+    end
+  end
+
+  describe "#filled?" do
+    it "should return true if the :filled attribute is true" do
+      style = Style.new(:filled, :filled => true)
+      style.should be_filled
+    end
+
+    it "should return false if the :filled attribute is omitted" do
+      style = Style.new(:unfilled)
+      style.should_not be_filled
+    end
+  end
 end

data/spec/unit/validations_spec.rb

@@ -194,11 +194,11 @@ describe Validations do
     end
 
     def make_thing_pass
-      @thing.photo = test_image_file
+      @thing.photo = uploaded_file('test.jpg')
     end
 
     def make_thing_fail
-      @thing.photo = test_empty_file
+      @thing.photo = uploaded_file('empty.txt')
     end
 
     it_should_behave_like "an ActiveRecord validation"
@@ -212,18 +212,18 @@ describe Validations do
 
       it "should fail if the file is empty" do
         Thing.validates_attachment_presence_of :photo
-        @thing = Thing.new(:photo => test_empty_file)
+        @thing = Thing.new(:photo => uploaded_file('empty.txt'))
         @thing.should_not be_valid
       end
 
       it "should pass if the file is not empty" do
         Thing.validates_attachment_presence_of :photo
-        @thing = Thing.new(:photo => test_image_file)
+        @thing = Thing.new(:photo => uploaded_file('test.jpg'))
         @thing.should be_valid
       end
     end
 
-    it_should_use_i18n_key(:attachment_blank){@thing.photo = test_empty_file}
+    it_should_use_i18n_key(:attachment_blank){@thing.photo = uploaded_file('empty.txt')}
   end
 
   describe ".validates_attachment_file_size_of" do
@@ -236,11 +236,11 @@ describe Validations do
     end
 
     def make_thing_pass
-      @thing.photo = uploaded_file_with_content('test.jpg', '....')
+      @thing.photo = uploaded_file('4-bytes.txt')
     end
 
     def make_thing_fail
-      @thing.photo = uploaded_file_with_content('test.jpg', '..')
+      @thing.photo = uploaded_file('6-bytes.txt')
     end
 
     it_should_behave_like "an ActiveRecord validation"
@@ -259,17 +259,17 @@ describe Validations do
         end
 
         it "should fail if the file size is less than the limit" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*4)
+          @thing.photo = uploaded_file('4-bytes.txt')
           @thing.should_not be_valid
         end
 
         it "should fail if the file size is equal to the limit" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*5)
+          @thing.photo = uploaded_file('5-bytes.txt')
           @thing.should_not be_valid
         end
 
         it "should pass if the file size is greater than the limit" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*6)
+          @thing.photo = uploaded_file('6-bytes.txt')
           @thing.should be_valid
         end
       end
@@ -281,72 +281,72 @@ describe Validations do
         end
 
         it "should fail if the file size is greater than the limit" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*6)
+          @thing.photo = uploaded_file('6-bytes.txt')
           @thing.should_not be_valid
         end
 
         it "should fail if the file size is equal to the limit" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*5)
+          @thing.photo = uploaded_file('5-bytes.txt')
           @thing.should_not be_valid
         end
 
         it "should pass if the file size is less than the limit" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*4)
+          @thing.photo = uploaded_file('4-bytes.txt')
           @thing.should be_valid
         end
       end
 
       describe "when :in is given" do
         before do
-          Thing.validates_attachment_file_size_of :photo, :in => 3..5
+          Thing.validates_attachment_file_size_of :photo, :in => 4..5
           @thing = Thing.new
         end
 
         it "should fail if the file size is less than the lower bound" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*2)
+          @thing.photo = uploaded_file('3-bytes.txt')
           @thing.should_not be_valid
         end
 
         it "should pass if the file size is equal to the lower bound" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*3)
+          @thing.photo = uploaded_file('4-bytes.txt')
           @thing.should be_valid
         end
 
         it "should fail if the file size is greater than the upper bound" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*6)
+          @thing.photo = uploaded_file('6-bytes.txt')
           @thing.should_not be_valid
         end
       end
 
       describe "when :in is given with an inclusive range" do
         before do
-          Thing.validates_attachment_file_size_of :photo, :in => 3..5
+          Thing.validates_attachment_file_size_of :photo, :in => 4..5
           @thing = Thing.new
         end
 
         it "should pass if the file size is equal to the upper bound" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*5)
+          @thing.photo = uploaded_file('5-bytes.txt')
           @thing.should be_valid
         end
       end
 
       describe "when :in is given with an exclusive range" do
         before do
-          Thing.validates_attachment_file_size_of :photo, :in => 3...5
+          Thing.validates_attachment_file_size_of :photo, :in => 4...5
           @thing = Thing.new
         end
 
         it "should fail if the file size is equal to the upper bound" do
-          @thing.photo = uploaded_file_with_content('test.jpg', '.'*5)
+          @thing.photo = uploaded_file('5-bytes.txt')
           @thing.should_not be_valid
         end
       end
     end
 
-    it_should_use_i18n_key(:attachment_too_large, :in => 3..5){@thing.photo = uploaded_file_with_content('test.jpg', '......')}
-    it_should_use_i18n_key(:attachment_too_large, :less_than => 5){@thing.photo = uploaded_file_with_content('test.jpg', '......')}
-    it_should_use_i18n_key(:attachment_too_small, :in => 3..5){@thing.photo = uploaded_file_with_content('test.jpg', '..')}
-    it_should_use_i18n_key(:attachment_too_small, :greater_than => 5){@thing.photo = uploaded_file_with_content('test.jpg', '..')}
+    it_should_use_i18n_key(:attachment_too_large, :in => 3..5){@thing.photo = uploaded_file('6-bytes.txt')}
+    it_should_use_i18n_key(:attachment_too_large, :less_than => 5){@thing.photo = uploaded_file('6-bytes.txt')}
+    it_should_use_i18n_key(:attachment_too_small, :in => 4..5){@thing.photo = uploaded_file('3-bytes.txt')}
+    it_should_use_i18n_key(:attachment_too_small, :greater_than => 5){@thing.photo = uploaded_file('4-bytes.txt')}
   end
 
   describe ".validates_attachment_type_of" do
@@ -359,11 +359,11 @@ describe Validations do
     end
 
     def make_thing_pass
-      @thing.photo = uploaded_file_with_content('test.jpg', "\xff\xd8")
+      @thing.photo = uploaded_file('test.jpg')
     end
 
     def make_thing_fail
-      @thing.photo = uploaded_file_with_content('test.avi', "RIFF    AVI ")
+      @thing.photo = uploaded_file('test.mov')
     end
 
     it_should_behave_like "an ActiveRecord validation"
@@ -372,7 +372,7 @@ describe Validations do
       describe "when :matches is given" do
         before do
           Thing.validates_attachment_type_of :photo, :matches => /^image/
-          @thing = Thing.new(:photo => uploaded_file)
+          @thing = Thing.new(:photo => uploaded_file('test.jpg'))
         end
 
         it "should pass if the attachment is nil" do
@@ -396,16 +396,16 @@ describe Validations do
         describe "when the value is a symbol" do
           before do
             Thing.validates_attachment_type_of :photo, :is => :image
-            @thing = Thing.new(:photo => uploaded_file)
+            @thing = Thing.new(:photo => uploaded_file('test.jpg'))
           end
 
           it "should pass if the symbol matches the Attachment type" do
-            @thing.photo = uploaded_file_with_content('test.jpg', "\xff\xd8")
+            @thing.photo = uploaded_file('test.jpg')
             @thing.should be_valid
           end
 
           it "should fail if the symbol does not match the Attachment type" do
-            @thing.photo = uploaded_file_with_content('test.avi', "RIFF    AVI ")
+            @thing.photo = uploaded_file('test.mov')
             @thing.should_not be_valid
             @thing.errors.on(:photo).should_not be_blank
           end
@@ -413,7 +413,7 @@ describe Validations do
 
         describe "when a mime-type string is given" do
           before do
-            @thing = Thing.new(:photo => uploaded_file)
+            @thing = Thing.new(:photo => uploaded_file('test.jpg'))
           end
 
           describe "when the string contains optional parameters" do
@@ -486,6 +486,6 @@ describe Validations do
       end
     end
 
-    it_should_use_i18n_key(:attachment_wrong_type, :matches => /\Aimage/){@thing.photo = uploaded_file_with_content('test.avi', "RIFF    AVI ")}
+    it_should_use_i18n_key(:attachment_wrong_type, :matches => /\Aimage/){@thing.photo = uploaded_file('test.mov')}
   end
 end