dragonfly 0.9.12 → 0.9.13

data/spec/dragonfly/job_endpoint_spec.rb

@@ -10,23 +10,23 @@ describe "Dragonfly::JobEndpoint Rack::Lint tests" do
     @job = @app.generate(:test_data)
     @endpoint = Rack::Lint.new(Dragonfly::JobEndpoint.new(@job))
   end
-  
+
   it "should pass for HEAD requests" do
     Rack::MockRequest.new(@endpoint).request("HEAD", '')
   end
-  
+
   it "should pass for GET requests" do
     Rack::MockRequest.new(@endpoint).request("GET", '')
   end
-  
+
   it "should pass for POST requests" do
     Rack::MockRequest.new(@endpoint).request("POST", '')
   end
-  
+
   it "should pass for PUT requests" do
     Rack::MockRequest.new(@endpoint).request("PUT", '')
   end
-  
+
   it "should pass for DELETE requests" do
     Rack::MockRequest.new(@endpoint).request("DELETE", '')
   end
@@ -69,7 +69,7 @@ describe Dragonfly::JobEndpoint do
   end
 
   %w(POST PUT DELETE CUSTOM_METHOD).each do |method|
-    
+
     it "should return a 405 error for a #{method} request" do
       response = make_request(@job, :method => method)
       response.status.should == 405
@@ -175,7 +175,7 @@ describe Dragonfly::JobEndpoint do
       end
     end
   end
-  
+
   describe "custom headers" do
     before(:each) do
       @app.configure{|c| c.response_headers['This-is'] = 'brill' }
@@ -208,7 +208,7 @@ describe Dragonfly::JobEndpoint do
         def initialize(app)
           @app = app
         end
-        
+
         def call(env)
           @app.call(env)
           throw :result, env['dragonfly.job']
@@ -228,7 +228,7 @@ describe Dragonfly::JobEndpoint do
 
   describe "inspect" do
     it "should be pretty yo" do
-      @job.to_app.inspect.should == %(<Dragonfly::JobEndpoint steps=[fetch("egg")] >)
+      @job.to_app.inspect.should =~ %r{<Dragonfly::JobEndpoint steps=.* >}
     end
   end
 

data/spec/dragonfly/job_spec.rb

@@ -25,12 +25,12 @@ describe Dragonfly::Job do
     end
 
     {
-      Dragonfly::Job::Fetch => :f,
-      Dragonfly::Job::Process => :p,
-      Dragonfly::Job::Encode => :e,
-      Dragonfly::Job::Generate => :g,
-      Dragonfly::Job::FetchFile => :ff,
-      Dragonfly::Job::FetchUrl => :fu
+      Dragonfly::Job::Fetch => 'f',
+      Dragonfly::Job::Process => 'p',
+      Dragonfly::Job::Encode => 'e',
+      Dragonfly::Job::Generate => 'g',
+      Dragonfly::Job::FetchFile => 'ff',
+      Dragonfly::Job::FetchUrl => 'fu'
     }.each do |klass, abbreviation|
       it "should return the correct abbreviation for #{klass}" do
         klass.abbreviation.should == abbreviation
@@ -74,7 +74,7 @@ describe Dragonfly::Job do
         @job.data.should == 'HELLO'
         @job.meta.should == {:name => 'test.txt'}
       end
-      
+
       it "shouldn't set any url_attrs" do
         @job.url_attrs.should == {}
       end
@@ -132,7 +132,7 @@ describe Dragonfly::Job do
         @job.data.should == 'hi'
         @job.meta.should == {:name => 'plasma.png'}
       end
-      
+
       it "shouldn't set any url_attrs" do
         @job.url_attrs.should == {}
       end
@@ -148,11 +148,11 @@ describe Dragonfly::Job do
       it "should fetch the specified file when applied" do
         @job.size.should == 62664
       end
-      
+
       it "should set the url_attrs" do
         @job.url_attrs.should == {:name => 'egg.png'}
       end
-      
+
       it "should set the name" do
         @job.meta[:name].should == 'egg.png'
       end
@@ -188,7 +188,7 @@ describe Dragonfly::Job do
         @job.fetch_url!('some.place.com/dung.beetle')
         @job.meta[:name].should == 'dung.beetle'
       end
-      
+
       it "should set the name url_attr if there is one" do
         @job.fetch_url!('some.place.com/dung.beetle')
         @job.url_attrs.should == {:name =>'dung.beetle'}
@@ -255,18 +255,18 @@ describe Dragonfly::Job do
     describe "encode" do
       before(:each) do
         @job.url_attrs = {:name => 'boid'}
-        @job.encode!(:gif, :bitrate => 'mumma')
+        @job.encode!(:gif, 'bitrate' => 'mumma')
       end
 
       it { @job.steps.should match_steps([Dragonfly::Job::Encode]) }
 
       it "should use the encoder when applied" do
-        @app.encoder.should_receive(:encode).with(@temp_object, :gif, :bitrate => 'mumma').and_return('alo')
+        @app.encoder.should_receive(:encode).with(@temp_object, :gif, 'bitrate' => 'mumma').and_return('alo')
         @job.data.should == 'alo'
       end
 
       it "should maintain the meta and update the format" do
-        @app.encoder.should_receive(:encode).with(@temp_object, :gif, :bitrate => 'mumma').and_return('alo')
+        @app.encoder.should_receive(:encode).with(@temp_object, :gif, 'bitrate' => 'mumma').and_return('alo')
         @job.meta.should == {:name => 'hello.txt', :a => :b, :format => :gif}
       end
 
@@ -276,20 +276,20 @@ describe Dragonfly::Job do
       end
 
       it "should allow returning an array with extra attributes form the encoder" do
-        @app.encoder.should_receive(:encode).with(@temp_object, :gif, :bitrate => 'mumma').and_return(['alo', {:name => 'doobie', :eggs => 'fish'}])
+        @app.encoder.should_receive(:encode).with(@temp_object, :gif, 'bitrate' => 'mumma').and_return(['alo', {:name => 'doobie', :eggs => 'fish'}])
         @job.data.should == 'alo'
         @job.meta.should == {:name => 'doobie', :a => :b, :eggs => 'fish', :format => :gif}
       end
 
       it "not allow overriding the format" do
-        @app.encoder.should_receive(:encode).with(@temp_object, :gif, :bitrate => 'mumma').and_return(['alo', {:format => :png}])
+        @app.encoder.should_receive(:encode).with(@temp_object, :gif, 'bitrate' => 'mumma').and_return(['alo', {:format => :png}])
         @job.apply.meta[:format].should == :gif
       end
 
       it "should maintain the url_attrs" do
         @job.url_attrs[:name].should == 'boid'
       end
-      
+
     end
   end
 
@@ -452,12 +452,12 @@ describe Dragonfly::Job do
       job.fetch! 'some_uid'
       job.generate! :plasma # you wouldn't really call this after fetch but still works
       job.process! :resize, '30x40'
-      job.encode! :gif, :bitrate => 20
+      job.encode! :gif, 'bitrate' => 20
       job.to_a.should == [
-        [:f, 'some_uid'],
-        [:g, :plasma],
-        [:p, :resize, '30x40'],
-        [:e, :gif, {:bitrate => 20}]
+        ['f', 'some_uid'],
+        ['g', :plasma],
+        ['p', :resize, '30x40'],
+        ['e', :gif, {'bitrate' => 20}]
       ]
     end
   end
@@ -471,10 +471,10 @@ describe Dragonfly::Job do
     describe "a well-defined array" do
       before(:each) do
         @job = Dragonfly::Job.from_a([
-          [:f, 'some_uid'],
-          [:g, :plasma],
-          [:p, :resize, '30x40'],
-          [:e, :gif, {:bitrate => 20}]
+          ['f', 'some_uid'],
+          ['g', 'plasma'],
+          ['p', 'resize', '30x40'],
+          ['e', 'gif', {'bitrate' => 20}]
         ], @app)
       end
       it "should have the correct step types" do
@@ -487,9 +487,9 @@ describe Dragonfly::Job do
       end
       it "should have the correct args" do
         @job.steps[0].args.should == ['some_uid']
-        @job.steps[1].args.should == [:plasma]
-        @job.steps[2].args.should == [:resize, '30x40']
-        @job.steps[3].args.should == [:gif, {:bitrate => 20}]
+        @job.steps[1].args.should == ['plasma']
+        @job.steps[2].args.should == ['resize', '30x40']
+        @job.steps[3].args.should == ['gif', {'bitrate' => 20}]
       end
       it "should have no applied steps" do
         @job.applied_steps.should be_empty
@@ -500,10 +500,10 @@ describe Dragonfly::Job do
     end
 
     [
-      :f,
-      [:f],
+      'f',
+      ['f'],
       [[]],
-      [[:egg]]
+      [['egg']]
     ].each do |object|
       it "should raise an error if the object passed in is #{object.inspect}" do
         lambda {
@@ -521,22 +521,23 @@ describe Dragonfly::Job do
   describe "serialization" do
     before(:each) do
       @app = test_app
-      @job = Dragonfly::Job.new(@app).fetch('uid').process(:resize_and_crop, :width => 270, :height => 92, :gravity => 'n')
+      @job = Dragonfly::Job.new(@app).fetch('uid').process(:resize_and_crop, 'width' => 270, 'height' => 92, 'gravity' => 'n')
     end
     it "should serialize itself" do
       @job.serialize.should =~ /^\w{1,}$/
     end
     it "should deserialize to the same as the original" do
       new_job = Dragonfly::Job.deserialize(@job.serialize, @app)
-      new_job.to_a.should == @job.to_a
-    end
-    it "should correctly deserialize a string serialized with ruby 1.8.7" do
-      job = Dragonfly::Job.deserialize('BAhbB1sHOgZmSSIIdWlkBjoGRVRbCDoGcDoUcmVzaXplX2FuZF9jcm9wewg6CndpZHRoaQIOAToLaGVpZ2h0aWE6DGdyYXZpdHlJIgZuBjsGVA', @app)
-      job.to_a.should == @job.to_a
-    end
-    it "should correctly deserialize a string serialized with ruby 1.9.2" do
-      job = Dragonfly::Job.deserialize('BAhbB1sHOgZmIgh1aWRbCDoGcDoUcmVzaXplX2FuZF9jcm9wewg6CndpZHRoaQIOAToLaGVpZ2h0aWE6DGdyYXZpdHkiBm4', @app)
-      job.to_a.should == @job.to_a
+
+      new_job.steps.length.should == 2
+      fetch_step, process_step = new_job.steps
+
+      fetch_step.should be_a(Dragonfly::Job::Fetch)
+      fetch_step.uid.should == 'uid'
+
+      process_step.should be_a(Dragonfly::Job::Process)
+      process_step.name.should == :resize_and_crop
+      process_step.arguments.should == [{'width' => 270, 'height' => 92, 'gravity' => 'n'}]
     end
   end
 
@@ -561,7 +562,7 @@ describe Dragonfly::Job do
     it "should return nil if there are no steps" do
       @job.url.should be_nil
     end
-    
+
     describe "using url_attrs in the url" do
       before(:each) do
         @app.server.url_format = '/media/:job/:zoo'
@@ -585,7 +586,7 @@ describe Dragonfly::Job do
         @job.url_attrs[:zoo] = 'hair'
         @job.url(:zoo => 'dare').should == "/media/#{@job.serialize}/dare"
       end
-      
+
       describe "basename" do
         before(:each) do
           @app.server.url_format = '/:job/:basename'
@@ -649,7 +650,7 @@ describe Dragonfly::Job do
       new_job = @job.to_fetched_job('some_uid')
       new_job.data.should == 'HELLO'
       new_job.to_a.should == [
-        [:f, 'some_uid']
+        ['f', 'some_uid']
       ]
       new_job.pending_steps.should be_empty
     end
@@ -667,7 +668,7 @@ describe Dragonfly::Job do
 
   describe "to_unique_s" do
     it "should use the arrays of args to create the string" do
-      job = test_app.fetch('uid').process(:gug, 4, :some => 'arg', :and => 'more')
+      job = test_app.fetch('uid').process(:gug, 4, 'some' => 'arg', 'and' => 'more')
       job.to_unique_s.should == 'fuidpgug4andmoresomearg'
     end
   end
@@ -677,15 +678,15 @@ describe Dragonfly::Job do
       @app = test_app
       @job = @app.fetch('eggs')
     end
-    
+
     it "should be of the correct format" do
       @job.sha.should =~ /^\w{8}$/
     end
-    
+
     it "should be the same for the same job steps" do
       @app.fetch('eggs').sha.should == @job.sha
     end
-    
+
     it "should be different for different jobs" do
       @app.fetch('figs').sha.should_not == @job.sha
     end
@@ -751,7 +752,7 @@ describe Dragonfly::Job do
     before(:each) do
       @app = test_app
     end
-    
+
     describe "fetch_step" do
       it "should return nil if it doesn't exist" do
         @app.generate(:ponies).process(:jam).fetch_step.should be_nil
@@ -814,10 +815,10 @@ describe Dragonfly::Job do
       it "should return the generate step otherwise" do
         step = @app.generate(:ponies).process(:cheese).generate_step
         step.should be_a(Dragonfly::Job::Generate)
-        step.args.should == [:ponies]
+        step.name.should == :ponies
       end
     end
-    
+
     describe "process_steps" do
       it "should return the processing steps" do
         job = @app.fetch('many/ponies').process(:jam).process(:eggs).encode(:gif)
@@ -838,7 +839,7 @@ describe Dragonfly::Job do
         step.format.should == :cheese
       end
     end
-    
+
     describe "step_types" do
       it "should return the step types" do
         job = @app.fetch('eggs').process(:beat, 'strongly').encode(:meringue)

data/spec/dragonfly/serializer_spec.rb

@@ -2,9 +2,9 @@
 require 'spec_helper'
 
 describe Dragonfly::Serializer do
-  
+
   include Dragonfly::Serializer
-  
+
   [
     'a',
     'sdhflasd',
@@ -22,21 +22,7 @@ describe Dragonfly::Serializer do
       str.should == string
     end
   end
-  
-  describe "replacing the '/' character in b64_encode" do
-    before(:each) do
-      @string = (127..255).map{|c| c.chr }.join
-    end
-    it "should replace '/' with '~'" do
-      b64_encode(@string).should_not =~ /\//
-      b64_encode(@string).should =~ /[\w+]+~[\w+]+/
-    end
-    it "should correctly encode and decode to the same string" do
-      str = b64_decode(b64_encode(@string))
-      str.should == @string
-    end
-  end
-  
+
   [
     :hello,
     nil,
@@ -50,7 +36,6 @@ describe Dragonfly::Serializer do
   ].each do |object|
     it "should correctly marshal encode #{object.inspect} properly with no padding/line break" do
       encoded = marshal_encode(object)
-      # raise encoded.index("\n").inspect
       encoded.should be_a(String)
       encoded.should_not =~ /\n|=/
     end
@@ -58,7 +43,7 @@ describe Dragonfly::Serializer do
       marshal_decode(marshal_encode(object)).should == object
     end
   end
-  
+
   describe "marshal_decode" do
     it "should raise an error if the string passed in is empty" do
       lambda{
@@ -71,5 +56,36 @@ describe Dragonfly::Serializer do
       }.should raise_error(Dragonfly::Serializer::BadString)
     end
   end
-  
+
+  [
+    [3,4,5],
+    {'wo' => 'there'},
+    [{'this' => 'should', 'work' => [3, 5.3, nil, {'egg' => false}]}, [], true]
+  ].each do |object|
+    it "should correctly json encode #{object.inspect} properly with no padding/line break" do
+      encoded = json_encode(object)
+      encoded.should be_a(String)
+      encoded.should_not =~ /\n|=/
+    end
+    it "should correctly json encode and decode #{object.inspect} to the same object" do
+      json_decode(json_encode(object)).should == object
+    end
+  end
+
+  describe "json_decode" do
+    it "optionally symbolizes keys" do
+      json_decode(json_encode('a' => 1), :symbolize_keys => true).should == {:a => 1}
+    end
+    it "should raise an error if the string passed in is empty" do
+      lambda{
+        json_decode('')
+      }.should raise_error(Dragonfly::Serializer::BadString)
+    end
+    it "should raise an error if the string passed in is gobbledeegook" do
+      lambda{
+        json_decode('ahasdkjfhasdkfjh')
+      }.should raise_error(Dragonfly::Serializer::BadString)
+    end
+  end
+
 end

data/spec/dragonfly/server_spec.rb

@@ -9,7 +9,7 @@ end
 describe Dragonfly::Server do
 
   describe "responses" do
-    
+
     before(:each) do
       @app = test_app
       @uid = @app.store('HELLO THERE')
@@ -17,7 +17,7 @@ describe Dragonfly::Server do
       @server.url_format = '/media/:job'
       @job = @app.fetch(@uid)
     end
-  
+
     after(:each) do
       @app.destroy(@uid)
     end
@@ -26,13 +26,13 @@ describe Dragonfly::Server do
       before(:each) do
         @server.url_format = '/media/:job/:name.:format'
       end
-    
+
       [
         '',
         '/name',
         '/name.ext'
       ].each do |suffix|
-    
+
         it "should return successfully when given the url with suffix #{suffix.inspect}" do
           url = "/media/#{@job.serialize}#{suffix}"
           response = request(@server, url)
@@ -40,7 +40,7 @@ describe Dragonfly::Server do
           response.body.should == 'HELLO THERE'
           response.content_type.should == 'application/octet-stream'
         end
-        
+
       end
 
       it "should return successfully with the correct sha given and protection on" do
@@ -51,24 +51,6 @@ describe Dragonfly::Server do
         response.body.should == 'HELLO THERE'
       end
 
-      
-      it "should work ok with + symbols" do
-        @app.processor.add(:thumb){|t, geometry| "eggs" }
-        @app.datastore.should_receive(:retrieve).with('2011/04/20/20_55_04_114_female_1.jpg').and_return "EGGS"
-        response = request(@server, '/media/BAhbB1sHOgZmSSIpMjAxMS8wNC8yMC8yMF81NV8wNF8xMTRfZmVtYWxlXzEuanBnBjoGRVRbCDoGcDoKdGh1bWJJIgwxMDB4NzU+BjsGVA')
-        response.status.should == 200
-        response.body.should == 'eggs'
-      end
-
-      it "should work ok with ~ symbols" do
-        funny_filename = (127..255).map{|c| c.chr }.join
-        @app.datastore.should_receive(:retrieve).with(funny_filename).and_return "EGGS"
-        # the following is the url for 'fetch(funny_filename)'
-        response = request(@server, '/media/BAhbBlsHOgZmIgGBf4CBgoOEhYaHiImKi4yNjo+QkZKTlJWWl5iZmpucnZ6foKGio6SlpqeoqaqrrK2ur7CxsrO0tba3uLm6u7y9vr~AwcLDxMXGx8jJysvMzc7P0NHS09TV1tfY2drb3N3e3+Dh4uPk5ebn6Onq6+zt7u~w8fLz9PX29~j5+vv8~f7~')
-        response.status.should == 200
-        response.body.should == 'EGGS'
-      end
-
       it "should return a cacheable response" do
         url = "/media/#{@job.serialize}"
         cache = Rack::Cache.new(@server, :entitystore => 'heap:/')
@@ -96,7 +78,7 @@ describe Dragonfly::Server do
         response = request(@server, url)
         response.status.should == 400
       end
-  
+
       it "should return a 400 if wrong sha given and protection on" do
         @server.protect_from_dos_attacks = true
         url = "/media/#{@job.serialize}?sha=asdfs"
@@ -113,7 +95,7 @@ describe Dragonfly::Server do
           response.headers['X-Cascade'].should == 'pass'
         end
       end
-  
+
       it "should return a 404 when the url matches but doesn't correspond to a job" do
         response = request(@server, '/media/sadhfasdfdsfsdf')
         response.status.should == 404
@@ -121,7 +103,7 @@ describe Dragonfly::Server do
         response.content_type.should == 'text/plain'
         response.headers['X-Cascade'].should be_nil
       end
-  
+
       it "should return a 404 when the url isn't known at all" do
         response = request(@server, '/jfasd/dsfa')
         response.status.should == 404
@@ -129,23 +111,23 @@ describe Dragonfly::Server do
         response.content_type.should == 'text/plain'
         response.headers['X-Cascade'].should == 'pass'
       end
-  
+
       it "should return a 404 when the url is a well-encoded but bad array" do
-        url = "/media/#{Dragonfly::Serializer.marshal_encode([[:egg, {:some => 'args'}]])}"
+        url = "/media/#{Dragonfly::Serializer.json_encode([['egg', {'some' => 'args'}]])}"
         response = request(@server, url)
         response.status.should == 404
         response.body.should == 'Not found'
         response.content_type.should == 'text/plain'
         response.headers['X-Cascade'].should be_nil
       end
-      
+
       it "should return a 403 Forbidden when someone uses fetch_file" do
         response = request(@server, "/media/#{@app.fetch_file('/some/file.txt').serialize}")
         response.status.should == 403
         response.body.should == 'Forbidden'
         response.content_type.should == 'text/plain'
       end
-      
+
       it "should return a 403 Forbidden when someone uses fetch_url" do
         response = request(@server, "/media/#{@app.fetch_url('some.url').serialize}")
         response.status.should == 403
@@ -155,14 +137,14 @@ describe Dragonfly::Server do
     end
 
   end
-  
+
   describe "dragonfly response" do
     before(:each) do
       @app = test_app
       @server = Dragonfly::Server.new(@app)
       @server.url_format = '/media/:job'
     end
-    
+
     it "should return a simple text response" do
       request(@server, '/dragonfly').should be_a_text_response
     end
@@ -181,30 +163,30 @@ describe Dragonfly::Server do
   end
 
   describe "urls" do
-    
+
     before(:each) do
       @app = test_app
       @server = Dragonfly::Server.new(@app)
       @server.url_format = '/media/:job/:basename.:format'
       @job = @app.fetch('some_uid')
     end
-    
+
     it "should generate the correct url when no basename/format" do
       @server.url_for(@job).should == "/media/#{@job.serialize}"
     end
-    
+
     it "should generate the correct url when there is a basename and no format" do
       @server.url_for(@job, :basename => 'hello').should == "/media/#{@job.serialize}/hello"
     end
-    
+
     it "should generate the correct url when there is a basename and different format" do
       @server.url_for(@job, :basename => 'hello', :format => 'gif').should == "/media/#{@job.serialize}/hello.gif"
     end
 
     it "should add extra params to the url query string" do
-      @server.url_for(@job, :a => 'thing', :b => 'nuther').should == "/media/#{@job.serialize}?a=thing&b=nuther"
+      @server.url_for(@job, :a => 'thing', :b => 'nuther').should match_url "/media/#{@job.serialize}?a=thing&b=nuther"
     end
-  
+
     it "should add the host to the url if configured" do
       @server.url_host = 'http://some.server:4000'
       @server.url_for(@job).should == "http://some.server:4000/media/#{@job.serialize}"
@@ -218,7 +200,7 @@ describe Dragonfly::Server do
       @server.url_host = 'http://some.server:4000'
       @server.url_for(@job, :host => 'https://smeedy').should == "https://smeedy/media/#{@job.serialize}"
     end
-  
+
     describe "Denial of Service protection" do
       before(:each) do
         @app = test_app
@@ -269,12 +251,12 @@ describe Dragonfly::Server do
           throw :halt, [200, {}, ['hello']]
         end
       end
-      
+
       it 'return the specified response instead of job.result' do
         response = request(@server, "/#{@job.serialize}")
         response.body.should == 'hello'
       end
-      
+
       it "should not apply the job if not asked to" do
         @app.generator.should_not_receive(:generate)
         response = request(@server, "/#{@job.serialize}")