preact 0.6.1 → 0.6.2

data/lib/preact.rb

@@ -27,7 +27,7 @@ module Preact
       yield(configuration) if block_given?
       
       # Configure logger.  Default to use Rails
-      self.logger = Logger.new(STDOUT) # ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT))
+      self.logger ||= configuration.logger || (defined?(Rails) ? Rails.logger : Logger.new(STDOUT))
 
       raise StandardError.new "Must specify project code and secret when configuring the Preact api client" unless configuration.valid?
 
@@ -49,14 +49,12 @@ module Preact
         logger.error "[Preact] No event specified, not logging event"
         return nil
       end
- 
-      person = configuration.convert_to_person(user).as_json
 
       if event.is_a?(String)
         preact_event = ActionEvent.new({
             :name => event,
             :timestamp => Time.now.to_f
-          }).as_json
+          })
       elsif event.is_a?(Hash)
         preact_event = ActionEvent.new(event)
       elsif !event.is_a?(ActionEvent)
@@ -67,8 +65,10 @@ module Preact
         # attach the account info to the event
         preact_event.account = configuration.convert_to_account(account).as_json
       end
+
+      person = configuration.convert_to_person(user)
       
-      send_log(person, preact_event)
+      send_log(person.as_json, preact_event.as_json)
     end
       
     def update_person(user)

data/lib/preact/version.rb

@@ -1,3 +1,3 @@
 module Preact
-  VERSION = "0.6.1"
-end
+  VERSION = "0.6.2"
+end

data/readme.md

@@ -50,7 +50,8 @@ person = {
   :email => "gooley@foliohd.com",
   :uid => "gooley",
   :properties => {
-    :account_level => "Pro",
+    :subscription_level => 4,
+    :subscription_level_name => "Pro",
     :is_paying => true,
     :created_at => 1347060566
     :twitter => "gooley"
@@ -68,6 +69,7 @@ Preact.log_event(person, {
     :note => "black shoes", 
     :revenue => 2500, 
     :extras => {
+      :category => "shoes",
       :size => "13",
       :color => "blue"
     })
@@ -125,8 +127,8 @@ end
 Then, you just pass that model to the log_event method and we will associate the user's action with that account.
 
 ```ruby
-Preact.log_event(@current_user, 'restored_answer_data', @current_user.project) 
-Preact.log_event(@current_user, { :name => 'updated-profile', :extras => {:twitter => "@gooley"} }, @current_user.project)
+Preact.log_event(@current_user, 'restored_answer_data', @current_project) 
+Preact.log_event(@current_user, { :name => 'updated-profile', :extras => {:twitter => "@gooley"} }, @current_project)
 ```
 
 Sidekiq Integration
@@ -150,6 +152,6 @@ end
 ```
 
 
-Copyright (c) 2011-2013 Christopher Gooley, Preact. See LICENSE.txt for further details.
+Copyright (c) 2011-2013 Christopher Gooley, Preact / Less Neglect, Inc. See LICENSE.txt for further details.
 
 Thanks to [Zach Millman](https://github.com/zmillman) for many contributions.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: preact
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors: