eco-helpers 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6946d1680313de425978c9ebbb55f0f59211fee5
-  data.tar.gz: dd889e82758cc4344fdcc5a5a9c28f9467846f8c
+  metadata.gz: ad5941e8792705047cf6dbd46515023c9bda2285
+  data.tar.gz: b1b3ef9fa046781f791170f2a4e872ef79862efe
 SHA512:
-  metadata.gz: 3a51c49225a13b8ec76211571e4082c6e8b4d394ffa2ce886af430c8dfa1d48b2295724de2edf46e6a0c36f3547566ab42e34ee871a8d581dbbf74b888a3a0aa
-  data.tar.gz: de29a8397e45cf8f22b500cffaa56b1e42c1d8ca28abc819b71f6c7adbfa7614479284ee02aa5fa1901ecc7fbcd3390326adc217f4bc3d5cc24c0fce68691059
+  metadata.gz: b05481b93f00fe18b0d8721ec2c1e11e25e85bda934042458e948217bb8e52a5efe2ae53464525bd95baffcb003f749361653bb0273edd8ae4ea80ea6b4a1c64
+  data.tar.gz: e26cc0b7607a2c7197c1e528a914ca9ea2414688205d21421c582d81317a54c6cc76c454646d88b865f287ebe389bd44e85cf0929b09036e8859183bc5856add

data/lib/eco/api/common/session/environment.rb

@@ -15,11 +15,11 @@ module Eco
           def initialize(init = {})
             init = init.conf if init.is_a?(Environment)
             msg = "Wrong Session::Environment initializer. Expected Hash or Environment object. Given: #{init}"
-            raise msg unless init.is_a?(SessionConfig)
+            raise msg unless init.is_a?(Eco::API::SessionConfig)
 
             @config = init
             @file_manager = Eco::API::Common::Session::FileManager.new(enviro: self)
-            @logger = Session::Logger.new(enviro: self)
+            @logger       = Eco::API::Common::Session::Logger.new(enviro: self)
             new_api
           end
 

data/lib/eco/api/common/session/mailer.rb

@@ -84,7 +84,6 @@ module Eco
             config.mailer.message_id_domain
           end
 
-
         end
       end
     end

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

@@ -15,7 +15,14 @@ module Eco
         end
 
         def to_id(name)
-          policy_group(name)&.id
+          case name
+          when Array
+            name.map do |n|
+              policy_group(n)&.id
+            end.compact
+          else
+            policy_group(name)&.id
+          end
         end
 
         def to_name(id)
@@ -26,6 +33,21 @@ module Eco
           @by_id.fetch(policy_group_id(id_name), nil)
         end
 
+        def user_pg_ids(initial: [], final: [], non_custom: [], preserve_custom: true)
+          non_custom = to_id([non_custom].flatten.compact)
+          initial    = to_id([initial].flatten.compact)
+          final      = to_id([final].flatten.compact)
+          unless initial.is_a?(Array) && final.is_a?(Array) && non_custom.is_a?(Array)
+            raise "Expected Array for :initial, :final and :custom"
+          end
+
+          initial_custom = initial - non_custom
+          final = final + initial_custom if preserve_custom
+          new_pg_ids = final - initial
+          # keep same order as they where
+          (initial & final) + new_pg_ids
+        end
+
         private
 
         def policy_group_name(id_name)

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

@@ -53,8 +53,8 @@ module Eco
         end
 
         def user_tags(initial: [], final: [], preserve_custom: true, add_custom: false)
-          initial ||= [initial].flatten.compact
-          final   ||= [final].flatten.compact
+          initial = [initial].flatten.compact
+          final   = [final].flatten.compact
           raise "Expected Array for initial: and final:" unless initial.is_a?(Array) && final.is_a?(Array)
           final    = filter_tags(final) unless add_custom
           custom   = initial - filter_tags(initial)

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

@@ -101,10 +101,11 @@ module Eco
           params = {per_page: DEFAULT_BATCH_BLOCK}.merge(params)
           per_page = params.fetch(:per_page)
 
-          iteration = 1; done = 0
+          iteration  = 1; done = 0
+          iterations = (people.length / per_page).ceil
 
           people.each_slice(per_page) do |slice|
-            msg = "starting batch '#{method}' iteration #{iteration}, which has #{slice.length} entries of #{people.length} -- #{done} done"
+            msg = "starting batch '#{method}' iteration #{iteration}/#{iterations}, with #{slice.length} entries of #{people.length} -- #{done} done"
             logger.info(msg)
 
             people_api.batch do |batch|

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

@@ -9,8 +9,8 @@ module Eco
 
         def initialize(name, type:, sets:, root:)
           raise "A name is required to refer a job. Given: #{name}" if !name
-          raise "Type should be one of #{TYPES}. Given: #{type}" if !BatchJob.valid_type?(type)
-          raise "Sets should be some of #{SETS}. Given: #{sets}" if !BatchJob.valid_sets?(sets)
+          raise "Type should be one of #{TYPES}. Given: #{type}"    if !BatchJob.valid_type?(type)
+          raise "Sets should be some of #{SETS}. Given: #{sets}"    if !BatchJob.valid_sets?(sets)
           super(root.enviro)
 
           @name = name
@@ -39,10 +39,10 @@ module Eco
           @queue.length > 0
         end
 
-        def add(data)
-          unless !data
-            @queue.push(data)
-            @callbacks[data] = Proc.new if block_given?
+        def add(entry)
+          unless !entry
+            @queue.push(entry)
+            @callbacks[entry] = Proc.new if block_given?
           end
         end
 
@@ -70,7 +70,7 @@ module Eco
             @status.root = self
           end
 
-          logger.info("Simulate: this would have launched: '#{@type.to_s}'") if simulate          
+          logger.info("Simulate: this would have launched: '#{@type.to_s}'") if simulate
           return @status
         end
 

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

@@ -1,7 +1,3 @@
-require 'json'
-require 'pp'
-require 'securerandom' # for uuid (perhaps metter to have structure i.e. Session:id-Batch:id)
-
 module Eco
   module API
     class Session

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

@@ -0,0 +1,58 @@
+module Eco
+  module API
+    class Session
+      class BatchJobs < API::Common::Session::BaseSession
+        attr_reader :name, :session
+
+        def initialize(name, session:)
+          raise("BatchJobs requires a session object") unless session.is_a?(API::Session)
+          super(session.enviro)
+          @session = session
+          @name     = name
+          reset
+        end
+
+        def reset
+          @jobs = {}
+          @callbacks = {}
+        end
+
+        def [](name)
+          @jobs[name]
+        end
+
+        def exists?(name)
+          @jobs.key?(name)
+        end
+
+        def new(name, type:, sets:)
+          raise("Can't create job named '#{name}' because it already exists.") if exists?(name)
+
+          job = BatchJob.new(name, type: type, sets: sets, root: self)
+          @jobs[name] = job
+          @callbacks[job] = Proc.new if block_given?
+
+          job
+        end
+
+        def pending?
+          @jobs.keys.any? do |key|
+            @jobs[key].pending?
+          end
+        end
+
+        def launch(simulate: false)
+          group_status = {}
+          @jobs.each do |name, job|
+            group_status[job] = job_status = job.launch(simulate: simulate)
+            callback = @callbacks[job]
+            callback.call(job, job_status) if callback
+          end
+
+          return group_status
+        end
+
+      end
+    end
+  end
+end

data/lib/eco/api/session/{batch_jobs.rb → job_groups.rb}

@@ -73,59 +73,6 @@ module Eco
         end
 
       end
-
-      class BatchJobs < API::Common::Session::BaseSession
-        attr_reader :name, :session
-
-        def initialize(name, session:)
-          raise("BatchJobs requires a session object") unless session.is_a?(API::Session)
-          super(session.enviro)
-          @session = session
-          @name     = name
-          reset
-        end
-
-        def reset
-          @jobs = {}
-          @callbacks = {}
-        end
-
-        def [](name)
-          @jobs[name]
-        end
-
-        def exists?(name)
-          @jobs.key?(name)
-        end
-
-        def new(name, type:, sets:)
-          raise("Can't create job named '#{name}' because it already exists.") if exists?(name)
-
-          job = BatchJob.new(name, type: type, sets: sets, root: self)
-          @jobs[name] = job
-          @callbacks[job] = Proc.new if block_given?
-
-          job
-        end
-
-        def pending?
-          @jobs.keys.any? do |key|
-            @jobs[key].pending?
-          end
-        end
-
-        def launch(simulate: false)
-          group_status = {}
-          @jobs.each do |name, job|
-            group_status[job] = job_status = job.launch(simulate: simulate)
-            callback = @callbacks[job]
-            callback.call(job, job_status) if callback
-          end
-
-          return group_status
-        end
-
-      end
     end
   end
 end

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

@@ -23,7 +23,7 @@ module Eco
           people = batch.get_people
           file = file_manager.save_json(people, filename, :timestamp)
           logger.info("#{people.length} people loaded and saved locally to #{file}.")
-          API::Organization::People.new(people)
+          Eco::API::Organization::People.new(people)
         end
 
         def load_people(filename = enviro.config.people.cache, modifier: [:newest, :api])

data/lib/eco/api/session.rb

@@ -178,4 +178,5 @@ require_relative 'session/batch'
 require_relative 'session/batch_status'
 require_relative 'session/task'
 require_relative 'session/batch_job'
-require_relative 'session/batch_jobs'
+require_relative 'session/job_group'
+require_relative 'session/job_groups'

data/lib/eco/api/session_config/apis.rb

@@ -10,7 +10,6 @@ module Eco
 
         def apis
           self["apis"] ||= {}
-          self["apis"]
         end
 
         def apis?
@@ -58,12 +57,20 @@ module Eco
           self["active-api"]
         end
 
-        def api(logger = ::Logger.new(IO::NULL))
+        def service_up?
+          api_klass = (active_api.version == :external)? Ecoportal::API::External : Ecoportal::API::Internal
+          @api_test ||= api_klass.new("foobar", host: active_api.host, logger: ::Logger.new(IO::NULL))
+          status = @api_test.client.get("/policy_groups").status
+          # 401 Unauthorized "Permission denied. API key may be invalid."
+          status == 401
+        end
+
+        def api(logger = ::Logger.new(IO::NULL), force_new: false)
           key     = active_api.key
           host    = active_api.host
           mode    = active_api.mode
           version = active_api.version
-          return @api if @api && key == @key && host == @host && @mode == mode && version == @version
+          return @api if (!force_new) && @api && key == @key && host == @host && @mode == mode && version == @version
 
           api_klass = (version == :external)? Ecoportal::API::External : Ecoportal::API::Internal
 
@@ -72,6 +79,10 @@ module Eco
           @api
         end
 
+        def new_api(logger = ::Logger.new(IO::NULL))
+          api(logger, force_new: true)
+        end
+
       end
     end
   end

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

@@ -73,15 +73,14 @@ module Eco
         # CUSTOM PERSON PARSERS
         def add_parser(format: :csv)
           new_parsers = Eco::API::Common::People::PersonParser.new
-
           yield(new_parsers, config)
+          
           parsers[format] ||= Eco::API::Common::People::PersonParser.new
           parsers[format] = parsers[format] ? parsers[format].merge(new_parsers) : new_parsers
         end
 
         def parsers
           self["parsers"] ||= {}
-          self["parsers"]
         end
 
         def parser(format: :csv)

data/lib/eco/api/session_config/use_cases.rb

@@ -3,7 +3,7 @@ module Eco
     class SessionConfig
       class UseCases < Hash
         attr_reader :config
-        
+
         def initialize(root:)
           super(nil)
           @root   = root
@@ -22,7 +22,7 @@ module Eco
         end
 
         def use_group
-          self["use_group"]
+          self["use_group"] ||= Eco::API::UseCases::UseGroup.new
         end
 
       end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/eco-helpers.rb

@@ -1,5 +1,5 @@
 require 'csv'
-require 'json' # native
+require 'json'
 require 'pp'
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Oscar Segura
@@ -223,8 +223,9 @@ files:
 - lib/eco/api/session.rb
 - lib/eco/api/session/batch.rb
 - lib/eco/api/session/batch_job.rb
-- lib/eco/api/session/batch_jobs.rb
 - lib/eco/api/session/batch_status.rb
+- lib/eco/api/session/job_group.rb
+- lib/eco/api/session/job_groups.rb
 - lib/eco/api/session/task.rb
 - lib/eco/api/session_config.rb
 - lib/eco/api/session_config/api.rb