foobara-remote-imports 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc711d9de1d42988b5b7dc5728c209d9799824cb29af45e9de02249bf4ad043a
-  data.tar.gz: 1acb351deca1c088a1b42cf71a53529163ae99b67ff2f3711af5fa6f7327c055
+  metadata.gz: 558b6612de0e763e884d28004f37f3f81af11800f331e7fda886884bb56c0464
+  data.tar.gz: 90a1e08d44ac3748b64f72b2d4a989373133f3c05413e6d7552dd46d468cfc53
 SHA512:
-  metadata.gz: 8f0f8fe372ce418207057f4e011c9b3aba7c76d3c9b770a0c49685920e0c51f086d870f2491f4cdb9c083185d21e88e3f395d3c0089953f3e60017ceb7ec232f
-  data.tar.gz: 7d15054b7ef96c7ba295cb02a32ee7b5362e58409e60550f376f6849e245cd4d1e6386453853ed050f411f3673d79622569679b976e8284384e514e1dcb82921
+  metadata.gz: 3ffd376884876fc2fc4d61f20f2a5c6267364b47e58d182e828b5aef87e0e9fb6b88c5a1d2082af30b573351cc6d9d0438820fd187d8bc0070be5028f6c6e004
+  data.tar.gz: 64b8821567a88171427344b43e208b251f30ff369c83cd495b220e916ad760c29aea5eac38035645327f0cdcd914fdefc8240985b52a0ec4a42929509ab1fdcf

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [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

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,7 +94,11 @@ 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,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foobara-remote-imports
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Miles Georgi
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0