remi 0.2.26 → 0.2.27
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +6 -23
- data/lib/remi.rb +2 -2
- data/lib/remi/data_target/salesforce.rb +6 -1
- data/lib/remi/sf_bulk_helper.rb +7 -2
- data/lib/remi/version.rb +1 -1
- data/remi.gemspec +2 -2
- metadata +2 -30
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 699ffcfaee3db2ae6e0fc56d79458c55d2241405
|
4
|
+
data.tar.gz: 70b17f181c0090eefb842da7f71a66882376475a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: eea0b513471b2767dc4ac7053d8cb574bd747d5120b127f42d254952a166bf35e40ef52fa3861d8e4351ff95e1b967094f90f0860277174d0e52e235a819e606
|
7
|
+
data.tar.gz: c9b8b111b7f3fddf7ff4fcd1310ca6102dd027acaaa1a90d15cfd80e65c7784c21396fe8c4bcfbe1b2177080479d445f81ee6ecf2ddec24aeeb5e3df7602b0c9
|
data/Gemfile.lock
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
PATH
|
2
2
|
remote: .
|
3
3
|
specs:
|
4
|
-
remi (0.2.
|
4
|
+
remi (0.2.27)
|
5
5
|
activesupport (~> 4.2)
|
6
6
|
bond (~> 0.5)
|
7
7
|
cucumber (~> 2.1)
|
@@ -12,14 +12,12 @@ PATH
|
|
12
12
|
pg (~> 0.18)
|
13
13
|
regex_sieve (~> 0.1)
|
14
14
|
regexp-examples (~> 1.1)
|
15
|
-
restforce (~> 2.1)
|
16
15
|
rspec (~> 3.3)
|
17
|
-
salesforce_bulk_api (= 0.0.12)
|
18
16
|
|
19
17
|
GEM
|
20
18
|
remote: https://rubygems.org/
|
21
19
|
specs:
|
22
|
-
activesupport (4.2.
|
20
|
+
activesupport (4.2.6)
|
23
21
|
i18n (~> 0.7)
|
24
22
|
json (~> 1.7, >= 1.7.7)
|
25
23
|
minitest (~> 5.1)
|
@@ -28,7 +26,7 @@ GEM
|
|
28
26
|
bond (0.5.1)
|
29
27
|
builder (3.2.2)
|
30
28
|
clbustos-rtf (0.4.2)
|
31
|
-
cucumber (2.3.
|
29
|
+
cucumber (2.3.3)
|
32
30
|
builder (>= 2.1.2)
|
33
31
|
cucumber-core (~> 1.4.0)
|
34
32
|
cucumber-wire (~> 0.0.1)
|
@@ -46,12 +44,7 @@ GEM
|
|
46
44
|
docile (1.1.5)
|
47
45
|
faker (1.6.3)
|
48
46
|
i18n (~> 0.5)
|
49
|
-
faraday (0.9.2)
|
50
|
-
multipart-post (>= 1.2, < 3)
|
51
|
-
faraday_middleware (0.10.0)
|
52
|
-
faraday (>= 0.7.4, < 0.10)
|
53
47
|
gherkin (3.2.0)
|
54
|
-
hashie (3.4.3)
|
55
48
|
i18n (0.7.0)
|
56
49
|
iruby (0.2.7)
|
57
50
|
bond (~> 0.5)
|
@@ -63,10 +56,9 @@ GEM
|
|
63
56
|
minitest (5.8.4)
|
64
57
|
multi_json (1.11.2)
|
65
58
|
multi_test (0.1.2)
|
66
|
-
multipart-post (2.0.0)
|
67
59
|
net-sftp (2.1.2)
|
68
60
|
net-ssh (>= 2.6.5)
|
69
|
-
net-ssh (3.
|
61
|
+
net-ssh (3.1.1)
|
70
62
|
pg (0.18.4)
|
71
63
|
prawn (0.8.4)
|
72
64
|
prawn-core (>= 0.8.4, < 0.9)
|
@@ -85,16 +77,11 @@ GEM
|
|
85
77
|
prawn (~> 0.8.4)
|
86
78
|
prawn-svg (~> 0.9.1)
|
87
79
|
text-table (~> 1.2)
|
88
|
-
restforce (2.1.2)
|
89
|
-
faraday (~> 0.9.0)
|
90
|
-
faraday_middleware (>= 0.8.8)
|
91
|
-
hashie (>= 1.2.0, < 4.0)
|
92
|
-
json (>= 1.7.5, < 1.9.0)
|
93
80
|
rspec (3.4.0)
|
94
81
|
rspec-core (~> 3.4.0)
|
95
82
|
rspec-expectations (~> 3.4.0)
|
96
83
|
rspec-mocks (~> 3.4.0)
|
97
|
-
rspec-core (3.4.
|
84
|
+
rspec-core (3.4.4)
|
98
85
|
rspec-support (~> 3.4.0)
|
99
86
|
rspec-expectations (3.4.0)
|
100
87
|
diff-lcs (>= 1.2.0, < 2.0)
|
@@ -104,16 +91,12 @@ GEM
|
|
104
91
|
rspec-support (~> 3.4.0)
|
105
92
|
rspec-support (3.4.1)
|
106
93
|
ruby-ole (1.2.12)
|
107
|
-
|
108
|
-
json
|
109
|
-
xml-simple
|
110
|
-
spreadsheet (1.1.1)
|
94
|
+
spreadsheet (1.1.2)
|
111
95
|
ruby-ole (>= 1.0)
|
112
96
|
text-table (1.2.4)
|
113
97
|
thread_safe (0.3.5)
|
114
98
|
tzinfo (1.2.2)
|
115
99
|
thread_safe (~> 0.1)
|
116
|
-
xml-simple (1.1.5)
|
117
100
|
|
118
101
|
PLATFORMS
|
119
102
|
ruby
|
data/lib/remi.rb
CHANGED
@@ -28,8 +28,8 @@ require 'active_support/core_ext/date/calculations'
|
|
28
28
|
require 'active_support/core_ext/time/calculations'
|
29
29
|
|
30
30
|
# - Should separate SF stuff into separate SF support package
|
31
|
-
require 'restforce'
|
32
|
-
require 'salesforce_bulk_api'
|
31
|
+
#require 'restforce'
|
32
|
+
#require 'salesforce_bulk_api'
|
33
33
|
|
34
34
|
|
35
35
|
# Remi
|
@@ -3,9 +3,10 @@ module Remi
|
|
3
3
|
class Salesforce
|
4
4
|
include DataTarget
|
5
5
|
|
6
|
-
def initialize(object:, operation:, credentials:, api: :bulk, logger: Remi::Settings.logger)
|
6
|
+
def initialize(object:, operation:, credentials:, external_id: 'Id', api: :bulk, logger: Remi::Settings.logger)
|
7
7
|
@sfo = object
|
8
8
|
@operation = operation
|
9
|
+
@external_id = external_id
|
9
10
|
@credentials = credentials
|
10
11
|
@api = api
|
11
12
|
@logger = logger
|
@@ -24,6 +25,10 @@ module Remi
|
|
24
25
|
Remi::SfBulkHelper::SfBulkUpdate.update(restforce_client, @sfo, df_as_array_of_hashes, logger: @logger)
|
25
26
|
elsif @operation == :create
|
26
27
|
Remi::SfBulkHelper::SfBulkCreate.create(restforce_client, @sfo, df_as_array_of_hashes, logger: @logger)
|
28
|
+
elsif @operation == :upsert
|
29
|
+
Remi::SfBulkHelper::SfBulkUpsert.upsert(restforce_client, @sfo, df_as_array_of_hashes, external_id: @external_id, logger: @logger)
|
30
|
+
else
|
31
|
+
raise "Unknown operation: #{@operation}"
|
27
32
|
end
|
28
33
|
|
29
34
|
@loaded = true
|
data/lib/remi/sf_bulk_helper.rb
CHANGED
@@ -228,6 +228,12 @@ module Remi
|
|
228
228
|
SfBulkUpsert.new(*args,**kargs).tap { |sf| sf.send(:execute) }
|
229
229
|
end
|
230
230
|
|
231
|
+
def initialize(restforce_client, object, data, external_id: 'Id', batch_size: 5000, max_attempts: 1, logger: Logger.new(STDOUT))
|
232
|
+
@external_id = external_id
|
233
|
+
|
234
|
+
super(restforce_client, object, data, batch_size: batch_size, max_attempts: max_attempts, logger: logger)
|
235
|
+
end
|
236
|
+
|
231
237
|
def operation
|
232
238
|
:upsert
|
233
239
|
end
|
@@ -235,8 +241,7 @@ module Remi
|
|
235
241
|
private
|
236
242
|
|
237
243
|
def send_bulk_operation
|
238
|
-
|
239
|
-
sf_bulk.send(operation, @object, @data, 'Id', true, false, [], @batch_size)
|
244
|
+
sf_bulk.send(operation, @object, @data, @external_id, true, false, [], @batch_size)
|
240
245
|
end
|
241
246
|
end
|
242
247
|
|
data/lib/remi/version.rb
CHANGED
data/remi.gemspec
CHANGED
@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
|
|
29
29
|
s.add_runtime_dependency "faker", ["~> 1.6"]
|
30
30
|
|
31
31
|
# Move these into separate package
|
32
|
-
s.add_runtime_dependency 'restforce', ['~> 2.1']
|
33
|
-
s.add_runtime_dependency 'salesforce_bulk_api', ['0.0.12']
|
32
|
+
# s.add_runtime_dependency 'restforce', ['~> 2.1']
|
33
|
+
# s.add_runtime_dependency 'salesforce_bulk_api', ['0.0.12']
|
34
34
|
|
35
35
|
s.add_development_dependency 'iruby', ['0.2.7']
|
36
36
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: remi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.27
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sterling Paramore
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-04-
|
11
|
+
date: 2016-04-13 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: daru
|
@@ -164,34 +164,6 @@ dependencies:
|
|
164
164
|
- - "~>"
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '1.6'
|
167
|
-
- !ruby/object:Gem::Dependency
|
168
|
-
name: restforce
|
169
|
-
requirement: !ruby/object:Gem::Requirement
|
170
|
-
requirements:
|
171
|
-
- - "~>"
|
172
|
-
- !ruby/object:Gem::Version
|
173
|
-
version: '2.1'
|
174
|
-
type: :runtime
|
175
|
-
prerelease: false
|
176
|
-
version_requirements: !ruby/object:Gem::Requirement
|
177
|
-
requirements:
|
178
|
-
- - "~>"
|
179
|
-
- !ruby/object:Gem::Version
|
180
|
-
version: '2.1'
|
181
|
-
- !ruby/object:Gem::Dependency
|
182
|
-
name: salesforce_bulk_api
|
183
|
-
requirement: !ruby/object:Gem::Requirement
|
184
|
-
requirements:
|
185
|
-
- - '='
|
186
|
-
- !ruby/object:Gem::Version
|
187
|
-
version: 0.0.12
|
188
|
-
type: :runtime
|
189
|
-
prerelease: false
|
190
|
-
version_requirements: !ruby/object:Gem::Requirement
|
191
|
-
requirements:
|
192
|
-
- - '='
|
193
|
-
- !ruby/object:Gem::Version
|
194
|
-
version: 0.0.12
|
195
167
|
- !ruby/object:Gem::Dependency
|
196
168
|
name: iruby
|
197
169
|
requirement: !ruby/object:Gem::Requirement
|