salesforce_flo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8f1c9187f49decf64aad3602dbc666dcb779efa
-  data.tar.gz: 6d03df17236eda0d75991259868a9b9ddb40a895
+  metadata.gz: f213441184760d6c7ae9ea601e3667da792b1450
+  data.tar.gz: 9bb28c5c280cb100e4afce9f7363932d2a1c3e61
 SHA512:
-  metadata.gz: 1e0bae2a9bc59b73225660edb54d2256b5948eca1809c1224aa46ab5bdef40d401238b92696a8fd90fb69617d24e78273c441413700d81a6cd1ea89b1c310769
-  data.tar.gz: d14d35b63e01e18da55d39028ec6794e449163ae5a2a7e0b9ff8fbc165a7f8246d88dcf82ac5b9e77200224d92dd8d9e11e6947938c5f228d6e7c4d842ef1d78
+  metadata.gz: c44d4ef7181a631a9e591ebeee8ee439a0cdb5ce2d16ddf6ec68e5a888f7dda50b231c0d48b3105c7e7dd44d90a27047c0f50365611fa997d5e6651742697dad
+  data.tar.gz: 7a7a0cbca2fb7f7c7b2edc9593046be30202ffe9ce6b90308a211cee2861a96260d44d355871f38e4c35f88a5f957352684539621d7751de99ad7efec3438db5

data/README.md

@@ -1,5 +1,5 @@
 # SalesforceFlo
-[![Gem Version](https://badge.fury.io/rb/salesforce_flo.svg)](https://badge.fury.io/rb/salesforce_flo) [![Code Climate](https://codeclimate.com/github/codeclimate/codeclimate/badges/gpa.svg)](https://codeclimate.com/github/codeclimate/codeclimate) [![Build Status](https://semaphoreci.com/api/v1/justinpowers/salesforce_flo/branches/master/shields_badge.svg)](https://semaphoreci.com/justinpowers/salesforce_flo)
+[![Gem Version](https://badge.fury.io/rb/salesforce_flo.svg)](https://badge.fury.io/rb/salesforce_flo) [![Code Climate](https://codeclimate.com/github/salesforce/salesforce_flo/badges/gpa.svg)](https://codeclimate.com/github/salesforce/salesforce_flo) [![Build Status](https://semaphoreci.com/api/v1/justinpowers/salesforce_flo/branches/master/shields_badge.svg)](https://semaphoreci.com/justinpowers/salesforce_flo)
 
 SalesforceFlo is a Salesforce plugin for the Flo workflow automation library.  If you aren't familiar with Flo, then please start [here](https://github.com/salesforce/flo)
 

data/lib/flo/provider/salesforce_flo.rb

@@ -3,11 +3,11 @@
 # Licensed under the BSD 3-Clause license.
 # For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
 
-require 'pry'
+require 'flo/provider/base'
 
 module Flo
   module Provider
-    class SalesforceFlo
+    class SalesforceFlo < Flo::Provider::Base
 
 
       # Creates a new SalesforceFlo Provider instance

data/lib/salesforce_flo/authentication/oauth_wrapper.rb

@@ -12,7 +12,8 @@ module SalesforceFlo
   module Authentication
     class OauthWrapper
 
-      SFDC_URI = 'https://login.salesforce.com/services/oauth2/authorize'
+      OAUTH_ENDPOINT = '/services/oauth2/authorize'
+      AUTH_HOST = 'https://login.salesforce.com'
       DEFAULT_CLIENT_ID = '3MVG9CEn_O3jvv0zPd34OzgiH037XR5Deez3GW8PpsMdzoxecdKUW1s.8oYU9GoLS2Tykr4qTrCizaQBjRXNT'
       DEFAULT_REDIRECT_HOSTNAME = 'localhost'
       DEFAULT_LISTEN_PORT = '3835'
@@ -34,6 +35,7 @@ module SalesforceFlo
         @redirect_hostname = opts[:redirect_hostname] || DEFAULT_REDIRECT_HOSTNAME
         @port = opts[:port] || DEFAULT_LISTEN_PORT
         @client = opts[:client] || -> (options) { Restforce.new(options) }
+
         raise ArgumentError.new(':client must respond to #call, try a lambda') unless @client.respond_to?(:call)
       end
 
@@ -44,7 +46,7 @@ module SalesforceFlo
       # from the salesforce that includes the access token
       # @return The result of invoking #call on the client object
       def call(opts={})
-        server = WEBrick::HTTPServer.new :Port => @redirect_hostname
+        server = WEBrick::HTTPServer.new(Port: @port)
         auth_details = {}
 
         server.mount_proc('/') do |req, res|
@@ -60,11 +62,11 @@ module SalesforceFlo
 
         trap "INT" do server.shutdown end
 
-        Launchy.open("#{SFDC_URI}?#{oauth_query_string}")
+        Launchy.open("#{AUTH_HOST}#{OAUTH_ENDPOINT}?#{oauth_query_string}")
         server.start
 
-        merged_options = opts.merge(auth_details).merge(client_id: @client_id, api_version: '38.0').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
-
+        merged_options = opts.merge(auth_details).merge(client_id: @client_id, api_version: '39.0').inject({}){|memo,(k,v)| memo[k.to_sym] = v; memo}
+        merged_options[:oauth_token] = merged_options[:access_token] if merged_options[:access_token]
         @client.call(merged_options)
       end
 
@@ -102,7 +104,7 @@ module SalesforceFlo
 
               function sendHashParams() {
                 xhr = new XMLHttpRequest();
-                var url = "http://localhost:8000/send_token";
+                var url = "http://localhost:#{@port}/send_token";
                 xhr.open("POST", url, true);
                 xhr.setRequestHeader("Content-type", "application/json");
                 var data = JSON.stringify(getHashParams());

data/lib/salesforce_flo/version.rb

@@ -4,5 +4,5 @@
 # For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
 
 module SalesforceFlo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/salesforce_flo.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'restforce'
   spec.add_dependency 'launchy'
+  spec.add_dependency 'flo', '>= 0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_flo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Justin Powers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 description: 
 email:
 - justin.powers@salesforce.com