eco-helpers 2.7.8 → 2.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73af9e54de9fc73f1986db49810ae91ad2a8c0153c26d40681873cc52754a923
-  data.tar.gz: eb978a976711797b852cfbf2d39f68cfc760906463753a8440e9c6f595269c51
+  metadata.gz: 1e9c00a0ecc4c1fb42d808e2df03a8618c7017be7a27e6319859bd7974b3638a
+  data.tar.gz: f9e2452935fcfc3712e53b5e5731151f1ddf6a4f946f2e1c6f8c629f48e09e9e
 SHA512:
-  metadata.gz: c454c5ec9ed3713e6bb4fd0e73b582343d5bc96fe6de677b63070838af87b93cb86dad96d1446ba4c6ead007587798c90d30d7c73cea601067db6acd9da32156
-  data.tar.gz: afd3bb1f221ddd4db2056a5347799f88c0ad70bbf6dbf868c1f8a231a1ee311df252db2e899f95ada3e31925b8376d74145bb55b0449aa88793d10b33dea1583
+  metadata.gz: 4e4595657f37f057269bbd38671858700bdcc22e2755e3b365bbe69e48e017e11974a8583b5e93c09c1abf90cd4f09c0ed8ac4a853be8d471c51719fa1500e71
+  data.tar.gz: 0e3af7794e45e62fdbb2ba06340cc7b23ea88466670eb8b597c4e279556bb5cc59dfa5f8ff0f294f77d15dfd159819590cd2228d05fa19af8a2421d4b665fa72

data/CHANGELOG.md

@@ -1,12 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.7.9] - 2024-05-xx
+## [2.7.12] - 2024-05-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.7.11] - 2024-05-20
+
+### Changed
+  - Upgrade SFTP access
+
+## [2.7.10] - 2024-05-16
+
+### Changed
+  - Temporarily silent warnings on tracking id changes (apparently the tracking locations tree is not up to date with latest version and gives false warnings)
+
+### Fixed
+  - Remove enviro from tagtree download
+
+## [2.7.9] - 2024-05-16
+
+### Fixed
+  - `Eco::Data::Locations::NodeDiff::NodesDiff#unarchive`
+    - It must include archived nodes that will receive new children
+
 ## [2.7.8] - 2024-05-16
 
 ### Added

data/eco-helpers.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'ecoportal-api',         '>= 0.9.8', '< 0.10'
   spec.add_dependency 'ecoportal-api-v2',      '>= 1.1.8', '< 1.2'
   spec.add_dependency 'ecoportal-api-graphql', '>= 0.3.18', '< 0.4'
+  spec.add_dependency 'ed25519', '>= 1.2'
+  spec.add_dependency 'bcrypt_pbkdf', '>= 1.0'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.142.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.58.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.8.1',  '< 3'

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

@@ -40,11 +40,13 @@ module Eco
         # @param tagtree [String] representation of the tagtree in json.
         def initialize(
           tagtree = [],
-          name: nil, id: nil,
-          depth: -1, path: [],
-          parent: nil, _weight: nil # rubocop:disable Lint/UnderscorePrefixedVariableName
+          name:    nil,
+          id:      nil,
+          depth:   -1,
+          path:    [],
+          parent:  nil,
+          _weight: nil # rubocop:disable Lint/UnderscorePrefixedVariableName
         )
-
           @source = parse_source_input(tagtree)
 
           msg = "You are trying to initialize a TagTree with a null tagtree"

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

@@ -21,12 +21,16 @@ module Eco
           #   1. If there's a file tagtree.json file, it uses it
           #   2. If no file, retrieves `structure_id` (config)
           # @param include_archived [Boolean] whether or not it should include archived nodes.
+          # @param [recache] used for re-caching
           # @return [Eco::API::Organization::TagTree]
-          def scope_tree(enviro: nil, include_archived: true, raise_on_missing: true) # rubocop:disable Lint/UnusedMethodArgument
-            return @tagtree if instance_variable_defined?(:@tagtree) && @tagtree.enviro == enviro
+          def scope_tree(
+            include_archived: true,
+            recache:          false,
+            raise_on_missing: true  # rubocop:disable Lint/UnusedMethodArgument
+          )
+            return @tagtree if instance_variable_defined?(:@tagtree) && !recache
 
             kargs = {
-              enviro:               enviro,
               includeArchivedNodes: include_archived
             }
 
@@ -48,16 +52,16 @@ module Eco
 
           # Among all the locations structures it selects the one with more location nodes
           # If `id` is provided, it only retrieves this locations structure.
-          # @param [enviro] used for re-caching
-          def live_tree(id: nil, enviro: nil, include_archived: false, **kargs, &block) # rubocop:disable Metrics/AbcSize
+          # @param [recache] used for re-caching
+          def live_tree( # rubocop:disable Metrics/AbcSize
+            id:               nil,
+            include_archived: false,
+            **kargs,
+            &block
+          )
             existing_cache   = !@live_tree.nil?
             first_load       = !existing_cache
-
-            target_change    = existing_cache && id     && @live_tree.id != id
-            enviro_change    = existing_cache && enviro && @live_tree.enviro != enviro
-
-            switching_target = existing_cache && (target_change || enviro_change)
-            _refresh_cache   = existing_cache && !switching_target
+            switching_target = existing_cache && id && @live_tree.id != id
 
             kargs = {
               includeArchivedNodes: include_archived

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

@@ -248,10 +248,17 @@ module Eco
         # @note it does NOT include archived nodes by default.
         #   - This is for legacy (most usecases don't)
         # @param include_archived [Boolean] whether or not it should include archived nodes.
+        # @param [recache] used for re-caching
         # @return [Eco::API::Organization::TagTree]
-        def tagtree(enviro: nil, include_archived: false, raise_on_missing: true)
+        def tagtree(
+          include_archived: false,
+          recache:          false,
+          raise_on_missing: true
+        )
           kargs = {
-            enviro: enviro, include_archived: include_archived, raise_on_missing: raise_on_missing
+            recache:          recache,
+            include_archived: include_archived,
+            raise_on_missing: raise_on_missing
           }
           @tagtree ||= tagtree_config.scope_tree(**kargs)
         end
@@ -259,8 +266,8 @@ module Eco
         # It obtains the first of the live tagtree in the org
         # @note it requires graphql connection configuration parameters
         # @return [Eco::API::Organization::TagTree]
-        def live_tree(id: nil, enviro: nil, **kargs, &block)
-          tagtree_config.live_tree(id: id, enviro: enviro, **kargs, &block)
+        def live_tree(id: nil, **kargs, &block)
+          tagtree_config.live_tree(id: id, **kargs, &block)
         end
 
         # Retrieves all the location structures of the organisation

data/lib/eco/api/session.rb

@@ -58,19 +58,26 @@ module Eco
       # @see Eco::API::Session::Config#tagtree
       # @see Eco::API::Session#live_trees
       # @return [Eco::API::Organization::TagTree]
-      def tagtree(live: false, merge: false, include_archived: false, **kargs, &block)
+      def tagtree(
+        live:             false,
+        merge:            false,
+        include_archived: false,
+        recache:          false,
+        **kargs,
+        &block
+      )
         if live && api?(version: :graphql)
           return live_tree(include_archived: include_archived, **kargs, &block) unless merge
           live_trees(include_archived: include_archived, **kargs, &block).inject(&:merge)
         else
-          config.tagtree(enviro: enviro)
+          config.tagtree(recache: recache)
         end
       end
 
       # @see Eco::API::Session::Config#live_tree
       # @return [Eco::API::Organization::TagTree]
       def live_tree(id: nil, include_archived: false, **kargs, &block)
-        config.live_tree(id: id, include_archived: include_archived, enviro: enviro, **kargs, &block)
+        config.live_tree(id: id, include_archived: include_archived, **kargs, &block)
       end
 
       # @see Eco::API::Session::Config#live_tree

data/lib/eco/api/usecases/graphql/helpers/location/command/diff/as_update.rb

@@ -35,8 +35,10 @@ class Eco::API::UseCases::GraphQL::Helpers::Location::Command::Diff
             h['parentId'] = after_id_update ? parent_id : parent_id_prev
           end
         else
+          return h if marked_for_unarchive?
+
           # Something is wrong (not expected to be any other category)
-          raise "Unexpected condition, please review code base"
+          raise "Please review code base, unexpected condition for #{h.pretty_inspect}"
         end
       end
     end

data/lib/eco/api/usecases/graphql/samples/location/command/track_changed_ids.rb

@@ -57,12 +57,12 @@ class Eco::API::UseCases::GraphQL::Samples::Location
 
         tags_remap_table << [[prev_id], [new_id]]
 
-        next unless ref_tree.is_a?(Eco::API::Organization::TagTree)
-        next unless ref_tree.tag?(new_id)
+        # next unless ref_tree.is_a?(Eco::API::Organization::TagTree)
+        # next unless ref_tree.tag?(new_id)
 
-        msg  = "Node '#{prev_id}' was updated to '#{new_id}', "
-        msg << "but in current structure '#{new_id}' is not present"
-        log(:warn) { msg }
+        # msg  = "Node '#{prev_id}' was updated to '#{new_id}', "
+        # msg << "but in current structure '#{new_id}' is not present"
+        # log(:warn) { msg }
       end
     end
 

data/lib/eco/data/locations/node_diff/accessors.rb

@@ -20,8 +20,8 @@ class Eco::Data::Locations::NodeDiff
       def attr_expose(*attrs)
         attrs.each do |attr|
           meth  = attr.to_sym
-          methp = "#{meth}_prev".to_sym
-          methq = "#{meth}?".to_sym
+          methp = :"#{meth}_prev"
+          methq = :"#{meth}?"
 
           # current value
           define_method meth do

data/lib/eco/data/locations/node_diff/nodes_diff/selectors.rb

@@ -5,8 +5,9 @@ class Eco::Data::Locations::NodeDiff::NodesDiff
     # @note the selector method name with a question mark should exist in the `diff_result_class`
     def selector(*attrs)
       attrs.each do |attr|
-        meth  = attr.to_sym
-        methq = "#{meth}?".to_sym
+        meth = attr.to_sym
+        methq = :"#{meth}?"
+
         define_method meth do
           diffs.select(&methq)
         end

data/lib/eco/data/locations/node_diff/nodes_diff.rb

@@ -21,6 +21,7 @@ class Eco::Data::Locations::NodeDiff
     def initialize(*args, original_tree:, **kargs, &block)
       super(*args, **kargs, &block)
       @original_tree = original_tree
+      mark_implicit_unarchive!
     end
 
     def diffs
@@ -95,6 +96,14 @@ class Eco::Data::Locations::NodeDiff
       msg.compact.join("\n")
     end
 
+    alias_method :unarchive_src, :unarchive
+
+    # @note we must unarchive destination parents that will get
+    #   some children as well
+    def unarchive
+      unarchive_src | @implicit_unarchive
+    end
+
     private
 
     def when_present(list, default = nil)
@@ -103,5 +112,26 @@ class Eco::Data::Locations::NodeDiff
       return yield(count) if count&.positive?
       default
     end
+
+    def mark_implicit_unarchive!
+      @implicit_unarchive = source_results.select do |result|
+        result.archived_prev && implicit_unarchive?(result)
+      end.tap do |results|
+        results.each(&:unarchive!)
+      end
+    end
+
+    def implicit_unarchive?(result)
+      [result.node_id, result.node_id_prev].compact.any? do |id|
+        target_parent_ids.include?(id)
+      end
+    end
+
+    def target_parent_ids
+      return @target_parent_ids if instance_variable_defined?(:@target_parent_ids)
+
+      @target_parent_ids  = insert.map(&:parent_id).uniq
+      @target_parent_ids |= move.map(&:parent_id)
+    end
   end
 end

data/lib/eco/data/locations/node_diff.rb

@@ -59,8 +59,17 @@ module Eco::Data::Locations
       parent_id?
     end
 
+    def unarchive!
+      @marked_for_unarchived = true
+    end
+
+    def marked_for_unarchive?
+      @marked_for_unarchived || false
+    end
+
     # Has the `archived` property changed and it was `true`?
     def unarchive?
+      return true  if     marked_for_unarchive?
       return false if     archived
       return false unless update?
       archived?

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = '2.7.8'.freeze
+  VERSION = '2.7.10'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.7.8
+  version: 2.7.10
 platform: ruby
 authors:
 - Oscar Segura
@@ -170,6 +170,34 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: bcrypt_pbkdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement