eco-helpers 1.5.8 → 1.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b5a4fcfab321e9a7071a18fb52c38c21a67314a44a2edda63f4783de6ea9f38
-  data.tar.gz: 20b067294c6e2d47c6efa09c62052d2081ce3a56252216fb11c9e465ed0fc5af
+  metadata.gz: f83b4bc20ff8289dbc743531ceaf75350fefbefa687c3f88ae09325b762e1fd1
+  data.tar.gz: b6ecd929fc1494ba657755020eac2cd92bdfe1ad4b4e5beb454c2bcaea165b77
 SHA512:
-  metadata.gz: 92bc7a1814a8654bc9831ca8e763802ad40f0679c7ee31bc26b2146f7006744b576fa7586c16b2bd50deb1b74738c41d08d14e47b41fd3d34fd299d753213bb1
-  data.tar.gz: 1dbdacf348a3ec57718dbf15dc825adf97839ea070ae0463b4df1a8a020c3c8bee8edc5b3903029d57f112a8517f20ac0870a5b73a206257be21d27e425c66f2
+  metadata.gz: 0fbb3710424b72248a2abefb0a0c8682a6fa4e97c69b50af951298c867582e4e857b5db25fd0afe1ba0a6379f6ba85e751a48c1bed1b091ad0a180f1d52f73df
+  data.tar.gz: 16157a6f8f6118574bec5ca59716b9c52b860b89acab5a7d56bc720b34339de80b747543da684ddd68b23c694f0a67e6af82396f95c1b3811bcf203e7cadb7ee

data/.yardopts

@@ -5,5 +5,6 @@
 --no-private
 --output-dir ./doc
 'lib/**/*.rb'
+CHANGELOG.md
 -
 LICENSE

data/CHANGELOG.md

@@ -1,7 +1,54 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [1.5.8] - 2020-12-xx
+## [1.5.13] - 2021-02-01
+
+### Added
+### Changed
+  - upgraded dependency with `ecoportal-api-oozes`
+
+### Fixed
+  - `Eco::API::Session::Config::Api` was not including the correct `host`
+    - this could have launched an `api` request to `live.ecoportal.com` when targeting `pre.dev`
+
+## [1.5.12] - 2021-02-01
+
+### Added
+  - `Eco::API::Common::People::DefaultParsers::CSVParser` when cell content is `Null`, capture `nil` value.
+
+### Changed
+  - upgraded `ecoportal-api` dependency
+
+### Fixed
+
+
+## [1.5.11] - 2021-01-25
+
+### Added
+  - `Eco::API::Organization::TagTree#subtag?` to check if the tag is in any subtree.
+
+### Changed
+
+### Fixed
+  - `Eco::API::MicroCases#set_supervisor` shouldn't set it if the entry does not have it.
+
+## [1.5.10] - 2021-01-19
+
+### Added
+### Changed
+### Fixed
+  - `Eco::API::Session::Batch::Errors#print` show the row number of the input data.
+
+## [1.5.9] - 2021-01-08
+
+### Added
+  - `Eco::API::Organization::TagTree#subtags` to get all the tags but those of the highest level.
+
+### Changed
+### Fixed
+
+
+## [1.5.8] - 2021-01-05
 
 ### Added
 ### Changed
@@ -9,7 +56,7 @@ All notable changes to this project will be documented in this file.
   - `Eco::API::Session::Batch::Jobs#job` shouldn't be calling the post-launch callback function on creation.
   - `Eco::API::Session#new_job` should include a `&block` parameter.
   - `Eco::API::UseCases::DefaultCases::RefreshCase`: fixed typo
-  
+
 ## [1.5.7] - 2020-12-17
 
 ### Added

data/eco-helpers.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |s|
   s.summary       = %q{eco-helpers to manage people api cases}
   s.homepage      = "https://www.ecoportal.com"
   s.licenses      = %w[MIT]
+  s.required_ruby_version = '>= 2.4.4'
 
   s.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -28,8 +29,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "yard",      ">= 0.9.18", "< 0.10"
   s.add_development_dependency "redcarpet", ">= 3.5.0",  "< 3.6"
 
-  s.add_dependency 'ecoportal-api', '>= 0.7.3', '< 0.8'
-  s.add_dependency 'ecoportal-api-oozes', '>= 0.7.2', '< 0.8'
+  s.add_dependency 'ecoportal-api', '>= 0.7.4', '< 0.8'
+  s.add_dependency 'ecoportal-api-oozes', '>= 0.7.3', '< 0.8'
   s.add_dependency 'aws-sdk-s3',    '>= 1.64.0', '< 2'
   s.add_dependency 'aws-sdk-ses',   '>= 1.29.0', '< 2'
   s.add_dependency 'dotenv',        '>= 2.7.0', '< 2.8'

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

@@ -5,8 +5,7 @@ class Eco::API::Common::People::DefaultParsers::CSVParser < Eco::API::Common::Lo
     Eco::CSV.parse(data, headers: true, skip_blanks: true).each_with_object([]) do |row, arr_hash|
       row_hash = row.headers.uniq.each_with_object({}) do |attr, hash|
         next if attr.to_s.strip.empty?
-        value            = row[attr]
-        hash[attr.strip] = value.to_s.empty?? nil : value
+        hash[attr.strip] = parse_string(row[attr])
       end
       arr_hash.push(row_hash)
     end
@@ -23,4 +22,18 @@ class Eco::API::Common::People::DefaultParsers::CSVParser < Eco::API::Common::Lo
     CSV::Table.new(arr_rows).to_csv
   end
 
+  private
+
+  def parse_string(value)
+    return nil if value.to_s.empty?
+    return nil if null?(value)
+    value
+  end
+
+  def null?(value)
+    return true if !value
+    str = value.strip.upcase
+    ["NULL"].any? {|token| str == token}
+  end
+
 end

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

@@ -75,7 +75,7 @@ module Eco
             !parsing?
           end
 
-          # @note `Eco::API::Common::People::EntryFactory#entries` adds this `idx`
+          # @note `Eco::API::Common::People::EntryFactory#entries` adds this `idx` (i.e. row number)
           # @return [Integer] the entry number in the input file
           def idx
             final_entry["idx"]

data/lib/eco/api/microcases/set_core_with_supervisor.rb

@@ -11,9 +11,11 @@ module Eco
       def set_core_with_supervisor(entry, person, people, supers_job, options)
         unless options.dig(:exclude, :core) && !person.new?
           micro.set_core(entry, person, options)
-          micro.set_supervisor(entry.supervisor_id, person, people, options) do |unkown_id|
-            # delay setting supervisor if does not exit
-            supers_job.add(person) {|person| person.supervisor_id = unkown_id}
+          if entry.supervisor_id?
+            micro.set_supervisor(entry.supervisor_id, person, people, options) do |unkown_id|
+              # delay setting supervisor if does not exit
+              supers_job.add(person) {|person| person.supervisor_id = unkown_id}
+            end
           end
         end
       end

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

@@ -46,6 +46,10 @@ module Eco
           @has_tags.empty?
         end
 
+        # Gets all the tags of the current node tree.
+        # @note
+        #   - this will include the upper level tag(s) as well
+        #   - to get all but the upper level tag(s) use `subtags` method instead
         # @param depth [Integer] if empty, returns the list of tag nodes of that level. Otherwise the list of tag nodes of the entire subtree.
         # @return [Array<String>]
         def tags(depth: nil)
@@ -58,6 +62,19 @@ module Eco
           end
         end
 
+        # Gets all but the upper level tags of the current node tree.
+        # @return [Array<String>]
+        def subtags
+          tags - tags(depth: depth)
+        end
+
+        # Verifies if a tag exists in the subtree(s).
+        # @param key [String] tag to verify.
+        # @return [Boolean]
+        def subtag?(key)
+          subtags.include?(key&.upcase)
+        end
+
         # Verifies if a tag exists in the tree.
         # @param key [String] tag to verify.
         # @return [Boolean]

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

@@ -123,7 +123,7 @@ module Eco
               entry    = queue.to_a[i]
               response = status[i]
               msg      = "Error #{response.status}: #{response.body}\n"
-              msg     += "-- Failed to batch #{method} (entry #{i+1}). Person: #{person_ref(entry)}"
+              msg     += "-- Failed to batch #{method}. Person: #{person_ref(entry)}"
             end
             msg
           end
@@ -164,7 +164,8 @@ module Eco
           private
 
           def person_ref(entry)
-            "(id: '#{get_attr(entry, :id)}') '#{get_attr(entry, :name)}' ('#{get_attr(entry, :external_id)}': '#{get_attr(entry, :email)}')"
+            row_str = (row = get_row(entry)) ? "(row: #{row}) " : nil
+            "#{row_str}(id: '#{get_attr(entry, :id)}') '#{get_attr(entry, :name)}' ('#{get_attr(entry, :external_id)}': '#{get_attr(entry, :email)}')"
           end
 
           def get_attr(entry, attr)
@@ -175,6 +176,15 @@ module Eco
             end
           end
 
+          def get_row(value)
+            case value
+            when Eco::API::Common::People::PersonEntry
+              value.idx
+            when Ecoportal::API::V1::Person
+              get_row(value.entry)
+            end
+          end
+
         end
       end
     end

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

@@ -142,7 +142,7 @@ module Eco
             when :v1
               klass.new(external_key, host: host, logger: logger)
             when :v2
-              klass.new(user_key: user_key, org_key: external_key, logger: logger)
+              klass.new(user_key: user_key, org_key: external_key, host: host, logger: logger)
             end.tap do |api|
               unless !api || log_connection?
                 @logger.info("Created api#{self.version(version)} connection on '#{name}' enviro, pointing to '#{host}' in '#{mode}' mode")

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "1.5.8"
+  VERSION = "1.5.13"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.13
 platform: ruby
 authors:
 - Oscar Segura
@@ -116,7 +116,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -126,7 +126,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.7.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.8'
@@ -474,7 +474,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="