dragonfly 0.7.7 → 0.8.0

data/lib/dragonfly/processing/image_magick_processor.rb

@@ -0,0 +1,99 @@
+module Dragonfly
+  module Processing
+    class ImageMagickProcessor
+
+      GRAVITIES = {
+        'nw' => 'NorthWest',
+        'n'  => 'North',
+        'ne' => 'NorthEast',
+        'w'  => 'West',
+        'c'  => 'Center',
+        'e'  => 'East',
+        'sw' => 'SouthWest',
+        's'  => 'South',
+        'se' => 'SouthEast'
+      }
+      
+      # Geometry string patterns
+      RESIZE_GEOMETRY         = /^\d*x\d*[><%^!]?$|^\d+@$/ # e.g. '300x200!'
+      CROPPED_RESIZE_GEOMETRY = /^(\d+)x(\d+)#(\w{1,2})?$/ # e.g. '20x50#ne'
+      CROP_GEOMETRY           = /^(\d+)x(\d+)([+-]\d+)?([+-]\d+)?(\w{1,2})?$/ # e.g. '30x30+10+10'
+      THUMB_GEOMETRY = Regexp.union RESIZE_GEOMETRY, CROPPED_RESIZE_GEOMETRY, CROP_GEOMETRY
+      
+      include ImageMagickUtils
+      
+      def resize(temp_object, geometry)
+        convert(temp_object, "-resize '#{geometry}'")
+      end
+      
+      def crop(temp_object, opts={})
+        width   = opts[:width]
+        height  = opts[:height]
+        gravity = GRAVITIES[opts[:gravity]]
+        x       = "#{opts[:x] || 0}"
+        x = '+' + x unless x[/^[+-]/]
+        y       = "#{opts[:y] || 0}"
+        y = '+' + y unless y[/^[+-]/]
+      
+        convert(temp_object, "-crop #{width}x#{height}#{x}#{y}#{" -gravity #{gravity}" if gravity}")
+      end
+      
+      def flip(temp_object)
+        convert(temp_object, "-flip")
+      end
+      
+      def flop(temp_object)
+        convert(temp_object, "-flop")
+      end
+      
+      def greyscale(temp_object)
+        convert(temp_object, "-colorspace Gray")
+      end
+      alias grayscale greyscale
+      
+      def resize_and_crop(temp_object, opts={})
+        attrs          = identify(temp_object)
+        current_width  = attrs[:width].to_i
+        current_height = attrs[:height].to_i
+        
+        width   = opts[:width]  ? opts[:width].to_i  : current_width
+        height  = opts[:height] ? opts[:height].to_i : current_height
+        gravity = opts[:gravity] || 'c'
+
+        if width != current_width || height != current_height
+          scale = [width.to_f / current_width, height.to_f / current_height].max
+          temp_object = TempObject.new(resize(temp_object, "#{(scale * current_width).ceil}x#{(scale * current_height).ceil}"))
+        end
+
+        crop(temp_object, :width => width, :height => height, :gravity => gravity)
+      end
+      
+      def rotate(temp_object, amount, opts={})
+        convert(temp_object, "-rotate '#{amount}#{opts[:qualifier]}'")
+      end
+      
+      def thumb(temp_object, geometry)
+        case geometry
+        when RESIZE_GEOMETRY
+          resize(temp_object, geometry)
+        when CROPPED_RESIZE_GEOMETRY
+          resize_and_crop(temp_object, :width => $1, :height => $2, :gravity => $3)
+        when CROP_GEOMETRY
+          crop(temp_object,
+            :width => $1,
+            :height => $2,
+            :x => $3,
+            :y => $4,
+            :gravity => $5
+          )
+        else raise ArgumentError, "Didn't recognise the geometry string #{geometry}"
+        end
+      end
+      
+      def convert(temp_object, args='', format=nil)
+        format ? [super, {:format => format.to_sym}] : super
+      end
+      
+    end
+  end
+end

data/lib/dragonfly/rails/images.rb

@@ -5,7 +5,7 @@ require 'uri'
 ### The dragonfly app ###
 app = Dragonfly[:images]
 app.configure_with(:rails)
-app.configure_with(:rmagick)
+app.configure_with(:imagemagick)
 
 ### Extend active record ###
 app.define_macro(ActiveRecord::Base, :image_accessor)

data/lib/dragonfly/temp_object.rb

@@ -163,20 +163,21 @@ module Dragonfly
     private
 
     def initialize_from_object!(obj)
-      case obj
-      when TempObject
+      if obj.is_a? TempObject
         @initialized_data = obj.initialized_data
         @initialized_tempfile = copy_to_tempfile(obj.initialized_tempfile.path) if obj.initialized_tempfile
         @initialized_file = obj.initialized_file
-      when String
+      elsif obj.is_a? String
         @initialized_data = obj
-      when Tempfile
+      elsif obj.is_a? Tempfile
         @initialized_tempfile = obj
-      when File
+      elsif obj.is_a? File
         @initialized_file = obj
         self.name = File.basename(obj.path)
+      elsif obj.respond_to?(:tempfile)
+        @initialized_tempfile = obj.tempfile
       else
-        raise ArgumentError, "#{self.class.name} must be initialized with a String, a File, a Tempfile, or another TempObject"
+        raise ArgumentError, "#{self.class.name} must be initialized with a String, a File, a Tempfile, another TempObject, or something that responds to .tempfile"
       end
       self.name = obj.original_filename if obj.respond_to?(:original_filename)
     end

data/spec/dragonfly/analysis/image_magick_analyser_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'dragonfly/analysis/shared_analyser_spec'
+
+describe Dragonfly::Analysis::ImageMagickAnalyser do
+  
+  before(:each) do
+    image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
+    @image = Dragonfly::TempObject.new(File.new(image_path))
+    @analyser = Dragonfly::Analysis::ImageMagickAnalyser.new
+    @analyser.log = Logger.new(LOG_FILE)
+  end
+
+  it_should_behave_like "image analyser methods"
+
+end

data/spec/dragonfly/analysis/r_magick_analyser_spec.rb

@@ -1,71 +1,27 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
+require 'dragonfly/analysis/shared_analyser_spec'
 
 describe Dragonfly::Analysis::RMagickAnalyser do
   
   before(:each) do
     image_path = File.dirname(__FILE__) + '/../../../samples/beach.png'
-    @beach = Dragonfly::TempObject.new(File.new(image_path))
+    @image = Dragonfly::TempObject.new(File.new(image_path))
     @analyser = Dragonfly::Analysis::RMagickAnalyser.new
     @analyser.log = Logger.new(LOG_FILE)
   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 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 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 format" do
-      @analyser.format(@beach).should == :png
-    end
-    
-  end
   
   describe "when using the filesystem" do
     before(:each) do
       @analyser.use_filesystem = true
     end
-    it_should_behave_like "analysis methods"
+    it_should_behave_like "image analyser methods"
   end
   
   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|
-    it "should throw unable_to_handle in #{meth.inspect} if it's not an image file" do
-      temp_object = Dragonfly::TempObject.new('blah')
-      lambda{
-        @analyser.send(meth, temp_object)
-      }.should throw_symbol(:unable_to_handle)
-    end
+    it_should_behave_like "image analyser methods"
   end
   
 end

data/spec/dragonfly/analysis/shared_analyser_spec.rb

@@ -0,0 +1,51 @@
+# NEEDS:
+#
+# @image
+# @processor
+#
+describe "image analyser methods", :shared => true do
+  
+  it "should return the width" do
+    @analyser.width(@image).should == 280
+  end
+
+  it "should return the height" do
+    @analyser.height(@image).should == 355
+  end
+
+  it "should return the aspect ratio" do
+    @analyser.aspect_ratio(@image).should == (280.0/355.0)
+  end
+
+  it "should say if it's portrait" do
+    @analyser.portrait?(@image).should be_true
+  end
+
+  it "should say if it's landscape" do
+    @analyser.landscape?(@image).should be_false
+  end
+
+  it "should return the number of colours" do
+    @analyser.number_of_colours(@image).should == 34703
+  end
+
+  it "should return the depth" do
+    @analyser.depth(@image).should == 8
+  end
+
+  it "should return the format" do
+    @analyser.format(@image).should == :png
+  end
+
+  %w(width height aspect_ratio number_of_colours depth format portrait? landscape?).each do |meth|
+    it "should throw unable_to_handle in #{meth.inspect} if it's not an image file" do
+      suppressing_stderr do
+        temp_object = Dragonfly::TempObject.new('blah')
+        lambda{
+          @analyser.send(meth, temp_object)
+        }.should throw_symbol(:unable_to_handle)
+      end
+    end
+  end
+
+end

data/spec/dragonfly/app_spec.rb

@@ -235,6 +235,8 @@ describe Dragonfly::App do
     end
 
     {
+      :imagemagick => Dragonfly::Config::ImageMagick,
+      :image_magick => Dragonfly::Config::ImageMagick,
       :rmagick => Dragonfly::Config::RMagick,
       :r_magick => Dragonfly::Config::RMagick,
       :rails => Dragonfly::Config::Rails,

data/spec/dragonfly/data_storage/data_store_spec.rb

@@ -13,6 +13,12 @@ describe "data_store", :shared => true do
       temp_object2 = Dragonfly::TempObject.new('gollum')
       @data_store.store(@temp_object).should_not == @data_store.store(temp_object2)
     end
+    it "should return a unique identifier for each storage even when the first is deleted" do
+      uid1 = @data_store.store(@temp_object)
+      @data_store.destroy(uid1)
+      uid2 = @data_store.store(@temp_object)
+      uid1.should_not == uid2
+    end
     it "should allow for passing in options as a second argument" do
       @data_store.store(@temp_object, :some => :option)
     end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -33,7 +33,7 @@ describe Dragonfly::DataStorage::FileDataStore do
     before(:each) do
       # Set 'now' to a date in the past
       Time.stub!(:now).and_return Time.mktime(1984,"may",4,14,28,1)
-      @file_pattern_prefix_without_root = '1984/05/04/'
+      @file_pattern_prefix_without_root = '1984/05/04/14_28_01_0_'
       @file_pattern_prefix = "#{@data_store.root_path}/#{@file_pattern_prefix_without_root}"
     end
     

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -4,7 +4,10 @@ require 'yaml'
 
 describe Dragonfly::DataStorage::S3DataStore do
 
-  # Change this to test it with an actual internet connection
+  # To run these tests, put a file ".s3_spec.yml" in the dragonfly root dir, like this:
+  # key: XXXXXXXXXX
+  # secret: XXXXXXXXXX
+  # enabled: true
   if File.exist?(file = File.expand_path('../../../../.s3_spec.yml', __FILE__))
     config = YAML.load_file(file)
     KEY = config['key']
@@ -53,6 +56,13 @@ describe Dragonfly::DataStorage::S3DataStore do
           data, extra = @data_store.retrieve(uid)
           data.should == 'eggheads'
         end
+        
+        it "should work fine when not using the filesystem" do
+          @data_store.use_filesystem = false
+          temp_object = Dragonfly::TempObject.new('gollum')
+          uid = @data_store.store(temp_object)
+          @data_store.retrieve(uid).should == ["gollum", {:meta=>{}, :format=>nil, :name=>nil}]
+        end
       end
 
     end

data/spec/dragonfly/deprecation_spec.rb

@@ -5,8 +5,8 @@ describe "Deprecated stuff" do
   describe "job urls" do
     
     before(:each) do
-      @app = test_app.configure_with(:rmagick) do |c|
-        c.log = Logger.new($stdout)
+      @app = test_app.configure_with(:imagemagick) do |c|
+        # c.log = Logger.new($stdout)
       end
       @job = @app.fetch('eggs')
     end

data/spec/dragonfly/encoding/image_magick_encoder_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe Dragonfly::Encoding::ImageMagickEncoder do
+  
+  before(:all) do
+    sample_file = File.dirname(__FILE__) + '/../../../samples/beach.png' # 280x355, 135KB
+    @image = Dragonfly::TempObject.new(File.new(sample_file))
+    @encoder = Dragonfly::Encoding::ImageMagickEncoder.new
+  end
+  
+  describe "#encode" do
+    
+    it "should encode the image to the correct format" do
+      image = @encoder.encode(@image, :gif)
+      image.should have_format('gif')
+    end
+    
+    it "should throw :unable_to_handle if the format is not handleable" do
+      lambda{
+        @encoder.encode(@image, :goofy)
+      }.should throw_symbol(:unable_to_handle)
+    end
+    
+    it "should do nothing if the image is already in the correct format" do
+      image = @encoder.encode(@image, :png)
+      image.should == @image
+    end
+
+    it "should allow for extra args" do
+      image = @encoder.encode(@image, :jpg, '-quality 1')
+      image.should have_format('jpeg')
+      image.should have_size('1.45KB')
+    end
+    
+    it "should still work even if the image is already in the correct format and args are given" do
+      image = @encoder.encode(@image, :png, '-quality 1')
+      image.should_not == @image
+    end
+  end
+  
+end

data/spec/dragonfly/encoding/r_magick_encoder_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe Dragonfly::Encoding::RMagickEncoder do
   
@@ -16,12 +16,9 @@ describe Dragonfly::Encoding::RMagickEncoder do
     end
     
     it "should throw :unable_to_handle if the format is not handleable" do
-      test_string = "I'm a string"
-      catch :unable_to_handle do
+      lambda{
         @encoder.encode(@image, :goofy)
-        test_string = "This line should not happen"
-      end
-      test_string.should == "I'm a string"
+      }.should throw_symbol(:unable_to_handle)
     end
     
     it "should do nothing if the image is already in the correct format" do

data/spec/dragonfly/generation/hash_with_css_style_keys_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Dragonfly::Generation::HashWithCssStyleKeys do
+  
+  before(:each) do
+    @hash = Dragonfly::Generation::HashWithCssStyleKeys[
+      :font_style => 'normal',
+      :'font-weight' => 'bold',
+      'font_colour' => 'white',
+      'font-size' => 23,
+      :hello => 'there'
+    ]
+  end
+
+  describe "accessing using underscore symbol style" do
+    it{ @hash[:font_style].should == 'normal' }
+    it{ @hash[:font_weight].should == 'bold' }
+    it{ @hash[:font_colour].should == 'white' }
+    it{ @hash[:font_size].should == 23 }
+    it{ @hash[:hello].should == 'there' }
+    it{ @hash[:non_existent_key].should be_nil }
+  end
+
+end