eco-helpers 2.5.9 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f78310ad18a148ef707c1735932215754c047041fd3a1539a1434a9d213427d
-  data.tar.gz: 8d795944674e2cb2148a796ca1c1aa0817f342c5ffb9228ef22a99fe3cc39179
+  metadata.gz: 796d1fc03564d9e1bd9389954b164c7d8e1469793871191390824a6e32fabc67
+  data.tar.gz: 7d820fb01377374aca6059f8df28f9bb596c1fa023f7ebbfdc4f94d011e703a7
 SHA512:
-  metadata.gz: 88cbb36569c4683decb9210d9db4ed2da2e205c8d06f170707b15cb9085fa111d39407eefd495211022129c4532172fd69bebe266123ab9a10c4663f2c83a940
-  data.tar.gz: 49795a3e5c994e1d0a74f46257865062501ed0b400fba66a9de1e81c6b3826a3a7f71ebd2e46df48a0d13577cafc677d23e7b60ff9768a42229f18bec4cce703
+  metadata.gz: c89c374aa377818d82d85eba913ffb9392343276373fbca166b53471dc2c70cdd3caa29c7050b7f2547ff3191d5078848238b11a6fe3264171ffc968bb38afb1
+  data.tar.gz: 98f7acfa91c4dd78b2c63340b620a2be5d7407bd074a23ea6908594ac79e126e6e3b1b837e5391acbd64dda59978ca380089f9b8d0b513563ca0c345b1d2b59a

data/.gitignore

@@ -3,7 +3,7 @@ Gemfile.lock
 
 # build artifacts
 *.gem
-/.bundle/
+/.bundle
 /vendor/bundle
 /spec/reports/
 /tmp/
@@ -18,4 +18,4 @@ Gemfile.lock
 # rspec failure tracking
 .rspec_status
 scratch.rb
-.byebug_history
+.byebug_history

data/CHANGELOG.md

@@ -1,13 +1,74 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.5.10] - 2023-09-xx
+## [2.6.1] - 2024-02-xx
+
+### Added
+### Changed
+### Fixed
+
+
+## [2.6.0] - 2024-02-03
+
+### Added
+  - `Eco::API::UseCases::UseCase`
+    - added `#classed_definition` to expose the original class definition
+    - injected further parameter as instance variables to the original class definition on run-time.
+  - Expose `live_trees` retrieval:
+    - `Eco::API::Session#live_trees`
+    - `Eco::API::Session::Config#live_trees`
+  - Ability to CLI-integrate use cases and their options via class
+    - `Eco::API::UseCases::Cli`
+  - Added use case to extract live locations structure (`-export-tree`)
+    - `Eco::API::UseCases::GraphQL::Cases::TagtreeExtract`
+  - `#api?` method to check if an API version is available
+    - `Eco::API::Common::Session::Environment#api?`
+    - `Eco::API::Common::Session::BaseSession#api?`
+  - `Eco::API::Organization::TagTree#merge` the merge method for tagtrees
+    - It allows to have all structure nodes available to check if a tag belongs to them
+  - `Eco::API::Session::Config::Workflow`
+    - **added** `open` alias method for `for`
+  - `Eco::Data::Mapper#self_mapped?` to check if a value maps to itself
+
+### Changed
+  - upgrade `ecoportal-api-graphql`, `ecoportal-api-v2` and `ecoportal-api`
+  - `Eco::API::Session#tagtree`: added parameters to be able to obtain:
+    - `:live` live trees if graphql api is available on the enviro
+    - `:merge` to merge all live trees if there isn't just one
+  - Tagtree retrieval: remove `enviro` param where there's no caching
+    - Removed also from `Eco::API::Organization::TagTree::new`
+  - Removed some use cases:
+    - `Eco::API::UseCases::DefaultCases::AbstractPolicyGroupAbilities`
+    - `Eco::API::UseCases::DefaultCases::AppendUsergroupsCase`
+    - `Eco::API::UseCases::DefaultCases::CreateDetailsCase`
+    - `Eco::API::UseCases::DefaultCases::CreateDetailsWithSupervisorCase`
+    - `Eco::API::UseCases::DefaultCases::EmailAsIdCase`
+    - `Eco::API::UseCases::DefaultCases::NewIdCase`
+    - `Eco::API::UseCases::DefaultCases::RemoveAccountSyncCase`
+    - `Eco::API::UseCases::DefaultCases::RemoveAccountTransCase`
+    - `Eco::API::UseCases::DefaultCases::NewEmailCase`
+    - `Eco::API::UseCases::DefaultCases::SetSupervisorCase`
+    - `Eco::API::UseCases::DefaultCases::TagTree`
+    - `Eco::API::UseCases::DefaultCases::UpdateDetailsCase`
+    - `Eco::API::UseCases::DefaultCases::ResetLandingPageCase`
+  - Moved some default use cases to new namespace `Eco::API::UseCases::Default`
+
+### Fixed
+  - Compatibility with `ruby 3`
+    - replaced `Proc.new` (with no block) by `block` in methods
+    - replaced `File#exists?` by `File#exist?`
+    - call to method's `super` not specifying args, no longer passes keyed/named args via simple splat `*` (but only double splat `**`)
+  - limit `nokogiri` gem to prev `1.16` (as it requires ruby 3 from thereon)
+  - `Eco::API::Common::People::PersonEntryAttributeMapper`
+    - `#aliased_attrs` was missing internal attrs that have been mapped directly as external attrs (same ext attr name as int attr name)
+
+## [2.5.10] - 2023-11-22
 
-### Added
-### Changed
 ### Fixed
+  - `Eco::API::UseCases::DefaultCases::ReinviteSyncCase` remove unnecessary additional parameters on call.
+  - `Eco::API::Session::Config::SFTP#enviro_subpaths` provided that a current workaround can be skipped
 
-## [2.5.9] - 2023-09-01
+## [2.5.9] - 2023-09-05
 
 The input **csv** of trees could come very compacted, which had unintended consequences.
   - This is a fix to this scenario.

data/eco-helpers.gemspec

@@ -24,24 +24,28 @@ Gem::Specification.new do |spec|
   #spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler",   ">= 2.4.8",  "< 3"
-  spec.add_development_dependency "rspec",     ">= 3.10.0", "< 4"
+  spec.add_development_dependency "bundler",   ">= 2.4.12", "< 3"
+  spec.add_development_dependency "rspec",     ">= 3.12.0", "< 4"
   spec.add_development_dependency "rake",      ">= 13.0.3", "< 14"
-  spec.add_development_dependency "yard",      ">= 0.9.26", "< 1"
-  spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 4"
+  spec.add_development_dependency "yard",      ">= 0.9.34", "< 1"
+  spec.add_development_dependency "redcarpet", ">= 3.6.0",  "< 4"
 
-  spec.add_dependency 'ecoportal-api', '>= 0.9.5', '< 0.10'
-  spec.add_dependency 'ecoportal-api-v2', '>= 1.1.3', '< 1.2'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.10', '< 0.4'
-  spec.add_dependency 'aws-sdk-s3',    '>= 1.83.0', '< 2'
-  spec.add_dependency 'aws-sdk-ses',   '>= 1.36.0', '< 2'
-  spec.add_dependency 'dotenv',        '>= 2.7.6',  '< 3'
-  spec.add_dependency 'net-sftp',      '>= 3.0.0',  '< 4'
-  spec.add_dependency 'hashdiff',      '>= 1.0.1',  '< 1.1'
+  spec.add_dependency 'ecoportal-api',         '>= 0.9.6', '< 0.10'
+  spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.5', '< 1.2'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.13', '< 0.4'
+  spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
+  spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'
+  spec.add_dependency 'dotenv',        '>= 2.8.1',  '< 3'
+  spec.add_dependency 'net-ssh',       '>= 7.2.1',  '< 8'
+  spec.add_dependency 'net-sftp',      '>= 4.0.0',  '< 5'
+  spec.add_dependency 'hashdiff',      '>= 1.1.0',  '< 1.2'
   spec.add_dependency 'fuzzy_match',   '>= 2.1.0',  '< 2.2'
-  spec.add_dependency 'amatch',        '>= 0.4.0',  '< 0.5'
-  spec.add_dependency 'jaro_winkler',  '>= 1.5.4',  '< 1.6'
-  spec.add_dependency 'roo',           '>= 2.8.3',  '< 2.9'
+  spec.add_dependency 'amatch',        '>= 0.4.1',  '< 0.5'
+  spec.add_dependency 'jaro_winkler',  '>= 1.5.6',  '< 1.6'
+  spec.add_dependency 'nokogiri',      '>= 1.13',   '< 1.16'
+  spec.add_dependency 'roo',           '>= 2.10.1', '< 2.11'
   spec.add_dependency 'roo-xls',       '>= 1.2.0',  '< 1.3'
-  spec.add_dependency 'docx',          '>= 0.6.2',  '< 0.7'
+  spec.add_dependency 'fast_excel',    '>= 0.5.0',  '< 0.6'
+  spec.add_dependency 'docx',          '>= 0.8.0',  '< 0.9'
+  spec.add_dependency 'rubyzip',       '>= 2.3.2',  '< 2.4'
 end

data/lib/eco/api/common/loaders/base.rb

@@ -30,10 +30,6 @@ module Eco
             raise "You should implement this method"
           end
 
-          def name
-            self.class.name
-          end
-
           private
 
           def session
@@ -54,11 +50,8 @@ module Eco
 
           def abort(msg, raising: true)
             logger.error(msg)
-            if raising
-              raise msg
-            else
-              exit(1)
-            end
+            raise msg if raising
+            exit 1
           end
         end
       end

data/lib/eco/api/common/loaders/use_case.rb

@@ -11,9 +11,31 @@ module Eco
               end
               @type = value
             end
+
+            def cli!
+              cli&.apply!
+            end
+
+            def cli(cli_class = nil)
+              if cli_class.is_a?(Class)
+                raise ArgumentError, "cli_class should inherit from Eco::API::UseCases::Cli" unless cli_class < Eco::API::UseCases::Cli
+                @cli = cli_class
+              elsif cli_class.nil?
+                return @cli if instance_variable_defined?(:@cli) && !@cli.nil?
+                # try to see if it's namespaced after the use case it provisions cli integration
+                begin
+                  try_class = [self.to_s, 'Cli'].join('::')
+                  @cli = Kernel.const_get(try_class)
+                rescue NameError
+                  nil
+                end
+              else
+                raise ArgumentError, "Expecting a class. Given: #{cli_class.class} object"
+              end
+            end
           end
 
-          inheritable_class_vars :type
+          inheritable_class_vars :type, :cli
 
           def initialize(usecases)
             raise "Expected Eco::API::UseCases. Given #{usecases.class}" unless usecases.is_a?(Eco::API::UseCases)
@@ -33,6 +55,10 @@ module Eco
           def type
             self.class.type
           end
+
+          def cli_apply!
+            self.class.cli!
+          end
         end
       end
     end

data/lib/eco/api/common/people/default_parsers.rb

@@ -8,8 +8,8 @@ module Eco
           autoloads_children_of "Eco::API::Common::Loaders::Parser"
           autoload_namespace    "Eco::API::Common::People::DefaultParsers"
 
-          def initialize(*args)
-            super(*args)
+          def initialize(**kargs)
+            super(**kargs)
             define_defaults
           end
 

data/lib/eco/api/common/people/person_entry.rb

@@ -3,6 +3,7 @@ module Eco
     module Common
       module People
         class PersonEntry
+          DEBUG = false
 
           # This class is meant to provide a common interface to access entries of source data that come in different formats.
           # @note
@@ -37,6 +38,8 @@ module Eco
               @mapped_entry       = __mapped_entry(@internal_entry)
               @external_entry     = __external_entry(@mapped_entry)
             end
+
+            (print_models; exit(1)) if DEBUG
           end
 
           # Generates a new entry

data/lib/eco/api/common/people/person_entry_attribute_mapper.rb

@@ -4,6 +4,7 @@ module Eco
       module People
         # @attr_reader direct_attrs [Array<String>] only those internal attributes present in the person entry that do **not** have an internal/external name mapping.
         class PersonEntryAttributeMapper
+          DEBUG = false
           @@cached_warnings = {}
 
           attr_reader :aliased_attrs, :direct_attrs
@@ -182,22 +183,59 @@ module Eco
 
           private
 
+          # Whether the maps include this `attr` as mapped to itself
+          def self_mapped_attr?(attr)
+            return false if !@attr_map
+            @attr_map.self_mapped?(attr)
+          end
+
+          # Whether the maps include this `attr` as mapped from to some other or itself
+          def external_attr?(attr)
+            return false if !@attr_map
+            @attr_map.external?(attr)
+          end
+
           # when parsing:
           def init_attr_trackers
             # (def) all internal attributes we can expect
             def_all_attrs     = @person_parser.all_model_attrs
             # (def) internal attrs with no aliasing nor parser definition (expected to be direct)
             def_unlinked      = @person_parser.undefined_model_attrs.select { |attr| !to_external(attr) }
-            # (def) those with parser or alias:
-            def_linked        = def_all_attrs - def_unlinked
+
+            debug(
+              def_unlinked,
+              "(def_unlinked) expected to be direct (not parser defined nor aliased)"
+            )
+
             # (data) data attributes (actual attributes of the entry)
             data_attrs        = attributes(@external_entry)
+            # (data) attributes of the data that COULD come directly as internal attribute names
+            # => WARNING: this includes ext direct attrs that may be aliased to other int attrs
+            data_direct_attrs_raw   = data_attrs & def_all_attrs
+            # (data) direct (int) ext data attrs mapped
+            data_direct_mapped      = data_direct_attrs_raw.select { |attr| external_attr?(attr) }
+            # (data) direct (int) ext data attrs mapped to themselves
+            data_direct_self_mapped = data_direct_attrs_raw.select { |attr| self_mapped_attr?(attr) }
+            # (data) direct (int) ext data attrs mapped only to another attr
+            data_direct_renamed     = data_direct_mapped - data_direct_self_mapped
             # (data) attributes of the data that come directly as internal attribute names
-            data_direct_attrs = data_attrs & def_all_attrs
+            data_direct_attrs       = data_direct_attrs_raw - data_direct_renamed
+
+            debug(
+              data_direct_attrs,
+              "(data_direct_attrs) attributes of the data that come directly as internal attribute names (data_direct_attrs_raw - data_direct_renamed)"
+            )
+
+            # (def) configured as alised (int <-> ext attrs) + accept/include int attrs as ext attrs
+            def_int_aliased_raw = def_all_attrs.select  { |attr| to_external(attr) }
+            # (def) aliasable int attrs of the input data (excludes int attrs direct as ext attrs that got renamed)
+            def_int_aliased     = def_int_aliased_raw - data_direct_renamed
+            # (def) ext attrs of the data's aliasable int attrs (def_int_aliased)
+            def_ext_alias       = def_int_aliased.map   { |attr| to_external(attr) }
+            # (def) those ext attrs that map to multiple int attrs
+            def_ext_multi_alias = def_ext_alias.detect  { |attr| def_ext_alias.count(attr) > 1 }
+            # (def) those ext attrs that are direct, mapt to themselves and some other
 
-            # (def) configured  as alised (internal <-> external attributes)
-            def_int_aliased   = def_all_attrs.select  { |attr| to_external(attr) }
-            def_ext_alias     = def_int_aliased.map   { |attr| to_external(attr) }
 
             # (data) virtual attrs (external alias of non native internal attr in data):
             data_vi_ext_alias = data_attrs.select do |attr|
@@ -210,27 +248,78 @@ module Eco
               @attr_map.to_internal(attr)
             end.compact
 
-            # (data) attrs that could come aliased in the current data
+            # (data) int attrs that come aliased in the current data
             # => modify aliased based on those that came directly as internal attrs in the entry
-            data_def_int_aliased = def_int_aliased - data_direct_attrs
+            data_def_int_aliased = (def_int_aliased - data_direct_attrs) | data_direct_self_mapped
             data_def_ext_alias   = data_def_int_aliased.map { |attr| to_external(attr) }
-            # (data) actual attrs of the data that come aliased
+            # (data) ext attrs of the data that come aliased
             data_ext_alias       = data_def_ext_alias & data_attrs
+            # (data) all internal attributes that come aliased, with given the entry
+            aliased_attrs        = data_def_int_aliased | data_vi_int_aliased
+
+            # render in the order that defines the model
+            @aliased_attrs       = (def_all_attrs & aliased_attrs) | (aliased_attrs - def_all_attrs)
+
+            debug(
+              data_vi_int_aliased,
+              "(data_vi_int_aliased) virtual internal attrs (internal names of those virtual attrs)"
+            )
+
+            debug(
+              def_int_aliased,
+              "(def_int_aliased) aliasable int attrs of the input data (excludes int attrs direct as ext attrs that got renamed)"
+            )
+
+            debug(
+              def_ext_alias,
+              "(def_ext_alias) ext attrs of the data's aliasable int attrs (def_int_aliased)"
+            )
+
+            debug(
+              data_def_int_aliased,
+              "(data_def_int_aliased) int attrs that come aliased in the current data ((def_int_aliased - data_direct_attrs) | data_direct_self_mapped)"
+            )
+
+            debug(
+              data_ext_alias,
+              "(data_ext_alias) ext attrs of the data that come aliased (data_def_ext_alias & data_attrs)"
+            )
+
+            debug(
+              aliased_attrs,
+              "(aliased_attrs) all internal attributes that come aliased, with given the entry (data_def_int_aliased | data_vi_int_aliased)"
+            )
 
-            # (data) all internal attributes that could come aliased, with given the entry
-            @aliased_attrs       = data_def_int_aliased + data_vi_int_aliased
             # (data) all those ext attrs present that will require aliasing
             #data_ext_alias_all   = data_def_ext_alias   + data_vi_ext_alias
-            data_ext_alias_all   = data_ext_alias       + data_vi_ext_alias
+            data_ext_alias_all   = data_ext_alias | data_vi_ext_alias
+
+            debug(
+              data_ext_alias_all,
+              "(data_ext_alias_all) all those ext attrs present that will require aliasing (data_ext_alias | data_vi_ext_alias)"
+            )
 
             # those that are direct external to internal:
             data_ext_direct      = data_attrs - data_ext_alias_all
-
             # (data) attributes that do not require aliasing
             # to avoid collisions between internal names:
-            #@direct_attrs        = data_ext_direct - def_linked
-            @direct_attrs        = data_ext_direct
-            @internal_attrs      = @aliased_attrs | @direct_attrs
+            direct_attrs         = data_ext_direct
+            # render in the order that defines the model
+            @direct_attrs        = (def_all_attrs & direct_attrs) | (direct_attrs - def_all_attrs)
+
+            # (data) attributes that are being aliased
+            internal_attrs       = @aliased_attrs | @direct_attrs
+            # render in the order that defines the model
+            @internal_attrs      = (def_all_attrs & internal_attrs) | (internal_attrs - def_all_attrs)
+
+            debug(
+              @direct_attrs,
+              "(@direct_attrs) attributes that do not require aliasing (data_attrs - data_ext_alias_all)"
+            )
+            debug(
+              @internal_attrs,
+              "(@internal_attrs) aliased_attrs | @direct_attrs"
+            )
           end
 
           def attributes(value)
@@ -265,6 +354,12 @@ module Eco
             logger.fatal(msg)
             raise msg
           end
+
+          def debug(var, msg)
+            return unless DEBUG
+            puts "\n  • #{msg}:"
+            pp var
+          end
         end
       end
     end

data/lib/eco/api/common/session/base_session.rb

@@ -35,6 +35,10 @@ module Eco
             enviro.api(version: version)
           end
 
+          def api?(version: nil)
+            enviro.api?(version: version)
+          end
+
           def file_manager
             enviro.file_manager
           end

data/lib/eco/api/common/session/environment.rb

@@ -53,6 +53,10 @@ module Eco
           def api(version: nil)
             config.api(logger, version: version)
           end
+
+          def api?(version:)
+            config.apis.active_api.version_available?(version)
+          end
         end
       end
     end

data/lib/eco/api/common/session/sftp.rb

@@ -24,7 +24,7 @@ module Eco
             rescue Exception => e
               msg = "Could not open SFTP session. Possible misconfiguration: #{e}"
               logger.error(msg)
-              raise msg
+              raise
             end
             @sftp_session
           end

data/lib/eco/api/organization/tag_tree.rb

@@ -19,7 +19,6 @@ module Eco
         attr_reader :parent
         attr_reader :nodes, :children_count
         attr_reader :depth, :path
-        attr_reader :enviro
 
         attr_reader :source
 
@@ -35,7 +34,7 @@ module Eco
         #    ]}]
         #    tree = TagTree.new(tree.to_json)
         # @param tagtree [String] representation of the tagtree in json.
-        def initialize(tagtree = [], name: nil, id: nil, depth: -1, path: [], parent: nil, _weight: nil, enviro: nil)
+        def initialize(tagtree = [], name: nil, id: nil, depth: -1, path: [], parent: nil, _weight: nil)
           @depth  = depth
           @parent = parent
 
@@ -45,9 +44,7 @@ module Eco
           else
             @source = tagtree
           end
-          fatal("You are trying to initialize a TagTree with a null tagtree") if !@source
-          fatal("Expecting Environment object. Given: #{enviro}") if enviro && !enviro.is_a?(API::Common::Session::Environment)
-          @enviro = enviro
+          raise ArgumentError, "You are trying to initialize a TagTree with a null tagtree" if !@source
 
           if @source.is_a?(Array)
             @id        = id
@@ -66,7 +63,7 @@ module Eco
           @path.push(@id) unless top?
 
           @nodes = @raw_nodes.map.with_index do |cnode, idx|
-            TagTree.new(cnode, depth: depth + 1, path: @path.dup, parent: self, _weight: idx, enviro: @enviro)
+            self.class.new(cnode, depth: depth + 1, path: @path.dup, parent: self, _weight: idx)
           end
 
           init_hashes
@@ -80,11 +77,28 @@ module Eco
           !archived?
         end
 
+        # @note that archived nodes will also be passed over to the copy
         # @return [Eco::API::Organization::TagTree]
         def dup
           self.class.new(as_json, name: name, id: id)
         end
 
+        # @return [Array] with the differences
+        def diff(tagtree, differences: {}, level: 0, **options)
+          require 'hashdiff'
+          Hashdiff.diff(self.as_json, tagtree.as_json, **options.slice(:array_path, :similarity, :use_lcs))
+        end
+
+        # It generates a merged tagtree out of two sources
+        # @note it merges the first level nodes (and their children) as it comes
+        # @return [Eco::API::Organization::TagTree] result of merging both trees
+        def merge(other)
+          raise ArgumentError, "Expecting Eco::API::Organization::TagTree. Given: #{other.class}" unless other.is_a?(Eco::API::Organization::TagTree)
+          mid   = [self.id, other.id].join('|')
+          mname = [self.name, other.name].join('|')
+          self.class.new(as_json | other.as_json, id: mid, name: mname)
+        end
+
         # @return [Eco::API::Organization::TagTree] with **non** `archived` nodes only
         def active_tree
           self.class.new(as_json(include_archived: false), name: name, id: id)
@@ -162,12 +176,6 @@ module Eco
           parent.name unless parent.top?
         end
 
-        # @return [Array] with the differences
-        def diff(tagtree, differences: {}, level: 0, **options)
-          require 'hashdiff'
-          Hashdiff.diff(self.as_json, tagtree.as_json, **options.slice(:array_path, :similarity, :use_lcs))
-        end
-
         def top?
           depth == -1
         end
@@ -410,17 +418,6 @@ module Eco
             h.merge(n.hash_paths)
           end
         end
-
-        def fatal(msg)
-          raise msg if !@enviro
-          @enviro.logger.fatal(msg)
-          raise msg
-        end
-
-        def warn(msg)
-          raise msg if !@enviro
-          @enviro.logger.warn(msg)
-        end
       end
     end
   end

data/lib/eco/api/session/batch/job.rb

@@ -105,7 +105,7 @@ module Eco
                 unless unique && @queue_hash.key?(entry)
                   @queue_hash[entry] = true
                   @queue.push(entry)
-                  @callbacks[entry]  = Proc.new if block_given?
+                  @callbacks[entry]  = block if block_given?
                 end
               end
             end
@@ -230,13 +230,13 @@ module Eco
             end.join("\n")
           end
 
-          def as_update(data, *args)
+          def as_update(data, **kargs)
             if data.is_a?(Array)
               data.map do |e|
-                feedback.as_update(e, *args)
+                feedback.as_update(e, **kargs)
               end.compact.select {|e| e && !e.empty?}
             else
-              feedback.as_update(data, *args)
+              feedback.as_update(data, **kargs)
             end
           end
 

data/lib/eco/api/session/batch/jobs.rb

@@ -74,10 +74,10 @@ module Eco
           # @yieldparam job [Eco::API::Session::Batch::Job] the job we have launched against the server.
           # @yieldparam status [Eco::API::Session::Batch::Status] the status of the batch job launch.
           # @return [Eco::API::Session::Batch::Job]
-          def add(job)
+          def add(job, &block)
             fatal "Expected Eco::API::Session::Batch::Job object. Given #{job.class}" unless job.is_a?(Eco::API::Session::Batch::Job)
             @jobs[job.name] = job
-            @callbacks[job] = Proc.new if block_given?
+            @callbacks[job] = block if block_given?
           end
 
           def pending?

data/lib/eco/api/session/batch/jobs_groups.rb

@@ -63,7 +63,7 @@ module Eco
           # @yieldparam group [Eco::API::Session::Batch::Jobs] the group of jobs we have launched against the server.
           # @yieldparam group_status [Hash<Eco::API::Session::Batch::Job, Eco::API::Session::Batch::Status>] the status of the launched batch jobs.
           # @return [Eco::API::Session::Batch::Jobs] the group of jobs.
-          def new(name, order: :last)
+          def new(name, order: :last, &block)
             fatal "Can't create job group named '#{name}' because it already exists." if exists?(name)
 
             Batch::Jobs.new(enviro, name: name).tap do |group|
@@ -75,7 +75,7 @@ module Eco
                 @order.unshift(group)
               end
 
-              @callbacks[group] = Proc.new if block_given?
+              @callbacks[group] = block if block_given?
             end
           end
 

data/lib/eco/api/session/config/files.rb

@@ -26,9 +26,9 @@ module Eco
 
           attr_key :timestamp_pattern
 
-          def add_validation(format)
+          def add_validation(format, &block)
             raise "Block must be given" unless block_given?
-            @validations[format] = Proc.new
+            @validations[format] = block
           end
 
           def validate(format, input)

data/lib/eco/api/session/config/people.rb

@@ -48,9 +48,9 @@ module Eco
           end
 
           # with given a person what is the criteria of exclusion
-          def api_excluded
+          def api_excluded(&block)
             return self["api_excluded"] unless block_given?
-            self["api_excluded"] = Proc.new
+            self["api_excluded"] = block
           end
 
           # internal-external fields map

data/lib/eco/api/session/config/sftp.rb

@@ -12,6 +12,10 @@ module Eco
             !!required
           end
 
+          def enviro_subpaths
+            self['enviro_subpaths'] ||= {}
+          end
+
           def enviro_subpath
             enviro_subpaths[config.active_enviro]
           end