dragonfly 0.7.5 → 0.7.6

data/spec/dragonfly/temp_object_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Dragonfly::TempObject do
-  
+
   ####### Helper Methods #######
 
   def sample_path(filename)
@@ -14,23 +14,23 @@ describe Dragonfly::TempObject do
     tempfile.rewind
     tempfile
   end
-  
+
   def new_file(data='HELLO')
     File.open('/tmp/test_file', 'w') do |f|
       f.write(data)
     end
     File.new('/tmp/test_file')
   end
-  
+
   def new_temp_object(data, opts={})
     klass = opts.delete(:class) || Dragonfly::TempObject
     klass.new(initialization_object(data), opts)
   end
-  
+
   def initialization_object(data)
     raise NotImplementedError, "This should be implemented in the describe block!"
   end
-  
+
   def get_parts(temp_object)
     parts = []
     temp_object.each do |bytes|
@@ -39,15 +39,15 @@ describe Dragonfly::TempObject do
     parts.length.should >= 2 # Sanity check to check that the sample file is adequate for this test
     parts
   end
-  
+
   ###############################
-  
+
   it "should raise an error if initialized with a non-string/file/tempfile" do
     lambda{
       Dragonfly::TempObject.new(3)
     }.should raise_error(ArgumentError)
   end
-  
+
   describe "common behaviour", :shared => true do
 
     describe "simple initialization" do
@@ -91,13 +91,13 @@ describe Dragonfly::TempObject do
           @temp_object.tempfile.open.read.should == 'HELLO'
         end
       end
-    
+
       describe "path" do
         it "should return the absolute file path" do
           @temp_object.path.should == @temp_object.tempfile.path
         end
       end
-    
+
       describe "size" do
         it "should return the size in bytes" do
           @temp_object.size.should == 5
@@ -126,7 +126,7 @@ describe Dragonfly::TempObject do
           file.read.should == 'HELLO'
         end
       end
-      
+
     end
 
     describe "initializing attributes too" do
@@ -169,10 +169,10 @@ describe Dragonfly::TempObject do
         parts.last.length.should <= 3001
       end
     end
-    
+
 
   end
-  
+
   describe "initializing from a string" do
 
     def initialization_object(data)
@@ -187,7 +187,7 @@ describe Dragonfly::TempObject do
       temp_object.each{}
     end
   end
-  
+
   describe "initializing from a tempfile" do
 
     def initialization_object(data)
@@ -202,7 +202,7 @@ describe Dragonfly::TempObject do
       temp_object.each{}
     end
   end
-  
+
   describe "initializing from a file" do
 
     def initialization_object(data)
@@ -217,7 +217,7 @@ describe Dragonfly::TempObject do
       temp_object.each{}
     end
   end
-  
+
   describe "initializing from another temp object" do
     before(:each) do
       @temp_object1 = Dragonfly::TempObject.new(new_tempfile('hello'))
@@ -233,7 +233,7 @@ describe Dragonfly::TempObject do
       @temp_object1.path.should_not == @temp_object2.path
     end
   end
-  
+
   describe "name" do
     before(:each) do
       @obj = new_tempfile
@@ -256,8 +256,13 @@ describe Dragonfly::TempObject do
       temp_object = Dragonfly::TempObject.new('sdf', :name => '')
       temp_object.name.should be_nil
     end
+    it "should allow setting" do
+      temp_object = Dragonfly::TempObject.new('sdf')
+      temp_object.name = "jonny.briggs"
+      temp_object.name.should == 'jonny.briggs'
+    end
   end
-  
+
   describe "ext" do
     it "should use the correct extension from name" do
       temp_object = Dragonfly::TempObject.new('asfsadf', :name => 'hello.there.mate')
@@ -287,7 +292,7 @@ describe Dragonfly::TempObject do
       temp_object.basename.should be_nil
     end
   end
-  
+
   describe "meta" do
     before(:each) do
       @temp_object = Dragonfly::TempObject.new('get outta here!')
@@ -296,11 +301,11 @@ describe Dragonfly::TempObject do
       @temp_object.meta.should == {}
     end
     it "should allow setting" do
-      @temp_object.meta[:teeth] = 'many'
+      @temp_object.meta = {:teeth => 'many'}
       @temp_object.meta.should == {:teeth => 'many'}
     end
   end
-  
+
   describe "format" do
     it "should return nil if not set" do
       temp_object = Dragonfly::TempObject.new('wassin my belly??!')
@@ -310,19 +315,28 @@ describe Dragonfly::TempObject do
       temp_object = Dragonfly::TempObject.new('wassin my belly??!', :format => :jpg)
       temp_object.format.should == :jpg
     end
+    it "should allow setting" do
+      temp_object = Dragonfly::TempObject.new('jo*ida pero contenta')
+      temp_object.format = :tiff
+      temp_object.format.should == :tiff
+    end
   end
-  
+
   describe "extract_attributes_from" do
     before(:each) do
       @temp_object = Dragonfly::TempObject.new("ne'er gonna give you up",
         :meta => {:a => 4},
-        :name => 'fred.txt'
+        :name => 'fred.txt',
+        :format => :txt
       )
-      @attributes = {:meta => {:b => 5}, :ogle => 'bogle'}
+      @attributes = {:meta => {:b => 5}, :ogle => 'bogle', :format => :dungbats}
       @temp_object.extract_attributes_from(@attributes)
     end
     it "should overwrite its own attributes if specified" do
-      @temp_object.meta.should == {:b => 5}
+      @temp_object.format.should == :dungbats
+    end
+    it "should merge its own meta if specified" do
+      @temp_object.meta.should == {:a => 4, :b => 5}
     end
     it "should leave non-specified attributes untouched" do
       @temp_object.name.should == 'fred.txt'

data/spec/simple_matchers.rb

@@ -2,7 +2,7 @@ def match_url(url)
   simple_matcher("match url #{url}") do |given|
     given_path, given_query_string = given.split('?')
     path, query_string = url.split('?')
-    
+
     path == given_path && given_query_string.split('&').sort == query_string.split('&').sort
   end
 end
@@ -22,7 +22,7 @@ def match_ar_error(string)
 end
 
 def include_hash(hash)
-  simple_matcher("include hash #{hash}") do |given|
+  simple_matcher("include hash #{hash.inspect}") do |given|
     given.merge(hash) == given
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Mark Evans
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 +01:00
+date: 2010-09-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,7 +113,6 @@ files:
 - lib/dragonfly/data_storage/s3data_store.rb
 - lib/dragonfly/encoder.rb
 - lib/dragonfly/encoding/r_magick_encoder.rb
-- lib/dragonfly/endpoint.rb
 - lib/dragonfly/function_manager.rb
 - lib/dragonfly/generation/r_magick_generator.rb
 - lib/dragonfly/generator.rb
@@ -127,6 +126,7 @@ files:
 - lib/dragonfly/processor.rb
 - lib/dragonfly/r_magick_utils.rb
 - lib/dragonfly/rails/images.rb
+- lib/dragonfly/response.rb
 - lib/dragonfly/routed_endpoint.rb
 - lib/dragonfly/serializer.rb
 - lib/dragonfly/simple_cache.rb

data/lib/dragonfly/endpoint.rb

@@ -1,43 +0,0 @@
-module Dragonfly
-  module Endpoint
-
-    class EmptyJob < StandardError; end
-
-    private
-
-    def response_for_job(job, env)
-      if etag_matches?(job, env)
-        [304, cache_headers(job), []]
-      else
-        [200, success_headers(job), job.result] # Successful response
-      end
-    rescue DataStorage::DataNotFound => e
-      [404, {"Content-Type" => 'text/plain'}, [e.message]]
-    end
-
-    def cache_headers(job)
-      {
-        "Cache-Control" => "public, max-age=#{job.app.cache_duration}",
-        "ETag" => %("#{job.unique_signature}")
-      }
-    end
-
-    def etag_matches?(job, env)
-      if_none_match = env['HTTP_IF_NONE_MATCH']
-      if if_none_match
-        if_none_match.tr!('"','')
-        if_none_match.split(',').include?(job.unique_signature) || if_none_match == '*'
-      else
-        false
-      end
-    end
-
-    def success_headers(job)
-      {
-        "Content-Type" => job.app.resolve_mime_type(job.result),
-        "Content-Length" => job.size.to_s,
-      }.merge(cache_headers(job))
-    end
-
-  end
-end