leap_salesforce 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da79723306cce1184458cea71bcd195548c701f48fa3de87961d2d95becc99d4
-  data.tar.gz: 587308a13bfd4164e27638c82ee8adc59a833165aaeb3561b26b17e944ab455e
+  metadata.gz: 5b9311c1afc5593fb4b3428de805b3a2a9c5a6e8331d827dd40b9d5b60e09d8d
+  data.tar.gz: 9532ceffad0924438eb87b97378faeadd6729e27bc396439a4934f2ee71f71e7
 SHA512:
-  metadata.gz: eeb1dfacd0c1812b5637c7709d34303a7e852e308f87d8c789e6993aecf9ab3261a3c90df42cdde17d49ed337b14ac5c0a00998de639fc8bd98b2617150a2a9e
-  data.tar.gz: 0d5ca787cdebd092f3a21c1489d57b56f0236272740fe1129e945729cda776eea007f66b2e1b021a5b217db9c28f6c696fa7836f9df841cb89cdb4049239449d
+  metadata.gz: 1c81db35151f84596e6d0b80815bebfdcf3f582be9ee2457eb46fe90b06bf989af780be6e9333dbf1de5bae3797193605849f54d87c7652f352ed741ceeb0cfc
+  data.tar.gz: a8998c522c93ed383524758d91dceac18fd6fdf8af41f5db8db3f9898a3be93e6e6f03cb63dd0277bd9a4e404403ebe5929636278c3b92878df89c081be4ac5a

data/.rubocop.yml

@@ -1,3 +1,3 @@
 # Modifies RuboCop (Static analysis tool)
-Layout/LineLength:
+Metrics/LineLength:
   Max: 160

data/ChangeLog

@@ -1,3 +1,8 @@
+Version 0.2.24
+* Bug fix
+  * Handle metadata label name that is the same name as a method on SoqlData (which one would not want overwriting)
+    such as 'status_code'
+
 Version 0.2.23
 * Enhancement
   * Raise better error when could not find record using query

data/config/environments/prod.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Files with the format 'env.rb' should be used if
 
 Soaspec::OAuth2.debug_oauth = false # Turn this true if you need debug authentication

data/config/general.rb

@@ -7,4 +7,4 @@ module LeapSalesforce
   Users.add User.new :cet, 'test.cet@brave-otter-ttxype.com'
 end
 
-ENV['SF_USERNAME'] = 'samuel.garratt@brave-otter-ttxype.com'
+ENV['SF_USERNAME'] = 'samuel.garratt@brave-otter-ttxype.com'

data/exe/leap_salesforce

@@ -56,4 +56,4 @@ module LeapSalesforce
   end
 end
 
-LeapSalesforce::Exe.start(ARGV)
+LeapSalesforce::Exe.start(ARGV)

data/lib/leap_salesforce/ext/string.rb

@@ -6,14 +6,21 @@ require 'active_support/core_ext/string'
 require 'date'
 require 'json'
 
+class MockHandler < Soaspec::RestHandler
+  base_url 'mock_url'
+end
+
 # Override string object to provide convenience methods for Strings
 class String
   # @return [Array] List of keywords reserved for FactoryBot
-  FACTORY_WORDS = ['sequence']
+  FACTORY_WORDS = ['sequence'].freeze
   # @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
+  Soaspec.api_handler = MockHandler.new
+  SOQLDATA_METHODS = Exchange.new.public_methods.collect(&:to_s)
+
   # @note This removes '?' which is allowed in a method but is not desired for automatic creation of their names
   #   in the way that is being used here
   # @return [String] Convert string to something that would be friendly to use as in Ruby
@@ -112,6 +119,6 @@ class String
 
   # @return [Boolean] Whether string is a Ruby keyword
   def keyword?
-    KEYWORDS.include?(self) || FACTORY_WORDS.include?(self)
+    KEYWORDS.include?(self) || FACTORY_WORDS.include?(self) || SOQLDATA_METHODS.include?(self)
   end
 end

data/lib/leap_salesforce/leaps.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Create a Leaps alias to LeapSalesforce as it's faster to type.
 # This will not be automatically required in case as 'Leaps' may be defined elsewhere
 
 require 'leap_salesforce'
-Leaps = LeapSalesforce
+Leaps = LeapSalesforce

data/lib/leap_salesforce/soql_data/soql_global_object_data.rb

@@ -154,6 +154,12 @@ module SoqlGlobalObjectData
   # @param [Symbol, String] name Name of accessor to refer to field/element with
   # @param [String] backend_name Name of Salesforce field
   def soql_element(name, backend_name)
+    if String::SOQLDATA_METHODS.include?(name.to_s)
+      LeapSalesforce.logger.warn "Cannot create metadata for '#{name}' (defined at #{caller_locations[0]})" \
+      ' as method already defined in SoqlData'
+      return
+    end
+
     # Either set the element (if creating a new record) or update the object
     # @param [String] new_value Value to update record to
     define_method("#{name}=") do |new_value|

data/lib/leap_salesforce/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - IQA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-14 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler