eco-helpers 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37b6126eddfc0f3ef3c32f621fd0c6d15e5b1e15e83e539a52d331ebe59d8d16
-  data.tar.gz: 838d28773e4175fe9948243dd0145ee184d6c1329a1c4fb772743db146261465
+  metadata.gz: 44dd3a1b4d94cef2da5fc8c4618c6898bf0310f48778be120cd83503913af297
+  data.tar.gz: 128f7c6d4a4112636089c82ec61a127914263553af0fe4d54aad563d73088532
 SHA512:
-  metadata.gz: daa1ee54fdf2aa3bb983ef4ca8c813c4e6778cea94f32777854fbb157864d80c9eb2120007fbbd4c9a47c3b84d72ca4f671f3f64c8bf0bbafca6385d490e7437
-  data.tar.gz: 8370f7da5acf41bc0951ed0fee5822bea43e128d8de34a3c84e626d60ad9ade2686bb0911af11e35b0197f8e67d9073826ff0f6b9b4dca4f5c78a73e9297b031
+  metadata.gz: d14f77e2cf74584eafc8c9834a71d52d1e399767352d27167ef5cbf05266c2a77777f866e64c482e610c8ca2a600aea3640256ed16ee1c6855a6b2db30af2c76
+  data.tar.gz: 1db0afa72df07479f22eca03553b3ac3c51f0228a7d726422a2f6e313565c960554be778c8b36515f1b14dc1085d8378d5d1ec859e96ef26cd116b36ccc738cf

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
-## [2.0.2] - 2021-02-xx
+## [2.0.3] - 2021-02-23
+
+### Added
+  - `Eco::API::UseCases::OozeSamples::OozeUpdateCase`: added integration to update page instances (non-templates)
+
+### Changed
+### Fixed
+  - `Eco::API::Policies::DefaultPolicies::UserAccess` complete default policy code.
+
+## [2.0.2] - 2021-02-22
 
 ### Added
 ### Changed

data/lib/eco/api/policies/default_policies/99_user_access_policy.rb

@@ -1,18 +1,18 @@
 class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loaders::Policy
   name "default-user-access"
 
-  attr_reader :session, :options
+  attr_reader   :session, :options, :job
   attr_accessor :account_removed_count
 
   def main(people, session, options, policy, job)
-    @session = session; @options = options
+    @session = session; @options = options; @job = job
 
     self.account_removed_count = 0
 
     people.each do |person|
-      remove_account_when_no_email!(person)      if person.email.to_s.empty?
-      person.account.policy_group_ids = [defid]  if no_policy_group_ids?(person)
-      refresh_abilities!(person.account)
+      remove_account_when_no_email!(person)    if person.email.to_s.empty?
+      person.account.policy_group_ids = defid  if no_policy_group_ids?(person)
+      refresh_abilities!(person)
     end
 
     warn_account_removal!
@@ -22,14 +22,14 @@ class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loader
 
   def warn_account_removal!
     if account_removed_count > 0
-      msg = "Removed account to #{account_removed_count} people"
+      msg = "(DefaultPolicy on job '#{job.name}') Removed account to #{account_removed_count} people"
       session.logger.warn(msg)
     end
   end
 
   def remove_account_when_no_email!(person)
     if person.account
-      account_removed_count += 1 if had_account?(person)
+      self.account_removed_count += 1 if had_account?(person)
       person.account = nil
     end
   end
@@ -40,23 +40,11 @@ class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loader
     return !!person.original_doc["account"]
   end
 
-  def provision_basic_level!(person)
-    if account = person.account
-
-      unless options.dig(:exclude, :abilities)
-        account.permissions_custom = session.new_preset(person)
-
-        if no_abilities?(person)
-          account.permissions_custom = min_abilities
-        end
-      end
-
-    end
-  end
-
-  def refresh_abilities!(account)
-    return nil unless account
-
+  def refresh_abilities!(person)
+    return nil if options.dig(:exclude, :abilities)
+    return nil unless account = person.account
+    account.permissions_custom = session.new_preset(person)
+    account.permissions_custom = min_abilities if no_abilities?(person)
   end
 
   def no_policy_group_ids?(person)
@@ -64,8 +52,8 @@ class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loader
   end
 
   def no_abilities?(person)
-    person.account.permissions_custom &&
-    person.account.permissions_custom.values.all?(&:nil?)
+    return true unless account = person.account
+    account.permissions_custom && account.permissions_custom.values.all?(&:nil?)
   end
 
   def min_abilities
@@ -86,7 +74,7 @@ class Eco::API::Policies::DefaultPolicies::UserAccess < Eco::API::Common::Loader
   end
 
   def defid
-    @defid ||= policy_groups.to_id(default_group)
+    @defid ||= policy_groups.to_id([default_group]).compact
   end
 
   def default_group

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

@@ -195,6 +195,7 @@ module Eco
           # @yieldreturn [Eco::API::UseCases::BaseIO] the `io` input/output object carried througout all the _workflow_
           # @return [Eco::API::Session::Config::Workflow] the current stage object (to ease chainig).
           def run(key = nil, io:, &block)
+            raise "Missing BaseIO object" unless io.is_a?(Eco::API::UseCases::BaseIO)
             begin
               if key
                 io = stage(key).run(io: io, &block)

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

@@ -25,10 +25,30 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::Common::Loader
     options.dig(:source, :ooze_id)
   end
 
+  def stage_id
+    options.dig(:source, :stage_id)
+  end
+
+  def stage(id_name = stage_id)
+    if stg = ooze.stages[id_name] || ooze.stages.get_by_name(id_name)
+      return apiv2.pages.get(ooze_id, stage_id: stg.id).tap do |stage|
+        if stage
+          new_target(stage)
+          logger.info("Got #{object_reference(stage)} from #{object_reference(ooze)}")
+        else
+          logger.error("Could not get stage '#{id_name}' in ooze '#{ooze_id}'")
+          exit(1)
+        end
+      end
+    end
+    raise "Stage '#{id_name}' doesn't exist in ooze '#{ooze_id}'"
+  end
+
   def ooze
     @ooze ||= apiv2.pages.get(ooze_id).tap do |ooze|
       if ooze
-        logger.info("Got ooze '#{ooze_id}': '#{ooze.name}'")
+        new_target(ooze)
+        logger.info("Got #{object_reference(ooze)}")
       else
         logger.error("Could not get ooze '#{ooze_id}'")
         exit(1)
@@ -39,7 +59,7 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::Common::Loader
   def launch_request
     prompt_to_confirm!
 
-    apiv2.pages.update(ooze).tap do |response|
+    apiv2.pages.update(target).tap do |response|
       if response.success?
         logger.info("All went OK")
       else
@@ -59,9 +79,35 @@ class Eco::API::UseCases::OozeSamples::OozeUpdateCase < Eco::API::Common::Loader
    @apiv2 ||= session.api(version: :oozes)
   end
 
-  def patch_doc(renew: false)
-    return @patch_doc if @patch_doc && !renew
-    @patch_doc = apiv2.pages.get_body(ooze)
+  def target
+    @target
+  end
+
+  def new_target(object)
+    if @target && patch_doc["page"]
+      logger.warn "You you are switching to a new target #{object_reference(object)} after doing unsaved changes to #{object_reference(@target)}"
+    end
+    @target = object
+  end
+
+  def object_reference(obj)
+    return "No reference" unless obj
+    "".tap do |ref|
+      case obj
+      when Ecoportal::API::V2::Page::Stage
+        ref << "Stage "
+      when Ecoportal::API::V2::Pages::PageStage
+        ref << "StagePage "
+      when Ecoportal::API::V2::Page
+        ref << "Page "
+      end
+      ref << "'#{obj.name}' " if obj.respond_to?(:name)
+    end
+  end
+
+
+  def patch_doc
+    apiv2.pages.get_body(target)
   end
 
   def backup_patch!

data/lib/eco/version.rb

@@ -1,3 +1,3 @@
 module Eco
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

metadata

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