dragonfly 0.5.3 → 0.5.4

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/dragonfly.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]
-  s.date = %q{2010-03-27}
+  s.date = %q{2010-04-13}
   s.email = %q{mark@new-bamboo.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/dragonfly/active_record_extensions/attachment.rb

@@ -39,10 +39,8 @@ module Dragonfly
       end
       
       def save!
-        if changed?
-          destroy!
-          self.uid = app.datastore.store(temp_object) if temp_object
-        end
+        destroy! if uid_changed?
+        self.uid = app.datastore.store(temp_object) if has_data_to_store?
       end
       
       def temp_object
@@ -97,7 +95,11 @@ module Dragonfly
         uid && !uid.is_a?(PendingUID)
       end
       
-      def changed?
+      def has_data_to_store?
+        uid.is_a?(PendingUID)
+      end
+      
+      def uid_changed?
         parent_model.send("#{attribute_name}_uid_changed?")
       end
       

data/spec/dragonfly/active_record_extensions/model_spec.rb

@@ -72,6 +72,24 @@ describe Item do
         end
       end
       
+      describe "when the uid is set manually" 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)
+          @item.save!
+        end
+        it "should not try to destroy any data" do
+          @app.datastore.should_not_receive(:destroy)
+          @item.save!
+        end
+        it "should not try to store any data" do
+          @app.datastore.should_not_receive(:store)
+          @item.save!
+        end
+      end
+      
       describe "when there has been some thing assigned but not saved" do
         before(:each) do
           @item.preview_image = "DATASTRING"
@@ -98,6 +116,24 @@ describe Item do
           temp_object.should be_a(Dragonfly::ExtendedTempObject)
           temp_object.data.should == 'DATASTRING'
         end
+        describe "when the uid is set manually" 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)
+            @item.save!
+          end
+          it "should not try to destroy any data" do
+            @app.datastore.should_not_receive(:destroy)
+            @item.save!
+          end
+          it "should not try to store any data" do
+            @app.datastore.should_not_receive(:store)
+            @item.save!
+          end
+        end
+        
       end
       
       describe "when something has been assigned and saved" do
@@ -132,6 +168,12 @@ describe Item do
           @item.preview_image.url(:arg).should == 'some.url'
         end
         
+        it "should destroy the old data when the uid is set manually" do
+          @app.datastore.should_receive(:destroy).with('some_uid')
+          @item.preview_image_uid = 'some_known_uid'
+          @item.save!
+        end
+        
         describe "when accessed by a new model object" do
           before(:each) do
             @item = Item.find(@item.id)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Mark Evans
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +00:00
+date: 2010-04-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency