dragonfly 0.1.6 → 0.2.1

data/lib/dragonfly/processing/base.rb

@@ -0,0 +1,9 @@
+module Dragonfly
+  module Processing
+    class Base
+
+      include Delegatable
+
+    end
+  end
+end

data/lib/dragonfly/processing/r_magick_processor.rb

@@ -3,7 +3,7 @@ require 'rmagick'
 module Dragonfly
   module Processing
 
-    module RMagickProcessor
+    class RMagickProcessor < Base
       
       GRAVITY_MAPPINGS = {
         'nw' => Magick::NorthWestGravity,
@@ -34,6 +34,20 @@ module Dragonfly
         image.crop(gravity, x, y, width, height).to_blob
       end
       
+      def generate(width, height)
+        image = Magick::Image.new(width, height)
+        num_points = 7
+        args = []
+        num_points.times do
+          args << rand(width)
+          args << rand(height)
+          args << "rgb(#{rand(256)},#{rand(256)},#{rand(256)})"
+        end
+        image = image.sparse_color(Magick::ShepardsColorInterpolate, *args)
+        image.format = 'png'
+        image.to_blob
+      end
+      
       def resize(temp_object, opts={})
         rmagick_image(temp_object).change_geometry!(opts[:geometry]) do |cols, rows, img|
          img.resize!(cols, rows)

data/lib/dragonfly/r_magick_configuration.rb

@@ -1,16 +1,20 @@
 module Dragonfly
+  
+  # RMagickConfiguration is a saved configuration for Dragonfly apps, which does the following:
+  # - registers an rmagick analyser
+  # - registers an rmagick processor
+  # - registers an rmagick encoder
+  # - adds parameter shortcuts like '280x140!', etc.
+  # Look at the source code for apply_configuration to see exactly how it configures the app.
   module RMagickConfiguration
     
     def self.apply_configuration(app)
       app.configure do |c|
-        c.analyser do |a|
-          a.register(Analysis::RMagickAnalyser.new)
-        end
-        c.processor do |p|
-          p.register(Processing::RMagickProcessor)
-        end
-        c.encoder = Encoding::RMagickEncoder.new
-        c.parameters do |p|
+        c.register_analyser(Analysis::FileCommandAnalyser)
+        c.register_analyser(Analysis::RMagickAnalyser)
+        c.register_processor(Processing::RMagickProcessor)
+        c.register_encoder(Encoding::RMagickEncoder)
+        c.parameters.configure do |p|
           p.default_format = :jpg
           # Standard resizing like '30x40!', etc.
           p.add_shortcut(Symbol) do |format|

data/lib/dragonfly/rails/images.rb

@@ -9,7 +9,7 @@ app.configure do |c|
   c.datastore.configure do |d|
     d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
   end
-  c.url_handler do |u|
+  c.url_handler.configure do |u|
     u.protect_from_dos_attacks = false
     u.path_prefix = '/media'
   end

data/lib/dragonfly/temp_object.rb

@@ -20,8 +20,10 @@ module Dragonfly
     attr_accessor :name
     
     def modify_self!(obj)
-      reset!
-      initialize_from_object!(obj)
+      unless obj == self
+        reset!
+        initialize_from_object!(obj)
+      end
       self
     end
     
@@ -79,6 +81,15 @@ module Dragonfly
       end
     end
     
+    def to_file(path)
+      if initialized_data
+        File.open(path, 'w'){|f| f.write(initialized_data) }
+      else
+        FileUtils.cp(self.path, path)
+      end
+      File.new(path)
+    end
+    
     protected
     
     attr_accessor :initialized_data, :initialized_tempfile, :initialized_file
@@ -103,6 +114,7 @@ module Dragonfly
         @initialized_tempfile = obj
       when File
         @initialized_file = obj
+        self.name = File.basename(obj.path)
       else
         raise ArgumentError, "#{self.class.name} must be initialized with a String, a File or a Tempfile"
       end

data/lib/dragonfly/url_handler.rb

@@ -52,12 +52,12 @@ module Dragonfly
     end
 
     def parameters_to_url(parameters)
-      parameters.validate!
       query_string = [:processing_method, :processing_options, :encoding].map do |attribute|
         build_query(MAPPINGS[attribute] => parameters[attribute]) unless parameters[attribute].blank?
       end.compact.join('&')
       sha_string = "&#{MAPPINGS[:sha]}=#{sha_from_parameters(parameters)}" if protect_from_dos_attacks?
-      url = "#{path_prefix}/#{escape_except_for_slashes(parameters.uid)}.#{parameters.format}?#{query_string}#{sha_string}"
+      ext = ".#{parameters.format}" if parameters.format
+      url = "#{path_prefix}/#{escape_except_for_slashes(parameters.uid)}#{ext}?#{query_string}#{sha_string}"
       url.sub!(/\?$/,'')
       url
     end
@@ -82,7 +82,8 @@ module Dragonfly
     end
   
     def extract_format(path, query)
-      path.sub(/^\//,'').split('.').last
+      bits = path.sub(/^\//,'').split('.')
+      bits.last if bits.length > 1
     end
   
     def extract_encoding(path, query)
@@ -140,9 +141,7 @@ module Dragonfly
     end
     
     def validate_format!(path)
-      if path !~ /^#{path_prefix}/ || path !~ /^.*[^\/].*\..*[^\/].*$/
-        raise UnknownUrl, "path '#{path}' not found" 
-      end
+      raise UnknownUrl, "path '#{path}' not found" unless path =~ %r(^#{path_prefix}/[^.]+)
     end
     
   end

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -93,9 +93,6 @@ describe Item do
         it "should return nil for the url" do
           @item.preview_image.url.should be_nil
         end
-        it "should return the size" do
-          @item.preview_image.size.should == 10
-        end
         it "should return the temp_object" do
           temp_object = @item.preview_image.temp_object
           temp_object.should be_a(Dragonfly::ExtendedTempObject)
@@ -135,39 +132,35 @@ describe Item do
           @item.preview_image.url(:arg).should == 'some.url'
         end
         
-        describe "when reloaded" do
+        describe "when accessed by a new model object" do
           before(:each) do
-            @item.reload
+            @item = Item.find(@item.id)
           end
           it "should destroy the data on destroy" do
             @app.datastore.should_receive(:destroy).with(@item.preview_image_uid)
             @item.destroy
           end
-          it "should return the size" do
-            @item.preview_image.size.should == 10
-          end
           it "should return the temp_object" do
-            temp_object = @item.preview_image.temp_object
-            temp_object.should be_a(Dragonfly::ExtendedTempObject)
-            temp_object.data.should == 'DATASTRING'
+            @app.should_receive(:fetch).with('some_uid').and_return(temp_object = mock('extended temp_object'))
+            @item.preview_image.temp_object.should == temp_object
           end
         end
 
         describe "when something new is assigned" do
           before(:each) do
-            @item.preview_image = "NEWDATASTRING"
+            @item.preview_image = "ANEWDATASTRING"
           end
           it "should set the uid to pending" do
             @item.preview_image_uid.should be_a(Dragonfly::ActiveRecordExtensions::PendingUID)
           end
           it "should destroy the old data when saved" do
-            @app.datastore.should_receive(:store).with(a_temp_object_with_data("NEWDATASTRING")).once.and_return('some_uid')
+            @app.datastore.should_receive(:store).with(a_temp_object_with_data("ANEWDATASTRING")).once.and_return('some_uid')
             
             @app.datastore.should_receive(:destroy).with('some_uid')
             @item.save!
           end
           it "should store the new data when saved" do
-            @app.datastore.should_receive(:store).with(a_temp_object_with_data("NEWDATASTRING"))
+            @app.datastore.should_receive(:store).with(a_temp_object_with_data("ANEWDATASTRING"))
             @item.save!
           end
           it "should destroy the old data on destroy" do
@@ -175,12 +168,12 @@ describe Item do
             @item.destroy
           end
           it "should return the new size" do
-            @item.preview_image.size.should == 13
+            @item.preview_image.size.should == 14
           end
           it "should return the new temp_object" do
             temp_object = @item.preview_image.temp_object
             temp_object.should be_a(Dragonfly::ExtendedTempObject)
-            temp_object.data.should == 'NEWDATASTRING'
+            temp_object.data.should == 'ANEWDATASTRING'
           end
         end
         
@@ -216,9 +209,8 @@ describe Item do
         end
 
       end
-
     end
-  end  
+  end
 
   describe "validations" do
 
@@ -265,26 +257,33 @@ describe Item do
       
     end
     
-    describe "validates_mime_type_of" do
+    describe "validates_property" do
 
       before(:each) do
         @item = Item.new(:preview_image => "1234567890")
       end
 
       before(:all) do
-        custom_analyser = Object.new
-        def custom_analyser.mime_type(temp_object)
-          case temp_object.data
-          when "WRONG TYPE" then 'wrong/type'
-          when "OTHER TYPE" then nil
-          else 'how/special'
+        custom_analyser = Class.new(Dragonfly::Analysis::Base)
+        custom_analyser.class_eval do
+          def mime_type(temp_object)
+            case temp_object.data
+            when "WRONG TYPE" then 'wrong/type'
+            when "OTHER TYPE" then nil
+            else 'how/special'
+            end
+          end
+
+          def number_of_Gs(temp_object)
+            temp_object.data.count('G')
           end
         end
-        @app.analyser.register(custom_analyser)
+        @app.register_analyser(custom_analyser)
         
         Item.class_eval do
-          validates_mime_type_of :preview_image, :in => ['how/special', 'how/crazy'], :if => :its_friday
-          validates_mime_type_of :other_image, :yet_another_image, :as => 'how/special'
+          validates_property :mime_type, :of => :preview_image, :in => ['how/special', 'how/crazy'], :if => :its_friday
+          validates_property :mime_type, :of => [:other_image, :yet_another_image], :as => 'how/special'
+          validates_property :number_of_Gs, :of => :preview_image, :in => (0..2)
 
           image_accessor :preview_image
           image_accessor :other_image
@@ -297,21 +296,27 @@ describe Item do
         end
       end
     
-      it "should be valid if nil, if not validated on presence (even with validates_mime_type_of)" do
+      it "should be valid if nil, if not validated on presence (even with validates_property)" do
         @item.other_image = nil
         @item.should be_valid
       end
     
-      it "should be invalid if the mime_type is unknown" do
+      it "should be invalid if the property is nil" do
         @item.preview_image = "OTHER TYPE"
         @item.should_not be_valid
-        @item.errors.on(:preview_image).should == "doesn't have the correct MIME-type. It needs to be one of 'how/special', 'how/crazy', but was 'unknown'"
+        @item.errors.on(:preview_image).should == "mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was ''"
       end
 
-      it "should be invalid if the mime_type is wrong" do
+      it "should be invalid if the property is wrong" do
         @item.preview_image = "WRONG TYPE"
         @item.should_not be_valid
-        @item.errors.on(:preview_image).should == "doesn't have the correct MIME-type. It needs to be one of 'how/special', 'how/crazy', but was 'wrong/type'"
+        @item.errors.on(:preview_image).should == "mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was 'wrong/type'"
+      end
+      
+      it "should work for a range" do
+        @item.preview_image = "GOOGLE GUM"
+        @item.should_not be_valid
+        @item.errors.on(:preview_image).should == "number of gs is incorrect. It needs to be between 0 and 2, but was '3'"
       end
 
       it "should validate individually" do
@@ -319,7 +324,7 @@ describe Item do
         @item.yet_another_image = "WRONG TYPE"
         @item.should_not be_valid
         @item.errors.on(:other_image).should be_nil
-        @item.errors.on(:yet_another_image).should == "doesn't have the correct MIME-type. It needs to be 'how/special', but was 'wrong/type'"
+        @item.errors.on(:yet_another_image).should == "mime type is incorrect. It needs to be 'how/special', but was 'wrong/type'"
       end
 
       it "should include standard extra options like 'if' on mime type validation" do
@@ -331,24 +336,44 @@ describe Item do
       it "should require either :as or :in as an argument" do
         lambda{
           Item.class_eval do
-            validates_mime_type_of :preview_image
+            validates_property :mime_type, :of => :preview_image
+          end
+        }.should raise_error(ArgumentError)
+      end
+
+      it "should require :of as an argument" do
+        lambda{
+          Item.class_eval do
+            validates_property :mime_type, :as => 'hi/there'
           end
         }.should raise_error(ArgumentError)
       end
 
     end
 
+    describe "validates_mime_type_of" do
+      it "should provide validates_mime_type as a convenience wrapper for validates_property" do
+        Item.should_receive(:validates_property).with(:mime_type, :of => :preview_image, :in => ['how/special', 'how/crazy'], :if => :its_friday)
+        Item.class_eval do
+          validates_mime_type_of :preview_image, :in => ['how/special', 'how/crazy'], :if => :its_friday
+        end
+      end
+    end
+
   end
 
-  describe "magic attributes" do
-    
+  describe "extra properties" do
+
     before(:each) do
       @app = Dragonfly::App[:images]
-      custom_analyser = Object.new
-      def custom_analyser.some_analyser_method(temp_object)
-        "abc" + temp_object.data[0..0]
+      custom_analyser = Class.new(Dragonfly::Analysis::Base)
+      custom_analyser.class_eval do
+        def some_analyser_method(temp_object)
+          "abc" + temp_object.data[0..0]
+        end
+        def number_of_As(temp_object); temp_object.data.count('A'); end
       end
-      @app.analyser.register(custom_analyser)
+      @app.register_analyser(custom_analyser)
       ActiveRecord::Base.register_dragonfly_app(:image, @app)
       Item.class_eval do
         image_accessor :preview_image
@@ -356,59 +381,125 @@ describe Item do
       @item = Item.new
     end
     
-    it "should default the magic attribute as nil" do
-      @item.preview_image_some_analyser_method.should be_nil
-    end
+    describe "magic attributes" do
     
-    it "should set the magic attribute when assigned" do
-      @item.preview_image = '123'
-      @item.preview_image_some_analyser_method.should == 'abc1'
-    end
+      it "should default the magic attribute as nil" do
+        @item.preview_image_some_analyser_method.should be_nil
+      end
     
-    it "should not set non-magic attributes with the same prefix when assigned" do
-      @item.preview_image_blah_blah = 'wassup'
-      @item.preview_image = '123'
-      @item.preview_image_blah_blah.should == 'wassup'
-    end
+      it "should set the magic attribute when assigned" do
+        @item.preview_image = '123'
+        @item.preview_image_some_analyser_method.should == 'abc1'
+      end
     
-    it "should update the magic attribute when something else is assigned" do
-      @item.preview_image = '123'
-      @item.preview_image = '456'
-      @item.preview_image_some_analyser_method.should == 'abc4'
-    end
+      it "should not set non-magic attributes with the same prefix when assigned" do
+        @item.preview_image_blah_blah = 'wassup'
+        @item.preview_image = '123'
+        @item.preview_image_blah_blah.should == 'wassup'
+      end
     
-    it "should reset the magic attribute when set to nil" do
-      @item.preview_image = '123'
-      @item.preview_image = nil
-      @item.preview_image_some_analyser_method.should be_nil
-    end
+      it "should update the magic attribute when something else is assigned" do
+        @item.preview_image = '123'
+        @item.preview_image = '456'
+        @item.preview_image_some_analyser_method.should == 'abc4'
+      end
     
-    it "should not reset non-magic attributes with the same prefix when set to nil" do
-      @item.preview_image_blah_blah = 'wassup'
-      @item.preview_image = '123'
-      @item.preview_image = nil
-      @item.preview_image_blah_blah.should == 'wassup'
-    end
+      it "should reset the magic attribute when set to nil" do
+        @item.preview_image = '123'
+        @item.preview_image = nil
+        @item.preview_image_some_analyser_method.should be_nil
+      end
     
-    it "should work for size too" do
-      @item.preview_image = '123'
-      @item.preview_image_size.should == 3
-    end
+      it "should not reset non-magic attributes with the same prefix when set to nil" do
+        @item.preview_image_blah_blah = 'wassup'
+        @item.preview_image = '123'
+        @item.preview_image = nil
+        @item.preview_image_blah_blah.should == 'wassup'
+      end
     
-    it "should store the original file extension if it exists" do
-      data = 'jasdlkf sadjl'
-      data.stub!(:original_filename).and_return('hello.png')
-      @item.preview_image = data
-      @item.preview_image_ext.should == 'png'
-    end
+      it "should work for size too" do
+        @item.preview_image = '123'
+        @item.preview_image_size.should == 3
+      end
+    
+      it "should store the original file extension if it exists" do
+        data = 'jasdlkf sadjl'
+        data.stub!(:original_filename).and_return('hello.png')
+        @item.preview_image = data
+        @item.preview_image_ext.should == 'png'
+      end
 
-    it "should store the original file name if it exists" do
-      data = 'jasdlkf sadjl'
-      data.stub!(:original_filename).and_return('hello.png')
-      @item.preview_image = data
-      @item.preview_image_name.should == 'hello.png'
+      it "should store the original file name if it exists" do
+        data = 'jasdlkf sadjl'
+        data.stub!(:original_filename).and_return('hello.png')
+        @item.preview_image = data
+        @item.preview_image_name.should == 'hello.png'
+      end
     end
+  
+  
+    describe "delegating methods to the temp_object" do
+      before(:each) do
+        @item.preview_image = "DATASTRING"
+      end
+      it "should have properties from the analyser" do
+        @item.preview_image.number_of_As.should == 2
+      end
+      it "should report that it responds to analyser methods" do
+        @item.preview_image.respond_to?(:number_of_As).should be_true
+      end
+      it "should include analyser methods in methods" do
+        @item.preview_image.methods.include?('number_of_As').should be_true
+      end
+      it "should include analyser methods in public_methods" do
+        @item.preview_image.public_methods.include?('number_of_As').should be_true
+      end
+      it "should update when something new is assigned" do
+        @item.preview_image = 'ANEWDATASTRING'
+        @item.preview_image.number_of_As.should == 3
+      end
+
+      describe "from a new model object" do
+        before(:each) do
+          @app.datastore.stub!(:store).and_return('my_uid')
+          item = Item.create!(:preview_image => 'DATASTRING')
+          @item = Item.find(item.id)
+          @temp_object = @app.create_object('DATASTRING')
+          @temp_object.name = 'jonny.briggs'
+        end
+        it "should load the temp_object then delegate the method" do
+          @app.should_receive(:fetch).with('my_uid').and_return(@temp_object)
+          @item.preview_image.number_of_As.should == 2
+        end
+        it "should use the magic attribute if there is one, and not load the temp_object" do
+          @app.should_not_receive(:fetch)
+          @item.should_receive(:preview_image_some_analyser_method).and_return('result yo')
+          @item.preview_image.some_analyser_method.should == 'result yo'
+        end
+        
+        %w(size name ext).each do |attr|
+          it "should use the magic attribute for #{attr} if there is one, and not load the temp_object" do
+            @app.should_not_receive(:fetch)
+            @item.should_receive("preview_image_#{attr}".to_sym).and_return('result yo')
+            @item.preview_image.send(attr).should == 'result yo'
+          end
+          it "should load the temp_object then delegate '#{attr}' if there is no magic attribute for it" do
+            Item.should_receive(:column_names).and_return(['preview_image_uid']) # no magic attributes
+            
+            @app.should_receive(:fetch).with('my_uid').and_return(@temp_object)
+            @item.preview_image.send(attr).should == @temp_object.send(attr)
+          end
+        end
+        
+      end
     
+      it "should not raise an error if a non-existent method is called" do
+        # Just checking method missing works ok
+        lambda{
+          @item.preview_image.eggbert
+        }.should raise_error(NoMethodError)
+      end
+    end
   end
 
 end