eco-helpers 2.7.22 → 2.7.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cc77a4ee2eb9f30b13efc22f5eaedff1b564f9831c3b7f4d9430b80185ffb83
-  data.tar.gz: fbe4135c3c9c08d46c1ee39b1b3de0c28fd2be547243d2137e49517997052d96
+  metadata.gz: 6576d3f9439855c0004110d104d82634733df41822acb362bc82cafcbf90d6ca
+  data.tar.gz: e0052851a9c33b54c77bcb4577874cb765e744c40ed63b7eaa5a5fd3d59632ec
 SHA512:
-  metadata.gz: 3f9d81d2a91bf458dadd99e60b15c2e4063e902fa4e9663383367f91a0ad39fdbf4bd4f367a11fa5aef6f9aacfe82ee22161adc4f36ec46781e2d23ef9798168
-  data.tar.gz: 823605e14716575990fcc13db6e538bc7642164b77b889d10fb0b3037bd8a9304751e012ba1fe3229895e0ec1d3585ea69318496a4226df5af18a7c288a42f81
+  metadata.gz: 479a0ed0a903b1f05a930673e0098912df91cb66a49b1acb99d2b7c82dd531f9bcd4704f46c0a4a84ad9f8c2e12a0469ccbc1b8760cba65fae1e7e272d6575aa
+  data.tar.gz: 5f626293d3de079368627f68eb5337abe64afde56f86248721ed3615a90d7e694cacde99fe78467e50fb4c24a8d19cb66670cffc14f63c08ab1b4735d9652041

data/CHANGELOG.md

@@ -2,19 +2,36 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.7.22] - 2024-07-xx
+## [2.7.25] - 2024-07-xx
 
 ### Added
 
 ### Changed
 
+### Fixed
+
+## [2.7.24] - 2024-07-30
+
+### Fixed
+
+- `Eco::API::Common::People::PersonEntry#set_core`
+  - Exclude setting `id` (should invariably be set via back-end only)
+
+## [2.7.23] - 2024-07-29
+
+### Fixed
+
+- Filename and path scoping
+
+## [2.7.22] - 2024-07-26
+
+### Changed
+
 - Patch on exception: to show cause
 - `Eco::Common::Session::FileManager`
   - `load_json` prevent avoidable memory leaks
   - `save_json` prevent avoidable memory leaks
 
-### Fixed
-
 ## [2.7.21] - 2024-07-13
 
 ### Added

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

@@ -211,7 +211,8 @@ module Eco
           # @param person [Ecoportal::API::V1::Person] the person we want to set the core values to.
           # @param exclude [String, Array<String>] core attributes that should not be set/changed to the person.
           def set_core(person, exclude: nil)
-            scoped_attrs = @emap.core_attrs(@final_entry) - into_a(exclude)
+            scoped_attrs  = @emap.core_attrs(@final_entry) - into_a(exclude)
+            scoped_attrs -= ['id']
             @final_entry.slice(*scoped_attrs).each do |attr, value|
               set_part(person, attr, value)
             rescue StandardError => e

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

@@ -17,10 +17,10 @@ module Eco
           end
 
           def dir_path=(value)
-            @dir =      Eco::Data::Files::Directory.new(value)
+            @dir      = Eco::Data::Files::Directory.new(value)
             @dir_path = @dir.create
-          rescue StandardError => e
-            logger.error("could not create or make any sense of directory '#{value}': #{e.to_s}")
+          rescue StandardError => err
+            logger.error("could not create or make any sense of directory '#{value}': #{err}")
           end
 
           def logger
@@ -123,7 +123,8 @@ module Eco
 
           def filename_for(filename, modifier = :no_stamp)
             file = dir.file(filename)
-            FileManager.timestamp_file(file) if modifier == :timestamp
+            file = FileManager.timestamp_file(file) if modifier == :timestamp
+            file
           end
         end
       end

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

@@ -15,12 +15,12 @@ module Eco
       def with_each(entries, people, options, append_created: true)
         @_skip_all_multiple_results = false
         people_copy = people.newFrom(people.to_a)
+
         entries.each_with_object([]) do |entry, scoped|
           begin
-            unless person = people_copy.find(entry, strict: micro.strict_search?(options))
-              person = session.new_person.tap do |person|
-                people << person if append_created
-              end
+            person   = people_copy.find(entry, strict: micro.strict_search?(options))
+            person ||= session.new_person.tap do |pers|
+              people << pers if append_created
             end
           rescue Eco::API::Organization::People::MultipleSearchResults => e
             unless @_skip_all_multiple_results
@@ -29,17 +29,19 @@ module Eco
             end
           end
 
-          if person
-            person.entry = entry
-            yield(entry, person) if block_given?
-            scoped << person
-          end
-        end.yield_self {|all_people| people.newFrom all_people.uniq}
+          next unless person
+
+          person.entry = entry
+          yield(entry, person) if block_given?
+          scoped << person
+        end.then do |all_people|
+          people.newFrom all_people.uniq
+        end
       end
 
       private
 
-      def _with_each_prompt_to_select_user(error, entry: nil, increase_count: true)
+      def _with_each_prompt_to_select_user(error, entry: nil, increase_count: true) # rubocop:disable Metrics/AbcSize
         unless error.is_a?(Eco::API::Organization::People::MultipleSearchResults)
           raise "Expecting Eco::API::Organization::People::MultipleSearchResults. Given: #{error.class}"
         end
@@ -47,7 +49,7 @@ module Eco
         @_with_each_prompts += 1 if increase_count
 
         lines = []
-        lines << "\n(#{@_with_each_prompts}) " + error.to_s + "\n"
+        lines << "\n(#{@_with_each_prompts}) #{error}\n"
         lines << "  #index   - Select the correct person by its number index among the list above."
         lines << "  (I)      - Just Skip/Ignore this one. I will deal with that input entry in another launch."
         lines << "  (A)      - Ignore all the rest of input entries with this problem."
@@ -56,20 +58,20 @@ module Eco
 
         prompt_user("Type one option (#number/I/A/C/B):", explanation: lines.join("\n"), default: "I") do |res|
           res = res.upcase
-          case
-          when res.start_with?("I")
-            logger.info "Ignoring entry... #{entry.to_s(:identify) if entry}"
+
+          if res.start_with?("I")
+            logger.info "Ignoring entry... #{entry&.to_s(:identify)}"
             nil
-          when res.start_with?("A")
+          elsif res.start_with?("A")
             logger.info "All input entries with this same issue will be ignored for this launch"
             @_skip_all_multiple_results = true
             nil
-          when res.start_with?("C")
+          elsif res.start_with?("C")
             logger.info "Creating new person...#{"for entry #{entry.to_s(:identify)}" if entry}"
             session.new_person
-          when res.start_with?("B")
+          elsif res.start_with?("B")
             raise error
-          when res && !res.empty? && (pos = res.to_i rescue nil) && (pos < error.candidates.length)
+          elsif res && !res.empty? && (pos = res.to_i rescue nil) && (pos < error.candidates.length) # rubocop:disable Style/RescueModifier
             error.candidate(pos).tap do |person|
               logger.info "Thanks!! You selected #{person.identify}"
               sleep(1.5)

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

@@ -54,19 +54,21 @@ module Eco
         end
 
         def file_name(fullname)
+          return nil unless fullname
+
           File.basename(fullname)
         end
 
         def file_basename(fullname)
-          File.basename(fullname, File.extname(fullname))
-        end
+          return nil unless fullname
 
-        def file_path(fullname)
-          File.dirname(fullname)
+          File.basename(fullname, File.extname(fullname))
         end
 
         def file_fullpath(fullname)
-          file_path(File.expand_path(fullname))
+          return nil unless fullname
+
+          File.dirname(File.expand_path(fullname))
         end
 
         def file_exists?(file)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.22'.freeze
+  VERSION = '2.7.24'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.22
+  version: 2.7.24
 platform: ruby
 authors:
 - Oscar Segura