eco-helpers 0.6.13 → 0.6.15

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

@@ -0,0 +1,33 @@
+module Eco
+  module API
+    class Session
+      class Config
+        class UseCases < Hash
+          attr_reader :config
+
+          def initialize(root:)
+            super(nil)
+            @root   = root
+            @config = @root
+          end
+
+          # CUSTOM USE CASES
+          def add
+            new_group = Eco::API::UseCases::UseGroup.new
+            yield(new_group, config)
+
+            self["use_group"] ||= Eco::API::UseCases::UseGroup.new
+            group = self["use_group"]
+            group = group ? group.merge(new_group) : group
+            self["use_group"] = group
+          end
+
+          def use_group
+            self["use_group"] ||= Eco::API::UseCases::UseGroup.new
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -4,10 +4,8 @@ module Eco
       class JobGroups < API::Common::Session::BaseSession
         DELAY_BETWEEN_GROUPS = 2
 
-        def initialize(session:)
-          raise("JobGroups requires a session object") unless session.is_a?(API::Session)
-          super(session.enviro)
-          @session = session
+        def initialize(e)
+          super(e)
           reset
         end
 
@@ -26,9 +24,9 @@ module Eco
         end
 
         def new(name, order: :last)
-          raise("Can't create job group named #{'name'} because it already exists.") if exists?(name)
+          fatal "Can't create job group named '#{name}' because it already exists." if exists?(name)
 
-          group = BatchJobs.new(name, session: @session)
+          group = BatchJobs.new(enviro, name: name)
           @groups[name] = group
 
           if order == :last

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

@@ -7,20 +7,9 @@ module Eco
         SAVE_FILE_MODE   = [:save]
         API_MODE         = [:api, :api_get]
 
-        attr_reader :batch
-
-        def initialize(root, env)
-          super(env)
-          @root = root
-        end
-
-        def batch
-          @root&.batch
-        end
-
         def file_people(filename = enviro.config.people.cache)
           logger.info("Going to get all the people via API")
-          people = batch.get_people
+          people = session.batch.get_people
           file = file_manager.save_json(people, filename, :timestamp)
           logger.info("#{people.length} people loaded and saved locally to #{file}.")
           Eco::API::Organization::People.new(people)
@@ -53,7 +42,7 @@ module Eco
           when use_api?(modifier)
             # no previous file: use API to get all people
             logger.info("Going to get all the people via API")
-            people = batch.get_people
+            people = session.batch.get_people
 
             if save_file?(modifier) && people && people.length > 0
               file = file_manager.save_json(people, filename, :timestamp)

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.6.13"
+  VERSION = "0.6.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.6.13
+  version: 0.6.15
 platform: ruby
 authors:
 - Oscar Segura
@@ -80,6 +80,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,6 +93,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +255,7 @@ files:
 - lib/eco/api/common/session/s3_uploader.rb
 - lib/eco/api/common/version_patches.rb
 - lib/eco/api/common/version_patches/external_person.rb
+- lib/eco/api/common/version_patches/internal_person.rb
 - lib/eco/api/eco_faker.rb
 - lib/eco/api/organization.rb
 - lib/eco/api/organization/people.rb
@@ -261,19 +268,19 @@ 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/config.rb
+- lib/eco/api/session/config/api.rb
+- lib/eco/api/session/config/apis.rb
+- lib/eco/api/session/config/files.rb
+- lib/eco/api/session/config/logger.rb
+- lib/eco/api/session/config/mailer.rb
+- lib/eco/api/session/config/people.rb
+- lib/eco/api/session/config/s3_storage.rb
+- lib/eco/api/session/config/use_cases.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
-- lib/eco/api/session_config/apis.rb
-- lib/eco/api/session_config/files.rb
-- lib/eco/api/session_config/logger.rb
-- lib/eco/api/session_config/mailer.rb
-- lib/eco/api/session_config/people.rb
-- lib/eco/api/session_config/s3_storage.rb
-- lib/eco/api/session_config/use_cases.rb
 - lib/eco/api/usecases.rb
 - lib/eco/api/usecases/base_case.rb
 - lib/eco/api/usecases/case_data.rb

data/lib/eco/api/session_config.rb

@@ -1,187 +0,0 @@
-module Eco
-  module API
-    class SessionConfig < Hash
-      BaseParser = Eco::API::Common::People::BaseParser
-      BaseCase   = Eco::API::UseCases::BaseCase
-
-      def initialize()
-        super(nil)
-        self["org"] = {}
-      end
-
-      def reopen
-        yield(self)
-      end
-
-      def apis
-        self["apis"] ||= SessionConfig::Apis.new(root: self)
-      end
-
-      def logger
-        self["logger"] ||= SessionConfig::Logger.new(root: self)
-      end
-
-      def s3storage
-        self["s3_storage"] ||= SessionConfig::S3Storage.new(root: self)
-      end
-
-      def files
-        self["files"] ||= SessionConfig::Files.new(root: self)
-      end
-
-      def mailer
-        self["mailer"] ||= SessionConfig::Mailer.new(root: self)
-      end
-
-      def org
-        self["org"]
-      end
-
-      def people
-        self["people"] ||= SessionConfig::People.new(root: self)
-      end
-
-      def usecases
-        self["usecases"] ||= SessionConfig::UseCases.new(root: self)
-      end
-
-      # LOGGER
-      def log_console_level=(value)
-        logger.console_level= value
-      end
-
-      def log_file_level=(value)
-        logger.file_level = value
-      end
-
-      def log_file=(file)
-        logger.file = file
-      end
-
-      def timestamp_console=(value)
-        logger.timestamp_console = value
-      end
-
-      def log_connection=(value)
-        logger.log_connection = value
-      end
-
-      # API
-      def dry_run!
-        self["dry-run"] = true
-      end
-
-      def dry_run?
-        self["dry-run"]
-      end
-
-      def run_mode=(mode)
-        apis.active_api.mode = mode
-      end
-
-      def run_mode_local?
-        apis.active_api.local?
-      end
-
-      def run_mode_remote?
-        apis.active_api.remote?
-      end
-
-      def apis?
-        apis.apis?
-      end
-
-      def add_api(name, **kargs)
-        apis.add(name, **kargs)
-        self
-      end
-
-      def active_api(name)
-        apis.active_name = name
-        self
-      end
-
-      def api(logger = ::Logger.new(IO::NULL))
-        apis.api(logger)
-      end
-
-      def policy_groups
-        policy_groups = api&.policy_groups.to_a.compact
-        Eco::API::Organization::PolicyGroups.new(policy_groups)
-      end
-
-      # FILES
-      def working_directory=(path)
-        files.working_directory = path
-      end
-
-      def file_timestamp_pattern=(pattern)
-        files.timestamp_pattern = pattern
-      end
-
-      def file_manager
-        Eco::API::Common::Session::FileManager.new(self)
-      end
-
-      def require(file)
-        require_relative "#{File.expand_path(file_manager.dir.file(file))}"
-      end
-
-      # ORG
-      def tagtree=(file)
-        org["tagtree"] = file
-      end
-
-      # PEOPLE
-      def discarded_people_file=(value)
-        people.discarded_file = value
-      end
-
-      def people_cache=(file)
-        people.cache = file
-      end
-
-      def requests_backup_folder=(folder)
-        people.requests_folder = folder
-      end
-
-      # PERSON FIELDS MAPPER
-      def person_fields_mapper=(file)
-        people.fields_mapper = file
-      end
-
-      def default_schema=(name)
-        people.default_schema = name
-      end
-
-      # ACCOUNT PRESETS
-      def presets_custom=(file)
-        people.presets_custom = file
-      end
-
-      def presets_map=(file)
-        people.presets_map = file
-      end
-
-      # CUSTOM PERSON PARSERS
-      def person_parser(format: :csv, &block)
-        people.add_parser(format: format, &block)
-      end
-
-      # CUSTOM USE CASES
-      def use_cases(&block)
-        usecases.add(&block)
-      end
-
-    end
-  end
-end
-
-require_relative 'session_config/api'
-require_relative 'session_config/apis'
-require_relative 'session_config/logger'
-require_relative 'session_config/mailer'
-require_relative 'session_config/s3_storage'
-require_relative 'session_config/files'
-require_relative 'session_config/people'
-require_relative 'session_config/use_cases'

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

@@ -1,47 +0,0 @@
-module Eco
-  module API
-    class SessionConfig
-      class Api < Hash
-
-        def initialize(key:, host:, version:, mode: :local, root:)
-          super(nil)
-          @root = root
-          self["key"]      =  key
-          self["host"]     = host
-          self["version"]  = version
-          self["mode"]     = mode
-        end
-
-        def key
-          self["key"]
-        end
-
-        def host
-          self["host"]
-        end
-
-        def mode=(mode)
-          self["mode"] = (mode == :remote)? :remote : :local
-        end
-
-        def mode
-          self["mode"]
-        end
-
-        def local?
-          mode == :local
-        end
-
-        def remote?
-          !local?
-        end
-
-        def version
-          self["version"]
-        end
-
-
-      end
-    end
-  end
-end

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

@@ -1,89 +0,0 @@
-module Eco
-  module API
-    class SessionConfig
-      class Apis < Hash
-
-        def initialize(root:)
-          super(nil)
-          @root = root
-        end
-
-        def apis
-          self["apis"] ||= {}
-        end
-
-        def apis?
-          apis.keys.length > 0
-        end
-
-        def defined?(name)
-          apis.key?(name)
-        end
-
-        def any_defined?(*names)
-          [names].flatten.any? do |name|
-            self.defined?(name)
-          end
-        end
-
-        def add(name, key:, host:, version: :internal, mode: :local)
-          apis[name] = SessionConfig::Api.new(
-            key: key,
-            host: host,
-            version: version,
-            mode: mode,
-            root: self
-          )
-          self
-        end
-
-        def active_name=(name)
-          raise "'#{name}' Api environment not defined" if !apis[name]
-          self["active-name"] = name
-          self["active-api"] = apis[name]
-          self
-        end
-
-        def active_name
-          self["active-name"]
-        end
-
-        # you can create multiple apis under same root_name (same org)
-        def active_root_name
-          active_name.split("-").first
-        end
-
-        def active_api
-          self["active-api"]
-        end
-
-        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 (!force_new) && @api && key == @key && host == @host && @mode == mode && version == @version
-
-          api_klass = (version == :external)? Ecoportal::API::External : Ecoportal::API::Internal
-
-          @api  = api_klass.new(key, host: host, logger: logger)
-          @key  = key; @host = host; @mode = mode; @version = version
-          @api
-        end
-
-        def new_api(logger = ::Logger.new(IO::NULL))
-          api(logger, force_new: true)
-        end
-
-      end
-    end
-  end
-end