dragonfly 0.9.15 → 1.0

data/spec/dragonfly/memory_data_store_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'dragonfly/spec/data_store_examples'
+
+describe Dragonfly::MemoryDataStore do
+
+  before(:each) do
+    @data_store = Dragonfly::MemoryDataStore.new
+  end
+
+  it_should_behave_like 'data_store'
+
+  it "allows setting the uid" do
+    uid = @data_store.write(Dragonfly::Content.new(test_app, "Hello"), :uid => 'some_uid')
+    uid.should == 'some_uid'
+    data, meta = @data_store.read(uid)
+    data.should == 'Hello'
+  end
+
+end
+

data/spec/dragonfly/middleware_spec.rb

@@ -11,37 +11,57 @@ describe Dragonfly::Middleware do
     Rack::MockRequest.new(app).get(url)
   end
 
-  before(:each) do
-    @stack = Rack::Builder.new do
-      use Dragonfly::Middleware, :images
-      run dummy_rack_app
+  describe "using the default app" do
+    before(:each) do
+      @stack = Rack::Builder.new do
+        use Dragonfly::Middleware
+        run dummy_rack_app
+      end
     end
-  end
 
-  it "should pass through if the app returns X-Cascade: pass" do
-    Dragonfly[:images].should_receive(:call).and_return(
-      [404, {"Content-Type" => 'text/plain', 'X-Cascade' => 'pass'}, ['Not found']]
-    )
-    response = make_request(@stack, '/media/hello.png?howare=you')
-    response.body.should == 'dummy_rack_app body'
-    response.status.should == 200
-  end
+    it "should pass through if the app returns X-Cascade: pass" do
+      Dragonfly.app.should_receive(:call).and_return(
+        [404, {"Content-Type" => 'text/plain', 'X-Cascade' => 'pass'}, ['Not found']]
+      )
+      response = make_request(@stack, '/media/hello.png?howare=you')
+      response.body.should == 'dummy_rack_app body'
+      response.status.should == 200
+    end
+
+    it "should return a 404 if the app returns a 404" do
+      Dragonfly.app.should_receive(:call).and_return(
+        [404, {"Content-Type" => 'text/plain'}, ['Not found']]
+      )
+      response = make_request(@stack, '/media/hello.png?howare=you')
+      response.status.should == 404
+    end
 
-  it "should return a 404 if the app returns a 404" do
-    Dragonfly[:images].should_receive(:call).and_return(
-      [404, {"Content-Type" => 'text/plain'}, ['Not found']]
-    )
-    response = make_request(@stack, '/media/hello.png?howare=you')
-    response.status.should == 404
+    it "should return as per the dragonfly app if the app returns a 200" do
+      Dragonfly.app.should_receive(:call).and_return(
+        [200, {"Content-Type" => 'text/plain'}, ['ABCD']]
+      )
+      response = make_request(@stack, '/media/hello.png?howare=you')
+      response.status.should == 200
+      response.body.should == 'ABCD'
+    end
   end
 
-  it "should return as per the dragonfly app if the app returns a 200" do
-    Dragonfly[:images].should_receive(:call).and_return(
-      [200, {"Content-Type" => 'text/plain'}, ['ABCD']]
-    )
-    response = make_request(@stack, '/media/hello.png?howare=you')
-    response.status.should == 200
-    response.body.should == 'ABCD'
+  describe "using a custom app" do
+    before(:each) do
+      @stack = Rack::Builder.new do
+        use Dragonfly::Middleware, :images
+        run dummy_rack_app
+      end
+    end
+
+    it "should use the specified dragonfly app" do
+      Dragonfly.app.should_not_receive(:call)
+      Dragonfly.app(:images).should_receive(:call).and_return([
+        200, {"Content-Type" => 'text/plain'}, ['booboo']
+      ])
+      response = make_request(@stack, '/media/hello.png?howare=you')
+      response.body.should == 'booboo'
+    end
   end
-  
+
 end

data/spec/dragonfly/{active_model_extensions → model}/model_spec.rb

@@ -1,98 +1,77 @@
-require 'dragonfly/active_model_extensions/spec_helper'
+require 'spec_helper'
 
-describe Item do
+# This spec is more of a functional spec for all of the model bits put together
+describe "models" do
 
-  def set_up_item_class(app=test_app)
-    app.define_macro(MyModel, :image_accessor)
-    Item.class_eval do
-      image_accessor :preview_image
-    end
+  before do
+    Dragonfly.app.use_datastore(:memory)
   end
 
-  # See extra setup in models / initializer files
+  describe "using the module" do
+    it "adds 'dragonfly_accessor'" do
+      klass = Class.new do
+        extend Dragonfly::Model
+        dragonfly_accessor :hello
+      end
+    end
+  end
 
   describe "defining accessors" do
 
-    let(:app1){ Dragonfly[:img] }
-    let(:app2){ Dragonfly[:vid] }
-
-    describe "attachment classes" do
-      before(:each) do
-        app1.define_macro(MyModel, :image_accessor)
-        app2.define_macro(MyModel, :video_accessor)
-        Item.class_eval do
-          image_accessor :preview_image
-          video_accessor :trailer_video
-        end
-        @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
+    before(:each) do
+      @app1, @app2 = Dragonfly.app(:img), Dragonfly.app(:vid)
+      app1, app2 = @app1, @app2
+      @model_class = new_model_class do
+        dragonfly_accessor :preview_image, :app => app1
+        dragonfly_accessor :trailer_video, :app => app2
       end
+      @classes = @model_class.dragonfly_attachment_classes
+      @class1, @class2 = @classes
+    end
 
-      it "should associate the correct app with each class" do
-        @class1.app.should == app1
-        @class2.app.should == app2
-      end
+    it "should return the attachment classes" do
+      @class1.superclass.should == Dragonfly::Model::Attachment
+      @class2.superclass.should == Dragonfly::Model::Attachment
+    end
 
-      it "should associate the correct attribute with each class" do
-        @class1.attribute.should == :preview_image
-        @class2.attribute.should == :trailer_video
-      end
+    it "should associate the correct app with each class" do
+      @class1.app.should == @app1
+      @class2.app.should == @app2
+    end
 
-      it "should associate the correct model class with each class" do
-        @class1.model_class.should == Item
-        @class2.model_class.should == Item
-      end
+    it "should associate the correct attribute with each class" do
+      @class1.attribute.should == :preview_image
+      @class2.attribute.should == :trailer_video
     end
 
-    describe "included modules (e.g. Mongoid::Document)" do
+    it "should associate the correct model class with each class" do
+      @class1.model_class.should == @model_class
+      @class2.model_class.should == @model_class
+    end
 
-      it "should work" do
-        mongoid_document = Module.new
-        app1.define_macro_on_include(mongoid_document, :dog_accessor)
-        model_class = Class.new do
-          def self.before_save(*args); end
-          def self.before_destroy(*args); end
-          include mongoid_document
-          dog_accessor :doogie
-        end
-        klass = model_class.dragonfly_attachment_classes.first
-        klass.app.should == app1
-        klass.attribute.should == :doogie
+    it "should allow passing the app name as the :app value" do
+      klass = new_model_class do
+        dragonfly_accessor :egg_nog, :app => :vid
       end
+      klass.dragonfly_attachment_classes.first.app.should == @app2
+    end
 
-      it "should work with two apps" do
-        mongoid_document = Module.new
-        app1.define_macro_on_include(mongoid_document, :image_accessor)
-        app2.define_macro_on_include(mongoid_document, :video_accessor)
-        model_class = Class.new do
-          def self.before_save(*args); end
-          def self.before_destroy(*args); end
-          include mongoid_document
-          image_accessor :doogie
-          video_accessor :boogie
-        end
-        model_class.dragonfly_attachment_classes[0].app.should == app1
-        model_class.dragonfly_attachment_classes[1].app.should == app2
+    it "should default the app to the default app" do
+      klass = new_model_class do
+        dragonfly_accessor :egg_nog
       end
-
+      klass.dragonfly_attachment_classes.first.app.should == Dragonfly.app
     end
-
   end
 
   describe "correctly defined" do
 
     before(:each) do
       @app = test_app
-      @app.define_macro(MyModel, :image_accessor)
-      Item.class_eval do
-        image_accessor :preview_image
+      @item_class = new_model_class('Item', :preview_image_uid, :preview_image_size) do
+        dragonfly_accessor :preview_image
       end
-      @item = Item.new
+      @item = @item_class.new
     end
 
     it "should provide a reader" do
@@ -111,7 +90,7 @@ describe Item do
         @item.preview_image_uid.should be_nil
       end
       it "should not try to store anything on save" do
-        @app.datastore.should_not_receive(:store)
+        @app.datastore.should_not_receive(:write)
         @item.save!
       end
       it "should not try to destroy anything on save" do
@@ -140,8 +119,8 @@ describe Item do
       before(:each) do
         @item.preview_image_uid = 'some_known_uid'
       end
-      it "should not try to retrieve any data" do
-        @app.datastore.should_not_receive(:retrieve)
+      it "should not try to read any data" do
+        @app.datastore.should_not_receive(:read)
         @item.save!
       end
       it "should not try to destroy any data" do
@@ -149,7 +128,7 @@ describe Item do
         @item.save!
       end
       it "should not try to store any data" do
-        @app.datastore.should_not_receive(:store)
+        @app.datastore.should_not_receive(:write)
         @item.save!
       end
     end
@@ -159,13 +138,13 @@ describe Item do
         @item.preview_image = "DATASTRING"
       end
       it "the reader should return an attachment" do
-        @item.preview_image.should be_a(Dragonfly::ActiveModelExtensions::Attachment)
+        @item.preview_image.should be_a(Dragonfly::Model::Attachment)
       end
       it "the uid should be nil" do
         @item.preview_image_uid.should be_nil
       end
       it "should store the image when saved" do
-        @app.datastore.should_receive(:store).with(a_temp_object_with_data("DATASTRING"), hash_including)
+        @app.datastore.should_receive(:write).with(content_with_data("DATASTRING"), hash_including)
         @item.save!
       end
       it "should not try to destroy anything on destroy" do
@@ -179,8 +158,8 @@ describe Item do
         before(:each) do
           @item.preview_image_uid = 'some_known_uid'
         end
-        it "should not try to retrieve any data" do
-          @app.datastore.should_not_receive(:retrieve)
+        it "should not try to read any data" do
+          @app.datastore.should_not_receive(:read)
           @item.save!
         end
         it "should not try to destroy any data" do
@@ -188,7 +167,7 @@ describe Item do
           @item.save!
         end
         it "should not try to store any data" do
-          @app.datastore.should_not_receive(:store)
+          @app.datastore.should_not_receive(:write)
           @item.save!
         end
       end
@@ -199,7 +178,7 @@ describe Item do
 
       before(:each) do
         @item.preview_image = "DATASTRING"
-        @app.datastore.should_receive(:store).with(a_temp_object_with_data("DATASTRING"), hash_including).once.and_return('some_uid')
+        @app.datastore.should_receive(:write).with(content_with_data("DATASTRING"), hash_including).once.and_return('some_uid')
         @item.save!
       end
 
@@ -207,7 +186,7 @@ describe Item do
         @item.preview_image_uid.should == 'some_uid'
       end
       it "should not try to store anything if saved again" do
-        @app.datastore.should_not_receive(:store)
+        @app.datastore.should_not_receive(:write)
         @item.save!
       end
 
@@ -231,7 +210,7 @@ describe Item do
 
       describe "when accessed by a new model object" do
         before(:each) do
-          @item = Item.find(@item.id)
+          @item = @item_class.find(@item.id)
         end
         it "should destroy the data on destroy" do
           @app.datastore.should_receive(:destroy).with(@item.preview_image_uid)
@@ -242,7 +221,7 @@ describe Item do
       describe "when something new is assigned" do
         before(:each) do
           @item.preview_image = "ANEWDATASTRING"
-          @app.datastore.stub!(:store).and_return('some_uid')
+          @app.datastore.stub(:write).and_return('some_uid')
         end
         it "should set the uid to nil" do
           @item.preview_image_uid.should be_nil
@@ -264,7 +243,7 @@ describe Item do
           @item.save!
         end
         it "should store the new data when saved" do
-          @app.datastore.should_receive(:store).with(a_temp_object_with_data("ANEWDATASTRING"), hash_including)
+          @app.datastore.should_receive(:write).with(content_with_data("ANEWDATASTRING"), hash_including)
           @item.save!
         end
         it "should destroy the old data on destroy" do
@@ -319,29 +298,15 @@ describe Item do
 
       end
 
-      describe "destroy errors" do
-        it "should log a warning if the data wasn't found on destroy" do
-          @app.datastore.should_receive(:destroy).with('some_uid').and_raise(Dragonfly::DataStorage::DataNotFound)
-          @app.log.should_receive(:warn)
-          @item.destroy
-        end
-
-        it "should log a warning if the data wasn't found on destroy" do
-          @app.datastore.should_receive(:destroy).with('some_uid').and_raise(Dragonfly::DataStorage::DestroyError)
-          @app.log.should_receive(:warn)
-          @item.destroy
-        end
-      end
-
     end
 
     describe "other types of assignment" do
       before(:each) do
-        @app.generator.add :egg do
-          "Gungedin"
+        @app.add_generator :egg do |content|
+          content.update "Gungedin"
         end
-        @app.processor.add :doogie do |temp_object|
-          temp_object.data.upcase
+        @app.add_processor :doogie do |content|
+          content.update content.data.upcase
         end
       end
 
@@ -363,8 +328,9 @@ describe Item do
 
       describe "assigning with another attachment" do
         before(:each) do
-          Item.class_eval do
-            image_accessor :other_image
+          @item_class.class_eval do
+            attr_accessor :other_image_uid
+            dragonfly_accessor :other_image
           end
         end
         it "should work like assigning the job" do
@@ -377,11 +343,8 @@ describe Item do
 
       describe "assigning by means of a bang method" do
         before(:each) do
-          @app.processor.add :double do |temp_object|
-            temp_object.data * 2
-          end
-          @app.encoder.add do |temp_object, format|
-            temp_object.data.downcase + format.to_s
+          @app.add_processor :double do |content|
+            content.update content.data * 2
           end
           @item.preview_image = "HELLO"
         end
@@ -393,14 +356,10 @@ describe Item do
           @item.preview_image.process!(:double)
           @item.preview_image_size.should == 10
         end
-        it "should work for encode" do
-          @item.preview_image.encode!(:egg)
-          @item.preview_image.data.should == 'helloegg'
-        end
         it "should work repeatedly" do
-          @item.preview_image.process!(:double).encode!(:egg)
-          @item.preview_image.data.should == 'hellohelloegg'
-          @item.preview_image_size.should == 13
+          @item.preview_image.process!(:double).process!(:double)
+          @item.preview_image.data.should == 'HELLOHELLOHELLOHELLO'
+          @item.preview_image_size.should == 20
         end
       end
     end
@@ -419,200 +378,29 @@ describe Item do
 
   end
 
-  describe "validations" do
-
-    before(:all) do
-      @app = test_app
-      @app.define_macro(MyModel, :image_accessor)
-    end
-
-    describe "validates_presence_of" do
-
-      before(:all) do
-        Item.class_eval do
-          image_accessor :preview_image
-          validates_presence_of :preview_image
-        end
-      end
-
-      it "should be valid if set" do
-        Item.new(:preview_image => "1234567890").should be_valid
-      end
-
-      it "should be invalid if not set" do
-        Item.new.should_not be_valid
-      end
-
-    end
-
-    describe "validates_size_of" do
-
-      before(:all) do
-        Item.class_eval do
-          image_accessor :preview_image
-          validates_size_of :preview_image, :within => (6..10)
-        end
-      end
-
-      it "should be valid if ok" do
-        Item.new(:preview_image => "1234567890").should be_valid
-      end
-
-      it "should be invalid if too small" do
-        Item.new(:preview_image => "12345").should_not be_valid
-      end
-
-    end
-
-    describe "validates_property" do
-
-      before(:each) do
-        @item = Item.new(:preview_image => "1234567890")
-      end
-
-      before(:all) do
-        custom_analyser = Class.new do
-          def mime_type(temp_object)
-            case temp_object.data
-            when "WRONG TYPE" then 'wrong/type'
-            when "OTHER TYPE" then nil
-            else 'how/special'
-            end
-          end
-
-          def number_of_Gs(temp_object)
-            temp_object.data.count('G')
-          end
-        end
-        @app.analyser.register(custom_analyser)
-
-        Item.class_eval do
-          validates_property :mime_type, :of => :preview_image, :in => ['how/special', 'how/crazy'], :if => :its_friday
-          validates_property :mime_type, :of => [:other_image, :yet_another_image], :as => 'how/special'
-          validates_property :number_of_Gs, :of => :preview_image, :in => (0..2)
-          validates_property :mime_type, :of => :otra_imagen, :in => ['que/pasa', 'illo/tio'], :message => "tipo de contenido incorrecto. Que chungo tio"
-
-          image_accessor :preview_image
-          image_accessor :other_image
-          image_accessor :yet_another_image
-          image_accessor :otra_imagen
-
-          def its_friday
-            true
-          end
-
-        end
-      end
-
-      it "should be valid if nil, if not validated on presence (even with validates_property)" do
-        @item.other_image = nil
-        @item.should be_valid
-      end
-
-      it "should be invalid if the property is nil" do
-        @item.preview_image = "OTHER TYPE"
-        @item.should_not be_valid
-        @item.errors[:preview_image].should == ["mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was 'application/octet-stream'"]
-      end
-
-      it "should be invalid if the property is wrong" do
-        @item.preview_image = "WRONG TYPE"
-        @item.should_not be_valid
-        @item.errors[:preview_image].should == ["mime type is incorrect. It needs to be one of 'how/special', 'how/crazy', but was 'wrong/type'"]
-      end
-
-      it "should work for a range" do
-        @item.preview_image = "GOOGLE GUM"
-        @item.should_not be_valid
-        @item.errors[:preview_image].should == ["number of gs is incorrect. It needs to be between 0 and 2, but was '3'"]
-      end
-
-      it "should validate individually" do
-        @item.other_image = "1234567"
-        @item.yet_another_image = "WRONG TYPE"
-        @item.should_not be_valid
-        @item.errors[:other_image].should == []
-        @item.errors[:yet_another_image].should == ["mime type is incorrect. It needs to be 'how/special', but was 'wrong/type'"]
-      end
-
-      it "should include standard extra options like 'if' on mime type validation" do
-        @item.should_receive(:its_friday).and_return(false)
-        @item.preview_image = "WRONG TYPE"
-        @item.should be_valid
-      end
-
-      it "should allow case sensitivity to be turned off when :as is specified" do
-        @item.should_receive(:its_friday).and_return(false)
-        Item.class_eval do
-          validates_property :mime_type, :of => :preview_image, :as => 'WronG/TypE', :case_sensitive => false
-        end
-        @item.preview_image = "WRONG TYPE"
-        @item.should be_valid
-      end
-
-      it "should allow case sensitivity to be turned off when :in is specified" do
-        @item.should_receive(:its_friday).and_return(false)
-        Item.class_eval do
-          validates_property :mime_type, :of => :preview_image, :in => ['WronG/TypE'], :case_sensitive => false
-        end
-        @item.preview_image = "WRONG TYPE"
-        @item.should be_valid
-      end
-
-      it "should require either :as or :in as an argument" do
-        lambda{
-          Item.class_eval do
-            validates_property :mime_type, :of => :preview_image
-          end
-        }.should raise_error(ArgumentError)
-      end
-
-      it "should require :of as an argument" do
-        lambda{
-          Item.class_eval do
-            validates_property :mime_type, :as => 'hi/there'
-          end
-        }.should raise_error(ArgumentError)
-      end
-
-      it "should allow for custom messages" do
-        @item.otra_imagen = "WRONG TYPE"
-        @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
-          validates_property :mime_type, :of => :preview_image, :as => 'one/thing',
-            :message => proc{|actual, model| "Unlucky #{model.title}! Was #{actual}" }
-        end
-        @item.title = 'scubby'
-        @item.preview_image = "WRONG TYPE"
-        @item.should_not be_valid
-        @item.errors[:preview_image].should  == ["Unlucky scubby! Was wrong/type"]
-      end
-
-    end
-
-  end
-
   describe "extra properties" do
 
     before(:each) do
       @app = test_app
-      custom_analyser = Class.new do
-        def some_analyser_method(temp_object)
-          "abc" + temp_object.data[0..0]
-        end
-        def number_of_As(temp_object); temp_object.data.count('A'); end
+      @app.add_analyser :some_analyser_method do |content|
+        "abc" + content.data[0..0]
+      end
+      @app.add_analyser :number_of_As do |content|
+        content.data.count('A')
       end
-      @app.analyser.register(custom_analyser)
-      @app.define_macro(MyModel, :image_accessor)
-      Item.class_eval do
-        image_accessor :preview_image
+
+      @item_class = new_model_class('Item',
+        :preview_image_uid,
+        :preview_image_some_analyser_method,
+        :preview_image_blah_blah,
+        :preview_image_size,
+        :preview_image_name,
+        :other_image_uid
+        ) do
+        dragonfly_accessor :preview_image
+        dragonfly_accessor :other_image
       end
-      @item = Item.new
+      @item = @item_class.new
     end
 
     describe "magic attributes" do
@@ -652,32 +440,17 @@ describe Item do
 
       it "should store the original file name if it exists" do
         data = 'jasdlkf sadjl'
-        data.stub!(:original_filename).and_return('hello.png')
+        data.stub(:original_filename).and_return('hello.png')
         @item.preview_image = data
         @item.preview_image_name.should == 'hello.png'
       end
 
-    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!
-        @app.fetch(@item.preview_image_uid).meta[:some_analyser_method].should == 'abc1'
-      end
-
-      it "should include the size in the saved meta" do
+      it "sets to nil if the analysis method blows up" do
+        @app.add_analyser :some_analyser_method do |content|
+          raise "oh dear"
+        end
         @item.preview_image = '123'
-        @item.save!
-        @app.fetch(@item.preview_image_uid).meta[:size].should == 3
+        @item.preview_image_some_analyser_method.should be_nil
       end
 
     end
@@ -706,16 +479,14 @@ describe Item do
 
       describe "from a new model object" do
         before(:each) do
-          @app.datastore.stub!(:store).and_return('my_uid')
-          item = Item.create!(:preview_image => 'DATASTRING')
-          @item = Item.find(item.id)
+          item = @item_class.create!(:preview_image => 'DATASTRING')
+          @item = @item_class.find(item.id)
         end
         it "should load the content then delegate the method" do
-          @app.datastore.should_receive(:retrieve).with('my_uid').and_return(['DATASTRING', {}])
           @item.preview_image.number_of_As.should == 2
         end
         it "should use the magic attribute if there is one, and not load the content" do
-          @app.datastore.should_not_receive(:retrieve)
+          @app.datastore.should_not_receive(:read)
           @item.should_receive(:preview_image_some_analyser_method).at_least(:once).and_return('result yo')
           @item.preview_image.some_analyser_method.should == 'result yo'
         end
@@ -748,23 +519,10 @@ describe Item do
       end
     end
 
-    describe "job shortcuts" do
-      before(:each) do
-        @app.job :bacon do
-          process :breakfast
-        end
-        @item = Item.new :preview_image => 'gurg'
-      end
-      it "should add job shortcuts for that app" do
-        job = @item.preview_image.bacon
-        job.steps.first.should be_a(Dragonfly::Job::Process)
-      end
-    end
-
     describe "setting things on the attachment" do
 
       before(:each) do
-        @item = Item.new
+        @item = @item_class.new
       end
 
       describe "name" do
@@ -787,29 +545,19 @@ describe Item do
       end
 
       describe "meta" do
-        before(:each) do
-          @item.preview_image = "Hello all"
-          @item.preview_image.meta = {:slime => 'balls'}
-        end
-        it "should allow for setting the meta" do
-          @item.preview_image.meta.should == {:slime => 'balls'}
-        end
-        it "should allow for updating the meta" do
-          @item.preview_image.meta[:numb] = 'nuts'
-          @item.preview_image.meta.should == {:slime => 'balls', :numb => 'nuts'}
+        before :each do
+          @item.preview_image = 'hello'
         end
-        it "should return the meta" do
-          (@item.preview_image.meta = {:doogs => 'boogs'}).should == {:doogs => 'boogs'}
+        it "should include meta info about the model by default" do
+          @item.preview_image.meta.should include_hash('model_class' => 'Item', 'model_attachment' => 'preview_image')
         end
-        it "should save it correctly" do
-          @item.save!
-          item = Item.find(@item.id)
-          item.preview_image.meta.should include_hash(:slime => 'balls')
+        it "provides accessors" do
+          @item.preview_image.meta = {'slime' => 'balls'}
+          @item.preview_image.meta.should == {'slime' => 'balls'}
         end
-        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)
+        it "provides add_meta" do
+          @item.preview_image.add_meta('sum' => 'ting').should == @item.preview_image
+          @item.preview_image.meta['sum'].should == 'ting'
         end
       end
 
@@ -821,25 +569,23 @@ describe Item do
 
     before(:all) do
       @app = test_app
-      @app2 = test_app
-      @app.define_macro(MyModel, :image_accessor)
-      @app2.define_macro(MyModel, :egg_accessor)
-      Car.class_eval do
-        image_accessor :image
+      @app2 = test_app(:two)
+      @car_class = new_model_class('Car', :image_uid, :reliant_image_uid) do
+        dragonfly_accessor :image
       end
-      Photo.class_eval do
-        egg_accessor :image
+      @photo_class = new_model_class('Photo', :image_uid) do
+        dragonfly_accessor :image, :app => :two
       end
 
-      @base_class = Car
-      class ReliantRobin < Car; image_accessor :reliant_image; end
+      @base_class = @car_class
+      class ReliantRobin < @car_class; dragonfly_accessor :reliant_image; end
       @subclass = ReliantRobin
-      class ReliantRobinWithModule < Car
+      class ReliantRobinWithModule < @car_class
         include Module.new
-        image_accessor :reliant_image
+        dragonfly_accessor :reliant_image
       end
       @subclass_with_module = ReliantRobinWithModule
-      @unrelated_class = Photo
+      @unrelated_class = @photo_class
     end
 
     it "should allow assigning base class accessors" do
@@ -861,7 +607,7 @@ describe Item do
       @subclass_with_module.create! :reliant_image => 'blah'
     end
     it "should return the correct attachment classes for the base class" do
-      @base_class.dragonfly_attachment_classes.should match_attachment_classes([[Car, :image, @app]])
+      @base_class.dragonfly_attachment_classes.should match_attachment_classes([[@car_class, :image, @app]])
     end
     it "should return the correct attachment classes for the subclass" do
       @subclass.dragonfly_attachment_classes.should match_attachment_classes([[ReliantRobin, :image, @app], [ReliantRobin, :reliant_image, @app]])
@@ -870,14 +616,16 @@ describe Item do
       @subclass_with_module.dragonfly_attachment_classes.should match_attachment_classes([[ReliantRobinWithModule, :image, @app], [ReliantRobinWithModule, :reliant_image, @app]])
     end
     it "should return the correct attachment classes for a class from a different hierarchy" do
-      @unrelated_class.dragonfly_attachment_classes.should match_attachment_classes([[Photo, :image, @app2]])
+      @unrelated_class.dragonfly_attachment_classes.should match_attachment_classes([[@photo_class, :image, @app2]])
     end
   end
 
   describe "setting the url" do
     before(:each) do
-      set_up_item_class
-      @item = Item.new
+      @item_class = new_model_class('Item', :preview_image_uid, :preview_image_name) do
+        dragonfly_accessor :preview_image
+      end
+      @item = @item_class.new
       stub_request(:get, "http://some.url/yo.png").to_return(:body => "aaaaayo")
     end
 
@@ -892,7 +640,7 @@ describe Item do
     it "should have set the name" do
       @item.preview_image_url = 'http://some.url/yo.png'
       @item.preview_image_name.should == 'yo.png'
-      @item.preview_image.meta[:name].should == 'yo.png'
+      @item.preview_image.meta['name'].should == 'yo.png'
     end
     [nil, ""].each do |value|
       it "should do nothing if set with #{value.inspect}" do
@@ -904,8 +652,10 @@ describe Item do
 
   describe "removing the accessor with e.g. a form" do
     before(:each) do
-      set_up_item_class
-      @item = Item.new
+      @item_class = new_model_class('Item', :preview_image_uid) do
+        dragonfly_accessor :preview_image
+      end
+      @item = @item_class.new
       @item.preview_image = "something"
     end
 
@@ -958,14 +708,14 @@ describe Item do
 
       before(:each) do
         @app = test_app
-        @app.define_macro(MyModel, :image_accessor)
+        @item_class = new_model_class('Item', :preview_image_uid, :title)
       end
 
       describe "as a block" do
 
         def set_after_assign(*args, &block)
-          Item.class_eval do
-            image_accessor :preview_image do
+          @item_class.class_eval do
+            dragonfly_accessor :preview_image do
               after_assign(*args, &block)
             end
           end
@@ -974,28 +724,28 @@ describe Item do
         it "should call it after assign" do
           x = nil
           set_after_assign{ x = 3 }
-          Item.new.preview_image = "hello"
+          @item_class.new.preview_image = "hello"
           x.should == 3
         end
 
         it "should not call it after unassign" do
           x = nil
           set_after_assign{ x = 3 }
-          Item.new.preview_image = nil
+          @item_class.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"
+          @item_class.new.preview_image = "discussion"
           x.should == "discussion"
         end
 
         it "should evaluate in the model context" do
           x = nil
           set_after_assign{ x = title.upcase }
-          item = Item.new
+          item = @item_class.new
           item.title = "big"
           item.preview_image = "jobs"
           x.should == "BIG"
@@ -1003,7 +753,7 @@ describe Item do
 
         it "should allow passing a symbol for calling a model method" do
           set_after_assign :set_title
-          item = Item.new
+          item = @item_class.new
           def item.set_title; self.title = 'duggen'; end
           item.preview_image = "jobs"
           item.title.should == "duggen"
@@ -1011,7 +761,7 @@ describe Item do
 
         it "should allow passing multiple symbols" do
           set_after_assign :set_title, :upcase_title
-          item = Item.new
+          item = @item_class.new
           def item.set_title; self.title = 'doobie'; end
           def item.upcase_title; self.title.upcase!; end
           item.preview_image = "jobs"
@@ -1020,7 +770,7 @@ describe Item do
 
         it "should not re-trigger callbacks (causing an infinite loop)" do
           set_after_assign{|a| self.preview_image = 'dogman' }
-          item = Item.new
+          item = @item_class.new
           item.preview_image = "hello"
         end
 
@@ -1031,13 +781,12 @@ describe Item do
     describe "after_unassign" do
       before(:each) do
         @app = test_app
-        @app.define_macro(MyModel, :image_accessor)
-        Item.class_eval do
-          image_accessor :preview_image do
+        @item_class = new_model_class('Item', :preview_image_uid, :title) do
+          dragonfly_accessor :preview_image do
             after_unassign{ self.title = 'unassigned' }
           end
         end
-        @item = Item.new :title => 'yo'
+        @item = @item_class.new :title => 'yo'
       end
 
       it "should not call it after assign" do
@@ -1054,19 +803,18 @@ describe Item do
     describe "copy_to" do
       before(:each) do
         @app = test_app
-        @app.define_macro(MyModel, :image_accessor)
-        @app.processor.add(:append) do |temp_object, string|
-          temp_object.data + string
+        @app.add_processor(:append) do |content, string|
+          content.update(content.data + string)
         end
-        Item.class_eval do
-          image_accessor :preview_image do
+        @item_class = new_model_class('Item', :preview_image_uid, :other_image_uid, :yet_another_image_uid, :title) do
+          dragonfly_accessor :preview_image do
             copy_to(:other_image){|a| a.process(:append, title) }
             copy_to(:yet_another_image)
           end
-          image_accessor :other_image
-          image_accessor :yet_another_image
+          dragonfly_accessor :other_image
+          dragonfly_accessor :yet_another_image
         end
-        @item = Item.new :title => 'yo'
+        @item = @item_class.new :title => 'yo'
       end
 
       it "should copy to the other image when assigned" do
@@ -1089,131 +837,108 @@ describe Item do
 
   end
 
-  describe "storage_opts" do
+  describe "storage_options" do
 
-    def set_storage_opts(*args, &block)
-      Item.class_eval do
-        image_accessor :preview_image do
-          storage_opts(*args, &block)
+    def set_storage_options(*args, &block)
+      @item_class.class_eval do
+        dragonfly_accessor :preview_image do
+          storage_options(*args, &block)
         end
       end
     end
 
     before(:each) do
       @app = test_app
-      @app.define_macro(MyModel, :image_accessor)
+      @item_class = new_model_class('Item', :preview_image_uid, :title)
     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'))
+      set_storage_options :egg => 'head'
+      item = @item_class.new :preview_image => 'hello'
+      @app.datastore.should_receive(:write).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'
-      @app.datastore.should_receive(:store).with(anything, hash_including(:egg => 'numb'))
+      set_storage_options{ {:egg => 'numb'} }
+      item = @item_class.new :preview_image => 'hello'
+      @app.datastore.should_receive(:write).with(anything, hash_including(:egg => 'numb'))
       item.save!
     end
 
     it "should yield the attachment and exec in model context" do
-      set_storage_opts{|a| {:egg => (a.data + title)} }
-      item = Item.new :title => 'lump', :preview_image => 'hello'
-      @app.datastore.should_receive(:store).with(anything, hash_including(:egg => 'hellolump'))
+      set_storage_options{|a| {:egg => (a.data + title)} }
+      item = @item_class.new :title => 'lump', :preview_image => 'hello'
+      @app.datastore.should_receive(:write).with(anything, hash_including(:egg => 'hellolump'))
       item.save!
     end
 
     it "should allow giving it a method symbol" do
-      set_storage_opts :special_ops
-      item = Item.new :preview_image => 'hello'
+      set_storage_options :special_ops
+      item = @item_class.new :preview_image => 'hello'
       def item.special_ops; {:a => 1}; end
-      @app.datastore.should_receive(:store).with(anything, hash_including(:a => 1))
+      @app.datastore.should_receive(:write).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
-          storage_opts{{ :a => title, :b => 'dumple' }}
-          storage_opts{{ :b => title.upcase, :c => 'digby' }}
+      @item_class.class_eval do
+        dragonfly_accessor :preview_image do
+          storage_options{{ :a => title, :b => 'dumple' }}
+          storage_options{{ :b => title.upcase, :c => 'digby' }}
         end
       end
-      item = Item.new :title => 'lump', :preview_image => 'hello'
-      @app.datastore.should_receive(:store).with(anything, hash_including(
+      item = @item_class.new :title => 'lump', :preview_image => 'hello'
+      @app.datastore.should_receive(:write).with(anything, hash_including(
         :a => 'lump', :b => 'LUMP', :c => 'digby'
       ))
       item.save!
     end
-  end
-
-  describe "storage_path, etc." do
 
-    def set_storage_path(path=nil, &block)
-      Item.class_eval do
-        image_accessor :preview_image do
-          storage_path(path, &block)
-        end
-        def monkey
-          "mr/#{title}/monkey"
+    it "gives a deprecation warning for storage_xxx methods" do
+      expect {
+        @item_class.class_eval do
+          dragonfly_accessor :preview_image do
+            storage_egg :fried
+          end
         end
-      end
+      }.to raise_error(/deprecated/)
     end
+  end
 
-    before(:each) do
+  describe "default" do
+    before do
       @app = test_app
-      @app.define_macro(MyModel, :image_accessor)
-    end
-
-    it "should allow setting as a string" do
-      set_storage_path 'always/the/same'
-      item = Item.new :preview_image => 'bilbo'
-      @app.datastore.should_receive(:store).with(anything, hash_including(
-        :path => 'always/the/same'
-      ))
-      item.save!
+      @item_class = new_model_class('Item', :image_uid) do
+        dragonfly_accessor :image do
+          default SAMPLES_DIR.join('beach.jpg')
+        end
+      end
+      @item = @item_class.new
     end
 
-    it "should allow setting as a symbol" do
-      set_storage_path :monkey
-      item = Item.new :title => 'billy'
-      item.preview_image = 'bilbo'
-      @app.datastore.should_receive(:store).with(anything, hash_including(
-        :path => 'mr/billy/monkey'
-      ))
-      item.save!
+    it "gives a default image when not set" do
+      @item.image.name.should == 'beach.jpg'
+      @item.image.size.should == 25932
     end
 
-    it "should allow setting as a block" do
-      set_storage_path{|a| "#{a.data}/megs/#{title}" }
-      item = Item.new :title => 'billy'
-      item.preview_image = 'bilbo'
-      @app.datastore.should_receive(:store).with(anything, hash_including(
-        :path => 'bilbo/megs/billy'
-      ))
-      item.save!
+    it "acts as normal otherwise" do
+      @item.image = "asdf"
+      @item.image.data.should == "asdf"
     end
 
-    it "should work for other storage_xxx declarations" do
-      Item.class_eval do
-        image_accessor :preview_image do
-          storage_eggs 23
-        end
-      end
-      item = Item.new :preview_image => 'bilbo'
-      @app.datastore.should_receive(:store).with(anything, hash_including(
-        :eggs => 23
-      ))
-      item.save!
+    it "adds to the path whitelist" do
+      path = SAMPLES_DIR.join('beach.jpg')
+      @app.fetch_file_whitelist.should include File.expand_path(path)
     end
   end
 
   describe "unknown config method" do
     it "should raise an error" do
+      item_class = new_model_class('Item', :preview_image_uid)
       lambda{
-        Item.class_eval do
-          image_accessor :preview_image do
+        item_class.class_eval do
+          dragonfly_accessor :preview_image do
             what :now?
           end
         end
@@ -1223,8 +948,10 @@ describe Item do
 
   describe "changed?" do
     before(:each) do
-      set_up_item_class
-      @item = Item.new
+      @item_class = new_model_class('Item', :preview_image_uid) do
+        dragonfly_accessor :preview_image
+      end
+      @item = @item_class.new
     end
 
     it "should be changed when assigned" do
@@ -1241,18 +968,26 @@ describe Item do
     it "should not be changed when reloaded" do
       @item.preview_image = 'ggg'
       @item.save!
-      item = Item.find(@item.id)
+      item = @item_class.find(@item.id)
       item.preview_image.should_not be_changed
     end
   end
 
   describe "retain and pending" do
     before(:each) do
-      set_up_item_class(@app=test_app)
-      @app.analyser.add :some_analyser_method do |temp_object|
-        temp_object.data.upcase
+      @app=test_app
+      @app.add_analyser :some_analyser_method do |content|
+        content.data.upcase
       end
-      @item = Item.new
+      @item_class = new_model_class('Item',
+        :preview_image_uid,
+        :preview_image_some_analyser_method,
+        :preview_image_size,
+        :preview_image_name
+        ) do
+        dragonfly_accessor :preview_image
+      end
+      @item = @item_class.new
     end
 
     it "should return nil if there are no changes" do
@@ -1273,25 +1008,26 @@ describe Item do
     it "should return the saved stuff if assigned and retained" do
       @item.preview_image = 'hello'
       @item.preview_image.name = 'dog.biscuit'
-      @app.datastore.should_receive(:store).with do |temp_object, opts|
-        temp_object.data.should == 'hello'
-        temp_object.meta.should == {
-          :name => "dog.biscuit",
-          :some_analyser_method => "HELLO",
-          :size => 5,
-          :model_class => "Item",
-          :model_attachment => :preview_image
-        }
+      @app.datastore.should_receive(:write).with do |content, opts|
+        content.data.should == 'hello'
       end.and_return('new/uid')
       @item.preview_image.retain!
-      Dragonfly::Serializer.json_decode(@item.retained_preview_image, :symbolize_keys => true).should == {
-        :uid => 'new/uid',
-        :some_analyser_method => 'HELLO',
-        :size => 5,
-        :name => 'dog.biscuit'
+      Dragonfly::Serializer.json_b64_decode(@item.retained_preview_image).should == {
+        'uid' => 'new/uid',
+        'some_analyser_method' => 'HELLO',
+        'size' => 5,
+        'name' => 'dog.biscuit'
       }
     end
 
+    it "should rescue analysis errors" do
+      @app.add_analyser(:some_analyser_method){ raise "oh no!" }
+      @item.preview_image = 'hello'
+      @item.preview_image.retain!
+      attrs = Dragonfly::Serializer.json_b64_decode(@item.retained_preview_image)
+      attrs['some_analyser_method'].should be_nil
+    end
+
     it "should return nil if assigned, retained and saved" do
       @item.preview_image = 'hello'
       @item.preview_image.retain!
@@ -1309,7 +1045,7 @@ describe Item do
     it "should return nil if no changes have been made" do
       @item.preview_image = 'hello'
       @item.save!
-      item = Item.find(@item.id)
+      item = @item_class.find(@item.id)
       item.preview_image.retain!
       item.retained_preview_image.should be_nil
     end
@@ -1317,17 +1053,26 @@ describe Item do
 
   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.json_encode(
-        :uid => 'new/uid',
-        :some_analyser_method => 'HELLO',
-        :size => 5,
-        :name => 'dog.biscuit'
+      @app=test_app
+      @app.add_analyser :some_analyser_method do |content|
+        content.data.upcase
+      end
+      @uid = @app.store('retrieved yo')
+      @pending_string = Dragonfly::Serializer.json_b64_encode(
+        'uid' => @uid,
+        'some_analyser_method' => 'HELLO',
+        'size' => 5,
+        'name' => 'dog.biscuit'
       )
-      @item = Item.new
+      @item_class = new_model_class('Item',
+        :preview_image_uid,
+        :preview_image_size,
+        :preview_image_some_analyser_method,
+        :preview_image_name
+        ) do
+        dragonfly_accessor :preview_image
+      end
+      @item = @item_class.new
     end
 
     it "should be retained" do
@@ -1337,7 +1082,7 @@ describe Item do
 
     it "should update the attributes" do
       @item.retained_preview_image = @pending_string
-      @item.preview_image_uid.should == 'new/uid'
+      @item.preview_image_uid.should == @uid
       @item.preview_image_some_analyser_method.should == 'HELLO'
       @item.preview_image_size.should == 5
       @item.preview_image_name.should == 'dog.biscuit'
@@ -1345,7 +1090,6 @@ describe Item do
 
     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'))
       @item.preview_image.data.should == 'retrieved yo'
     end
 
@@ -1355,17 +1099,17 @@ describe Item do
     end
 
     it "should raise an error if the pending string contains a non-magic attr method" do
-      pending_string = Dragonfly::Serializer.json_encode(
-        :uid => 'new/uid',
-        :some_analyser_method => 'HELLO',
-        :size => 5,
-        :name => 'dog.biscuit',
-        :something => 'else'
+      pending_string = Dragonfly::Serializer.json_b64_encode(
+        'uid' => @uid,
+        'some_analyser_method' => 'HELLO',
+        'size' => 5,
+        'name' => 'dog.biscuit',
+        'something' => 'else'
       )
       item = @item
       lambda{
         item.retained_preview_image = pending_string
-      }.should raise_error(Dragonfly::ActiveModelExtensions::Attachment::BadAssignmentKey)
+      }.should raise_error(Dragonfly::Model::Attachment::BadAssignmentKey)
     end
 
     [nil, "", "asdfsad"].each do |value|
@@ -1377,15 +1121,15 @@ describe Item do
 
     it "should return the pending string again" do
       @item.retained_preview_image = @pending_string
-      Dragonfly::Serializer.json_decode(@item.retained_preview_image).should ==
-        Dragonfly::Serializer.json_decode(@pending_string)
+      Dragonfly::Serializer.json_b64_decode(@item.retained_preview_image).should ==
+        Dragonfly::Serializer.json_b64_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')
+      @app.datastore.should_receive(:write).with(content_with_data('oldone'), anything).and_return('old/uid')
       @item.save!
-      item = Item.find(@item.id)
+      item = @item_class.find(@item.id)
       item.retained_preview_image = @pending_string
       @app.datastore.should_receive(:destroy).with('old/uid')
       item.save!
@@ -1394,25 +1138,25 @@ describe Item do
     describe "combinations of assignment" do
       it "should destroy the previously retained one if something new is then assigned" do
         @item.retained_preview_image = @pending_string
-        @app.datastore.should_receive(:destroy).with('new/uid')
+        @app.datastore.should_receive(:destroy).with(@uid)
         @item.preview_image = 'yet another new thing'
       end
 
       it "should destroy the previously retained one if something new is already assigned" do
         @item.preview_image = 'yet another new thing'
-        @app.datastore.should_receive(:destroy).with('new/uid')
+        @app.datastore.should_receive(:destroy).with(@uid)
         @item.retained_preview_image = @pending_string
       end
 
       it "should destroy the previously retained one if nil is then assigned" do
         @item.retained_preview_image = @pending_string
-        @app.datastore.should_receive(:destroy).with('new/uid')
+        @app.datastore.should_receive(:destroy).with(@uid)
         @item.preview_image = nil
       end
 
       it "should destroy the previously retained one if nil is already assigned" do
         @item.preview_image = nil
-        @app.datastore.should_receive(:destroy).with('new/uid')
+        @app.datastore.should_receive(:destroy).with(@uid)
         @item.retained_preview_image = @pending_string
       end
 
@@ -1445,46 +1189,78 @@ describe Item do
 
   end
 
-  describe "format and mime type" do
-    before(:each) do
-      @app = test_app
-      @app.analyser.add :mime_type do |temp_object|
-        'some/type'
+  describe "xxx_stored?" do
+    before do
+      item_class = new_model_class('Item', :photo_uid) do
+        dragonfly_accessor :photo
       end
-      set_up_item_class(@app)
-      @item = Item.new
-      @content = "doggo"
-      @content.stub!(:original_filename).and_return('egg.png')
+      @item = item_class.new
+    end
+
+    it "returns false if unassigned" do
+      @item.photo_stored?.should be_false
     end
-    it "should trust the file extension with format if configured to" do
-      @item.preview_image = @content
-      @item.preview_image.format.should == :png
+
+    it "returns false if assigned but not stored" do
+      @item.photo = "Asdf"
+      @item.photo_stored?.should be_false
     end
-    it "should trust the file extension with mime_type if configured to" do
-      @item.preview_image = @content
-      @item.preview_image.mime_type.should == 'image/png'
+
+    it "returns true if stored" do
+      @item.photo = "Asdf"
+      @item.save!
+      @item.photo_stored?.should be_true
     end
-    it "should not trust the file extension with format if configured not to" do
-      @app.trust_file_extensions = false
-      @item.preview_image = @content
-      @item.preview_image.format.should == nil
+  end
+
+  describe "misc properties" do
+    before(:each) do
+      @item_class = new_model_class('Item', :photo_uid) do
+        dragonfly_accessor :photo
+      end
+      @item = @item_class.new :photo => 'blug'
     end
-    it "should not trust the file extension with mime_type if configured not to" do
-      @app.trust_file_extensions = false
-      @item.preview_image = @content
-      @item.preview_image.mime_type.should == 'some/type'
+
+    it "returns the b64_data" do
+      @item.photo.b64_data.should =~ /^data:/
+    end
+
+    it "returns the mime_type" do
+      @item.photo.ext = 'txt'
+      @item.photo.mime_type.should == 'text/plain'
     end
   end
 
   describe "inspect" do
     before(:each) do
-      set_up_item_class
-      @item = Item.new :preview_image => 'blug'
+      @item_class = new_model_class('Item', :preview_image_uid) do
+        dragonfly_accessor :preview_image
+      end
+      @item = @item_class.new :preview_image => 'blug'
       @item.save!
     end
     it "should be awesome" do
-      @item.preview_image.inspect.should =~ %r{^<Dragonfly Attachment uid="[^"]+", app=:test[_\w]*>$}
+      @item.preview_image.inspect.should =~ %r{^<Dragonfly Attachment uid="[^"]+", app=:default>$}
     end
   end
 
+  describe 'overwriting instance methods' do
+    let(:klass) do
+      new_model_class('Item', :foo_uid) do
+        dragonfly_accessor :foo
+
+        def foo
+          super
+        end
+      end
+    end
+
+    let(:item) { klass.new }
+
+    it 'works as expected when calling super' do
+      item.foo.should be_nil
+      item.foo = 'DATASTRING'
+      item.foo.should be_a(Dragonfly::Model::Attachment)
+    end
+  end
 end