dragonfly 0.7.4 → 0.7.5

data/Gemfile

@@ -14,7 +14,7 @@ gem 'mongo'
 gem 'nokogiri', '1.5.0.beta.2' # 1.4.3.1 segfaults on Ruby 1.9.2
 gem 'rack', '~>1.1'
 gem 'rack-cache'
-gem 'rails', '3.0.0.rc', :require => nil
+gem 'rails', '3.0.0', :require => nil
 gem 'rake'
 gem 'rmagick', '2.12.2', :require => nil
 gem 'rspec', '~> 1.3'

data/History.md

@@ -1,3 +1,17 @@
+0.7.5 (2010-09-01)
+==================
+Changes
+--------
+- RMagick processor, encoder, analyser and generator all use the filesystem now
+  They can be configured to use in-memory strings with the use_filesystem config option.
+- Upgraded support from Rails 3.0.0.rc -> Rails.3.0.0
+
+0.7.4 (2010-08-28)
+==================
+Features
+--------
+- Gave model accessors bang methods process! and encode!
+
 0.7.3 (2010-08-27)
 ==================
 Fixes

data/README.md

@@ -11,7 +11,7 @@ For the lazy Rails user...
 
     gem 'rmagick',    :require => 'RMagick'
     gem 'rack-cache', :require => 'rack/cache'
-    gem 'dragonfly', '~>0.7.3'
+    gem 'dragonfly', '~>0.7.4'
 
 **Initializer** (e.g. config/initializers/dragonfly.rb):
 

data/VERSION

@@ -1 +1 @@
-0.7.4
+0.7.5

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.7.4"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-08-28}
+  s.date = %q{2010-09-01}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
      "features/images.feature",
      "features/no_processing.feature",
      "features/rails_2.3.5.feature",
-     "features/rails_3.0.0.rc.feature",
+     "features/rails_3.0.0.feature",
      "features/steps/common_steps.rb",
      "features/steps/dragonfly_steps.rb",
      "features/steps/rails_steps.rb",
@@ -64,7 +64,7 @@ Gem::Specification.new do |s|
      "fixtures/files/features/support/paths.rb",
      "fixtures/files/features/text_images.feature",
      "fixtures/rails_2.3.5/template.rb",
-     "fixtures/rails_3.0.0.rc/template.rb",
+     "fixtures/rails_3.0.0/template.rb",
      "irbrc.rb",
      "lib/dragonfly.rb",
      "lib/dragonfly/active_model_extensions.rb",
@@ -122,6 +122,7 @@ Gem::Specification.new do |s|
      "spec/dragonfly/analysis/file_command_analyser_spec.rb",
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
+     "spec/dragonfly/config/r_magick_spec.rb",
      "spec/dragonfly/configurable_spec.rb",
      "spec/dragonfly/core_ext/string_spec.rb",
      "spec/dragonfly/core_ext/symbol_spec.rb",
@@ -170,6 +171,7 @@ Gem::Specification.new do |s|
      "spec/dragonfly/analysis/file_command_analyser_spec.rb",
      "spec/dragonfly/analysis/r_magick_analyser_spec.rb",
      "spec/dragonfly/app_spec.rb",
+     "spec/dragonfly/config/r_magick_spec.rb",
      "spec/dragonfly/configurable_spec.rb",
      "spec/dragonfly/core_ext/string_spec.rb",
      "spec/dragonfly/core_ext/symbol_spec.rb",

data/extra_docs/Configuration.md

@@ -70,6 +70,11 @@ The {Dragonfly::Config::RMagick RMagick configuration} registers the app with th
 
 The file 'dragonfly/rails/images' does this for you.
 
+By default the processor, analyser, encoder and generator pass data around using tempfiles.
+You can make it pass data around using in-memory strings using
+
+    app.configure_with(:rmagick, :use_filesystem => false)
+
 Rails
 -----
 

data/extra_docs/Rails2.md

@@ -34,7 +34,7 @@ Gems
 ----
 environment.rb
 
-    config.gem 'dragonfly', '~>0.7.3'
+    config.gem 'dragonfly', '~>0.7.4'
     config.gem 'rmagick', :lib => 'RMagick'
     config.gem 'rack-cache', :lib => 'rack/cache'
 

data/extra_docs/Rails3.md

@@ -33,7 +33,7 @@ application.rb:
 Gemfile
 -------
 
-    gem 'dragonfly', '~>0.7.3'
+    gem 'dragonfly', '~>0.7.4'
     gem 'rmagick', :require => 'RMagick'
     gem 'rack-cache', :require => 'rack/cache'
 

data/features/rails_3.0.0.feature

@@ -0,0 +1,8 @@
+Feature: champion uses dragonfly in his Rails 3.0.0 application
+  In order to be a champion
+  A user uses dragonfly in his Rails 3.0.0 application
+
+  Scenario: Set up dragonfly using initializer
+    Given a Rails 3.0.0 application set up for using dragonfly
+    Then the manage_album_images cucumber features in my Rails 3.0.0 app should pass
+    And the text_images cucumber features in my Rails 3.0.0 app should pass

data/features/steps/rails_steps.rb

@@ -2,7 +2,7 @@ RAILS_APP_NAME = 'tmp_app'
 FIXTURES_PATH = ROOT_PATH + "/fixtures"
 GEMFILES = {
   '2.3.5' => ROOT_PATH + '/Gemfile.rails.2.3.5',
-  '3.0.0.rc' => ROOT_PATH + '/Gemfile',
+  '3.0.0' => ROOT_PATH + '/Gemfile',
 }
 
 def fixture_path(version)
@@ -17,7 +17,7 @@ end
 
 {
   '2.3.5' => "BUNDLE_GEMFILE=#{GEMFILES['2.3.5']} rails #{RAILS_APP_NAME} -m template.rb",
-  '3.0.0.rc' => "BUNDLE_GEMFILE=#{GEMFILES['3.0.0.rc']} bundle exec rails new #{RAILS_APP_NAME} -m template.rb"
+  '3.0.0' => "BUNDLE_GEMFILE=#{GEMFILES['3.0.0']} bundle exec rails new #{RAILS_APP_NAME} -m template.rb"
 }.each do |version, rails_command|
 
   Given /^a Rails #{version} application set up for using dragonfly$/ do

data/lib/dragonfly/analysis/r_magick_analyser.rb

@@ -6,33 +6,36 @@ module Dragonfly
 
       include Loggable
       include RMagickUtils
+      include Configurable
+
+      configurable_attr :use_filesystem, true
 
       def width(temp_object)
-        rmagick_image(temp_object) do |image|
+        ping_rmagick_image(temp_object) do |image|
           image.columns
         end
       end
 
       def height(temp_object)
-        rmagick_image(temp_object) do |image|
+        ping_rmagick_image(temp_object) do |image|
           image.rows
         end
       end
 
       def aspect_ratio(temp_object)
-        rmagick_image(temp_object) do |image|
+        ping_rmagick_image(temp_object) do |image|
           image.columns.to_f / image.rows
         end
       end
 
       def portrait?(temp_object)
-        rmagick_image(temp_object) do |image|
+        ping_rmagick_image(temp_object) do |image|
           image.columns <= image.rows
         end
       end
 
       def landscape?(temp_object)
-        rmagick_image(temp_object) do |image|
+        ping_rmagick_image(temp_object) do |image|
           image.columns >= image.rows
         end
       end
@@ -51,7 +54,7 @@ module Dragonfly
       alias number_of_colors number_of_colours
 
       def format(temp_object)
-        rmagick_image(temp_object) do |image|
+        ping_rmagick_image(temp_object) do |image|
           image.format.downcase.to_sym
         end
       end

data/lib/dragonfly/config/r_magick.rb

@@ -9,12 +9,21 @@ module Dragonfly
     # Look at the source code for apply_configuration to see exactly how it configures the app.
     module RMagick
 
-      def self.apply_configuration(app)
+      def self.apply_configuration(app, opts={})
+        use_filesystem = opts.has_key?(:use_filesystem) ? opts[:use_filesystem] : true
         app.configure do |c|
-          c.analyser.register(Analysis::RMagickAnalyser)
-          c.processor.register(Processing::RMagickProcessor)
-          c.encoder.register(Encoding::RMagickEncoder)
-          c.generator.register(Generation::RMagickGenerator)
+          c.analyser.register(Analysis::RMagickAnalyser) do |a|
+            a.use_filesystem = use_filesystem
+          end
+          c.processor.register(Processing::RMagickProcessor) do |p|
+            p.use_filesystem = use_filesystem
+          end
+          c.encoder.register(Encoding::RMagickEncoder) do |e|
+            e.use_filesystem = use_filesystem
+          end
+          c.generator.register(Generation::RMagickGenerator) do |g|
+            g.use_filesystem = use_filesystem
+          end
           c.job :thumb do |geometry, format|
             process :thumb, geometry
             encode format if format

data/lib/dragonfly/encoding/r_magick_encoder.rb

@@ -41,6 +41,7 @@ module Dragonfly
         :xpm,
         :xwd
       ]
+      configurable_attr :use_filesystem, true
 
       def encode(temp_object, format, encoding={})
         format = format.to_s.downcase

data/lib/dragonfly/function_manager.rb

@@ -1,17 +1,17 @@
 module Dragonfly
   class FunctionManager
-    
+
     # Exceptions
     class NotDefined < NoMethodError; end
     class UnableToHandle < NotImplementedError; end
-    
+
     include Loggable
-    
+
     def initialize
       @functions = {}
       @objects = []
     end
-    
+
     def add(name, callable_obj=nil, &block)
       functions[name] ||= []
       functions[name] << (callable_obj || block)
@@ -29,7 +29,7 @@ module Dragonfly
       objects << obj
       obj
     end
-    
+
     def call_last(meth, *args)
       if functions[meth.to_sym]
         functions[meth.to_sym].reverse.each do |function|
@@ -45,12 +45,16 @@ module Dragonfly
       end
     end
 
+    def get_registered(klass)
+      objects.reverse.detect{|o| o.instance_of?(klass) }
+    end
+
     def inspect
       to_s.sub(/>$/, " with functions: #{functions.keys.map{|k| k.to_s }.sort.join(', ')} >")
     end
 
     private
-    
+
     def methods_to_add(obj)
       if obj.is_a?(Configurable)
         obj.public_methods(false) -

data/lib/dragonfly/generation/r_magick_generator.rb

@@ -3,13 +3,13 @@ require 'RMagick'
 module Dragonfly
   module Generation
     class RMagickGenerator
-      
+
       FONT_STYLES = {
         'normal' => Magick::NormalStyle,
         'italic' => Magick::ItalicStyle,
         'oblique' => Magick::ObliqueStyle
       }
-      
+
       FONT_STRETCHES = {
         'normal'          => Magick::NormalStretch,
         'semi-condensed'  => Magick::SemiCondensedStretch,
@@ -21,7 +21,7 @@ module Dragonfly
         'extra-expanded'  => Magick::ExtraExpandedStretch,
         'ultra-expanded'  => Magick::UltraExpandedStretch
       }
-      
+
       FONT_WEIGHTS = {
         'normal'  => Magick::NormalWeight,
         'bold'    => Magick::BoldWeight,
@@ -37,7 +37,7 @@ module Dragonfly
         '800'     => 800,
         '900'     => 900
       }
-      
+
       # HashWithCssStyleKeys is solely for being able to access a hash
       # which has css-style keys (e.g. 'font-size') with the underscore
       # symbol version
@@ -55,25 +55,29 @@ module Dragonfly
           )
         end
       end
-      
+
+      include RMagickUtils
+      include Configurable
+      configurable_attr :use_filesystem, true
+
       def plasma(width, height, format='png')
         image = Magick::Image.read("plasma:fractal"){self.size = "#{width}x#{height}"}.first
         image.format = format.to_s
-        data = image.to_blob
+        content = use_filesystem ? write_to_tempfile(image) : image.to_blob
         image.destroy!
         [
-          data,
+          content,
           {:format => format.to_sym, :name => "plasma.#{format}"}
         ]
       end
-      
+
       def text(text_string, opts={})
         opts = HashWithCssStyleKeys[opts]
-        
+
         draw = Magick::Draw.new
         draw.gravity = Magick::CenterGravity
         draw.text_antialias = true
-        
+
         # Font size
         font_size = (opts[:font_size] || 12).to_i
 
@@ -112,22 +116,22 @@ module Dragonfly
         }
         # Draw the text
         draw.annotate(image, width, height, padding_left, padding_top, text_string)
-        
+
         # Scale back down again
         image.scale!(1/s)
-        
+
         format = opts[:format] || :png
         image.format = format.to_s
 
-        # Output image as string
-        data = image.to_blob
+        # Output image either as a string or a tempfile
+        content = use_filesystem ? write_to_tempfile(image) : image.to_blob
         image.destroy!
         [
-          data,
+          content,
           {:format => format, :name => "text.#{format}"}
         ]
       end
-      
+
       private
 
       # Use css-style padding declaration, i.e.
@@ -152,7 +156,7 @@ module Dragonfly
         else raise ArgumentError, "Couldn't parse padding string '#{str}' - should be a css-style string"
         end
       end
-      
+
       def scale_factor_for(font_size)
         # Scale approximately to 64 if below
         min_size = 64

data/lib/dragonfly/processing/r_magick_processor.rb

@@ -23,6 +23,9 @@ module Dragonfly
       THUMB_GEOMETRY = Regexp.union RESIZE_GEOMETRY, CROPPED_RESIZE_GEOMETRY, CROP_GEOMETRY
 
       include RMagickUtils
+      include Configurable
+      
+      configurable_attr :use_filesystem, true
 
       def crop(temp_object, opts={})
         x       = opts[:x].to_i

data/lib/dragonfly/r_magick_utils.rb

@@ -1,24 +1,46 @@
+require 'tempfile'
+
 module Dragonfly
   module RMagickUtils
-    
+
     private
-    
+
+    # Requires the extended object to respond to 'use_filesystem'
     def rmagick_image(temp_object, &block)
-      image = Magick::Image.from_blob(temp_object.data).first
-      result = block[image]
+      imagelist = use_filesystem ? Magick::Image.read(temp_object.path) : Magick::Image.from_blob(temp_object.data)
+      image = imagelist.first
+      result = block.call(image)
       case result
       when Magick::Image, Magick::ImageList
-        content = result.to_blob
+        content = use_filesystem ? write_to_tempfile(result) : result.to_blob
         result.destroy!
       else
         content = result
       end
-      image.destroy! unless image.destroyed?
+      image.destroy!
       content
     rescue Magick::ImageMagickError => e
       log.warn("Unable to handle content in #{self.class} - got:\n#{e}")
       throw :unable_to_handle
     end
-    
+
+    def ping_rmagick_image(temp_object, &block)
+      imagelist = use_filesystem ? Magick::Image.ping(temp_object.path) : Magick::Image.from_blob(temp_object.data)
+      image = imagelist.first
+      result = block.call(image)
+      image.destroy!
+      result
+    rescue Magick::ImageMagickError => e
+      log.warn("Unable to handle content in #{self.class} - got:\n#{e}")
+      throw :unable_to_handle
+    end
+
+    def write_to_tempfile(rmagick_image)
+      tempfile = Tempfile.new('dragonfly')
+      tempfile.close
+      rmagick_image.write(tempfile.path)
+      tempfile
+    end
+
   end
 end

data/spec/dragonfly/active_model_extensions/model_spec.rb

@@ -1,5 +1,4 @@
 require File.dirname(__FILE__) + '/spec_helper'
-require 'active_support/core_ext/hash/except' # Needed for Rails 3.0.0.rc but subsequently fixed - TODO: remove when gem is updated
 
 describe Item do
 

data/spec/dragonfly/analysis/r_magick_analyser_spec.rb

@@ -9,36 +9,54 @@ describe Dragonfly::Analysis::RMagickAnalyser do
     @analyser.log = Logger.new(LOG_FILE)
   end
 
-  it "should return the width" do
-    @analyser.width(@beach).should == 280
-  end
+  describe "analysis methods", :shared => true do
+    
+    it "should return the width" do
+      @analyser.width(@beach).should == 280
+    end
   
-  it "should return the height" do
-    @analyser.height(@beach).should == 355
-  end
+    it "should return the height" do
+      @analyser.height(@beach).should == 355
+    end
   
-  it "should return the aspect ratio" do
-    @analyser.aspect_ratio(@beach).should == (280.0/355.0)
-  end
+    it "should return the aspect ratio" do
+      @analyser.aspect_ratio(@beach).should == (280.0/355.0)
+    end
   
-  it "should say if it's portrait" do
-    @analyser.portrait?(@beach).should be_true
-  end
+    it "should say if it's portrait" do
+      @analyser.portrait?(@beach).should be_true
+    end
   
-  it "should say if it's landscape" do
-    @analyser.landscape?(@beach).should be_false
-  end
+    it "should say if it's landscape" do
+      @analyser.landscape?(@beach).should be_false
+    end
+  
+    it "should return the number of colours" do
+      @analyser.number_of_colours(@beach).should == 34703
+    end
+  
+    it "should return the depth" do
+      @analyser.depth(@beach).should == 8
+    end
   
-  it "should return the number of colours" do
-    @analyser.number_of_colours(@beach).should == 34703
+    it "should return the format" do
+      @analyser.format(@beach).should == :png
+    end
+    
   end
   
-  it "should return the depth" do
-    @analyser.depth(@beach).should == 8
+  describe "when using the filesystem" do
+    before(:each) do
+      @analyser.use_filesystem = true
+    end
+    it_should_behave_like "analysis methods"
   end
   
-  it "should return the format" do
-    @analyser.format(@beach).should == :png
+  describe "when not using the filesystem" do
+    before(:each) do
+      @analyser.use_filesystem = false
+    end
+    it_should_behave_like "analysis methods"
   end
   
   %w(width height aspect_ratio number_of_colours depth format portrait? landscape?).each do |meth|

data/spec/dragonfly/config/r_magick_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe Dragonfly::Config::RMagick do
+
+  before(:each) do
+    @app = test_app
+  end
+
+  it "should configure all to use the filesystem by default" do
+    @app.configure_with(Dragonfly::Config::RMagick)
+    @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_true
+    @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_true
+    @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_true
+    @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_true
+  end
+
+  it "should configure all not to use the filesystem if requested" do
+    @app.configure_with(Dragonfly::Config::RMagick, :use_filesystem => false)
+    @app.analyser.get_registered(Dragonfly::Analysis::RMagickAnalyser).use_filesystem.should be_false
+    @app.processor.get_registered(Dragonfly::Processing::RMagickProcessor).use_filesystem.should be_false
+    @app.encoder.get_registered(Dragonfly::Encoding::RMagickEncoder).use_filesystem.should be_false
+    @app.generator.get_registered(Dragonfly::Generation::RMagickGenerator).use_filesystem.should be_false
+  end
+
+end

data/spec/dragonfly/encoding/r_magick_encoder_spec.rb

@@ -28,6 +28,13 @@ describe Dragonfly::Encoding::RMagickEncoder do
       image = @encoder.encode(@image, :png)
       image.should == @image
     end
+    
+    it "should work when not using the filesystem" do
+      @encoder.use_filesystem = false
+      image = @encoder.encode(@image, :gif)
+      image.should have_format('gif')
+    end
+
   end
   
 end

data/spec/dragonfly/generation/r_magick_generator_spec.rb

@@ -6,7 +6,7 @@ describe Dragonfly::Generation::RMagickGenerator do
     before(:each) do
       @generator = Dragonfly::Generation::RMagickGenerator.new
     end
-    
+
     describe "generating an image with the given dimensions" do
       before(:each) do
         @image, @extra = @generator.plasma(23,12)
@@ -16,7 +16,7 @@ describe Dragonfly::Generation::RMagickGenerator do
       it {@image.should have_format('png')}
       it {@extra.should == {:format => :png, :name => 'plasma.png'}}
     end
-    
+
     describe "specifying the format" do
       before(:each) do
         @image, @extra = @generator.plasma(23, 12, :gif)
@@ -24,6 +24,14 @@ describe Dragonfly::Generation::RMagickGenerator do
       it {@image.should have_format('gif')}
       it {@extra.should == {:format => :gif, :name => 'plasma.gif'}}
     end
+
+    describe "when not using the filesystem" do
+      it "should still work" do
+        @generator.use_filesystem = false
+        image, extra = @generator.plasma(4, 6)
+        image.should have_width(4)
+      end
+    end
   end
 
   describe "text" do
@@ -50,6 +58,14 @@ describe Dragonfly::Generation::RMagickGenerator do
       it {@extra.should == {:format => :gif, :name => 'text.gif'}}
     end
 
+    describe "when not using the filesystem" do
+      it "should still work" do
+        @generator.use_filesystem = false
+        image, extra = @generator.text(@text, :font_size => 12)
+        image.should have_width(20..40)
+      end
+    end
+
     # it "should ignore percent characters used by rmagick"
 
     describe "padding" do

data/spec/dragonfly/processing/r_magick_processor_spec.rb

@@ -1,218 +1,236 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Dragonfly::Processing::RMagickProcessor do
+  
+  describe "processing methods", :shared => true do
 
-  before(:each) do
-    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
-    @image = Dragonfly::TempObject.new(File.new(sample_file))
-    @processor = Dragonfly::Processing::RMagickProcessor.new
-  end
+    describe "resize" do
 
-  describe "resize" do
-  
-    it "should work correctly with xNN" do
-      image = @processor.resize(@image, 'x30')
-      image.should have_width(24)
-      image.should have_height(30)
-    end
-  
-    it "should work correctly with NNx" do
-      image = @processor.resize(@image, '30x')
-      image.should have_width(30)
-      image.should have_height(38)
-    end
-  
-    it "should work correctly with NNxNN" do
-      image = @processor.resize(@image, '30x30')
-      image.should have_width(24)
-      image.should have_height(30)
-    end
-  
-    it "should work correctly with NNxNN!" do
-      image = @processor.resize(@image, '30x30!')
-      image.should have_width(30)
-      image.should have_height(30)
-    end
-  
-    it "should work correctly with NNxNN%" do
-      image = @processor.resize(@image, '25x50%')
-      image.should have_width(70)
-      image.should have_height(178)
-    end
-  
-    describe "NNxNN>" do
-    
-      it "should not resize if the image is smaller than specified" do
-        image = @processor.resize(@image, '1000x1000>')
-        image.should have_width(280)
-        image.should have_height(355)
+      it "should work correctly with xNN" do
+        image = @processor.resize(@image, 'x30')
+        image.should have_width(24)
+        image.should have_height(30)
       end
-    
-      it "should resize if the image is larger than specified" do
-        image = @processor.resize(@image, '30x30>')
+
+      it "should work correctly with NNx" do
+        image = @processor.resize(@image, '30x')
+        image.should have_width(30)
+        image.should have_height(38)
+      end
+
+      it "should work correctly with NNxNN" do
+        image = @processor.resize(@image, '30x30')
         image.should have_width(24)
         image.should have_height(30)
       end
-    
+
+      it "should work correctly with NNxNN!" do
+        image = @processor.resize(@image, '30x30!')
+        image.should have_width(30)
+        image.should have_height(30)
+      end
+
+      it "should work correctly with NNxNN%" do
+        image = @processor.resize(@image, '25x50%')
+        image.should have_width(70)
+        image.should have_height(178)
+      end
+
+      describe "NNxNN>" do
+
+        it "should not resize if the image is smaller than specified" do
+          image = @processor.resize(@image, '1000x1000>')
+          image.should have_width(280)
+          image.should have_height(355)
+        end
+
+        it "should resize if the image is larger than specified" do
+          image = @processor.resize(@image, '30x30>')
+          image.should have_width(24)
+          image.should have_height(30)
+        end
+
+      end
+
+      describe "NNxNN<" do
+
+        it "should not resize if the image is larger than specified" do
+          image = @processor.resize(@image, '10x10<')
+          image.should have_width(280)
+          image.should have_height(355)
+        end
+
+        it "should resize if the image is smaller than specified" do
+          image = @processor.resize(@image, '400x400<')
+          image.should have_width(315)
+          image.should have_height(400)
+        end
+
+      end
+
     end
-  
-    describe "NNxNN<" do
-    
-      it "should not resize if the image is larger than specified" do
-        image = @processor.resize(@image, '10x10<')
+
+    describe "crop" do # Difficult to test here other than dimensions
+
+      it "should not crop if no args given" do
+        image = @processor.crop(@image)
         image.should have_width(280)
         image.should have_height(355)
       end
-    
-      it "should resize if the image is smaller than specified" do
-        image = @processor.resize(@image, '400x400<')
-        image.should have_width(315)
-        image.should have_height(400)
+
+      it "should crop using the offset given" do
+        image = @processor.crop(@image, :x => '7', :y => '12')
+        image.should have_width(273)
+        image.should have_height(343)
       end
-    
-    end
-  
-  end
 
-  describe "crop" do # Difficult to test here other than dimensions
-  
-    it "should not crop if no args given" do
-      image = @processor.crop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
-    end
-  
-    it "should crop using the offset given" do
-      image = @processor.crop(@image, :x => '7', :y => '12')
-      image.should have_width(273)
-      image.should have_height(343)
-    end
-  
-    it "should crop using the dimensions given" do
-      image = @processor.crop(@image, :width => '10', :height => '20')
-      image.should have_width(10)
-      image.should have_height(20)
-    end
-  
-    it "should crop in one dimension if given" do
-      image = @processor.crop(@image, :width => '10')
-      image.should have_width(10)
-      image.should have_height(355)
-    end
-  
-    it "should take into account the gravity given" do
-      image1 = @processor.crop(@image, :width => '10', :height => '10', :gravity => 'nw')
-      image2 = @processor.crop(@image, :width => '10', :height => '10', :gravity => 'se')
-      image1.should_not == image2
-    end
-  
-    it "should clip bits of the image outside of the requested crop area when not nw gravity" do
-      # Rmagick was previously throwing an error when the cropping area was outside the image size, when
-      # using a gravity other than nw
-      image = @processor.crop(@image, :width => '500', :height => '1000', :x => '100', :y => '200', :gravity => 'se')
-      image.should have_width(180)
-      image.should have_height(155)
-    end
-  
-  end
+      it "should crop using the dimensions given" do
+        image = @processor.crop(@image, :width => '10', :height => '20')
+        image.should have_width(10)
+        image.should have_height(20)
+      end
 
-  describe "greyscale" do
-    it "should not raise an error" do
-      # Bit tricky to test
-      @processor.greyscale(@image)
-    end
-  end
+      it "should crop in one dimension if given" do
+        image = @processor.crop(@image, :width => '10')
+        image.should have_width(10)
+        image.should have_height(355)
+      end
+
+      it "should take into account the gravity given" do
+        image1 = @processor.crop(@image, :width => '10', :height => '10', :gravity => 'nw')
+        image2 = @processor.crop(@image, :width => '10', :height => '10', :gravity => 'se')
+        image1.should_not == image2
+      end
+
+      it "should clip bits of the image outside of the requested crop area when not nw gravity" do
+        # Rmagick was previously throwing an error when the cropping area was outside the image size, when
+        # using a gravity other than nw
+        image = @processor.crop(@image, :width => '500', :height => '1000', :x => '100', :y => '200', :gravity => 'se')
+        image.should have_width(180)
+        image.should have_height(155)
+      end
 
-  describe "resize_and_crop" do
-  
-    it "should do nothing if no args given" do
-      image = @processor.resize_and_crop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
     end
-  
-    it "should crop to the correct dimensions" do
-      image = @processor.resize_and_crop(@image, :width => '100', :height => '100')
-      image.should have_width(100)
-      image.should have_height(100)
+
+    describe "greyscale" do
+      it "should not raise an error" do
+        # Bit tricky to test
+        @processor.greyscale(@image)
+      end
     end
-  
-    it "should allow cropping in one dimension" do
-      image = @processor.resize_and_crop(@image, :width => '100')
-      image.should have_width(100)
-      image.should have_height(355)
+
+    describe "resize_and_crop" do
+
+      it "should do nothing if no args given" do
+        image = @processor.resize_and_crop(@image)
+        image.should have_width(280)
+        image.should have_height(355)
+      end
+
+      it "should crop to the correct dimensions" do
+        image = @processor.resize_and_crop(@image, :width => '100', :height => '100')
+        image.should have_width(100)
+        image.should have_height(100)
+      end
+
+      it "should allow cropping in one dimension" do
+        image = @processor.resize_and_crop(@image, :width => '100')
+        image.should have_width(100)
+        image.should have_height(355)
+      end
+
+      it "should take into account the gravity given" do
+        image1 = @processor.resize_and_crop(@image, :width => '10', :height => '10', :gravity => 'nw')
+        image2 = @processor.resize_and_crop(@image, :width => '10', :height => '10', :gravity => 'se')
+        image1.should_not == image2
+      end
+
     end
-  
-    it "should take into account the gravity given" do
-      image1 = @processor.resize_and_crop(@image, :width => '10', :height => '10', :gravity => 'nw')
-      image2 = @processor.resize_and_crop(@image, :width => '10', :height => '10', :gravity => 'se')
-      image1.should_not == image2
+
+    describe "rotate" do
+
+      it "should rotate by 90 degrees" do
+        image = @processor.rotate(@image, 90)
+        image.should have_width(355)
+        image.should have_height(280)
+      end
+
+      it "should not rotate given a larger height and the '>' qualifier" do
+        image = @processor.rotate(@image, 90, :qualifier => '>')
+        image.should have_width(280)
+        image.should have_height(355)
+      end
+
+      it "should rotate given a larger height and the '<' qualifier" do
+        image = @processor.rotate(@image, 90, :qualifier => '<')
+        image.should have_width(355)
+        image.should have_height(280)
+      end
+
     end
-  
-  end
 
-  describe "rotate" do
-  
-    it "should rotate by 90 degrees" do
-      image = @processor.rotate(@image, 90)
-      image.should have_width(355)
-      image.should have_height(280)
+    describe "thumb" do
+      it "should call resize if the correct string given" do
+        @processor.should_receive(:resize).with(@image, '30x40').and_return(image = mock)
+        @processor.thumb(@image, '30x40').should == image
+      end
+      it "should call resize_and_crop if the correct string given" do
+        @processor.should_receive(:resize_and_crop).with(@image, :width => '30', :height => '40', :gravity => 'se').and_return(image = mock)
+        @processor.thumb(@image, '30x40#se').should == image
+      end
+      it "should call crop if x and y given" do
+        @processor.should_receive(:crop).with(@image, :width => '30', :height => '40', :x => '+10', :y => '+20', :gravity => nil).and_return(image = mock)
+        @processor.thumb(@image, '30x40+10+20').should == image
+      end
+      it "should call crop if just gravity given" do
+        @processor.should_receive(:crop).with(@image, :width => '30', :height => '40', :x => nil, :y => nil, :gravity => 'sw').and_return(image = mock)
+        @processor.thumb(@image, '30x40sw').should == image
+      end
+      it "should call crop if x, y and gravity given" do
+        @processor.should_receive(:crop).with(@image, :width => '30', :height => '40', :x => '-10', :y => '-20', :gravity => 'se').and_return(image = mock)
+        @processor.thumb(@image, '30x40-10-20se').should == image
+      end
+      it "should raise an argument error if an unrecognized string is given" do
+        lambda{ @processor.thumb(@image, '30x40#ne!') }.should raise_error(ArgumentError)
+      end
     end
-  
-    it "should not rotate given a larger height and the '>' qualifier" do
-      image = @processor.rotate(@image, 90, :qualifier => '>')
-      image.should have_width(280)
-      image.should have_height(355)
+
+    describe "flip" do
+      it "should flip the image, leaving the same dimensions" do
+        image = @processor.flip(@image)
+        image.should have_width(280)
+        image.should have_height(355)
+      end
     end
-  
-    it "should rotate given a larger height and the '<' qualifier" do
-      image = @processor.rotate(@image, 90, :qualifier => '<')
-      image.should have_width(355)
-      image.should have_height(280)
+
+    describe "flop" do
+      it "should flop the image, leaving the same dimensions" do
+        image = @processor.flop(@image)
+        image.should have_width(280)
+        image.should have_height(355)
+      end
     end
-  
+
   end
 
-  describe "thumb" do
-    it "should call resize if the correct string given" do
-      @processor.should_receive(:resize).with(@image, '30x40').and_return(image = mock)
-      @processor.thumb(@image, '30x40').should == image
-    end
-    it "should call resize_and_crop if the correct string given" do
-      @processor.should_receive(:resize_and_crop).with(@image, :width => '30', :height => '40', :gravity => 'se').and_return(image = mock)
-      @processor.thumb(@image, '30x40#se').should == image
-    end
-    it "should call crop if x and y given" do
-      @processor.should_receive(:crop).with(@image, :width => '30', :height => '40', :x => '+10', :y => '+20', :gravity => nil).and_return(image = mock)
-      @processor.thumb(@image, '30x40+10+20').should == image
-    end
-    it "should call crop if just gravity given" do
-      @processor.should_receive(:crop).with(@image, :width => '30', :height => '40', :x => nil, :y => nil, :gravity => 'sw').and_return(image = mock)
-      @processor.thumb(@image, '30x40sw').should == image
-    end
-    it "should call crop if x, y and gravity given" do
-      @processor.should_receive(:crop).with(@image, :width => '30', :height => '40', :x => '-10', :y => '-20', :gravity => 'se').and_return(image = mock)
-      @processor.thumb(@image, '30x40-10-20se').should == image
-    end
-    it "should raise an argument error if an unrecognized string is given" do
-      lambda{ @processor.thumb(@image, '30x40#ne!') }.should raise_error(ArgumentError)
-    end
+  before(:each) do
+    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355
+    @image = Dragonfly::TempObject.new(File.new(sample_file))
+    @processor = Dragonfly::Processing::RMagickProcessor.new
   end
 
-  describe "flip" do
-    it "should flip the image, leaving the same dimensions" do
-      image = @processor.flip(@image)
-      image.should have_width(280)
-      image.should have_height(355)
+  describe "when using the filesystem" do
+    before(:each) do
+      @processor.use_filesystem = true
     end
+    it_should_behave_like "processing methods"
   end
 
-  describe "flop" do
-    it "should flop the image, leaving the same dimensions" do
-      image = @processor.flop(@image)
-      image.should have_width(280)
-      image.should have_height(355)
+  describe "when not using the filesystem" do
+    before(:each) do
+      @processor.use_filesystem = false
     end
+    it_should_behave_like "processing methods"
   end
-  
+
 end

data/spec/image_matchers.rb

@@ -1,11 +1,11 @@
 def image_properties(image)
-  data = case image
-  when Dragonfly::TempObject then image.data
-  when String then image
+  if image.is_a?(Tempfile)
+    tempfile = image
+  else
+    tempfile = Tempfile.new('image')
+    tempfile.write(image.is_a?(Dragonfly::TempObject) ? image.data : image)
+    tempfile.close
   end
-  tempfile = Tempfile.new('image')
-  tempfile.write(data)
-  tempfile.close
   details = `identify #{tempfile.path}`
   # example of details string:
   # myimage.png PNG 200x100 200x100+0+0 8-bit DirectClass 31.2kb

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
   - 7
-  - 4
-  version: 0.7.4
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Mark Evans
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 +01:00
+date: 2010-09-01 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -76,7 +74,7 @@ files:
 - features/images.feature
 - features/no_processing.feature
 - features/rails_2.3.5.feature
-- features/rails_3.0.0.rc.feature
+- features/rails_3.0.0.feature
 - features/steps/common_steps.rb
 - features/steps/dragonfly_steps.rb
 - features/steps/rails_steps.rb
@@ -90,7 +88,7 @@ files:
 - fixtures/files/features/support/paths.rb
 - fixtures/files/features/text_images.feature
 - fixtures/rails_2.3.5/template.rb
-- fixtures/rails_3.0.0.rc/template.rb
+- fixtures/rails_3.0.0/template.rb
 - irbrc.rb
 - lib/dragonfly.rb
 - lib/dragonfly/active_model_extensions.rb
@@ -148,6 +146,7 @@ files:
 - spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/analysis/r_magick_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
+- spec/dragonfly/config/r_magick_spec.rb
 - spec/dragonfly/configurable_spec.rb
 - spec/dragonfly/core_ext/string_spec.rb
 - spec/dragonfly/core_ext/symbol_spec.rb
@@ -194,7 +193,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -203,7 +201,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -224,6 +221,7 @@ test_files:
 - spec/dragonfly/analysis/file_command_analyser_spec.rb
 - spec/dragonfly/analysis/r_magick_analyser_spec.rb
 - spec/dragonfly/app_spec.rb
+- spec/dragonfly/config/r_magick_spec.rb
 - spec/dragonfly/configurable_spec.rb
 - spec/dragonfly/core_ext/string_spec.rb
 - spec/dragonfly/core_ext/symbol_spec.rb

data/features/rails_3.0.0.rc.feature

@@ -1,8 +0,0 @@
-Feature: champion uses dragonfly in his Rails 3.0.0.rc application
-  In order to be a champion
-  A user uses dragonfly in his Rails 3.0.0.rc application
-
-  Scenario: Set up dragonfly using initializer
-    Given a Rails 3.0.0.rc application set up for using dragonfly
-    Then the manage_album_images cucumber features in my Rails 3.0.0.rc app should pass
-    And the text_images cucumber features in my Rails 3.0.0.rc app should pass