historyable 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzU1M2JlMTY5YjkyMjUyMmI1NTVmZDgwNTA1NDY5MmViYTQ2YjJiOA==
+    ZjkzMWQ0Mjk3OGMwODJhMGQzNjViZDNiMjg1N2VkYTg4OGU2M2UxNw==
   data.tar.gz: !binary |-
-    MGEyNzQyY2JlMWMyMzU3NTI0NGJkNTVhMTNiNmU2MzAxYzA2M2IxMw==
+    MjQyMDFmZDlhZTRmMGVmYjlmNDk2MTRjNmY1ZGE2NDIxNzFjOGNiYg==
 SHA512:
   metadata.gz: !binary |-
-    ZjU4NmFmMGVjODIyYWI1YTNjYTRiZDA4OWI0NDBhZTkzNjFjZTNlMWVmOTM5
-    ZjY5MTY0Zjc3M2U3MDdjMjg3OGRhYmMzZjNmY2VjMzdiODllY2IzMzcwYzI2
-    N2E3NWE3ZTM2NjQ3OGQ4OTJiMWEwZDljZDRlMDViMWM1ZTkwYTE=
+    YWQ4YWE3ODhkN2U1MGJiYTVkYjBmMzZjYzg2NjcyOWNhY2RlZjU5Yzc4NmMx
+    OTBmMjg0ZDZkZTdkNWI2YjFkNWViZTBjOTIyYzFmYWE3YWU0NjM5ZTZjOGI4
+    ODk3MmUxYzZhMjVkZDRkOTU4ODJlN2ZiNjY2YTc2MGM3NWY4MGM=
   data.tar.gz: !binary |-
-    MzUyZjJmNmYwMGI4NmVhZmVmMGEzODVmYTNlZTM5N2JkYjE5ZDM4Y2JjMTUx
-    YTU5MGIxYjgxZmQ5ZmM0OTc3ZTZkNTY3YjQzZDkzOGJhOWFlNWE0OGUwYWEy
-    NGQyZGUyMmMxYTkwNmNlNGQzODI4NDg2YmQ2M2Q1YzRiMjNlMDA=
+    Mzk3YmYzNDFhYTk2MDExZjlhNDZkNDI3YzhjMWRjNmRiMWZlMjI4MDE3MDQy
+    YmI4OTQ0MThlODQ3N2Q2OTkxMjZjZmZlMjhhOGFlYWNkMjdmNmU4ODViYjVi
+    YWMwYWRkYzU0ZmY4MDI4MDg5MjVkYWY5NGNmMTFlZTYzZWE5NmE=

data/lib/historyable/change.rb

@@ -1,4 +1,6 @@
-class Change < ActiveRecord::Base
-  belongs_to :historyable, polymorphic: true
-  serialize :object_attribute_value
+module Historyable
+  class Change < ActiveRecord::Base
+    belongs_to :historyable, polymorphic: true
+    serialize :object_attribute_value
+  end
 end

data/lib/historyable/version.rb

@@ -1,3 +1,3 @@
 module Historyable
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/historyable.rb

@@ -9,7 +9,8 @@ module Historyable
   Item = Struct.new(:attribute_name, :association_name)
 
   included do
-    class_attribute :historyable_items, :historyable_cache, instance_writer: false
+    class_attribute :historyable_items, instance_writer: false
+    attr_accessor   :historyable_cache
   end
 
 
@@ -20,24 +21,18 @@ module Historyable
     #
     # @param attributes [Array, Symbol]
     def has_history(*attributes)
-      self.historyable_cache = ActiveSupport::Cache::MemoryStore.new
       self.historyable_items = attributes.map do |attribute|
         attribute_name   = attribute.to_sym
-        association_name = attribute.to_s.insert(-1, '_changes').to_sym
+        association_name = "#{attribute}_changes".to_sym
 
         Item.new(attribute_name, association_name)
       end
 
-      # Associations
       historyable_items.each do |historyable|
-        has_many historyable.association_name,
-                 as:         :item,
-                 class_name: '::Change',
-                 dependent:  :destroy
-      end
+        # Associations
+        define_historyable_association(historyable)
 
-      # Instance methods
-      historyable_items.each do |historyable|
+        # Instance methods
         define_historyable_attribute_history_raw(historyable)
         define_historyable_attribute_history(historyable)
         define_historyable_attribute_history?(historyable)
@@ -50,6 +45,13 @@ module Historyable
 
     private
 
+    def define_historyable_association(historyable)
+      has_many historyable.association_name,
+               as:         :item,
+               class_name: Change,
+               dependent:  :destroy
+    end
+
     # attribute_history_raw
     #
     # @example
@@ -75,19 +77,15 @@ module Historyable
     # @return [Array]
     def define_historyable_attribute_history(historyable)
       define_method("#{historyable.attribute_name.to_s}_history") do
-        historyable_cache.fetch(historyable.attribute_name) do
-          collection = []
-
-          records = send("#{historyable.attribute_name}_history_raw")
-          records.each do |record|
-            item = HashWithIndifferentAccess.new
-            item[:attribute_value] = record.object_attribute_value
-            item[:changed_at]      = record.created_at
-
-            collection << item
-          end
-
-          collection
+        self.historyable_cache ||= Hash.new
+        historyable_cache[historyable.attribute_name] ||= send("#{historyable.attribute_name}_history_raw").inject([]) do |memo, record|
+          # @TODO Create a class instead of a hash to store the attributes value
+          # instead of doing collection.map {|hash| hash[:changed_at] } will do collection.map(&:changed_at)
+          item = HashWithIndifferentAccess.new
+          item[:attribute_value] = record.object_attribute_value
+          item[:changed_at]      = record.created_at
+
+          memo << item
         end
       end
     end
@@ -121,7 +119,7 @@ module Historyable
       send(historyable.association_name).create(object_attribute: historyable.attribute_name,
                                                 object_attribute_value: send(historyable.attribute_name))
       # Expires attribute_history cache
-      historyable_cache.delete(historyable.attribute_name)
+      historyable_cache && historyable_cache.delete(historyable.attribute_name)
     end
 
     true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: historyable
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Philippe Dionne
@@ -38,7 +38,7 @@ cert_chain:
   aW9OckllMC8xNWRIcERvSUVESUxhNnpVNDZCClhEdHAxWXhkZVZHSUJ1Tm9Q
   MXZqRFN2TktZajBwTWpSQUVQcnFLMzlqS0U9Ci0tLS0tRU5EIENFUlRJRklD
   QVRFLS0tLS0K
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +54,6 @@ dependencies:
   type: :runtime
   prerelease: false
   name: activerecord
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.14
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.14
-  type: :runtime
-  prerelease: false
-  name: activesupport
 description: A simple and solid concern to track ActiveRecord models attributes changes.
 email:
 - philippe.dionne@hooktstudios.com