eco-helpers 2.1.2 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d5ec6baab743f216afd4ca77a4d36f9a43a52e841f0c2ca9ef73f63e3423b1
-  data.tar.gz: 5906de7dd2f2765c6222ac707b42b6b270914b40c964e7ba579966652a418e72
+  metadata.gz: ca676558c0e1a885b1f9e15d68e3c4f3688b90713c88182854b426a8ce1bf447
+  data.tar.gz: 41e8693e90664d7789040dd2dab66521e330693a9ae62f7bb5c5bc2dbd940911
 SHA512:
-  metadata.gz: e0494e227d268046a78fb6bf2df120506056bf96bf09464816ebc3a2fb2e6907e89729ed9c9ab848d93bfb9b53bdcf7f3c220c60847ffb403e54f663eca4c3c6
-  data.tar.gz: 26b09ee8c9eb63b9cd91772d55f1c52bdc941bff59e83da809d80272978eb8f62d687caf4417404a32d494e2853644b2e3532a151b81f001bc6b9b87f3263067
+  metadata.gz: 65b5157cc78ff3016f932283e2f0504e46681e15dc2acd902bb0e6188af98f5fe5271ad0db49a48fe969c642df3146daffeffcb0008dda3012433450dbbc1e87
+  data.tar.gz: 3a23f58986631f819b18bd8395ec92c321e9cb21bfde172a3e565df309cdad3b759d1d60f8c4bf52cff29332b49607f30afad19c90a80c5f9fb974637c3b218e

data/CHANGELOG.md

@@ -1,12 +1,31 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.1.3] - 2022-09-xx
+## [2.1.5] - 2022-10-xx
 
 ### Added
 ### Changed
 ### Fixed
 
+## [2.1.4] - 2022-10-20
+
+### Added
+  - `Eco::API::Common::Session::Mailer#mail` added parameters `cc` and `bcc`
+
+## [2.1.3] - 2022-10-11
+
+### Added
+  - `Eco::API::UseCases::OozeSamples::OozeBaseCase`
+    - `with_fields`, `with_sections` and `add_field` accept an `entry` parameter
+    - also did some internal refactor
+
+### Changed
+  - Upgraded `ecoportal-api-v2` **gem**
+
+### Fixed
+  - `Eco::API::UseCases::OozeSamples::RegisterUpdateCase`
+    - account for stages with updates within same entry
+
 ## [2.1.2] - 2022-09-29
 
 ### Added

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.5', '< 0.9'
-  spec.add_dependency 'ecoportal-api-v2', '>= 0.9.2', '< 0.10'
+  spec.add_dependency 'ecoportal-api-v2', '>= 0.9.3', '< 0.10'
   spec.add_dependency 'ecoportal-api-graphql', '>= 0.1.10', '< 0.2'
   spec.add_dependency 'aws-sdk-s3',    '>= 1.83.0', '< 2'
   spec.add_dependency 'aws-sdk-ses',   '>= 1.36.0', '< 2'

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

@@ -16,11 +16,9 @@ module Eco
           # @param to [String] destination email address
           # @param subject [String] subject of the email
           # @param body [String] `html` or plain text message
-          def mail(to: nil, subject:, body:)
+          def mail(to: nil, subject:, body:, cc: nil, bcc: nil)
             ses.send_email(
-              destination: {
-                to_addresses: [fetch_to(to)].flatten,
-              },
+              destination: fetch_destination(to: to, cc: cc, bcc: bcc),
               source:  fetch_from,
               message: {
                 subject: {
@@ -64,6 +62,15 @@ module Eco
             @enviro.config || {}
           end
 
+          def fetch_destination(to: nil, cc: nil, bcc: nil)
+            cc_to  = [cc].flatten.compact.uniq
+            bcc_to = [bcc].flatten.compact.uniq
+            { to_addresses: [fetch_to(to)].flatten }.tap do |dest|
+              dest.merge!(cc_addresses: cc_to) unless cc_to.empty?
+              dest.merge!(bcc_addresses: bcc_to) unless bcc_to.empty?
+            end
+          end
+
           def fetch_to(value = nil)
             value || config.mailer.to
           end

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

@@ -46,30 +46,30 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     ooze(ooze_id, stage_id: stage_id)
   end
 
-  def add_field_by_doc(doc, section, after: nil, before: nil, side: :left)
+  def add_field_by_doc(doc, section, entry: target, 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(doc: doc) do |field|
+    entry.components.add(doc: doc) do |field|
       section.add_component(field, after: after, before: before, side: side)
     end.tap do |field|
       yield(field) if block_given?
     end
   end
 
-  def add_field(name, type, section, after: nil, before: nil, side: :left)
+  def add_field(name, type, section, entry: target, 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|
+    entry.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
+  def with_fields(entry = target, type: nil, label: nil)
+    flds = entry.components
     flds = flds.get_by_type(type) if type
     flds = flds.select do |fld|
       value = (label == :unnamed) ? nil : label
@@ -79,8 +79,8 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     end
   end
 
-  def with_sections(type: nil, heading: nil)
-    secs = target.sections
+  def with_sections(entry = target, type: nil, heading: nil)
+    secs = entry.sections
     secs = secs.get_by_type(type) if type
     secs = secs.select do |sec|
       value = (heading == :unnamed) ? nil : heading
@@ -141,7 +141,10 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
   # It fill update the ooze only if it's dirty (it carries changes)
   # @return [Boolean, Response] `false` if there was not request against the server, `Response` otherwise
   def update_ooze(ooze = target)
-    if !options[:simulate]
+    if options[:simulate]
+      dry_run_feedback(ooze)
+      false
+    else
       return false unless dirty?(ooze)
 
       ooze.validate.tap do |validation|
@@ -156,19 +159,6 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
           logger.error("Could not update #{object_reference(ooze)} (created_at: #{ooze.created_at}: #{response.body}")
         end
       end
-    else
-      ooze.validate.tap do |validation|
-        logger.error(validation) if validation.is_a?(String)
-      end
-      unless options.dig(:feedback, :only_stats)
-        if patch = (patch_doc(ooze) || {})["page"]
-          pp patch
-        end
-      end
-
-      backup_patch!(ooze)
-      exit(0) if dirty?(ooze) && dry_count > DRY_COUNT
-      false
     end
   end
 
@@ -204,6 +194,14 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     puts "Saved patch at: #{File.expand_path(SAVE_PATCH)}"
   end
 
+  def display_patch(entry = target)
+    unless options.dig(:feedback, :only_stats)
+      if patch = (patch_doc(entry) || {})["page"]
+        pp patch
+      end
+    end
+  end
+
   def patch_doc(ooze = target)
     apiv2.pages.get_body(ooze)
   end
@@ -213,6 +211,19 @@ class Eco::API::UseCases::OozeSamples::OozeBaseCase < Eco::API::Common::Loaders:
     @dry_count += 1
   end
 
+  def dry_run_feedback(entry = target)
+    entry.validate.tap do |validation|
+      logger.error(validation) if validation.is_a?(String)
+    end
+    display_patch(entry)
+    backup_patch!(entry)
+    if dirty?(entry) && dry_count > self.class::DRY_COUNT
+      logger.info("Reached #{self.class::DRY_COUNT} dry-run samples.")
+      exit(0)
+    end
+    false
+  end
+
   def apiv2
    @apiv2 ||= session.api(version: :oozes)
   end

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

@@ -52,7 +52,15 @@ class Eco::API::UseCases::OozeSamples::RegisterUpdateCase < Eco::API::UseCases::
 
   def before_loading_new_target(ooze_id)
     if pending = queue_shift(ooze_id)
-      update_ooze(pending)
+      update_ooze(pending).tap do |result|
+        if result.is_a?(Ecoportal::API::Common::Response)
+          if result.success?
+            @updated_oozes += 1
+          else
+            @failed_update_oozes +=1
+          end
+        end
+      end
     end
   end
 

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.1.2"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eco-helpers
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.4
 platform: ruby
 authors:
 - Oscar Segura
@@ -136,7 +136,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.9.3
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.10'