eco-helpers 3.0.30 → 3.0.32

data/lib/eco/api/usecases/default_cases/to_csv_case.rb

@@ -137,16 +137,16 @@ class Eco::API::UseCases::DefaultCases::ToCsvCase < Eco::API::Common::Loaders::U
 
   def nice_header_maps
     @nice_header_maps ||= {
-      "policy_group_ids"   => "User Group(s)",
-      "email"              => "Email",
-      "name"               => "Name",
-      "supervisor_id"      => "Manager ID",
-      "filter_tags"        => "Locations",
-      "default_tag"        => "Default Location",
-      "id"                 => "ecoPortal ID",
-      "external_id"        => "Reference ID (ext_id)",
-      "login_provider_ids" => "Login Methods",
-      "landing_page_id"    => "Landing Page ID"
+      'policy_group_ids'   => 'User Group(s)',
+      'email'              => 'Email',
+      'name'               => 'Name',
+      'supervisor_id'      => 'Manager ID',
+      'filter_tags'        => 'Locations',
+      'default_tag'        => 'Default Location',
+      'id'                 => 'ecoPortal ID',
+      'external_id'        => 'Reference ID (ext_id)',
+      'login_provider_ids' => 'Login Methods',
+      'landing_page_id'    => 'Landing Page ID'
     }
   end
 end

data/lib/eco/api/usecases/default_cases/to_csv_detailed_case.rb

@@ -1,11 +1,11 @@
 class Eco::API::UseCases::DefaultCases::ToCsvDetailedCase < Eco::API::UseCases::DefaultCases::ToCsvCase
-  name "to-csv-detailed"
+  name 'to-csv-detailed'
   type :export
 
   private
 
   def to_row(person)
-    data = super(person)
+    data = super
     data << person_supervisor(person)
     data += user_abilities(person)
     data += user_permissions_custom(person) if options.dig(:export, :options, :permissions_custom)
@@ -17,18 +17,18 @@ class Eco::API::UseCases::DefaultCases::ToCsvDetailedCase < Eco::API::UseCases::
 
   def person_supervisor(person)
     session.micro.with_supervisor(person.supervisor_id, people) do |supervisor|
-      return supervisor ? supervisor.name : ""
+      return supervisor ? supervisor.name : ''
     end
   end
 
   def user_abilities(person)
     account_abilities = (person.account && person.account.permissions_merged) || {}
-    abilities.map {|key| account_abilities[key] || "no access"}
+    abilities.map {|key| account_abilities[key] || 'no access'}
   end
 
   def user_permissions_custom(person)
     account_abilities = (person.account && person.account.permissions_custom) || {}
-    abilities.map {|key| account_abilities[key] || "no access"}
+    abilities.map {|key| account_abilities[key] || 'no access'}
   end
 
   def user_preferences(person)
@@ -38,17 +38,17 @@ class Eco::API::UseCases::DefaultCases::ToCsvDetailedCase < Eco::API::UseCases::
 
   def spot_header(person = people.first)
     super(person) do |header|
-      header << "Supervisor Name"
+      header << 'Supervisor Name'
       header += abilities_header
-      header += abilities_header("custom") if options.dig(:export, :options, :permissions_custom)
-      header << "Landing Page"
+      header += abilities_header('custom') if options.dig(:export, :options, :permissions_custom)
+      header << 'Landing Page'
       header += preferences
       header
     end
   end
 
   def keys(entry)
-    super(entry) + ["freemium"]
+    super | ['freemium']
   end
 
   def login_providers
@@ -66,52 +66,52 @@ class Eco::API::UseCases::DefaultCases::ToCsvDetailedCase < Eco::API::UseCases::
   end
 
   def preferences
-    @preferences ||= [
-      "show_sidebar", "show_shortcuts", "show_coming_soon", "show_recently_visited_forms",
-      "show_tasks", "show_task_bubbles",
-      "kiosk_enabled"
+    @preferences ||= %w[
+      show_sidebar, show_shortcuts, show_coming_soon, show_recently_visited_forms,
+      show_tasks, show_task_bubbles,
+      kiosk_enabled
     ]
   end
 
   def nice_header_maps
     @nice_header_maps ||= super.merge({
-      "landing_page_id"    => "Landing Page ID",
-      "show_sidebar"       => "(pref) Sidebar Open?",
-      "show_shortcuts"     => "(pref) Link to Registers?",
-      "show_coming_soon"   => "(pref) Coming Soon List?",
-      "show_recently_visited_forms" => "(pref) Recently Visited Forms List?",
-      "show_tasks"         => "(pref) Tasks List?",
-      "show_task_bubbles"  => "(pref) Task Count Bubbles",
-      "kiosk_enabled"      => "Kiosk User?",
-      "freemium"           => "Freemium User?",
-      "files"              => "(able) on Files",
-      "reports"            => "(able) on Report Structures",
-      "data"               => "(able) on Data (hours, datasets)",
-      "organization"       => "(able) on Organization Config",
-      "pages"              => "(able) on Page/Entries",
-      "page_editor"        => "(able) page Editor Level",
-      "registers"          => "(able) on Registers",
-      "tasks"              => "(able) on Tasks",
-      "person_core"        => "(able) on People",
-      "person_core_create" => "(able) Create People?",
-      "person_core_edit"   => "(able) Edit People?",
-      "person_details"     => "(able) on People Schema Details",
-      "person_account"     => "(able) on Users",
-      "person_abilities"   => "(able) on Users' Abilities",
-      "custom_files"              => "(min) on Files",
-      "custom_reports"            => "(min) on Report Structures",
-      "custom_data"               => "(min) on Data (hours, datasets)",
-      "custom_organization"       => "(min) on Organization Config",
-      "custom_pages"              => "(min) on Page/Entries",
-      "custom_page_editor"        => "(min) page Editor Level",
-      "custom_registers"          => "(min) on Registers",
-      "custom_tasks"              => "(min) on Tasks",
-      "custom_person_core"        => "(min) on People",
-      "custom_person_core_create" => "(min) Create People?",
-      "custom_person_core_edit"   => "(min) Edit People?",
-      "custom_person_details"     => "(min) on People Schema Details",
-      "custom_person_account"     => "(min) on Users",
-      "custom_person_abilities"   => "(min) on Users' Abilities"
+      'landing_page_id'             => 'Landing Page ID',
+      'show_sidebar'                => '(pref) Sidebar Open?',
+      'show_shortcuts'              => '(pref) Link to Registers?',
+      'show_coming_soon'            => '(pref) Coming Soon List?',
+      'show_recently_visited_forms' => '(pref) Recently Visited Forms List?',
+      'show_tasks'                  => '(pref) Tasks List?',
+      'show_task_bubbles'           => '(pref) Task Count Bubbles',
+      'kiosk_enabled'               => 'Kiosk User?',
+      'freemium'                    => 'Freemium User?',
+      'files'                       => '(able) on Files',
+      'reports'                     => '(able) on Report Structures',
+      'data'                        => '(able) on Data (hours, datasets)',
+      'organization'                => '(able) on Organization Config',
+      'pages'                       => '(able) on Page/Entries',
+      'page_editor'                 => '(able) page Editor Level',
+      'registers'                   => '(able) on Registers',
+      'tasks'                       => '(able) on Tasks',
+      'person_core'                 => '(able) on People',
+      'person_core_create'          => '(able) Create People?',
+      'person_core_edit'            => '(able) Edit People?',
+      'person_details'              => '(able) on People Schema Details',
+      'person_account'              => '(able) on Users',
+      'person_abilities'            => "(able) on Users' Abilities",
+      'custom_files'                => '(min) on Files',
+      'custom_reports'              => '(min) on Report Structures',
+      'custom_data'                 => '(min) on Data (hours, datasets)',
+      'custom_organization'         => '(min) on Organization Config',
+      'custom_pages'                => '(min) on Page/Entries',
+      'custom_page_editor'          => '(min) page Editor Level',
+      'custom_registers'            => '(min) on Registers',
+      'custom_tasks'                => '(min) on Tasks',
+      'custom_person_core'          => '(min) on People',
+      'custom_person_core_create'   => '(min) Create People?',
+      'custom_person_core_edit'     => '(min) Edit People?',
+      'custom_person_details'       => '(min) on People Schema Details',
+      'custom_person_account'       => '(min) on Users',
+      'custom_person_abilities'     => "(min) on Users' Abilities"
     })
   end
 end

data/lib/eco/api/usecases/default_cases/update_case.rb

@@ -1,10 +1,10 @@
 class Eco::API::UseCases::DefaultCases::UpdateCase < Eco::API::Common::Loaders::UseCase
-  name "update"
+  name 'update'
   type :sync
 
   def main(entries, people, session, options, usecase)
-    update   = session.new_job("main", "update", :update, usecase)
-    supers   = session.new_job("post", "supers", :update, usecase, :core)
+    update   = session.new_job('main', 'update', :update, usecase)
+    supers   = session.new_job('post', 'supers', :update, usecase, :core)
 
     micro.with_each_present(entries, people, options, log_starter: true) do |entry, person|
       update.add(person)

data/lib/eco/api/usecases/graphql/samples/location/service/tree_diff/convertible/inputable.rb

@@ -46,7 +46,10 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
         end
 
         def input_folder
-          File.join(config.active_enviro, self.class::IN_FOLDER)
+          File.join(
+            config.active_enviro,
+            self.class::IN_FOLDER
+          )
         end
       end
     end

data/lib/eco/api/usecases/lib/files/sftp.rb

@@ -59,7 +59,11 @@ module Eco::API::UseCases::Lib::Files
     def sftp_move_file(source, dest)
       sftp.move(source, dest, 0x0001) do |response|
         if response.ok?
-          log(:info) { "#{source}\n  -to-> #{dest}"    }
+          log(:info) {
+            msg  = 'Moving file '
+            msg << "#{source}\n  -to-> #{dest}"
+            msg
+          }
         else
           log(:info) { "Could not move file #{source}" }
         end

data/lib/eco/cli/config/use_cases/active_case.rb

@@ -0,0 +1,9 @@
+module Eco
+  class CLI
+    class Config
+      class UseCases
+        ActiveCase = Struct.new(:index, :option, :callback)
+      end
+    end
+  end
+end

data/lib/eco/cli/config/use_cases/case_config.rb

@@ -0,0 +1,27 @@
+module Eco
+  class CLI
+    class Config
+      class UseCases
+        CaseConfig = Struct.new(
+          :cases_config,
+          :option,
+          :type,
+          :description,
+          :casename,
+          :callback
+        ) do
+          def add_option(arg, desc = nil, &block)
+            core_config.options_set.add(arg, desc, namespace: option, &block)
+            self
+          end
+
+          private
+
+          def core_config
+            cases_config.core_config
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eco/cli/config/use_cases.rb

@@ -1,3 +1,5 @@
+require_relative 'use_cases/case_config'
+require_relative 'use_cases/active_case'
 module Eco
   class CLI
     class Config
@@ -5,21 +7,6 @@ module Eco
         include Eco::CLI::Config::Help
         attr_reader :core_config
 
-        CaseConfig = Struct.new(:cases_config, :option, :type, :description, :casename, :callback) do
-          def add_option(arg, desc = nil, &block)
-            core_config.options_set.add(arg, desc, namespace: option, &block)
-            self
-          end
-
-          private
-
-          def core_config
-            cases_config.core_config
-          end
-        end
-
-        ActiveCase = Struct.new(:index, :option, :callback)
-
         def initialize(core_config:)
           @core_config  = core_config
           @linked_cases = {}

data/lib/eco/cli_default/usecases.rb

@@ -1,5 +1,5 @@
 ASSETS.cli.config do |cnf| # rubocop:disable Metrics/BlockLength
-  cnf.usecases do |cases| # rubocop:disable Metrics/BlockLength
+  cnf.usecases do |cases|
     desc = 'It exports to a CSV the (filtered) people'
     cases.add('-people-to-csv', :export, desc) do |people, session, options|
       file = SCR.get_file('-people-to-csv', required: true, should_exist: false)

data/lib/eco/data/files/helpers.rb

@@ -115,7 +115,10 @@ module Eco
         end
 
         def folder_files(folder = '.', pattern = '*', regexp: nil, older_than: nil)
+          return [] unless folder.is_a?(String)
+
           target = File.join(File.expand_path(folder), pattern)
+
           Dir[target].tap do |dir_files|
             dir_files.select! {|f| File.file?(f)}
 

data/lib/eco/language/delegation/delegating_blank.rb

@@ -10,6 +10,8 @@ module Eco::Language::Delegation
         super
 
         base.include DelegatingMissing
+        base.send :include, Eco::Language::Methods::InstanceMethodHelpers
+
         base.extend ClassMethods
         base.inheritable_class_vars :_delegating_blank
       end
@@ -70,7 +72,7 @@ module Eco::Language::Delegation
       private
 
       def method_added(method_name)
-        return super if (@installing ||= false)
+        return super if (@installing ||= false) # rubocop:disable Style/ParenthesesAroundCondition
 
         method_name = method_name.to_sym
         return super unless delegating_blank?(method_name)
@@ -96,7 +98,7 @@ module Eco::Language::Delegation
 
         return unless instance_method?(base, name: method_name, include_private: true)
 
-        method_was_inherited = inherited_method?(base, name: method_name)
+        method_was_inherited = instance_inherited_method?(base, name: method_name)
         original_method      = :"delegated_blank_original_#{method_name}"
 
         return if instance_method?(base, name: original_method, include_private: true, inherited: false)
@@ -124,20 +126,6 @@ module Eco::Language::Delegation
         base.define_method(method_name, &method_def)
       end
 
-      def instance_method?(base = self, name:, include_private: false, inherited: true)
-        return true  if base.method_defined?(name, inherited)
-        return false unless include_private
-
-        base.private_instance_methods(inherited).include?(name.to_sym)
-      end
-
-      def inherited_method?(base = self, name:)
-        return false if base.public_instance_methods(false).include?(name.to_sym)
-        return false if base.private_instance_methods(false).include?(name.to_sym)
-
-        true
-      end
-
       def sym_or_string?(value)
         return false unless value.is_a?(Symbol) || value.is_a?(String)
         return false if value.to_s.strip.empty?

data/lib/eco/language/delegation/delegating_missing_const.rb

@@ -42,7 +42,7 @@ module Eco::Language::Delegation
       def initialize(...)
         super if defined?(super)
 
-        delegated_class.tap do |klass|
+        delegated_class.tap do
           next unless (target = self.class.delegating_missing_target(self))
 
           self.class.delegated_class target.class

data/lib/eco/language/methods/call_detector.rb

@@ -1,11 +1,7 @@
-module Eco
-  module Language
-    module Methods
-      module CallDetector
-        def called_via?(klass, sym)
-          klass == method(sym).owner
-        end
-      end
+module Eco::Language::Methods
+  module CallDetector
+    def called_via?(klass, sym)
+      klass == method(sym).owner
     end
   end
 end

data/lib/eco/language/methods/dsl_able.rb

@@ -1,41 +1,37 @@
-module Eco
-  module Language
-    module Methods
-      # Adds #evaluate, which will run `&block` where `DslAble` has been included.
-      # @note
-      #   1. If a method is missing on the evaluation object, it will re-try it on
-      #     on the block context.
-      #   2. **Override behaviour**: the above gives precedence to
-      #     methods defined in the context of the object that evaluates,
-      #     over those in the block context.
-      module DslAble
-        # It runs the `block` within this object context
-        # @note if the object misses any method, redirects the method to the
-        #   original evaluate caller.
-        def evaluate(*args, **kargs, &block)
-          return unless block_given?
+module Eco::Language::Methods
+  # Adds #evaluate, which will run `&block` where `DslAble` has been included.
+  # @note
+  #   1. If a method is missing on the evaluation object, it will re-try it on
+  #     on the block context.
+  #   2. **Override behaviour**: the above gives precedence to
+  #     methods defined in the context of the object that evaluates,
+  #     over those in the block context.
+  module DslAble
+    # It runs the `block` within this object context
+    # @note if the object misses any method, redirects the method to the
+    #   original evaluate caller.
+    def evaluate(*args, **kargs, &block)
+      return unless block_given?
 
-          @self_before_evaluate = eval('self', block.binding, __FILE__, __LINE__)
+      @self_before_evaluate = eval('self', block.binding, __FILE__, __LINE__)
 
-          instance_exec(*args, **kargs, &block).tap do
-            @self_before_evaluate = nil
-          end
-        end
+      instance_exec(*args, **kargs, &block).tap do
+        @self_before_evaluate = nil
+      end
+    end
 
-        # When it's the case, redirect to the original `evaluate` caller
-        # @see https://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
-        def method_missing(method, *args, **kargs, &block)
-          super unless @self_before_evaluate
+    # When it's the case, redirect to the original `evaluate` caller
+    # @see https://www.dan-manges.com/blog/ruby-dsls-instance-eval-with-delegation
+    def method_missing(method, *args, **kargs, &block)
+      super unless @self_before_evaluate
 
-          @self_before_evaluate.send(method, *args, **kargs, &block)
-        end
+      @self_before_evaluate.send(method, *args, **kargs, &block)
+    end
 
-        # This allows to capture a method using `name` method.
-        # @note that for a Dsl this is not necessary
-        def respond_to_missing?(name, include_private = false)
-          super
-        end
-      end
+    # This allows to capture a method using `name` method.
+    # @note that for a Dsl this is not necessary
+    def respond_to_missing?(name, include_private = false)
+      super
     end
   end
 end

data/lib/eco/language/methods/instance_method_helpers.rb

@@ -0,0 +1,38 @@
+module Eco::Language::Methods
+  # Helpers to scope instance methods.
+  module InstanceMethodHelpers
+    class << self
+      def included(base)
+        super
+
+        base.extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      private
+
+      def unless_instance_method(base = self, name:, include_private: true, inherited: true)
+        return false if instance_method?(base, name: name, include_private: include_private, inherited: inherited)
+
+        yield if block_given?
+
+        true
+      end
+
+      def instance_method?(base = self, name:, include_private: false, inherited: true)
+        return true  if base.method_defined?(name, inherited)
+        return false unless include_private
+
+        base.private_instance_methods(inherited).include?(name.to_sym)
+      end
+
+      def instance_inherited_method?(base = self, name:)
+        return false if base.public_instance_methods(false).include?(name.to_sym)
+        return false if base.private_instance_methods(false).include?(name.to_sym)
+
+        true
+      end
+    end
+  end
+end

data/lib/eco/language/methods.rb

@@ -5,5 +5,6 @@ module Eco
   end
 end
 
+require_relative 'methods/instance_method_helpers'
 require_relative 'methods/call_detector'
 require_relative 'methods/dsl_able'

data/lib/eco/language.rb

@@ -4,8 +4,8 @@ module Eco
 end
 
 require_relative 'language/strings'
-require_relative 'language/klass'
 require_relative 'language/methods'
+require_relative 'language/klass'
 require_relative 'language/models'
 require_relative 'language/auxiliar_logger'
 require_relative 'language/basic_logger'

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '3.0.30'.freeze
+  VERSION = '3.0.32'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 3.0.30
+  version: 3.0.32
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -243,7 +243,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: 0.10.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -253,7 +253,7 @@ dependencies:
         version: '0.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.9
+        version: 0.10.10
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-graphql
   requirement: !ruby/object:Gem::Requirement
@@ -932,6 +932,8 @@ files:
 - lib/eco/cli/config/input.rb
 - lib/eco/cli/config/options_set.rb
 - lib/eco/cli/config/use_cases.rb
+- lib/eco/cli/config/use_cases/active_case.rb
+- lib/eco/cli/config/use_cases/case_config.rb
 - lib/eco/cli/scripting.rb
 - lib/eco/cli/scripting/args_helpers.rb
 - lib/eco/cli/scripting/argument.rb
@@ -1028,6 +1030,7 @@ files:
 - lib/eco/language/methods.rb
 - lib/eco/language/methods/call_detector.rb
 - lib/eco/language/methods/dsl_able.rb
+- lib/eco/language/methods/instance_method_helpers.rb
 - lib/eco/language/models.rb
 - lib/eco/language/models/class_helpers.rb
 - lib/eco/language/models/collection.rb