eco-helpers 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2878273b593e2556be3d41de808563fdb2bf4995c488a61274552f828d0c5b59
-  data.tar.gz: 1cb620f1532563deee7671b28d8999c9a0dd877c572c542b840febc81646fde8
+  metadata.gz: 8bb545e3154c1a65a993a24b6eeab4eebbe125e95492bc2b6961fee0a708a80f
+  data.tar.gz: dc6bd380cd757b5218fadf264c64ef8a61b767916514aebac63fae0739c5153c
 SHA512:
-  metadata.gz: 715d86772a51b17cfc928ea241e818ead64efca009f34f5e9bdbcb56fde97a4e44157ce08a5836b29011c9bd6911b138ed374a0fd53f8316a48669cc48b56631
-  data.tar.gz: ca74f83124a7ea16cd883ea1e34f4350f5a0505e3439ef6cc4eb729e7329dc6cd9eabbe1311e8992eeb7dd571f485404c748ea751678759572ded8d0bb35ad68
+  metadata.gz: b9852caf3f9f2dcdcbcbe4d17e325c566e63b3724b92349668e35fb4839aea5b7879b3b080b031868495b40c5bb09a9fc9d43c0b5cd4e9dbc298ec0f25d867d8
+  data.tar.gz: 5941ec298de1bff8205be578bcefaed0602dfea76ceee47a00497b28ff973a293553927d1ce96f0617abe0886c5fa4f5810678e69c3fab2673fd35c6df88dac3

data/CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.2.7] - 2025-09-xx
+
+### Added
+
+### Changed
+
+### Fixed
+
+## [3.2.6] - 2025-09-05
+
+### Added
+
+- **Improvement**: classifications conversion to ignore ending `s` (plurals).
+
+### Fixed
+
+- Node `id` and `parent_id` **upcase** in `NodePlain` (**case insensitive**)
+  - It was failing to pair children with their parent (on input files).
+- **remove** _classifications treatment_ on `Organization::TagTree` and `NodePlain`
+  - This was a working around due to not using `as_nodes_json` as a **common** converter between `live_tree` and `file_tree` (which was fixed in a previous release).
+  - `as_nodes_json` already does the call to `node_parser_block`, which does the conversion of the **classifications**
+
 ## [3.2.6] - 2025-09-xx
 
 ### Added

data/lib/eco/api/organization/node_classifications.rb

@@ -66,10 +66,11 @@ module Eco
           treat_classication(val)
         end
 
+        # Enhances the lookup
         def treat_classication(value)
           return value unless value.is_a?(String)
 
-          value.strip.gsub(/\W+/, '').downcase
+          value.strip.downcase.gsub(/s(?:\W|$)/, '').gsub(/\W+/, '-')
         end
 
         def init_caches

data/lib/eco/api/organization/tag_tree.rb

@@ -211,9 +211,9 @@ module Eco
           &block
         )
           max_depth ||= total_depth
-          return nil if max_depth < depth
-          return []  if top? && !include_children
-          return nil if archived? && !include_archived
+          return    if max_depth < depth
+          return [] if top? && !include_children
+          return    if archived? && !include_archived
 
           if include_children
             child_nodes   = nodes
@@ -441,14 +441,13 @@ module Eco
 
         def init_node
           return if source.is_a?(Array)
+
           @id                   = source.values_at('tag', 'id').compact.first&.upcase
           @name                 = source['name']
           @weight               = source['weight']
           @archived             = as_boolean(source['archived'])
           @archived_token       = source['archived_token']
-          @classifications      = into_a(source['classifications']).map do |value|
-            treat_classication(value)
-          end
+          @classifications      = into_a(source['classifications'])
           @classification_names = into_a(source['classification_names'])
           @raw_nodes            = source['nodes'] || []
         end
@@ -491,11 +490,6 @@ module Eco
           [tnodes, ddepth]
         end
 
-        def treat_classication(value)
-          return value unless value.is_a?(String)
-          value.strip.gsub(/\W+/, '').downcase
-        end
-
         # Helper to convert to array
         def into_a(value)
           if value.is_a?(String)
@@ -510,6 +504,7 @@ module Eco
           return true  if value == true
           return false if value.to_s.strip.empty?
           return true  if %w[yes x true].include?(value.downcase)
+
           false
         end
       end

data/lib/eco/api/usecases/graphql/helpers/location/base/classifications_parser.rb

@@ -5,39 +5,46 @@ module Eco::API::UseCases::GraphQL::Helpers::Location
 
       private
 
+      def to_classification_ids(values)
+        values = [values].flatten unless values.is_a?(Array)
+
+        values = values.compact.map {|val| val.split('|')}.flatten
+        values.compact.map {|val| to_classification(val)}.compact.uniq
+      end
+
       # @note
       #   1. It returns `nil` unless there are classifications defined
       #   2. If the value is wrong, it warns and returns `nil`
       def to_classification(value)
-        return nil unless node_classifications?
+        return unless node_classifications?
 
-        raise ArgumentError, "Expecting a single element. Given: #{value.class}" if value.is_a?(Enumerator)
+        msg = "Expecting a single element. Given: #{value.class}"
+        raise ArgumentError, msg if value.is_a?(Enumerator)
 
-        return nil unless value.is_a?(String)
+        return unless value.is_a?(String)
 
         node_classifications.to_id(value).tap do |type|
-          unknown_clasification!(value) unless type
-        end
-      end
+          next if type
 
-      def to_classification_ids(values)
-        values = [values].flatten unless values.is_a?(Array)
-        values = values.compact.map {|val| val.split('|')}.flatten
-        values.compact.map {|val| to_classification(val)}.compact.uniq
+          unknown_classification!(value)
+        end
       end
 
       # @note
       #   1. It returns `nil` unless there are classifications defined
       #   2. If the value is wrong, it warns and returns `nil`
       def to_classification_name(value)
-        return nil unless node_classifications?
+        return unless node_classifications?
 
-        raise ArgumentError, "Expecting a single element. Given: #{value.class}" if value.is_a?(Enumerator)
+        msg = "Expecting a single element. Given: #{value.class}"
+        raise ArgumentError, msg if value.is_a?(Enumerator)
 
-        return nil unless value.is_a?(String)
+        return unless value.is_a?(String)
 
         node_classifications.to_name(value) do |name|
-          unknown_clasification!(value) unless name
+          next unless name
+
+          unknown_classification!(value)
         end
       end
 
@@ -49,10 +56,11 @@ module Eco::API::UseCases::GraphQL::Helpers::Location
         @node_classifications ||= session.node_classifications
       end
 
-      def unknown_clasification!(value)
+      def unknown_classification!(value)
         return if unknown_classifications.include?(value)
 
         unknown_classifications << value
+
         log(:warn) {
           "Unknown location node classification '#{value}'"
         }

data/lib/eco/data/locations/node_base/tag_validations.rb

@@ -2,7 +2,7 @@ module Eco::Data::Locations::NodeBase
   module TagValidations
     include Eco::Language::AuxiliarLogger
 
-    ALLOWED_CHARACTERS = "A-Za-z0-9 &_'\/.-".freeze
+    ALLOWED_CHARACTERS = "A-Za-z0-9 &_'/.-".freeze
     VALID_TAG_REGEX    = /^[#{ALLOWED_CHARACTERS}]+$/
     INVALID_TAG_REGEX  = /[^#{ALLOWED_CHARACTERS}]+/
     VALID_TAG_CHARS    = /[#{ALLOWED_CHARACTERS}]+/
@@ -11,9 +11,11 @@ module Eco::Data::Locations::NodeBase
     def clean_id(str, notify: true, ref: '')
       blanks_x2 = has_double_blanks?(str) # dubocop:disable Naming/VariableNumber
       partial   = replace_not_allowed(str)
+
       remove_double_blanks(partial).tap do |result|
         next unless notify
         next if invalid_warned?(str)
+
         if partial != str
           invalid_chars = identify_invalid_characters(str)
           log(:warn) {
@@ -24,6 +26,7 @@ module Eco::Data::Locations::NodeBase
             "* #{ref}Double blanks removed: '#{str}' :_converted_>> '#{result}'"
           }
         end
+
         invalid_warned!(str)
       end
     end
@@ -46,13 +49,15 @@ module Eco::Data::Locations::NodeBase
     end
 
     def remove_double_blanks(str)
-      return nil if str.nil?
+      return if str.nil?
+
       str.gsub(DOUBLE_BLANKS, ' ').strip
     end
 
     def replace_not_allowed(str)
-      return nil if str.nil?
+      return     if str.nil?
       return str if str.match(VALID_TAG_REGEX)
+
       str.gsub(INVALID_TAG_REGEX, ' ')
     end
 

data/lib/eco/data/locations/node_base/treeify.rb

@@ -28,10 +28,12 @@ module Eco::Data::Locations::NodeBase
     # @return [Array<Hash>] a hierarchical tree of nested Hashes via `nodes` key.
     def treeify(nodes, skipped: [], unlinked_trees: [], &block)
       return [] if nodes.empty?
+
       block  ||= nodes.first.class.serializer
       done_ids = {}
       warns    = []
       parents  = parents_hash(nodes)
+
       get_children(
         nil,                parents,
         done_ids: done_ids, skipped: skipped,
@@ -43,6 +45,7 @@ module Eco::Data::Locations::NodeBase
           skipped: skipped, unlinked_trees: unlinked_trees,
           warns:   warns,   &block
         )
+
         log(:warn) { warns.join("\n") } unless warns.empty?
       end
     end

data/lib/eco/data/locations/node_base.rb

@@ -23,7 +23,7 @@ module Eco::Data::Locations
     end
 
     def attr?(sym)
-      !attr(sym).to_s.strip.empty?
+      !attr(sym).to_s.strip.empty? # rubocop:disable Style/Attr
     end
 
     def set_attrs(**kargs)
@@ -57,6 +57,7 @@ module Eco::Data::Locations
 
     def slice(*attrs)
       return {} if attrs.empty?
+
       to_h(*attrs)
     end
   end

data/lib/eco/data/locations/node_level/parsing.rb

@@ -17,6 +17,7 @@ class Eco::Data::Locations::NodeLevel
     # @return [Boolean] whether or not it's worthy trying to parse with `NodeLevel`.
     def csv_matches_format?(csv)
       return false unless csv.is_a?(::CSV::Table)
+
       !Eco::Data::Locations::NodePlain.csv_matches_format?(csv)
     end
 
@@ -26,7 +27,8 @@ class Eco::Data::Locations::NodeLevel
     # @param `csv` [CSV::Table]
     # @return [Array<NodeLevel>]
     def nodes_from_csv(csv)
-      raise ArgumentError, "Expecting CSV::Table. Given: #{csv.class}" unless csv.is_a?(::CSV::Table)
+      msg = "Expecting CSV::Table. Given: #{csv.class}"
+      raise ArgumentError, msg unless csv.is_a?(::CSV::Table)
 
       possible_classifications = csv.headers
 
@@ -52,6 +54,7 @@ class Eco::Data::Locations::NodeLevel
 
         prev_node = node
       end
+
       tidy_nodes(nodes)
     end
   end

data/lib/eco/data/locations/node_level.rb

@@ -36,15 +36,19 @@ module Eco::Data::Locations
     end
 
     # In node level the parent id is set via parsing
-    attr_accessor :parentId # rubocop:disable Naming/MethodName
-    alias_method :parent_id=, :parentId=
-    alias_method :parent_id,  :parentId
+    attr_writer :parent_id
+    alias_method :parentId=, :parent_id= # rubocop:disable Naming/MethodName
+
+    def parent_id
+      @parent_id&.upcase
+    end
+    alias_method :parentId, :parent_id # rubocop:disable Naming/MethodName
 
     def id
       tag.upcase
     end
-    alias_method :nodeId,  :id
-    alias_method :node_id, :nodeId
+    alias_method :node_id, :id
+    alias_method :nodeId,  :id # rubocop:disable Naming/MethodName
 
     def name
       tag

data/lib/eco/data/locations/node_plain/parsing.rb

@@ -16,6 +16,7 @@ class Eco::Data::Locations::NodePlain
     # @return [Boolean] whether or not it's worthy trying to parse with `NodePlain`.
     def csv_matches_format?(csv)
       return false unless csv.is_a?(::CSV::Table)
+
       (basic_headers & csv.headers) == basic_headers
     end
 
@@ -23,7 +24,9 @@ class Eco::Data::Locations::NodePlain
     # @param `csv` [CSV::Table] with specific headers
     # @return [Array<NodePlain>]
     def nodes_from_csv(csv)
-      raise ArgumentError, "Expecting CSV::Table. Given: #{csv.class}" unless csv.is_a?(::CSV::Table)
+      msg = "Expecting CSV::Table. Given: #{csv.class}"
+      raise ArgumentError, msg unless csv.is_a?(::CSV::Table)
+
       # Convert to Eco::CSV::Table for a fresh start
       csv     = Eco::CSV.parse(csv.to_csv).nil_blank_cells.add_index_column(:row_num)
       headers = node_class::ALL_ATTRS.map(&:to_s)

data/lib/eco/data/locations/node_plain.rb

@@ -22,7 +22,10 @@ module Eco::Data::Locations
     PROP_ATTRS         = (ALL_ATTRS - ADDITIONAL_ATTRS).freeze
 
     def id
-      clean_id(super, ref: "(Row: #{row_num}) ")
+      clean_id(
+        super,
+        ref: "(Row: #{row_num}) "
+      )&.upcase
     end
     # backwards compatibility
     alias_method :tag, :id
@@ -32,9 +35,13 @@ module Eco::Data::Locations
     end
 
     def parent_id
-      clean_id(super, notify: false, ref: "(Row: #{row_num} - parent_id) ")
+      clean_id(
+        super,
+        notify: false,
+        ref:    "(Row: #{row_num} - parent_id) "
+      )&.upcase
     end
-    alias_method :parentId, :parent_id
+    alias_method :parentId, :parent_id # rubocop:disable Naming/MethodName
 
     def archived
       value = super
@@ -42,13 +49,12 @@ module Eco::Data::Locations
       return true  if value == true
       return false if value.to_s.strip.empty?
       return true  if %w[yes x true].include?(value.downcase)
+
       false
     end
 
     def classifications
-      into_a(super).map do |value|
-        treat_classication(value)
-      end
+      into_a(super)
     end
 
     def classification_names
@@ -68,11 +74,6 @@ module Eco::Data::Locations
 
     private
 
-    def treat_classication(value)
-      return value unless value.is_a?(String)
-      value.strip.gsub(/\W+/, '').downcase
-    end
-
     # Helper to convert to array
     def into_a(value)
       if value.is_a?(String)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '3.2.5'.freeze
+  VERSION = '3.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Oscar Segura
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-04 00:00:00.000000000 Z
+date: 2025-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug