Gracefully deprecate old nested meta

lib/dragonfly/job.rb

@@ -422,7 +422,10 @@ def attributes_for_url
     end
 
     def update(content, meta)
-      self.meta.merge!(meta) if meta
+      if meta
+        meta.merge!(meta.delete(:meta)) if meta[:meta] # legacy data etc. may have nested meta hash - deprecate gracefully here
+        self.meta.merge!(meta)
+      end
       if content
         self.temp_object = TempObject.new(content)
         self.name = temp_object.original_filename if name.nil? && temp_object.original_filename

spec/dragonfly/job_spec.rb

@@ -1032,4 +1032,15 @@
     end
   end
 
+  describe "deprecated meta format" do
+    before(:each) do
+      @app = test_app
+    end
+    it "should still work if the datastore/whatever returns meta nested in :meta key" do
+      @app.datastore.should_receive(:retrieve).with('some_uid').and_return(['HELLO', {:name => 'test.txt', :meta => {:some => 'meta'}}])
+      job = @app.fetch('some_uid').apply
+      job.meta.should == {:name => 'test.txt', :some => 'meta'}
+    end
+  end
+
 end