dragonfly 0.9.12 → 0.9.13

data/lib/dragonfly/url_mapper.rb

@@ -1,21 +1,15 @@
 module Dragonfly
   class UrlMapper
-    
+
     # Exceptions
     class BadUrlFormat < StandardError; end
-    
+
     class Segment < Struct.new(:param, :seperator, :pattern)
-    
       def regexp_string
         @regexp_string ||= "(#{Regexp.escape(seperator)}#{pattern}+?)?"
       end
-      # 
-      # def regexp
-      #   @regexp ||= Regexp.new(regexp_string)
-      # end
-    
     end
-    
+
     def initialize(url_format, patterns={})
       @url_format = url_format
       raise BadUrlFormat, "bad url format #{url_format}" if url_format[/[\w_]:[\w_]/]
@@ -24,13 +18,13 @@ module Dragonfly
     end
 
     attr_reader :url_format, :url_regexp, :segments
-    
+
     def params_for(path, query=nil)
       if path and md = path.match(url_regexp)
         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 && URI.unescape(value)
+          params[var] = value && Rack::Utils.unescape(value)
         end
         params
       end
@@ -39,21 +33,21 @@ module Dragonfly
     def params_in_url
       @params_in_url ||= url_format.scan(/\:[\w_]+/).map{|f| f.tr(':','') }
     end
-    
+
     def url_for(params)
       params = params.dup
       url = url_format.dup
       segments.each do |seg|
         value = params[seg.param]
-        value ? url.sub!(/:[\w_]+/, URI.escape(value.to_s)) : url.sub!(/.:[\w_]+/, '')
+        value ? url.sub!(/:[\w_]+/, Rack::Utils.escape(value.to_s)) : url.sub!(/.:[\w_]+/, '')
         params.delete(seg.param)
       end
       url << "?#{Rack::Utils.build_query(params)}" if params.any?
       url
     end
-    
+
     private
-    
+
     def init_segments(patterns)
       @segments = []
       url_format.scan(/([^\w_]):([\w_]+)/).each do |seperator, param|
@@ -64,7 +58,7 @@ module Dragonfly
         )
       end
     end
-    
+
     def init_url_regexp
       i = -1
       regexp_string = url_format.gsub(/[^\w_]:[\w_]+/) do
@@ -73,6 +67,6 @@ module Dragonfly
       end
       @url_regexp = Regexp.new('^' + regexp_string + '$')
     end
-    
+
   end
 end

data/lib/dragonfly/utils.rb

@@ -0,0 +1,24 @@
+require 'tempfile'
+
+module Dragonfly
+  module Utils
+
+    module_function
+
+    def new_tempfile(ext=nil, content=nil)
+      tempfile = ext ? Tempfile.new(['dragonfly', ".#{ext}"]) : Tempfile.new('dragonfly')
+      tempfile.binmode
+      tempfile.write(content) if content
+      tempfile.close
+      tempfile
+    end
+
+    def symbolize_keys(hash)
+      hash.inject({}) do |new_hash, (key, value)|
+        new_hash[key.to_sym] = value
+        new_hash
+      end
+    end
+
+  end
+end

data/spec/dragonfly/active_model_extensions/model_spec.rb

@@ -27,7 +27,7 @@ describe Item do
         @classes = Item.dragonfly_attachment_classes
         @class1, @class2 = @classes
       end
-      
+
       it "should return the attachment classes" do
         @class1.superclass.should == Dragonfly::ActiveModelExtensions::Attachment
         @class2.superclass.should == Dragonfly::ActiveModelExtensions::Attachment
@@ -50,7 +50,7 @@ describe Item do
     end
 
     describe "included modules (e.g. Mongoid::Document)" do
-      
+
       it "should work" do
         mongoid_document = Module.new
         app1.define_macro_on_include(mongoid_document, :dog_accessor)
@@ -239,7 +239,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!
@@ -300,11 +300,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 "destroy errors" do
@@ -568,7 +568,7 @@ describe Item do
         @item.should_not be_valid
         @item.errors[:otra_imagen].should  == ["tipo de contenido incorrecto. Que chungo tio"]
       end
-      
+
       it "should allow for custom messages including access to the property name and expected/allowed values" do
         @item.should_receive(:its_friday).and_return(false) # hack to get rid of other validation
         Item.class_eval do
@@ -648,14 +648,14 @@ describe Item do
     end
 
     describe "meta from magic attributes" do
-      
+
       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')
         @item.preview_image = data
         @item.preview_image.meta[:name].should == 'hello.png'
       end
-      
+
       it "should include magic attributes in the saved meta" do
         @item.preview_image = '123'
         @item.save!
@@ -735,7 +735,7 @@ describe Item do
         }.should raise_error(NoMethodError)
       end
     end
-    
+
     describe "job shortcuts" do
       before(:each) do
         @app.job :bacon do
@@ -797,7 +797,7 @@ describe Item do
         it "should include meta info about the model" do
           @item.save!
           item = Item.find(@item.id)
-          item.preview_image.meta.should include_hash(:model_class => 'Item', :model_attachment => :preview_image)  
+          item.preview_image.meta.should include_hash(:model_class => 'Item', :model_attachment => :preview_image)
         end
       end
 
@@ -896,7 +896,7 @@ describe Item do
       @item = Item.new
       @item.preview_image = "something"
     end
-    
+
     [
       1,
       "1",
@@ -933,24 +933,24 @@ describe Item do
         @item.remove_preview_image.should be_false
       end
     end
-    
+
     it "should return false by default for the getter" do
       @item.remove_preview_image.should be_false
     end
-    
+
   end
-  
+
   describe "callbacks" do
 
     describe "after_assign" do
-      
+
       before(:each) do
         @app = test_app
         @app.define_macro(MyModel, :image_accessor)
       end
 
       describe "as a block" do
-        
+
         def set_after_assign(*args, &block)
           Item.class_eval do
             image_accessor :preview_image do
@@ -972,14 +972,14 @@ describe Item do
           Item.new.preview_image = nil
           x.should be_nil
         end
-        
+
         it "should yield the attachment" do
           x = nil
           set_after_assign{|a| x = a.data }
           Item.new.preview_image = "discussion"
           x.should == "discussion"
         end
-        
+
         it "should evaluate in the model context" do
           x = nil
           set_after_assign{ x = title.upcase }
@@ -988,7 +988,7 @@ describe Item do
           item.preview_image = "jobs"
           x.should == "BIG"
         end
-        
+
         it "should allow passing a symbol for calling a model method" do
           set_after_assign :set_title
           item = Item.new
@@ -1005,7 +1005,7 @@ describe Item do
           item.preview_image = "jobs"
           item.title.should == "DOOBIE"
         end
-        
+
         it "should not re-trigger callbacks (causing an infinite loop)" do
           set_after_assign{|a| self.preview_image = 'dogman' }
           item = Item.new
@@ -1013,9 +1013,9 @@ describe Item do
         end
 
       end
-    
+
     end
-    
+
     describe "after_unassign" do
       before(:each) do
         @app = test_app
@@ -1027,18 +1027,18 @@ describe Item do
         end
         @item = Item.new :title => 'yo'
       end
-      
+
       it "should not call it after assign" do
         @item.preview_image = 'suggs'
         @item.title.should == 'yo'
       end
-      
+
       it "should call it after unassign" do
         @item.preview_image = nil
         @item.title.should == 'unassigned'
       end
     end
-    
+
     describe "copy_to" do
       before(:each) do
         @app = test_app
@@ -1056,7 +1056,7 @@ describe Item do
         end
         @item = Item.new :title => 'yo'
       end
-      
+
       it "should copy to the other image when assigned" do
         @item.preview_image = 'hello bear'
         @item.other_image.data.should == 'hello bearyo'
@@ -1067,18 +1067,18 @@ describe Item do
         @item.preview_image = nil
         @item.other_image.should be_nil
       end
-      
+
       it "should allow simply copying over without args" do
         @item.preview_image = 'hello bear'
         @item.yet_another_image.data.should == 'hello bear'
       end
-      
+
     end
-    
+
   end
 
   describe "storage_opts" do
-    
+
     def set_storage_opts(*args, &block)
       Item.class_eval do
         image_accessor :preview_image do
@@ -1086,19 +1086,19 @@ describe Item do
         end
       end
     end
-    
+
     before(:each) do
       @app = test_app
       @app.define_macro(MyModel, :image_accessor)
     end
-    
+
     it "should send the specified options to the datastore on store" do
       set_storage_opts :egg => 'head'
       item = Item.new :preview_image => 'hello'
       @app.datastore.should_receive(:store).with(anything, hash_including(:egg => 'head'))
       item.save!
     end
-    
+
     it "should allow putting in a proc" do
       set_storage_opts{ {:egg => 'numb'} }
       item = Item.new :preview_image => 'hello'
@@ -1120,7 +1120,7 @@ describe Item do
       @app.datastore.should_receive(:store).with(anything, hash_including(:a => 1))
       item.save!
     end
-    
+
     it "should allow setting more than once" do
       Item.class_eval do
         image_accessor :preview_image do
@@ -1137,7 +1137,7 @@ describe Item do
   end
 
   describe "storage_path, etc." do
-   
+
     def set_storage_path(path=nil, &block)
       Item.class_eval do
         image_accessor :preview_image do
@@ -1172,7 +1172,7 @@ describe Item do
       ))
       item.save!
     end
-  
+
     it "should allow setting as a block" do
       set_storage_path{|a| "#{a.data}/megs/#{title}" }
       item = Item.new :title => 'billy'
@@ -1196,7 +1196,7 @@ describe Item do
       item.save!
     end
   end
-  
+
   describe "unknown config method" do
     it "should raise an error" do
       lambda{
@@ -1208,18 +1208,18 @@ describe Item do
       }.should raise_error(NoMethodError)
     end
   end
-  
+
   describe "changed?" do
     before(:each) do
       set_up_item_class
       @item = Item.new
     end
-    
+
     it "should be changed when assigned" do
       @item.preview_image = 'ggg'
       @item.preview_image.should be_changed
     end
-    
+
     it "should not be changed when saved" do
       @item.preview_image = 'ggg'
       @item.save!
@@ -1233,7 +1233,7 @@ describe Item do
       item.preview_image.should_not be_changed
     end
   end
-  
+
   describe "retain and pending" do
     before(:each) do
       set_up_item_class(@app=test_app)
@@ -1251,13 +1251,13 @@ describe Item do
       @item.preview_image = 'hello'
       @item.retained_preview_image.should be_nil
     end
-    
+
     it "should return nil if assigned and saved" do
       @item.preview_image = 'hello'
       @item.save!
       @item.retained_preview_image.should be_nil
     end
-    
+
     it "should return the saved stuff if assigned and retained" do
       @item.preview_image = 'hello'
       @item.preview_image.name = 'dog.biscuit'
@@ -1272,14 +1272,14 @@ describe Item do
         }
       end.and_return('new/uid')
       @item.preview_image.retain!
-      Dragonfly::Serializer.marshal_decode(@item.retained_preview_image).should == {
+      Dragonfly::Serializer.json_decode(@item.retained_preview_image, :symbolize_keys => true).should == {
         :uid => 'new/uid',
         :some_analyser_method => 'HELLO',
         :size => 5,
         :name => 'dog.biscuit'
       }
     end
-    
+
     it "should return nil if assigned, retained and saved" do
       @item.preview_image = 'hello'
       @item.preview_image.retain!
@@ -1302,14 +1302,14 @@ describe Item do
       item.retained_preview_image.should be_nil
     end
   end
-  
+
   describe "assigning from a pending state" do
     before(:each) do
       set_up_item_class(@app=test_app)
       @app.analyser.add :some_analyser_method do |temp_object|
         temp_object.data.upcase
       end
-      @pending_string = Dragonfly::Serializer.marshal_encode(
+      @pending_string = Dragonfly::Serializer.json_encode(
         :uid => 'new/uid',
         :some_analyser_method => 'HELLO',
         :size => 5,
@@ -1322,7 +1322,7 @@ describe Item 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
       @item.preview_image_uid.should == 'new/uid'
@@ -1330,7 +1330,7 @@ describe Item do
       @item.preview_image_size.should == 5
       @item.preview_image_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'))
@@ -1341,9 +1341,9 @@ describe Item do
       @item.retained_preview_image = @pending_string
       @item.preview_image.url.should =~ %r{^/\w+/dog.biscuit$}
     end
-    
+
     it "should raise an error if the pending string contains a non-magic attr method" do
-      pending_string = Dragonfly::Serializer.marshal_encode(
+      pending_string = Dragonfly::Serializer.json_encode(
         :uid => 'new/uid',
         :some_analyser_method => 'HELLO',
         :size => 5,
@@ -1355,20 +1355,20 @@ describe Item do
         item.retained_preview_image = pending_string
       }.should raise_error(Dragonfly::ActiveModelExtensions::Attachment::BadAssignmentKey)
     end
-    
+
     [nil, "", "asdfsad"].each do |value|
       it "should do nothing if assigned with #{value}" do
         @item.retained_preview_image = value
         @item.preview_image_uid.should be_nil
       end
     end
-    
+
     it "should return the pending string again" do
       @item.retained_preview_image = @pending_string
-      Dragonfly::Serializer.marshal_decode(@item.retained_preview_image).should ==
-        Dragonfly::Serializer.marshal_decode(@pending_string)
+      Dragonfly::Serializer.json_decode(@item.retained_preview_image).should ==
+        Dragonfly::Serializer.json_decode(@pending_string)
     end
-    
+
     it "should destroy the old one on save" do
       @item.preview_image = 'oldone'
       @app.datastore.should_receive(:store).with(a_temp_object_with_data('oldone'), anything).and_return('old/uid')
@@ -1403,7 +1403,7 @@ describe Item do
         @app.datastore.should_receive(:destroy).with('new/uid')
         @item.retained_preview_image = @pending_string
       end
-      
+
       describe "automatically retaining (hack to test for existence of hidden form field)" do
         it "should automatically retain if set as an empty string then changed" do
           @item.retained_preview_image = ""
@@ -1432,7 +1432,7 @@ describe Item do
     end
 
   end
-  
+
   describe "format and mime type" do
     before(:each) do
       @app = test_app
@@ -1463,7 +1463,7 @@ describe Item do
       @item.preview_image.mime_type.should == 'some/type'
     end
   end
-  
+
   describe "inspect" do
     before(:each) do
       set_up_item_class
@@ -1474,5 +1474,5 @@ describe Item do
       @item.preview_image.inspect.should =~ %r{^<Dragonfly Attachment uid="[^"]+", app=:test[_\w]*>$}
     end
   end
-  
+
 end