eco-helpers 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb418abf2d0a0a3bcf9d4f95c9696b9d6347f006
-  data.tar.gz: 978e4c69e536b192722df51e8eb361d835a708ae
+  metadata.gz: 1be39cfd739ccf1346f635fb4b341faf84567869
+  data.tar.gz: e7b0a20c6a4438a8cb7475d93c84a098339ed2b2
 SHA512:
-  metadata.gz: 72efbdbf8703f5be28ef9fb223c3886d83ed8a3d72d5ff58efe7bb59ce6cc5f82916cef8cdac685c01c7f1d70d70a6cf43fe7ddc35bfffe3754b98ded18e976e
-  data.tar.gz: b40e206e5e3d633e8dec159342e1df20b2424e378e4418cdd4820c675335d34f94925a3865ff12c2c10f1b0836178f6adab4cbd036e931a2eb6ffd5e9f082e25
+  metadata.gz: 85d763bfd6a440ed19d6bb43b130073cb625eb4da0076d2e09430b6c09709a5aa87218c588988dca3ffd11e771174dac4bdcf688eab59630441d6635e170eb45
+  data.tar.gz: a26f655e2f9afc47ffdd4e9a545e8223d248a5430b94ef0dc972e926b1a3ac425bb1a7f23474b6680c4a06875a159111c269f3cdd7f88aa97ba4fb8c3ac01688

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

@@ -2,33 +2,6 @@ module Eco
   module API
     module Common
       module People
-        class EntryFactory
-
-          attr_reader :person_parser
-
-          def initialize(schema:, person_parser: nil, fields_mapper: nil, logger: ::Logger.new(IO::NULL))
-            raise "Constructor needs a PersonSchema. Given: #{schema}" if !schema.is_a?(Ecoportal::API::V1::PersonSchema)
-            raise "Expecting PersonParser. Given: #{person_parser}" if person_parser && !person_parser.is_a?(Eco::API::Common::People::PersonParser)
-            raise "Expecting Mapper object. Given: #{fields_mapper}" if fields_mapper && !fields_mapper.is_a?(Eco::Data::Mapper)
-
-            @logger = logger
-            @schema = Ecoportal::API::V1::PersonSchema.new(JSON.parse(schema.doc.to_json))
-
-            default_parser = Eco::API::Common::People::DefaultParsers.new(schema: @schema)
-            @parser = default_parser.merge(person_parser)
-
-            @fields_mapper = fields_mapper
-          end
-
-          def new(data, dependencies: {})
-            PersonEntry.new(data, parser: @parser, mapper: @fields_mapper, dependencies: dependencies, logger: @logger)
-          end
-
-          def entries(data)
-            Entries.new(data, klass: PersonEntry, factory: self)
-          end
-        end
-
         class Entries <  Eco::Language::Models::Collection
 
           # build the shortcuts of Collection

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

@@ -0,0 +1,35 @@
+module Eco
+  module API
+    module Common
+      module People
+        class EntryFactory
+
+          attr_reader :person_parser
+
+          def initialize(schema:, person_parser: nil, fields_mapper: nil, logger: ::Logger.new(IO::NULL))
+            raise "Constructor needs a PersonSchema. Given: #{schema}" if !schema.is_a?(Ecoportal::API::V1::PersonSchema)
+            raise "Expecting PersonParser. Given: #{person_parser}" if person_parser && !person_parser.is_a?(Eco::API::Common::People::PersonParser)
+            raise "Expecting Mapper object. Given: #{fields_mapper}" if fields_mapper && !fields_mapper.is_a?(Eco::Data::Mapper)
+
+            @logger = logger
+            @schema = Ecoportal::API::V1::PersonSchema.new(JSON.parse(schema.doc.to_json))
+
+            default_parser = Eco::API::Common::People::DefaultParsers.new(schema: @schema)
+            @parser = default_parser.merge(person_parser)
+
+            @fields_mapper = fields_mapper
+          end
+
+          def new(data, dependencies: {})
+            PersonEntry.new(data, parser: @parser, mapper: @fields_mapper, dependencies: dependencies, logger: @logger)
+          end
+
+          def entries(data)
+            Entries.new(data, klass: PersonEntry, factory: self)
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -15,3 +15,4 @@ require_relative 'people/person_parser'
 require_relative 'people/default_parsers'
 require_relative 'people/person_entry'
 require_relative 'people/entries'
+require_relative 'people/entry_factory'

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

@@ -32,7 +32,7 @@ module Eco
             api = config.api(log)
 
             unless log_connection
-              logger.info("Created connection pointing to '#{config.apis.active_api.host}'")
+              logger.info("Created connection pointing to '#{config.apis.active_api.host}' in '#{config.apis.active_api.mode}' mode")
               api.logger.level = ::Logger::UNKNOWN
             end
 

data/lib/eco/api/session.rb

@@ -159,6 +159,7 @@ 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)
+        logger.debug("Session: going to process '#{name}' defined case")
         @use_cases.case(name, type: type).process(**args)
       end
 

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

@@ -2,10 +2,12 @@ module Eco
   module API
     class SessionConfig
       class People < Hash
+        attr_reader :config
 
         def initialize(root:)
           super(nil)
-          @root = root
+          @root   = root
+          @config = @root
         end
 
         def cache=(file)
@@ -69,18 +71,21 @@ module Eco
         end
 
         # CUSTOM PERSON PARSERS
-        def person_parser(format: :csv)
-          self["parsers"] ||= Eco::API::Common::People::PersonParser.new
+        def add_parser(format: :csv)
           new_parsers = Eco::API::Common::People::PersonParser.new
 
-          yield(new_parsers, self)
+          yield(new_parsers, config)
+          parsers[format] ||= Eco::API::Common::People::PersonParser.new
+          parsers[format] = parsers[format] ? parsers[format].merge(new_parsers) : new_parsers
+        end
 
-          parsers = self["parsers"][format]
-          self["parsers"][format] = parsers ? parsers.merge(new_parsers) : new_parsers
+        def parsers
+          self["parsers"] ||= {}
+          self["parsers"]
         end
 
         def parser(format: :csv)
-          self.dig("parsers", format)
+          parsers[format]
         end
 
       end

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

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

data/lib/eco/api/session_config.rb

@@ -126,7 +126,7 @@ module Eco
 
       # PEOPLE
       def discarded_people_file=(value)
-        people.discarded_people_file = value
+        people.discarded_file = value
       end
 
       def people_cache=(file)
@@ -157,7 +157,7 @@ module Eco
 
       # CUSTOM PERSON PARSERS
       def person_parser(format: :csv, &block)
-        people.parser(format: format, &block)
+        people.add_parser(format: format, &block)
       end
 
       # CUSTOM USE CASES

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Oscar Segura
@@ -193,6 +193,7 @@ files:
 - lib/eco/api/common/people/default_parsers/numeric_parser.rb
 - lib/eco/api/common/people/default_parsers/select_parser.rb
 - lib/eco/api/common/people/entries.rb
+- lib/eco/api/common/people/entry_factory.rb
 - lib/eco/api/common/people/person_entry.rb
 - lib/eco/api/common/people/person_factory.rb
 - lib/eco/api/common/people/person_modifier.rb