foobara 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 782f9f751e5ade5abc8f593f9f3fb6afe456df2d2a5636554652432ff44722e5
-  data.tar.gz: ce77c639a1a7e5f9c79833610655e65ee6ed5e8051ce77c19ca43bbb58c748eb
+  metadata.gz: 0c67b545a741174d59b5a74553449d32169d2745b33824ad14ee21e4dac7085b
+  data.tar.gz: 1e54750375fe79b83ee0bbf08e460021193124e5f7f661c4eef39afd53c3573b
 SHA512:
-  metadata.gz: dfce0e9aec6e7b6212ee1bc236e8bca42fba3a380ddce7a2fe75db012f738c3ad13d41a9f8d98438d18252ba92f3a87b90cdb5087d5cfc19006672d6d519db6f
-  data.tar.gz: b2221f7c2920cb7f5978f5ead9e3655a47fe464d6a738445f111e619736d6212f56d97e066d90000934878844c2a6b3937b58366eb086990987fc367b58d1649
+  metadata.gz: 18d0063f27c3c708b30603091ddaaba2bb11ad864d6902b705f0b120ba64ed32f33f64023561a11086e3cf266cf426b927deefc44e173d625156e6aa4d2c9a19
+  data.tar.gz: 84f34116a5033ae5c2f34c6e408520cb61a2b0efbedbb59b1b07792c35992c1622153a4b254c8c5c4bd3782b6a22c0a04ec828160f3a0c11e0729871a160ccc7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [0.0.3] - 2024-08-15
+
+- Do not automatically try to map subcommand types to calling command result type
+- Add some crude help info for models in http connector
+
 ## [0.0.2] - 2024-06-20
 
 - Make sure content-type is json if we are json serializing an HTTP response

data/projects/command/src/concerns/domain_mappers.rb

@@ -4,22 +4,35 @@ module Foobara
       module DomainMappers
         include Concern
 
-        def run_mapped_subcommand!(subcommand_class, unmapped_inputs)
+        def run_mapped_subcommand!(subcommand_class, *args)
+          unmapped_inputs, has_result_type, result_type =
+            case args.size
+            when 1
+              [args.first]
+            when 2
+              [args[1], true, args[0]]
+            else
+              # :nocov:
+              raise ArgumentError,
+                    "Wrong number of arguments: (#{args.size}. Expected 2 or 3 argument."
+              # :nocov:
+            end
+
           inputs = domain_map!(unmapped_inputs, to: subcommand_class, strict: true)
 
           result = run_subcommand!(subcommand_class, inputs)
 
-          result_mapper = self.class.domain.foobara_domain_mapper_registry.lookup(
-            from: result,
-            to: result_type,
-            strict: true
-          )
+          if has_result_type
+            result_mapper = self.class.domain.foobara_domain_mapper_registry.lookup!(
+              from: result,
+              to: result_type,
+              strict: true
+            )
 
-          if result_mapper
-            result_mapper.map(result)
-          else
-            result
+            result = result_mapper.map(result)
           end
+
+          result
         end
 
         def domain_map(...)

data/projects/command_connectors_http/src/http/commands/help/templates/entity.html.erb

@@ -1 +1,11 @@
-<%= full_type_name %>
+<h1><%= full_entity_name %></h1>
+<p><%= description %></p>
+
+<h2>Attributes</h2>
+<%= render_html_list(attributes_type) %>
+
+<h2>Primary Key</h2>
+<%= primary_key_attribute %>
+
+<h2>Possible Errors</h2>
+<%= render_html_list(possible_errors) %>

data/projects/command_connectors_http/src/http/commands/help/templates/model.html.erb

@@ -1 +1,8 @@
-<%= full_type_name %>
+<h1><%= full_model_name %></h1>
+<p><%= description %></p>
+
+<h2>Attributes</h2>
+<%= render_html_list(attributes_type) %>
+
+<h2>Possible Errors</h2>
+<%= render_html_list(possible_errors) %>

data/projects/domain/src/domain_mapper/registry.rb

@@ -1,5 +1,30 @@
 module Foobara
   class DomainMapper
+    class NoDomainMapperFoundError < StandardError
+      attr_accessor :value, :from, :to, :has_value
+
+      def initialize(from, to, **opts)
+        valid_keys = [:value]
+        invalid_keys = opts.keys - [:value]
+
+        if invalid_keys.any?
+          # :nocov:
+          raise ArgumentError, "Invalid keys: #{invalid_keys.join(", ")}. expected one of: #{valid_keys.join(", ")}"
+          # :nocov:
+        end
+
+        if opts.key?(:value)
+          self.has_value = true
+          self.value = opts[:value]
+        end
+
+        self.from = from
+        self.to = to
+
+        super("No domain mapper found for #{value}. from: #{from}. to: #{to}.")
+      end
+    end
+
     class Registry
       class AmbiguousDomainMapperError < StandardError
         attr_accessor :candidates, :from, :to
@@ -17,6 +42,12 @@ module Foobara
         mappers << mapper
       end
 
+      def lookup!(from: nil, to: nil, strict: false)
+        result = lookup(from:, to:, strict:)
+
+        result || raise(NoDomainMapperFoundError.new(from, to))
+      end
+
       def lookup(from: nil, to: nil, strict: false)
         candidates = mappers.select do |mapper|
           mapper.applicable?(from, to)

data/projects/domain/src/domain_module_extension.rb

@@ -4,18 +4,6 @@ module Foobara
     class AlreadyRegisteredError < StandardError; end
     class CannotSetTypeConstantError < StandardError; end
 
-    class NoDomainMapperFoundError < StandardError
-      attr_accessor :value, :from, :to
-
-      def initialize(value, from, to)
-        self.value = value
-        self.from = from
-        self.to = to
-
-        super("No domain mapper found for #{value}. from: #{from}. to: #{to}.")
-      end
-    end
-
     class << self
       def global
         GlobalDomain
@@ -165,9 +153,8 @@ module Foobara
 
         def foobara_domain_map!(value, from: value, to: nil, strict: false)
           mapper = foobara_domain_mapper_registry.lookup(from:, to:, strict:)
-
           unless mapper
-            raise NoDomainMapperFoundError.new(value, from, to)
+            raise Foobara::DomainMapper::NoDomainMapperFoundError.new(from, to, value:)
           end
 
           mapper.call(value)

data/projects/foobara/lib/foobara/all.rb

@@ -8,9 +8,6 @@ module Foobara
   end
 
   module Monorepo
-    # universal
-    project "version"
-
     # could be independent projects
     projects "delegate",
              "concerns",

data/projects/manifest/src/foobara/manifest/entity.rb

@@ -25,6 +25,10 @@ module Foobara
         super - [primary_key_name]
       end
 
+      def full_entity_name
+        full_model_name
+      end
+
       def associations
         @associations ||= self[:associations].to_h do |path_key, type_name|
           [path_key.to_sym, Type.new(root_manifest, [:type, type_name])]

data/projects/manifest/src/foobara/manifest/model.rb

@@ -15,6 +15,10 @@ module Foobara
         attributes_type.attribute_names
       end
 
+      def full_model_name
+        scoped_full_name
+      end
+
       # TODO: rename
       def has_associations?(type = attributes_type)
         case type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foobara
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Miles Georgi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-21 00:00:00.000000000 Z
+date: 2024-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara-util
@@ -378,8 +378,6 @@ files:
 - projects/value/src/processor/selection.rb
 - projects/value/src/transformer.rb
 - projects/value/src/validator.rb
-- projects/version/lib/foobara/version.rb
-- projects/version/src/version.rb
 - projects/weak_object_set/lib/foobara/weak_object_set.rb
 - projects/weak_object_set/src/weak_object_set.rb
 homepage: https://github.com/foobara/foobara
@@ -390,7 +388,7 @@ metadata:
   source_code_uri: https://github.com/foobara/foobara
   changelog_uri: https://github.com/foobara/foobara/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - "./projects/builtin_types/lib"
@@ -417,7 +415,6 @@ require_paths:
 - "./projects/type_declarations/lib"
 - "./projects/types/lib"
 - "./projects/value/lib"
-- "./projects/version/lib"
 - "./projects/weak_object_set/lib"
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
@@ -431,7 +428,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Implements command pattern for encapsulating and managing domain complexity
   as well as many supporting libraries including entities.

data/projects/version/lib/foobara/version.rb

@@ -1,4 +0,0 @@
-module Foobara
-  module Version
-  end
-end

data/projects/version/src/version.rb

@@ -1,5 +0,0 @@
-module Foobara
-  module Version
-    VERSION = "0.0.2".freeze
-  end
-end