sf_cli 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e22af218b203252c97bf0021671105be00d1af29161b2a087e23256cc81d8505
-  data.tar.gz: a8a84e90555ebd665651137ea7d339768f68cb211ab9d1c10df328bbb2f28842
+  metadata.gz: a644e819d71225a7ac587cd46e40d47d2c1d766a4cc7ff237c9d90ffd9b3ab2c
+  data.tar.gz: 806e3a803d8a7fdbafab63930c7c4cbe0438819804a8a37e71fdcac2d565378b
 SHA512:
-  metadata.gz: 64e83911a17efb2b59760c52e5722e9437c83888dea7a05c4a56477c24f919b6c35b43a96fb19e20dfec15cdea0ade7c501d8f40b214971b6da2263dc393ee20
-  data.tar.gz: f1b8fc98e0c1f3f429b9cc6af47a50bdb32b71014dc530c430225591d8ea08ae238347fe293d141870c51fa5608c06113bc52f9a8c953728317ff456fa119cc5
+  metadata.gz: 0c61efe52e48624aa6948ec16df153b15a813207096bbdc72239d25a43b9b9105d7d5e8d2f5d1e165b9ad03d779cf65fcec9978f4b1ef47afb923a327805eea6
+  data.tar.gz: cb0d416817d9e4d698b87db6353083aee9a14aa860c86b166396bb3ce66f640c4c74d89906bbfd203a53b63c27ee90d69f62b67ecb9f529e3bea81115d7507eb

data/lib/sf_cli/console/commands.rb

@@ -1,8 +1,5 @@
 require 'sf_cli'
 require 'byebug'
-require 'sf_cli/sf/model'
-require 'sf_cli/sf/model/query_condition'
-require 'sf_cli/sf/model/sf_command_connection'
 require 'stringio'
 
 module SfCli
@@ -12,36 +9,8 @@ module SfCli
     # Developer Console commands
     #
     module Commands
-      def use(target_org)
-        org_info = sf.org.display target_org: target_org
-        conn = SfCli::Sf::Model::SfCommandConnection.new target_org: target_org, instance_url: org_info.instance_url
-        conn.open unless org_info.connected?
-
-        SfCli::Sf::Model.set_connection conn
-
-        available_models.each do |model|
-          Object.const_get(model).connection = conn
-        end
-
-        true
-      end
-
-      def available_models
-        @available_models ||= []
-      end
-
-      def generate(*object_types)
-        SfCli::Sf::Model.generate object_types
-        available_models.append(*object_types).flatten
-        object_types
-      end
-
-      def connection
-        SfCli::Sf::Model.connection
-      end
-
       def target_org
-        connection.target_org
+        @target_org
       end
 
       def apex(apex_code = nil)
@@ -62,68 +31,6 @@ module SfCli
         system 'sf org list'
         conf.inspect_mode = true
       end
-
-      alias :gen  :generate
-      alias :conn :connection
-
-      def help
-        conf.inspect_mode = false
-        puts <<~HELP
-          Available commands:
-            use   --- set current org.
-            gen   --- generate Object model classes
-            query --- Query by SOQL with human readable format
-            apex  --- run Apex code
-            conn  --- show current connection setting
-            orgs  --- show the list of org
-
-          Syntax:
-            [use]
-              use target-org
-
-              parameters:
-                targat-org --- Username or alias of the org you are going to use. If you are not sure about them, check by `sf org list`.
-
-              example:
-                use :your_org_alias
-
-            [gen]
-              gen object-name, object-name, ...
-              generate object-name, object-name, ...
-
-              parameters:
-                object-name --- Comma separated Names. Symbol or String can be OK. At least 1 object name is required.
-
-              example:
-                gen :Account, :Contact, :User
-
-            [query]
-              query SOQL
-
-                parameters:
-                  SOQL --- soql.You must quote it like "SELECT ...."
-
-              example:
-                query "SELECT Id, Name FROM Account LIMIT 3"
-
-            [apex]
-              apex apex_code
-
-              parameters:
-                apex code --- Apex code you want to execute.You must quote the code.
-
-              example:
-                apex "System.debug('abc');"
-
-            [conn]
-                conn
-                connection
-
-            [orgs]
-                orgs
-        HELP
-        conf.inspect_mode = true
-      end
     end
   end
 end

data/lib/sf_cli/console.rb

@@ -2,4 +2,4 @@ require 'sf_cli/console/commands'
 
 include SfCli::Console::Commands
 
-use ARGV[0] if ARGV[0]
+@target_org = ARGV[0]

data/lib/sf_cli/sf/apex/core.rb

@@ -1,5 +1,6 @@
 require_relative '../core/base'
 require_relative './run'
+require_relative './generate'
 
 module SfCli
   module Sf
@@ -12,6 +13,7 @@ module SfCli
       class Core
         include ::SfCli::Sf::Core::Base
         include Run
+        include Generate
       end
     end
   end

data/lib/sf_cli/sf/apex/generate.rb

@@ -0,0 +1,63 @@
+module SfCli::Sf::Apex
+  module Generate
+    # Generate an Apex class
+    # @param name        [String,Symbol] Apex class name
+    # @param output_dir  [String]        directory for saving the created files
+    # @param template    [String,Symbol] template to use for file creation.Permissible values are: ApexException, ApexUnitTest, BasicUnitTest, DefaultApexClass, InboundEmailService
+    # @param api_version [Numeric]       override the api version used for api requests made by this command
+    # @param raw_output  [Boolian]       output what original command shows
+    #
+    # @return [Array] the list of files that is created
+    #
+    # @see https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_apex_commands_unified.htm#cli_reference_apex_generate_class_unified command reference
+    #
+    def generate_class(name, output_dir: nil, template: nil, api_version: nil, raw_output: false)
+      flags = {
+        :"name" => name,
+        :"output-dir" => output_dir,
+        :"template" => template,
+        :"api-version" => api_version,
+      }
+      switches = {
+      }
+      command_output_format = raw_output ? :human : :json
+      redirect_type = raw_output ? nil : :null_stderr
+      action = __method__.to_s.tr('_', ' ')
+      output = exec(action, flags: flags, switches: switches, redirection: redirect_type, raw_output: raw_output, format: command_output_format)
+      return output if raw_output
+
+      output['result']['created']
+    end
+
+    # Generate an Apex trigger
+    # @param name        [String,Symbol] Name of the generated Apex trigger
+    # @param output_dir  [String]        directory for saving the created files
+    # @param sobject     [String,Symbol] Salesforce object to generate a trigger on
+    # @param event       [Array]         Events that fire the trigger.Permissible values are: "before insert", "before update", "before delete", "after insert", "after update", "after delete", "after undelete"
+    # @param api_version [Numeric]       override the api version used for api requests made by this command
+    # @param raw_output  [Boolian]       output what original command shows
+    #
+    # @return [Array] the list of files that is created
+    #
+    # @see https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_apex_commands_unified.htm#cli_reference_apex_generate_trigger_unified command reference
+    #
+    def generate_trigger(name, output_dir: nil, sobject: nil, event: nil, api_version: nil, raw_output: false)
+      flags = {
+        :"name" => name,
+        :"output-dir" => output_dir,
+        :"sobject" => sobject,
+        :"event" => event&.map{|ev| %|"#{ev}"|}&.join(' '),
+        :"api-version" => api_version,
+      }
+      switches = {
+      }
+      command_output_format = raw_output ? :human : :json
+      redirect_type = raw_output ? nil : :null_stderr
+      action = __method__.to_s.tr('_', ' ')
+      output = exec(action, flags: flags, switches: switches, redirection: redirect_type, raw_output: raw_output, format: command_output_format)
+      return output if raw_output
+
+      output['result']['created']
+    end
+  end
+end

data/lib/sf_cli/sf/core/base.rb

@@ -47,8 +47,11 @@ module SfCli
           if format.to_sym == :json
             ' ' + {json: true}.merge(hash).each_with_object([]){|(k,v), arr| arr << %(--#{k}) if v}.join(' ')
           else
-            return '' if hash.empty?
-            hash.each_with_object([]){|(k,v), arr| arr << %(--#{k}) if v}.join(' ')
+            options = hash.each_with_object([]){|(k,v), arr| arr << %(--#{k}) if v}.join(' ')
+            return '' if options.empty?
+
+            options = ' ' + options unless options.start_with?(' ')
+            return options
           end
         end
 

data/lib/sf_cli/sf/lightning/core.rb

@@ -0,0 +1,19 @@
+require_relative '../core/base'
+require_relative './generate'
+
+module SfCli
+  module Sf
+    #
+    # Lightning Commands
+    #
+    # @see https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_lightning_commands_unified.htm command reference
+    #
+    module Lightning
+      # @private :nodoc: just for developers
+      class Core
+        include ::SfCli::Sf::Core::Base
+        include Generate
+      end
+    end
+  end
+end

data/lib/sf_cli/sf/lightning/generate.rb

@@ -0,0 +1,34 @@
+module SfCli::Sf::Lightning
+  module Generate
+    # Generate an Apex class
+    # @param name        [String,Symbol] component name
+    # @param type        [String,Symbol] component type.Only aura or lwc is permissible.
+    # @param output_dir  [String]        directory for saving the created files
+    # @param template    [String,Symbol] Template to use for file creation.Permissible values are: default, analyticsDashboard, analyticsDashboardWithStep
+    # @param api_version [Numeric]       override the api version used for api requests made by this command
+    # @param raw_output  [Boolian]       output what original command shows
+    #
+    # @return [Array] the list of files that is created
+    #
+    # @see https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_lightning_commands_unified.htm#cli_reference_lightning_generate_component_unified command reference
+    #
+    def generate_component(name, type: nil, output_dir: nil, template: nil, api_version: nil, raw_output: false)
+      flags = {
+        :"name" => name,
+        :"output-dir"  => output_dir,
+        :"type"        => type,
+        :"template"    => template,
+        :"api-version" => api_version,
+      }
+      switches = {
+      }
+      command_output_format = raw_output ? :human : :json
+      redirect_type = raw_output ? nil : :null_stderr
+      action = __method__.to_s.tr('_', ' ')
+      output = exec(action, flags: flags, switches: switches, redirection: redirect_type, raw_output: raw_output, format: command_output_format)
+      return output if raw_output
+
+      output['result']['created']
+    end
+  end
+end

data/lib/sf_cli/sf/main.rb

@@ -15,7 +15,7 @@ module SfCli
     class Main
       include Singleton
 
-      OPERATION_CATEGORIES = %w[Org Sobject Data Project Apex]
+      OPERATION_CATEGORIES = %w[Org Sobject Data Project Apex Lightning]
 
       OPERATION_CATEGORIES.each do |category|
         require_relative %(#{category.downcase}/core)

data/lib/sf_cli/sf/project/core.rb

@@ -2,6 +2,7 @@ require_relative '../core/base'
 require_relative './generate'
 require_relative './generate_manifest'
 require_relative './retrieve_start'
+require_relative './deploy_start'
 
 module SfCli
   module Sf
@@ -17,6 +18,7 @@ module SfCli
         include Generate
         include GenerateManifest
         include RetrieveStart
+        include DeployStart
       end
     end
   end

data/lib/sf_cli/sf/project/deploy_start.rb

@@ -0,0 +1,80 @@
+module SfCli::Sf::Project
+  module DeployStart
+    Result = Struct.new(:done, :details, :id, :status, :success, :files) do
+        def success?
+          success
+        end
+      end
+
+    DeployedFile = Data.define(:full_name, :type, :state, :file_path)
+
+    # Deploy metadata to an org from your local project.
+    # @param manifest         [String]        path of the manifest file(package.xml) that specifies the components to retrieve
+    # @param metadata         [Array]         metadata names that specifies the components to retrieve
+    # @param source_dir       [String]        file or directory path to retrieve from the org.
+    # @param target_org       [Symbol,String] an alias of paticular org, or username can be used
+    # @param api_version      [Numeric]       override the api version used for api requests made by this command
+    # @param wait             [Integer]       number of minutes to wait for command to complete
+    # @param raw_output       [Boolian]       output what original command shows
+    # @param dry_run          [Boolian]       validate deploy and run Apex tests but don’t save to the org.
+    # @param ignore_conflicts [Boolian]       ignore conflicts and deploy local files, even if they overwrite changes in the org.
+    # @param ignore_errors    [Boolian]       ignore any errors and don’t roll back deployment. Never use this flag when deploying to a production org. 
+    # @param ignore_warnings  [Boolian]       ignore warnings and allow a deployment to complete successfully.
+    # @param metadata_dir     [Symbol,String] root of directory or zip file of metadata formatted files to deploy.
+    # @param single_package   [Boolian]       indicates that the metadata zip file points to a directory structure for a single package.
+    # @param tests            [Array]         Apex tests to run when --test-level is RunSpecifiedTests.
+    # @param test_level       [Symbol,String] deployment Apex testing level. Available values are NoTestRun, RunSpecifiedTests, RunLocalTests, RunAllTestsInOrg.
+    #
+    # @return [Result] the retsult of the command
+    #
+    # @see https://developer.salesforce.com/docs/atlas.en-us.sfdx_cli_reference.meta/sfdx_cli_reference/cli_reference_project_commands_unified.htm#cli_reference_project_deploy_start_unified command reference
+    #
+    def deploy_start(metadata: nil, manifest: nil,  source_dir: nil, target_org: nil, raw_output: false, metadata_dir: nil, tests: nil, test_level: nil,
+      api_version: nil, wait: nil, dry_run: false, ignore_conflicts: false, ignore_errors: false, ignore_warnings: false, single_package: false)
+
+      flags = {
+        :manifest       => manifest,
+        :metadata       => metadata&.join(' '),
+        :"source-dir"   => source_dir,
+        :"target-org"   => target_org,
+        :"api-version"  => api_version,
+        :"metadata-dir" => metadata_dir,
+        :tests          => tests&.join(' '),
+        :"test-level"   => test_level,
+        :"wait"         => wait,
+      }
+      switches = {
+        :"dry-run"          => dry_run,
+        :"ignore-conflicts" => ignore_conflicts,
+        :"ignore-errors"    => ignore_errors,
+        :"ignore-warnings"  => ignore_warnings,
+        :"single-package"   => single_package,
+      }
+      action = __method__.to_s.tr('_', ' ')
+      command_output_format = raw_output ? :human : :json
+      redirect_type = raw_output ? nil : :null_stderr
+      output = exec(action, flags: flags, switches: switches, redirection: redirect_type, raw_output: raw_output, format: command_output_format)
+      return output if raw_output
+
+      Result.new(
+        done:    output['result']['done'],
+        id:      output['result']['id'],
+        details: output['result']['details'],
+        status:  output['result']['status'],
+        success: output['result']['success'],
+        files:   output['result']['files'].map{|f| create_deployed_file(f)}
+      )
+    end
+
+    private
+
+    def create_deployed_file(hash)
+      DeployedFile.new(
+        full_name: hash['fullName'],
+        type:      hash['type'],
+        state:     hash['state'],
+        file_path: hash['filePath']
+      )
+    end
+  end
+end

data/lib/sf_cli/version.rb

@@ -1,3 +1,3 @@
 module SfCli
-  VERSION = '1.2.4'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,28 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: sf_cli
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Takanobu Maekawa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-04 00:00:00.000000000 Z
+date: 2024-11-20 00:00:00.000000000 Z
 dependencies: []
 description: A library for introducing Salesforce CLI to Ruby scripting.
 email:
-executables:
-- sf_cli
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/sf_cli
 - lib/sf_cli.rb
 - lib/sf_cli/command_exec_error.rb
 - lib/sf_cli/console.rb
 - lib/sf_cli/console/commands.rb
 - lib/sf_cli/sf/apex/core.rb
+- lib/sf_cli/sf/apex/generate.rb
 - lib/sf_cli/sf/apex/run.rb
 - lib/sf_cli/sf/core/base.rb
 - lib/sf_cli/sf/core/org_base.rb
@@ -41,15 +40,9 @@ files:
 - lib/sf_cli/sf/data/update_record.rb
 - lib/sf_cli/sf/data/upsert_bulk.rb
 - lib/sf_cli/sf/data/upsert_resume.rb
+- lib/sf_cli/sf/lightning/core.rb
+- lib/sf_cli/sf/lightning/generate.rb
 - lib/sf_cli/sf/main.rb
-- lib/sf_cli/sf/model.rb
-- lib/sf_cli/sf/model/base_methods.rb
-- lib/sf_cli/sf/model/class_definition.rb
-- lib/sf_cli/sf/model/dml_methods.rb
-- lib/sf_cli/sf/model/generator.rb
-- lib/sf_cli/sf/model/query_condition.rb
-- lib/sf_cli/sf/model/query_methods.rb
-- lib/sf_cli/sf/model/sf_command_connection.rb
 - lib/sf_cli/sf/org/core.rb
 - lib/sf_cli/sf/org/display.rb
 - lib/sf_cli/sf/org/list.rb
@@ -58,6 +51,7 @@ files:
 - lib/sf_cli/sf/org/list_metadata_types.rb
 - lib/sf_cli/sf/org/login.rb
 - lib/sf_cli/sf/project/core.rb
+- lib/sf_cli/sf/project/deploy_start.rb
 - lib/sf_cli/sf/project/generate.rb
 - lib/sf_cli/sf/project/generate_manifest.rb
 - lib/sf_cli/sf/project/retrieve_start.rb

data/bin/sf_cli

@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'optparse'
-require 'sf_cli'
-require 'sf_cli/version'
-
-def generate_project(project_name, params)
-  base_dir        = Dir.pwd
-  target_org      = params[:"target-org"]
-  retrieve_source = params[:retrieve]
-  editor          = params[:editor]
-
-  sf.project.generate project_name, manifest: true
-
-  Dir.chdir project_name
-
-  sf.project.generate_manifest from_org: target_org, output_dir: 'manifest' if target_org
-  sf.project.retrieve_start manifest: 'manifest/package.xml', target_org: target_org if retrieve_source
-  system 'code .' if editor
-ensure
-  Dir.chdir base_dir
-end
-
-params = {}
-opt = OptionParser.new
-Version = SfCli::VERSION
-
-opt.on('-i', '--irb', 'Start irb session that integrates sf_cli and object model library.') { system 'irb -r sf_cli/console' }
-opt.on('-g OBJECT', '--generate', 'Generate OBJECT. As of now, only project is available as OBJECT.')
-opt.on('-o TARGET_ORG', '--target-org', 'Username or alias of the target org. When specified with "-g project", the manifest file is created based on the org')
-opt.on('-r', '--retrieve', 'Retrieve source files.When specified with "-g project", source files is loaded according to the manifest file.')
-opt.on('-e', '--editor', 'Open VS Code for current directory. When specified with "-g project", it opens the project directory')
-
-opt.parse!(ARGV, into: params)
-
-if params[:generate] == 'project'
-  generate_project(ARGV[0], params)
-elsif params[:editor]
-  system 'code .'
-end

data/lib/sf_cli/sf/model/base_methods.rb

@@ -1,63 +0,0 @@
-module SfCli
-  module Sf
-    module Model
-      # @private :nodoc: just for developers
-      module BaseMethods
-        def self.included(c)
-          c.extend ClassMethods
-        end
-
-        module ClassMethods
-          def connection
-            @connection
-          end
-
-          def connection=(conn)
-            @connection = conn
-          end
-
-          def describe
-            connection.describe(name.to_sym)
-          end
-        end
-
-        def initialize(attributes = {})
-          @original_attributes = {}
-          @current_attributes = {}
-          @updated_attributes = {}
-
-          attributes.each do |k, v|
-            field_name = k.to_sym
-            if self.class.field_names.include?(field_name)
-              @original_attributes[field_name] = v
-              __send__ (field_name.to_s + '='), v
-            elsif self.class.parent_relations.find{|r| r[:name] == field_name}
-              __send__ (field_name.to_s + '='), v
-            elsif self.class.children_relations.find{|r| r[:name] == field_name}
-              __send__ (field_name.to_s + '='), (v.nil? ? [] : v)
-            end
-          end
-        end
-
-        def to_h(keys: nil)
-          self.class.field_names.each_with_object({}) do |name, hash|
-            if keys&.instance_of?(Array)
-              hash[name] = __send__(name) if keys.include?(name)
-            else
-              hash[name] = __send__(name)
-            end
-          end
-        end
-
-        def new_record?
-          self.Id.nil?
-        end
-
-        def persisted?
-          new_record? == false
-        end
-      end
-    end
-  end
-end
-

data/lib/sf_cli/sf/model/class_definition.rb

@@ -1,104 +0,0 @@
-require_relative './base_methods'
-require_relative './dml_methods'
-require_relative './query_methods'
-
-module SfCli
-  module Sf
-    module Model
-      # @private :nodoc: just for developers
-      class ClassDefinition
-        attr_reader :schema
-
-        def initialize(schema)
-          @schema = schema
-        end
-
-        def to_s
-          <<~Klass
-            Class.new do
-              include ::SfCli::Sf::Model::BaseMethods
-              include ::SfCli::Sf::Model::DmlMethods
-              include ::SfCli::Sf::Model::QueryMethods
-
-              attr_reader :original_attributes, :current_attributes, :updated_attributes
-
-              #{ class_methods }
-
-              #{ field_attribute_methods  }
-              #{ parent_relation_methods }
-              #{ children_relation_methods }
-            end
-          Klass
-        end
-
-        def class_methods
-          <<~EOS
-            class << self
-              def field_names
-                @field_names ||= #{ schema.field_names }
-              end
-
-              def parent_relations
-                @parent_relations ||= #{ schema.parent_relations }
-              end
-
-              def children_relations
-                @children_relations ||= #{ schema.children_relations }
-              end
-            end
-          EOS
-        end
-
-        def field_attribute_methods
-          schema.field_names.each_with_object('') do |name, s|
-            s << <<~EOS
-              def #{name}
-                @#{name}
-              end
-
-              def #{name}=(value)
-                @#{name} = value
-                return if %i[Id LastModifiedDate IsDeleted SystemModstamp CreatedById CreatedDate LastModifiedById].include?(:#{name})
-
-                current_attributes[:#{name}] = value
-                if current_attributes[:#{name}] == original_attributes[:#{name}]
-                  updated_attributes[:#{name}] = nil
-                else
-                  updated_attributes[:#{name}] = value
-                end
-              end
-            EOS
-          end
-        end
-
-        def parent_relation_methods
-          schema.parent_relations.each_with_object('') do |r, s|
-            s << <<~EOS
-              def #{r[:name]}
-                @#{r[:name]}
-              end
-
-              def #{r[:name]}=(attributes)
-                @#{r[:name]} = attributes.nil? ? nil : #{r[:class_name]}.new(attributes)
-              end
-            EOS
-          end
-        end
-
-        def children_relation_methods
-          schema.children_relations.each_with_object('') do |r, s|
-            s << <<~EOS
-              def #{r[:name]}
-                @#{r[:name]}
-              end
-
-              def #{r[:name]}=(records)
-                @#{r[:name]} = records.map{|attributes| #{r[:class_name]}.new(attributes)}
-              end
-            EOS
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sf_cli/sf/model/dml_methods.rb

@@ -1,37 +0,0 @@
-module SfCli
-  module Sf
-    module Model
-      # @private :nodoc: just for developers
-      module DmlMethods
-        def self.included(c)
-          c.extend ClassMethods
-        end
-
-        def save
-          if new_record?
-            self.Id = self.class.connection.create(self.class.name.to_sym, current_attributes.reject{|_,v| v.nil?})
-          else
-            self.class.connection.update(self.class.name.to_sym, self.Id, updated_attributes.reject{|_,v| v.nil?})
-          end
-
-          @original_attributes = current_attributes.dup
-          @updated_attributes = {}
-
-          self.Id
-        end
-
-        def delete
-          return if self.Id.nil?
-
-          self.class.connection.delete(self.class.name.to_sym, self.Id)
-        end
-
-        module ClassMethods
-          def create(values = {})
-            connection.create(name.to_sym, values, Object.const_get(name.to_sym))
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sf_cli/sf/model/generator.rb

@@ -1,40 +0,0 @@
-require_relative './class_definition'
-
-module SfCli
-  module Sf
-    module Model
-      # @private :nodoc: just for developers
-      class Generator
-        attr_reader :connection
-
-        def initialize(connection)
-          @connection = connection
-        end
-
-        def generate(object_name)
-          return false if generated? object_name
-
-          schema = describe(object_name)
-          class_definition = ClassDefinition.new(schema)
-
-          instance_eval "::#{object_name} = #{class_definition}"
-          klass = Object.const_get object_name.to_sym
-          klass.connection = connection
-
-          true
-        end
-
-        def describe(object_name)
-          connection.describe object_name
-        end
-
-        def generated?(object_name)
-          Object.const_get object_name.to_sym
-          true
-        rescue NameError
-          false
-        end
-      end
-    end
-  end
-end

data/lib/sf_cli/sf/model/query_condition.rb

@@ -1,198 +0,0 @@
-require 'date'
-
-module SfCli
-  module Sf
-    module Model
-      module QueryMethods
-        # @private :nodoc: just for developers
-        class QueryCondition
-          attr_reader :connection,
-                      :object_name,
-                      :all_field_names,
-                      :fields,
-                      :conditions,
-                      :limit_num,
-                      :row_order,
-                      :count_select,
-                      :max_select_field,
-                      :min_select_field
-
-          def initialize(connection, object_name, field_names)
-            @object_name = object_name
-            @all_field_names = field_names 
-            @connection = connection
-            @fields = []
-            @conditions = [] 
-            @limit_num = nil
-            @row_order = nil
-            @count_select = false
-            @max_select_field = nil
-            @min_select_field = nil
-          end
-
-          def where(*expr)
-            return self unless valid_expr?(expr)
-
-            conditions.append to_string_expr(expr)
-            self
-          end
-
-          def not(*expr)
-            return self unless valid_expr?(expr)
-
-            conditions.append %|(NOT(#{to_string_expr(expr)}))|
-            self
-          end
-
-          def select(*expr)
-            return self if expr&.empty?
-
-            if expr.size > 1
-              @fields = self.fields + expr
-            else
-              self.fields << expr.first
-            end
-            return self
-          end
-
-          def limit(num)
-            @limit_num = num
-            return self
-          end
-
-          def order(*fields)
-            return self if fields&.empty?
-
-            @row_order = fields
-            return self
-          end
-
-          def to_soql
-            base   = 'SELECT %{select} FROM %{object}' % {select: select_fields, object: object_name}
-            where  = conditions.size.zero?  ? nil : 'WHERE %{where}'    % {where: conditions.flatten.join(' AND ')}
-            _order = row_order.nil?         ? nil : 'ORDER BY %{order}' % {order: row_order.join(', ')}
-            limit  = limit_num.nil?         ? nil : 'LIMIT %{limit}'    % {limit: limit_num} 
-
-            [base, where, _order, limit].compact.join(' ')
-          end
-
-          def to_csv
-            connection.query(to_soql, Object.const_get(object_name.to_sym), :csv)
-          end
-
-          def all
-            connection.query(to_soql, Object.const_get(object_name.to_sym))
-          end
-
-          def pluck(field_name)
-            connection.query(to_soql, nil).map{|record| record[field_name.to_s]}
-          end
-
-          def take
-            limit(1).all.first
-          end
-
-          def count
-            @count_select = true
-            connection.query(to_soql, nil).first['expr0']
-          end
-
-          def max(field_name)
-            @max_select_field = field_name
-            connection.query(to_soql, nil).first['expr0']
-          end
-
-          def min(field_name)
-            @min_select_field = field_name
-            connection.query(to_soql, nil).first['expr0']
-          end
-
-          private
-
-          def select_fields
-            return 'COUNT(Id)'                if count_select
-            return "MAX(#{max_select_field})" if max_select_field
-            return "MIN(#{min_select_field})" if min_select_field
-
-            (fields.empty? ? all_field_names : fields).join(', ')
-          end 
-
-          def to_string_expr(expr)
-            return str_by_ternary_expr(expr) if expr.size > 1
-            return expr[0] if expr[0].instance_of? String
-
-            strs_by_hash_expr(expr)
-          end
-
-          def str_by_ternary_expr(expr)
-            return self if expr.size < 3
-
-            value = case expr[2].class.name.to_sym
-                    when :String
-                      %|'#{expr[2]}'|
-                    when :Time
-                      expr[2].to_datetime
-                    when :NilClass
-                      :null
-                    when :Array
-                      candidates = expr[2].map do |o|
-                          case o.class.name.to_sym
-                          when :String
-                            %|'#{o}'|
-                          when :Time
-                            o.to_datetime
-                          when :NilClass
-                            :null
-                          else
-                            o
-                          end
-                        end
-                      %|(#{candidates.join(', ')})|
-                    else
-                      expr[2]
-                    end
-            %|#{expr[0]} #{expr[1]} #{value}|
-          end
-
-          def valid_expr?(expr)
-            return false if expr&.empty?
-            return false if expr.map{|o| (o == '' || o == {} || o == []) ? nil : o}.compact.size.zero?
-            return false unless [Hash, Symbol, String].any?{|klass| expr.first.instance_of? klass}
-
-            true
-          end
-
-          def strs_by_hash_expr(expr)
-            expr[0].map do |k,v|
-              case v.class.name.to_sym
-              when :String
-                %|#{k} = '#{v}'|
-              when :Time
-                %|#{k} = #{v.to_datetime}|
-              when :NilClass
-                %|#{k} = null|
-              when :Array
-                candidates = v.map do |o|
-                    case o.class.name.to_sym
-                    when :String
-                      %|'#{o}'|
-                    when :Time
-                      %|#{o.to_datetime}|
-                    when :NilClass
-                      :null
-                    else
-                      o
-                    end
-                  end
-                %|#{k} IN (#{candidates.join(', ')})|
-              else
-                "#{k} = #{v}"
-              end
-            end
-            .join(' AND ')
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sf_cli/sf/model/query_methods.rb

@@ -1,84 +0,0 @@
-require_relative './query_condition'
-
-module SfCli
-  module Sf
-    module Model
-      # @private :nodoc: just for developers
-      module QueryMethods
-        def self.included(c)
-          c.extend ClassMethods
-        end
-
-        module ClassMethods
-          def where(*expr)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.where(*expr)
-            return qc
-          end
-
-          def select(*fields)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.select(*fields)
-            return qc
-          end
-
-          def limit(num)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.limit(num)
-            qc
-          end
-
-          def order(*field_names)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.order(*field_names)
-            qc
-          end
-
-          def find(id)
-            connection.find(name.to_sym, id, Object.const_get(name.to_sym))
-          end
-
-          def find_by(*find_condition)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.where(*find_condition).take
-          end
-
-          def all
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.all
-          end
-
-          def to_csv
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.to_csv
-          end
-
-          def pluck(field_name)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.pluck(field_name)
-          end
-
-          def take
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.take
-          end
-
-          def count
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.count
-          end
-
-          def max(field_name)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.max(field_name)
-          end
-
-          def min(field_name)
-            qc = QueryCondition.new(connection, self.name, self.field_names)
-            qc.min(field_name)
-          end
-        end
-      end
-    end
-  end
-end

data/lib/sf_cli/sf/model/sf_command_connection.rb

@@ -1,79 +0,0 @@
-require_relative '../sobject/core'
-require_relative '../data/core'
-require_relative '../org/core'
-
-module SfCli
-  module Sf
-    module Model
-      #
-      # Connection object to access Salesforce based on Sf command
-      #
-      class SfCommandConnection
-        attr_reader :target_org, :instance_url
-
-        # @private :nodoc: just for developers
-        attr_reader :sf_data, :sf_org, :sf_sobject
-
-        # @param target_org   [Symbol,String] an alias of paticular org, or username can be used
-        # @param instance_url [String]        URL of the instance that the org lives on.
-        #
-        def initialize(target_org: nil, instance_url: nil)
-          @sf_org = ::SfCli::Sf::Org::Core.new
-          @sf_data = ::SfCli::Sf::Data::Core.new
-          @sf_sobject = ::SfCli::Sf::Sobject::Core.new
-          @target_org = target_org
-          @instance_url = instance_url
-        end
-
-        def open
-          if ENV['SF_ACCESS_TOKEN']
-            sf_org.login_access_token target_org: target_org, instance_url: instance_url
-          else
-            sf_org.login_web target_org: target_org, instance_url: instance_url
-          end
-        end
-
-        # Sf command style query interface for Model module
-        #
-        # For query details, see {SfCli::Sf::Data::Query sf data query}
-        #
-        def exec_query(soql, format: nil, bulk: false, wait: nil, model_class: nil)
-          sf_data.query(soql, target_org: target_org, format: format, bulk: bulk, wait: wait, model_class: model_class)
-        end
-
-        # @private :nodoc: just for developers
-        def find(object_type, id, klass)
-          sf_data.get_record object_type, record_id: id, target_org: target_org, model_class: klass
-        end
-
-        # @private :nodoc: just for developers
-        def create(object_type, values, klass = nil)
-          id = sf_data.create_record object_type, values: values, target_org: target_org
-          return id if klass.nil?
-
-          find(object_type, id, klass)
-        end
-
-        # @private :nodoc: just for developers
-        def update(object_type, id, values)
-          sf_data.update_record object_type, record_id: id, where: nil, values: values, target_org: target_org
-        end
-
-        # @private :nodoc: just for developers
-        def delete(object_type, id)
-          sf_data.delete_record object_type, record_id: id, where: nil, target_org: target_org
-        end
-
-        # @private :nodoc: just for developers
-        def query(soql, klass, format = nil)
-          sf_data.query soql, target_org: target_org, format: format, model_class: klass
-        end
-
-        # @private :nodoc: just for developers
-        def describe(object_type)
-          sf_sobject.describe(object_type, target_org: target_org)
-        end
-      end
-    end
-  end
-end

data/lib/sf_cli/sf/model.rb

@@ -1,31 +0,0 @@
-require_relative 'model/generator'
-
-module SfCli
-  module Sf
-    #
-    # The module for object model definition and generation
-    #
-    module Model
-      # The connection object to access Salesforce
-      def self.connection
-        @@connection
-      end
-
-      # set the connection
-      def self.set_connection(conn)
-        @@connection = conn
-      end
-
-      # generate object models
-      # @param object_names [Array] a list of object name
-      #
-      def self.generate(object_names)
-        generator = Generator.new(connection)
-
-        object_names.each do |object_name|
-          generator.generate(object_name)
-        end
-      end
-    end
-  end
-end