eco-helpers 2.0.37 → 2.0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a1e3f56c23a45ecb80f852556b02b1ac7cc3a2546a72bcb5d2d05283bbc66b6
-  data.tar.gz: 82250daa8e645c1a68d79d047d938fd3371c909d9eeb04dca58548d5bd907543
+  metadata.gz: 3f9f409fadb3cd263964b4254d35ea3b32cd97ff21eaaef4cd96bb0bafb61b83
+  data.tar.gz: 411187eb287a25f73e75d08fd7ccc6984e3ece935786fd161f3998cfb53a0670
 SHA512:
-  metadata.gz: d93e88f2f6dab9ca740d7c21741be6c6aec2885c98336fe7d0d247964e995b519603aaf989872073a3ff93234f64cce3cb62bece56ed4c33d7597de186f70bae
-  data.tar.gz: 4cd351d33ef0f66d178273d64ba52b39356204a8b31aabc358bda6267892af678c785b17537eb2ca2b00533a81b2ee600b3e648f40891b4438162a7362d33825
+  metadata.gz: 7ef199c58c422283f767f90319e6768265a2d38b33e4b5be73ad6b3c77923949056e5263e2130b650307d08deb78d4e0e1da078fcfed70936cb294aa8bb1326f
+  data.tar.gz: aee328dc5617c180ca6efc8e7399a205755b4abb6ff0b8546f19462e2d3a2f095bcc7be6d3b43eb2303b99710fd3bcc881c4421560a37d91b4b0a743bc6e3db6

data/CHANGELOG.md

@@ -1,6 +1,43 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [2.0.41] - 2021-09-xx
+
+### Added
+### Changed
+### Fixed
+  - `Eco::API::Session::Batch::Job` `backup_update`
+    - Saved `requests` filename was overlapping due to only batch job type being used
+    - Now it uses the name of the batch job as well
+
+## [2.0.40] - 2021-09-29
+
+### Added
+  - Unique access point for `validation` via core case `Eco::API::UseCases::OozeSamples::OozeBaseCase#update_ooze`
+
+## [2.0.39] - 2021-09-28
+
+### Changed
+  - `Eco::API::UseCases::OozeSamples::OozeBaseCase`
+    - Moved helpers from `Eco::API::UseCases::OozeSamples::OozeUpdateCase`
+
+### Fixed
+  - `Eco::API::UseCases::OozeSamples::RegisterUpdateCase`
+    - fix launch condition to be `Y`
+    - fix `search` method call
+  - Changed the `workflow` to prevent re-cache of people when `people` was not used
+
+## [2.0.38] - 2021-09-07
+
+### Added
+  - `Eco::CSV::Table` some more helpers to manage input `csv`s
+    - `#transform_headers` that allows to pass a block to decide the new name
+    - `#merge_same_header_names` that allows to deal with value of columns with same header name
+    - `#duplicated_header_names` that identifies repeated header names
+
+### Changed
+  - Changed the `workflow` to prevent re-cache of people when `people` was not used
+
 ## [2.0.37] - 2021-09-03
 
 ### Added
@@ -12,7 +49,7 @@ All notable changes to this project will be documented in this file.
     - stop downloading the people manager
   - `Eco::API::UseCases::OozeSamples::RegisterUpdateCase`
     - prevent queuing non page objects
-    
+
 ## [2.0.36] - 2021-08-31
 
 ### Fixed

data/eco-helpers.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "redcarpet", ">= 3.5.1",  "< 3.6"
 
   spec.add_dependency 'ecoportal-api', '>= 0.8.3', '< 0.9'
-  spec.add_dependency 'ecoportal-api-v2', '>= 0.8.13', '< 0.9'
+  spec.add_dependency 'ecoportal-api-v2', '>= 0.8.19', '< 0.9'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.83.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.36.0', '< 2'
   spec.add_dependency 'dotenv',        '>= 2.7.6', '< 2.8'

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

@@ -343,7 +343,8 @@ module Eco
           def backup_update(requests, simulate: false)
             dry_run   = simulate ? "_dry_run" : ""
             dir       = config.people.requests_folder
-            file      = File.join(dir, "#{type}_data#{dry_run}.json")
+            filename  = name.split(" ").join("-").gsub(/[=\\\/><,"-]+/,"_")
+            file      = File.join(dir, "#{type}_data_#{filename}#{dry_run}.json")
             file_manager.save_json(requests, file, :timestamp)
           end
 

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

@@ -26,6 +26,48 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     update_ooze(ooze)
   end
 
+  protected
+
+  def add_field(name, type, section, after:  nil, before: nil, side: :left)
+    unless section.is_a?(Ecoportal::API::V2::Page::Section)
+      raise "You need to specify a section for a new field. Given: #{section.class}"
+    end
+    target.components.add(label: name, type: type) do |field|
+      section.add_component(field, after: after, before: before, side: side)
+    end.tap do |field|
+      yield(field) if block_given?
+    end
+  end
+
+  def with_fields(type: nil, label: nil)
+    flds = target.components
+    flds = flds.get_by_type(type) if type
+    flds = flds.select do |fld|
+      value = (label == :unnamed) ? nil : label
+      !label || same_string?(fld.label, value)
+    end.each do |field|
+      yield(field) if block_given?
+    end
+  end
+
+  def with_sections(type: nil, heading: nil)
+    secs = target.sections
+    secs = secs.get_by_type(type) if type
+    secs = secs.select do |sec|
+      value = (heading == :unnamed) ? nil : heading
+      !heading || same_string?(sec.heading, value)
+    end.each do |sec|
+      yield(sec) if block_given?
+    end
+  end
+
+  def with_stage(name:)
+    if stage = target.stages.get_by_name(name)
+      yield(stage) if block_given?
+    end
+    stage
+  end
+
   private
 
   # Hook method to use before the target is switched
@@ -70,6 +112,11 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   def update_ooze(ooze = target)
     if !options[:simulate]
       return unless dirty?(ooze)
+      
+      ooze.validate.tap do |validation|
+        raise validation if validation.is_a?(String)
+      end
+
       apiv2.pages.update(ooze).tap do |response|
         if response.success?
           ooze.consolidate!

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

@@ -4,44 +4,6 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::UseCases::Ooze
 
   private
 
-  def with_fields(type: nil, label: nil)
-    flds = target.components
-    flds = flds.get_by_type(type) if type
-    flds = flds.select do |fld|
-      value = (label == :unnamed) ? nil : label
-      !label || same_string?(fld.label, value)
-    end.each do |field|
-      yield(field) if block_given?
-    end
-  end
-
-  def with_sections(type: nil, heading: nil)
-    secs = target.sections
-    secs = secs.get_by_type(type) if type
-    secs = secs.select do |sec|
-      value = (heading == :unnamed) ? nil : heading
-      !heading || same_string?(sec.heading, value)
-    end.each do |sec|
-      yield(sec) if block_given?
-    end
-  end
-
-  def with_stage(name:)
-    if stage = target.stages.get_by_name(name)
-      yield(stage) if block_given?
-    end
-    stage
-  end
-
-  def add_field(name, type, section, after:  nil, side: :left)
-    raise "You need to specify a section for a new field. Given: #{section.class}" unless section.is_a?(Ecoportal::API::V2::Page::Section)
-    target.components.add(label: name, type: type) do |field|
-      section.add_component(field, after: after, side: side)
-    end.tap do |field|
-      yield(field) if block_given?
-    end
-  end
-
   def to_field(value)
     fld   = nil
     fld ||= value if value.is_a?(Ecoportal::API::V2::Page::Component)
@@ -50,5 +12,4 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::UseCases::Ooze
     #fld ||= value.reference if value.is_a?(Ecoportal::API::V2::Page::Force::Binding)
   end
 
-
 end

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

@@ -129,7 +129,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
     apiv2.registers.search(register_id, search_options.merge(only_first: true)).tap do |search_results|
       str_results = "Total target entries: #{search_results.total} (out of #{search_results.total_before_filtering})"
       session.prompt_user("Do you want to proceed (y/N):", explanation: str_results, default: "N", timeout: 10) do |res|
-        if res.upcase.start_with?("N")
+        unless res.upcase.start_with?("Y")
           puts "..."
           logger.info "Aborting script..."
           exit(0)
@@ -142,7 +142,7 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
     @search_options ||= {}.tap do |opts|
       opts.merge!(sort: "created_at")
       opts.merge!(dir:  "asc")
-      opts.merge!(query:   conf_filters) if conf_search
+      opts.merge!(query:   conf_search) if conf_search
       opts.merge!(filters: conf_filters)
     end
   end

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

@@ -101,19 +101,28 @@ ASSETS.cli.config do |config|
         get_people     = io.options.dig(:people, :get)
         partial_update = get_people && get_people.dig(:type) == :partial
         run_it         = !io.options[:dry_run] || io.options.dig(:post_launch, :run)
-        if run_it && partial_update
-          unless io.options[:dry_run]
+        refresh_data   = !io.options[:dry_run] && partial_update
+        if run_it
+          if refresh_data
             # get target people afresh
             people = io.session.micro.people_refresh(people: io.people, include_created: true)
             io     = io.base.new(people: people)
+          else
+            msg = "Although there are post_launch cases, data will not be refreshed before their run"
+            if io.options[:dry_run]
+              msg += ", because we are in dry-run (simulate)."
+            elsif !partial_update
+              msg += ", because it is not a partial update (-get-partial option not present)."
+            end
+            io.session.logger.warn(msg)
           end
         else
           wf_post.skip!
           msg = "Although there are post_launch cases, they will NOT be RUN"
-          if io.options[:dry_run]
-            msg+= ", because we are in dry-run (simulate)."
-          elsif !partial_update
+          if !partial_update
             msg+= ", because it is not a partial update (-get-partial)"
+          elsif io.options[:dry_run]
+            msg+= ", because we are in dry-run (simulate)."
           end
           io.session.logger.info(msg)
         end
@@ -146,8 +155,11 @@ ASSETS.cli.config do |config|
       get_people     = io.options.dig(:people, :get)
       partial_update = get_people && get_people.dig(:type) == :partial
       unless !io.options[:end_get] || io.options[:dry_run] || partial_update
-        people = io.session.micro.people_cache
-        io     = io.new(people: people)
+        # Prevent getting people when there were no use cases that used them
+        unless io.people
+          people = io.session.micro.people_cache
+          io     = io.new(people: people)
+        end
       end
       io
     end

data/lib/eco/csv/table.rb

@@ -15,6 +15,46 @@ module Eco
         end
       end
 
+      # @return [Eco::CSV::Table]
+      def transform_headers
+        header = self.headers
+        cols   = self.columns
+        cols.each do |col|
+          col[0] = yield(col.first)
+        end
+        columns_to_table(cols)
+      end
+
+      # @return [Eco::CSV::Table]
+      def merge_same_header_names
+        dups = self.duplicated_header_names
+        out_rows = self.map do |row|
+          row.to_a.each_with_object({}) do |(name, value), out|
+            if dups.include?(name) && out.key?(name)
+              if block_given?
+                yield(value, out[name], name)
+              else
+                # resolve
+                value || out[name]
+              end
+            elsif out.key?(name)
+              out[name]
+            else
+              value
+            end.tap do |final_value|
+              out[name] = final_value
+            end
+          end
+        end
+        self.class.new(out_rows)
+      end
+
+      # @return [Array<String>] list of duplicated header names
+      def duplicated_header_names
+        header = self.headers
+        header.select {|e| header.count(e) > 1}.uniq
+      end
+
       # @return [Eco::CSV::Table]
       def transform_values
         transformed_rows = rows.map do |row|

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.37"
+  VERSION = "2.0.41"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.37
+  version: 2.0.41
 platform: ruby
 authors:
 - Oscar Segura
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.13
+        version: 0.8.19
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.13
+        version: 0.8.19
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'