eco-helpers 1.2.2 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3ad84afe4b64a3fc6285227c511f07973bad7a2fa30563bba3c961607f06882
-  data.tar.gz: 6b5b3b281cb22bf03f344647dbd887263544b77de4bd7b5f0a9e724fa3e74291
+  metadata.gz: adb97e964a09a628b29aa507f3f6d764df82b7c8dbdd568f86245ab05fdfb4bb
+  data.tar.gz: 1f09ede76add050f3800d6683717a1ccd8f45e6af46f030e53d24edee74f7273
 SHA512:
-  metadata.gz: 35b1e316a53705127ae555572f1186b037862067387b14482285a46fbf76a2402e43d9ea761712c52f7be39c0a281288c63ecd0672baee605d8cd6b2dcee2d58
-  data.tar.gz: 7a28bbd1d45d39ad090812496efe5fc26ee916e5db3a28d27ef1582bce8f48e44e2d4ee900143aa172f9603e893a1a09591b4c3e6991e6cfd731c315e352bb55
+  metadata.gz: c0d9585e4c20c5e9f0f8ca0101789dc9e50e6e08a71297c0376f1c2334abe602fbe24ca5fee178c840c2c52e0ee6a1446c26eee0103a377f29e99fbe9afece46
+  data.tar.gz: e3894a74b853858da71ee783f460eed18cbd68dae92a941ea755a687b84c7b27f4899a675c7cb16ecbb83d0eb4105aa8380d8dea3ac64493a7e82f6802a14e37

data/lib/eco/api/error.rb

@@ -74,6 +74,10 @@ module Eco
         def descendants(direct: false)
           ObjectSpace.each_object(::Class).select do |klass|
             klass < self
+          end.sort do |k1, k2|
+            next -1 if k2 < k1
+            next  1 if k1 < k2
+            0
           end.tap do |siblings|
             if direct
               siblings.reject! do |si|

data/lib/eco/api/error/handler.rb

@@ -2,9 +2,9 @@ module Eco
   module API
     class Error
       class Handler < Eco::API::UseCases::UseCase
-        @types = [:transform]
+        @types = [:error_handler]
 
-        def initialize(name, type: :transform, root:, &block)
+        def initialize(name, type: :error_handler, root:, &block)
           super(name, type: type, root: root, &block)
         end
 

data/lib/eco/api/error/handlers.rb

@@ -8,7 +8,7 @@ module Eco
           super(handler)
         end
 
-        def on(klass_err, type: :transform, retry: true, &block)
+        def on(klass_err, type: :error_handler, retry: true, &block)
           Eco::API::Error.validate_err_class(klass_err)
           raise "Expected block but not given" unless block
           Eco::API::Error::Handler.new(klass_err, type: type, root: self, &block).tap do |handler|

data/lib/eco/api/session/batch/feedback.rb

@@ -56,13 +56,21 @@ module Eco
                 hash = entry.as_json.slice("id", "external_id", "email")
               else
                 hash = entry.as_update
-                if entry.details
+                #if entry.details
+                if hash["details"]
                   if hfields = hash.dig("details", "fields")
                     hfields.each do |fld|
                       fld.merge!("alt_id" => entry.details.get_field(fld["id"]).alt_id)
                     end
                   end
                 end
+
+                if account = hash["account"]
+                  if account.keys == ["send_invites"] && !account["send_invites"]
+                    hash.delete("account")
+                    hash.delete("id") if hash.keys == ["id"]
+                  end
+                end
               end
             end
             hash || {}

data/lib/eco/api/session/batch/job.rb

@@ -56,6 +56,20 @@ module Eco
             @status     = nil
           end
 
+          # Creates an empty `Batch::Job` with same behaviour as the current one
+          # @note
+          #   * this job will not be linked to the `Batch::Jobs` model of the current session
+          #   * mostly used for error_handlers
+          # @return [Eco::API::Session::Batch::Job]
+          def dup(name = "ad-hoc:job-from:#{self.name}", usecase: nil)
+            self.class.new(enviro, name: name, type: type, sets: sets, usecase: usecase)
+          end
+
+          # @return [Boolean] `true` if the current batch job is a result of an error_handler
+          def error_handler?
+            usecase? && usecase.is_a?(Eco::API::Error::Handler)
+          end
+
           # @return [Boolean] was this `batch job` generated by a `usecase`? (`Eco::API::UseCases::UseCase`)
           def usecase?
             !!usecase
@@ -251,13 +265,15 @@ module Eco
                 #else # do not entry.reset! (keep track on changes still)
                 end
               end
-              # launch_error handlers
+              # launch error_handlers
               handlers = session.config.error_handlers
-              if status.errors.any? && !handlers.empty?
+              if status.errors.any? && !handlers.empty? && !error_handler?
                 err_types = status.errors.by_type
                 handlers.each do |handler|
                   if entries = err_types[handler.name]
-                    handler.launch(people: people(entries), session: session, options: options)
+                    handler_job = self.dup("#{self.name} => #{handler.name}", usecase: handler)
+                    handler.launch(people: people(entries), session: session, options: options, job: handler_job)
+                    handler_job.launch(simulate: simulate)
                   end
                 end
               end

data/lib/eco/api/usecases/base_case.rb

@@ -12,7 +12,7 @@ module Eco
           end
         end
 
-        @types = [:import, :filter, :transform, :sync, :export, :other]
+        @types = [:import, :filter, :transform, :sync, :error_handler, :export, :other]
 
         class << self
           attr_reader :types

data/lib/eco/api/usecases/base_io.rb

@@ -11,7 +11,7 @@ module Eco
           end
 
           def people_required?(type)
-            !valid_type?(type) || [:filter, :transform, :sync, :export].include?(type)
+            !valid_type?(type) || [:filter, :transform, :sync, :error_handler, :export].include?(type)
           end
 
         end
@@ -54,8 +54,16 @@ module Eco
 
         # @see Eco::API::UseCases::BaseIO#initialize
         # @return [Eco::API::UseCases::BaseIO]
-        def new(type: self.type, input: self.input, people: self.people, session: self.session, options: self.options, validate: true)
-          self.class.new(type: type, input: input, people: people, session: session, options: options, validate: validate)
+        def new(**kargs)
+          default = {
+            type:     self.type,
+            input:    self.input,
+            people:   self.people,
+            session:  self.session,
+            options:  self.options,
+            validate: true
+          }.merge(kargs)
+          self.class.new(**default.merge(kargs))
         end
 
         # Helper to build a `Hash` of symbol keys or `Array` with params to do callbacks.

data/lib/eco/api/usecases/use_case.rb

@@ -40,7 +40,7 @@ module Eco
           kargs  = params.merge(kargs).merge(usecase: self)
 
           UseCaseIO.new(**kargs).tap do |uio|
-            @options = uio.options
+            @options   = uio.options
             uio.session.logger.debug("#{self.class}: going to process '#{name}'")
             uio.output = @callback.call(*uio.params)
             @times_launched += 1

data/lib/eco/api/usecases/use_case_io.rb

@@ -12,9 +12,12 @@ module Eco
 
         attr_reader :usecase
 
+        # @param usecase [Eco::API::UseCases::UseCase] the target `usecase`
+        # @param job [Eco::API::Session::Batch::Job] the default `job` of the usecase
         # @see Eco::API::UseCases::BaseIO#initialize
-        def initialize(usecase:, **kargs)
+        def initialize(usecase:, job: nil, **kargs)
           self.usecase = usecase
+          @job         = job
           super(**kargs)
         end
 
@@ -22,7 +25,11 @@ module Eco
         # @param usecase [Eco::API::UseCases::UseCase] target usecase
         # @return [Eco::API::UseCases::UseCaseIO]
         def new(usecase:, **kargs)
-          super(**kargs.merge(usecase: usecase))
+          default = {
+            usecase: usecase,
+            job:     @job
+          }
+          super(**default.merge(kargs))
         end
 
 
@@ -46,9 +53,12 @@ module Eco
         def params(keyed: false)
           super(keyed: keyed).tap do |res|
             if keyed
-              res.merge!(usecase: usecase)
+              res.merge!({
+                usecase: usecase,
+                job:     @job
+              })
             else
-              res.push(usecase)
+              res.push(usecase).push(@job)
             end
           end
         end
@@ -64,7 +74,7 @@ module Eco
             kargs[:input]  = output
           when :filter
             kargs[:people] = output
-          when :transform, :sync, :export
+          when :transform, :sync, :export, :error_handler
             # no redirections => should it redirect the input?
           end
           self.class.new(kargs)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.2.2"
+  VERSION = "1.3.1"
 end

metadata

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