activehistory 0.1 → 0.2

data/test/active_record_adapter/association_test/has_many_association_test.rb

@@ -10,72 +10,211 @@ class HasManyAssociationTest < ActiveSupport::TestCase
   test '::create with has_many association' do
     @property = create(:property)
     WebMock::RequestRegistry.instance.reset!
-    
+
     @photo = travel_to(@time) { create(:photo, property: @property) }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do
+      assert_action_for @photo, {
         diff: {
           id: [nil, @photo.id],
           property_id: [nil, @property.id],
           format: [nil, @photo.format]
         },
-        subject: "Photo/#{@photo.id}",
+        subject_type: "Photo",
+        subject_id: @photo.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @property, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         diff: {
           photo_ids: [[], [@photo.id]]
         }
-      }.as_json
+      }
     end
   end
-  
+
   test '::update with has_many association' do
     @property = create(:property)
     @photo = create(:photo, property: @property)
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @photo.update(property: nil) }
-    
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+
+    assert_posted("/events") do
+      assert_action_for @photo, {
         diff: {
           property_id: [@property.id, nil]
         },
-        subject: "Photo/#{@photo.id}",
+        subject_type: "Photo",
+        subject_id: @photo.id,
         timestamp: @time.iso8601(3),
         type: 'update'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @property, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         diff: {
           photo_ids: [[@photo.id], []]
         }
-      }.as_json
+      }
     end
   end
 
   test 'has_many <<'
   test 'has_many.delete'
   test 'has_many.destroy'
-  test 'has_many='
-  test 'has_many_ids='
-  test 'has_many.clear'
+  
+  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, {
+        diff: { property_id: [nil, @property.id] },
+        subject_type: "Photo",
+        subject_id: @photo1.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+
+      assert_action_for @property, {
+        diff: { photo_ids: [[], [@photo1.id]] },
+        subject_type: "Property",
+        subject_id: @property.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+    end
+    
+    WebMock::RequestRegistry.instance.reset!
+    travel_to(@time) { @property.photos = [@photo2] }
+    assert_posted("/events") do      
+      assert_action_for @photo2, {
+        diff: { property_id: [nil, @property.id] },
+        subject_type: "Photo",
+        subject_id: @photo2.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @property, {
+        diff: { photo_ids: [[@photo1.id], [@photo2.id]] },
+        subject_type: "Property",
+        subject_id: @property.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @photo1, {
+        diff: { property_id: [@property.id, nil] },
+        subject_type: "Photo",
+        subject_id: @photo1.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+    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, {
+        diff: { photo_ids: [[], [@photo1.id]] },
+        subject_type: "Property",
+        subject_id: @property.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @photo1, {
+        diff: { property_id: [nil, @property.id] },
+        subject_type: "Photo",
+        subject_id: @photo1.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+    end
+    
+    WebMock::RequestRegistry.instance.reset!
+    travel_to(@time) { @property.photo_ids = [@photo2].map(&:id) }
+    assert_posted("/events") do      
+      assert_action_for @photo2, {
+        diff: { property_id: [nil, @property.id] },
+        subject_type: "Photo",
+        subject_id: @photo2.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @property, {
+        diff: { photo_ids: [[@photo1.id], [@photo2.id]] },
+        subject_type: "Property",
+        subject_id: @property.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @photo1, {
+        diff: { property_id: [@property.id, nil] },
+        subject_type: "Photo",
+        subject_id: @photo1.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+    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",
+        subject_id: @property.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @photo1, {
+        diff: { property_id: [@property.id, nil] },
+        subject_type: "Photo",
+        subject_id: @photo1.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+      
+      assert_action_for @photo2, {
+        diff: { property_id: [@property.id, nil] },
+        subject_type: "Photo",
+        subject_id: @photo2.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+    end
+  end
+  
   test 'has_many.create'
    
 end

data/test/active_record_adapter/association_test/has_one_association_test.rb

@@ -13,30 +13,29 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     
     @account = travel_to(@time) { create(:account, email_address: @email_address) }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do      
+      assert_action_for @account, {
         diff: {
           id: [nil, @account.id],
           name: [nil, @account.name],
           photos_count: [nil, 0],
           email_address_id: [nil, @email_address.id]
         },
-        subject: "Account/#{@account.id}",
+        subject_type: "Account",
+        subject_id: @account.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @email_address, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "EmailAddress/#{@email_address.id}",
+        subject_type: "EmailAddress",
+        subject_id: @email_address.id,
         diff: {
           account_id: [nil, @account.id]
         }
-      }.as_json
+      }
     end
   end
     
@@ -46,61 +45,59 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     
     @email_address = travel_to(@time) { create(:email_address, account: @account) }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do      
+      assert_action_for @email_address, {
         diff: {
           id: [nil, @email_address.id],
           address: [nil, @email_address.address],
           account_id: [nil, @account.id]
         },
-        subject: "EmailAddress/#{@email_address.id}",
+        subject_type: "EmailAddress",
+        subject_id: @email_address.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @account, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "Account/#{@account.id}",
+        subject_type: "Account",
+        subject_id: @account.id,
         diff: {
           email_address_id: [nil, @email_address.id]
         }
-      }.as_json
+      }
     end
   end
   
   test '::create with has_one association 2' do
     @account = travel_to(@time) { create(:account, email_address: build(:email_address)) }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do      
+      assert_action_for @account, {
         diff: {
           id: [nil, @account.id],
           name: [nil, @account.name],
           photos_count: [nil, 0],
           email_address_id: [nil, @account.email_address.id]
         },
-        subject: "Account/#{@account.id}",
+        subject_type: "Account",
+        subject_id: @account.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @account.email_address, {
         timestamp: @time.iso8601(3),
         type: 'create',
-        subject: "EmailAddress/#{@account.email_address.id}",
+        subject_type: "EmailAddress",
+        subject_id: @account.email_address.id,
         diff: {
           id: [nil, @account.email_address.id],
           address: [nil, @account.email_address.address],
           account_id: [nil, @account.id]
         }
-      }.as_json
+      }
     end
   end
   
@@ -111,27 +108,26 @@ class HasOneAssociationTest < ActiveSupport::TestCase
     @email_address = @account.email_address
     travel_to(@time) { @account.update(email_address: nil) }
     
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-      
-      assert_equal req_data['actions'][0], {
+    assert_posted("/events") do
+      assert_action_for @email_address, {
         diff: {
           account_id: [@account.id, nil]
         },
-        subject: "EmailAddress/#{@email_address.id}",
+        subject_type: "EmailAddress",
+        subject_id: @email_address.id,
         timestamp: @time.iso8601(3),
         type: 'update'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @account, {
         timestamp: @time.iso8601(3),
         type: 'update',
-        subject: "Account/#{@account.id}",
+        subject_type: "Account",
+        subject_id: @account.id,
         diff: {
           email_address_id: [@email_address.id, nil]
         }
-      }.as_json
+      }
     end
   end
 

data/test/active_record_adapter/create_test.rb

@@ -10,11 +10,8 @@ class CreateTest < ActiveSupport::TestCase
   test '::create creates an Action' do
     @property = travel_to(@time) { create(:property) }
     
-    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, {
         diff: {
           id: [nil, @property.id],
           name: [nil, @property.name],
@@ -25,30 +22,29 @@ class CreateTest < ActiveSupport::TestCase
           active: [nil, @property.active],
           created_at: [nil, @property.created_at]
         },
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
     end
   end
   
   test "::create creates an Action without :excluded attributes" do
     @comment = travel_to(@time) { create(:comment) }
     
-    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, {
         diff: {
           id: [nil, @comment.id],
           # No Title
           body: [nil, @comment.body]
         },
-        subject: "Comment/#{@comment.id}",
+        subject_type: "Comment",
+        subject_id: @comment.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
     end
   end
   

data/test/active_record_adapter/destroy_test.rb

@@ -13,14 +13,12 @@ class DestroyTest < ActiveSupport::TestCase
     
     travel_to(@time) { @property.destroy }
     
-    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: 'destroy',
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         diff: {
           id: [@property.id, nil],
           name: [@property.name, nil],