activehistory 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d976170424ce9995a019e74e9475ce1036ee85
-  data.tar.gz: 3ed68d22d9444cab4a7d1536b5a6514d822a677d
+  metadata.gz: 738938e4c7303437ed611ad74d5b48736f5590a6
+  data.tar.gz: 5e0a178f69fd5cff99025256a819bccb30e35445
 SHA512:
-  metadata.gz: 448baea6c2bc3e7d3d284491bfcaebf807ef3ac61fe021151065a88a4b6d38b02ef594a6ffe2b115b57fcef420032c4bfc74b3f0a08cbc6a76e7afba4e51b0b6
-  data.tar.gz: 202e03ba0ed75936b7ac9f66406f2b1e559449d2eeaa78299793cb65af0d6c18ff06b11da6b1e16931cfb74897dfbac628e416871b0c89cc172c80590653fffe
+  metadata.gz: aa67c5b5797e87d86122853469a87b25af576baed17e7672cb81290ee68707038d3368afc09a9b7bcefc2be43605a3ac206fedbb9626dd21d5c46c5f66345849
+  data.tar.gz: f535f87bceff3329c4850d584c78201decc0ba7af419fcd9e3f288d1f9d84ea9607b39eaaf13fb7765970d1e41435d2c077918e3898d27a7f5763f3c6bcb9359

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    activehistory (0.1)
-      activerecord (= 5.0.0.1)
+    activehistory (0.2.1)
+      activerecord (~> 5.0)
       arel (~> 7.0)
       globalid (~> 0.3.7)
 

data/activehistory.gemspec

@@ -36,6 +36,6 @@ Gem::Specification.new do |s|
   # 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.0.1'
+  s.add_runtime_dependency 'activerecord', '~> 5.0'
   s.add_runtime_dependency 'globalid', '~> 0.3.7'
 end

data/lib/activehistory.rb

@@ -1,10 +1,13 @@
+require 'logger'
+
 module ActiveHistory
   
-  mattr_accessor :connection
+  mattr_accessor :connection, :logger
   
   UUIDV4 = /^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i
   
   def self.configure(settings)
+    self.logger = settings&.delete(:logger) || Logger.new(STDOUT)
     @@connection = ActiveHistory::Connection.new(settings)
   end
   
@@ -27,7 +30,7 @@ module ActiveHistory
     
     yield
   ensure
-    if Thread.current[:activehistory_event] && !Thread.current[:activehistory_event].actions.empty?
+    if configured? && Thread.current[:activehistory_event] && !Thread.current[:activehistory_event].actions.empty?
       Thread.current[:activehistory_event].save!
     end
     Thread.current[:activehistory_event] = nil

data/lib/activehistory/adapters/active_record.rb

@@ -45,7 +45,6 @@ module ActiveHistory::Adapter
         else
           reflection_or_relation_name
         end
-        puts "#{self}##{id}.#{reflection.name} +#{added.inspect} -#{removed.inspect}"
         
         action = ActiveHistory.current_event(timestamp: timestamp).action_for(self, id, { type: type, timestamp: timestamp })
       
@@ -54,9 +53,18 @@ 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
+            action.diff[diff_key][1] = action.diff[diff_key][1] - in_common
+          end
         else
           diff_key = "#{reflection.name.to_s.singularize}_id"
-          action.diff[diff_key] ||= [removed.first, added.first]
+          if action.diff.has_key?(diff_key) && action.diff[diff_key][0] == added.first
+            action.diff.delete(diff_key)
+          else
+            action.diff[diff_key] ||= [removed.first, added.first]
+          end
         end
 
       
@@ -220,8 +228,6 @@ module ActiveHistory::Adapter
         timestamp: timestamp,
         type: type
       })
-      
-      
     end
     
     def activehistory_association_udpated(reflection, id, added: [], removed: [], timestamp: nil, type: :update)
@@ -394,10 +400,11 @@ module ActiveRecord
       
       def activehistory_encapsulate
         @activehistory_timestamp = Time.now.utc
+
         if !Thread.current[:activehistory_save_lock]
           run_save = true
           Thread.current[:activehistory_save_lock] = true
-          if !Thread.current[:activehistory_event]
+          if Thread.current[:activehistory_event].nil?
             destroy_current_event = true
             Thread.current[:activehistory_event] = ActiveHistory::Event.new(timestamp: @activehistory_timestamp)
           end
@@ -418,7 +425,6 @@ module ActiveRecord
         if destroy_current_event
           Thread.current[:activehistory_event] = nil
         end
-        
       end
       
     end

data/lib/activehistory/event.rb

@@ -41,7 +41,13 @@ class ActiveHistory::Event
     action = @actions.find { |a| a.subject_type.to_s == type.to_s && a.subject_id.to_s == id.to_s }
     
     if new_options
-      action || action!({ subject_type: type, subject_id: id, type: :update }.merge(new_options))
+      if action
+        action.diff.merge!(new_options[:diff]) if new_options.has_key?(:diff)
+        action
+      else
+        action!({ subject_type: type, subject_id: id, type: :update }.merge(new_options))
+      end
+
     else
       action
     end
@@ -59,14 +65,18 @@ class ActiveHistory::Event
   
   def _update
     return if actions.empty?
-    ActiveHistory.connection.post('/actions', {
-      actions: actions.as_json.map{|json| json[:event_id] = id; json}
-    })
+    actions.delete_if { |a| a.diff.empty? }
+    payload = JSON.generate({actions: actions.as_json.map{ |json| json[:event_id] = id; json }})
+    ActiveHistory.logger.debug("[ActiveHistory] POST /actions WITH #{payload}")
+    ActiveHistory.connection.post('/actions', payload)
     @actions = []
   end
   
   def _create
-    ActiveHistory.connection.post('/events', self.as_json)
+    actions.delete_if { |a| a.diff.empty? }
+    payload = JSON.generate(self.as_json)
+    ActiveHistory.logger.debug("[ActiveHistory] POST /events WITH #{payload}")
+    ActiveHistory.connection.post('/events', payload)
     @actions = []
     @persisted = true
   end

data/lib/activehistory/version.rb

@@ -1,3 +1,3 @@
 module ActiveHistory
-  VERSION = '0.2'
+  VERSION = '0.2.1'
 end

data/test/active_record_adapter/association_test/has_many_association_test.rb

@@ -12,7 +12,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
     WebMock::RequestRegistry.instance.reset!
 
     @photo = travel_to(@time) { create(:photo, property: @property) }
-    
+
     assert_posted("/events") do
       assert_action_for @photo, {
         diff: {
@@ -71,13 +71,13 @@ class HasManyAssociationTest < ActiveSupport::TestCase
   test 'has_many <<'
   test 'has_many.delete'
   test 'has_many.destroy'
-  
+
   test 'has_many=' do
     @property = create(:property)
     @photo1 = create(:photo)
     @photo2 = create(:photo)
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @property.photos = [@photo1] }
     assert_posted("/events") do
       assert_action_for @photo1, {
@@ -96,10 +96,10 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         type: 'update'
       }
     end
-    
+
     WebMock::RequestRegistry.instance.reset!
     travel_to(@time) { @property.photos = [@photo2] }
-    assert_posted("/events") do      
+    assert_posted("/events") do
       assert_action_for @photo2, {
         diff: { property_id: [nil, @property.id] },
         subject_type: "Photo",
@@ -107,7 +107,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @property, {
         diff: { photo_ids: [[@photo1.id], [@photo2.id]] },
         subject_type: "Property",
@@ -115,7 +115,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @photo1, {
         diff: { property_id: [@property.id, nil] },
         subject_type: "Photo",
@@ -125,13 +125,13 @@ class HasManyAssociationTest < ActiveSupport::TestCase
       }
     end
   end
-  
+
   test 'has_many_ids=' do
     @property = create(:property)
     @photo1 = create(:photo)
     @photo2 = create(:photo)
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @property.photo_ids = [@photo1].map(&:id) }
     assert_posted("/events") do
       assert_action_for @property, {
@@ -141,7 +141,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @photo1, {
         diff: { property_id: [nil, @property.id] },
         subject_type: "Photo",
@@ -150,10 +150,10 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         type: 'update'
       }
     end
-    
+
     WebMock::RequestRegistry.instance.reset!
     travel_to(@time) { @property.photo_ids = [@photo2].map(&:id) }
-    assert_posted("/events") do      
+    assert_posted("/events") do
       assert_action_for @photo2, {
         diff: { property_id: [nil, @property.id] },
         subject_type: "Photo",
@@ -161,7 +161,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @property, {
         diff: { photo_ids: [[@photo1.id], [@photo2.id]] },
         subject_type: "Property",
@@ -169,7 +169,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @photo1, {
         diff: { property_id: [@property.id, nil] },
         subject_type: "Photo",
@@ -179,16 +179,16 @@ class HasManyAssociationTest < ActiveSupport::TestCase
       }
     end
   end
-  
+
   test 'has_many.clear' do
     @photo1 = create(:photo)
     @photo2 = create(:photo)
     @property = create(:property, photos: [@photo1, @photo2])
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @property.photos.clear }
     assert_posted("/events") do |req|
-      
+
       assert_action_for @property, {
         diff: { photo_ids: [[@photo1, @photo2].map(&:id), []] },
         subject_type: "Property",
@@ -196,7 +196,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @photo1, {
         diff: { property_id: [@property.id, nil] },
         subject_type: "Photo",
@@ -204,7 +204,7 @@ class HasManyAssociationTest < ActiveSupport::TestCase
         timestamp: @time.iso8601(3),
         type: 'update'
       }
-      
+
       assert_action_for @photo2, {
         diff: { property_id: [@property.id, nil] },
         subject_type: "Photo",
@@ -215,6 +215,52 @@ class HasManyAssociationTest < ActiveSupport::TestCase
     end
   end
   
+  test 'has_many.clear, has_many=, while updating model; a werid example but could happen in an after_save callback etc..' do
+    @photo1 = create(:photo)
+    @photo2 = create(:photo)
+    @property = create(:property, name: 'old name', photos: [@photo1])
+    WebMock::RequestRegistry.instance.reset!
+    
+    travel_to(@time) {
+      begin
+        Thread.current[:activehistory_save_lock] = true
+        Thread.current[:activehistory_event] = ActiveHistory::Event.new()
+        @property.name = 'new name'
+        @property.photos.clear
+        @property.photos = [@photo2, @photo1]
+        @property.save
+        ActiveHistory.current_event.save!
+      ensure
+        Thread.current[:activehistory_save_lock] = false
+        Thread.current[:activehistory_event] = nil
+      end
+    }
+    
+    assert_posted("/events") do |req|
+      
+      assert_action_for @property, {
+        diff: {
+          photo_ids: [[], [@photo2].map(&:id)],
+          name: ['old name', 'new name']
+        },
+        subject_type: "Property",
+        subject_id: @property.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_no_action_for @photo1
+      
+      assert_action_for @photo2, {
+        diff: { property_id: [nil, @property.id] },
+        subject_type: "Photo",
+        subject_id: @photo2.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+    end
+  end
+  
   test 'has_many.create'
    
 end

data/test/test_helper.rb

@@ -17,7 +17,8 @@ require 'active_record'
 require 'activehistory'
 
 ActiveHistory.configure({
-  url: 'http://activehistory.com'
+  url: 'http://activehistory.com',
+  logger: Logger.new("/dev/null")
 })
 ActiveRecord::Base.establish_connection({
   adapter: 'postgresql',
@@ -40,6 +41,12 @@ class ActiveSupport::TestCase
     WebMock.stub_request(:any, /^http:\/\/activehistory.com\/.*/)
   end
   
+  set_callback(:teardown, :after) do
+    if !Thread.current[:activehistory_event].nil?
+      raise 'no nil'
+    end
+  end
+  
   def assert_posted(path, &block)
     assert_requested(:post, "#{ActiveHistory.url}#{path}", times: 1) do |req|
       @req = JSON.parse(req.body)
@@ -48,13 +55,21 @@ class ActiveSupport::TestCase
   end
   
   def assert_action_for(model, expected)
-    action = @req['actions'].find do |action|
-      action['subject_type'] == model.class.base_class.model_name.name && action['subject_id'] == model.id
+    action = @req['actions'].find do |a|
+      a['subject_type'] == model.class.base_class.model_name.name && a['subject_id'] == model.id
     end
 
     assert_equal(expected.as_json, action)
   end
   
+  def assert_no_action_for(model)
+    action = @req['actions'].find do |a|
+      a['subject_type'] == model.class.base_class.model_name.name && a['subject_id'] == model.id
+    end
+
+    assert_nil action
+  end
+  
   def assert_not_posted(path)
     assert_not_requested(:post, "#{ActiveHistory.url}#{path}")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activehistory
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -210,16 +210,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -290,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Track changes to ActiveRecord models