preact 0.6.5 → 0.7.0

data/lib/preact.rb

@@ -5,6 +5,8 @@ require 'preact/objects/api_object'
 require 'preact/objects/person'
 require 'preact/objects/event'
 require 'preact/objects/action_event'
+require 'preact/objects/action_link'
+require 'preact/objects/account_event'
 require 'preact/objects/message'
 require 'preact/objects/account'
 
@@ -73,6 +75,38 @@ module Preact
       
       send_log(person.as_json, preact_event.as_json)
     end
+
+    def log_account_event(event, account)
+      # Don't send requests when disabled
+      if configuration.disabled?
+        logger.info "[Preact] Logging is disabled, not logging event"
+        return nil
+      elsif account.nil?
+        logger.error "[Preact] No account specified, not logging event"
+        return nil
+      elsif event.nil?
+        logger.error "[Preact] No event specified, not logging event"
+        return nil
+      end
+
+      if event.is_a?(String)
+        preact_event = AccountEvent.new({
+            :name => event,
+            :timestamp => Time.now.to_f
+          })
+      elsif event.is_a?(Hash)
+        preact_event = AccountEvent.new(event)
+      elsif event.is_a?(AccountEvent)
+        preact_event = event
+      else
+        raise StandardError.new "Unknown event class, must pass a string event name, event hash or AccountEvent object"
+      end
+
+      # attach the account info to the event
+      preact_event.account = configuration.convert_to_account(account).as_json
+      
+      send_log(nil, preact_event.as_json)
+    end
       
     def update_person(user)
       # Don't send requests when disabled

data/lib/preact/objects/account_event.rb

@@ -0,0 +1,12 @@
+module Preact
+	class AccountEvent < Event
+
+    def as_json(options={})
+      super(options).merge({
+        :klass => "accountevent"
+      })
+    end
+
+	end
+
+end

data/lib/preact/objects/action_event.rb

@@ -1,35 +1,5 @@
 module Preact
 	class ActionEvent < Event
 
-    attr_accessor :note, :links, :external_identifier, :extras
-
-    def add_link(name, href)
-      self.links ||= []
-      self.links << ActionLink.new({ :name => name, :href => href })
-    end
-
-    def as_json(options={})
-      super(options).merge({
-        :klass => "actionevent",
-        :note => self.note,
-        :external_identifier => self.external_identifier,
-        :extras => self.extras,
-        :links => self.links.nil? ? nil : self.links.as_json
-      })
-    end
-
-	end
-
-	class ActionLink < ApiObject
-
-		attr_accessor :name, :href
-    
-    def as_json
-      {
-        :name => self.name,
-        :href => self.href
-      }
-    end
-
 	end
 end

data/lib/preact/objects/action_link.rb

@@ -0,0 +1,14 @@
+module Preact
+	class ActionLink < ApiObject
+
+		attr_accessor :name, :href
+
+		def as_json
+		  {
+		    :name => self.name,
+		    :href => self.href
+		  }
+		end
+
+	end
+end

data/lib/preact/objects/event.rb

@@ -2,12 +2,25 @@ class Preact::Event < Preact::ApiObject
   
   attr_accessor :name, :timestamp, :account
 
+  attr_accessor :note, :links, :external_identifier, :extras
+
+  def add_link(name, href)
+    self.links ||= []
+    self.links << ActionLink.new({ :name => name, :href => href })
+  end
+
   def as_json(options={})
     {
+      :klass     => "actionevent",
       :name      => self.name,
       :timestamp => self.timestamp,
       :account   => self.account,
-      :source    => Preact.configuration.user_agent # version of this logging library
+      :source    => Preact.configuration.user_agent, # version of this logging library
+
+      :note      => self.note,
+      :external_identifier => self.external_identifier,
+      :extras    => self.extras,
+      :links     => self.links.nil? ? nil : self.links.as_json
     }
   end
 

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: preact
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -119,7 +119,9 @@ files:
 - lib/preact/client.rb
 - lib/preact/configuration.rb
 - lib/preact/objects/account.rb
+- lib/preact/objects/account_event.rb
 - lib/preact/objects/action_event.rb
+- lib/preact/objects/action_link.rb
 - lib/preact/objects/api_object.rb
 - lib/preact/objects/event.rb
 - lib/preact/objects/message.rb