recorder 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c80f7cee2e38cf2926994bf24de8efd4db6cb5
-  data.tar.gz: 57bf290b34bb02949f2ddfcd4bc560a9b4aa0d20
+  metadata.gz: 99e7c1bf50c6c1844ee0961756ffe1ab06128991
+  data.tar.gz: 51d81209e457c6d099f3ffb168ac261bcf559aed
 SHA512:
-  metadata.gz: d25f3f23d9b3527a3e3a1fee809beb21bb5988079b9798221cd1607e04283445cdb13bd89cdb519e0e21687ca75eee2c6f6790bffbc5e8d180899e01b6fd24c6
-  data.tar.gz: e733f79ed49cb43195eab6b06e53789a7f577bddd3bc1e7550533b058f4233b861743c64481e11e4d801e5446ef9592fe608599f1bf364f0752e52302ff88b4f
+  metadata.gz: f0d3fc8fb50bbb4bb2d87ad02cb2086669e6cced785e65a96a4f911a1ec6e33d0a4dcf81feecdc8bf6299e9fefe8601ae5fd54845f9ce0c8a100f256b26d278b
+  data.tar.gz: 4812c0ac7f9c24fb614f7eb9f038c42ab57b5a732e319674d89ad87fe374fb4dd513077a881330e3a496859a7f3d1677ee1108c0818c3c3829d064a051d734d1

data/lib/recorder/changeset.rb

@@ -6,24 +6,52 @@ module Recorder
       @item = item; @changes = changes
     end
 
-    def attributes
+    def keys
       self.changes.keys
     end
 
     def human_attribute_name(attribute)
-      self.item.class.human_attribute_name(attribute.to_s)
+      if defined?(Draper) && self.item.decorated?
+        self.item.source.class.human_attribute_name(attribute.to_s)
+      else
+        self.item.class.human_attribute_name(attribute.to_s)
+      end
+
+    end
+
+    def previous(attribute)
+      # self.changes[attribute.to_s][0]
+      # self.previous_version.try("display_#{attribute}") || self.previous_version.try(attribute)
+      self.try("previous_#{attribute}") || self.previous_version.try(attribute)
     end
 
-    def before(attribute)
-      self.changes[attribute.to_s][0]
+    def previous_version
+      return @previous_version if defined?(@previous_version)
+
+      @previous_version = self.item.dup
+
+      self.changes.each do |key, change|
+        @previous_version.send("#{key}=", change[0])
+      end
+
+      @previous_version
     end
 
-    def after(attribute)
-      self.changes[attribute.to_s][1]
+    def next(attribute)
+      self.try("next_#{attribute}") || self.next_version.send(attribute)
+      # self.next_version.try("display_#{attribute}") || self.next_version.try(attribute)
     end
 
-    # def item_human_attribute_name(attribute)
-    #   self.item.source.class.human_attribute_name(attribute)
-    # end
+    def next_version
+      return @next_version if defined?(@next_version)
+
+      @next_version = self.item.dup
+
+      self.changes.each do |key, change|
+        @next_version.send("#{key}=", change[1])
+      end
+
+      @next_version
+    end
   end
 end

data/lib/recorder/draper/decorator_concern.rb

@@ -6,18 +6,31 @@ module Recorder
       end
 
       def item_changeset
-        @item_changeset ||= Recorder::Changeset.new(self.item.source, source.data['changes'])
+        return @item_changeset if defined?(@item_changeset)
+
+        @item_changeset ||= self.changeset_klass(self.item.source).new(self.item, source.data['changes'])
       end
 
       def changed_associations
-        source.data['associations'].keys#.map{ |association| self.item_human_attribute_name(association) }
+        source.data['associations'].keys
       end
 
       def association_changeset(name)
         association = self.item.send(name)
-        association = association.source if association.decorated?
+        # association = association.source if association.decorated?
+
+        self.changeset_klass(association).new(association, source.data['associations'].fetch(name.to_s).try(:fetch, 'changes'))
+      end
+
+    protected
+
+      def changeset_klass(object)
+        klass = object.decorated? ? object.source.class : object.class
+        klass = klass.base_class
+        klass = "#{klass}Changeset"
 
-        Recorder::Changeset.new(association, source.data['associations'].fetch(name.to_s).try(:fetch, 'changes'))
+        klass = klass.constantize rescue nil
+        klass.present? ? klass : Recorder::Changeset
       end
     end
   end

data/lib/recorder/observer.rb

@@ -10,17 +10,21 @@ module Recorder
     end
 
     module ClassMethods
-      def record_changes(options = {})
+      def recorder(options = {})
+        define_method 'recorder_option' do
+          options
+        end
+
         after_commit :on => :create do
-          Recorder::Tape.new(self, options).record_create
+          Recorder::Tape.new(self).record_create
         end
 
         after_commit :on => :update do
-          Recorder::Tape.new(self, options).record_update
+          Recorder::Tape.new(self).record_update
         end
 
         after_commit :on => :destroy do
-          Recorder::Tape.new(self, options).record_destroy
+          Recorder::Tape.new(self).record_destroy
         end
       end
     end

data/lib/recorder/tape.rb

@@ -1,10 +1,9 @@
 module Recorder
   class Tape
-    attr_reader :item, :options
+    attr_reader :item
 
-    def initialize(item, options = {})
-      @item = item
-      @options = options
+    def initialize(item)
+      @item = item;
     end
 
     def record_create
@@ -56,13 +55,12 @@ module Recorder
     end
 
     def sanitize_attributes(attributes = {})
-      # attributes.symbolize_keys.delete_if{ |key, value|  [:created_at, :updated_at, :delta].include?(key) || (value[0] == value[1]) }
-      attributes.symbolize_keys.except(:created_at, :updated_at, :delta)
+      attributes.symbolize_keys.except(self.item.recorder_options[:except])
     end
 
     def parse_associations_attributes
-      if self.options[:associations].any?
-        self.options[:associations].inject({}) do |hash, association|
+      if self.item.recorder_options[:associations].any?
+        self.item.recorder_options[:associations].inject({}) do |hash, association|
           reflection = self.item.class.reflect_on_association(association)
           if reflection.present?
             if reflection.collection?

data/lib/recorder/version.rb

@@ -3,7 +3,7 @@ module Recorder
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY = 2
+    TINY = 3
     PRE = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".").freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recorder
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord