eco-helpers 2.0.28 → 2.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b80eb47cf2adf3301ae87dd42a54c1317f864733af3d1cce071d8c326b4309b6
-  data.tar.gz: f72f9feeca70b9b9c159ad9efc48c379104c3e6ddde433b571b65f08ec0b5f07
+  metadata.gz: 0a1f04caab2cae362249d46b694021287a8904052f3851151b4cb6103e7f8790
+  data.tar.gz: b050e7dd4626f331080cb6dc1437da74a793460bce5426ff3aa5a9b91bba5a53
 SHA512:
-  metadata.gz: dc7717f2ac13b00d5b91607f45dc1c0965336ab1ff4e7792785f35425f361e05b98d60f727f65117ae0002867c5be401041cd65b9448c01c73d0fd50306d2218
-  data.tar.gz: 2605aadb300be3ae8b48770fab89ccbb39395f8d7239c66d7dd6dda8649c2f27f55b3e9ca912150e19a290e46b359e1909de7c2214277fc4bb6a510e9edb7415
+  metadata.gz: 7eb83d0cd4b318f42e90065f772b0b9aa801afddd39d0f2e6fa9861446fd06d537cc436500f8cc9a2c852ce46d3ea2b00a2d3a7199cdba9bf244a8104aa63bfc
+  data.tar.gz: ef8ab06e274156c0341212b9b72865e0dfe4e55e9c4f0f816b67554739b6fc2a1b15614a973bfae234dbdd03de7b429513ad19edcd9264b0123cb80374dc78b8

data/CHANGELOG.md

@@ -1,12 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.28] - 2021-07-08
+## [2.0.32] - 2021-07-xx
 
 ### Added
 
 ### Changed
 
+### Fixed
+  - `Eco::API::UseCases::OozeSamples::OozeUpdateCase` prompting user, fixed typo
+  - `Eco::API::Session::Batch::Job`: `include-excluded` again... typo.
+
+## [2.0.31] - 2021-07-13
+
+### Fixed
+  - `Eco::API::Session::Batch::Job`: `include-excluded` was triggering a type error.
+
+## [2.0.30] - 2021-07-08
+
+### Added
+  * `Eco::API::Common::People::DefaultParsers::XLSParser` uses as default the `fields_map.json` to identify the headers.
+
+### Fixed
+  * `Eco::API::Common::People::DefaultParsers::XLSParser` should return all `String` values
+
+## [2.0.29] - 2021-07-08
+
 ### Fixed
   - `Eco::API::Common::People::PersonEntryAttributeMapper#details_attrs`
     * What a mess this was doing to the `csv` export :/
@@ -75,9 +94,6 @@ All notable changes to this project will be documented in this file.
     * when in `dry-run` it fakes the `id` with a counter
   - `Eco::API::Common::People::PersonFactory` gets `subordinates` initialized to `0` (when **creating** a `new` person)
 
-### Fixed
-
-
 ## [2.0.25] - 2021-06-23
 
 ### Added

data/lib/eco/api/common/loaders/base.rb

@@ -5,7 +5,7 @@ module Eco
         class Base
           extend Eco::API::Common::ClassHelpers
 
-          class << self              
+          class << self
             # Sort order
             def <=>(other)
               created_at <=> other.created_at

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

@@ -6,7 +6,12 @@ class Eco::API::Common::People::DefaultParsers::XLSParser < Eco::API::Common::Lo
 
   def parser(file, deps)
     @file = file
-    rows.tap {|r| @file = nil}
+    rows.tap do |rws|
+      @file = nil
+      rws.each do |row|
+        to_string!(row)
+      end
+    end
   end
 
   def serializer(array_hash, deps)
@@ -15,8 +20,18 @@ class Eco::API::Common::People::DefaultParsers::XLSParser < Eco::API::Common::Lo
 
   private
 
+  def to_string!(row)
+    row.transform_values! do |val|
+      next nil unless val
+      next val if val.is_a?(String)
+      val.to_s
+    end
+  end
+
+
   def headers
-    raise "You should implement this method"
+    logger.warn("Headers detection is using your fields_map.json file (native behaviour)")
+    session.fields_mapper.list(:external).uniq
   end
 
   def sheet_name
@@ -34,7 +49,7 @@ class Eco::API::Common::People::DefaultParsers::XLSParser < Eco::API::Common::Lo
 
   def rows(target = headers)
     begin
-      spreadheet.parse(header_search: target)
+      spreadheet.parse(header_search: target, clean: true)
     rescue Roo::HeaderRowNotFoundError => e
       missing  = JSON.parse(e.message)
       logger.warn("The input file is missing these headers: #{missing}")

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

@@ -252,13 +252,14 @@ module Eco
           # - filter out excluded entries from the api update
           def api_included(full_queue)
             return full_queue if type == :create
-            return full_queue unless excluded = session.config.people.api_excluded
-            if options.dig(:include, :excluded, :only)
-              full_queue.select {|entry| excluded.call(entry, session, options, self)}
+            return full_queue unless excluded_callback = session.config.people.api_excluded
+            excluded = options.dig(:include, :excluded)
+            if excluded.is_a?(Hash) && excluded[:only]
+              full_queue.select {|entry| excluded_callback.call(entry, session, options, self)}
             elsif options.dig(:include, :excluded)
               full_queue
             else
-              full_queue.select {|entry| !excluded.call(entry, session, options, self)}
+              full_queue.select {|entry| !excluded_callback.call(entry, session, options, self)}
             end
           end
 

data/lib/eco/api/usecases/ooze_samples/ooze_update_case.rb

@@ -45,7 +45,7 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::Common::Loader
   end
 
   def ooze
-    @ooze ||= apiv2.pages.get(ooze_id).tap do |ooze|
+    @ooze ||= apiv2.pages.get(ooze_id, stage_id: stage_id).tap do |ooze|
       if ooze
         new_target(ooze)
         logger.info("Got #{object_reference(ooze)}")
@@ -124,7 +124,7 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::Common::Loader
   end
 
   def prompt_to_confirm!
-    prompt_user("Do you want to proceed (y/N)?", default: "Y") do |response|
+    micro.prompt_user("Do you want to proceed (y/N)?", default: "Y") do |response|
       exit(1) unless response.upcase.start_with?("Y")
     end
   end

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.28"
+  VERSION = "2.0.32"
 end

metadata

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