oeh-client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 387ba081ef8853fc009d375625937d086de71905
-  data.tar.gz: 2306b95911d221c4b377c0c3547de92d2f6cba78
+  metadata.gz: 523096f4e6ed912ba9438ae57ee5db4c5436a107
+  data.tar.gz: 0acd9dd22c8d6a825ff85f337425d9862e80a0b8
 SHA512:
-  metadata.gz: 704963a6de39b8b22fe7715aece3ad147b175329dac4bb45a079274d2c1bf32756653b9992453cfc165a652d83a0a9e058247207dcbf804deb6799166b02b231
-  data.tar.gz: 518ae34e6924ffca0d244b79961d7566123b31e71713ec2fe6b443c6eb3617947f908f7179be236fe8149f9a2d5f9de56c29feec85a4abf73ccb5ac76e67cb02
+  metadata.gz: 7c095dfd4864698e800cd3caa046c0069836b44928a57e60e73e9f8cde139c85867244585681f8ae329fd5f1b3651da17246711f8769d467eb87b82eafe73594
+  data.tar.gz: 0226d6c29edbe1e84e3fcda936f1ccac0aae561ae1074d9c77a117ebd6a7bad28d451301bca55a487fd435be084b58b4860c60ad3d06c319d04700bb456af9f5

data/lib/oehclient/helper.rb

@@ -13,6 +13,9 @@ module OEHClient
 			API_URI_PART 			= "/rt/api"
 			API_VERSION 			= "/2.0"
 
+			POST_METHOD				= "post"
+			PUT_METHOD				= "put"
+
 			# request_url builds the target request URL with the passed parameters, URL encoding the parameters
 			#  as necessary to create a valid request
 			def self.format_url(url, params)
@@ -60,6 +63,23 @@ module OEHClient
 
 		end # module Response
 
+
+		module Timestamp
+
+			# convert the time value from a Time, DateTime, String, or Integer to a proper ONE timestamp value
+			# format (UTC Milliseconds)
+			def self.to_one_timestamp(timevalue)
+
+				one_timestamp = timevalue												if (timevalue.is_a?(Integer))
+				one_timestamp = timevalue.utc.strftime("%s%L").to_i 					if (timevalue.is_a?(Time) || timevalue.is_a?(DateTime))
+				one_timestamp = Time.parse(timevalue).utc.strftime("%s%L").to_i 		if (timevalue.is_a?(String))
+
+				one_timestamp
+
+			end
+
+		end
+
 	end
 
 end

data/lib/oehclient/interaction/interaction.rb

@@ -51,9 +51,9 @@ class OEHClient::Interaction::Interaction
 						 }
 
 			# conditionally merge the rest of the attributes if they are passed
-			attributes.merge!(:timestamp => timestamp)		unless (timestamp.nil?)
-			attributes.merge!(:tid => tid)					if (!tid.nil? && !tid.empty?)
-			attributes.merge!(:ck => customer_key)			if (!customer_key.nil? && !customer_key.empty?)
+			attributes.merge!(:timestamp => OEHClient::Helper::Timestamp.to_one_timestamp(timestamp))		unless(timestamp.blank?)
+			attributes.merge!(:tid => tid)																	unless(timestamp.blank?)
+			attributes.merge!(:ck => customer_key)															unless(customer_key.blank?)
 
 
 			# create a new interaction using all attributes pass
@@ -96,13 +96,13 @@ class OEHClient::Interaction::Interaction
 		# set the instance attributes is the parameter hash is created
 		if (!attributes.nil? && attributes.kind_of?(Hash))
 
-			@uri 			= attributes[:uri] 			if (attributes.has_key?(:uri))
-			@customer_key 	= attributes[:ck] 			if (attributes.has_key?(:ck))
-			@tid 			= attributes[:tid] 			if (attributes.has_key?(:tid))
-			@session 		= attributes[:session]		if (attributes.has_key?(:session))
-			@timestamp 		= attributes[:timestamp] 	if (attributes.has_key?(:timestamp))
+			@uri 			= attributes[:uri] 															if (attributes.has_key?(:uri))
+			@customer_key 	= attributes[:ck] 															if (attributes.has_key?(:ck))
+			@tid 			= attributes[:tid] 															if (attributes.has_key?(:tid))
+			@session 		= attributes[:session]														if (attributes.has_key?(:session))
+			@timestamp 		= OEHClient::Helper::Timestamp.to_one_timestamp(attributes[:timestamp]) 	if (attributes.has_key?(:timestamp))
 
-			@space 			= OEHClient::Config::SpaceManager.instance.get(attributes[:sk])		if (attributes.has_key?(:sk))
+			@space 			= OEHClient::Config::SpaceManager.instance.get(attributes[:sk])				if (attributes.has_key?(:sk))
 
 		end
 
@@ -115,7 +115,7 @@ class OEHClient::Interaction::Interaction
 		raise OEHClient::Exception::MissingParameterException.new(missing_minimal_parameters) 	unless (minimal_parameters?)
 
 		# call the appropriate method based on the existance of the timestamp value
-		((!@timestamp.nil?) ? send_offline(@space.token) : send_realtime(@space.token, parameters))
+		((!@timestamp.nil?) ? send_offline(@space.token, parameters) : send_realtime(@space.token, parameters))
 
 		# return the current instance interacton
 		self
@@ -140,7 +140,7 @@ class OEHClient::Interaction::Interaction
 														:tid => @tid,
 														:session => @session,
 														:sk => @space.site_key,
-														:timestamp => timestamp
+														:timestamp => OEHClient::Helper::Timestamp.to_one_timestamp(timestamp)
 													})
 
 		# Send the interaction for processing and return the current instance
@@ -157,10 +157,13 @@ class OEHClient::Interaction::Interaction
 		properties ||= Hash.new
 
 		# Call the PUT method to update the 
-		OEHClient::Helper::Response.handle(OEHClient.put(@space.token(), 
-														OEHClient::Helper::Request.format_url(realtime_url, {:sk => @space.site_key}),
-														nil,
-														request_data(properties))) unless properties.empty?
+		#OEHClient::Helper::Response.handle(OEHClient.put(@space.token(), 
+		#												OEHClient::Helper::Request.format_url(realtime_url, {:sk => @space.site_key}),
+		#												nil,
+		#												request_data(properties))) unless properties.empty?
+
+		send_request(OEHClient::Helper::Request::PUT_METHOD, @space.token(), realtime_url, properties) unless properties.empty?
+
 		# return the current object
 		self
 	end
@@ -171,28 +174,33 @@ class OEHClient::Interaction::Interaction
 
 	# send_realtime posts a new interaction occuring at the moment (in realtime).  The response attributes
 	#  are mapped to the current instance attributes for all valid requests
-	def send_realtime(token, parameters={})
-
-		response = OEHClient::Helper::Response.handle(OEHClient.post(token, 
-																	OEHClient::Helper::Request.format_url(realtime_url, {:sk => @space.site_key}),
-																	nil,
-																	request_data(parameters))
-													)
-
+	def send_realtime(token, properties={})
+		# POST the realtime interaction method
+		response = send_request(OEHClient::Helper::Request::POST_METHOD, token, realtime_url, properties)
+		# map the response message to the current instance attributes
 		map_response(response)
-
-
 	end
 
 	# send_offline posts a historic interaction, using a specified timestamp
-	def send_offline(token)
-
-		response = OEHClient::Helper::Response.handle(OEHClient.put(token,
-																	OEHClient::Helper::Request.format_url(offline_url, {:sk => @space.site_key}),
-																	nil,
-																	request_data))
+	def send_offline(token, properties={})
+		# PUT the offline interaction method
+		response = send_request(OEHClient::Helper::Request::PUT_METHOD, token, offline_url, properties)	
+		# map the response message to the current instance attributes
 		map_response(response)
+	end
 
+	# send_request acts as the wrapper to send all client requests to the ONE server in a unified manner
+	def send_request(method, token, url, properties={})
+		# set the URL parameters for the site_key and the tid, of the value exists
+		url_parameters = {:sk => @space.site_key}		
+		url_parameters.merge!({:tid => @tid})			unless (@tid.blank?)
+		# send the POST or PUT methond along with the arguments to the OEHClient class
+		OEHClient::Helper::Response.handle(OEHClient.send(method.downcase.to_sym, 
+															token,
+															OEHClient::Helper::Request.format_url(url, url_parameters),
+															nil,
+															request_data(properties)
+														))
 
 	end
 
@@ -278,7 +286,6 @@ class OEHClient::Interaction::Interaction
 		parameters.merge!({ONE_PARAM_URI => @uri}) 			if (!@uri.nil? && @uri.length > 0)
 
 		parameters.merge!({ONE_PARAM_CK => @customer_key}) 	if (!@customer_key.nil? && @customer_key.length > 0)
-		parameters.merge!({ONE_PARAM_TID => @tid}) 			if (!@tid.nil? && @tid.length > 0)
 
 		parameters.merge!({ONE_PARAM_SESSION => @session}) 	if (!@session.nil? && @session.length > 0)
 		parameters.merge!({ONE_PARAM_TS => @timestamp}) 	if (!@timestamp.nil?)

data/lib/oehclient/version.rb

@@ -1,3 +1,3 @@
 module OEHClient
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oeh-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Jason Balliet
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -155,7 +155,6 @@ files:
 - lib/oehclient/interaction/interaction.rb
 - lib/oehclient/interaction/optimization.rb
 - lib/oehclient/version.rb
-- oeh-client-0.1.0.gem
 - oeh-client.gemspec
 homepage: https://rubygems.org/gems/oeh-client
 licenses: