eco-helpers 2.7.17 → 2.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f96561e2b58978c8949c744ac79c87888f067def10f63e00e3393e94cb992c
-  data.tar.gz: 7dba34b74428c53f7167eb1075b11bbd306432b3687c05986c66610da5b69f5e
+  metadata.gz: b5c149fd9a573b4749de56e7c0fd836bc98e94059b410de583bc4fb4b60cbe54
+  data.tar.gz: 6ab2832a7a6bf7ee001d6f17abc0ab7193eda256fe14357e735eef0c19105733
 SHA512:
-  metadata.gz: 35223b9e52a315cf78b65393b509675a5ab515976e36535906b1a1e4588ccab178272ce209ab964b4f0365f74adccae9536db778edc5b524fa0cc70b327f0ccf
-  data.tar.gz: 0b356c4f3ca79f4ae57cae1db37f97455199c0772a165f294577bf7cfe3b4f1249a3c6cbee34c8903cb2d637a3b4b28658a3897680d61b2494aeffdd026efb8f
+  metadata.gz: 0cf654ea67d048caf05f803f39d15ebd021569766c13a6e707f92478a864c7584a0a1fdfe7a2a9148ab9376cddb405c6156345cc3e99a2bae8e68663f7583033
+  data.tar.gz: 7f5e1496bcef34f5c074c8806c4e54ece4324756c4142ed4be694d5e0911a013fe859f1d66482a0023ef485743e10bf6d7e1fea0bf06145b1ad1062c322c1ee7

data/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.7.18] - 2024-06-xx
+## [2.7.19] - 2024-06-xx
 
 ### Added
 
@@ -10,6 +10,15 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+## [2.7.18] - 2024-07-01
+
+### Changed
+
+- `Eco::API::UseCases::GraphQL::Samples::Location::Service::TreeToList`
+  - Custom input node parsers: yield has_node and node as well.
+- `Eco::API::UseCases::GraphQL::Samples::Location::Service::TreeDiff`
+  - Exclude archived nodes from the file as **default**
+
 ## [2.7.17] - 2024-06-22
 
 ### Added

data/eco-helpers.gemspec

@@ -35,13 +35,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'amatch',        '>= 0.4.1',  '< 0.5'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'
-  spec.add_dependency 'bcrypt_pbkdf',  '>= 1.0'
+  spec.add_dependency 'bcrypt_pbkdf',  '~> 1.0'
   spec.add_dependency 'docx',          '>= 0.8.0',  '< 0.9'
   spec.add_dependency 'dotenv',        '>= 2.8.1',  '< 3'
   spec.add_dependency 'ecoportal-api',         '>= 0.9.8', '< 0.10'
   spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.18', '< 0.4'
   spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.8', '< 1.2'
-  spec.add_dependency 'ed25519', '>= 1.2'
+  spec.add_dependency 'ed25519',       '~> 1.2'
   spec.add_dependency 'fast_excel',    '>= 0.5.0',  '< 0.6'
   spec.add_dependency 'fuzzy_match',   '>= 2.1.0',  '< 2.2'
   spec.add_dependency 'hashdiff',      '>= 1.1.0',  '< 1.2'

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

@@ -1,11 +1,16 @@
 class ::Exception
   def patch_full_message(trace_count: -1)
-    msg = []
     tracing   = backtrace || []
-    tracing   = instance_of?(SystemStackError) ? tracing[1..30] : tracing[1..trace_count]
+    tracing   = tracing[1..trace_count]
+    tracing   = tracing[1..30] if instance_of?(SystemStackError)
     tracing ||= []
+
+    msg = []
     msg << "\n#{tracing.first} \n#{message} (#{self.class})"
-    tracing.each_with_index {|bt, i| msg << "#{" "*8}#{i+1}: from #{bt}"}
+    tracing.each_with_index do |bt, i|
+      msg << "#{" " * 8}#{i + 1}: from #{bt}"
+    end
+
     msg.join("\n")
   rescue StandardError => e
     puts "Something is wrong with 'patch_full_message': #{e}"

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

@@ -13,6 +13,8 @@ module Eco
       def people_search(data, options: {}, silent: true) # rubocop:disable Metrics/AbcSize
         session.logger.info("Going to api get #{data.length} entries...")
 
+        silent = silent && data.count <= 500
+
         start = Time.now
         people = session.batch.search(data, silent: silent).then do |status|
           secs = (Time.now - start).round(3)

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

@@ -102,10 +102,22 @@ module Eco::API::UseCases::GraphQL::Samples
       #     - `as_nodes_json`
       #   2. `org_tree` is native from `Eco::Data::Locations::NodeBase::CsvConvert`
       def file_nodes_list
-        @file_nodes_list ||= as_nodes_json(org_tree(input_csv)).tap do |list|
+        @file_nodes_list ||= as_nodes_json(file_tree).tap do |list|
           log(:info) { "Converted input csv file to list of #{list.count} hash-nodes" }
         end
       end
+
+      def file_tree
+        org_tree(input_csv).then do |tree|
+          next tree if include_file_archived?
+
+          tree.active_tree
+        end
+      end
+
+      def include_file_archived?
+        options.dig(:input, :file, :include, :archived)
+      end
     end
   end
 end

data/lib/eco/api/usecases/graphql/samples/location/service/tree_to_list/converter/parser.rb

@@ -14,11 +14,11 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
           return @node_parser_block if instance_variable_defined?(:@node_parser_block)
           custom_before = custom_node_parser_before_block
           custom_after  = custom_node_parser_block
-          @node_parser_block = proc do |node_hash|
+          @node_parser_block = proc do |node_hash, node|
             node_hash.tap do
-              custom_before&.call(node_hash)
-              default_node_parse(node_hash)
-              custom_after&.call(node_hash)
+              custom_before&.call(node_hash, node)
+              default_node_parse(node_hash, node)
+              custom_after&.call(node_hash, node)
             end
           end
         end
@@ -35,7 +35,7 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
         end
 
         # Generic parsing
-        def default_node_parse(node_hash)
+        def default_node_parse(node_hash, _node)
           class_ids = to_classification_ids(node_hash['classifications'])
           node_hash['classifications'] = class_ids
         end

data/lib/eco/api/usecases/graphql/samples/location/service/tree_to_list/converter.rb

@@ -24,12 +24,10 @@ module Eco::API::UseCases::GraphQL::Samples::Location::Service
             next key unless node_attr_maps.key?(key)
             node_attr_maps[key]
           end.tap do |node_hash|
-            node_parser_block&.call(node_hash)
-            yield(node_hash) if block_given?
+            node_parser_block&.call(node_hash, node)
+            yield(node_hash, node) if block_given?
           end
-        end.tap do |list|
-          list.each(&node_parser_block)
-        end
+        end.compact.reject(&:empty?)
       end
     end
   end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.17'.freeze
+  VERSION = '2.7.19'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.17
+  version: 2.7.19
 platform: ruby
 authors:
 - Oscar Segura
@@ -202,14 +202,14 @@ dependencies:
   name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -316,14 +316,14 @@ dependencies:
   name: ed25519
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency