mongomodel 0.2.17 → 0.2.18

data/lib/mongomodel/attributes/mongo.rb

@@ -18,7 +18,6 @@ module MongoModel
       
       def load!(hash)
         from_mongo!(hash)
-        changed.clear
       end
       
       def from_mongo!(hash)
@@ -26,7 +25,7 @@ module MongoModel
           property = properties_as[k.to_s]
           
           if property
-            child = self[property.name] = property.from_mongo(v)
+            child = store(property.name, property.from_mongo(v))
             child.parent_document = instance if child.respond_to?(:parent_document=)
           else
             self[k.to_sym] = v

data/lib/mongomodel/attributes/store.rb

@@ -5,7 +5,6 @@ module MongoModel
     class Store < ActiveSupport::OrderedHash
       include Typecasting
       include Mongo
-      include Dirty
       
       attr_reader :instance
       delegate :properties, :to => :instance

data/lib/mongomodel/concerns/attribute_methods/dirty.rb

@@ -10,14 +10,37 @@ module MongoModel
         after_save { changed_attributes.clear }
       end
       
+      def write_attribute(key, value)
+        attr = key.to_sym
+        
+        # The attribute already has an unsaved change.
+        if changed_attributes.include?(attr)
+          old = changed_attributes[attr]
+          changed_attributes.delete(attr) if value == old
+        else
+          old = clone_attribute_value(attr)
+          changed_attributes[attr] = old unless value == old
+        end
+        
+        super
+      end
+      
       # Returns the attributes as they were before any changes were made to the document.
       def original_attributes
         {}.with_indifferent_access.merge(attributes).merge(changed_attributes)
       end
-    
+      
     protected
       def changed_attributes
-        attributes.changed
+        @changed_attributes ||= {}.with_indifferent_access
+      end
+    
+    private
+      def clone_attribute_value(attribute_name)
+        value = self[attribute_name.to_sym]
+        value.duplicable? ? value.clone : value
+      rescue TypeError, NoMethodError
+        value
       end
     end
   end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.17"
+  VERSION = "0.2.18"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 2
-  - 17
-  version: 0.2.17
+  - 18
+  version: 0.2.18
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -132,7 +132,6 @@ files:
 - autotest/discover.rb
 - bin/console
 - lib/mongomodel.rb
-- lib/mongomodel/attributes/dirty.rb
 - lib/mongomodel/attributes/mongo.rb
 - lib/mongomodel/attributes/store.rb
 - lib/mongomodel/attributes/typecasting.rb

data/lib/mongomodel/attributes/dirty.rb

@@ -1,32 +0,0 @@
-module MongoModel
-  module Attributes
-    module Dirty
-      def []=(key, value)
-        attr = key.to_sym
-        
-        # The attribute already has an unsaved change.
-        if changed.include?(attr)
-          old = changed[attr]
-          changed.delete(attr) if value == old
-        else
-          old = clone_attribute_value(attr)
-          changed[attr] = old unless value == old
-        end
-        
-        super
-      end
-      
-      def changed
-        @changed ||= {}.with_indifferent_access
-      end
-      
-    private
-      def clone_attribute_value(attribute_name)
-        value = self[attribute_name.to_sym]
-        value.duplicable? ? value.clone : value
-      rescue TypeError, NoMethodError
-        value
-      end
-    end
-  end
-end