bulldog 0.0.11 → 0.0.12

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/bulldog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bulldog}
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Ogata"]
-  s.date = %q{2009-12-03}
+  s.date = %q{2009-12-11}
   s.description = %q{= Bulldog
 
 Flexible file attachments for active record.

data/lib/bulldog/attachment/base.rb

@@ -145,6 +145,20 @@ module Bulldog
         true
       end
 
+      #
+      # Return the value of the given attribute from an instance
+      # variable set during file examination.
+      #
+      # If not set, runs a file examination first.
+      #
+      def from_examination(name)
+        ivar = :"@#{name}"
+        value = instance_variable_get(ivar) and
+          return value
+        examine
+        instance_variable_get(ivar)
+      end
+
       private  # -------------------------------------------------------
 
       #

data/lib/bulldog/attachment/image.rb

@@ -16,8 +16,7 @@ module Bulldog
       #
       def dimensions(style_name)
         if style_name.equal?(:original)
-          examine
-          @original_dimensions
+          from_examination :original_dimensions
         else
           style = reflection.styles[style_name]
           target_dimensions = style[:size].split(/x/).map(&:to_i)
@@ -54,7 +53,7 @@ module Bulldog
           if $?.success? && output.present?
             width, height, orientation = *output.scan(/(\d+) (\d+) (\d?)/).first.map(&:to_i)
             rotated = (orientation & 0x4).nonzero?
-            @original_dimensions ||= rotated ? [height, width] : [width, height]
+            @original_dimensions = rotated ? [height, width] : [width, height]
             true
           else
             Bulldog.logger.warn "command failed (#{$?.exitstatus})"

data/lib/bulldog/attachment/maybe.rb

@@ -130,14 +130,12 @@ module Bulldog
           if (column_name = reflection.column_name_for_stored_attribute(name))
             value = record.send(column_name)
             value = send("deserialize_#{name}", value) if storable_attribute.cast
-            ivar = :"@#{name}"
             if storable_attribute.per_style?
-              instance_variable_get(ivar) or
-                instance_variable_set(ivar, {})
-              instance_variable_get(ivar)[name] = value
+              ivar = :"@original_#{name}"
             else
-              instance_variable_set(ivar, value)
+              ivar = :"@#{name}"
             end
+            instance_variable_set(ivar, value)
           end
         end
       end

data/lib/bulldog/attachment/pdf.rb

@@ -16,8 +16,7 @@ module Bulldog
       #
       def dimensions(style_name)
         if style_name.equal?(:original)
-          examine
-          @original_dimensions
+          from_examination :original_dimensions
         else
           style = reflection.styles[style_name]
           target_dimensions = style[:size].split(/x/).map(&:to_i)

data/lib/bulldog/attachment/video.rb

@@ -30,8 +30,7 @@ module Bulldog
         if stream.missing?
           0
         else
-          examine
-          @original_duration
+          from_examination :original_duration
         end
       end
 
@@ -50,7 +49,7 @@ module Bulldog
           if stream.missing?
             [VideoTrack.new(:dimensions => [2, 2])]
           else
-            examine
+            examine unless @original_video_tracks
             if @original_video_tracks.empty?
               @original_video_tracks << VideoTrack.new(:dimensions => [2, 2])
             end

data/spec/unit/attachment/image_spec.rb

@@ -1,164 +1,177 @@
 require 'spec_helper'
 
 describe Attachment::Image do
-  use_model_class(:Thing,
-                  :photo_file_name => :string,
-                  :photo_width => :integer,
-                  :photo_height => :integer,
-                  :photo_aspect_ratio => :float,
-                  :photo_dimensions => :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)
-  end
-
   def run(command)
     `#{command}`
     $?.success? or
       raise "command failed: #{command}"
   end
 
-  describe "#dimensions" do
-    it "should return 1x1 if the style is missing" do
-      Thing.attachment_reflections[:photo].configure do
-        detect_type_by{:image}
-      end
-      @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]
+  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 return the width and height of the default style if no style name is given" do
-      @thing.photo.dimensions.should == [80, 60]
-    end
+  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)
 
-    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]
+    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)
     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 "#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 honor the exif:Orientation header" do
-      path = create_image("#{temporary_directory}/test.jpg", :size => '40x30')
-      rotated_path = "#{temporary_directory}/rotated-test.jpg"
-      run "exif --create-exif --ifd=EXIF --tag=Orientation --set-value=4 --output=#{rotated_path} #{path}"
-      open(rotated_path) do |file|
-        @thing.photo = file
-        @thing.photo.dimensions(:original).should == [30, 40]
+      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
-    end
 
-    it "should only invoke identify once"
-    it "should log the result"
-  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 "#width" do
-    it "should return the width of the default style if no style name is given" do
-      @thing.photo.width.should == 80
-    end
+      it "should honor the exif:Orientation header" do
+        path = create_image("#{temporary_directory}/test.jpg", :size => '40x30')
+        rotated_path = "#{temporary_directory}/rotated-test.jpg"
+        run "exif --create-exif --ifd=EXIF --tag=Orientation --set-value=4 --output=#{rotated_path} #{path}"
+        open(rotated_path) do |file|
+          @thing.photo = file
+          @thing.photo.dimensions(:original).should == [30, 40]
+        end
+      end
 
-    it "should return the width of the given style" do
-      @thing.photo.width(:original).should == 40
-      @thing.photo.width(:double).should == 80
+      it "should only invoke identify once"
+      it "should log the result"
     end
-  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
+    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
 
-    it "should return the height of the given style" do
-      @thing.photo.height(:original).should == 30
-      @thing.photo.height(:double).should == 60
+      it "should return the width of the given style" do
+        @thing.photo.width(:original).should == 40
+        @thing.photo.width(:double).should == 80
+      end
     end
-  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
+    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 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)
+      it "should return the height of the given style" do
+        @thing.photo.height(:original).should == 30
+        @thing.photo.height(:double).should == 60
+      end
     end
-  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 "#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
 
-    describe "after roundtripping through the database" do
-      before do
-        @thing.save
-        @thing = Thing.find(@thing.id)
+      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
+    end
 
-      it "should restore the stored attributes" do
+    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
 
-      it "should recalculate the dimensions correctly" do
-        @thing.photo.dimensions(:filled).should == [60, 60]
-        @thing.photo.dimensions(:unfilled).should == [120, 90]
+      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
+
+        it "should recalculate the dimensions correctly" do
+          @thing.photo.dimensions(:filled).should == [60, 60]
+          @thing.photo.dimensions(:unfilled).should == [120, 90]
+        end
       end
     end
-  end
 
-  describe "#reload" do
-    before do
-      thing = Thing.create(:photo => test_image_file('test.jpg'))
-      @thing = Thing.find(thing.id)
-    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 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'
 
-    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
+        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 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 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]
+      end
     end
   end
 end

data/spec/unit/attachment/pdf_spec.rb

@@ -1,23 +1,6 @@
 require 'spec_helper'
 
 describe Attachment::Pdf do
-  use_model_class(:Thing,
-                  :attachment_file_name => :string,
-                  :attachment_width => :integer,
-                  :attachment_height => :integer,
-                  :attachment_aspect_ratio => :float,
-                  :attachment_dimensions => :string)
-
-  before do
-    Thing.has_attachment :attachment do
-      style :double, :size => '1224x1584'
-      style :filled, :size => '500x500', :filled => true
-      style :unfilled, :size => '1000x1000'
-      default_style :double
-    end
-    @thing = Thing.new(:attachment => test_file)
-  end
-
   def test_file
     path = "#{temporary_directory}/test.pdf"
     FileUtils.cp("#{ROOT}/spec/data/test.pdf", path)
@@ -28,109 +11,139 @@ describe Attachment::Pdf do
     Thing.attachment_reflections[:attachment].configure(&block)
   end
 
-  describe "#process" do
-    it "should be processed with ImageMagick by default" do
-      context = nil
-      configure do
-        style :output
-        process :on => :event do
-          context = self
+  describe "when file attributes are not stored" do
+    use_model_class(:Thing, :attachment_file_name => :string)
+
+    describe "#dimensions" do
+      it "should return 1x1 if the file is missing" do
+        Thing.has_attachment :attachment do
+          type :pdf
+          style :double, :size => '1224x1584'
+          style :filled, :size => '500x500', :filled => true
+          style :unfilled, :size => '1000x1000'
+          default_style :double
         end
+        @thing = Thing.new(:attachment => test_file)
+        @thing.save.should be_true
+        File.unlink(@thing.attachment.path(:original))
+        @thing = Thing.find(@thing.id)
+        @thing.attachment.is_a?(Attachment::Pdf)  # sanity check
+        @thing.attachment.stream.missing?         # sanity check
+        @thing.attachment.dimensions(:original).should == [1, 1]
       end
-
-      @thing.attachment.process(:event)
-      context.should be_a(Processor::ImageMagick)
     end
   end
 
-  describe "#dimensions" do
-    it "should return 1x1 if the style is missing" do
-      Thing.attachment_reflections[:attachment].configure do
-        detect_type_by{:pdf}
+  describe "when file attributes are stored" do
+    use_model_class(:Thing,
+                    :attachment_file_name => :string,
+                    :attachment_width => :integer,
+                    :attachment_height => :integer,
+                    :attachment_aspect_ratio => :float,
+                    :attachment_dimensions => :string)
+
+    before do
+      Thing.has_attachment :attachment do
+        style :double, :size => '1224x1584'
+        style :filled, :size => '500x500', :filled => true
+        style :unfilled, :size => '1000x1000'
+        default_style :double
       end
-      @thing.save.should be_true
-      File.unlink(@thing.attachment.path(:original))
-      @thing = Thing.find(@thing.id)
-      @thing.attachment.is_a?(Attachment::Pdf)  # sanity check
-      @thing.attachment.stream.missing?         # sanity check
-      @thing.attachment.dimensions(:original).should == [1, 1]
+      @thing = Thing.new(:attachment => test_file)
     end
 
-    it "should return the width and height of the default style if no style name is given" do
-      @thing.attachment.dimensions.should == [1224, 1584]
-    end
+    describe "#process" do
+      it "should be processed with ImageMagick by default" do
+        context = nil
+        configure do
+          style :output
+          process :on => :event do
+            context = self
+          end
+        end
 
-    it "should return the width and height of the given style" do
-      @thing.attachment.dimensions(:original).should == [612, 792]
-      @thing.attachment.dimensions(:double).should == [1224, 1584]
+        @thing.attachment.process(:event)
+        context.should be_a(Processor::ImageMagick)
+      end
     end
 
-    it "should return the calculated width according to style filledness" do
-      @thing.attachment.dimensions(:filled).should == [500, 500]
-      @thing.attachment.dimensions(:unfilled).should == [773, 1000]
-    end
+    describe "#dimensions" do
+      it "should return the width and height of the default style if no style name is given" do
+        @thing.attachment.dimensions.should == [1224, 1584]
+      end
 
-    it "should only invoke identify once"
-    it "should log the result"
-  end
+      it "should return the width and height of the given style" do
+        @thing.attachment.dimensions(:original).should == [612, 792]
+        @thing.attachment.dimensions(:double).should == [1224, 1584]
+      end
 
-  describe "#width" do
-    it "should return the width of the default style if no style name is given" do
-      @thing.attachment.width.should == 1224
-    end
+      it "should return the calculated width according to style filledness" do
+        @thing.attachment.dimensions(:filled).should == [500, 500]
+        @thing.attachment.dimensions(:unfilled).should == [773, 1000]
+      end
 
-    it "should return the width of the given style" do
-      @thing.attachment.width(:original).should == 612
-      @thing.attachment.width(:double).should == 1224
+      it "should only invoke identify once"
+      it "should log the result"
     end
-  end
 
-  describe "#height" do
-    it "should return the height of the default style if no style name is given" do
-      @thing.attachment.height.should == 1584
-    end
+    describe "#width" do
+      it "should return the width of the default style if no style name is given" do
+        @thing.attachment.width.should == 1224
+      end
 
-    it "should return the height of the given style" do
-      @thing.attachment.height(:original).should == 792
-      @thing.attachment.height(:double).should == 1584
+      it "should return the width of the given style" do
+        @thing.attachment.width(:original).should == 612
+        @thing.attachment.width(:double).should == 1224
+      end
     end
-  end
 
-  describe "#aspect_ratio" do
-    it "should return the aspect ratio of the default style if no style name is given" do
-      @thing.attachment.aspect_ratio.should be_close(612.0/792, 1e-5)
-    end
+    describe "#height" do
+      it "should return the height of the default style if no style name is given" do
+        @thing.attachment.height.should == 1584
+      end
 
-    it "should return the aspect ratio of the given style" do
-      @thing.attachment.aspect_ratio(:original).should be_close(612.0/792, 1e-5)
-      @thing.attachment.aspect_ratio(:filled).should be_close(1, 1e-5)
+      it "should return the height of the given style" do
+        @thing.attachment.height(:original).should == 792
+        @thing.attachment.height(:double).should == 1584
+      end
     end
-  end
 
-  describe "storable attributes" do
-    it "should set the stored attributes on assignment" do
-      @thing.attachment_width.should == 612
-      @thing.attachment_height.should == 792
-      @thing.attachment_aspect_ratio.should be_close(612.0/792, 1e-5)
-      @thing.attachment_dimensions.should == '612x792'
-    end
+    describe "#aspect_ratio" do
+      it "should return the aspect ratio of the default style if no style name is given" do
+        @thing.attachment.aspect_ratio.should be_close(612.0/792, 1e-5)
+      end
 
-    describe "after roundtripping through the database" do
-      before do
-        @thing.save
-        @thing = Thing.find(@thing.id)
+      it "should return the aspect ratio of the given style" do
+        @thing.attachment.aspect_ratio(:original).should be_close(612.0/792, 1e-5)
+        @thing.attachment.aspect_ratio(:filled).should be_close(1, 1e-5)
       end
+    end
 
-      it "should restore the stored attributes" do
+    describe "storable attributes" do
+      it "should set the stored attributes on assignment" do
         @thing.attachment_width.should == 612
         @thing.attachment_height.should == 792
         @thing.attachment_aspect_ratio.should be_close(612.0/792, 1e-5)
         @thing.attachment_dimensions.should == '612x792'
       end
 
-      it "should recalculate the dimensions correctly" do
-        @thing.attachment.dimensions(:filled).should == [500, 500]
-        @thing.attachment.dimensions(:unfilled).should == [773, 1000]
+      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.attachment_width.should == 612
+          @thing.attachment_height.should == 792
+          @thing.attachment_aspect_ratio.should be_close(612.0/792, 1e-5)
+          @thing.attachment_dimensions.should == '612x792'
+        end
+
+        it "should recalculate the dimensions correctly" do
+          @thing.attachment.dimensions(:filled).should == [500, 500]
+          @thing.attachment.dimensions(:unfilled).should == [773, 1000]
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bulldog
 version: !ruby/object:Gem::Version 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - George Ogata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -05:00
+date: 2009-12-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency