dragonfly 0.9.8 → 0.9.9

data/lib/dragonfly/url_attributes.rb

@@ -0,0 +1,30 @@
+module Dragonfly
+  
+  # UrlAttributes is like a normal hash, but treats
+  # :name, :ext and :basename specially -
+  # updating ext/basename also updates the name
+  class UrlAttributes < Hash
+
+    SPECIAL_KEYS = [:name, :basename, :ext]
+
+    include HasFilename
+
+    def name
+      self[:name]
+    end
+    
+    def name=(name)
+      self[:name] = name
+    end
+    
+    def slice(*keys)
+      keys.inject({}) do |hash, key|
+        key = key.to_sym
+        hash[key] = SPECIAL_KEYS.include?(key) ? send(key) : self[key]
+        hash
+      end
+    end
+    
+  end
+
+end

data/lib/dragonfly/url_mapper.rb

@@ -30,7 +30,7 @@ module Dragonfly
         params = Rack::Utils.parse_query(query)
         params_in_url.each_with_index do |var, i|
           value = md[i+1][1..-1] if md[i+1]
-          params[var] = value
+          params[var] = value && URI.unescape(value)
         end
         params
       end
@@ -45,7 +45,7 @@ module Dragonfly
       url = url_format.dup
       segments.each do |seg|
         value = params[seg.param]
-        value ? url.sub!(/:[\w_]+/, value.to_s) : url.sub!(/.:[\w_]+/, '')
+        value ? url.sub!(/:[\w_]+/, URI.escape(value.to_s)) : url.sub!(/.:[\w_]+/, '')
         params.delete(seg.param)
       end
       url << "?#{Rack::Utils.build_query(params)}" if params.any?

data/spec/dragonfly/active_model_extensions/model_spec.rb

@@ -190,16 +190,14 @@ describe Item do
         @item.destroy
       end
 
-      it "should return the url for the data" do
-        @item.preview_image.url.should =~ %r<^/\w+$>
-      end
-
       it "should destroy the old data when the uid is set manually" do
         @app.datastore.should_receive(:destroy).with('some_uid')
         @item.preview_image_uid = 'some_known_uid'
         @item.save!
       end
 
+      # SEE model_urls_spec.rb for urls
+
       describe "when accessed by a new model object" do
         before(:each) do
           @item = Item.find(@item.id)
@@ -222,6 +220,7 @@ describe Item do
           @app.datastore.should_receive(:destroy).with('some_uid')
           @item.save!
         end
+        
         it "should not try to destroy the old data if saved again" do
           @app.datastore.should_receive(:destroy).with('some_uid')
           @item.save!
@@ -257,6 +256,10 @@ describe Item do
         it "should return the new data" do
           @item.preview_image.data.should == 'ANEWDATASTRING'
         end
+
+        it 'should mark the attribute as changed' do
+          @item.preview_image_uid_changed?.should be_true
+        end
       end
 
       describe "when it is set to nil" do
@@ -278,6 +281,11 @@ describe Item do
           @app.datastore.should_receive(:destroy).with('some_uid')
           @item.destroy
         end
+        
+        it 'should mark the attribute as changed' do
+          @item.preview_image_uid_changed?.should be_true
+        end
+        
       end
 
       describe "when the data can't be found" do
@@ -496,6 +504,24 @@ describe Item do
         @item.should be_valid
       end
 
+      it "should allow case sensitivity to be turned off when :as is specified" do
+        @item.should_receive(:its_friday).and_return(false)
+        Item.class_eval do
+          validates_property :mime_type, :of => :preview_image, :as => 'WronG/TypE', :case_sensitive => false
+        end
+        @item.preview_image = "WRONG TYPE"
+        @item.should be_valid
+      end
+
+      it "should allow case sensitivity to be turned off when :in is specified" do
+        @item.should_receive(:its_friday).and_return(false)
+        Item.class_eval do
+          validates_property :mime_type, :of => :preview_image, :in => ['WronG/TypE'], :case_sensitive => false
+        end
+        @item.preview_image = "WRONG TYPE"
+        @item.should be_valid
+      end
+
       it "should require either :as or :in as an argument" do
         lambda{
           Item.class_eval do
@@ -598,27 +624,6 @@ describe Item do
 
     describe "meta from magic attributes" do
       
-      it "should set the meta for the magic attribute when assigned" do
-        @item.preview_image = '123'
-        @item.preview_image.meta[:some_analyser_method].should == 'abc1'
-      end
-      
-      it "should not set meta for non-magic attributes with the same prefix when assigned" do
-        @item.preview_image = '123'
-        @item.preview_image.meta[:blah_blah].should be_nil
-      end
-
-      it "should update the meta for the magic attribute when something else is assigned" do
-        @item.preview_image = '123'
-        @item.preview_image = '456'
-        @item.preview_image.meta[:some_analyser_method].should == 'abc4'
-      end
-      
-      it "should include the meta for size too" do
-        @item.preview_image = '123'
-        @item.preview_image.meta[:size].should == 3
-      end
-
       it "should store the meta for the original file name if it exists" do
         data = 'jasdlkf sadjl'
         data.stub!(:original_filename).and_return('hello.png')
@@ -626,11 +631,16 @@ describe Item do
         @item.preview_image.meta[:name].should == 'hello.png'
       end
       
-      it "should still have the meta after reload" do
+      it "should include magic attributes in the saved meta" do
         @item.preview_image = '123'
         @item.save!
-        item = Item.find(@item.id)
-        item.preview_image.meta[:some_analyser_method].should == 'abc1'
+        @app.fetch(@item.preview_image_uid).meta[:some_analyser_method].should == 'abc1'
+      end
+
+      it "should include the size in the saved meta" do
+        @item.preview_image = '123'
+        @item.save!
+        @app.fetch(@item.preview_image_uid).meta[:size].should == 3
       end
 
     end
@@ -646,10 +656,10 @@ describe Item 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'.to_method_name).should be_true
+        @item.preview_image.methods.map{|m| m.to_sym }.should include(:number_of_As)
       end
       it "should include analyser methods in public_methods" do
-        @item.preview_image.public_methods.include?('number_of_As'.to_method_name).should be_true
+        @item.preview_image.public_methods.map{|m| m.to_sym }.should include(:number_of_As)
       end
 
       it "should update when something new is assigned" do
@@ -679,6 +689,12 @@ describe Item do
           @item.preview_image.size.should == 17
         end
 
+        it "should use the magic attribute for name if there is one, and not the job object" do
+          @item.preview_image.send(:job).should_not_receive(:name)
+          @item.should_receive("preview_image_name").and_return('jeffrey.bungle')
+          @item.preview_image.name.should == 'jeffrey.bungle'
+        end
+
         it "should delegate 'size' to the job object if there is no magic attribute for it" do
           @item.other_image = 'blahdata'
           @item.other_image.send(:job).should_receive(:size).and_return 54
@@ -751,7 +767,7 @@ describe Item do
         it "should save it correctly" do
           @item.save!
           item = Item.find(@item.id)
-          item.preview_image.apply.meta.should include_hash(:slime => 'balls')
+          item.preview_image.meta.should include_hash(:slime => 'balls')
         end
         it "should include meta info about the model" do
           @item.save!
@@ -1220,7 +1236,16 @@ describe Item do
     it "should return the saved stuff if assigned and retained" do
       @item.preview_image = 'hello'
       @item.preview_image.name = 'dog.biscuit'
-      @app.datastore.should_receive(:store).with(a_temp_object_with_data('hello'), anything).and_return('new/uid')
+      @app.datastore.should_receive(:store).with do |temp_object, opts|
+        temp_object.data.should == 'hello'
+        temp_object.meta.should == {
+          :name => "dog.biscuit",
+          :some_analyser_method => "HELLO",
+          :size => 5,
+          :model_class => "Item",
+          :model_attachment => :preview_image
+        }
+      end.and_return('new/uid')
       @item.preview_image.retain!
       Dragonfly::Serializer.marshal_decode(@item.retained_preview_image).should == {
         :uid => 'new/uid',
@@ -1267,6 +1292,11 @@ describe Item do
       )
       @item = Item.new
     end
+
+    it "should be retained" do
+      @item.dragonfly_attachments[:preview_image].should_receive(:retain!)
+      @item.retained_preview_image = @pending_string
+    end
     
     it "should update the attributes" do
       @item.retained_preview_image = @pending_string
@@ -1276,19 +1306,12 @@ describe Item do
       @item.preview_image_name.should == 'dog.biscuit'
     end
     
-    it "should update the attachment meta" do
-      @item.retained_preview_image = @pending_string
-      @item.preview_image.meta[:some_analyser_method].should == 'HELLO'
-      @item.preview_image.meta[:size].should == 5
-      @item.preview_image.meta[:name].should == 'dog.biscuit'
-    end
-    
     it "should be a normal fetch job" do
       @item.retained_preview_image = @pending_string
       @app.datastore.should_receive(:retrieve).with('new/uid').and_return(Dragonfly::TempObject.new('retrieved yo'))
       @item.preview_image.data.should == 'retrieved yo'
     end
-    
+
     it "should give the correct url" do
       @item.retained_preview_image = @pending_string
       @item.preview_image.url.should =~ %r{^/\w+/dog.biscuit$}

data/spec/dragonfly/active_model_extensions/spec_helper.rb

@@ -11,6 +11,7 @@ class MyModel
   define_model_callbacks :save, :destroy
   
   include ActiveModel::Validations
+  include ActiveModel::Dirty
   
   class << self
     def create!(attrs={})
@@ -73,6 +74,7 @@ class Item < MyModel
     :created_at,
     :updated_at
   ]
+  define_attribute_methods ATTRIBUTES
   attr_accessor *ATTRIBUTES
 end
 
@@ -82,10 +84,12 @@ class Car < MyModel
     :reliant_image_uid,
     :type
   ]
+  define_attribute_methods ATTRIBUTES
   attr_accessor *ATTRIBUTES
 end
 
 class Photo < MyModel
   ATTRIBUTES = [:image_uid]
+  define_attribute_methods ATTRIBUTES
   attr_accessor *ATTRIBUTES
 end

data/spec/dragonfly/app_spec.rb

@@ -101,9 +101,17 @@ describe Dragonfly::App do
       @app.store(temp_object)
     end
     it "should allow storing with extra stuff" do
-      @app.datastore.should_receive(:store).with(
-        a_temp_object_with_data("HELLO"), :meta => {:egg => :head}, :option => :blarney
-      )
+      @app.datastore.should_receive(:store).with do |temp_object, opts|
+        temp_object.data.should == 'HELLO'
+        temp_object.meta.should == {:egg => :head}
+        opts[:option].should == :blarney
+      end
+      @app.store("HELLO", :meta => {:egg => :head}, :option => :blarney)
+    end
+    it "should still pass in meta in the opts arg, for deprecated use of meta" do
+      @app.datastore.should_receive(:store).with do |temp_object, opts|
+        opts[:meta].should == {:egg => :head}
+      end
       @app.store("HELLO", :meta => {:egg => :head}, :option => :blarney)
     end
   end

data/spec/dragonfly/configurable_spec.rb

@@ -119,18 +119,6 @@ describe Dragonfly::Configurable do
     end
   end
   
-  describe "using in the singleton class" do
-    it "should work" do
-      class OneOff
-        class << self
-          include Dragonfly::Configurable
-          configurable_attr :food, 'bread'
-        end
-      end
-      OneOff.food.should == 'bread'
-    end
-  end
-  
   describe "configuration method" do
     
     before(:each) do
@@ -270,11 +258,11 @@ describe Dragonfly::Configurable do
   
   describe "falling back to another config" do
     before(:each) do
-      @garage = Object.new
-      class << @garage
+      class Garage
         include Dragonfly::Configurable
         configurable_attr :top_speed, 100
       end
+      @garage = Garage.new
       @car.use_as_fallback_config(@garage)
     end
     
@@ -364,15 +352,15 @@ describe Dragonfly::Configurable do
     
     describe "objects with different methods" do
       before(:each) do
-        @dad = Object.new
-        class << @dad
+        class Dad
           include Dragonfly::Configurable
         end
-        @kid = Object.new
-        class << @kid
+        @dad = Dad.new
+        class Kid
           include Dragonfly::Configurable
           configurable_attr :lug, 'default-lug'
         end
+        @kid = Kid.new
         @kid.use_as_fallback_config(@dad)
       end
 
@@ -394,11 +382,11 @@ describe Dragonfly::Configurable do
       end
       
       it "should work when a grandchild config is added later" do
-        grandkid = Object.new
-        class << grandkid
+        class Grandkid
           include Dragonfly::Configurable
           configurable_attr :oogie, 'boogie'
         end
+        grandkid = Grandkid.new
         grandkid.use_as_fallback_config(@kid)
         @dad.configure{|c| c.oogie = 'duggen' }
         grandkid.oogie.should == 'duggen'
@@ -458,4 +446,34 @@ describe Dragonfly::Configurable do
     end
     
   end
+
+  describe "inheriting configurable_attrs from multiple places" do
+    before(:each) do
+      module A
+        include Dragonfly::Configurable
+        configurable_attr :a
+      end
+      module B
+        include Dragonfly::Configurable
+        configurable_attr :b
+      end
+      class K
+        include Dragonfly::Configurable
+        include A
+        include B
+        configurable_attr :c
+      end
+      class L < K
+      end
+    end
+    
+    it "should include configuration from all of its mixins" do
+      l = L.new
+      l.configure do |c|
+        c.a = 'something'
+        c.b = 'something'
+        c.c = 'something'
+      end
+    end
+  end
 end

data/spec/dragonfly/data_storage/file_data_store_spec.rb

@@ -7,10 +7,15 @@ describe Dragonfly::DataStorage::FileDataStore do
     FileUtils.mkdir_p(File.dirname(filename))
     FileUtils.touch(filename)
   end
+
+  def assert_exists(path)
+    File.exists?(path).should be_true
+  end
   
   before(:each) do
     @data_store = Dragonfly::DataStorage::FileDataStore.new
     @data_store.root_path = 'tmp/file_data_store_test'
+    @temp_object = Dragonfly::TempObject.new('goobydoo')
   end
   
   after(:each) do
@@ -20,16 +25,8 @@ describe Dragonfly::DataStorage::FileDataStore do
   
   it_should_behave_like 'data_store'
   
-  before(:each) do
-    @temp_object = Dragonfly::TempObject.new('goobydoo')
-  end
-  
   describe "store" do
     
-    def it_should_write_to_file(storage_path, temp_object)
-      temp_object.should_receive(:to_file).with(storage_path).and_return(mock('file', :close => nil))
-    end
-    
     before(:each) do
       # Set 'now' to a date in the past
       Time.stub!(:now).and_return Time.mktime(1984,"may",4,14,28,1)
@@ -38,31 +35,20 @@ describe Dragonfly::DataStorage::FileDataStore do
     end
     
     it "should store the file in a folder based on date, with default filename" do
-      it_should_write_to_file("#{@file_pattern_prefix}file", @temp_object)
       @data_store.store(@temp_object)
+      assert_exists "#{@file_pattern_prefix}file"
     end
 
-    it "should use the temp_object original filename if it exists" do
-      @temp_object.should_receive(:original_filename).at_least(:once).and_return('hello.there')
-      it_should_write_to_file("#{@file_pattern_prefix}hello.there", @temp_object)
+    it "should use the temp_object name if it exists" do
+      @temp_object.should_receive(:name).at_least(:once).and_return('hello.there')
       @data_store.store(@temp_object)
+      assert_exists "#{@file_pattern_prefix}hello.there"
     end
 
-    it "should use the meta name if it exists" do
-      it_should_write_to_file("#{@file_pattern_prefix}damp.squib", @temp_object)
-      @data_store.store(@temp_object, :meta => {:name => 'damp.squib'})
-    end
-
-    it "should prefer the meta name to the original filename" do
-      @temp_object.stub!(:original_filename).and_return('hello.there')
-      it_should_write_to_file("#{@file_pattern_prefix}damp.squib", @temp_object)
-      @data_store.store(@temp_object, :meta => {:name => 'damp.squib'})
-    end
-
-    it "should get rid of funny characters in the temp_object original filename" do
-      @temp_object.should_receive(:original_filename).at_least(:once).and_return('A Picture with many spaces in its name (at 20:00 pm).png')
-      it_should_write_to_file("#{@file_pattern_prefix}A_Picture_with_many_spaces_in_its_name_at_20_00_pm_.png", @temp_object)
+    it "should get rid of funny characters in the temp_object name" do
+      @temp_object.should_receive(:name).at_least(:once).and_return('A Picture with many spaces in its name (at 20:00 pm).png')
       @data_store.store(@temp_object)
+      assert_exists "#{@file_pattern_prefix}A_Picture_with_many_spaces_in_its_name_at_20_00_pm_.png"
     end
 
     describe "when the filename already exists" do
@@ -70,12 +56,12 @@ describe Dragonfly::DataStorage::FileDataStore do
       it "should use a different filename" do
         touch_file("#{@file_pattern_prefix}file")
         @data_store.should_receive(:disambiguate).with("#{@file_pattern_prefix}file").and_return("#{@file_pattern_prefix}file_2")
-        it_should_write_to_file("#{@file_pattern_prefix}file_2", @temp_object)
         @data_store.store(@temp_object)
+        assert_exists "#{@file_pattern_prefix}file_2"
       end
     
       it "should use a different filename taking into account the name and ext" do
-        @temp_object.should_receive(:original_filename).at_least(:once).and_return('hello.png')
+        @temp_object.should_receive(:name).at_least(:once).and_return('hello.png')
         touch_file("#{@file_pattern_prefix}hello.png")
         @data_store.should_receive(:disambiguate).with("#{@file_pattern_prefix}hello.png").and_return("#{@file_pattern_prefix}blah.png")
         @data_store.store(@temp_object)
@@ -86,20 +72,20 @@ describe Dragonfly::DataStorage::FileDataStore do
         touch_file("#{@file_pattern_prefix}file_2")
         @data_store.should_receive(:disambiguate).with("#{@file_pattern_prefix}file").and_return("#{@file_pattern_prefix}file_2")
         @data_store.should_receive(:disambiguate).with("#{@file_pattern_prefix}file_2").and_return("#{@file_pattern_prefix}file_3")
-        it_should_write_to_file("#{@file_pattern_prefix}file_3", @temp_object)
         @data_store.store(@temp_object)
+        assert_exists "#{@file_pattern_prefix}file_3"
       end
 
       describe "specifying the uid" do
         it "should allow for specifying the path to use" do
-          it_should_write_to_file("#{@data_store.root_path}/hello/there/mate.png", @temp_object)
           @data_store.store(@temp_object, :path => 'hello/there/mate.png')
+          assert_exists "#{@data_store.root_path}/hello/there/mate.png"
         end
         it "should correctly disambiguate if the file exists" do
           touch_file("#{@data_store.root_path}/hello/there/mate.png")
           @data_store.should_receive(:disambiguate).with("#{@data_store.root_path}/hello/there/mate.png").and_return("#{@data_store.root_path}/hello/there/mate_2.png")
-          it_should_write_to_file("#{@data_store.root_path}/hello/there/mate_2.png", @temp_object)
           @data_store.store(@temp_object, :path => 'hello/there/mate.png')
+          assert_exists "#{@data_store.root_path}/hello/there/mate_2.png"
         end
       end
 
@@ -112,7 +98,7 @@ describe Dragonfly::DataStorage::FileDataStore do
       end
     
       it "should return the filepath without the root of the stored file when a file name is provided" do
-        @temp_object.should_receive(:original_filename).at_least(:once).and_return('hello.you.png')
+        @temp_object.should_receive(:name).at_least(:once).and_return('hello.you.png')
         @data_store.store(@temp_object).should == "#{@file_pattern_prefix_without_root}hello.you.png"
       end
     
@@ -162,10 +148,11 @@ describe Dragonfly::DataStorage::FileDataStore do
     end
     
     it "should work even if meta is stored in old .extra file" do
-      uid = @data_store.store(@temp_object, :meta => {:dog => 'food'})
+      @temp_object.meta = {:dog => 'foog'}
+      uid = @data_store.store(@temp_object)
       FileUtils.mv("#{@data_store.root_path}/#{uid}.meta", "#{@data_store.root_path}/#{uid}.extra")
       pathname, meta = @data_store.retrieve(uid)
-      meta.should == {:dog => 'food'}
+      meta.should == {:dog => 'foog'}
     end
     
     it "should raise a BadUID error if the file path has ../ in it" do
@@ -239,16 +226,17 @@ describe Dragonfly::DataStorage::FileDataStore do
   describe "turning meta off" do
     before(:each) do
       @data_store.store_meta = false
+      @temp_object.meta = {:bitrate => '35', :name => 'danny.boy'}
     end
 
     it "should not write a meta file" do
-      uid = @data_store.store(@temp_object, :meta => {:bitrate => '35', :name => 'danny.boy'})
+      uid = @data_store.store(@temp_object)
       path = File.join(@data_store.root_path, uid) + '.meta'
       File.exist?(path).should be_false
     end
 
     it "should return an empty hash on retrieve" do
-      uid = @data_store.store(@temp_object, :meta => {:bitrate => '35', :name => 'danny.boy'})
+      uid = @data_store.store(@temp_object)
       obj, meta = @data_store.retrieve(uid)
       meta.should == {}
     end