eco-helpers 2.3.2 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7446c914bf420a89e5964fea7fe67063f75ff6f26a999c2bff908daf3be7636
-  data.tar.gz: 3d59cd7ffad8e9e5c0d8ce3e2c032024854b7785f5c2742a912fecfc793a435f
+  metadata.gz: d2b034981dcaa5e5ecfb1778df6fed175e4631d1244372c475bd5049e8e97c67
+  data.tar.gz: ca64274315a6da975781f3d8198b3a58956e9f665a674392ba03090feb284488
 SHA512:
-  metadata.gz: 998823b933ca7795d2681556c9a2ca0c5de23ee342ff77877f79ebda57949f2c3a3b074d80d9780fae3a16ccc9c84fb1dfd4b63a1ada03d060bc6a01d9ee2750
-  data.tar.gz: 9cff3c674bac74f83de92b2b3847a3b9817f7abaf7abd0436347a2aec87d88e1a2ee2388d6768d8e23f28d7e5de69cd5195df3d52b0b801b8bf6925d9b53f8ca
+  metadata.gz: 33d6ba24ecab02c3bb10d11577ed067b7eab05e4c1fa0af17c72405cb16fd135b253a0414d33a14821b0684129e921eee0cb65eec8ac88558e3931c5d3bbcb8c
+  data.tar.gz: db51965c0d7b2a607a3cd6a1fbbdac48430be4804367d9746d448141c5fe00e04e835c202e696b42bc68e6c153b511f45c3a11b38ee7c6c1701fbb46d3cf9f23

data/CHANGELOG.md

@@ -1,12 +1,26 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.3.3] - 2023-03-xx
+## [2.4.3] - 2023-03-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.4.2] - 2023-03-17
+
+### Fixed
+  - `Eco::API::Common::People::EntryFactory#entries` _bom_ **encoding** (get back support)
+
+## [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

data/eco-helpers.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://www.ecoportal.com"
   spec.licenses      = %w[MIT]
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.7.2'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -24,13 +24,13 @@ 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.2.17",  "< 2.3"
+  spec.add_development_dependency "bundler",   ">= 2.4.8",  "< 2.5"
   spec.add_development_dependency "rspec",     ">= 3.10.0", "< 3.11"
   spec.add_development_dependency "rake",      ">= 13.0.3", "< 13.1"
   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.9.2', '< 0.10'
+  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'

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

@@ -193,14 +193,16 @@ module Eco
               logger.error("File does not exist: #{file}")
               exit(1)
             end
-            ext        = File.extname(file)
+            #ext        = File.extname(file)
             encoding ||= Eco::API::Common::Session::FileManager.encoding(file)
-            encoding   = (encoding != "utf-8")? "#{encoding}|utf-8": encoding
+            encoding   = (encoding == "bom") ? "#{encoding}|utf-8": encoding
+            puts "File encoding: '#{encoding}'" unless !encoding || encoding == 'utf-8'
             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") unless encoding.include?('utf-8')
               tolerance = 5
               content.scrub do |bytes|
                 replacement = '<' + bytes.unpack('H*')[0] + '>'
@@ -220,9 +222,7 @@ module Eco
             logger.fatal(msg)
             raise msg
           end
-
         end
-
       end
     end
   end

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.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.3.2"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.2
 platform: ruby
 authors:
 - Oscar Segura
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2018-09-05 00:00:00.000000000 Z
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: 2.4.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.17
+        version: 2.4.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -390,7 +390,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.7'
-description: 
+description:
 email:
 - oscar@ecoportal.co.nz
 executables: []
@@ -675,7 +675,7 @@ homepage: https://www.ecoportal.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -683,15 +683,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: eco-helpers to manage people api cases
 test_files: []