leap_salesforce 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13951c22ceafff2467ca471cb6fda3c9b7ab34dd707c7e23371be362aee3199d
-  data.tar.gz: 2285ff9c9b90f44da101c8b186646ae8e7d4a7ff83b16bcd04807f72f5432d3c
+  metadata.gz: b60fb84b150303c1dc91eb621c40d5c155f439ecd7047911a321d65129259943
+  data.tar.gz: '0966f9cb9274d9f5d7f3d9f2cc85391bf57b909eb6c2d63792452a70e5f690f3'
 SHA512:
-  metadata.gz: 6377865707517db0bc51c59bf8e2f7d17a7ceba3191c5cd9759dfbde7e904cd2471e4574c8e981a3a781dfa1f9bc487a0f414d3b8c94c6cd618d6b2145d0b752
-  data.tar.gz: a033b46017e9dbd28b743a38b97fcd5c16663a5f3addf07dd3039354101a6a610c501c4f004e6ba1357d465d0a5212fb48dac1de8e20787a1565ac612148c21a
+  metadata.gz: dc9ae149d641d926b3d165c28356a39655b5bc1376488db5526b4b61dffe351d7212a05b800b0e932796fcb40296f39face2cd68e67347987925d74c6eae56b6
+  data.tar.gz: 8a7de04ea12fa03beaf419a756f4a9bc5acdba392b9162d7e920aa29652c882034488e69ee2d569b095e0e57f9266ca8002a5b95544be7e2c716ffdfbdb094f4

data/ChangeLog

@@ -1,3 +1,7 @@
+Version 1.4.1
+* Fixed method names that need to match types 
+* Fixed file name created. Needs to be with '.java' in lower case
+
 Version 1.4
 * Ability to generate Java classes from metadata using the exe 'leap_salesforce create_soql_objects --language=java'
 

data/exe/leap_salesforce

@@ -62,15 +62,20 @@ Please ignore "config/credentials/" and "logs/"'.colorize :red
     end
 
     desc 'create_soql_objects', 'Creates SOQL objects from metadata based on .leap_salesforce.yml'
-    option :language, default: 'ruby'
+    option :language
     def create_soql_objects
-      LeapSalesforce.language = options[:language]
+      LeapSalesforce.language = options[:language] if options[:language]
       require 'leap_salesforce/generator/soql_objects'      
       LeapSalesforce.oauth_working?
       LeapSalesforce::Users.execute_as_if_present key: :admin do
         LeapSalesforce::Generator::SoqlObjects.new.create_all
       end
     end
+
+    desc 'version', 'Version this library'
+    def version
+      puts LeapSalesforce::VERSION
+    end
   end
 end
 

data/lib/leap_salesforce/generator/soql_objects.rb

@@ -12,7 +12,7 @@ module LeapSalesforce
     class SoqlObjects
       include Generator
 
-      SOQL_DATA_FOLDER = LeapSalesforce.language == "java" ? 'SoqlObjects' : 'soql_data'
+      SOQL_DATA_FOLDER = LeapSalesforce.language == 'java' ? 'SoqlObjects' : 'soql_data'
       SOQL_OBJECT_FOLDER = File.join(LeapSalesforce.lib_folder, SOQL_DATA_FOLDER).freeze
       FACTORY_FOLDER = File.join(LeapSalesforce.lib_folder, 'factories').freeze
 
@@ -32,7 +32,8 @@ module LeapSalesforce
           raise LeapSalesforce::SetupError, "Error producing Soql data for '#{@soql_class}', soql table " \
           " '#{@soql_object.backend_name}'. Error message: '#{desc.error_message}'"
         end
-        return unless LeapSalesforce.language == "ruby"
+        return unless LeapSalesforce.language == 'ruby'
+
         content = read_template 'soql_object.rb.erb', binding
         file = File.join(SOQL_OBJECT_FOLDER, "#{@soql_object.reference}.rb")
         generate_file file, content, overwrite: false
@@ -40,21 +41,22 @@ module LeapSalesforce
 
       # Generate module with fields for Soql Object
       def generate_field_module
-        if LeapSalesforce.language == "ruby"
+        if LeapSalesforce.language == 'ruby'
           field_content = read_template 'soql_object_field_names.rb.erb', binding
           field_file = File.join(SOQL_OBJECT_FOLDER, "#{@field_name_file}.rb")
         elsif LeapSalesforce.language == "java"
-          field_content = read_template 'soql_object_field_names.Java.erb', binding
-          field_file = File.join(SOQL_OBJECT_FOLDER, "#{@soql_object.class_name}.Java")
+          field_content = read_template 'soql_object_field_names.java.erb', binding
+          field_file = File.join(SOQL_OBJECT_FOLDER, "#{@soql_object.class_name}.java")
         else
           raise LeapSalesforce::SetupError, "Unsupported language '#{LeapSalesforce.language}'"
-        end    
-        generate_file field_file, field_content        
+        end
+        generate_file field_file, field_content
       end
 
       # Generate factory for mass generating objects using FactoryBot
       def generate_factory
-        return unless LeapSalesforce.language == "ruby"
+        return unless LeapSalesforce.language == 'ruby'
+
         @default_fields, @other_fields = filter_fields
         content = read_template 'factory.rb.erb', binding
         file = File.join(FACTORY_FOLDER, "#{@soql_object.reference}.rb")
@@ -72,10 +74,10 @@ module LeapSalesforce
           generate_field_module
           generate_factory
         end
-        if LeapSalesforce.language == 'ruby'
-          `rubocop -A #{SOQL_OBJECT_FOLDER} --enable-pending-cops`
-          `rubocop -A #{FACTORY_FOLDER} --enable-pending-cops`
-        end
+        return unless LeapSalesforce.language == 'ruby'
+
+        `rubocop -A #{SOQL_OBJECT_FOLDER} --enable-pending-cops`
+        `rubocop -A #{FACTORY_FOLDER} --enable-pending-cops`
       end
 
       private

data/lib/leap_salesforce/generator/templates/soql_object_field_names.Java.erb

@@ -15,8 +15,11 @@ public class <%= @soql_object.class_name %> {
 <% end %>
 
 <% @soql_class.fields.each do |field| %>
-	public String get<%= field['label'].unused_camel_name %>() { return <%= field['name'].camelize(:lower) %>; }
-	public void set<%= field['label'].unused_camel_name %>(String <%= field['name'].camelize(:lower) %>) { this.<%= field['name'].camelize(:lower) %> = <%= field['name'].camelize(:lower) %>; }
+	public String get<%= field['name'].camelize(:upper) %>() { return <%= field['name'].camelize(:lower) %>; }
+	/**
+	 * Label: '<%= field['label'] %>', Type: <%= field['type'] %><%= ", Relationship:" + field['relationshipName'] if field['relationshipName'] %>
+	 */
+	public void set<%= field['name'].camelize(:upper) %>(String <%= field['name'].camelize(:lower) %>) { this.<%= field['name'].camelize(:lower) %> = <%= field['name'].camelize(:lower) %>; }
 <% end %>
 }
 

data/lib/leap_salesforce/parameters.rb

@@ -16,8 +16,8 @@ module LeapSalesforce
   @client_id = ENV['client_id']
   @client_secret = ENV['client_secret']
   @password = ENV['password']
-  @language = "ruby"
-  @soql_field_start_text = ""
+  @language = 'ruby'
+  @soql_field_start_text = ''
   @environment = nil
   @logger = Logger.new $stdout
   @sfdx = false
@@ -135,7 +135,7 @@ module LeapSalesforce
     # @return [Symbol] Name of the language used
     attr_accessor :language
 
-    # @return [String] Text to be added as start of auto generated Soql field names 
+    # @return [String] Text to be added as start of auto generated Soql field names
     # classes in the Salesforce object
     attr_accessor :soql_field_start_text
 

data/lib/leap_salesforce/session.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'auth'
 require 'savon'
 require 'json'
@@ -21,12 +23,11 @@ module LeapSalesforce
     end
 
     class << self
-
       # Login via SOAP API
       def soap_login(username, password, security_token)
         client = Savon.client do
           endpoint "#{SoqlHandler.instance_url}/services/Soap/u/51.0"
-          namespace "urn:partner.soap.sforce.com"
+          namespace 'urn:partner.soap.sforce.com'
           log true # See request and response. (Put this in traffic file)
           log_level :debug
           logger Soaspec::SpecLogger.create

data/lib/leap_salesforce/soql_data/soql.rb

@@ -120,7 +120,7 @@ module LeapSalesforce
       value = value.nil? ? 'null' : value.to_s
       operator, value = case value[0]
                         when '>', '<', '!', 'I' then extract_comparator(value)
-                        when '~' then ['LIKE', value[1..-1]]
+                        when '~' then ['LIKE', value[1..]]
                         else ['=', value]
                         end
       case soql_table.type_for(field_name)
@@ -142,18 +142,18 @@ module LeapSalesforce
     # @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]]
+        [value[0..1], value[2..]]
       elsif value[0..2] == '!IN'
-        ['NOT IN', value[3..-1].to_soql_array]
+        ['NOT IN', value[3..].to_soql_array]
       elsif value[0..1] == 'IN'
-        ['IN', value[2..-1].to_soql_array]
+        ['IN', value[2..].to_soql_array]
       elsif value[0] == 'I' # 'N' not 2nd character
         ['=', value]
       elsif value[0] == '!'
-        remaining = value[1..-1] == 'nil' ? 'null' : value[1..-1]
+        remaining = value[1..] == 'nil' ? 'null' : value[1..]
         ['!=', remaining]
       else
-        [value[0], value[1..-1]]
+        [value[0], value[1..]]
       end
     end
   end

data/lib/leap_salesforce/soql_data/soql_data.rb

@@ -49,7 +49,7 @@ class SoqlData < Exchange
     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]
+                                        suburl_passed[suburl_passed.index('sobjects')..]
                                       else
                                         suburl_passed
                                       end

data/lib/leap_salesforce/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: leap_salesforce
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - IQA