lotus-model 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b91d99745af6c3080d3e83ff84b369517df2dd77
-  data.tar.gz: cda6f8e7128dbb6db125054d0092a6f4fc83b413
+  metadata.gz: acf5bf11caa86301e6e5335064ca5c5454df5b86
+  data.tar.gz: 0782b930d37c6236c6c676017ae34caf68b1c2d2
 SHA512:
-  metadata.gz: 1ad445fbbf969ebd9dccc1997bd92a10ccc3e4bd3f679d8691b94f9c66940d72afda02d3fcad063001a1905fcae862b5eeb2b0768bc0d85016f10fc3e5e1ef5e
-  data.tar.gz: ed8fafcd2491178a6b9646e1a28c07110208c7d8d1dfa15420aeca8482fccc38952058b95d3f86c28e0bc8066a1a9503c11b487348853b442a2bd491e9cf8314
+  metadata.gz: 0299bb1a135bb8f43804f44968126425fde51be8377b035f2635312d49cc42bc2d4ab62374967f3a574007ae5c6f16e43ba5867372c495c05113fe4420126efa
+  data.tar.gz: a69e4eddfb3b10999487d08bf754f6bf413ac487e80ecb1b3d9b5a34f19856e9da9633854a8c987afa5a5f3d74589835dddde4f5a0265e6d0179ff1af72f33a9

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Lotus::Model
 A persistence layer for Lotus
 
+## v0.3.2 - 2015-05-22
+### Added
+- [Dmitry Tymchuk & Luca Guidi] Fix for dirty tracking of attributes changed in place (eg. `book.tags << 'non-fiction'`)
+
 ## v0.3.1 - 2015-05-15
 ### Added
 - [Dmitry Tymchuk] Dirty tracking for entities (via `Lotus::Entity::DirtyTracking` module to include)

data/lib/lotus/entity.rb

@@ -154,7 +154,7 @@ module Lotus
 
       # Define setter/getter methods for attributes.
       #
-      # @params attr [Symbol] an attribute name
+      # @param attr [Symbol] an attribute name
       #
       # @since 0.3.1
       # @api private

data/lib/lotus/entity/dirty_tracking.rb

@@ -3,57 +3,25 @@ module Lotus
     # Dirty tracking for entities
     #
     # @since 0.3.1
+    #
+    # @example Dirty tracking
+    #   require 'lotus/model'
+    #
+    #   class User
+    #     include Lotus::Entity
+    #     include Lotus::Entity::DirtyTracking
+    #
+    #     attributes :name
+    #   end
+    #
+    #   article = Article.new(title: 'Generation P')
+    #   article.changed? # => false
+    #
+    #   article.title = 'Master and Margarita'
+    #   article.changed? # => true
+    #
+    #   article.changed_attributes # => {:title => "Generation P"}
     module DirtyTracking
-      # Override setters for attributes to support dirty tracking
-      #
-      # @since 0.3.1
-      #
-      # @example Dirty tracking
-      #   require 'lotus/model'
-      #
-      #   class User
-      #     include Lotus::Entity
-      #     include Lotus::Entity::DirtyTracking
-      #
-      #     attributes :name
-      #   end
-      #
-      #   article = Article.new(title: 'Generation P')
-      #   article.changed? # => false
-      #
-      #   article.title = 'Master and Margarita'
-      #   article.changed? # => true
-      #
-      #   article.changed_attributes # => {:title => "Generation P"}
-      def self.included(base)
-        base.class_eval do
-          extend ClassMethods
-        end
-      end
-
-      module ClassMethods
-        # Override attribute accessors function.
-        # Create setter methods with attribute values checking.
-        # If the new value or a changed, added to @changed_attributes.
-        #
-        # @params attr [Symbol] an attribute name
-        #
-        # @since 0.3.1
-        # @api private
-        #
-        # @see Lotus::Entity::ClassMethods#define_attr_accessor
-        def define_attr_accessor(attr)
-          attr_reader(attr)
-
-          class_eval %{
-            def #{ attr }=(value)
-              _attribute_changed(:#{ attr }, @#{ attr }, value)
-              @#{ attr } = value
-            end
-          }
-        end
-      end
-
       # Override initialize process.
       #
       # @param attributes [Hash] a set of attribute names and values
@@ -62,9 +30,8 @@ module Lotus
       #
       # @see Lotus::Entity#initialize
       def initialize(attributes = {})
-        _clear_changes_information
         super
-        _clear_changes_information
+        @_initial_state = Utils::Hash.new(to_h).deep_dup
       end
 
       # Getter for hash of changed attributes.
@@ -78,7 +45,7 @@ module Lotus
       # @example
       #   require 'lotus/model'
       #
-      #   class User
+      #   class Article
       #     include Lotus::Entity
       #     include Lotus::Entity::DirtyTracking
       #
@@ -91,7 +58,7 @@ module Lotus
       #   article.title = 'Master and Margarita'
       #   article.changed_attributes # => {:title => "The crime and punishment"}
       def changed_attributes
-        @changed_attributes.dup
+        Hash[@_initial_state.to_a - to_h.to_a]
       end
 
       # Checks if the attributes were changed
@@ -100,26 +67,7 @@ module Lotus
       #
       # @since 0.3.1
       def changed?
-        @changed_attributes.size > 0
-      end
-
-      private
-
-      # Set changed attributes in Hash with their old values.
-      #
-      # @params attrs [Symbol] an attribute name
-      #
-      # @since 0.3.1
-      # @api private
-      def _attribute_changed(attr, current_value, new_value)
-        @changed_attributes[attr] = new_value if current_value != new_value
-      end
-
-      # Clear all information about dirty data
-      #
-      # @since 0.3.1
-      def _clear_changes_information
-        @changed_attributes = {}
+        changed_attributes.any?
       end
     end
   end

data/lib/lotus/model/version.rb

@@ -3,6 +3,6 @@ module Lotus
     # Defines the version
     #
     # @since 0.1.0
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.3.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lotus-model
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Luca Guidi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-15 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lotus-utils