eco-helpers 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c15ec5f243e3ddbf220b7177458666205cbd03aa2cd7b42ae49c75b7309c41
-  data.tar.gz: 3f46b25d6aff9988339d4e331356b9cf9e168a944ec7f7ae7ac171d660413499
+  metadata.gz: f3aec55ff6424177729ff863f6652dfe53fecd2df84111036d336e216f9df441
+  data.tar.gz: 86faa0568a8d3bc393cbbe4db62bb367230035de12230739c68891d551ae16b7
 SHA512:
-  metadata.gz: 5fa870fa6491d12d458696895882b63895bf3dc5e2ca86ce58dd6ad476ec63e012b4a58809244f47ac09e674139dfcfe6e68fc32e052dbd248c145d0f9edb5c6
-  data.tar.gz: 692681ee1f899a6d6509289c99b291a379c20daa6b34155a6faa903e43badddca393644dc10dc07e00eaa4f96e0b6f83da0b31bc8764c70713b5c3f824a686fb
+  metadata.gz: 49f68f024a1e129502ec505b79b945feec5f40a99dfa8c7ebb45ea9699c889efffaad23b1e0c08302032a92cc117a0fb9ecf404cb68cdf6d576deb283d63118e
+  data.tar.gz: 64777d1d3c04e878538f70b41fd0fc67ec4a951c1d59ade2300a96174c006ff68d1a2c12c9c661b57bc75af5e71e8d690c1e8239664373b426328d4e247a674d

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

@@ -14,6 +14,10 @@ module Eco
           @caches_init = false
         end
 
+        def to_json
+          to_a.to_json
+        end
+
         def [](id_or_ext)
           id(id_or_ext) || external_id(id_or_ext)
         end

data/lib/eco/api/session.rb

@@ -1,8 +1,8 @@
 module Eco
   module API
     class Session < Common::Session::BaseSession
-      attr_reader   :batch
-      attr_reader   :job_groups
+      attr_reader   :batch, :job_groups
+      attr_reader   :usecases
       attr_accessor :schema
 
       def initialize(init = {})
@@ -18,7 +18,7 @@ module Eco
         @task         = Task.new(enviro)
         @job_groups   = JobGroups.new(enviro)
 
-        @use_cases    = Eco::API::UseCases::DefaultCases.new.merge(config.usecases)
+        @usecases     = Eco::API::UseCases::DefaultCases.new.merge(config.usecases)
 
         self.schema = config.people.default_schema || schemas.first
         @policy_groups = config.policy_groups
@@ -142,9 +142,9 @@ module Eco
 
       def process_case(name, type: nil, **params)
         args = { session: self }.merge(params)
-        fatal("Undefined usecase '#{name}' of type '#{type.to_s}'") if !@use_cases.defined?(name, type: type)
+        fatal("Undefined usecase '#{name}' of type '#{type.to_s}'") if !usecases.defined?(name, type: type)
         logger.debug("Session: going to process '#{name}' defined case")
-        @use_cases.case(name, type: type).launch(**args)
+        usecases.case(name, type: type).launch(**args)
       end
 
       def job_group(name, order: :last)

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

@@ -23,6 +23,13 @@ module Eco
           @jobs.key?(name)
         end
 
+        def job(name, type: nil, sets: nil, usecase: nil, &block)
+          new(name, type: type, sets: sets, usecase: usecase, &block) unless exists?(name)
+          self[name].tap do |job|
+            block.call(job) if block
+          end
+        end
+
         def new(name, type:, sets:, usecase: nil)
           fatal "Can't create job named '#{name}' because it already exists." if exists?(name)
 

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

@@ -176,7 +176,7 @@ module Eco
         private
 
         def person_ref(entry)
-          "(id: '#{get_attr(entry, :id)}')'#{get_attr(entry, :name)}' ('#{get_attr(entry, :external_id)}': '#{get_attr(entry, :email)}')"
+          "(id: '#{get_attr(entry, :id)}') '#{get_attr(entry, :name)}' ('#{get_attr(entry, :external_id)}': '#{get_attr(entry, :email)}')"
         end
 
         def get_attr(entry, attr)

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

@@ -188,6 +188,10 @@ module Eco
           @schemas = Eco::API::Organization::PersonSchemas.new(schs)
         end
 
+        def session
+          @session ||= Eco::API::Session.new(self)
+        end
+
         # PEOPLE
         def discarded_people_file=(value)
           people.discarded_file = value

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

@@ -12,6 +12,10 @@ module Eco
             apis.keys.length > 0
           end
 
+          def enviros
+            apis.keys
+          end
+
           def defined?(name)
             apis.key?(name)
           end

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

@@ -14,7 +14,11 @@ module Eco
               begin
                 cnf[key] = self[key].clone(config: cnf)
               rescue ArgumentError
-                cnf[key] = self[key].clone
+                begin
+                  cnf[key] = self[key].clone
+                rescue TypeError
+                  cnf[key] = self[key]
+                end
               end
             end
           end

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

@@ -15,6 +15,25 @@ module Eco
           Eco::API::Organization::People.new(people)
         end
 
+        def search(data, silent: true)
+          # to scope people to be fresh data got via api
+          session.logger.info("going to api get entries...")
+          status = session.batch.search(data, silent: silent)
+          people = Eco::API::Organization::People.new(status.people)
+          # get the supervisors
+          session.logger.info("going to api get supervisors...")
+          supers = data.each_with_object([]) do |entry, sup|
+            if entry.respond_to?(:supervisor_id) && !entry.supervisor_id.to_s.strip.empty?
+              spr = {"id" => entry.supervisor_id}
+              sup.push(spr) unless sup.include?(spr)
+            end
+          end
+          status = session.batch.search(supers, silent: silent)
+          people = people.merge(status.people)
+          session.logger.info("could get #{people.length} people (out of #{data.length} entries)")
+          people
+        end
+
         def load_people(filename = enviro.config.people.cache, modifier: [:newest, :api])
           modifier = [modifier].flatten
           people = []

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

@@ -7,15 +7,15 @@ module Eco
           def process
             @cases.define("delete", type: :transform) do |people, session, options, usecase|
               delete = session.job_group("main").new("delete", usecase: usecase, type: :delete, sets: [:core, :details, :account])
-              people.each_with_index do |person|
+              people.each_with_index do |person, i|
                 delete.add(person)
               end
             end
 
-            @cases.define("delete", type: :sync) do |entries, people, session|
+            @cases.define("delete", type: :sync) do |entries, people, session, options, usecase|
               delete = session.job_group("main").new("delete", usecase: usecase, type: :delete, sets: [:core, :details, :account])
               strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
-              entries.each_with_index do |entry|
+              entries.each_with_index do |entry, i|
                 if person = people.find(entry, strict: strict_search)
                   delete.add(person)
                 else

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

@@ -41,7 +41,9 @@ module Eco
                     person.account&.send_invites = options[:send_invites] if options.key?(:send_invites)
                   end
 
-                  person.details = entry.details unless options.dig(:exclude, :details)
+                  unless options.dig(:exclude, :details)
+                    person.details = entry.details
+                  end
 
                   creation.add(person) if create
                   update.add(person) unless create

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

@@ -11,7 +11,6 @@ module Eco
               users = people.users
               session.logger.warn("There are no people with account amoung your #{people.length} people") unless users.length > 0
               users.each do |person|
-                print "."
                 person.account.permissions_custom = session.new_preset(person)
                 job.add(person)
               end

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

@@ -10,7 +10,7 @@ module Eco
           transform: [:people, :session],
           export:    [:people, :session, :options]
         }
-        
+
         class << self
           def valid_type?(type)
             TYPES.include?(type)
@@ -29,12 +29,18 @@ module Eco
           raise "Undefined usecase type #{type}, when creating '#{name}'. Please, use any of #{TYPES}" unless self.class.valid_type?(type)
 
           self.root = root
-          @case     = block
+          @callback = block
           @name     = name
           @type     = type
           @times_launched = 0
         end
 
+        def chainer
+          # TODO: root is a UseGroup that will not point to this new case.
+          # => Moreover, the name and type will be the same as self
+          Eco::API::UseCases::UseCaseChain.new(usecase: self, root: @root)
+        end
+
         def root=(value)
           raise "Root should be a UseGroup. Given: #{value}" if !value.is_a?(UseGroup)
           @root = value
@@ -44,7 +50,7 @@ module Eco
           @options = options
           data = UseCaseIO.new(usecase: self, input: input, people: people, session: session, options: options)
 
-          data.output = @case.call(data.params)
+          data.output = @callback.call(data.params)
           @times_launched += 1
 
           data_model = {
@@ -54,6 +60,12 @@ module Eco
           }
         end
 
+        protected
+
+        def callback
+          @callback
+        end
+
       end
 
     end

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

@@ -5,7 +5,14 @@ module Eco
         MAX_CHAINS   = 70
         @@num_chains = 0
 
-        def initialize(name, type:, root:, &block)
+        def initialize(name = nil, type: nil, root:, usecase: nil, &block)
+          if usecase
+            raise "Expected Eco::API::UseCases::UseCase. Given #{usecase.class}" if !usecase.is_a?(Eco::API::UseCases::UseCase)
+            type = usecase.type
+            name = usecase.name
+            block = usecase.callback unless block
+          end
+
           super(name, type: type, root: root, &block)
           @chains   = []
           @resolved_chains = nil
@@ -64,9 +71,9 @@ module Eco
 
           use_group = use_group || @root
           @resolved_chains = @chains.map do |usecase|
-            usecase = usecase.call(use_group) if usecase.respond_to? :call
+            usecase = usecase.call(use_group)  if usecase.respond_to?(:call)
             raise "A UseCase can only be chained with another UseCase" if usecase && !usecase.is_a?(UseCase)
-            usecase.resolved_chains(use_group)
+            usecase.resolved_chains(use_group) if usecase.respond_to?(:resolved_chains)
             usecase
           end
         end
@@ -83,6 +90,7 @@ module Eco
               # chained cases use same params as parent case (out of simplicity)
               data_chain = dm[self][:io].chain(usecase: usecase)
               keyed_data = data_chain.params(keyed: true)
+              keyed_data.delete(:usecase)
               dm[self][:chains].merge(usecase.launch(keyed_data))
             end
           end

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

@@ -63,10 +63,10 @@ module Eco
         def chain(usecase:)
           raise "It should be a UseCase. Given: #{usecase}" if !usecase.is_a?(UseCase)
 
-          kargs = params(keyed: true)
+          aux_io = self.class.new(input: input, people: people, session: session, options: options, usecase: usecase)
+          kargs  = aux_io.params(keyed: true)
 
-          # TODO: review chaining framework (redirection should depend on self.type as well)
-          case usecase.type
+          case self.type
           when :import
             kargs[:input]  = output
           when :filter
@@ -74,7 +74,6 @@ module Eco
           when :transform, :sync, :export
             # no redirections => should it redirect the input?
           end
-
           self.class.new(kargs)
         end
 

data/lib/eco/assets.rb

@@ -9,25 +9,29 @@ module Eco
       @active_config = :default
     end
 
-    def session(key: active_config)
-      sessions[key] ||= Eco::API::Session.new(config(key: key))
-      sessions[key].tap do |session|
+    def session(key: active_config, update_active: true)
+      config(key: key, update_active: update_active).session.tap do |session|
         yield(session) if block_given?
       end
+      #sessions[key] ||= Eco::API::Session.new(config(key: key, update_active: update_active))
+      #sessions[key].tap do |session|
+      #  yield(session) if block_given?
+      #end
     end
 
-    def sessions
-      @sessions ||= {}
-    end
+    #def sessions
+    #  @sessions ||= {}
+    #end
 
 
-    def config(key: active_config)
+    def config(key: active_config, update_active: true)
       configs[:default] ||= Eco::API::Session::Config.new(key)
       unless configs.key?(key)
-        @active_config = key
+        @active_config = key unless !update_active
         configs[key] = configs[:default].clone(key)
       end
       configs[key].tap do |config|
+        config.active_api(key) if config.apis.defined?(key)
         yield(config) if block_given?
       end
     end

data/lib/eco/language/models/collection.rb

@@ -100,8 +100,6 @@ module Eco
 
         def remove(attr, value, modifier = Language::MatchModifier.new)
           self < exclude(attr, value, modifier)
-          on_change
-          self
         end
 
         def attr(attr, value = true, modifier = Language::MatchModifier.new)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

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