eco-helpers 2.2.5 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0281c78aabb03180573c1089c8c7fbea48f9efcdc9b26ca44ff7027dff1fade4'
-  data.tar.gz: 3c0aed71b46dfa29012ee171492d4ed26a19d7ed3a173ea548f12123a5f52469
+  metadata.gz: 4cf51ce07b09a2eaa798de0b8524206de5a91160bd3d5df2af980c8985bfbdda
+  data.tar.gz: a203cc025f972e1b35c605450f42556911b913d43f8b860ff8e6f346eb93fb91
 SHA512:
-  metadata.gz: 2f1e8b821ec4d9a62bb4820e0a4c57afd9cf60af897585b474b89063ea0ce260ebb26dd7c9f09d5d3abcac2ab92f53f0bb41d10fff59228006a3c244b2774197
-  data.tar.gz: ee33bfe26cb343df58e437dc8fb1bdc48c5117171fff82adb54fa6f864205a3de927eeb41689a118943936e9d8c42d8085d69aea3ad23c84045faa0dc142300d
+  metadata.gz: ff86775ef30897999f6e109cb7a442fb0d8eaeae789715a91f62483d56c181a553f99a8d6c6aa7ce406da0577bfe1b0c90a02fcc918dbde7d8cecba398df032a
+  data.tar.gz: a16c1de5d41090ad98adcd8540da800a5bb0857c7f15bbc9c88898d0885d2f9ae9392a1b699c4d26e8378d9799d750a509230924076ffc1570a2418b08bfffb0

data/CHANGELOG.md

@@ -1,12 +1,39 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.2.6] - 2023-03-xx
+## [2.3.4] - 2023-03-xx
 
 ### Added
+  - Added new option `-input-encoding` to specify the encoding of an input file
+
 ### Changed
+  - `ecoportal-api` **gem** update
+
 ### Fixed
 
+## [2.3.3] - 2023-03-16
+
+### Added
+  - Added new option `-input-encoding` to specify the encoding of an input file
+
+### Changed
+  - `ecoportal-api` **gem** update
+  
+
+## [2.3.2] - 2023-03-10
+
+### Fixed
+  - upgraded core library gems:
+    - `ecoportal-api`
+
+## [2.3.1] - 2023-03-09
+
+### Changed
+  - upgraded core library gems:
+    - `ecoportal-api`
+    - `ecoportal-api-v2`
+    - `ecoportal-api-graphql`
+
 ## [2.2.5] - 2023-03-07
 
 ### Fixed

data/eco-helpers.gemspec

@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard",      ">= 0.9.26", "< 0.10"
   spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 3.6"
 
-  spec.add_dependency 'ecoportal-api', '>= 0.8.5', '< 0.9'
-  spec.add_dependency 'ecoportal-api-v2', '>= 1.0.1', '< 1.1'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.2.3', '< 0.3'
+  spec.add_dependency 'ecoportal-api', '>= 0.9.3', '< 0.10'
+  spec.add_dependency 'ecoportal-api-v2', '>= 1.1.1', '< 1.2'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.1', '< 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', '< 2.8'

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

@@ -195,12 +195,12 @@ module Eco
             end
             ext        = File.extname(file)
             encoding ||= Eco::API::Common::Session::FileManager.encoding(file)
-            encoding   = (encoding != "utf-8")? "#{encoding}|utf-8": encoding
             read_with_tolerance(file, encoding: encoding)
           end
 
           def read_with_tolerance(file, encoding:)
             if content = File.read(file, encoding: encoding)
+              content = content.encode("utf-8")
               tolerance = 5
               content.scrub do |bytes|
                 replacement = '<' + bytes.unpack('H*')[0] + '>'
@@ -220,9 +220,7 @@ module Eco
             logger.fatal(msg)
             raise msg
           end
-
         end
-
       end
     end
   end

data/lib/eco/api/common/version_patches/ecoportal_api/external_person.rb

@@ -3,17 +3,6 @@ module Ecoportal
     class V1
       # @attr entry [Eco::API::Common::People::PersonEntry, Hash] the input entry plain hash data used to update/create this person.
       class Person
-        class << self
-          def redef_without_warning(const, value)
-            self.class.send(:remove_const, const) if self.class.const_defined?(const)
-            self.class.const_set(const, value)
-          end
-        end
-
-        redef_without_warning('VALID_TAG_REGEX', /^[A-Za-z0-9 &_'\/.-]+$/)
-
-        passthrough :contractor_organization_id
-
         attr_accessor :entry
 
         def identify(section = :person)

data/lib/eco/api/common/version_patches/ecoportal_api.rb

@@ -1,4 +1 @@
-require_relative 'ecoportal_api/client'
 require_relative 'ecoportal_api/external_person'
-require_relative 'ecoportal_api/external_details'
-require_relative 'ecoportal_api/internal_person'

data/lib/eco/api/microcases/with_each_leaver.rb

@@ -2,7 +2,10 @@ module Eco
   module API
     class MicroCases
       # Detects who has left the organization and `yield` s them one by one to the given block
-      # @note to be used only when the input file is the full DB
+      # @note
+      #   - To be used only when the input file is the full DB
+      #   - The `Entries#find` method. If the people manager entry does not have `external_id`,
+      #     but has a matching `email` wiht some input entry (row), it won't be identified as a leaver.
       # @param entries [Eco::API::Common::People::Entries] the input entries with the data.
       # @param people [Eco::API::Organization::People] target existing _People_ of the current update.
       # @param options [Hash] the options.

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

@@ -28,7 +28,10 @@ module Eco
             end.max do |a,b|
               a.count <=> b.count
             end.tap do |tree|
-              session_logger.info("Using LIVE LOCATIONS Structure: '#{tree.name}'") if tree
+              if tree
+                msg ="Using LIVE LOCATIONS Structure: '#{tree.name}' (#{tree.count} nodes)"
+                session_logger.info(msg)
+              end
             end
           end
 

data/lib/eco/api/session.rb

@@ -154,8 +154,8 @@ module Eco
       # @see Eco::API::Common::People::EntryFactory#entries
       # @param (see Eco::API::Common::People::EntryFactory#entries)
       # @return [Eco::API::Common::People::Entries] collection of entries.
-      def entries(*args)
-        entry_factory.entries(*args).tap do |collection|
+      def entries(*args, **kargs)
+        entry_factory.entries(*args, **kargs).tap do |collection|
           logger.info("Loaded #{collection.length} input entries.")
         end
       end

data/lib/eco/cli/config/default/input.rb

@@ -55,10 +55,14 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(input: {file: {name: file}})
       options.deep_merge!(input: {file: {format: format}})
 
+      encoding = options.dig(:input, :file, :encoding)
+
       case format
       when :xml
         [file].flatten.each {|f| session.config.files.validate(:xml, f)}
-        input = session.entries(file: file, format: format)
+        kargs = {file: file, format: format}
+        kargs.merge!(encoding: encoding) if encoding
+        input = session.entries(**kargs)
       when :xls
         input = session.entries(file: file, format: format)
       when :json
@@ -66,7 +70,9 @@ ASSETS.cli.config do |cnf|
           people.merge(JSON.parse(File.read(file)))
         end
       else # :csv
-        input = session.csv_entries(file, check_headers: true)
+        kargs = {check_headers: true}
+        kargs.merge!(encoding: encoding) if encoding
+        input = session.csv_entries(file, **kargs)
       end
     end
     input

data/lib/eco/cli/config/default/options.rb

@@ -68,6 +68,13 @@ ASSETS.cli.config do |cnf|
       options.deep_merge!(input: {entries_from: true})
     end
 
+    desc  = "Used to specify the input file encoding"
+    options_set.add("-input-encoding", desc) do |options, session|
+      if encoding = SCR.get_arg("-input-encoding", with_param: true)
+        options.deep_merge!(input: {file: {encoding: encoding}})
+      end
+    end
+
     desc  = "Used to only get the people from the input file. It will also include their current and new supervisors."
     options_set.add("-get-partial", desc) do |options, session|
       options.deep_merge!(people: {

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.2.5"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.3.3
 platform: ruby
 authors:
 - Oscar Segura
@@ -116,60 +116,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-v2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ecoportal-api-graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
@@ -457,10 +457,7 @@ files:
 - lib/eco/api/common/session/sftp.rb
 - lib/eco/api/common/version_patches.rb
 - lib/eco/api/common/version_patches/ecoportal_api.rb
-- lib/eco/api/common/version_patches/ecoportal_api/client.rb
-- lib/eco/api/common/version_patches/ecoportal_api/external_details.rb
 - lib/eco/api/common/version_patches/ecoportal_api/external_person.rb
-- lib/eco/api/common/version_patches/ecoportal_api/internal_person.rb
 - lib/eco/api/common/version_patches/exception.rb
 - lib/eco/api/common/version_patches/hash.rb
 - lib/eco/api/common/version_patches/hash/deep_merge.rb

data/lib/eco/api/common/version_patches/ecoportal_api/client.rb

@@ -1,9 +0,0 @@
-module Ecoportal
-  module API
-    module Common
-      class Client
-        attr_reader :host
-      end
-    end
-  end
-end

data/lib/eco/api/common/version_patches/ecoportal_api/external_details.rb

@@ -1,15 +0,0 @@
-module Ecoportal
-  module API
-    class V1
-      class PersonDetails
-        # Checks if an `id` or `alt_id` exists
-        # @param id [String] the `id` or the `alt_id` of the target field.
-        # @return [Boolean] `true` if it exists, `false` otherwise
-        def key?(id)
-          @fields_by_id or index_fields
-          @fields_by_id.key?(id) || @fields_by_alt_id.key?(id)
-        end        
-      end
-    end
-  end
-end

data/lib/eco/api/common/version_patches/ecoportal_api/internal_person.rb

@@ -1,37 +0,0 @@
-module Ecoportal
-  module API
-    class Internal
-      class Person
-
-        def new?(doc = :initial)
-          ref_doc = (doc == :original) ? original_doc : initial_doc
-          !ref_doc["details"] && !ref_doc["account"]
-        end
-
-        # @return [Boolean] if the account has been added, compared to `doc`
-        def account_added?(doc = :initial)
-          ref_doc = (doc == :original) ? original_doc : initial_doc
-          account && !ref_doc["account"]
-        end
-
-        # It replaces `doc` by `new_doc`
-        # @return [Hash] `doc` before change
-        def replace_doc!(new_doc)
-          raise UnlinkedModel.new(from: "#{self.class}#replace_doc", key: _key) unless linked?
-          @doc.tap do
-            @doc = new_doc
-          end
-        end
-
-        # It replaces `original_doc` by `new_doc`
-        # @return [Hash] `original_doc` before change
-        def replace_original_doc!(new_doc)
-          raise UnlinkedModel.new(from: "#{self.class}#replace_original_doc", key: _key) unless linked?
-          @original_doc.tap do
-            @original_doc = new_doc
-          end
-        end
-      end
-    end
-  end
-end