caixanegra 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4296a7a3ef7cd55657a83b6fd6f4cf9389c8ba731a539191a6e6c16e853b6848
-  data.tar.gz: 8805ae26d4cbb6a37c98a22b5fba5b11a3f14a88de9fa685d313bfc58d22e4ed
+  metadata.gz: df3d38ccee4981c27d6acb8e72bc4c40c00537c6c370cdc17581de1dc179ac3f
+  data.tar.gz: 4bad76dfbfb9834d19389a28f92a7b3a7a1208c9cdf230a43fc4f9faf6322fb4
 SHA512:
-  metadata.gz: c866e8d7614824e7a82bd8fe26dc0a434be293a6e317142169724c24a00f5c60b7e4ff804836053a0f75a865f6df1943464ae5c5dbfad8c2500ce31ea820b306
-  data.tar.gz: 0d12dc642122961304bb47ec2840560e6da603f83c575b8e3e0604e5527743a54ce43c950ca372763018658da8f9a9ba2a06e88da6a31bb62bb18e45e128e7e3
+  metadata.gz: 464c5ebbc06fa24c1f6f9261dd9e4241dff7bbfc8ccca0f067de5f289e5bda3a4e658475c8b15fa72971574748927016e5e23eed6020a0eda94580e7e85128ed
+  data.tar.gz: 55fcf0df7d3aac4d6e4458728cab6f3cfe874014903d47b5e4de1976290d8728cccdd28a687a748e43b5338bb6090b94596bb56fb43437ebbf203934c525717a

data/README.md

@@ -51,7 +51,7 @@ uid = Caixanegra::Manager.handler(my_flow || {})
 You can then safely navigate to the designer.
 
 ```ruby
-link_to "Some flow", "/caixanegra/design/#{@uid}?unit_scope=optional_scope", target: :blank
+link_to "Some flow", "/caixanegra/design/#{@uid}?unit_scope=optional_scope,another_optional_scope", target: :_blank
 ```
 
 Saved changes will update the flow definition on Redis, and you must then persist them. You can get the flow definition for any specified **caixanegra** handled UID:
@@ -63,7 +63,7 @@ persist_flow(updated_flow) # your own persistence or transport solution. It's a
 
 **NOTE:** There's currently no managed way to set callbacks on save actions from the designer. Working on it
 
-Please, refer to [the wiki](https://github.com/sergiorribeiro/caixanegra/wiki) to get to know more about [creating your units](https://github.com/sergiorribeiro/caixanegra/wiki/Creating-units).
+Please, refer to [the wiki](https://github.com/sergiorribeiro/caixanegra/wiki) to get to know more about [units](https://github.com/sergiorribeiro/caixanegra/wiki/Anatomy-of-a-unit).
 
 # License
 **caixanegra** is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/app/assets/javascripts/caixanegra/designer.js

@@ -166,9 +166,9 @@ window.Caixanegra.Designer = {
             ctx.beginPath();
             ctx.moveTo(this.#drawValues.position.x + this.size.x, exit.markerY);
             ctx.lineTo(this.#drawValues.position.x + this.size.x + 25, exit.markerY);
-            
+
             if (this.connectingExit === exit && context.mouse.move) {
-              ctx.lineTo(context.mouse.move.x, context.mouse.move.y);
+              ctx.lineTo(context.mouse.move.x + context.referential.x, context.mouse.move.y + context.referential.y);
             } else if (exit.reference.target) {
               const targetCenter = exit.reference.target.getCenter(context.referential);
               ctx.lineTo(targetCenter.x, targetCenter.y);
@@ -382,10 +382,10 @@ window.Caixanegra.Designer = {
     }
 
     deleteUnit() {
-      this.removeUnit(this.selectedUnit.oid);
-      this.toggleDeleteConfirmation();
       this.unitDetailPane.classList.remove("-open");
       this.unitDebugHitsPane.classList.remove("-open");
+      this.removeUnit(this.selectedUnit.oid);
+      this.toggleDeleteConfirmation();
     }
 
     flushToConsole(entries) {

data/app/controllers/caixanegra/api/designer/flows_controller.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Caixanegra
-  module API
+  module Api
     module Designer
-      class FlowsController < ::Caixanegra::APIController
+      class FlowsController < ::Caixanegra::ApiController
         before_action :set_flow, only: %i[show debug_run]
 
         def show
@@ -20,7 +20,6 @@ module Caixanegra
           execution = Caixanegra::Executor.new(
             initial_carryover: initial_carryover,
             flow_definition: @flow,
-            unit_scope: params[:unit_scope],
             debug_mode: true
           ).run
 

data/app/controllers/caixanegra/api/designer/units_controller.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 module Caixanegra
-  module API
+  module Api
     module Designer
-      class UnitsController < ::Caixanegra::APIController
+      class UnitsController < ::Caixanegra::ApiController
         def index
           render json: units
         end
@@ -15,26 +15,20 @@ module Caixanegra
         end
 
         def units
-          @units ||= begin
-            base_units = Caixanegra.units.reject { |_, v| v.is_a? Hash }
-            scope_units = Caixanegra.units[unit_scope] if unit_scope.present?
-            all_units = base_units.merge(scope_units || {})
+          @units ||= ::Caixanegra::UnitHelper.scoped_units(unit_scope).map do |k, v|
+            base = {
+              title: v.name,
+              type: v.type,
+              description: v.description,
+              class: k,
+              exits: v.exits&.map { |e| { name: e } },
+              inputs: v.inputs,
+              assignments: v.assignments
+            }
 
-            all_units.map do |k, v|
-              base = {
-                title: v.name,
-                type: v.type,
-                description: v.description,
-                class: k,
-                exits: v.exits&.map { |e| { name: e } },
-                inputs: v.inputs,
-                assignments: v.assignments
-              }
+            base[:set] = v.set if base[:set]
 
-              base[:set] = v.set if base[:set]
-
-              base
-            end
+            base
           end
         end
       end

data/app/controllers/caixanegra/api_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Caixanegra
-  class APIController < ActionController::API
+  class ApiController < ActionController::API
   end
 end

data/app/models/caixanegra/unit.rb

@@ -36,6 +36,12 @@ module Caixanegra
       }
     end
 
+    def exit_and_return
+      {
+        carry_over: @carry_over
+      }
+    end
+
     def flow
       exit_through exits.first
     end
@@ -64,7 +70,10 @@ module Caixanegra
 
         input_value = result
       end
+
       input_value.presence || @inputs[id][:default]
+    rescue StandardError
+      raise(UnitIOException.new, "Unable to fetch input '#{id}'")
     end
 
     def name

data/lib/caixanegra/exceptions.rb

@@ -2,4 +2,6 @@
 
 module Caixanegra
   class UnitScopedException < StandardError; end
+  class UnitIOException < StandardError; end
+  class ContinuityException < StandardError; end
 end

data/lib/caixanegra/executor.rb

@@ -5,7 +5,6 @@ module Caixanegra
     def initialize(params)
       @initial_carryover = params[:initial_carryover] || {}
       @flow = (params[:flow_definition] || {}).deep_symbolize_keys
-      @unit_scope = params[:unit_scope]
       @debug_mode = params[:debug_mode] == true
       @execution = { history: [], steps: [] }
       @storage = {}
@@ -113,6 +112,8 @@ module Caixanegra
           raise exception
         end
         next_unit = next_unit(result)
+        raise(ContinuityException.new, "Unable to choose a valid exit") if next_unit.nil?
+
         log_step_result(result, next_unit)
         @execution[:steps] += feeder_steps
         @step_unit = next_unit
@@ -143,6 +144,8 @@ module Caixanegra
     end
 
     def next_unit(result)
+      return nil if result.nil?
+
       exit_name = result[:exit_through]
       metadata = unit_metadata(@step_unit.oid)
       log_console_entry "Next unit found through '#{exit_name}': '#{@step_unit.oid}'"
@@ -187,15 +190,13 @@ module Caixanegra
       unit_class = scoped_units[unit_data[:class].to_sym]
       inputs = unit_class.inputs
       unit_class.new(unit_data[:oid], inputs, mappings, carry_over, @storage)
+    rescue
+      log_console_entry "Unable to load unit instance of type '#{unit_data[:class]}'"
+      nil
     end
 
     def scoped_units
-      @scoped_units ||= begin
-        base_units = Caixanegra.units.reject { |_, v| v.is_a? Hash }
-        scope_units = Caixanegra.units[@unit_scope] if @unit_scope.present?
-
-        base_units.merge(scope_units || {})
-      end
+      @scoped_units ||= UnitHelper.all_units
     end
   end
 end

data/lib/caixanegra/unit_helper.rb

@@ -0,0 +1,32 @@
+module Caixanegra
+  class UnitHelper
+    class << self
+      def scoped_units(scope)
+        all_units = {}
+        all_units = all_units.merge(Caixanegra.units.reject { |_, v| v.is_a? Hash })
+
+        (scope || "").split(",").each do |current_scope|
+          all_units = all_units.merge(Caixanegra.units[current_scope.to_sym])
+        end
+
+        all_units
+      end
+
+      def all_units
+        all_units = {}
+
+        Caixanegra.units.each do |k, v|
+          if v.is_a? Hash
+            v.each do |ik, iv|
+              all_units[ik] = iv
+            end
+          else
+            all_units[k] = v
+          end
+        end
+
+        all_units
+      end
+    end
+  end
+end

data/lib/caixanegra/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Caixanegra
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/caixanegra.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'caixanegra/exceptions'
+require 'caixanegra/unit_helper'
 require 'caixanegra/engine'
 require 'caixanegra/version'
 require 'caixanegra/executor'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caixanegra
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sergiorribeiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,6 +72,7 @@ files:
 - lib/caixanegra/exceptions.rb
 - lib/caixanegra/executor.rb
 - lib/caixanegra/manager.rb
+- lib/caixanegra/unit_helper.rb
 - lib/caixanegra/version.rb
 - lib/tasks/caixanegra_tasks.rake
 homepage: https://github.com/sergiorribeiro/caixanegra/wiki
@@ -86,7 +87,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="