eco-helpers 2.7.17 → 2.7.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35f96561e2b58978c8949c744ac79c87888f067def10f63e00e3393e94cb992c
-  data.tar.gz: 7dba34b74428c53f7167eb1075b11bbd306432b3687c05986c66610da5b69f5e
+  metadata.gz: 4f816f1f0ec131d756c11a4839629d57f90f2b9cc2a8a9008b54de0c57926272
+  data.tar.gz: 8e725e46c074927cf2db191471d29fe5dfce15c7aa121f9e49cfa30411f29bf2
 SHA512:
-  metadata.gz: 35223b9e52a315cf78b65393b509675a5ab515976e36535906b1a1e4588ccab178272ce209ab964b4f0365f74adccae9536db778edc5b524fa0cc70b327f0ccf
-  data.tar.gz: 0b356c4f3ca79f4ae57cae1db37f97455199c0772a165f294577bf7cfe3b4f1249a3c6cbee34c8903cb2d637a3b4b28658a3897680d61b2494aeffdd026efb8f
+  metadata.gz: 8427745673ff4ab4d19477fff524cb9cab781b9b818c072943c600282cc5d519f06b3a5807e6a241787fb1c259a1697530c282ccf18c9849d8d4f09ca89e64b7
+  data.tar.gz: 22da605e9eaa15e84ea50a6431ad4e9f7b98239b981e5ec7b07dbd93d92d72387232c222656ec8a79ed725c60d5088c150edc4dbed4547ce10fd97e01d6be6ae

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/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.18'.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.18
 platform: ruby
 authors:
 - Oscar Segura