activehistory 0.2.2 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d963f534f27dfefd26d29a44571a997f74abc8b6
-  data.tar.gz: 0cda709c598c17b4fa85d845769ce06eaf0a4c2c
+  metadata.gz: 7d058bc974abf0cc2b78bbe2f1a310d923917c39
+  data.tar.gz: b71d899daa40624f2fcdd234c66242e42944d36f
 SHA512:
-  metadata.gz: a82a9e4858e82570938b99cb6a1b696c27b163c578480d9f312cb4c33b6e09fb298768ccfeb0ab0c2f87540fab4c2a6169b6d83ae0a037a69f9f3251aadfc472
-  data.tar.gz: 269c594656f0bc6110c40a86ed8db03ce1afadadad8dd9a0d8f20f1e22e80327904f42385cd9cf601e546983fc9c51a9db1301383f01d7d24ab3dcb343a9d225
+  metadata.gz: 1f73eff939b5cf10570e7738ba267c3b1c20a990981818590d86f9dc8cbecbf216e27d6e306a9a00380511a73dd7493006f1d9e9f78f5643da8f061676a4c219
+  data.tar.gz: 9691514585efb7e08f972733f73a7179da93755db86decbb88f5fa75da2c1384659df1366ada96dce8fafec28756ef0fa81c0273460d584728e1c14011ca5363

data/.gitignore

@@ -2,6 +2,7 @@
 *.DS_Store
 /coverage/
 /tmp/
+.byebug_history
 
 # Used by dotenv library to load environment variables.
 # .env

data/Gemfile.lock

@@ -1,30 +1,30 @@
 PATH
   remote: .
   specs:
-    activehistory (0.2.1)
-      activerecord (~> 5.0)
-      arel (~> 7.0)
+    activehistory (0.2.3)
+      activerecord (~> 5.1)
       globalid (~> 0.3.7)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
-      arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.4.0)
     ansi (1.5.0)
-    arel (7.1.4)
+    arel (8.0.0)
     builder (3.2.2)
-    concurrent-ruby (1.0.2)
+    byebug (9.0.6)
+    concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     docile (1.1.5)
@@ -35,10 +35,10 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     hashdiff (0.3.0)
-    i18n (0.7.0)
-    json (1.8.3)
+    i18n (0.8.1)
+    json (1.8.6)
     metaclass (0.0.4)
-    minitest (5.9.1)
+    minitest (5.10.1)
     minitest-reporters (1.1.11)
       ansi
       builder
@@ -62,8 +62,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     webmock (2.1.0)
       addressable (>= 2.3.6)
@@ -76,6 +76,7 @@ PLATFORMS
 DEPENDENCIES
   activehistory!
   bundler
+  byebug
   factory_girl
   faker
   minitest
@@ -90,4 +91,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   1.13.2
+   1.15.3

data/activehistory.gemspec

@@ -31,11 +31,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sdoc-templates-42floors'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pg'
+  s.add_development_dependency 'byebug'
 
   # Runtime
-  # s.add_runtime_dependency 'msgpack'
-  # s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'arel', '~> 7.0'
-  s.add_runtime_dependency 'activerecord', '~> 5.0'
+  s.add_runtime_dependency 'activerecord', '~> 5.1'
   s.add_runtime_dependency 'globalid', '~> 0.3.7'
 end

data/lib/activehistory/action.rb

@@ -1,6 +1,6 @@
 class ActiveHistory::Action
 
-  attr_accessor :type, :timestamp, :subject_type, :subject_id, :diff
+  attr_accessor :id, :event_id, :type, :timestamp, :subject_type, :subject_id, :diff
 
   def initialize(attrs)
     attrs.each do |k,v|
@@ -12,11 +12,13 @@ class ActiveHistory::Action
   def as_json
     {
       diff:         diff.as_json,
-      subject_type: @subject_type,
-      subject_id:   @subject_id,
-      timestamp:    @timestamp.iso8601(3),
-      type:         @type
-    }
+      subject_type: subject_type,
+      subject_id:   subject_id,
+      timestamp:    timestamp.iso8601(3),
+      type:         type,
+      event_id:     event_id,
+      id:           id
+    }.select { |k, v| !v.nil? }
   end
 
 end

data/lib/activehistory/adapters/active_record.rb

@@ -21,7 +21,7 @@ module ActiveHistory::Adapter
         @activehistory = options
       end
       
-      def has_and_belongs_to_many(name, scope = nil, options = {}, &extension)
+      def has_and_belongs_to_many(name, scope = nil, **options, &extension)
         super
         name = name.to_s
         habtm_model = self.const_get("HABTM_#{name.to_s.camelize}")
@@ -53,6 +53,7 @@ module ActiveHistory::Adapter
           action.diff[diff_key] ||= [[], []]
           action.diff[diff_key][0] |= removed
           action.diff[diff_key][1] |= added
+
           in_common = (action.diff[diff_key][0] & action.diff[diff_key][1])
           if !in_common.empty?
             action.diff[diff_key][0] = action.diff[diff_key][0] - in_common
@@ -155,7 +156,8 @@ module ActiveHistory::Adapter
       return if !activehistory_tracking
       
       if type == :create || type == :update
-        diff = self.changes.select { |k,v| !activehistory_tracking[:exclude].include?(k.to_sym) }
+        diff = self.saved_changes.select { |k,v| !activehistory_tracking[:exclude].include?(k.to_sym) }
+
         if type == :create
           self.class.columns.each do |column|
             if !diff[column.name] && !activehistory_tracking[:exclude].include?(column.name.to_sym) && column.default != self.attributes[column.name]
@@ -164,11 +166,29 @@ module ActiveHistory::Adapter
           end
         end
       elsif type == :destroy
-        diff = self.attributes.select { |k| !activehistory_tracking[:exclude].include?(k.to_sym) }.map { |k, i| [k, [i, nil]] }.to_h
+        relations_ids = self.class.reflect_on_all_associations.map { |r| "#{r.name.to_s.singularize}_ids" }
+
+        diff = self.attributes.select do |k|
+          !activehistory_tracking[:exclude].include?(k.to_sym) 
+        end.map do |k, i|
+          if relations_ids.include?(k)
+            [ k, [ i, [] ] ]
+          else
+            [ k, [ i, nil ] ]
+          end
+        end.to_h
       end
-      
-      return if type == :update && (diff.keys - (self.send(:timestamp_attributes_for_update) + self.send(:timestamp_attributes_for_create)).map(&:to_s)).empty?
-      
+
+      if type == :update
+        diff_without_timestamps = if self.class.record_timestamps
+          diff.keys - (self.class.send(:timestamp_attributes_for_update_in_model) + self.class.send(:timestamp_attributes_for_create_in_model))
+        else
+          diff.keys
+        end
+        
+        return if diff_without_timestamps.empty?
+      end
+
       if activehistory_tracking[:habtm_model]
         if type == :create
           self.class.reflect_on_association(:left_side).klass.activehistory_association_changed(
@@ -269,6 +289,7 @@ module ActiveHistory::Adapter
         })
       
         action.diff ||= {}
+
         if inverse_association.collection? || activehistory_tracking[:habtm_model]
           diff_key = "#{inverse_association.name.to_s.singularize}_ids"
           action.diff[diff_key] ||= [[], []]

data/lib/activehistory/event.rb

@@ -8,7 +8,7 @@ end
 class ActiveHistory::Event
   include GlobalID::Identification
 
-  attr_accessor :id, :ip, :user_agent, :session_id, :metadata, :timestamp, :performed_by_id, :performed_by_type, :actions
+  attr_accessor :id, :metadata, :timestamp, :actions
   
   def initialize(attrs={})
     attrs.each do |k,v|
@@ -25,7 +25,7 @@ class ActiveHistory::Event
     @actions ||= []
     @timestamp ||= Time.now
   end
-  
+
   def persisted?
     @persisted
   end
@@ -37,7 +37,6 @@ class ActiveHistory::Event
   end
   
   def action_for(type, id, new_options=nil)
-    byebug if $debugging
     type = type.base_class.model_name.name if !type.is_a?(String)
     action = @actions.find { |a| a.subject_type.to_s == type.to_s && a.subject_id.to_s == id.to_s }
     
@@ -85,12 +84,7 @@ class ActiveHistory::Event
   def as_json
     {
       id:                   id,
-      ip:                   ip,
-      user_agent:           user_agent,
-      session_id:           session_id,
       metadata:             metadata,
-      performed_by_type:    performed_by_type,
-      performed_by_id:      performed_by_id,
       timestamp:            timestamp.utc.iso8601(3),
       actions:              actions.as_json
     }

data/lib/activehistory/metadatum.rb

@@ -0,0 +1,9 @@
+class Metadatum
+
+  attr_accessor :event_id, :key, :value
+
+  def initialize(attrs)
+    attrs.each { |k, v| self.send("#{k}=", v) }
+  end
+
+end

data/lib/activehistory/version.rb

@@ -1,3 +1,3 @@
 module ActiveHistory
-  VERSION = '0.2.2'
+  VERSION = '5.1.0'
 end

data/test/active_record_adapter/event_test.rb

@@ -9,12 +9,14 @@ class EventTest < ActiveSupport::TestCase
 
   test 'Data captured from Event encalpsulation' do
     data = {
-      ip: '127.0.0.1',
-      user_agent:         'user-agent',
-      session_id:         'session-id',
-      performed_by_type:  'model',
-      performed_by_id:    'id',
-      metadata:           {random: 'stuff'},
+      metadata:           {
+        ip: '127.0.0.1',
+        user_agent:         'user-agent',
+        session_id:         'session-id',
+        performed_by_type:  'model',
+        performed_by_id:    'id',
+        random: 'stuff'
+      },
       timestamp:          Time.now
     }
     

data/test/models.rb

@@ -40,9 +40,19 @@ class Region < ActiveRecord::Base
   track
   
   has_and_belongs_to_many :properties, inverse_of: :regions
-  has_and_belongs_to_many :parents, :join_table => 'regions_regions', :class_name => 'Region', :foreign_key => 'child_id', :association_foreign_key => 'parent_id'
-  has_and_belongs_to_many :children, :join_table => 'regions_regions', :class_name => 'Region', :foreign_key => 'parent_id', :association_foreign_key => 'child_id'
-  
+
+  has_and_belongs_to_many :parents,
+    class_name: 'Region',
+    join_table: 'regions_regions',
+    foreign_key: 'child_id',
+    association_foreign_key: 'parent_id'
+
+  has_and_belongs_to_many :children,
+    class_name: 'Region',
+    join_table: 'regions_regions',
+    foreign_key: 'parent_id',
+    association_foreign_key: 'child_id'
+
 end
 
 class Comment < ActiveRecord::Base
@@ -56,5 +66,3 @@ end
 class UnobservedModel < ActiveRecord::Base
   
 end
-
-# ActiveRecord::Base.logger = Logger.new(STDOUT)

data/test/test_helper.rb

@@ -8,6 +8,7 @@ require 'minitest/reporters'
 require 'webmock/minitest'
 require 'factory_girl'
 require 'faker'
+require 'byebug'
 
 
 WebMock.disable_net_connect!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activehistory
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 5.1.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -193,33 +193,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: arel
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +256,7 @@ files:
 - lib/activehistory/connection.rb
 - lib/activehistory/event.rb
 - lib/activehistory/exceptions.rb
+- lib/activehistory/metadatum.rb
 - lib/activehistory/regard.rb
 - lib/activehistory/version.rb
 - test/active_record_adapter/association_test/belongs_to_association_test.rb
@@ -290,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Track changes to ActiveRecord models