dragonfly 0.9.8 → 0.9.9

data/spec/dragonfly/data_storage/s3_data_store_spec.rb

@@ -59,17 +59,17 @@ describe Dragonfly::DataStorage::S3DataStore do
       @data_store.store(temp_object).should_not == @data_store.store(temp_object2)
     end
 
-    it "should use the name in the meta if set" do
-      temp_object = Dragonfly::TempObject.new('eggheads')
-      uid = @data_store.store(temp_object, :meta => {:name =>  'doobie'})
+    it "should use the name from the temp_object if set" do
+      temp_object = Dragonfly::TempObject.new('eggheads', :name => 'doobie')
+      uid = @data_store.store(temp_object)
       uid.should =~ /doobie$/
       data, meta = @data_store.retrieve(uid)
       data.should == 'eggheads'
     end
 
     it "should work ok with files with funny names" do
-      temp_object = Dragonfly::TempObject.new('eggheads')
-      uid = @data_store.store(temp_object, :meta => {:name =>  'A Picture with many spaces in its name (at 20:00 pm).png'})
+      temp_object = Dragonfly::TempObject.new('eggheads', :name => 'A Picture with many spaces in its name (at 20:00 pm).png')
+      uid = @data_store.store(temp_object)
       uid.should =~ /A_Picture_with_many_spaces_in_its_name_at_20_00_pm_\.png$/
       data, meta = @data_store.retrieve(uid)
       data.should == 'eggheads'
@@ -224,6 +224,13 @@ describe Dragonfly::DataStorage::S3DataStore do
       end
       @data_store.store(@temp_object, :headers => {'hello' => 'there'})
     end
+    
+    it "should store with the content-type if passed in" do
+      @data_store.storage.should_receive(:put_object) do |_, __, ___, headers|
+        headers['Content-Type'].should == 'text/plain'
+      end
+      @data_store.store(@temp_object, :mime_type => 'text/plain')
+    end
   end
 
   describe "urls for serving directly" do
@@ -245,6 +252,15 @@ describe Dragonfly::DataStorage::S3DataStore do
       @data_store.url_for(@uid, :expires => 1301476942).should =~
         %r{^https://#{@data_store.domain}/#{BUCKET_NAME}/some/path/on/s3\?AWSAccessKeyId=#{@data_store.access_key_id}&Signature=[\w%]+&Expires=1301476942$}
     end
+
+    it "should allow for using https" do
+      @data_store.url_for(@uid, :scheme => 'https').should == "https://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
+    end
+
+    it "should allow for always using https" do
+      @data_store.url_scheme = 'https'
+      @data_store.url_for(@uid).should == "https://#{BUCKET_NAME}.s3.amazonaws.com/some/path/on/s3"
+    end
     
   end
 

data/spec/dragonfly/data_storage/shared_data_store_examples.rb

@@ -44,8 +44,8 @@ shared_examples_for "data_store" do
 
     describe "when meta is given" do
       before(:each) do
-        temp_object = Dragonfly::TempObject.new('gollum')
-        @uid = @data_store.store(temp_object, :meta => {:bitrate => '35', :name => 'danny.boy'})
+        temp_object = Dragonfly::TempObject.new('gollum', :bitrate => '35', :name => 'danny.boy')
+        @uid = @data_store.store(temp_object)
         @obj, @meta = @data_store.retrieve(@uid)
       end
 

data/spec/dragonfly/has_filename_spec.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+describe Dragonfly::HasFilename do
+  
+  before(:each) do
+    @obj = Object.new
+    class << @obj
+      include Dragonfly::HasFilename
+      attr_accessor :name
+    end
+  end
+
+  describe "basename" do
+    it "should define basename" do
+      @obj.name = 'meat.balls'
+      @obj.basename.should == 'meat'
+    end
+    it "should all but the last bit" do
+      @obj.name = 'tooting.meat.balls'
+      @obj.basename.should == 'tooting.meat'
+    end
+    it "should be nil if name not set" do
+      @obj.basename.should be_nil
+    end
+    it "should be the whole name if it has no ext" do
+      @obj.name = 'eggs'
+      @obj.basename.should == 'eggs'
+    end
+  end
+  
+  describe "basename=" do
+    it "should set the whole name if there isn't one" do
+      @obj.basename = 'doog'
+      @obj.name.should == 'doog'
+    end
+    it "should replace the whole name if there's no ext" do
+      @obj.name = 'lungs'
+      @obj.basename = 'doog'
+      @obj.name.should == 'doog'
+    end
+    it "should replace all but the last bit" do
+      @obj.name = 'bong.lungs.pig'
+      @obj.basename = 'smeeg'
+      @obj.name.should == 'smeeg.pig'
+    end
+  end
+  
+  describe "ext" do
+    it "should define ext" do
+      @obj.name = 'meat.balls'
+      @obj.ext.should == 'balls'
+    end
+    it "should only use the last bit" do
+      @obj.name = 'tooting.meat.balls'
+      @obj.ext.should == 'balls'
+    end
+    it "should be nil if name not set" do
+      @obj.ext.should be_nil
+    end
+    it "should be nil if name has no ext" do
+      @obj.name = 'eggs'
+      @obj.ext.should be_nil
+    end
+  end
+  
+  describe "ext=" do
+    it "should use a default basename if there is no name" do
+      @obj.ext = 'doog'
+      @obj.name.should == 'file.doog'
+    end
+    it "should append the ext if name has none already" do
+      @obj.name = 'lungs'
+      @obj.ext = 'doog'
+      @obj.name.should == 'lungs.doog'
+    end
+    it "should replace the ext if name has one already" do
+      @obj.name = 'lungs.pig'
+      @obj.ext = 'doog'
+      @obj.name.should == 'lungs.doog'
+    end
+    it "should only replace the last bit" do
+      @obj.name = 'long.lungs.pig'
+      @obj.ext = 'doog'
+      @obj.name.should == 'long.lungs.doog'
+    end
+  end
+  
+end

data/spec/dragonfly/image_magick/analyser_spec.rb

@@ -64,5 +64,15 @@ describe Dragonfly::ImageMagick::Analyser do
     image = Dragonfly::TempObject.new(SAMPLES_DIR.join('white pixel.png'))
     @analyser.width(image).should == 1
   end
+  
+  it "should work (width) for images with capital letter extensions" do
+    image = Dragonfly::TempObject.new(SAMPLES_DIR.join('DSC02119.JPG'))
+    @analyser.width(image).should == 1
+  end
+
+  it "should work (width) for images with numbers in the format" do
+    image = Dragonfly::TempObject.new(SAMPLES_DIR.join('a.jp2'))
+    @analyser.width(image).should == 1
+  end
 
 end

data/spec/dragonfly/image_magick/processor_spec.rb

@@ -237,6 +237,17 @@ describe Dragonfly::ImageMagick::Processor do
     end
   end
 
+  describe "auto-orient" do
+    it "should rotate an image according to exif information" do
+      @image = Dragonfly::TempObject.new(SAMPLES_DIR.join('beach.jpg'))
+      @image.should have_width(355)
+      @image.should have_height(280)
+      image = @processor.auto_orient(@image)
+      image.should have_width(280)
+      image.should have_height(355)
+    end
+  end
+
   describe "flip" do
     it "should flip the image, leaving the same dimensions" do
       image = @processor.flip(@image)

data/spec/dragonfly/job_spec.rb

@@ -45,18 +45,18 @@ describe Dragonfly::Job do
 
   end
 
+  it "should allow initializing with content" do
+    job = Dragonfly::Job.new(@app, 'eggheads')
+    job.data.should == 'eggheads'
+  end
+
   describe "without content" do
 
     before(:each) do
-      @app = mock_app
+      @app = test_app
       @job = Dragonfly::Job.new(@app)
     end
 
-    it "should allow initializing with content" do
-      job = Dragonfly::Job.new(@app, 'eggheads')
-      job.data.should == 'eggheads'
-    end
-
     describe "fetch" do
       before(:each) do
         @job.fetch!('some_uid')
@@ -74,6 +74,10 @@ 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
     end
 
     describe "process" do
@@ -95,10 +99,19 @@ describe Dragonfly::Job do
     end
 
     describe "analyse" do
-      it "should raise an error" do
+      it "should raise a NoContent error" do
+        job = @app.new_job # This will define #analyser on it
+        lambda{
+          job.analyse(:width)
+        }.should raise_error(Dragonfly::Job::NoContent)
+      end
+    end
+
+    describe "data" do
+      it "should raise a NoContent error" do
         lambda{
-          @job.analyse(:width)
-        }.should raise_error(Dragonfly::Job::NothingToAnalyse)
+          @job.data
+        }.should raise_error(Dragonfly::Job::NoContent)
       end
     end
 
@@ -119,6 +132,10 @@ 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
     end
 
     describe "fetch_file" do
@@ -132,6 +149,10 @@ describe Dragonfly::Job 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
@@ -139,7 +160,7 @@ describe Dragonfly::Job do
 
     describe "fetch_url" do
       before(:each) do
-        stub_request(:get, 'http://some.place.com').to_return(:body => 'result!')
+        stub_request(:get, %r{http://some\.place\.com/.*}).to_return(:body => 'result!')
         stub_request(:get, 'https://some.place.com').to_return(:body => 'secure result!')
       end
 
@@ -167,12 +188,22 @@ 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'}
+      end
 
       ["some.place.com", "some.place.com/", "some.place.com/eggs/"].each do |url|
         it "should not set the name if there isn't one, e.g. #{url}" do
           @job.fetch_url!(url)
           @job.meta[:name].should be_nil
         end
+
+        it "should not set the name url_attr if there isn't one, e.g. #{url}" do
+          @job.fetch_url!(url)
+          @job.url_attrs[:name].should be_nil
+        end
       end
     end
 
@@ -194,6 +225,7 @@ describe Dragonfly::Job do
 
     describe "process" do
       before(:each) do
+        @job.url_attrs = {:some => 'thing'}
         @job.process!(:resize, '20x30')
       end
 
@@ -206,10 +238,13 @@ describe Dragonfly::Job do
 
       it "should maintain the meta attributes" do
         @app.processor.should_receive(:process).with(@temp_object, :resize, '20x30').and_return('hi')
-        @job.data.should == 'hi'
         @job.meta.should == {:name => 'hello.txt', :a => :b}
       end
 
+      it "should maintain the url_attrs" do
+        @job.url_attrs.should == {:some => 'thing'}
+      end
+
       it "should allow returning an array with extra attributes from the processor" do
         @app.processor.should_receive(:process).with(@temp_object, :resize, '20x30').and_return(['hi', {:name => 'hello_20x30.txt', :eggs => 'asdf'}])
         @job.data.should == 'hi'
@@ -219,6 +254,7 @@ describe Dragonfly::Job do
 
     describe "encode" do
       before(:each) do
+        @job.url_attrs = {:name => 'boid'}
         @job.encode!(:gif, :bitrate => 'mumma')
       end
 
@@ -231,13 +267,12 @@ describe Dragonfly::Job do
 
       it "should maintain the meta and update the format" do
         @app.encoder.should_receive(:encode).with(@temp_object, :gif, :bitrate => 'mumma').and_return('alo')
-        @job.data.should == 'alo'
         @job.meta.should == {:name => 'hello.txt', :a => :b, :format => :gif}
       end
 
-      it "should update the format even when not applied" do
+      it "should update the format on the url_attrs" do
         @app.encoder.should_not_receive(:encode)
-        @job.meta[:format].should == :gif
+        @job.url_attrs[:format].should == :gif
       end
 
       it "should allow returning an array with extra attributes form the encoder" do
@@ -250,6 +285,11 @@ describe Dragonfly::Job do
         @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
 
@@ -522,7 +562,7 @@ describe Dragonfly::Job do
       @job.url.should be_nil
     end
     
-    describe "using meta in the url" do
+    describe "using url_attrs in the url" do
       before(:each) do
         @app.server.url_format = '/media/:job/:zoo'
         @job.generate!(:fish)
@@ -533,33 +573,29 @@ describe Dragonfly::Job do
       it "should add given params" do
         @job.url(:zoo => 'jokes', :on => 'me').should == "/media/#{@job.serialize}/jokes?on=me"
       end
-      it "should use the meta if it exists" do
-        @job.meta[:zoo] = 'hair'
+      it "should use the url_attr if it exists" do
+        @job.url_attrs[:zoo] = 'hair'
         @job.url.should == "/media/#{@job.serialize}/hair"
       end
-      it "should not add an meta that isn't needed" do
-        @job.meta[:gump] = 'flub'
+      it "should not add any url_attrs that aren't needed" do
+        @job.url_attrs[:gump] = 'flub'
         @job.url.should == "/media/#{@job.serialize}"
       end
       it "should override if a param is passed in" do
-        @job.meta[:zoo] = 'hair'
+        @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'
-          @job.meta = {:name => 'hello.egg', :basename => 'hi'}
-        end
-        it "should use the meta if it exists" do
-          @job.url.should == "/#{@job.serialize}/hi"
         end
-        it "should use the name if basename meta doesn't exist" do
-          @job.meta.delete(:basename)
+        it "should use the name" do
+          @job.url_attrs = {:name => 'hello.egg'}
           @job.url.should == "/#{@job.serialize}/hello"
         end
         it "should not set if neither exist" do
-          @job.meta = {}
+          @job.url_attrs = {}
           @job.url.should == "/#{@job.serialize}"
         end
       end
@@ -567,17 +603,14 @@ describe Dragonfly::Job do
       describe "ext" do
         before(:each) do
           @app.server.url_format = '/:job.:ext'
-          @job.meta = {:name => 'hello.egg', :ext => 'hi'}
+          @job.url_attrs = {:name => 'hello.egg', :ext => 'hi'}
         end
-        it "should use the meta if it exists" do
-          @job.url.should == "/#{@job.serialize}.hi"
-        end
-        it "should use the name if ext meta doesn't exist" do
-          @job.meta.delete(:ext)
+        it "should use the name" do
+          @job.url_attrs = {:name => 'hello.egg'}
           @job.url.should == "/#{@job.serialize}.egg"
         end
         it "should not set if neither exist" do
-          @job.meta = {}
+          @job.url_attrs = {}
           @job.url.should == "/#{@job.serialize}"
         end
       end
@@ -585,21 +618,22 @@ describe Dragonfly::Job do
       describe "format" do
         before(:each) do
           @app.server.url_format = '/:job.:format'
-          @job.stub!(:ext).and_return("hi")
         end
-        it "should use the meta if it exists" do
-          @job.meta = {:format => :txt}
+        it "should use the url_attr if it exists" do
+          @job.url_attrs = {:ext => 'hi', :format => :txt}
           @job.url.should == "/#{@job.serialize}.txt"
         end
-        it "should use the ext if format meta doesn't exist" do
+        it "should use the ext if format url_attr doesn't exist" do
+          @job.url_attrs = {:name => 'hup.hi'}
           @job.url.should == "/#{@job.serialize}.hi"
         end
         it "should not use the ext if format meta doesn't exist and trust_file_extensions is switched off" do
+          @job.url_attrs = {:name => 'hup.hi'}
           @app.trust_file_extensions = false
           @job.url.should == "/#{@job.serialize}"
         end
         it "should not set if neither exist" do
-          @job.should_receive(:ext).and_return nil
+          @job.url_attrs = {}
           @job.url.should == "/#{@job.serialize}"
         end
       end
@@ -624,6 +658,11 @@ describe Dragonfly::Job do
       new_job = @job.to_fetched_job('some_uid')
       new_job.meta.should == {:right => 'said fred'}
     end
+    it "should maintain the url_attrs" do
+      @job.url_attrs = {:dang => 'that dawg'}
+      new_job = @job.to_fetched_job('some_uid')
+      new_job.url_attrs.should == {:dang => 'that dawg'}
+    end
   end
 
   describe "to_unique_s" do
@@ -811,7 +850,8 @@ describe Dragonfly::Job do
   describe "meta" do
     before(:each) do
       @app = test_app
-      @job = @app.new_job
+      @app.generator.add(:gollum){|t| "OK"}
+      @job = @app.new_job("Goo")
     end
     it "should default meta to an empty hash" do
       @job.meta.should == {}
@@ -820,10 +860,13 @@ describe Dragonfly::Job do
       @job.meta = {:a => :b}
       @job.meta.should == {:a => :b}
     end
-    it "should not allow setting as anything other than a hash" do
-      lambda{
-        @job.meta = 3
-      }.should raise_error(ArgumentError)
+    it "should apply the job" do
+      @job.should_receive :apply
+      @job.meta
+    end
+    it "should apply the job before setting (for consistency)" do
+      @job.should_receive :apply
+      @job.meta = {}
     end
     it "should allow setting on initialize" do
       job = @app.new_job('asdf', :b => :c)
@@ -835,157 +878,120 @@ describe Dragonfly::Job do
     end
   end
 
-  describe "name" do
+  describe "sanity check for name, basename, ext" do
     before(:each) do
       @app = test_app
+      @job = @app.new_job('asdf')
     end
+
     it "should default to nil" do
-      job = @app.new_job('HELLO')
-      job.name.should be_nil
+      @job.name.should be_nil
     end
-    it "should use the meta" do
-      job = @app.new_job('HELLO')
-      job.meta[:name] = 'monkey.egg'
-      job.name.should == 'monkey.egg'
+
+    it "reflect the meta" do
+      @job.meta[:name] = 'monkey.egg'
+      @job.name.should == 'monkey.egg'
+      @job.basename.should == 'monkey'
+      @job.ext.should == 'egg'
     end
-    it "should allow setting" do
-      job = @app.new_job('HELLO')
-      job.name = "jonny.briggs"
-      job.meta[:name].should == 'jonny.briggs'
+  end
+
+  describe "format" do
+    before(:each) do
+      @app = test_app
     end
-    
-    describe "ext" do
-      before(:each) do
-        @job = @app.new_job('asdf')
-      end
-      it "should use the correct extension from name" do
-        @job.name = 'hello.there.mate'
-        @job.ext.should == 'mate'
-      end
-      it "should be nil if name has none" do
-        @job.name = 'hello'
-        @job.ext.should be_nil
-      end
-      it "should be nil if name is nil" do
-        @job.name = nil
-        @job.ext.should be_nil
-      end
-      it "should use the meta first if set" do
-        @job.meta[:ext] = 'duggs'
-        @job.name = 'hello.there.mate'
-        @job.ext.should == 'duggs'
-      end
+    it "should default to nil" do
+      job = @app.new_job("HELLO")
+      job.format.should be_nil
     end
-
-    describe "basename" do
-      before(:each) do
-        @job = @app.new_job('asdf')
-      end
-      it "should use the correct basename from name" do
-        @job.name = 'hello.there.mate'
-        @job.basename.should == 'hello.there'
-      end
-      it "should be the name if it has no ext" do
-        @job.name = 'hello'
-        @job.basename.should == 'hello'
-      end
-      it "should be nil if name is nil" do
-        @job.name = nil
-        @job.basename.should be_nil
-      end
-      it "should use the meta first if set" do
-        @job.meta[:basename] = 'duggs'
-        @job.name = 'hello.there.mate'
-        @job.basename.should == 'duggs'
-      end
+    it "should use the meta format if it exists" do
+      job = @app.new_job("HELLO")
+      job.meta[:format] = :txt
+      job.format.should == :txt
     end
-
-    describe "format" do
-      before(:each) do
-        @app = test_app
-      end
-      it "should default to nil" do
-        job = @app.new_job("HELLO")
-        job.format.should be_nil
-      end
-      it "should use the meta format if it exists" do
-        job = @app.new_job("HELLO")
-        job.meta[:format] = :txt
-        job.format.should == :txt
-      end
-      it "should use the analyser format if it exists" do
-        @app.analyser.add :format do |temp_object|
-          :egg
-        end
-        job = @app.new_job("HELLO")
-        job.format.should == :egg
-      end
-      it "should use the file extension if it has no format" do
-        @job = @app.new_job("HIMATE", :name => 'test.pdf')
-        @job.format.should == :pdf
+    it "should use the analyser format if it exists" do
+      @app.analyser.add :format do |temp_object|
+        :egg
       end
-      it "should not use the file extension if it's been switched off" do
-        @app.trust_file_extensions = false
-        @job = @app.new_job("HIMATE", :name => 'test.pdf')
-        @job.format.should be_nil
-      end
-      it "should prefer the set format over the file extension" do
-        job = @app.new_job("HELLO", :name => 'test.pdf', :format => :txt)
-        job.format.should == :txt
-      end
-      it "should prefer the file extension over the analysed format" do
-        @app.analyser.add :format do |temp_object|
-          :egg
-        end
-        job = @app.new_job("HELLO", :name => 'test.pdf')
-        job.format.should == :pdf
-      end
-      it "should apply the job" do
-        @app.generator.add(:test){ ["skid marks", {:name => 'terry.burton'}] }
-        job = @app.generate(:test)
-        job.format.should == :burton
-        job.should be_applied
+      job = @app.new_job("HELLO")
+      job.format.should == :egg
+    end
+    it "should use the file extension if it has no format" do
+      job = @app.new_job("HIMATE", :name => 'test.pdf')
+      job.format.should == :pdf
+    end
+    it "should not use the file extension if it's been switched off" do
+      @app.trust_file_extensions = false
+      job = @app.new_job("HIMATE", :name => 'test.pdf')
+      job.format.should be_nil
+    end
+    it "should prefer the set format over the file extension" do
+      job = @app.new_job("HELLO", :name => 'test.pdf', :format => :txt)
+      job.format.should == :txt
+    end
+    it "should prefer the file extension over the analysed format" do
+      @app.analyser.add :format do |temp_object|
+        :egg
       end
+      job = @app.new_job("HELLO", :name => 'test.pdf')
+      job.format.should == :pdf
+    end
+    it "should apply the job" do
+      @app.generator.add(:test){ ["skid marks", {:name => 'terry.burton'}] }
+      job = @app.generate(:test)
+      job.format.should == :burton
+      job.should be_applied
     end
+  end
 
-    describe "mime_type" do
-      before(:each) do
-        @app = test_app
-      end
-      it "should return the correct mime_type if the format is given" do
-        @job = @app.new_job("HIMATE")
-        @job.should_receive(:format).and_return(:tiff)
-        @job.mime_type.should == 'image/tiff'
-      end
-      it "should fall back to the mime_type analyser if the format is nil" do
-        @app.analyser.add :mime_type do |temp_object|
-          'image/jpeg'
-        end
-        @job = @app.new_job("HIMATE")
-        @job.mime_type.should == 'image/jpeg'
-      end
-      it "should fall back to the fallback mime_type if neither format or analyser exist" do
-        @app.new_job("HIMATE").mime_type.should == 'application/octet-stream'
+  describe "mime_type" do
+    before(:each) do
+      @app = test_app
+    end
+    it "should return the correct mime_type if the format is given" do
+      @job = @app.new_job("HIMATE")
+      @job.should_receive(:format).and_return(:tiff)
+      @job.mime_type.should == 'image/tiff'
+    end
+    it "should fall back to the mime_type analyser if the format is nil" do
+      @app.analyser.add :mime_type do |temp_object|
+        'image/jpeg'
       end
+      @job = @app.new_job("HIMATE")
+      @job.mime_type.should == 'image/jpeg'
+    end
+    it "should fall back to the fallback mime_type if neither format or analyser exist" do
+      @app.new_job("HIMATE").mime_type.should == 'application/octet-stream'
     end
-
   end
-  
+
   describe "store" do
     before(:each) do
       @app = test_app
       @app.generator.add(:test){ ["Toes", {:name => 'doogie.txt'}] }
       @job = @app.generate(:test)
     end
-    it "should store its data along with the meta" do
+    it "should store its data along with the meta and mime_type" do
       @job.meta[:eggs] = 'doolally'
-      @app.datastore.should_receive(:store).with(a_temp_object_with_data("Toes"), :meta => {:name => 'doogie.txt', :eggs => 'doolally'})
+      @app.datastore.should_receive(:store).with do |temp_object, opts|
+        temp_object.data.should == "Toes"
+        temp_object.name.should == 'doogie.txt'
+        temp_object.meta[:eggs].should == 'doolally'
+        opts[:mime_type].should == 'text/plain'
+      end
       @job.store
     end
     it "should add extra opts" do
-      @app.datastore.should_receive(:store).with(a_temp_object_with_data("Toes"), :meta => {:name => 'doogie.txt'}, :path => 'blah')
+      @app.datastore.should_receive(:store).with(anything, hash_including(:path => 'blah', :mime_type => 'text/plain'))
       @job.store(:path => 'blah')
     end
+    it "should pass in its meta, for deprecated datastores" do
+      @job.meta[:beans] = 5
+      @app.datastore.should_receive(:store).with do |temp_object, opts|
+        opts[:meta].should == {:beans => 5, :name => 'doogie.txt'}
+      end
+      @job.store
+    end
   end
 
   describe "dealing with original_filename" do