Skip to content

fixing timestamp bug and removing user_info from track calls #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 10, 2015
Merged

fixing timestamp bug and removing user_info from track calls #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6874422
fixing timestamp bug and removing user_info from track calls
usmanity Aug 27, 2015
129fe93
updating to include parens for methods
usmanity Aug 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 18 additions & 27 deletions lib/outbound.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,51 +29,51 @@ module Defaults
}
end

def Outbound.init api_key, log_level=Logger::ERROR
def Outbound.init(api_key, log_level=Logger::ERROR)
@logger.level = log_level
@ob = Outbound::Client.new api_key, @logger
end

def Outbound.identify user_id, info={}
def Outbound.identify(user_id, info={})
if @ob == nil
res = Result.new Outbound::ERROR_INIT, false
@logger.error res.error
return res
end
return @ob.identify user_id, info
return @ob.identify(user_id, info)
end

def Outbound.track user_id, event, properties={}, user_info={}, timestamp
def Outbound.track(user_id, event, properties={}, timestamp=nil)
if @ob == nil
res = Result.new Outbound::ERROR_INIT, false
@logger.error res.error
return res
end
return @ob.track user_id, event, properties, user_info, timestamp
return @ob.track(user_id, event, properties, timestamp)
end

def Outbound.disable platform, user_id, token
def Outbound.disable(platform, user_id, token)
if @ob == nil
res = Result.new Outbound::ERROR_INIT, false
@logger.error res.error
return res
end
return @ob.disable platform, user_id, token
return @ob.disable(platform, user_id, token)
end

def Outbound.register platform, user_id, token
def Outbound.register(platform, user_id, token)
if @ob == nil
res = Result.new Outbound::ERROR_INIT, false
@logger.error res.error
return res
end
return @ob.register platform, user_id, token
return @ob.register(platform, user_id, token)
end

class Result
include Defaults

def initialize error, received_call
def initialize(error, received_call)
@error = error
@received_call = received_call
end
Expand Down Expand Up @@ -113,12 +113,12 @@ def platform_error?
class Client
include Defaults

def initialize api_key, logger
def initialize(api_key, logger)
@api_key = api_key
@logger = logger
end

def identify user_id, info={}
def identify(user_id, info={})
unless user_id.is_a? String or user_id.is_a? Numeric
res = Result.new Outbound::ERROR_USER_ID, false
@logger.error res.error
Expand All @@ -136,7 +136,7 @@ def identify user_id, info={}
return post(@api_key, '/identify', user_data)
end

def track user_id, event, properties={}, user_info={}, timestamp
def track(user_id, event, properties={}, user_info={}, timestamp)
unless user_id.is_a? String or user_id.is_a? Numeric
res = Result.new Outbound::ERROR_USER_ID, false
@logger.error res.error
Expand All @@ -151,15 +151,6 @@ def track user_id, event, properties={}, user_info={}, timestamp

data = {:user_id => user_id, :event => event}

begin
user = user(user_info)
if user.length > 0
data[:user] = user
end
rescue
@logger.error "Could not use user info (#{user_info}) and/or user attributes #{user_attributes} given to track call."
end

if properties.is_a? Hash
if properties.length > 0
data[:properties] = properties
Expand All @@ -168,7 +159,7 @@ def track user_id, event, properties={}, user_info={}, timestamp
@logger.error "Could not use event properties (#{properties}) given to track call."
end

unless timestamp == {}
unless timestamp == nil
data[:timestamp] = timestamp
else
data[:timestamp] = Time.now.to_i
Expand All @@ -177,7 +168,7 @@ def track user_id, event, properties={}, user_info={}, timestamp
return post(@api_key, '/track', data)
end

def disable platform, user_id, token
def disable(platform, user_id, token)
unless user_id.is_a? String or user_id.is_a? Numeric
res = Result.new Outbound::ERROR_USER_ID, false
@logger.error res.error
Expand All @@ -199,7 +190,7 @@ def disable platform, user_id, token
return post(@api_key, "/#{platform}/disable", {:token => token, :user_id => user_id})
end

def register platform, user_id, token
def register(platform, user_id, token)
unless user_id.is_a? String or user_id.is_a? Numeric
res = Result.new Outbound::ERROR_USER_ID, false
@logger.error res.error
Expand All @@ -223,7 +214,7 @@ def register platform, user_id, token

private

def post api_key, path, data
def post(api_key, path, data)
begin
headers = HEADERS
headers['X-Outbound-Key'] = api_key
Expand All @@ -249,7 +240,7 @@ def post api_key, path, data
return err, true
end

def user info={}
def user(info={})
unless info.is_a? Hash
raise
end
Expand Down