leap_salesforce 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c881f656d66f33e7114b3c35d66171657310ed97696c7b0fd66ed81ba3f6462c
-  data.tar.gz: 590ff727c864eae8c3cedfdd819e442fd86a3b4e988b371c86bce92c2de484c6
+  metadata.gz: 05c69a9a17c1add0dad1ef3ba178ef096818a8379dd6488f3bd96fdcd78a32c1
+  data.tar.gz: c05c1ad0beddeac93a2d5af4c880712c8b235a0e18d76e3db71a098bbc714dcd
 SHA512:
-  metadata.gz: 804633946e5efadfea7657a7725f57d8f3b08fa1e4dfeb4ce826e30bd8435bc058e0ac07d6fde6ce62e8417309c2f6effd30c028bccbaef31a4a9244c5cc1844
-  data.tar.gz: 52d08e6d6dc453e1bc934c2ff2f5ef310e01593a5ebf3eed4f51f84fd8e4e92bf649e83c6ee0329c02f0baaf6b1bb18209765d67fe261eb2788b3001cad5d566
+  metadata.gz: 23541a09f8e1495f33f776eecdbca0a94d92f1a4b0049ece899a6d32331ccfe014741b35f115c0e0d14e8f3b4354d5a40d1049c1acff3d63690da7c056762f01
+  data.tar.gz: 53a7cdbec9530f8400c6a7f9a20a8a12ce0738293640640cd64c9ba1560d3bf734ddab15b1d90652a5cd011baad3a2001f88fd557f61405c3b84ab424500ef97

data/.gitignore

@@ -9,7 +9,6 @@
 Gemfile.lock
 logs/
 stub/
-*/server.csr
 .idea/workspace.xml
 .idea/.rakeTasks
 stub_log
@@ -26,4 +25,5 @@ config/credentials/
 # sfdx
 /JWT/
 /scripts/setup_env.sh
-sf_log.log
+sf_log.log
+*/server.*

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 0.2.4
+* Bug Fix
+  * Fixed 'delete_as_admin' method which was referring to methods that don't exist
+
 Version 0.2.3
 * Enhancement
   * Get sfdx init working with `leap_salesforce init sfdx=true`

data/lib/leap_salesforce/auth.rb

@@ -64,6 +64,7 @@ module LeapSalesforce
                       else
                         'get_prod_auth'
                       end
+        puts "Using JWT folder '#{ENV['JWT_FOLDER']}'"
         self.sfdx_display_output = `sh #{__dir__}/#{script_name}.sh`
         self.access_token = from_output 'Access Token'
         url_obtained = from_output 'Instance Url'

data/lib/leap_salesforce/ext/string.rb

@@ -5,6 +5,7 @@ require 'rubykeyword'
 require 'humanize'
 require 'active_support/core_ext/string'
 require 'date'
+require 'json'
 
 # Override string object to provide convenience methods for Strings
 class String
@@ -91,4 +92,16 @@ class String
   else
     true
   end
+
+  # Convert Ruby String representation of Array to SoqlArray
+  # @return [String] String representation for use in Soql IN query
+  def to_soql_array
+    arr = JSON.parse(self)
+    unless arr.is_a? Array
+      raise ArgumentError, "Cannot convert #{self} into Array" \
+      "Called at #{caller_locations[0]}"
+    end
+    joined = arr.join("', '")
+    "('#{joined}')"
+  end
 end

data/lib/leap_salesforce/rake/sfdx.rake

@@ -4,7 +4,7 @@
 namespace :sfdx do
   desc 'Login with credentials'
   task :login do
-    puts `sfdx force:auth:jwt:grant --clientid $SF_CONSUMER_KEY --jwtkeyfile JWT/server.key --username $SF_USERNAME --setdefaultdevhubusername --setalias HubOrg`
+    puts `sfdx force:auth:jwt:grant --clientid $SF_CONSUMER_KEY --jwtkeyfile "$JWT_FOLDER"/server.key --username $SF_USERNAME --setdefaultdevhubusername --setalias HubOrg`
   end
 
   task :display do

data/lib/leap_salesforce/rake.rb

@@ -1,5 +1,6 @@
 # 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))

data/lib/leap_salesforce/soql_data/soql_data.rb

@@ -127,7 +127,11 @@ class SoqlData < Exchange
   # @param [Boolean] must_pass Whether to raise exception if call is not successful
   # @return [Exchange] Exchange object making delete
   def delete_as_admin(must_pass: true)
-    LeapSalesforce.api_username = Test.email_for('System Admin')
+    LeapSalesforce.api_user = LeapSalesforce::Users.where key: :admin
+  rescue LeapSalesforce::UserError
+    raise LeapSalesforce::SetupError, 'Please set up a user with a key of :admin' \
+    'to use "delete_as_admin"'
+  else
     delete must_pass: must_pass
   end
 

data/lib/leap_salesforce/soql_data/soql_global_object_data.rb

@@ -259,7 +259,7 @@ module SoqlGlobalObjectData
   def condition_for(value)
     value = value.to_s
     operator, value = case value[0]
-                      when '>', '<' then extract_comparator(value)
+                      when '>', '<', '!', 'I' then extract_comparator(value)
                       when '~' then ['LIKE', value[1..-1]]
                       else
                         return "= '#{value}'" unless value.type_of_time?
@@ -268,14 +268,22 @@ module SoqlGlobalObjectData
                       end
     return "#{operator} #{value.to_zulu_date_string}" if value.type_of_time?
 
+    return "#{operator} #{value}" if operator.end_with? 'IN'
+
     "#{operator} '#{value}'"
   end
 
   # @param [String] value Value to extract comparator for
-  # @return [Array] Extract of >, >, >= from string and rest of string
+  # @return [Array] Extract of operator, value, taking >, >, >= from string and rest of string
   def extract_comparator(value)
     if value[1] == '='
       [value[0..1], value[2..-1]]
+    elsif value[0..2] == '!IN'
+      ['NOT IN', value[3..-1].to_soql_array]
+    elsif value[0..1] == 'IN'
+      ['IN', value[2..-1].to_soql_array]
+    elsif value[0] == '!'
+      ['!=', value[1..-1]]
     else
       [value[0], value[1..-1]]
     end

data/lib/leap_salesforce/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-12 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler