eco-helpers 2.2.1 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c71f3bf20fae0dff4ec0ccd0ee8205b8af1dee3c9fabb02791f6102a84f7f9ab
-  data.tar.gz: 81ba2c67c4653941529051d433189101e6480313447fdbe6c64da617887371b7
+  metadata.gz: ac9d8f190b56ad971ec86e7c51be2d8bce759b7769e11065c7a61e4b26e2c5f2
+  data.tar.gz: b4a0de11bae2d18e4156e4904a5ca051d070c08e8c3c213749ac83acaa326059
 SHA512:
-  metadata.gz: b67b415da8341ab6d20a4165ef9f761777bcdb871635a33b0681a56228dae6138c779c31852ce2e748156fa41832ab1ea457ad1aa7ff9dc66c3e1c16dc016be4
-  data.tar.gz: 53e6154974cc3db39e56a127710c1a676e34af8786012b0f3c41051fe14d0b27cc55945875843cdfa1f5fb98d64ed8afcae7eebcd2cfb0cb30da43f7aee2c16f
+  metadata.gz: 19cfac22cebdb7a601879a9ce3c6a897c424dceeca2e42c65d8632dcdadd7c49fe239daab17926ae6531e87fe03ca962a42cf0bc815c29c8cf24d8cbbd2fbe73
+  data.tar.gz: 1912c842a4f517f1977024b7337dca4ab648eb77e4d6b30ab5c28fdf1d2381e6e851107d4b1a6693e603133c70b7dd231861ab78d70d0fce5cdcbdc4ed7d6b9c

data/CHANGELOG.md

@@ -1,11 +1,23 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.2.2] - 2023-02-xx
+## [2.2.3] - 2023-02-xx
 
 ### 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
+
+### Fixed
+  - Typo in GraphQL client (`locationsStructures` should read `locationStructures`)
+  - Multiple typos in new code
 
 ## [2.2.1] - 2023-02-24
 
@@ -18,7 +30,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
   - **Patch** `Ecoportal::API::V1::Person::VALID_TAG_REGEX` it now allows for dot `.`
   - update gem dependencies
-  
+
 ## [2.1.12] - 2022-11-30
 
 ### Fixed

data/eco-helpers.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ecoportal-api', '>= 0.8.5', '< 0.9'
   spec.add_dependency 'ecoportal-api-v2', '>= 1.0.1', '< 1.1'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.2.2', '< 0.3'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.2.3', '< 0.3'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.83.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.36.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.7.6', '< 2.8'

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
@@ -84,7 +84,7 @@ module Eco
 
         # @return [Boolean] `true` if there are tags in the node, `false` otherwise.
         def empty?
-          @has_tags.empty?
+          @hash_tags.empty?
         end
 
         # @return [Integer] the number of locations
@@ -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/base_config.rb

@@ -38,6 +38,10 @@ module Eco
             config.apis
           end
 
+          def logger
+            config.logger
+          end
+
           def clone(config:)
             keys.each_with_object(self.class.new(config: config)) do |key, cnf|
               begin

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

@@ -21,23 +21,29 @@ 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|
+              if tree
+                logger.info("Live tree in use: '#{tree.name}'")
+              end
+            end
           end
 
           # Retrieves all the location structures of the organisation
           def live_trees(enviro: nil)
-            [].tap do |trees|
+            [].tap do |eco_trees|
               next unless apis.active_api.version_available?(:graphql)
               next unless graphql = apis.api(version: :graphql)
               kargs = {
                 includeArchived: false,
                 includeUnpublished: false
               }
-              next unless trees = graphql.currentOrganization.locationsStructures(**kargs)
+              next unless trees = graphql.currentOrganization.locationStructures(**kargs)
               trees.each do |tree|
                 args = {  enviro: enviro, id: tree.id, name: tree.name}
                 eco_tree = Eco::API::Organization::TagTree.new(tree.treeify, **args)
-                trees.push(eco_tree)
+                eco_trees.push(eco_tree)
               end
             end
           end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.2.1"
+  VERSION = "2.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.3
 platform: ruby
 authors:
 - Oscar Segura
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.3'