eco-helpers 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9831e1570b2ad8b1dd11128af4bf1c141dd76ead7e7d7c9fa315c089e25a866
-  data.tar.gz: 0e328fe606aa425c68ef609c7385fe9d62500ac020769bd78a8840f5dce915fd
+  metadata.gz: f2cc1dbfbff9d516658984913b6c550a5c5eba25134c2fd58252dc6ce6ca4a18
+  data.tar.gz: 6a9af3f7c3d8bbac1cf66c37bf5e563e2b899f63275187dc1caf0a7985ab09f3
 SHA512:
-  metadata.gz: 76fdbb40780576960262ee427d3ec563e72da484e398f0593811d5fd773f8ec31e07ae2183d58f6a6a26fa3fb135ccb4d5515113868b49fcb182ba06a35c3a40
-  data.tar.gz: 7853f924a6b514f476c7470c6748a9bf47137ecd68b2b1541cb52d600eb6692091705e7be23cdfdb9bedb339c6c0d1812d5000bb3771804bae65d566c3eb027e
+  metadata.gz: c749092b76b38487931672d4fcf38cdfbcbfc3c92445c23587c53a086c02113e3f1b65e2ecacfe3d53f231014437e0e0f93b58acf0701ebf2adc661d68eb0855
+  data.tar.gz: f8bc01d6781aeb0791b95015206844513d91356bf981828691f841175af225c829f3a82bd85bc9a92af54993be26218a36f41435431d8622a93f598a62cf7561

data/lib/eco/api/common/people/default_parsers.rb

@@ -15,6 +15,7 @@ module Eco
             # Select Options
             select_hashes = @schema.fields.map do |fld|
               if fld.type == "select"
+                raise "The schema selection field '#{fld.name}' is missing selection options." unless fld.options && !fld.options.empty?
                 options_hash = fld.options.map { |v| [v.downcase.strip, v] }.to_h
                 [fld.alt_id, options_hash]
               end

data/lib/eco/api/common/people/entry_factory.rb

@@ -19,12 +19,23 @@ module Eco
             @logger = logger
             @schema = Ecoportal::API::V1::PersonSchema.new(JSON.parse(schema.doc.to_json))
 
-            default_parser = Eco::API::Common::People::DefaultParsers.new(schema: @schema)
-            @person_parser = default_parser.merge(person_parser)
+            @source_person_parser = person_parser
+
+            @person_parser = Eco::API::Common::People::DefaultParsers.new(schema: @schema)
+            @person_parser = @person_parser.merge(@source_person_parser)
+            @person_parser_patch_version = @source_person_parser.patch_version
 
             @attr_map = attr_map
           end
 
+          def person_parser
+            if @person_parser_patch_version < @source_person_parser.patch_version
+              @person_parser.merge(@source_person_parser)
+              @person_parser_patch_version = @source_person_parser.patch_version
+            end
+            @person_parser
+          end
+
           # key method to generate objects of `PersonEntry` that share dependencies via this `EntryFactory` environment.
           # @note this method is necessary to make the factory object work as a if it was a class `PersonEntry` you can call `new` on.
           # @param data [Array<Hash>] data to be parsed. The external hashed entry.
@@ -32,7 +43,7 @@ module Eco
           def new(data, dependencies: {})
             PersonEntry.new(
               data,
-              person_parser: @person_parser,
+              person_parser: person_parser,
               attr_map:      @attr_map,
               dependencies:  dependencies,
               logger:        @logger
@@ -62,7 +73,7 @@ module Eco
               if Eco::API::Common::Session::FileManager.file_exists?(file)
                 encoding   ||= Eco::API::Common::Session::FileManager.encoding(file)
                 file_content = File.read(file, encoding: encoding)
-                arr_hash     = @person_parser.parse(format, file_content)
+                arr_hash     = person_parser.parse(format, file_content)
               else
                 @logger.warn("File does not exist: #{file}")
               end
@@ -105,7 +116,7 @@ module Eco
               end
 
               File.open(file, "w", enconding: encoding) do |fd|
-                fd.write(@person_parser.serialize(format, data_entries))
+                fd.write(person_parser.serialize(format, data_entries))
               end
             end
 

data/lib/eco/api/common/people/person_parser.rb

@@ -17,7 +17,8 @@ module Eco
           attr_reader :schema
           attr_reader :details_attrs, :all_attrs
           attr_reader :defined_attrs
-
+          attr_reader :patch_version
+          
           # @example Example of usage:
           #  person_parser = PersonParser.new(schema: schema)
           #  person_parser.define_attribute("example") do |parser|
@@ -33,7 +34,8 @@ module Eco
           def initialize(schema: nil)
             raise "Constructor needs a PersonSchema. Given: #{schema}" if schema && !schema.is_a?(Ecoportal::API::V1::PersonSchema)
             @details_attrs = []
-            @parsers = {}
+            @parsers       = {}
+            @patch_version = 0
 
             if schema
               @schema = Ecoportal::API::Internal::PersonSchema.new(JSON.parse(schema.doc.to_json))
@@ -43,6 +45,10 @@ module Eco
             @all_attrs = CORE_ATTRS + ACCOUNT_ATTRS + @details_attrs
           end
 
+          def patched!
+            @patch_version += 1
+          end
+
           # Scopes `source_attrs` using the _**core** attributes_.
           # @note use this helper to know which among your attributes are **core** ones.
           # @param source_attrs [Array<String>]
@@ -115,6 +121,7 @@ module Eco
             return self if !parser
             raise "Expected a PersonParser object. Given #{parser}" if !parser.is_a?(PersonParser)
             @parsers.merge!(parser.hash)
+            patched!
             self
           end
 
@@ -133,12 +140,11 @@ module Eco
               msg = "The attribute '#{attr_to_str(attr)}' is not part of core, account or target schema, or does not match any type: #{@details_attrs}"
               raise msg
             end
-            # Eco::Language::Models::ParserSerializer
             Eco::API::Common::People::PersonAttributeParser.new(attr, dependencies: dependencies).tap do |parser|
               @parsers[attr] = parser
               definition.call(parser)
             end
-
+            patched!
             self
           end
 

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

@@ -50,7 +50,13 @@ module Eco
 
           def load_json(filename)
             content = file_content(filename)
-            return content && JSON.parse(content)
+            begin
+              parsed = content && JSON.parse(content)
+            rescue JSON::ParserError => e
+              pp "Parsing error on file #{filename}"
+              raise e
+            end
+            return parsed
           end
 
           def touch(filename, modifier = :no_stamp, mode: :string)

data/lib/eco/api/session.rb

@@ -113,6 +113,17 @@ module Eco
         self
       end
 
+      # Allows to use the defined parsers
+      # @note the use of these method requires to know which is the expected format of `source`
+      # @param attr [String] type (`Symbol`) or attribute (`String`) to target a specific parser.
+      # @param source [Any] source value to be parsed.
+      def parse_attribute(attr, source)
+        unless parsers = @entry_factory.person_parser
+          raise "There are no parsers defined"
+        end
+        parsers.parse(attr, source)
+      end
+
       # Builds the presets using the usergroup ids of the input.
       # @note for each flag/ability it will take the highest among those mapped for the present usergroups.
       # @param [Ecoportal::API::Internal::Person, Array<String>] the array should be of usegroup names or ids.

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

@@ -6,11 +6,12 @@ module Eco
           extend Eco::API::Common::ClassHelpers
 
           @workflow = {
-            load:     {input: nil, people: {get: nil, filter: nil}},
-            usecases: nil,
+            options:     nil,
+            load:        {input: nil, people: {get: nil, filter: nil}, filter: nil},
+            usecases:    nil,
             launch_jobs: nil,
             post_launch: {usecases: nil, launch_jobs: nil},
-            end: nil
+            end:         nil
           }
 
           class << self

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

@@ -31,7 +31,6 @@ module Eco
                     )
                   end
 
-
                   entry.set_details(person) unless options.dig(:exclude, :details)
 
                   unless options.dig(:exclude, :account)
@@ -72,7 +71,7 @@ module Eco
                       end
                     end
                   end
-                  
+
                 end
               end
             end

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

@@ -31,7 +31,7 @@ module Eco
                   ini_tags   = person.filter_tags || []
 
                   core_attrs = ["name", "external_id", "email", "filter_tags"]
-                  core_excluded = core_attrs.map(&:to_sym).select {|attr| options.dig(:exclude, attr)}
+                  core_excluded = core_attrs.map.select {|attr| options.dig(:exclude, attr.to_sym)}
                   core_excluded.push("supervisor_id")
 
                   entry.set_core(person, exclude: core_excluded)

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

@@ -14,8 +14,8 @@ module Eco
               end
             end
 
-            @cases.define("remove-account", type: :sync) do |entries, people, session, options|
-              update = session.job_group("main").new("update", type: :update, sets: [:core, :account])
+            @cases.define("remove-account", type: :sync) do |entries, people, session, options, usecase|
+              update = session.job_group("main").new("update", usecase: usecase, type: :update, sets: [:core, :account])
 
               strict_search = session.config.people.strict_search? && (!options[:search]&.key?(:strict) || options.dig(:search, :strict))
 

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

@@ -19,7 +19,7 @@ module Eco
                     ini_tags   = person.filter_tags || []
 
                     core_attrs = ["name", "external_id", "email", "filter_tags"]
-                    core_excluded = core_attrs.map(&:to_sym).select {|attr| options.dig(:exclude, attr)}
+                    core_excluded = core_attrs.map.select {|attr| options.dig(:exclude, attr.to_sym)}
                     core_excluded.push("supervisor_id")
 
                     entry.set_core(person, exclude: core_excluded)

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

@@ -15,7 +15,7 @@ module Eco
                 if person = people.find(entry, strict: strict_search)
                   unless options.dig(:exclude, :core)
                     core_attrs = ["name", "external_id", "email", "filter_tags"]
-                    core_excluded = core_attrs.map(&:to_sym).select {|attr| options.dig(:exclude, attr)}
+                    core_excluded = core_attrs.map.select {|attr| options.dig(:exclude, attr.to_sym)}
                     core_excluded.push("supervisor_id")
 
                     entry.set_core(person, exclude: core_excluded) unless options.dig(:exclude, :core)

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

@@ -18,11 +18,14 @@ module Eco
                 person = session.new_person if create = !person
 
                 unless options.dig(:exclude, :core) && !create
-                  ini_tags   = person.filter_tags || []
+                  ini_tags         = person.filter_tags || []
 
-                  core_attrs = ["name", "external_id", "email", "filter_tags"]
-                  core_excluded = core_attrs.map(&:to_sym).select {|attr| options.dig(:exclude, attr)}
-                  core_excluded.push("supervisor_id")
+                  core_excluded    = ["supervisor_id"]
+
+                  unless create
+                    core_attrs     = ["name", "external_id", "email", "filter_tags"]
+                    core_excluded += core_attrs.map.select {|attr| options.dig(:exclude, attr.to_sym)}
+                  end
 
                   entry.set_core(person, exclude: core_excluded)
                   if session.tagtree && !options.dig(:exclude, :filter_tags)

data/lib/eco/assets.rb

@@ -19,7 +19,7 @@ module Eco
       configs[:default] ||= Eco::API::Session::Config.new(key)
       unless configs.key?(key)
         @active_config = key unless !update_active
-        configs[key] = configs[:default].clone(key)
+        configs[key]   = configs[:default].clone(key)
       end
       configs[key].tap do |config|
         config.active_api(key) if config.apis.defined?(key)

data/lib/eco/cli.rb

@@ -26,9 +26,9 @@ module Eco
 
     def run(session:)
       io = Eco::API::UseCases::BaseIO.new(session: session, options: options)
-      io = io.new(options: config.options_set.process(io: io))
-
+      
       session.workflow(io: io) do |wf, io|
+        io = wf.run(:options, io: io)
         io = wf.run(:load, io: io)
         io = wf.run(:usecases, io: io)
         io = wf.run(:launch_jobs, io: io)

data/lib/eco/cli/config/default/workflow.rb

@@ -1,10 +1,23 @@
 ASSETS.cli.config do |config|
   ASSETS.config.workflow do |wf|
 
-    wf.on(:load) do |wf_load, io|
-      io = io.new(input:   config.input.get(io: io))
-      io = io.new(people:  config.people(io: io))
-      io = io.new(people:  config.people_filters.process(io: io))
+    io = nil
+    wf.on(:options) do |wf_options, io|
+      io = io.new(options:   config.options_set.process(io: io))
+    end
+
+    wf.for(:load) do |wf_load|
+      wf_load.on(:input) do |wf_input, io|
+        io = io.new(input:   config.input.get(io: io))
+      end
+
+      wf_load.on(:people) do |wf_people, io|
+        io = io.new(people:  config.people(io: io))
+      end
+
+      wf_load.on(:filter) do |wf_filter, io|
+        io = io.new(people:  config.people_filters.process(io: io))
+      end
     end
 
     wf.before(:usecases) do |wf_cases, io|

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

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