eco-helpers 0.7.2 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4f70377026306ed8ee7e6bb8629bb765b92ea310b41a75dddb586cc398d5f5b
-  data.tar.gz: 2a25b0c4114c3b68943308e7475989a93cf8055ac59f9ff0e00173b02f2b3386
+  metadata.gz: 6d073b7d0bba9ae161a99451c11c4416c49d8a0693ebbe6110d46e8fd898141c
+  data.tar.gz: 748e56af552eb2556a8aa6d7770afeac04a15ff8481362efedb6ef431eb8c340
 SHA512:
-  metadata.gz: 62c5f462a9121215a5a7d45a084084b088c314544cba21dabeb0e15a4c386288b6b136a3c7bc7436f9974d84a5c3418df93803409d6637f17dde0bac8024ae27
-  data.tar.gz: 3e16c7ed28eeb72da9783cbbda1c4e44c3452aee7ee0eeb1c41855189f0d53f1d96dcf3caf68fc3e9eeefbd42ee9c5c63c84ee51e8b0c8e9e6c50d9d9bdcc8cb
+  metadata.gz: 10926532189b83b07bc128e4d96d3b23982f3b85553b8bd1e554a9503bf60b752f30ecf14a8f38f912d5428cd76fd59268b00881e6bda477811da9c07aac8ad7
+  data.tar.gz: bd33ffa5bf16699087c90a441d74546541e5b33c1cf58e6db5da840f9a4271a15aef5ab826060e891ea4808d700a8c221a61a765cd4ff50c86b85943007f26b6

data/eco-helpers.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard",      "~> 0.9", ">= 0.9.18"
   s.add_development_dependency "redcarpet", "~> 3.4", ">= 3.4.0"
 
-  s.add_dependency 'ecoportal-api', '~> 0.4',  '>= 0.4.2'
+  s.add_dependency 'ecoportal-api', '~> 0.4',  '>= 0.4.3'
   s.add_dependency 'thor',          '~> 0',    '>= 0.20'
   s.add_dependency 'nokogiri',      '~> 1.6',  '>= 1.6.8'
   s.add_dependency 'aws-sdk-s3',    '~> 1.30', '>= 1.30.1'

data/lib/eco-helpers.rb

@@ -13,3 +13,4 @@ require_relative 'eco/data'
 require_relative 'eco/api'
 require_relative 'eco/tester'
 require_relative 'eco/cli'
+require_relative 'eco/assets'

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

@@ -13,7 +13,7 @@ module Eco
             @enviro = enviro
             init = @enviro.config if @enviro && init.empty?
             @timestamp_pattern = init.files.timestamp_pattern || DEFAULT_TIMESTAMP_PATTERN
-            self.dir_path = init.files.working_directory || Dir.pwd
+            self.dir_path = init.working_directory || Dir.pwd
           end
 
           def dir_path=(value)

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

@@ -57,7 +57,7 @@ module Eco
 
             if !pers && !strict && !email.to_s.strip.empty?
               candidates = @by_non_users_email[email&.downcase.strip] || []
-              raise "Too many non-user candidates (#{candiates.length}) with email '#{email}'" if candidates.length > 1
+              raise "Too many non-user candidates (#{candidates.length}) with email '#{email}'" if candidates.length > 1
               pers = candidates.first
             end
 

data/lib/eco/api/session.rb

@@ -19,7 +19,7 @@ module Eco
         @task         = Task.new(enviro)
         @job_groups   = JobGroups.new(enviro)
 
-        @use_cases    = Eco::API::UseCases::DefaultCases.new.merge(config.usecases.use_group)
+        @use_cases    = Eco::API::UseCases::DefaultCases.new.merge(config.usecases)
 
         @schemas      = config.schemas
         self.schema = config.people.default_schema || @schemas.first

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

@@ -41,12 +41,21 @@ module Eco
           batch_from(people, method: method, params: params, silent: silent)
         end
 
-        def search(data, params: {})
+        def search(data, silent: false, params: {})
           params = {per_page: DEFAULT_BATCH_BLOCK}.merge(params)
 
-          launch(data, method: :get, params: params, silent: true).tap do |status|
+          launch(data, method: :get, params: params, silent: silent).tap do |status|
             status.type = :search
-            status.queue.each do |entry|
+
+            entries = status.queue
+            puts "\n"
+            entries.each_with_index do |entry, i|
+              if (i % 500 == 0)
+                percent = i * 100 / entries.length
+                print "Searching: #{percent.round}% (#{i}/#{entries.length} entries)\r"
+                $stdout.flush
+              end
+
               unless status.success?(entry)
                 email = nil
                 case
@@ -59,7 +68,7 @@ module Eco
                 people_matching = []
                 email = email.to_s.strip.downcase
                 unless email.empty?
-                  people_matching = get(params: params.merge(q: email), silent: true).select do |person|
+                  people_matching = get(params: params.merge(q: email), silent: silent).select do |person|
                     person.email == email
                   end
                 end
@@ -91,16 +100,25 @@ module Eco
           page = params[:page] || 1
 
           people = []; total_pages = nil
+          results_from = nil
           loop do
+            params.merge!(results_from: results_from) unless !results_from
             people_res, response = client_get(client, params: params.merge(page: page), silent: silent)
             people += people_res
 
-            total_pages ||= response.body["total_pages"]
+            total_iterations ||= response.body["total_pages"]
+            no_pages = !response.body["total_pages"]
+            total_results    ||= response.body["total_results"]
+
+            if !total_iterations
+              total_iterations ||= (total_results.to_f / params[:per_page]).ceil
+            end
 
-            msg = "page number: #{page}/#{total_pages}, got num people #{people_res.length}, with total #{people.length} people got"
+            msg = "iteration number: #{page}/#{total_iterations}, got num people #{people_res.length}, with total #{people.length} people got"
             logger.info(msg) unless silent
 
-            break if page >= total_pages || !looping
+            iterate = (no_pages && results_from = response.body["next_results_from"]) || (looping && page < total_iterations)
+            break unless iterate
             page += 1
           end
 
@@ -123,23 +141,23 @@ module Eco
           [people, response]
         end
 
-        def batch_from(people, method:, params: {}, silent: false)
+        def batch_from(data, method:, params: {}, silent: false)
           fatal "Invalid batch method: #{method}." if !self.class.valid_method?(method)
-          return nil if !people || !people.is_a?(Enumerable)
+          return nil if !data || !data.is_a?(Enumerable)
           fatal "cannot batch #{method} without api connnection, please provide a valid api connection!" unless people_api = api&.people
 
           # batch Status
-          status = new_status(people, method)
+          status = new_status(data, method)
 
           # param q does not make sense here, even for GET method
           params   = {per_page: DEFAULT_BATCH_BLOCK}.merge(params)
           per_page = params[:per_page] || DEFAULT_BATCH_BLOCK
 
           iteration  = 1; done = 0
-          iterations = (people.length.to_f / per_page).ceil
+          iterations = (data.length.to_f / per_page).ceil
 
-          people.each_slice(per_page) do |slice|
-            msg = "starting batch '#{method}' iteration #{iteration}/#{iterations}, with #{slice.length} entries of #{people.length} -- #{done} done"
+          data.each_slice(per_page) do |slice|
+            msg = "starting batch '#{method}' iteration #{iteration}/#{iterations}, with #{slice.length} entries of #{data.length} -- #{done} done"
             logger.info(msg) unless silent
 
             people_api.batch do |batch|

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

@@ -137,7 +137,7 @@ module Eco
 
         def apply_policies(pre_queue)
           pre_queue.tap do |entries|
-            policies = session.config.api_policies.policies
+            policies = session.config.policies
             unless policies.empty?
               policies.launch(people: people(entries), session: session)
             end

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

@@ -15,7 +15,7 @@ module Eco
 
         def initialize(e, queue:, method:, type: :exact)
           super(e)
-          fatal("In batch operations you must batch an array. Received: #{queue}")  unless queue && queue.is_a?(Array)
+          fatal("In batch operations you must batch an Enumerable. Received: #{queue}")  unless queue && queue.is_a?(Enumerable)
 
           self.type = type
           @method = method

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

@@ -2,33 +2,46 @@ module Eco
   module API
     class Session
       class Config < Hash
-        def initialize()
+        attr_reader :name
+
+        def initialize(name = :default)
           super(nil)
+          @name = name
           self["org"] = {}
         end
 
+        def clone(name)
+          keys.each_with_object(self.class.new(name)) do |key, cnf|
+            begin
+              cnf[key] = self[key].clone(config: cnf)
+            rescue ArgumentError
+              cnf[key] = self[key].clone
+            end
+          end
+        end
+
         def reopen
           yield(self)
         end
 
         def apis
-          self["apis"] ||= Session::Config::Apis.new(root: self)
+          self["apis"] ||= Session::Config::Apis.new(config: self)
         end
 
         def logger
-          self["logger"] ||= Session::Config::Logger.new(root: self)
+          self["logger"] ||= Session::Config::Logger.new(config: self)
         end
 
         def s3storage
-          self["s3_storage"] ||= Session::Config::S3Storage.new(root: self)
+          self["s3_storage"] ||= Session::Config::S3Storage.new(config: self)
         end
 
         def files
-          self["files"] ||= Session::Config::Files.new(root: self)
+          self["files"] ||= Session::Config::Files.new(config: self)
         end
 
         def mailer
-          self["mailer"] ||= Session::Config::Mailer.new(root: self)
+          self["mailer"] ||= Session::Config::Mailer.new(config: self)
         end
 
         def org
@@ -36,15 +49,7 @@ module Eco
         end
 
         def people
-          self["people"] ||= Session::Config::People.new(root: self)
-        end
-
-        def usecases
-          self["usecases"] ||= Session::Config::UseCases.new(root: self)
-        end
-
-        def api_policies
-          self["api_policies"] ||= Session::Config::Policies.new(root: self)
+          self["people"] ||= Session::Config::People.new(config: self)
         end
 
         # LOGGER
@@ -112,6 +117,14 @@ module Eco
           files.working_directory = path
         end
 
+        def working_directory(mode: :active_api)
+          if mode == :active_api
+            apis.active_root_name
+          else
+            files.working_directory
+          end
+        end
+
         def file_timestamp_pattern=(pattern)
           files.timestamp_pattern = pattern
         end
@@ -120,11 +133,32 @@ module Eco
           Eco::API::Common::Session::FileManager.new(self)
         end
 
-        def require(file)
-          require_relative "#{File.expand_path(file_manager.dir.file(file))}"
+        def require(file = nil, match: nil)
+          if match
+            file_manager.dir.dir_files(pattern: match).each do |file|
+              #pp "#{File.expand_path(file)}"
+              require_relative File.expand_path(file)
+            end
+          else
+            require_relative "#{File.expand_path(file_manager.dir.file(file))}"
+          end
         end
 
         # ORG
+
+        def location_codes=(file)
+          org["location_codes"] = file
+        end
+
+        def location_codes
+          org["location_codes"]
+        end
+
+        def locations_mapper
+          file = file_manager.newest(location_codes)
+          @locations_mapper ||= Eco::Data::Mapper.new(file_manager.load_json(file), internal: :first)
+        end
+
         def tagtree=(file)
           org["tagtree"] = file
         end
@@ -174,17 +208,29 @@ module Eco
 
         # CUSTOM PERSON PARSERS
         def person_parser(format: :csv, &block)
-          people.add_parser(format: format, &block)
+          people.parser(format: format, &block)
         end
 
         # CUSTOM USE CASES
-        def use_cases(&block)
-          usecases.add(&block)
+        def usecases
+          cases = self["usecases"] ||= Eco::API::UseCases::UseGroup.new
+          if block_given?
+            yield(cases)
+            self
+          else
+            cases
+          end
         end
 
         # API POLICIES
-        def policies(&block)
-          api_policies.add(&block)
+        def policies
+          api_policies = self["policies"] ||= Eco::API::Policies::UsedPolicies.new
+          if block_given?
+            yield(api_policies)
+            self
+          else
+            api_policies
+          end
         end
 
       end
@@ -192,6 +238,7 @@ module Eco
   end
 end
 
+require_relative 'config/base_config'
 require_relative 'config/api'
 require_relative 'config/apis'
 require_relative 'config/logger'
@@ -199,5 +246,3 @@ require_relative 'config/mailer'
 require_relative 'config/s3_storage'
 require_relative 'config/files'
 require_relative 'config/people'
-require_relative 'config/use_cases'
-require_relative 'config/policies'

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

@@ -2,12 +2,7 @@ module Eco
   module API
     class Session
       class Config
-        class Apis < Hash
-
-          def initialize(root:)
-            super(nil)
-            @root = root
-          end
+        class Apis < BaseConfig
 
           def apis
             self["apis"] ||= {}

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

@@ -0,0 +1,26 @@
+module Eco
+  module API
+    class Session
+      class Config
+        class BaseConfig < Hash
+          attr_reader :config
+          def initialize(config:)
+            super(nil)
+            @config = config
+          end
+
+          def clone(config:)
+            keys.each_with_object(self.class.new(config: config)) do |key, cnf|
+              begin
+                cnf[key] = self[key].clone(config: cnf)
+              rescue ArgumentError
+                cnf[key] = self[key].clone
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

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

@@ -2,11 +2,10 @@ module Eco
   module API
     class Session
       class Config
-        class Files < Hash
+        class Files < BaseConfig
 
-          def initialize(root:)
-            super(nil)
-            @root        = root
+          def initialize(config:)
+            super(config: config)
             @validations = {}
           end
 

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

@@ -2,12 +2,7 @@ module Eco
   module API
     class Session
       class Config
-        class Logger < Hash
-
-          def initialize(root:)
-            super(nil)
-            @root = root
-          end
+        class Logger < BaseConfig
 
           def console_level=(value)
             self["console_level"] = value

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

@@ -2,12 +2,7 @@ module Eco
   module API
     class Session
       class Config
-        class Mailer < Hash
-
-          def initialize(root:)
-            super(nil)
-            @root = root
-          end
+        class Mailer < BaseConfig
 
           def from=(value)
             self["from"] = value

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

@@ -2,14 +2,7 @@ module Eco
   module API
     class Session
       class Config
-        class People < Hash
-          attr_reader :config
-
-          def initialize(root:)
-            super(nil)
-            @root   = root
-            @config = @root
-          end
+        class People < BaseConfig
 
           def cache=(file)
             self["cache"] = file
@@ -80,15 +73,6 @@ module Eco
             self["presets_map"]
           end
 
-          # Defines an `ParserSerializer` for a `PersonParser` of certain `format`
-          # @param format [Symbol] the target format this parser/serializer is made for.
-          def add_parser(format: :csv)
-            parsers[format] ||= Eco::API::Common::People::PersonParser.new
-            parsers[format].tap do |prs|
-              yield(prs, config)
-            end
-          end
-
           # @return [Hash] with defined pairs format `key` and Person parsers.
           def parsers
             self["parsers"] ||= {}
@@ -98,7 +82,13 @@ module Eco
           # @param format [Symbol] the format this parser/serializer recognizes.
           # @return [Eco::API::Common::People::PersonParser] parser/serializer for the defined `format`.
           def parser(format: :csv)
-            parsers[format]
+            prs = parsers[format] ||= Eco::API::Common::People::PersonParser.new
+            if block_given?
+              yield(prs)
+              self
+            else
+              prs
+            end
           end
 
         end

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

@@ -2,12 +2,7 @@ module Eco
   module API
     class Session
       class Config
-        class S3Storage < Hash
-
-          def initialize(root:)
-            super(nil)
-            @root = root
-          end
+        class S3Storage < BaseConfig
 
           def bucket_name=(value)
             self["bucket_name"] = value

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

@@ -25,7 +25,7 @@ module Eco
         end
 
         def initialize(name, type:, root:, options: {}, &block)
-          raise "Undefine usecase type #{type}. Please, use any of #{TYPES}" unless self.class.valid_type?(type)
+          raise "Undefined usecase type #{type}, when creating '#{name}'. Please, use any of #{TYPES}" unless self.class.valid_type?(type)
 
           self.root = root
           @case     = block

data/lib/eco/assets.rb

@@ -0,0 +1,42 @@
+require 'ecoportal/api'
+
+module Eco
+  class Assets
+
+    attr_reader :active_config
+
+    def initialize
+      @active_config = :default
+    end
+
+    def session(key: active_config)
+      sessions[key] ||= Eco::API::Session.new(config(key: key))
+      sessions[key].tap do |session|
+        yield(session) if block_given?
+      end
+    end
+
+    def sessions
+      @sessions ||= {}
+    end
+
+
+    def config(key: active_config)
+      configs[:default] ||= Eco::API::Session::Config.new(key)
+      unless configs.key?(key)
+        @active_config = key
+        configs[key] = configs[:default].clone(key)
+      end
+      configs[key].tap do |config|
+        yield(config) if block_given?
+      end
+    end
+
+    def configs
+      @configs ||= {}
+    end
+  end
+end
+
+ASSETS = Eco::Assets.new
+#require_relative 'assets/'

data/lib/eco/data/files/directory.rb

@@ -26,8 +26,8 @@ module Eco
           File.expand_path(@dir_path)
         end
 
-        def dir_files(file: nil, file_pattern: dir_pattern)
-          find = !!file ? file_pattern(file) : dir_pattern
+        def dir_files(file: nil, pattern: dir_pattern)
+          find = !!file ? file_pattern(file) : file_pattern(pattern)
           Dir.glob(find)
         end
 
@@ -76,8 +76,13 @@ module Eco
 
         private
 
-        def file_pattern(filename)
-          Files::FilePattern.new(filename).pattern(@dir_path)
+        def file_pattern(value)
+          case value
+          when Files::FilePattern
+            value
+          else
+            Files::FilePattern.new(value).pattern(@dir_path)
+          end
         end
 
         def dir_pattern

data/lib/eco/data/files/file_pattern.rb

@@ -24,7 +24,8 @@ module Eco
           filename = File.basename(@source_file)
           path = File.dirname(@source_file)
           path = File.join(dir, path) if dir
-          File.join(path, "*" + filename)
+          wildcard = (filename =~ /\*/)? "" : "*"
+          File.join(path, wildcard + filename)
         end
       end
     end

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

@@ -49,6 +49,10 @@ module Eco
           self.class.new(data, klass: @klass, factory: @factory)
         end
 
+        def merge(data)
+          newFrom to_a + data
+        end
+
         def to_c
           Collection.new(self, klass: @klass, factory: @factory)
         end

data/lib/eco/scripting/args_helpers.rb

@@ -12,7 +12,7 @@ module Eco
 
       def stop_on_unknown!(exclude: [])
         if arguments.any_unkown?(exclude: exclude)
-          raise "There are unkown options in your command line arguments: #{arguments.unknown(exclude: exclude)}"
+          raise "There are unknown options in your command line arguments: #{arguments.unknown(exclude: exclude)}"
         end
       end
 

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.7.2"
+  VERSION = "0.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.1
 platform: ruby
 authors:
 - Oscar Segura
@@ -107,7 +107,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -323,13 +323,12 @@ files:
 - 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/base_config.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/policies.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/usecases.rb
@@ -361,6 +360,7 @@ files:
 - lib/eco/api/usecases/use_case_chain.rb
 - lib/eco/api/usecases/use_case_io.rb
 - lib/eco/api/usecases/use_group.rb
+- lib/eco/assets.rb
 - lib/eco/cli.rb
 - lib/eco/cli/api.rb
 - lib/eco/cli/root.rb

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

@@ -1,29 +0,0 @@
-module Eco
-  module API
-    class Session
-      class Config
-        class Policies < Hash
-          attr_reader :config
-
-          def initialize(root:)
-            super(nil)
-            @root   = root
-            @config = @root
-          end
-
-          # API POLICIES
-          def add
-            policies.tap do |group|
-              yield(group, config)
-            end
-          end
-
-          def policies
-            self["used_policies"] ||= Eco::API::Policies::UsedPolicies.new
-          end
-
-        end
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-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
-            use_group.tap do |group|
-              yield(group, config)
-            end            
-          end
-
-          def use_group
-            self["use_group"] ||= Eco::API::UseCases::UseGroup.new
-          end
-
-        end
-      end
-    end
-  end
-end