foobara-http-command-connector 0.0.25 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88dbdfc89d4069572fddd99686602ba6397997f6c783436dfd95b105a615034b
-  data.tar.gz: 0cadfc7c58c3d52c7a8fdecd1e2f6bc7ba8fb6f513dd835ed1e93786090aafaf
+  metadata.gz: 36ab57af0c0d65f450500790ed68ba268c1bd5862fbaec71cfb83f4a00fc514a
+  data.tar.gz: 93cbb5d98e08155a605be8481a3dd9a092d051e4b7d642b0df13af65d9c5f489
 SHA512:
-  metadata.gz: a38d412897c87218f0941b0df609f98481766557fa8182766d8ba704b93c2fc15d79bf71104a90e5a2ffcae99c4c845cc4171af19645ffdbdad38bf44bf05232
-  data.tar.gz: 72c53f3b1fa770643c09a8755818e8b54619ebea9b6a2b2172790d73228f6bb33009b3b19aaafbe4ebcd3f819b944ca7aa82dcbee7d11393f06922991f7c2240
+  metadata.gz: '09d292eba68a1d214d65035c8df665b69aadfdfaf9aeb4964d9d9941e4b3aedc35bacf8a86b28ee5691b9578a853e65b7ee32fcfd1937a37063d976c3b87e541'
+  data.tar.gz: 8ad52d666aefd12f21bc71f52f7a1639c4d7c63700e18f8c1a9f015f93d42bf1ebf73948f603d90f10afdca204e7f686a92bf99afb19a9368ddde5bec7b06e97

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.1.0] - 2025-08-22
+
+- Handle new Foobara 0.1.0 type declarations
+
+## [0.0.26] - 2025-05-03
+
+- Deal with CommandConnector interface changes
+
 ## [0.0.25] - 2025-05-01
 
 - Add SetInputToProcResult request transformer

data/src/http/commands/help/presenter.rb

@@ -125,18 +125,24 @@ module Foobara
                 html << render_html_list({ element_type: data.element_type }, skip_wrapper: true)
                 html << "</ul>" unless skip_wrapper
               when Manifest::TypeDeclaration
-                html << "<ul>" unless skip_wrapper
-                data.relevant_manifest.each_pair do |key, value|
-                  if key.to_s == "type"
-                    value = root_manifest.lookup_path(key, value)
+                manifest = data.relevant_manifest
+
+                if manifest.is_a?(::Symbol)
+                  html << foobara_reference_link(data.to_type)
+                else
+                  html << "<ul>" unless skip_wrapper
+                  data.relevant_manifest.each_pair do |key, value|
+                    if key.to_s == "type"
+                      value = root_manifest.lookup_path(key, value)
+                    end
+                    html << "<li>#{key}"
+                    html << "<ul>"
+                    html << render_html_list(value, skip_wrapper: true)
+                    html << "</ul>"
+                    html << "</li>"
                   end
-                  html << "<li>#{key}"
-                  html << "<ul>"
-                  html << render_html_list(value, skip_wrapper: true)
-                  html << "</ul>"
-                  html << "</li>"
+                  html << "</ul>" unless skip_wrapper
                 end
-                html << "</ul>" unless skip_wrapper
               when Manifest::Type, Manifest::Command, Manifest::Error
                 html << foobara_reference_link(data)
               when Manifest::PossibleError

data/src/http/commands/help.rb

@@ -31,21 +31,13 @@ module Foobara
 
               if result
                 self.object_to_help_with = result
+              elsif mode == Namespace::LookupMode::ABSOLUTE
+                determine_object_to_help_with(mode: Namespace::LookupMode::GENERAL)
+              elsif mode == Namespace::LookupMode::GENERAL
+                determine_object_to_help_with(mode: Namespace::LookupMode::RELAXED)
               else
-                # TODO: we should look up from the command connector's namespace instead, right?
-                result = GlobalOrganization.foobara_lookup(arg, mode:)
-
-                if result && root_manifest.contains?(result.foobara_manifest_reference,
-                                                     result.scoped_category)
-                  self.object_to_help_with = result
-                elsif mode == Namespace::LookupMode::ABSOLUTE
-                  determine_object_to_help_with(mode: Namespace::LookupMode::GENERAL)
-                elsif mode == Namespace::LookupMode::GENERAL
-                  determine_object_to_help_with(mode: Namespace::LookupMode::RELAXED)
-                else
-                  # TODO: add an input error instead for missing record to trigger 404
-                  add_runtime_error(CommandConnector::NotFoundError.for(arg))
-                end
+                # TODO: add an input error instead for missing record to trigger 404
+                add_runtime_error(CommandConnector::NotFoundError.for(arg))
               end
             else
               self.object_to_help_with = root_manifest

data/src/http/cookie.rb

@@ -4,7 +4,7 @@ module Foobara
       class Cookie
         attr_accessor :name, :value, :opts
 
-        ALLOWED_OPTIONS = %i[path httponly secure same_site domain expires max_age].freeze
+        ALLOWED_OPTIONS = [:path, :httponly, :secure, :same_site, :domain, :expires, :max_age].freeze
 
         def initialize(name, value, **opts)
           invalid_options = opts.keys - ALLOWED_OPTIONS

data/src/http/request.rb

@@ -113,14 +113,6 @@ module Foobara
                                path
                              end
         end
-
-        def set_response_header(name, value)
-          name = name.to_s
-          name = name.downcase
-
-          self.response_headers ||= {}
-          self.response_headers = response_headers.merge(name => value)
-        end
       end
     end
   end

data/src/http/request_mutators/set_input_to_proc_result.rb

@@ -24,6 +24,10 @@ module Foobara
           Domain.current.foobara_type_from_declaration(new_declaration)
         end
 
+        def applicable?(_request)
+          true
+        end
+
         def mutate(request)
           request.inputs[attribute_name] = request.instance_exec(&input_value_proc)
         end

data/src/http.rb

@@ -58,24 +58,28 @@ module Foobara
         super(*, prefix:, **)
       end
 
-      def request_to_command(request)
+      def request_to_command_class(request)
         if request.method == "OPTIONS"
-          return Foobara::CommandConnectors::Http::Commands::GetOptions.new(request:)
+          Foobara::CommandConnectors::Http::Commands::GetOptions
+        else
+          super.tap do |command_class|
+            if request.action == "help"
+              command_class.serializers = [Commands::Help::ResultSerializer]
+            end
+          end
         end
+      end
 
-        command = super
-
-        if request.action == "help"
-          request.set_response_header("content-type", "text/html")
-          command.class.serializers = [Commands::Help::ResultSerializer]
+      def request_to_command_inputs(request)
+        if request.method == "OPTIONS"
+          { request: }
+        else
+          super
         end
-
-        command
       end
 
       def set_response_status(response)
-        command = response.command
-        outcome = command.outcome
+        outcome = response.outcome
 
         response.status = if outcome.success?
                             200
@@ -124,6 +128,10 @@ module Foobara
           end
         end
 
+        if request.action == "help"
+          response_headers = (response_headers || {}).merge("content-type" => "text/html")
+        end
+
         if response_headers
           static_headers.merge(response_headers)
         else
@@ -135,10 +143,10 @@ module Foobara
 
       def static_headers
         @static_headers ||= ENV.each_with_object({}) do |(key, value), headers|
-          next if %w[
-            FOOBARA_HTTP_RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_HEADERS
-            FOOBARA_HTTP_RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_METHODS
-            FOOBARA_HTTP_RESPONSE_HEADER_ACCESS_CONTROL_MAX_AGE
+          next if [
+            "FOOBARA_HTTP_RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_HEADERS",
+            "FOOBARA_HTTP_RESPONSE_HEADER_ACCESS_CONTROL_ALLOW_METHODS",
+            "FOOBARA_HTTP_RESPONSE_HEADER_ACCESS_CONTROL_MAX_AGE"
           ].include?(key)
 
           match = key.match(/\AFOOBARA_HTTP_RESPONSE_HEADER_(.*)\z/)

metadata

@@ -1,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: foobara-http-command-connector
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 1.1.0
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.88
+        version: 0.1.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.88
+        version: 2.0.0
 email:
 - azimux@gmail.com
 executables: []
@@ -95,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: No description. Add one.
 test_files: []