remi 0.2.26 → 0.2.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 783520781cb755c4f317a95122e3395296ac15da
-  data.tar.gz: 7bbbfd2df7aaa94f3604fec9d77d93f41e3f7740
+  metadata.gz: 699ffcfaee3db2ae6e0fc56d79458c55d2241405
+  data.tar.gz: 70b17f181c0090eefb842da7f71a66882376475a
 SHA512:
-  metadata.gz: f06fda56e67c2dcc7884c13d1fa19a11f5c8d23438a331801b1d312c095ae9d13fae0a723a803b5fae62975832c075e702121d5c9f3621124f628bfca48969b9
-  data.tar.gz: 58d6e66fd1cbe3b79a9938b8e26efb5d2a86ab43e8b3832e4addce69e4f4c215fcd8b4a623c7f5e82fdcf22c884bae5f162a566e419ee75a960930cde090e3da
+  metadata.gz: eea0b513471b2767dc4ac7053d8cb574bd747d5120b127f42d254952a166bf35e40ef52fa3861d8e4351ff95e1b967094f90f0860277174d0e52e235a819e606
+  data.tar.gz: c9b8b111b7f3fddf7ff4fcd1310ca6102dd027acaaa1a90d15cfd80e65c7784c21396fe8c4bcfbe1b2177080479d445f81ee6ecf2ddec24aeeb5e3df7602b0c9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remi (0.2.26)
+    remi (0.2.27)
       activesupport (~> 4.2)
       bond (~> 0.5)
       cucumber (~> 2.1)
@@ -12,14 +12,12 @@ PATH
       pg (~> 0.18)
       regex_sieve (~> 0.1)
       regexp-examples (~> 1.1)
-      restforce (~> 2.1)
       rspec (~> 3.3)
-      salesforce_bulk_api (= 0.0.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.5.1)
+    activesupport (4.2.6)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -28,7 +26,7 @@ GEM
     bond (0.5.1)
     builder (3.2.2)
     clbustos-rtf (0.4.2)
-    cucumber (2.3.2)
+    cucumber (2.3.3)
       builder (>= 2.1.2)
       cucumber-core (~> 1.4.0)
       cucumber-wire (~> 0.0.1)
@@ -46,12 +44,7 @@ GEM
     docile (1.1.5)
     faker (1.6.3)
       i18n (~> 0.5)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.10.0)
-      faraday (>= 0.7.4, < 0.10)
     gherkin (3.2.0)
-    hashie (3.4.3)
     i18n (0.7.0)
     iruby (0.2.7)
       bond (~> 0.5)
@@ -63,10 +56,9 @@ GEM
     minitest (5.8.4)
     multi_json (1.11.2)
     multi_test (0.1.2)
-    multipart-post (2.0.0)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (3.0.2)
+    net-ssh (3.1.1)
     pg (0.18.4)
     prawn (0.8.4)
       prawn-core (>= 0.8.4, < 0.9)
@@ -85,16 +77,11 @@ GEM
       prawn (~> 0.8.4)
       prawn-svg (~> 0.9.1)
       text-table (~> 1.2)
-    restforce (2.1.2)
-      faraday (~> 0.9.0)
-      faraday_middleware (>= 0.8.8)
-      hashie (>= 1.2.0, < 4.0)
-      json (>= 1.7.5, < 1.9.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.3)
+    rspec-core (3.4.4)
       rspec-support (~> 3.4.0)
     rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
@@ -104,16 +91,12 @@ GEM
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
     ruby-ole (1.2.12)
-    salesforce_bulk_api (0.0.12)
-      json
-      xml-simple
-    spreadsheet (1.1.1)
+    spreadsheet (1.1.2)
       ruby-ole (>= 1.0)
     text-table (1.2.4)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xml-simple (1.1.5)
 
 PLATFORMS
   ruby

data/lib/remi.rb

@@ -28,8 +28,8 @@ require 'active_support/core_ext/date/calculations'
 require 'active_support/core_ext/time/calculations'
 
 # - Should separate SF stuff into separate SF support package
-require 'restforce'
-require 'salesforce_bulk_api'
+#require 'restforce'
+#require 'salesforce_bulk_api'
 
 
 # Remi

data/lib/remi/data_target/salesforce.rb

@@ -3,9 +3,10 @@ module Remi
     class Salesforce
       include DataTarget
 
-      def initialize(object:, operation:, credentials:, api: :bulk, logger: Remi::Settings.logger)
+      def initialize(object:, operation:, credentials:, external_id: 'Id', api: :bulk, logger: Remi::Settings.logger)
         @sfo = object
         @operation = operation
+        @external_id = external_id
         @credentials = credentials
         @api = api
         @logger = logger
@@ -24,6 +25,10 @@ module Remi
           Remi::SfBulkHelper::SfBulkUpdate.update(restforce_client, @sfo, df_as_array_of_hashes, logger: @logger)
         elsif @operation == :create
           Remi::SfBulkHelper::SfBulkCreate.create(restforce_client, @sfo, df_as_array_of_hashes, logger: @logger)
+        elsif @operation == :upsert
+          Remi::SfBulkHelper::SfBulkUpsert.upsert(restforce_client, @sfo, df_as_array_of_hashes, external_id: @external_id, logger: @logger)
+        else
+          raise "Unknown operation: #{@operation}"
         end
 
         @loaded = true

data/lib/remi/sf_bulk_helper.rb

@@ -228,6 +228,12 @@ module Remi
         SfBulkUpsert.new(*args,**kargs).tap { |sf| sf.send(:execute) }
       end
 
+      def initialize(restforce_client, object, data, external_id: 'Id', batch_size: 5000, max_attempts: 1, logger: Logger.new(STDOUT))
+        @external_id = external_id
+
+        super(restforce_client, object, data, batch_size: batch_size, max_attempts: max_attempts, logger: logger)
+      end
+
       def operation
         :upsert
       end
@@ -235,8 +241,7 @@ module Remi
       private
 
       def send_bulk_operation
-        # Upsert does not support external id right now
-        sf_bulk.send(operation, @object, @data, 'Id', true, false, [], @batch_size)
+        sf_bulk.send(operation, @object, @data, @external_id, true, false, [], @batch_size)
       end
     end
 

data/lib/remi/version.rb

@@ -1,3 +1,3 @@
 module Remi
-  VERSION = '0.2.26'
+  VERSION = '0.2.27'
 end

data/remi.gemspec

@@ -29,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "faker", ["~> 1.6"]
 
   # Move these into separate package
-  s.add_runtime_dependency 'restforce', ['~> 2.1']
-  s.add_runtime_dependency 'salesforce_bulk_api', ['0.0.12']
+#  s.add_runtime_dependency 'restforce', ['~> 2.1']
+#  s.add_runtime_dependency 'salesforce_bulk_api', ['0.0.12']
 
   s.add_development_dependency 'iruby', ['0.2.7']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remi
 version: !ruby/object:Gem::Version
-  version: 0.2.26
+  version: 0.2.27
 platform: ruby
 authors:
 - Sterling Paramore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daru
@@ -164,34 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: restforce
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: salesforce_bulk_api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.12
 - !ruby/object:Gem::Dependency
   name: iruby
   requirement: !ruby/object:Gem::Requirement