eco-helpers 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9786a6c42a701c7c84fc751543cd341587f637315c48febc00f85bbb948391c3
-  data.tar.gz: aec51b6308d345fa529acfb26db56178d09ac7397d25d7c323bc6904c793fdad
+  metadata.gz: 22b18f6a77dccb77c810944846f1fdc470e0ee54255b2b72b0f1865d9d3b556c
+  data.tar.gz: 5cd2157a4feeb673598608ce04e8e8eee26d75fd7d8e58ee7f51683367a68ad3
 SHA512:
-  metadata.gz: 246d8b86360b5c5a949b85d74ca2829350c206617a7ed39f071c0d853a04cc4cba40b0298897f81de8970e76d92c8b8c995dd79ccbd1748dff8c0201f4eef961
-  data.tar.gz: 4468a3e61ec3f5cc661fc42189f00ef676e4e99a7fb9a2adbd85eef40597f1c2787007b55d4cd14170de09cadcad7824b657ad005bab5efb4b6998073360e7e4
+  metadata.gz: 32c089f361f91e2f411659150d3345717b700a693962fad99ecdd1c9311daeb8d30f78d706bb6335a67e8617493d22335808146d562da531c1c9bce98cc94b9a
+  data.tar.gz: c9967613a369e8672cded50133b4eb7f422f801f9b6a879e82918ec71eaa3d8d6b9798ced776d70bdc30416cf81d558b45e12c799258dfaaeffc2e06a05547a4

data/CHANGELOG.md

@@ -1,11 +1,29 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.2.3] - 2023-02-xx
+## [2.2.5] - 2023-03-xx
 
 ### Added
 ### Changed
 ### Fixed
+  - Logger object when logging from config
+
+## [2.2.4] - 2023-03-07
+
+### Fixed
+  - Logger object when logging from config
+
+## [2.2.3] - 2023-03-07
+
+### Added
+  - Logger info for live tree selected.
+
+### Changed
+  - `Eco::API::Common::People::DefaultParsers::PolicyGroupsParser`
+    - Should warn of unknown policy groups
+
+### Fixed
+  - `Eco::API:Organization::TagTree` fix `defaults_tag` scoping
 
 ## [2.2.2] - 2023-02-27
 

data/lib/eco/api/common/people/default_parsers/policy_groups_parser.rb

@@ -5,7 +5,12 @@ class Eco::API::Common::People::DefaultParsers::PolicyGroupsParser < Eco::API::C
   def parser(hash, deps)
     policy_group_ids = hash["policy_group_ids"] || []
     policy_group_ids.map do |name|
-      policy_groups.to_id(name&.downcase.strip)
+      policy_groups.to_id(name&.downcase.strip).tap do |known|
+        unless !name || known || unknown_pgs.include?(name)
+          unknown_pgs.push(name)
+          logger.warn("Unknown Policy Group: '#{name}'")
+        end
+      end
     end.compact.tap do |pg_names|
       pg_names.push(default_id) if pg_names.empty?
     end
@@ -20,6 +25,10 @@ class Eco::API::Common::People::DefaultParsers::PolicyGroupsParser < Eco::API::C
 
   private
 
+  def unknown_pgs
+    unknown_pgs ||= []
+  end
+
   def default_id
     @default_id    ||= policy_groups.to_id(config.people.default_usergroup)
   end
@@ -27,5 +36,4 @@ class Eco::API::Common::People::DefaultParsers::PolicyGroupsParser < Eco::API::C
   def policy_groups
     @policy_groups ||= config.policy_groups
   end
-
 end

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

@@ -22,6 +22,8 @@ module Eco
         #    tree = TagTree.new(tree.to_json)
         # @param tagtree [String] representation of the tagtree in json.
         def initialize(tagtree = [], name: nil, id: nil, depth: -1, path: [], enviro: nil)
+          @depth = depth
+
           case tagtree
           when String
             @source = JSON.parse(tagtree)
@@ -32,24 +34,22 @@ module Eco
           fatal("Expecting Environment object. Given: #{enviro}") if enviro && !enviro.is_a?(API::Common::Session::Environment)
           @enviro = enviro
 
-          @depth = depth
           if @source.is_a?(Array)
             @id    = id
             @name  = name
-            @nodes = @source
+            @row_nodes = @source
           else
             @id    = @source.values_at('tag', 'id').compact.first&.upcase
             @name  = @source['name']
-            @nodes = @source['nodes'] || []
+            @row_nodes = @source['nodes'] || []
           end
 
           @path  = path || []
           @path.push(@id) unless top?
 
-          @nodes = nodes.map do |cnode|
-            TagTree.new(cnode, depth: @depth + 1, path: @path.dup, enviro: @enviro)
+          @nodes = @row_nodes.map do |cnode|
+            TagTree.new(cnode, depth: depth + 1, path: @path.dup, enviro: @enviro)
           end
-          @children_count = @nodes.count
 
           init_hashes
         end
@@ -94,9 +94,11 @@ module Eco
 
         # @return [Integer] the highest `depth` of all the children.
         def total_depth
-          @total_depth ||= if children_count > 0
-              deepest_node = nodes.max_by {|node| node.total_depth}
-              deepest_node.depth
+          @total_depth ||= if has_children?
+              deepest_node = nodes.max_by do |node|
+                node.total_depth
+              end
+              deepest_node.total_depth
             else
               depth
             end
@@ -140,10 +142,20 @@ module Eco
         # @return [Array<String>]
         def leafs
           tags.select do |tag|
-            node(tag).children_count == 0
+            !node(tag).has_children?
           end
         end
 
+        # @return [Integer]
+        def children_count
+          nodes.count
+        end
+
+        # @return [Boolean] it has subnodes
+        def has_children?
+          children_count > 0
+        end
+
         # Verifies if a tag exists in the tree.
         # @param key [String] tag to verify.
         # @return [Boolean]
@@ -222,14 +234,14 @@ module Eco
         # @return [String] default tag.
         def default_tag(*values)
           values = filter_tags(values)
-          nodes = []; depth = -1
+          nodes = []; ddepth = -1
           values.each do |tag|
             raise("Couldn't find the node of #{tag} in the tag-tree definition") unless cnode = node(tag)
 
-            if cnode.depth > depth
+            if cnode.depth > ddepth
               nodes = [cnode]
-              depth = cnode.depth
-            elsif cnode.depth == depth
+              ddepth = cnode.depth
+            elsif cnode.depth == ddepth
               nodes.push(cnode)
             end
           end
@@ -237,9 +249,9 @@ module Eco
           default_tag = nil
           if nodes.length > 1
             common      = nodes.reduce(self.tags.reverse) {|com, cnode| com & cnode.path.reverse}
-            default_tag = common.first if common.length > 0 && depth > 0
+            default_tag = common.first if common.length > 0 && ddepth > 0
           end
-          default_tag = nodes.first&.tag  if !default_tag && ( (depth > 0) || flat?)
+          default_tag ||= nodes.first&.tag  if (ddepth > 0) || flat?
           default_tag
         end
 
@@ -258,12 +270,12 @@ module Eco
         def init_hashes
           @hash_tags  = {}
           @hash_tags[@id] = self unless top?
-          @hash_tags = @nodes.reduce(@hash_tags) do |h,n|
+          @hash_tags = nodes.reduce(@hash_tags) do |h,n|
             h.merge(n.hash)
           end
           @hash_paths = {}
           @hash_paths[@id] = @path unless top?
-          @hash_paths = @nodes.reduce(@hash_paths) do |h,n|
+          @hash_paths = nodes.reduce(@hash_paths) do |h,n|
             h.merge(n.hash_paths)
           end
         end

data/lib/eco/api/session/config/tagtree.rb

@@ -21,7 +21,11 @@ module Eco
             trees = live_trees(enviro: enviro)
             @live_tree = trees.reject do |tree|
               tree.empty?
-            end.max {|a,b| a.count <=> b.count}
+            end.max do |a,b|
+              a.count <=> b.count
+            end.tap do |tree|
+              session_logger.info("Using LIVE LOCATIONS Structure: '#{tree.name}'") if tree
+            end
           end
 
           # Retrieves all the location structures of the organisation
@@ -41,6 +45,16 @@ module Eco
               end
             end
           end
+
+          private
+
+          def session
+            ASSETS.session
+          end
+
+          def session_logger
+            session.logger
+          end
         end
       end
     end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.2.2"
+  VERSION = "2.2.4"
 end

metadata

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