eco-helpers 2.4.5 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 333d58d63c6ffad6b06865c89dce3e48a50347ba998361f34eb9a2e230ea83f2
-  data.tar.gz: 7be152e20c00765217b6650790dfd4aeba729bb614e6d0928a7e7ea82d94de33
+  metadata.gz: 0ab1e50c5ccc57fd84bd6b21b40a9d455455e3457c89248f7bf60177fe82293a
+  data.tar.gz: 169a31ded9574a5fd8a135a0cfe3f388fe71c48e87f7f67969e12036ba40ab3f
 SHA512:
-  metadata.gz: 3cb79f7d5429bf4c3cd8b8b37cbbdb2b8208da2161559fb6a09b08a67cea1ded2d08355928af4ee136b39bc10fda3f82ece275f5991c65bfcf41c4290d7d7269
-  data.tar.gz: 78723001238f02cac999e2af5200e1e13f444572366291357a70ec951732ded65bd708be9b6c0259a9e6bf797fc5c803df17a28167d01b1bf1223900f8226cc7
+  metadata.gz: 7de4657000ee0181e9c7dcea3536365c5a66fc26d5b25999715129ce4ebed459ba67042de42736b96879b617aba2adc063f92403f0ff063cac13fd5301562191
+  data.tar.gz: e9518629a51f623b07d795eedad394682b53bc23edf1389cb2185f34519ccaed8cf2c746eba8c8ae0c4e12b41068b7444f2f6f263e3a30cd5ab91aa45be09185

data/CHANGELOG.md

@@ -1,16 +1,45 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.4.6] - 2023-03-xx
+## [2.4.8] - 2023-04-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.4.7] - 2023-04-03
+
+### Added
+  - `Eco::Data::Hashes::ArrayDiff#diffs?`
+  - `Eco::API::Organization::TagTree` added methods:
+    - `#source` => to expose the original doc
+    - `#all_nodes` => to implement the block call
+
+### Changed
+  - Upgraded `ecoportal-api-graphql` **gem**
+
+### Fixed
+  - `Eco::API::Session::Config::Api` **new `graphql` api** was missing `host`
+  - `Eco::API::UseCases::DefaultCases::CsvToTree::Helper`
+    - `#nodes_from_csv` assumed unique top level tag and not present
+    - This fix completes this feature (as top level tags were not there)
+
+## [2.4.6] - 2023-04-02
+
+### Added
+  - `Eco::API::Organization::TagTree` added support for `archived_token`
+  - Added support for `block` in
+    - `Eco::API::Session#live_tree`
+    - `Eco::API::Session::Config::Tagtree` in `#live_trees` and `live_tree`
+
+### Changed
+  - Upgraded `ecoportal-api-graphql` **gem**
+
+
 ## [2.4.5] - 2023-03-31
 
 ### Added
-  - `Eco::API:Organization::TagTree` support for `archived` and `weight` properties
+  - `Eco::API::Organization::TagTree` support for `archived` and `weight` properties
   - `Eco::Data::Hashes::ArrayDiff` and `Eco::Data::Hashes::DiffResult`
     - Enable easy comparison of array of hashes
     - Input data can be diverse

data/eco-helpers.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ecoportal-api', '>= 0.9.3', '< 0.10'
   spec.add_dependency 'ecoportal-api-v2', '>= 1.1.1', '< 1.2'
-  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.1', '< 0.4'
+  spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.5', '< 0.4'
   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/organization/tag_tree.rb

@@ -5,13 +5,16 @@ module Eco
       class TagTree
         attr_accessor :id
         alias_method :tag, :id
-        attr_accessor :name, :archived, :weight
+        attr_accessor :name, :weight
+        attr_accessor :archived, :archived_token
 
         attr_reader :parent
         attr_reader :nodes, :children_count
         attr_reader :depth, :path
         attr_reader :enviro
 
+        attr_reader :source
+
         include Enumerable
 
         # @example Node format:
@@ -41,19 +44,20 @@ module Eco
           if @source.is_a?(Array)
             @id        = id
             @name      = name
-            @row_nodes = @source
+            @raw_nodes = @source
           else
             @id        = @source.values_at('tag', 'id').compact.first&.upcase
             @name      = @source['name']
-            @archived  = @source.fetch('archived', false)
-            @weight    = @source.fetch('weight', _weight)
-            @row_nodes = @source['nodes'] || []
+            @archived  = @source['archived'] || false
+            @archived_token   = @source['archived_token']
+            @source['weight'] = @weight = @source['weight'] || _weight
+            @raw_nodes = @source['nodes'] || []
           end
 
           @path  = path || []
           @path.push(@id) unless top?
 
-          @nodes = @row_nodes.map.with_index do |cnode, idx|
+          @nodes = @raw_nodes.map.with_index do |cnode, idx|
             TagTree.new(cnode, depth: depth + 1, path: @path.dup, parent: self, _weight: idx, enviro: @enviro)
           end
 
@@ -82,10 +86,13 @@ module Eco
         # @note order is that of the parent to child relationships
         # @return [Array[]]
         def all_nodes(&block)
-          [].tap do |all_nodes|
-            all_nodes.push(self) unless top?
+          [].tap do |out_nodes|
+            unless top?
+              out_nodes.push(self)
+              yield(self) if block_given?
+            end
             nodes.each do |node|
-              all_nodes.concat(node.all_nodes)
+              out_nodes.concat(node.all_nodes(&block))
             end
           end
         end

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

@@ -171,7 +171,7 @@ module Eco
             when :v2
               klass.new(user_key: user_key, org_key: external_key, host: host, logger: logger)
             when :graphql
-              klass.new(org_id: org_id, email: email, pass: pass)
+              klass.new(host: host, org_id: org_id, email: email, pass: pass)
             end.tap do |api|
               unless !api || log_connection?
                 @logger.info("Created api#{self.version(version)} connection on '#{name}' enviro, pointing to '#{host}' in '#{mode}' mode")

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

@@ -20,9 +20,9 @@ module Eco
           end
 
           # Among all the locations structures it selects the one with more location nodes
-          def live_tree(enviro: nil, include_archived: false)
+          def live_tree(enviro: nil, include_archived: false, &block)
             return @live_tree if instance_variable_defined?(:@live_tree) && @live_tree.enviro == enviro
-            trees = live_trees(enviro: enviro, include_archived: include_archived)
+            trees = live_trees(enviro: enviro, include_archived: include_archived, &block)
             @live_tree = trees.reject do |tree|
               tree.empty?
             end.max do |a,b|
@@ -36,7 +36,7 @@ module Eco
           end
 
           # Retrieves all the location structures of the organisation
-          def live_trees(enviro: nil, include_archived: false)
+          def live_trees(enviro: nil, include_archived: false, &block)
             [].tap do |eco_trees|
               next unless apis.active_api.version_available?(:graphql)
               next unless graphql = apis.api(version: :graphql)
@@ -44,7 +44,7 @@ module Eco
                 includeArchived:    include_archived,
                 includeUnpublished: false
               }
-              next unless trees = graphql.currentOrganization.locationStructures(**kargs)
+              next unless trees = graphql.currentOrganization.locationStructures(**kargs, &block)
               trees.each do |tree|
                 args = {  enviro: enviro, id: tree.id, name: tree.name}
                 eco_tree = Eco::API::Organization::TagTree.new(tree.treeify, **args)

data/lib/eco/api/session.rb

@@ -45,8 +45,8 @@ module Eco
       end
 
       # @see Eco::API::Session::Config#live_tree
-      def live_tree(include_archived: false)
-        config.live_tree(enviro: enviro)
+      def live_tree(include_archived: false, &block)
+        config.live_tree(enviro: enviro, &block)
       end
 
       # @see Eco::API::Session::Config#schemas

data/lib/eco/api/usecases/default_cases/csv_to_tree_case/helper.rb

@@ -25,11 +25,16 @@ class Eco::API::UseCases::DefaultCases::CsvToTree
           node = Node.new(i, *values)
           prev_node ||= node
 
-          if prev_node.raw_level <= node.raw_level
+          # If node is nested in prev_node or is a sibling thereof
+          if prev_node.raw_level <= node.raw_level\
+            # Make sure parent is among upper level tags
             node.set_high_levels(prev_node)
           else
             if parent_node = prev_nodes[node.raw_level - 1]
               node.set_high_levels(parent_node)
+            elsif node.raw_level == 1
+              # It is expected not to have parent
+              #puts "Node '#{node.raw_tag}' doesn't have parent, but it's top level tag"
             else
               raise "Node '#{node.raw_tag}' (#{node.row_num} row) doesn't have parent"
             end

data/lib/eco/api/usecases/default_cases/hris_case.rb

@@ -44,7 +44,7 @@ class Eco::API::UseCases::DefaultCases::HrisCase < Eco::API::Common::Loaders::Us
       other_people  = people.group_by_schema.values_at(*other_schemas).map(&:to_a).flatten
       if other_people.length > 3
         msg  = "There are #{other_people.length} people in schemas other than #{active_schema.name}."
-        msg << " Please, use the filter option '-schema_id SchemaName' for the 'hris' case to only include those of that schema"
+        msg << " Please, use the filter option '-schema-id SchemaName' for the 'hris' case to only include those of that schema"
         msg << " in the current update. The HRIS case identifies people that are not in the file as leavers"
         msg << " (as it will remove the account of all the people of other schemas if they are not in the input file)."
         msg << "\n For example: -schema-id '#{active_schema.name.downcase}'"

data/lib/eco/data/hashes/array_diff.rb

@@ -56,15 +56,24 @@ module Eco
         #   - It also allows to know the original value
         # @return [Hash] where `key` is the key of the record, and `value` a `DiffResult` object
         def diffs
-          @diffs ||= paired_sources.each_with_object([]) do |(src1, src2), diffs|
+          @diffs ||= source_results.select do |res|
+            res.diff?
+          end
+        end
+
+        # @return [Boolean] wheter or not there are differences.
+        def diffs?
+          !diffs.empty?
+        end
+
+        def source_results
+          @source_results ||= paired_sources.each_with_object([]) do |(src1, src2), res|
             args = {
               key:            key,
               compare:        compared_attrs,
               case_sensitive: case_sensitive?
             }
-            diff_result_class.new(src1, src2, **args).tap do |res|
-              diffs << res if res.diff?
-            end
+            res << diff_result_class.new(src1, src2, **args)
           end
         end
 

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.4.5"
+  VERSION = "2.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.7
 platform: ruby
 authors:
 - Oscar Segura
@@ -156,7 +156,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.5
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'