oeh-client 1.1.0 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/oehclient/data/structure.rb +10 -4
- data/lib/oehclient/realtime/interaction.rb +19 -4
- data/lib/oehclient/version.rb +1 -1
- data/oeh-client.gemspec +6 -6
- metadata +22 -10
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 082a84c84c35ecaec94d4ac6974ca94f0dd1f04f
|
4
|
+
data.tar.gz: 53c6d28df03a9f7b274115bb1247f4068a684a25
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3e8b73e778aae60dfe73f52f677a1786397b8e9d606fdc6745726ef38dc31cc9e06ae8393b338184efc0728f6f08774fc026590d6817208ddd1776846c8287ea
|
7
|
+
data.tar.gz: da55bcabcca9343714a4080aec2ffa403f039dc6533d2999feb1fb1b73c7c9ee7c25a38f3c520f245da8daf2a5f7e40aa1dad99f8c3fa571cc8b87cbd31ee85c
|
@@ -22,10 +22,16 @@ class OEHClient::Data::Structure < OEHClient::Data::Node
|
|
22
22
|
# implementation expects a Hash that contains the Customer Key (:ck),
|
23
23
|
# Site Key (:sk), and API Name (:api) because they are required to get
|
24
24
|
# structure from OEH
|
25
|
-
if (parameters.has_key?(:ck) && parameters.has_key?(:sk) && parameters.has_key?(:api))
|
25
|
+
if ((parameters.has_key?(:ck) || parameters.has_key?(:tid)) && parameters.has_key?(:sk) && parameters.has_key?(:api))
|
26
26
|
|
27
|
-
|
28
|
-
|
27
|
+
oeh_params = {:sk => parameters[:sk]}
|
28
|
+
|
29
|
+
# set the values based on passed parameters
|
30
|
+
oeh_params.merge!({:ck => parameters[:ck]}) if (parameters.has_key?(:ck))
|
31
|
+
oeh_params.merge!({:keyname => parameters[:keyname]}) if (parameters.has_key?(:keyname))
|
32
|
+
oeh_params.merge!({:tid => parameters[:tid]}) if (parameters.has_key?(:tid))
|
33
|
+
|
34
|
+
# grab the API Name
|
29
35
|
api_name = parameters[:api]
|
30
36
|
|
31
37
|
# set the space based on the site key value that was passed
|
@@ -35,7 +41,7 @@ class OEHClient::Data::Structure < OEHClient::Data::Node
|
|
35
41
|
# of this class (OEHClient::Data::Structure) as the return value
|
36
42
|
response = OEHClient.get(self.request_url(api_name),
|
37
43
|
@space.oauth_consumer,
|
38
|
-
:params =>
|
44
|
+
:params => oeh_params)
|
39
45
|
# dynamically map the response object to a new OEHClient::Data::Structure class
|
40
46
|
OEHClient::Data::Structure.new(response[:body])
|
41
47
|
|
@@ -35,7 +35,8 @@ class OEHClient::Realtime::Interaction
|
|
35
35
|
attr_accessor :uri, # The full touchpoint/interaction URI used to post the interaction
|
36
36
|
:space, # The configured OEHClient::Config::Space object that represents the OEH workspace
|
37
37
|
|
38
|
-
:timestamp, # A millisecond value representing a Time value of the interaction
|
38
|
+
:timestamp, # A millisecond value representing a Time value of the interaction
|
39
|
+
:keyname, # The customer keyname to use based on multi-key configuration. Default is customerKey
|
39
40
|
:customer_key, # The customer to which this interaction is related
|
40
41
|
:tid, # The Thunderhead ID (TID) to which this interaction is related
|
41
42
|
:session, # The session id to which this interaction is related
|
@@ -66,7 +67,14 @@ class OEHClient::Realtime::Interaction
|
|
66
67
|
# conditionally merge the rest of the attributes if they are passed
|
67
68
|
attributes.merge!(:timestamp => OEHClient::Helper::Timestamp.to_one_timestamp(timestamp)) unless(timestamp.blank?)
|
68
69
|
attributes.merge!(:tid => tid) unless(timestamp.blank?)
|
69
|
-
|
70
|
+
|
71
|
+
if (customer_key.is_a?(Hash))
|
72
|
+
attributes.merge!(:ck => customer_key[:value]) if (customer_key.has_key?(:value))
|
73
|
+
attributes.merge!(:keyname => customer_key[:keyname]) if (customer_key.has_key?(:keyname))
|
74
|
+
else
|
75
|
+
attributes.merge!(:ck => customer_key) unless(customer_key.blank?)
|
76
|
+
end
|
77
|
+
|
70
78
|
|
71
79
|
|
72
80
|
# create a new interaction using all attributes pass
|
@@ -89,7 +97,13 @@ class OEHClient::Realtime::Interaction
|
|
89
97
|
|
90
98
|
# conditionally merge the rest of the attributes if they are passed
|
91
99
|
attributes.merge!(:tid => tid) if (!tid.nil? && !tid.empty?)
|
92
|
-
|
100
|
+
|
101
|
+
if (customer_key.is_a?(Hash))
|
102
|
+
attributes.merge!(:ck => customer_key[:value]) if (customer_key.has_key?(:value))
|
103
|
+
attributes.merge!(:keyname => customer_key[:keyname]) if (customer_key.has_key?(:keyname))
|
104
|
+
else
|
105
|
+
attributes.merge!(:ck => customer_key) unless(customer_key.blank?)
|
106
|
+
end
|
93
107
|
|
94
108
|
# create a new interaction using all parameters pass
|
95
109
|
new_interaction = OEHClient::Realtime::Interaction.new(attributes)
|
@@ -111,6 +125,7 @@ class OEHClient::Realtime::Interaction
|
|
111
125
|
if (!attributes.nil? && attributes.kind_of?(Hash))
|
112
126
|
|
113
127
|
@uri = attributes[:uri] if (attributes.has_key?(:uri))
|
128
|
+
@keyname = attributes[:keyname] if (attributes.has_key?(:keyname))
|
114
129
|
@customer_key = attributes[:ck] if (attributes.has_key?(:ck))
|
115
130
|
@tid = attributes[:tid] if (attributes.has_key?(:tid))
|
116
131
|
@session = attributes[:session] if (attributes.has_key?(:session))
|
@@ -314,7 +329,7 @@ class OEHClient::Realtime::Interaction
|
|
314
329
|
# the instance of the class
|
315
330
|
parameters.merge!({ONE_PARAM_URI => @uri}) if (!@uri.nil? && @uri.length > 0)
|
316
331
|
|
317
|
-
|
332
|
+
parameters.merge!({"customerKeyName" => @keyname}) if (!@keyname.nil? && @keyname.length > 0)
|
318
333
|
parameters.merge!({"customerKey" => @customer_key}) if (!@customer_key.nil? && @customer_key.length > 0)
|
319
334
|
|
320
335
|
|
data/lib/oehclient/version.rb
CHANGED
data/oeh-client.gemspec
CHANGED
@@ -31,11 +31,11 @@ Gem::Specification.new do |spec|
|
|
31
31
|
spec.add_development_dependency "rake", "~> 10.0"
|
32
32
|
spec.add_development_dependency "rspec-rails", "~> 3.2"
|
33
33
|
|
34
|
-
spec.add_dependency "oauth"
|
35
|
-
spec.add_dependency "json"
|
36
|
-
spec.add_dependency "uuidtools"
|
37
|
-
spec.add_dependency "activesupport", "~> 4.2.0
|
38
|
-
spec.add_dependency "railties", ">= 4.2.0
|
39
|
-
spec.add_dependency "rest-client"
|
34
|
+
spec.add_dependency "oauth", '~> 0'
|
35
|
+
spec.add_dependency "json", '~> 0'
|
36
|
+
spec.add_dependency "uuidtools", '~> 0'
|
37
|
+
spec.add_dependency "activesupport", "~> 4.2", '>= 4.2.0'
|
38
|
+
spec.add_dependency "railties", "~> 4.2", '>= 4.2.0'
|
39
|
+
spec.add_dependency "rest-client", '~> 0'
|
40
40
|
|
41
41
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: oeh-client
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version:
|
4
|
+
version: 2.0.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jason Balliet
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-12-07 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|
@@ -56,42 +56,42 @@ dependencies:
|
|
56
56
|
name: oauth
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- - "
|
59
|
+
- - "~>"
|
60
60
|
- !ruby/object:Gem::Version
|
61
61
|
version: '0'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
|
-
- - "
|
66
|
+
- - "~>"
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: json
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
|
-
- - "
|
73
|
+
- - "~>"
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '0'
|
76
76
|
type: :runtime
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
80
|
-
- - "
|
80
|
+
- - "~>"
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
84
|
name: uuidtools
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
|
-
- - "
|
87
|
+
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
89
|
version: '0'
|
90
90
|
type: :runtime
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
|
-
- - "
|
94
|
+
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
@@ -99,6 +99,9 @@ dependencies:
|
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
100
100
|
requirements:
|
101
101
|
- - "~>"
|
102
|
+
- !ruby/object:Gem::Version
|
103
|
+
version: '4.2'
|
104
|
+
- - ">="
|
102
105
|
- !ruby/object:Gem::Version
|
103
106
|
version: 4.2.0
|
104
107
|
type: :runtime
|
@@ -106,12 +109,18 @@ dependencies:
|
|
106
109
|
version_requirements: !ruby/object:Gem::Requirement
|
107
110
|
requirements:
|
108
111
|
- - "~>"
|
112
|
+
- !ruby/object:Gem::Version
|
113
|
+
version: '4.2'
|
114
|
+
- - ">="
|
109
115
|
- !ruby/object:Gem::Version
|
110
116
|
version: 4.2.0
|
111
117
|
- !ruby/object:Gem::Dependency
|
112
118
|
name: railties
|
113
119
|
requirement: !ruby/object:Gem::Requirement
|
114
120
|
requirements:
|
121
|
+
- - "~>"
|
122
|
+
- !ruby/object:Gem::Version
|
123
|
+
version: '4.2'
|
115
124
|
- - ">="
|
116
125
|
- !ruby/object:Gem::Version
|
117
126
|
version: 4.2.0
|
@@ -119,6 +128,9 @@ dependencies:
|
|
119
128
|
prerelease: false
|
120
129
|
version_requirements: !ruby/object:Gem::Requirement
|
121
130
|
requirements:
|
131
|
+
- - "~>"
|
132
|
+
- !ruby/object:Gem::Version
|
133
|
+
version: '4.2'
|
122
134
|
- - ">="
|
123
135
|
- !ruby/object:Gem::Version
|
124
136
|
version: 4.2.0
|
@@ -126,14 +138,14 @@ dependencies:
|
|
126
138
|
name: rest-client
|
127
139
|
requirement: !ruby/object:Gem::Requirement
|
128
140
|
requirements:
|
129
|
-
- - "
|
141
|
+
- - "~>"
|
130
142
|
- !ruby/object:Gem::Version
|
131
143
|
version: '0'
|
132
144
|
type: :runtime
|
133
145
|
prerelease: false
|
134
146
|
version_requirements: !ruby/object:Gem::Requirement
|
135
147
|
requirements:
|
136
|
-
- - "
|
148
|
+
- - "~>"
|
137
149
|
- !ruby/object:Gem::Version
|
138
150
|
version: '0'
|
139
151
|
description: A simple set of classes that allow access to Interactions, Documents,
|