activehistory 0.1 → 0.2

data/test/active_record_adapter/event_test.rb

@@ -10,12 +10,12 @@ 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',
-      account:    'model/id',
-      api_key:    'api-key',
-      metadata:   {random: 'stuff'},
-      timestamp:  Time.now
+      user_agent:         'user-agent',
+      session_id:         'session-id',
+      performed_by_type:  'model',
+      performed_by_id:    'id',
+      metadata:           {random: 'stuff'},
+      timestamp:          Time.now
     }
     
     # TODO: timestamp:  @attrs[:timestamp].iso8601(3),
@@ -24,13 +24,22 @@ class EventTest < ActiveSupport::TestCase
       create(:property)
     end
     
+    eid = nil
     assert_requested(:post, "http://activehistory.com/events", times: 1) do |req|
       req_data = JSON.parse(req.body)
       data.each do |k, v|
         assert_equal v.is_a?(Time) ? v.utc.iso8601(3) : v.as_json, req_data[k.to_s]
       end
       
-      assert_equal 2, req_data['actions'].size
+      eid = req_data['id']
+      assert_equal 1, req_data['actions'].size
+    end
+    
+    assert_requested(:post, "http://activehistory.com/actions", times: 1) do |req|
+      req_data = JSON.parse(req.body)
+      
+      assert_equal 1, req_data['actions'].size
+      assert_equal eid, req_data['actions'].first['event_id']
     end
   end
   
@@ -56,4 +65,21 @@ class EventTest < ActiveSupport::TestCase
     assert_not_requested :any, /^http:\/\/activehistory.com\/.*/
   end
   
+  test 'Appending actions to an existing event' do
+    property = nil
+    ActiveHistory.encapsulate(id: "ddb666bd-73c8-4952-ab07-3a45e88f701b") {
+      property = create(:property)
+    }
+
+    assert_requested(:post, "http://activehistory.com/actions", times: 1) do |req|
+      req_data = JSON.parse(req.body)
+      
+      assert_equal 1, req_data['actions'].size
+      req_data['actions'][0]['diff'].each do |k, v|
+        assert_equal property.send(k).is_a?(Time) ? property.send(k).utc.iso8601(3) : property.send(k).as_json, v[1]
+      end
+    end
+
+  end
+  
 end

data/test/active_record_adapter/save_test.rb

@@ -14,14 +14,12 @@ class SaveTest < ActiveSupport::TestCase
     @property.name = 'Empire State Building'
     travel_to(@time) { @property.save }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 1, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do
+      assert_action_for @property, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         diff: {
           name: ['unkown', 'Empire State Building']
         }
@@ -37,14 +35,12 @@ class SaveTest < ActiveSupport::TestCase
     @comment.body = 'new body'
     travel_to(@time) { @comment.save }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 1, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do
+      assert_action_for @comment, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "Comment/#{@comment.id}",
+        subject_type: "Comment",
+        subject_id: @comment.id,
         diff: {
           body: ['body', 'new body']
         }

data/test/activehistory_test.rb

@@ -0,0 +1,96 @@
+require 'test_helper'
+
+class ActiveHistoryTest < ActiveSupport::TestCase
+
+  def setup
+    super
+    @time = (Time.now.utc + 2).change(usec: 0)
+  end
+
+  test '::encapsulate(EVENT_ID) appends action to EVENT_ID'
+
+  test '::encapsulate(event) appends actions to the given event' do
+    @property = create(:property, name: 'unkown')
+    WebMock::RequestRegistry.instance.reset!
+
+    event = ActiveHistory::Event.create!
+
+    ActiveHistory.encapsulate(event) do
+      @property.name = 'Empire State Building'
+      travel_to(@time) { @property.save }
+    end
+
+    assert_posted('/actions') do |req|
+      assert_action_for @property, {
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        event_id: event.id,
+        subject_type: 'Property',
+        subject_id: @property.id,
+        diff: { name: ['unkown', 'Empire State Building'] }
+      }.as_json
+    end
+
+    WebMock::RequestRegistry.instance.reset!
+
+    ActiveHistory.encapsulate(event) do
+      @property.name = 'Empire State'
+      travel_to(@time) { @property.save }
+    end
+
+    assert_posted('/actions') do |req|
+      assert_action_for @property, {
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        event_id: event.id,
+        subject_type: 'Property',
+        subject_id: @property.id,
+        diff: { name: ['Empire State Building', 'Empire State'] }
+      }.as_json
+    end
+
+  end
+
+  test '::encapsulate' do
+    @property = create(:property, name: 'unkown')
+    WebMock::RequestRegistry.instance.reset!
+
+    ActiveHistory.encapsulate do
+      @property.name = 'Empire State Building'
+      travel_to(@time) { @property.save }
+
+      eid = nil
+      assert_posted("/events") do
+        eid = @req['id']
+        assert_action_for @property, {
+          timestamp: @time.iso8601(3),
+          type: 'update',
+          subject_type: "Property",
+          subject_id: @property.id,
+          diff: {
+            name: ['unkown', 'Empire State Building']
+          }
+        }.as_json
+      end
+
+      WebMock::RequestRegistry.instance.reset!
+      @property.name = "Crysler Building"
+      travel_to(@time + 1) { @property.save }
+      
+      assert_posted("/actions") do
+        assert_action_for @property, {
+          event_id: eid,
+          timestamp: (@time + 1).iso8601(3),
+          type: 'update',
+          subject_type: "Property",
+          subject_id: @property.id,
+          diff: {
+            name: ['Empire State Building', 'Crysler Building']
+          }
+        }.as_json
+      end
+      
+    end
+  end
+  
+end

data/test/models.rb

@@ -12,7 +12,7 @@ class EmailAddress < ActiveRecord::Base
   
   track
   
-  belongs_to :account
+  belongs_to :account, inverse_of: :email_address
   
 end
 

data/test/test_helper.rb

@@ -41,7 +41,18 @@ class ActiveSupport::TestCase
   end
   
   def assert_posted(path, &block)
-    assert_requested(:post, "#{ActiveHistory.url}#{path}", times: 1, &block)
+    assert_requested(:post, "#{ActiveHistory.url}#{path}", times: 1) do |req|
+      @req = JSON.parse(req.body)
+      block.call @req
+    end
+  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
+    end
+
+    assert_equal(expected.as_json, action)
   end
   
   def assert_not_posted(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activehistory
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -220,6 +220,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 5.0.0.1
+- !ruby/object:Gem::Dependency
+  name: globalid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.7
 description: |
   ActiveHistory tracks and logs changes to your ActiveRecord models and
   relationships for auditing in the future.
@@ -252,6 +266,7 @@ files:
 - test/active_record_adapter/destroy_test.rb
 - test/active_record_adapter/event_test.rb
 - test/active_record_adapter/save_test.rb
+- test/activehistory_test.rb
 - test/factories.rb
 - test/models.rb
 - test/schema.rb