foobara-remote-imports 0.0.14 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13478ddf352d2b4ec575ec3a3575550f02fca154036570c5f6209a4c7860dc8d
-  data.tar.gz: e94e39347ed584ad1703ebb9ff835e9da594ac178a28d0d21156469576f8e93c
+  metadata.gz: 558b6612de0e763e884d28004f37f3f81af11800f331e7fda886884bb56c0464
+  data.tar.gz: 90a1e08d44ac3748b64f72b2d4a989373133f3c05413e6d7552dd46d468cfc53
 SHA512:
-  metadata.gz: 8774a942cb9ea0a768282883b6a3221e29005ca01c072ee4e7411264d2402c8ab012167f8e4b32c7dc292e8484d903d5c45361ce9db7561a8c223a073b5ecea5
-  data.tar.gz: 627a4df57f8eaa948728150c7615e851127f16076f3b23c7191af43a7a92289b0dbb3d02d188d0fc998077692dce7197e22f2cf326a7e1db1d3652517cc7711f
+  metadata.gz: 3ffd376884876fc2fc4d61f20f2a5c6267364b47e58d182e828b5aef87e0e9fb6b88c5a1d2082af30b573351cc6d9d0438820fd187d8bc0070be5028f6c6e004
+  data.tar.gz: 64b8821567a88171427344b43e208b251f30ff369c83cd495b220e916ad760c29aea5eac38035645327f0cdcd914fdefc8240985b52a0ec4a42929509ab1fdcf

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.2.0] - 2025-10-29
+
+- Support auth to get the manifest itself when needed
+- Strip entire path/query string from the manifest URL to get the API url base
+
+## [1.1.0] - 2025-08-22
+
+- Handle new Foobara 0.1.0 type declarations
+
 ## [0.0.14] - 2025-05-11
 
 - Fix bug that incorrectly leaves a model class anonymous if there's a custom type named "model"

data/src/foobara/remote_imports/import_base.rb

@@ -96,21 +96,31 @@ module Foobara
       end
 
       def load_manifest_from_url
-        url = URI.parse(manifest_url)
-        response = Net::HTTP.get_response(url)
-
-        manifest_json = if response.is_a?(Net::HTTPSuccess)
-                          response.body
-                        else
-                          # :nocov:
-                          raise "Could not get manifest from #{url}: " \
-                                "#{response.code} #{response.message}"
-                          # :nocov:
-                        end
+        uri = URI.parse(manifest_url)
+
+        net_http = Net::HTTP.new(uri.host, uri.port).tap do |http|
+          http.use_ssl = uri.scheme == "https"
+          http.read_timeout = ENV["FOOBARA_HTTP_MANIFEST_TIMEOUT"]&.to_i || 30
+        end
+
+        request = Net::HTTP::Get.new(uri.request_uri, load_manifest_headers)
+        response = net_http.request(request)
+
+        unless response.is_a?(Net::HTTPSuccess)
+          # :nocov:
+          raise "Could not get manifest from #{manifest_url}: " \
+                "#{response.code} #{response.message}"
+          # :nocov:
+        end
+        manifest_json = response.body
 
         JSON.parse(manifest_json)
       end
 
+      def load_manifest_headers
+        { "Content-Type" => "application/json" }
+      end
+
       # TODO: feels like a command smell to pass manifests here... reconsider algorithm
       def filter_manifests_to_import
         return if to_import.nil? || to_import.empty?

data/src/foobara/remote_imports/import_command.rb

@@ -13,10 +13,30 @@ module Foobara
         auth_header :tuple,
                     element_type_declarations: [:string, :duck],
                     description: "A header name, header value/proc pair."
+        manifest_requires_auth :boolean, default: false
       end
 
       depends_on ImportDomain, ImportType, ImportError
 
+      def load_manifest_headers
+        if manifest_requires_auth
+          key = auth_header.first
+          value = auth_header.last
+
+          if value.is_a?(Proc)
+            value = if value.lambda? && value.arity == 0
+                      value.call
+                    else
+                      value.call(self)
+                    end
+          end
+
+          super.merge(key => value)
+        else
+          super
+        end
+      end
+
       def find_manifests_to_import
         root_manifest.commands
       end
@@ -74,13 +94,30 @@ module Foobara
       end
 
       def build_command
-        url_base = root_manifest.metadata["url"].gsub(/\/manifest$/, "")
+        url_base = root_manifest.metadata["url"]
+        url_base = URI.parse(url_base)
+        url_base = URI::Generic.new(url_base.scheme, url_base.userinfo, url_base.host, url_base.port,
+                                    nil, nil, nil, nil, nil)
+        url_base = url_base.to_s
+
+        domain = Namespace.global.foobara_lookup_domain!(
+          manifest_to_import.domain.scoped_full_path,
+          mode: Namespace::LookupMode::ABSOLUTE_SINGLE_NAMESPACE
+        )
+
+        inputs_type = nil
+        result_type = nil
+
+        TypeDeclarations.strict_stringified do
+          inputs_type = domain.foobara_type_from_declaration(manifest_to_import.inputs_type.relevant_manifest)
+          result_type = domain.foobara_type_from_declaration(manifest_to_import.result_type.relevant_manifest)
+        end
 
         subclass_args = {
           url_base:,
           description: manifest_to_import.description,
-          inputs: manifest_to_import.inputs_type.relevant_manifest,
-          result: manifest_to_import.result_type.relevant_manifest,
+          inputs: inputs_type,
+          result: result_type,
           possible_errors: manifest_to_import.possible_errors,
           name: manifest_to_import.reference,
           base: determine_base_command_class

metadata

@@ -1,28 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: foobara-remote-imports
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 1.2.0
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-05-11 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.2.0
+    - - "<"
+      - !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.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.0.88
+        version: 2.0.0
 email:
 - azimux@gmail.com
 executables: []
@@ -65,7 +71,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: Used to import commands/entities/whatever from another system into this one.
 test_files: []