leap_salesforce 0.2.18 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2c0ca47804ac6b8569d9a025d57650cfd749000abcf51a32833734fe82aabc3
-  data.tar.gz: bfdbffd73951d36c605e51250d7db353d50408b1435f95a8a7bb2e296f923e29
+  metadata.gz: 860e70700f38ef5c8d3d91d818f62133a6c510cc938c08a5d7a88b612b362c52
+  data.tar.gz: 06e4e60b1c79e909cd3664f8130b4d060712e11e9d68a92b9e69f6eff691dc4a
 SHA512:
-  metadata.gz: fe62e4cc025ebb9b51432d295ff377f672127c07cc95d9f0691a3898339baee22beac1f01e8c0da5074bc6194fefde2465513e875e27b4d620dc285c45ef1b49
-  data.tar.gz: aa0431124e5a9e1b0e6664c175a8818af2283b73215c4a5f4cc34f2b3f45e09904560e1bff5c1c69b44e6964c774ce204028e35b619bea5e4c2ca98e1129a9d2
+  metadata.gz: edccc57873db055416189cbbad1f68351e861e63d5cb754822b2192591149948a44334d2340f6f70e65b76dfa0a9ffdf7b9abc9ba9ff1f508785aefc1fd04055
+  data.tar.gz: e16efec11ca65a52f3015fe32bad973aa40a102d39ad57068234f0820c6de78047ee3651b440a3a4e2ad1da19be0882e58acb5ac3def8f63c23b49d4465ec34b

data/.idea/leap-salesforce.iml

@@ -15,7 +15,7 @@
     <orderEntry type="library" scope="PROVIDED" name="addressable (v2.7.0, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="akami (v1.3.1, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.3, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.4, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.0.2, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="coderay (v1.1.2, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="colorize (v0.8.1, RVM: ruby-2.6.3) [gem]" level="application" />
@@ -33,7 +33,7 @@
     <orderEntry type="library" scope="PROVIDED" name="humanize (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="i18n (v1.7.0, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.2.0, RVM: ruby-2.6.3) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="json (v2.3.0, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="jsonpath (v1.0.5, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="kramdown (v2.1.0, RVM: ruby-2.6.3) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="launchy (v2.4.3, RVM: ruby-2.6.3) [gem]" level="application" />

data/.leap_salesforce.yml

@@ -11,3 +11,4 @@ soql_objects:
   - Broker: Broker__c
   - Account
   - Attachment
+  - EventLogFile

data/ChangeLog

@@ -1,3 +1,10 @@
+Version 0.2.19
+* Enhancement
+  * Where suburl is passed into SoqlData, take part from 'sobjects' onwards to make using a path obtained from
+    a request in a subsequent request easier
+* Bug fix
+  * Handle 'sequence' keyword in FactoryBot
+
 Version 0.2.18
 * Bug fix
   * Fixes #29 to raise error if value retrieved on object after an update failure

data/lib/leap_salesforce/auth.rb

@@ -87,11 +87,12 @@ module LeapSalesforce
           raise SetupError,
                 'Please set SF_USERNAME and SF_CONSUMER_KEY environment variables'
         end
+        # TODO: These scripts only work in a linux shell
         script_name = if ENV['SCRATCH_ORG'] && !ENV['SCRATCH_ORG'].empty?
                         raise "Please set SCRATCH_ORG_ALIAS when SCRATCH_ORG(#{ENV['SCRATCH_ORG']}) is set" unless ENV['SCRATCH_ORG_ALIAS']
 
                         puts "Using sandbox #{ENV['SCRATCH_ORG_ALIAS']}"
-                        'get_scratch_auth'
+                        'get_scratch_auth_jwt'
                       else
                         'get_prod_auth'
                       end

data/lib/leap_salesforce/ext/string.rb

@@ -8,7 +8,9 @@ require 'json'
 
 # Override string object to provide convenience methods for Strings
 class String
-  # @return [Array] List of ruby keywords
+  # @return [Array] List of keywords reserved for FactoryBot
+  FACTORY_WORDS = ['sequence']
+  # @return [Array] List of ruby keywords. Some words are only key to FactoryBot like 'sequence'
   KEYWORDS = %w[BEGIN END __ENCODING__ __END__ __FILE__ __LINE__ alias and begin break case class def defined?
                 do else elsif end ensure false for if in module next nil not or redo rescue retry return
                 self super then true undef unless until when while yield private].freeze
@@ -110,6 +112,6 @@ class String
 
   # @return [Boolean] Whether string is a Ruby keyword
   def keyword?
-    KEYWORDS.include? self
+    KEYWORDS.include?(self) || FACTORY_WORDS.include?(self)
   end
 end

data/lib/leap_salesforce/{get_scratch_auth.sh → get_scratch_auth_jwt.sh}

@@ -1,2 +1,3 @@
+# Get scratch ORG logging in via jwtkeyfile
 sfdx force:auth:jwt:grant --clientid "$SF_CONSUMER_KEY" --jwtkeyfile "$JWT_FOLDER"/server.key --username "$SF_USERNAME" --setdefaultdevhubusername --setalias HubOrg
 sfdx force:org:display --targetusername "$SCRATCH_ORG_ALIAS"

data/lib/leap_salesforce/get_scratch_auth_url.sh

@@ -0,0 +1,4 @@
+# Get scratch ORG logging in via Auth url
+#echo $org_auth_url > $file
+sfdx force:auth:sfdxurl:store --sfdxurlfile "$file" --setalias HubOrg --json
+sfdx force:org:display --targetusername "$SCRATCH_ORG_ALIAS"

data/lib/leap_salesforce/rake.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 
-import File.join(__dir__, 'rake', 'setup.rake')
-import File.join(__dir__, 'rake', 'sfdx.rake')
-
-# Dir.glob('rake/*.rake').each(&method(:import))
+require 'leap_salesforce'
+Dir.glob(File.join(__dir__, 'rake', '*.rake')).each(&method(:import))

data/lib/leap_salesforce/soql_data/soql.rb

@@ -54,7 +54,7 @@ module LeapSalesforce
     # @param [Hash] lookup Hash representing look up performed
     # @param [String] url Url to get
     def data_from_url(url, lookup)
-      soql_table.new("Id at #{url}", method: :get, suburl: url.split("v#{SoqlHandler.api_version}/").last)
+      soql_table.new("Id at #{url}", method: :get, suburl: url)
     rescue NoElementAtPath
       raise NoElementAtPath, "No result found for #{lookup} under user #{LeapSalesforce.api_user}"
     end

data/lib/leap_salesforce/soql_data/soql_data.rb

@@ -46,6 +46,14 @@ class SoqlData < Exchange
   #   leave this to empty. Otherwise Hash would look like method: :get, suburl: 'URL_AFTER_SOQL_HANDLER_BASE_URL'
   def initialize(name = nil, http_parameters = {})
     super
+    if @override_parameters && @override_parameters[:suburl]
+      suburl_passed = @override_parameters[:suburl]
+      @override_parameters[:suburl] = if suburl_passed.include?('sobjects')
+                                        suburl_passed[suburl_passed.index('sobjects')..-1]
+                                      else
+                                        suburl_passed
+                                      end
+    end
 
     return unless http_parameters.empty?
 

data/lib/leap_salesforce/users/users.rb

@@ -8,7 +8,12 @@ module LeapSalesforce
     @list = []
     class << self
       # @return [Array] List of test users
-      attr_accessor :list
+      attr_writer :list
+
+      # @return [Array] List of test users
+      def list
+        @list.empty? ? [User.new(:admin, ENV['SF_USERNAME'])] : @list
+      end
 
       # @param [LeapSalesforce::User, Array] user Test user to add to leap salesforce
       def add(user)

data/lib/leap_salesforce/version.rb

@@ -2,5 +2,5 @@
 
 module LeapSalesforce
   # @return [String] Version of leap salesforce
-  VERSION = '0.2.18'
+  VERSION = '0.2.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -318,7 +318,8 @@ files:
 - lib/leap_salesforce/generator/templates/spec/picklists_spec.rb.erb
 - lib/leap_salesforce/generator/templates/spec/spec_helper.rb.erb
 - lib/leap_salesforce/get_prod_auth.sh
-- lib/leap_salesforce/get_scratch_auth.sh
+- lib/leap_salesforce/get_scratch_auth_jwt.sh
+- lib/leap_salesforce/get_scratch_auth_url.sh
 - lib/leap_salesforce/leaps.rb
 - lib/leap_salesforce/limits.rb
 - lib/leap_salesforce/loader.rb