leap_salesforce 0.1.0 → 0.1.1

data/.leap_salesforce.yml

@@ -1,4 +1,4 @@
-environment: uat
+environment: prod
 lib_folder: spec/support
 soql_objects:
   - Case
@@ -6,5 +6,5 @@ soql_objects:
   - Document: ContentDocument
   - User:
     create_enum: false
-  - Role: Role__c
+  - Broker: Broker__c
   - Account

data/ChangeLog

@@ -0,0 +1,5 @@
+Version 0.1.1
+* Enhancements
+  * Suggestions for generated factory
+  * Begin unit tests
+  * Handle Macrons by ensuring they're not copied into Ruby names / Modules

data/README.md

@@ -25,6 +25,10 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+## Docs
+
+Technical docs [here](https://www.rubydoc.info/gems/leap_salesforce)
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -41,7 +45,7 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the SfTest project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/leap-dojo/leap_salesforce/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the LeapSalesforce project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://gitlab.com/leap-dojo/leap_salesforce/blob/master/CODE_OF_CONDUCT.md).
 
 # Examples
 

data/Rakefile

@@ -2,17 +2,17 @@
 
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'rake/clean'
 
 require 'leap_salesforce/rake'
 
+CLEAN.include 'tmp/*'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task default: %i[clean spec]
 
-# TODO: This needs to be in one place
 require 'leap_salesforce'
-LeapSalesforce.api_user = LeapSalesforce::Users.where(key: :cet)
 
 desc "Create stubs for dynamic methods so they're picked up by the IDE"
 task :stub do

data/config/environments/prod.rb

@@ -0,0 +1,4 @@
+# Files with the format 'env.rb' should be used if
+
+Soaspec::OAuth2.debug_oauth = false # Turn this true if you need debug authentication
+Soaspec::SpecLogger.output_to_terminal = false # Turn this to true if you want to see API traffic on the terminal

data/config/general.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Add users to LeapSalesforce context. First user is the default
+module LeapSalesforce
+  Users.add User.new :admin, 'samuel.garratt@brave-otter-ttxype.com'
+end

data/exe/leap_salesforce

@@ -0,0 +1,54 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'thor'
+require 'leap_salesforce/parameters'
+require 'leap_salesforce/generator/generator'
+
+module LeapSalesforce
+  # Executable for setting up Leap Salesforce
+  class Exe < Thor
+    include LeapSalesforce::Generator
+    include LeapSalesforce::ExeHelpers
+
+    OAUTH_WIKI = 'https://gitlab.com/leap-dojo/leap_salesforce/wikis/SetUpOAuthApp'
+
+    desc 'init', 'Create new leap salesforce repository'
+    option :setup_done, default: false, type: :boolean, banner: 'Whether setup is done'
+    option :client_id, banner: 'OAuth2 client id'
+    option :client_secret, banner: 'OAuth2 client secret'
+    option :username, banner: 'Username'
+    option :user_key, banner: 'Key to identify user by'
+    option :password, banner: 'User password'
+    option :environment, banner: 'Environment to set automation code up for'
+    def init
+      # Ask user to create OAuth application by following
+      unless options[:setup_done]
+        oauth_setup = input_for "Have you set up OAuth application by following #{OAUTH_WIKI} (y/n)?"
+        exit if oauth_setup.downcase == 'n'
+      end
+
+      query_for_parameters
+      generate_files binding, ['Gemfile', 'Rakefile', '.leap_salesforce.yml', '.rspec',
+                               { config: ['general.rb', { credentials: 'salesforce_oauth2.yml' }] },
+                               { spec: %w[spec_helper.rb limit_spec.rb crud_eg_spec.rb] }]
+
+      environment_content = read_template File.join('config', 'environments', 'specific_file.rb.erb'),
+                                          binding
+      generate_file File.join('config', 'environments', "#{@environment}.rb"), environment_content,
+                    overwrite: false
+
+      puts 'Initial files created!'
+      puts 'Installing gems'
+      puts `bundle install`
+      puts 'Creating initial Soql objects. See ".leap_salesforce.yml" for list'
+      puts `rake leaps:create_soql_objects`
+      puts 'Creating enums'
+      puts `rake leaps:create_enums`
+    end
+  end
+end
+
+LeapSalesforce::Exe.start(ARGV)

data/leap_salesforce.gemspec

@@ -27,13 +27,12 @@ It reads the Metadata from Salesforce and creates the foundation for API tests.'
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'faker'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'topoisomerase'
   spec.add_dependency 'activerecord'
   spec.add_dependency 'factory_bot'
+  spec.add_dependency 'faker'
   spec.add_dependency 'rake'
   spec.add_dependency 'require_all'
   spec.add_dependency 'rubocop'

data/lib/leap_salesforce/ext/string.rb

@@ -8,7 +8,12 @@ class String
   # @todo: Have method of replacing all
   # @return [String] Remove many complex characters to make a key for a Ruby Hash that is usable
   def to_key_name
-    tr(' ,', '_').tr("'/()-:", '').tr('&', '').gsub('<', 'gt').tr('ā', 'a').snakecase.gsub('__', '_')
+    tr(' ,-', '_').tr("'/():", '').tr('&', '').gsub('<', 'gt').remove_macrons.snakecase.gsub('__', '_')
+  end
+
+  # @return [String] Return string without macrons, used for filenames and ruby methods
+  def remove_macrons
+    tr('ā', 'a').tr('ē', 'e').tr('ō', 'o').tr('ī', 'i').tr('ū', 'u')
   end
 
   # A ruby friendly method name that is not taken by keywords like 'class', 'alias'

data/lib/leap_salesforce/generator/default.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module LeapSalesforce
+  module Default
+    # Defaults for various objects within a Factory
+    module Factory
+      class << self
+        # @return [String] String to set Factory field to value specified
+        def set(value, use_quotes: nil)
+          if use_quotes
+            "#{@field['label'].unused_ruby_name} { '#{value}' }"
+          else
+            "#{@field['label'].unused_ruby_name} { #{value} }"
+          end
+        end
+
+        # @return [String] Default value for Factory
+        def value_for(field, class_name)
+          @field = field
+          case field['type']
+          when 'string' then set("Faker::Lorem.paragraph_by_chars(#{field['length']})")
+          when 'id' then set('Best to not hard code this', use_quotes: true)
+          when 'boolean' then set('true')
+          when 'picklist' then set("#{class_name}::#{field['name']}.sample")
+          when 'reference'
+            soql_obj = LeapSalesforce.soql_objects.find { |so| so.backend_name == field['relationshipName'] }&.reference
+            if soql_obj
+              "association :#{@field['label'].unused_ruby_name}, factory: :#{soql_obj}"
+            else
+              "# Please add #{field['relationshipName']} to .leap_salesforce.yml to create association for #{field}"
+            end
+          else
+            set("Content depending on #{field['type']}", use_quotes: true)
+          end
+        end
+      end
+    end
+
+    # Contains default fields for various out of the box entities to be included in Factory
+    module Fields
+      class << self
+        def contact
+          %w[FirstName LastName]
+        end
+
+        def account
+          ['Name']
+        end
+      end
+    end
+  end
+end

data/lib/leap_salesforce/generator/exe_helpers.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module LeapSalesforce
+  # Helpers for LeapSalesforce executable
+  module ExeHelpers
+    # Return input for query
+    # @param [String] query Query to ask on terminal
+    # @return [String] User input to store
+    def input_for(query)
+      puts query
+      $stdin.gets.strip
+    end
+
+    # Ask user to enter parameters specific to their Salesforce environment
+    def query_for_parameters
+      puts 'Please enter the following information to generate files for a new leap_salesforce testing repo'
+      # Ask for OAuth credential details
+      @client_id = options[:client_id] || input_for('Enter the client id')
+      @client_secret = options[:client_secret] || input_for('Enter the client secret')
+      @username = options[:username] || input_for('Enter the Salesforce username. It is ideal to start with a System admin' \
+' so that any necessary metadata can be read')
+      @user_key = options[:user_key] || input_for('Enter a key to refer to this user (This will be stored as a Symbol)')
+      @password = options[:password] || input_for('Enter password for this user. Recommendation is that 1 password be shared across' \
+' all test users to be easier to manage')
+      @environment = options[:environment] || input_for('Enter the environment you want to set things up for ' \
+'(This will be parameterised so can be changed later)')
+    end
+  end
+end

data/lib/leap_salesforce/generator/generator.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+require 'erb'
+require 'fileutils'
+require_relative 'exe_helpers'
+
+module LeapSalesforce
+  # Generators for creating code
+  module Generator
+    # @param [String] filename Relative filename to this file
+    # @param [Binding] binding Binding object used for ERB variables
+    # @return [String] Interpreted file after calculating ERB for template file passed
+    def read_template(filename, binding)
+      ERB.new(File.read(File.join(__dir__, 'templates', filename))).result(binding)
+    end
+
+    # Generate file creating necessary folder if necessary
+    # @param [String] filename Name of file to generate
+    # @param [String] content Content to put within file
+    def generate_file(filename, content, overwrite: true)
+      FileUtils.mkdir_p File.dirname filename unless File.directory? File.dirname(filename)
+      return puts "File '#{filename}' already exists, skipping..." if (File.exist?(filename) && !overwrite)
+
+      File.write filename, content
+      puts "Created file at #{filename}"
+    end
+
+    # @example Create a spec_helper file and test file in spec folder
+    #   generate_files [ { spec: [ 'spec_helper.rb', 'limit_spec.rb' ] } ]
+    # @param [Hash] list_of_files Hash of files to generate for
+    def generate_files(binding, list_of_files, folder: nil)
+      return create_inner_file(folder, list_of_files, binding) unless list_of_files.respond_to? :each
+
+      list_of_files.each do |item|
+        if item.is_a? Hash # Go one level deeper
+          item.each do |inner_folder, sub_files|
+            inner_folder = inner_folder.to_s
+            current_folder = folder ? File.join(folder, inner_folder) : inner_folder
+            generate_files binding, sub_files, folder: current_folder
+          end
+        else
+          create_inner_file folder, item, binding
+        end
+      end
+    end
+
+    def create_inner_file(folder, name, binding)
+      item = name.to_s
+      path = folder ? File.join(folder, item) : item
+      generate_from_template path, binding
+    end
+
+    # Generate file from template
+    # @param [String] template_name Path to file with templates folder to use as template
+    # @param [Binding] binding Binding object used for ERB variables
+    def generate_from_template(template_name, binding)
+      content = read_template "#{template_name}.erb", binding
+      generate_file template_name, content, overwrite: false
+    end
+  end
+end

data/lib/leap_salesforce/generator/soql_enums.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'soql_objects'
 
 module LeapSalesforce
@@ -29,8 +31,8 @@ module LeapSalesforce
           puts "#{picklists.count} picklists found"
           picklists.each do |picklist|
             @picklist = picklist
-            @enum_name = picklist.tr(" '/()-", '')
-            picklist_name = picklist.snakecase.tr(' ', '_')
+            @enum_name = picklist.tr(" '/()-", '').remove_macrons
+            picklist_name = picklist.to_key_name
             values = entity.picklist_for picklist
             @enum_values = {}
             values.each { |value| @enum_values[value.to_key_name] = value }

data/lib/leap_salesforce/generator/soql_objects.rb

@@ -1,25 +1,12 @@
+# frozen_string_literal: true
+
 require 'fileutils'
-require_relative 'default_fields'
+require_relative 'default'
+require_relative 'generator'
 
 module LeapSalesforce
   # Generators for creating code
   module Generator
-    # @param [String] filename Relative filename to this file
-    # @param [Binding] binding Binding object used for ERB variables
-    # @return [String] Interpreted file after calculating ERB for template file passed
-    def read_template(filename, binding)
-      ERB.new(File.read(File.join(__dir__, 'templates', filename))).result(binding)
-    end
-
-    # Generate file creating necessary folder if necessary
-    # @param [String] filename Name of file to generate
-    # @param [String] content Content to put within file
-    def generate_file(filename, content)
-      FileUtils.mkdir_p File.dirname filename unless File.directory? File.dirname(filename)
-      File.write filename, content
-      puts "Created file at #{filename}"
-    end
-
     # Creates SoqlObjects and related modules
     class SoqlObjects
       include Generator
@@ -27,23 +14,12 @@ module LeapSalesforce
       SOQL_OBJECT_FOLDER = File.join(LeapSalesforce.lib_folder, 'soql_data').freeze
       FACTORY_FOLDER = File.join(LeapSalesforce.lib_folder, 'factories').freeze
 
-      # Extracts the soql_object defined in '.leap_salesforce.yml' and assigns instance variables
-      def extract_info_from_object(soql_object)
-        @class_name, @soql_object = case soql_object
-                                    when Hash
-                                      @create_enum = soql_object['create_enum'].nil? ? true : soql_object['create_enum']
-                                      [soql_object.keys[0], soql_object.values[0] || soql_object.keys[0]]
-                                    else
-                                      [soql_object.to_s, soql_object.to_s]
-                                    end
-      end
-
       # Create temporary class for building API requests on
       def ensure_class_defined
-        @soql_class = Object.const_get @class_name
+        @soql_class = Object.const_get @soql_object.class_name
       rescue NameError
-        @soql_class = Object.const_set @class_name, Class.new(SoqlData)
-        @soql_class.instance_variable_set(:@soql_object_name, @soql_object)
+        @soql_class = Object.const_set @soql_object.class_name, Class.new(SoqlData)
+        @soql_class.instance_variable_set(:@soql_object_name, @soql_object.backend_name)
       end
 
       # Generate Soql object file
@@ -52,10 +28,10 @@ module LeapSalesforce
         desc = @soql_class.description
         unless desc.soql_fields?
           raise LeapSalesforce::SetupError, "Error producing Soql data for '#{@soql_class}', soql table " \
-          " '#{@soql_object}'. Error message: '#{desc.error_message}'"
+          " '#{@soql_object.backend_name}'. Error message: '#{desc.error_message}'"
         end
         content = read_template 'soql_object.rb.erb', binding
-        file = File.join(SOQL_OBJECT_FOLDER, "#{@class_name.snakecase}.rb")
+        file = File.join(SOQL_OBJECT_FOLDER, "#{@soql_object.reference}.rb")
         generate_file file, content
       end
 
@@ -68,23 +44,19 @@ module LeapSalesforce
 
       # Generate factory for mass generating objects using FactoryBot
       def generate_factory
-        class_method_name = @class_name.snakecase
-        all_fields = @soql_class.fields
-        @default_fields, @other_fields = if DefaultFields.respond_to? class_method_name
-          all_fields.partition { |field| DefaultFields.send(class_method_name).include? field['name'] }
-                                         else
-                                           [[], all_fields]
-                                         end
+        @default_fields, @other_fields = filter_fields
         content = read_template 'factory.rb.erb', binding
-        file = File.join(FACTORY_FOLDER, "#{@class_name.snakecase}.rb")
+        file = File.join(FACTORY_FOLDER, "#{@soql_object.reference}.rb")
         generate_file file, content
       end
 
       # Generate soql_object and it's related modules, factories
       def create_all
-        LeapSalesforce.soql_objects.each do |soql_object|
-          extract_info_from_object soql_object
-          @field_name_file = "#{@class_name.snakecase}_field_names"
+        puts "Generating Soql objects for #{LeapSalesforce.soql_objects.count} objects"
+        LeapSalesforce.soql_objects.each do |soql_object| # Soql object is now special class
+          # extract_info_from_object soql_object
+          @soql_object = soql_object
+          @field_name_file = "#{soql_object.reference}_field_names"
           generate_soql_object
           generate_field_module
           generate_factory
@@ -92,6 +64,19 @@ module LeapSalesforce
         `rubocop -a #{SOQL_OBJECT_FOLDER}`
         `rubocop -a #{FACTORY_FOLDER}`
       end
+
+      private
+
+      # @return [Array] Returns Array with first list being default fields for Factory and the 2nd being
+      #   all other fields
+      def filter_fields
+        all_fields = @soql_class.fields
+        if Default::Fields.respond_to? @soql_object.reference
+          all_fields.partition { |field| Default::Fields.send(@soql_object.reference).include? field['name'] }
+        else
+          [[], all_fields]
+        end
+      end
     end
   end
 end

data/lib/leap_salesforce/generator/templates/.leap_salesforce.yml.erb

@@ -0,0 +1,9 @@
+environment: <%= @environment %>
+# lib_folder: lib/leap_salesforce # Default folder where assets will be stored
+soql_objects:
+  - Case
+  - Contact
+  - Document: ContentDocument
+  - User:
+    create_enum: false # Example of indicating that enumerations are not required to be generated for
+  - Account

data/lib/leap_salesforce/generator/templates/.rspec.erb

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/lib/leap_salesforce/generator/templates/Gemfile.erb

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'leap_salesforce'
+gem 'rspec'

data/lib/leap_salesforce/generator/templates/Rakefile.erb

@@ -0,0 +1,8 @@
+require 'rspec/core/rake_task'
+require 'leap_salesforce/rake'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec
+
+require 'leap_salesforce'

data/lib/leap_salesforce/generator/templates/config/credentials/salesforce_oauth2.yml.erb

@@ -0,0 +1,3 @@
+client_id: '<%= @client_id %>'
+client_secret: '<%= @client_secret %>'
+password: '<%= @password %>'

data/lib/leap_salesforce/generator/templates/config/environments/specific_file.rb.erb

@@ -0,0 +1,4 @@
+# Code specific to setting up the <%= @environment %> environment
+
+Soaspec::OAuth2.debug_oauth = false # Turn this true if you need debug authentication
+Soaspec::SpecLogger.output_to_terminal = false # Turn this to true if you want to see API traffic on the terminal

data/lib/leap_salesforce/generator/templates/config/general.rb.erb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+# Add users to LeapSalesforce context. First user is the default
+module LeapSalesforce
+  Users.add User.new <%= ":#{@user_key}" %>, '<%= @username %>'
+end

data/lib/leap_salesforce/generator/templates/factory.rb.erb

@@ -1,12 +1,12 @@
 # Basic factory settings made according to values defined at
 # https://developer.salesforce.com/docs/atlas.en-us.api.meta/api/sforce_api_objects_case.htm
 FactoryBot.define do
-  <%= "factory :#{@class_name.snakecase} do" %>
+  <%= "factory :#{@soql_object.reference} do" %>
     <% @default_fields.each do |field| %>
-    <%= "#{field['label'].unused_ruby_name} { 'Content depending on #{field['type']}' }" %> <% end %>
+    <%= LeapSalesforce::Default::Factory.value_for(field, @soql_object.class_name) %> <% end %>
     trait :all do
       <% @other_fields.each do |field| %>
-      <%= "#{field['label'].unused_ruby_name} { 'Content depending on #{field['type']}' }" %> <% end %>
+      <%= LeapSalesforce::Default::Factory.value_for(field, @soql_object.class_name) %> <% end %>
     end
   <%= 'end' %>
 end

data/lib/leap_salesforce/generator/templates/soql_object.rb.erb

@@ -1,7 +1,7 @@
 require_relative '<%= @field_name_file %>'
-# An <%= @class_name %> object mapping to a SOQL <%= @soql_object %>
-class <%= @class_name %> < SoqlData
-  include <%= @class_name %>::Fields
-  <%= "soql_object '#{@soql_object}'" unless @soql_object == @class_name %>
-  <%= "create_enum false" if @create_enum == false %>
+# An <%= @soql_object.class_name %> object mapping to a SOQL <%= @soql_object.backend_name %>
+class <%= @soql_object.class_name %> < SoqlData
+  include <%= @soql_object.class_name %>::Fields
+  <%= "soql_object '#{@soql_object.backend_name}'" unless @soql_object.backend_name == @soql_object.class_name %>
+  <%= "create_enum false" if @soql_object.create_enum == false %>
 end

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

@@ -1,5 +1,5 @@
-# Fields for <%= @class_name %> mapped from SOQL <%= @soql_object %>
-class <%= @class_name %> < SoqlData
+# Fields for <%= @soql_object.class_name %> mapped from SOQL <%= @soql_object.backend_name %>
+class <%= @soql_object.class_name %> < SoqlData
   module Fields
     extend SoqlGlobalObjectData
     <% @soql_class.fields.each do |field| %>

data/lib/leap_salesforce/generator/templates/spec/crud_eg_spec.rb.erb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+# This file demonstrates how simple creation, reading updating and deletion (CRUD)
+# can be done through LeapSalesforce classes
+# Depending on validation rules and mandatory fields this may or may not work
+
+RSpec.describe 'Contact CRUD' do
+  let(:uniq_value) { 'UNIQ FIRST NAME' }
+  let(:updated_value) { 'New Value' }
+  it 'Create using factory bot' do
+    @contact = FactoryBot.create(:contact)
+  end
+  it 'Read contact by name' do
+    FactoryBot.create(:contact, first_name: uniq_value)
+    @contact = Contact.find(FirstName: uniq_value)
+    retrieved_first_name = @contact.first_name
+    expect(retrieved_first_name).to eq uniq_value
+  end
+  it 'Updates contacts name' do
+    @contact = FactoryBot.create(:contact, first_name: uniq_value)
+    @contact.first_name = updated_value
+    expect(@contact.find.first_name).to eq updated_value
+  end
+  after { @contact.delete } # Delete data after each action. Comment out if you want data to remain
+end

data/lib/leap_salesforce/generator/templates/spec/limit_spec.rb.erb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+# This test demonstrates how limits can be checked for an organisation to ensure that memory is not run out of
+
+RSpec.describe 'Limits' do
+  let(:soql_limits) { SoqlData.limits }
+  context 'Storage > 4MB' do
+    it 'data storage' do
+      expect(LeapSalesforce::Limits.remaining_for(:DataStorageMB)).to be > 4
+    end
+    it 'file storage' do
+      expect(LeapSalesforce::Limits.remaining_for(:FileStorageMB)).to be > 4
+    end
+  end
+end

data/lib/leap_salesforce/generator/templates/spec/spec_helper.rb.erb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require 'leap_salesforce'
+
+LeapSalesforce.api_user = LeapSalesforce::Users.where(key: <%= ":#{@user_key}" %>)

data/lib/leap_salesforce/limits.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LeapSalesforce
   # Handles retrieving limits of a Salesforce instance
   class Limits
@@ -5,8 +7,7 @@ module LeapSalesforce
       # @param [Symbol, String] limit_name Name of limit to find remaining amount for
       # @return [Integer] Finds remaining amount for a Salesforce limit
       def remaining_for(limit_name)
-        limit_data = SoqlData.limits[limit_name]
-        limit_data['Max'] - limit_data['Remaining']
+        SoqlData.limits[limit_name]['Remaining']
       end
     end
   end

data/lib/leap_salesforce/parameters.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'users/users'
+require_relative 'soql_object'
 
 # Adding parameters to set for authentication
 module LeapSalesforce
@@ -8,6 +9,10 @@ module LeapSalesforce
   @lib_folder = File.join('lib', 'leap_salesforce').freeze
   @objects_to_verify = []
   @soql_objects = []
+  @client_id = ENV['client_id']
+  @client_secret = ENV['client_secret']
+  @password = ENV['password']
+  @environment = nil
   class << self
     # @return [String] Environment to use for tests. This can be accessed to change the username used to login
     #   to test.salesforce with. This can be set on the command line with 'LEAP_ENV'
@@ -48,6 +53,13 @@ module LeapSalesforce
     #   Changes to these values will need to be version controlled
     attr_accessor :objects_to_verify
     # @return [Array] List of Soql Objects identified for Leap Salesforce to maintain
-    attr_accessor :soql_objects
+    attr_reader :soql_objects
+
+    # @return [Array] list_of_soql_objects Array describing Soql objects taken from .leap_salesforce.yml
+    def soql_objects=(list_of_soql_objects)
+      @soql_objects = list_of_soql_objects.collect do |soql_object_desc|
+        SoqlObject.new(soql_object_desc)
+      end
+    end
   end
 end

data/lib/leap_salesforce/rake/setup.rake

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-
-
 namespace :leaps do
   desc 'Create Enumeration objects for picklists from Salesforce Metadata'
   task :create_enums do