activehistory 0.1 → 0.2

data/lib/activehistory/connection.rb

@@ -8,19 +8,16 @@ class ActiveHistory::Connection
   def initialize(config)
     if config[:url]
       uri = URI.parse(config.delete(:url))
-      config[:api_key] ||= (uri.user ? CGI.unescape(uri.user) : nil)
-      config[:host]    ||= uri.host
-      config[:port]    ||= uri.port
-      config[:ssl] ||= (uri.scheme == 'https')
+      config[:api_key]  ||= (uri.user ? CGI.unescape(uri.user) : nil)
+      config[:host]     ||= uri.host
+      config[:port]     ||= uri.port
+      config[:ssl]      ||= (uri.scheme == 'https')
     end
 
     [:api_key, :host, :port, :ssl, :user_agent].each do |key|
       self.instance_variable_set(:"@#{key}", config[key])
     end
 
-    @connection = Net::HTTP.new(host, port)
-    @connection.use_ssl = ssl
-
     true
   end
   
@@ -61,27 +58,18 @@ class ActiveHistory::Connection
     return_value = nil
     retry_count = 0
     begin
-      @connection.request(request) do |response|
-        if response['API-Version-Deprecated']
-          logger.warn("DEPRECATION WARNING: API v#{API_VERSION} is being phased out")
-        end
-
+      connection = Net::HTTP.new(host, port)
+      connection.use_ssl = ssl
+      connection.request(request) do |response|
         validate_response_code(response)
-
-        # Get the cookies
-        response.each_header do |key, value|
-          if key.downcase == 'set-cookie' && Thread.current[:sunstone_cookie_store]
-            Thread.current[:sunstone_cookie_store].set_cookie(request_uri, value)
-          end
-        end
-
+        
         if block_given?
-          return_value =yield(response)
+          return_value = yield(response)
         else
-          return_value =response
+          return_value = response
         end
       end
-    rescue ActiveRecord::ConnectionNotEstablished
+    rescue ActiveHistory::Exception::ServiceUnavailable
       retry_count += 1
       retry_count == 1 ? retry : raise
     end

data/lib/activehistory/event.rb

@@ -1,50 +1,104 @@
+require 'globalid'
+require 'securerandom'
+
+GlobalID::Locator.use :activehistory do |gid|
+  ActiveHistory::Event.new({ id: gid.model_id })
+end
+
 class ActiveHistory::Event
-  
-  attr_accessor :actions, :regards, :timestamp
+  include GlobalID::Identification
+
+  attr_accessor :id, :ip, :user_agent, :session_id, :metadata, :timestamp, :performed_by_id, :performed_by_type, :actions
   
   def initialize(attrs={})
-    @attrs = attrs
-    @attrs[:timestamp] ||= Time.now
-    @actions = []
-    @regards = []
+    attrs.each do |k,v|
+      self.send("#{k}=", v)
+    end
+
+    if id
+      @persisted = true
+    else
+      @persisted = false
+      @id ||= SecureRandom.uuid
+    end
+
+    @actions ||= []
+    @timestamp ||= Time.now
   end
   
+  def persisted?
+    @persisted
+  end
+
   def action!(action)
     action = ActiveHistory::Action.new(action)
     @actions << action
     action
   end
   
-  def action_for(id)
-    @actions.find { |a| a.subject == id }
+  def action_for(type, id, new_options=nil)
+    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 }
+    
+    if new_options
+      action || action!({ subject_type: type, subject_id: id, type: :update }.merge(new_options))
+    else
+      action
+    end
+  end
+
+  def self.create!(attrs={})
+    event = self.new(attrs)
+    event.save!
+    event
+  end
+    
+  def save!
+    persisted? ? _update : _create
   end
   
-  def regard!(regard)
-    @regards << regard
+  def _update
+    return if actions.empty?
+    ActiveHistory.connection.post('/actions', {
+      actions: actions.as_json.map{|json| json[:event_id] = id; json}
+    })
+    @actions = []
   end
   
-  def save!
-    return if @actions.empty?
-    
+  def _create
     ActiveHistory.connection.post('/events', self.as_json)
+    @actions = []
+    @persisted = true
   end
-  
+
   def as_json
     {
-      ip:         @attrs[:ip],
-      user_agent: @attrs[:user_agent],
-      session_id: @attrs[:session_id],
-      account:    @attrs[:account],
-      api_key:    @attrs[:api_key],
-      metadata:   @attrs[:metadata],
-      timestamp:  @attrs[:timestamp].utc.iso8601(3),
-      actions:    @actions.map(&:as_json),
-      regards:    @regards.map(&: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
     }
   end
+
+  def to_gid_param(options={})
+    to_global_id(options).to_param
+  end
+
+  def to_global_id(options={})
+    @global_id ||= GlobalID.create(self, { app: :activehistory }.merge(options))
+  end
+  
+  def to_sgid_param(options={})
+    to_signed_global_id(options).to_param
+  end
   
-  def encapsulate
-  ensure
+  def to_signed_global_id(options={})
+     SignedGlobalID.create(self, { app: :activehistory }.merge(options))
   end
 
 end

data/lib/activehistory/version.rb

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

data/test/active_record_adapter/association_test/belongs_to_association_test.rb

@@ -13,70 +13,78 @@ class BelongsToAssociationTest < ActiveSupport::TestCase
     
     @target = travel_to(@time) { create(:photo, account: @model) }
 
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
-
-      assert_equal 'update',   req_data['actions'][1]['type']
-      assert_equal "Account/#{@model.id}",  req_data['actions'][1]['subject']
-      assert_equal [[], [@target.id]], req_data['actions'][1]['diff']['photo_ids']
+    assert_posted("/events") do
+      assert_action_for @model, {
+        diff: { photo_ids: [[], [@target.id]] },
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Account",
+        subject_id: @model.id,
+      }
     end
   end
-  
+
   test 'TargetModel.update removes from association' do
     @model = create(:account)
     @target = create(:photo, account: @model)
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @target.update(account: nil) }
-    
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
 
-      assert_equal 'update',   req_data['actions'][1]['type']
-      assert_equal "Account/#{@model.id}",  req_data['actions'][1]['subject']
-      assert_equal [[@target.id], []], req_data['actions'][1]['diff']['photo_ids']
+    assert_posted("/events") do
+      assert_action_for @model, {
+        diff: { photo_ids: [[@target.id], []] },
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Account",
+        subject_id: @model.id,
+      }
     end
   end
-  
+
   test 'TargetModel.update changes association' do
     @model1 = create(:account)
     @model2 = create(:account)
     @target = create(:photo, account: @model1)
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @target.update(account: @model2) }
-    
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 3, req_data['actions'].size
 
-      assert_equal 'update',   req_data['actions'][1]['type']
-      assert_equal "Account/#{@model1.id}",  req_data['actions'][1]['subject']
-      assert_equal [[@target.id], []], req_data['actions'][1]['diff']['photo_ids']
+    assert_posted("/events") do
+      assert_action_for @model1, {
+        diff: { photo_ids: [[@target.id], []] },
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Account",
+        subject_id: @model1.id,
+      }
       
-      assert_equal 'update',   req_data['actions'][2]['type']
-      assert_equal "Account/#{@model2.id}",  req_data['actions'][2]['subject']
-      assert_equal [[], [@target.id]], req_data['actions'][2]['diff']['photo_ids']
+      assert_action_for @model2, {
+        diff: { photo_ids: [[], [@target.id]] },
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Account",
+        subject_id: @model2.id,
+      }
     end
   end
-  
+
   test 'TargetModel.destroy removes from association' do
     @model = create(:account)
     @target = create(:photo, account: @model)
     WebMock::RequestRegistry.instance.reset!
-    
+
     travel_to(@time) { @target.destroy }
-    
-    assert_posted("/events") do |req|
-      req_data = JSON.parse(req.body)
-      assert_equal 2, req_data['actions'].size
 
-      assert_equal 'update',   req_data['actions'][1]['type']
-      assert_equal "Account/#{@model.id}",  req_data['actions'][1]['subject']
-      assert_equal [[@target.id], []], req_data['actions'][1]['diff']['photo_ids']
+    assert_posted("/events") do
+      assert_action_for @model, {
+        diff: { photo_ids: [[@target.id], []] },
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Account",
+        subject_id: @model.id,
+      }
     end
   end
-  
+
 end

data/test/active_record_adapter/association_test/has_and_belongs_to_many_test.rb

@@ -12,57 +12,54 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
     WebMock::RequestRegistry.instance.reset!
 
     @region = travel_to(@time) { create(:region, properties: [@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 @region, {
         diff: {
           id: [nil, @region.id],
           name: [nil, @region.name],
           property_ids: [[], [@property.id]]
         },
-        subject: "Region/#{@region.id}",
+        subject_type: "Region",
+        subject_id: @region.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: {
           region_ids: [[], [@region.id]]
         }
-      }.as_json
+      }
     end
   end
 
   test '::create with new has_and_belongs_to_many association' do
-    WebMock::RequestRegistry.instance.reset!
-
     @region = travel_to(@time) { create(:region, properties: [build(:property)]) }
     @property = @region.properties.first
 
-    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 @region, {
         diff: {
           id: [nil, @region.id],
           name: [nil, @region.name],
           property_ids: [[], [@property.id]]
         },
-        subject: "Region/#{@region.id}",
+        subject_type: "Region",
+        subject_id: @region.id,
         timestamp: @time.iso8601(3),
         type: 'create'
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @property, {
         timestamp: @time.iso8601(3),
         type: 'create',
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         diff: {
           id: [nil, @property.id],
           name: [nil, @property.name],
@@ -74,7 +71,7 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
           active: [nil, @property.active],
           region_ids: [[], [@region.id]]
         }
-      }.as_json
+      }
     end
   end
 
@@ -85,27 +82,26 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
 
     travel_to(@time) { @region.update(properties: [@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 @region, {
         diff: {
           property_ids: [[], [@property.id]]
         },
-        subject: "Region/#{@region.id}",
+        subject_type: "Region",
+        subject_id: @region.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: {
           region_ids: [[], [@region.id]]
         }
-      }.as_json
+      }
     end
   end
 
@@ -116,14 +112,12 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
     travel_to(@time) { @region.update(properties: [build(:property)]) }
     @property = @region.properties.first
     
-    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 @property, {
         timestamp: @time.iso8601(3),
         type: 'create',
-        subject: "Property/#{@property.id}",
+        subject_type: "Property",
+        subject_id: @property.id,
         diff: {
           id: [nil, @property.id],
           name: [nil, @property.name],
@@ -135,16 +129,17 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
           active: [nil, @property.active],
           region_ids: [[], [@region.id]]
         }
-      }.as_json
+      }
 
-      assert_equal req_data['actions'][1], {
+      assert_action_for @region, {
         diff: {
           property_ids: [[], [@property.id]]
         },
-        subject: "Region/#{@region.id}",
+        subject_type: "Region",
+        subject_id: @region.id,
         timestamp: @time.iso8601(3),
         type: 'update'
-      }.as_json
+      }
     end
   end
 
@@ -152,30 +147,70 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
     @property = create(:property)
     @region = create(:region, properties: [@property])
     WebMock::RequestRegistry.instance.reset!
-
+    
     travel_to(@time) { @region.update(properties: []) }
 
-    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 @region, {
         diff: {
           property_ids: [[@property.id], []]
         },
-        subject: "Region/#{@region.id}",
+        subject_type: "Region",
+        subject_id: @region.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: {
           region_ids: [[@region.id], []]
         }
-      }.as_json
+      }
+    end
+  end
+  
+  test '::update with replacing has_and_belongs_to_many association' do
+    @property1 = create(:property)
+    @property2 = create(:property)
+    @region = create(:region, properties: [@property1])
+    WebMock::RequestRegistry.instance.reset!
+    
+    travel_to(@time) { @region.update(properties: [@property2]) }
+
+    assert_posted("/events") do
+      assert_action_for @region, {
+        diff: {
+          property_ids: [[@property1.id], [@property2.id]]
+        },
+        subject_type: "Region",
+        subject_id: @region.id,
+        timestamp: @time.iso8601(3),
+        type: 'update'
+      }
+
+      assert_action_for @property1, {
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Property",
+        subject_id: @property1.id,
+        diff: {
+          region_ids: [[@region.id], []]
+        }
+      }
+
+      assert_action_for @property2, {
+        timestamp: @time.iso8601(3),
+        type: 'update',
+        subject_type: "Property",
+        subject_id: @property2.id,
+        diff: {
+          region_ids: [[], [@region.id]]
+        }
+      }
     end
   end
   
@@ -186,25 +221,24 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
     
     travel_to(@time) { @region.destroy }
 
-    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 @region, {
         diff: {
           id: [@region.id, nil],
           name: [@region.name, nil],
           property_ids: [[@property.id], []]
         },
-        subject: "Region/#{@region.id}",
+        subject_type: "Region",
+        subject_id: @region.id,
         timestamp: @time.iso8601(3),
         type: 'destroy'
       }.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: {
           region_ids: [[@region.id], []]
         }
@@ -212,7 +246,6 @@ class HasAndBelongsToManyAssociationTest < ActiveSupport::TestCase
     end
   end
 
-
   test 'has_and_belongs_to_many <<'
   test 'has_and_belongs_to_many.delete'
   test 'has_and_belongs_to_many.destroy'