caixanegra 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df3d38ccee4981c27d6acb8e72bc4c40c00537c6c370cdc17581de1dc179ac3f
-  data.tar.gz: 4bad76dfbfb9834d19389a28f92a7b3a7a1208c9cdf230a43fc4f9faf6322fb4
+  metadata.gz: c291dfc1c33d2c17e87093eff1bceff3c061ef8c7230a561ace088cd9e23f279
+  data.tar.gz: e812c3f4c1d202902f926115162c0b9b46885b35af56db52db3aa94ab8e53ac8
 SHA512:
-  metadata.gz: 464c5ebbc06fa24c1f6f9261dd9e4241dff7bbfc8ccca0f067de5f289e5bda3a4e658475c8b15fa72971574748927016e5e23eed6020a0eda94580e7e85128ed
-  data.tar.gz: 55fcf0df7d3aac4d6e4458728cab6f3cfe874014903d47b5e4de1976290d8728cccdd28a687a748e43b5338bb6090b94596bb56fb43437ebbf203934c525717a
+  metadata.gz: c6276bd14d36c832729b8a717a15ad5a8c6b9e6223343d6169fa1c153dc0389d0d0ef73ed61b0eb4f19a9dfc1936683b59b80e994b740df4cc670958fbc21833
+  data.tar.gz: 70059940599beff0f5cf09bbb73defa53fc31e336166a15a0262902f194862cd318b5bb8fb7bcb22a7934960411c7dce14f997816a0430fc943ba6d0dceddb88

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

@@ -522,33 +522,63 @@ window.Caixanegra.Designer = {
         this.#catalog = response;
         const unitMenu = document.querySelector("#unitMenu");
         unitMenu.innerHTML = "";
-        this.#catalog.forEach((unitData) => {
-          const item = document.createElement("div");
-          const content = document.createElement("div");
-          const colorCode = document.createElement("div");
-          const header = document.createElement("div");
-          const name = document.createElement("span");
-          const type = document.createElement("span");
-          const description = document.createElement("div");
-          description.classList.add("description");
-          item.classList.add("unit");
-          header.classList.add("header");
-          content.classList.add("content");
-          colorCode.classList.add("color-code");
-          name.classList.add("name");
-          type.classList.add("type");
-
-          name.innerHTML = unitData.title;
-          type.innerHTML = unitData.type;
-          description.innerHTML = unitData.description;
-          colorCode.style.backgroundColor = Caixanegra.Designer.typeColor(unitData.type);
-
-          header.append(name, type);
-          content.append(header, description);
-          item.append(colorCode, content);
-          item.addEventListener("click", this.createUnit.bind(this, unitData));
-          unitMenu.appendChild(item);
+
+        const scopes = [];
+        
+        this.#catalog.forEach(unit => {
+          if (unit.hasOwnProperty("scope") && Array.isArray(unit.scope)) {
+            scopes.push(...unit.scope);
+          } else {
+            scopes.push("_unscoped");
+          }
+        });
+        
+        [...new Set(scopes)].sort().forEach(scope => {
+          const scopeWrapper = document.createElement("div");
+          const scopeTitle = document.createElement("div");
+          const scopeUnits = document.createElement("div");
+
+          scopeWrapper.classList.add("unit-wrapper");
+          scopeTitle.classList.add("title");
+
+          scopeTitle.innerHTML = scope === "_unscoped" ? "unscoped" : scope.replace(/_/g, " ");
+          scopeWrapper.appendChild(scopeTitle);
+          scopeWrapper.appendChild(scopeUnits);
+
+          const filteredUnits = this.#catalog.filter(unit => {
+            return (unit.scope === null && scope === "_unscoped") || (unit.scope || []).includes(scope)
+          });
+
+          filteredUnits.forEach((unitData) => {
+            const item = document.createElement("div");
+            const content = document.createElement("div");
+            const colorCode = document.createElement("div");
+            const header = document.createElement("div");
+            const name = document.createElement("span");
+            const type = document.createElement("span");
+            const description = document.createElement("div");
+            description.classList.add("description");
+            item.classList.add("unit");
+            header.classList.add("header");
+            content.classList.add("content");
+            colorCode.classList.add("color-code");
+            name.classList.add("name");
+            type.classList.add("type");
+  
+            name.innerHTML = unitData.title;
+            type.innerHTML = unitData.type;
+            description.innerHTML = unitData.description;
+            colorCode.style.backgroundColor = Caixanegra.Designer.typeColor(unitData.type);
+  
+            header.append(name, type);
+            content.append(header, description);
+            item.append(colorCode, content);
+            item.addEventListener("click", this.createUnit.bind(this, unitData));
+            scopeUnits.appendChild(item);
+          });
+          unitMenu.appendChild(scopeWrapper);
         });
+
         this.#loadedComponents.catalog = true;
         this.#reveal();
       });

data/app/assets/stylesheets/caixanegra/designer.scss

@@ -119,6 +119,15 @@ $accent-contrast-color: darken($accent-color, 20%);
     transform: translateY(0%);
   }
 
+  .unit-wrapper {
+    .title {
+      font-family: Verdana, Geneva, Tahoma, sans-serif;
+      font-size: 0.7em;
+      color: rgba(0,0,0,.7);
+      margin-bottom: 5px;
+    }
+  }
+
   .unit {
     display: flex;
     flex-direction: row;

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

@@ -17,7 +17,8 @@ module Caixanegra
         def units
           @units ||= ::Caixanegra::UnitHelper.scoped_units(unit_scope).map do |k, v|
             base = {
-              title: v.name,
+              scope: v.scope,
+              title: v.unit_name,
               type: v.type,
               description: v.description,
               class: k,

data/app/models/caixanegra/unit.rb

@@ -76,8 +76,12 @@ module Caixanegra
       raise(UnitIOException.new, "Unable to fetch input '#{id}'")
     end
 
-    def name
-      self.class.name
+    def scope
+      self.class.scope
+    end
+
+    def unit_name
+      self.class.unit_name
     end
 
     def description
@@ -108,12 +112,16 @@ module Caixanegra
     end
 
     class << self
-      attr_reader :name, :description, :inputs, :exits, :assignments, :type
+      attr_reader :unit_name, :description, :inputs, :exits, :assignments, :type, :scope
 
       @type = :passthrough
 
+      def configure_scope(value)
+        @scope = value
+      end
+
       def configure_name(value)
-        @name = value
+        @unit_name = value
       end
 
       def configure_description(value)

data/lib/caixanegra/executor.rb

@@ -148,9 +148,11 @@ module Caixanegra
 
       exit_name = result[:exit_through]
       metadata = unit_metadata(@step_unit.oid)
-      log_console_entry "Next unit found through '#{exit_name}': '#{@step_unit.oid}'"
       exit_metadata = metadata[:exits].find { |ex| ex[:name] == exit_name.to_s }
-      unit(exit_metadata[:target], map_carry_over(result))
+      next_unit = unit(exit_metadata[:target], map_carry_over(result))
+      log_console_entry "Next unit found through '#{exit_name}': '#{next_unit.oid}'"
+
+      next_unit
     end
 
     def process_feeders

data/lib/caixanegra/unit_helper.rb

@@ -2,30 +2,26 @@ 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 })
+        units = {}
 
-        (scope || "").split(",").each do |current_scope|
-          all_units = all_units.merge(Caixanegra.units[current_scope.to_sym])
+        scopes = (scope || "").split(",").map(&:to_sym)
+        Caixanegra.units.each do |unit|
+          if unit.scope.nil? || unit.scope.any? { |checking_scope| scopes.include?(checking_scope) }
+            units[unit.name.demodulize.underscore.to_sym] = unit
+          end
         end
 
-        all_units
+        units
       end
 
       def all_units
-        all_units = {}
+        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
+        Caixanegra.units.each do |unit|
+          units[unit.name.demodulize.underscore.to_sym] = unit
         end
 
-        all_units
+        units
       end
     end
   end

data/lib/caixanegra/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caixanegra
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - sergiorribeiro
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -61,7 +61,6 @@ files:
 - app/controllers/caixanegra/api_controller.rb
 - app/controllers/caixanegra/application_controller.rb
 - app/controllers/caixanegra/designer_controller.rb
-- app/helpers/caixanegra/application_helper.rb
 - app/models/caixanegra/unit.rb
 - app/views/caixanegra/designer/index.html.erb
 - app/views/layouts/caixanegra/application.html.erb

data/app/helpers/caixanegra/application_helper.rb

@@ -1,4 +0,0 @@
-module Caixanegra
-  module ApplicationHelper
-  end
-end