foobara-remote-imports 1.1.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc711d9de1d42988b5b7dc5728c209d9799824cb29af45e9de02249bf4ad043a
-  data.tar.gz: 1acb351deca1c088a1b42cf71a53529163ae99b67ff2f3711af5fa6f7327c055
+  metadata.gz: f1748c91e76bfd28962f68cad11973d9e1b2a84a3f1c4910fadf43b121172db6
+  data.tar.gz: 75ae2b5d402baf94d46b51459958da14e1fd00136c4d3fd240a10ed4e9f447d0
 SHA512:
-  metadata.gz: 8f0f8fe372ce418207057f4e011c9b3aba7c76d3c9b770a0c49685920e0c51f086d870f2491f4cdb9c083185d21e88e3f395d3c0089953f3e60017ceb7ec232f
-  data.tar.gz: 7d15054b7ef96c7ba295cb02a32ee7b5362e58409e60550f376f6849e245cd4d1e6386453853ed050f411f3673d79622569679b976e8284384e514e1dcb82921
+  metadata.gz: 4ab8e8a5de0cf0557efabb6a1594659b35a51562db6cc51a719884c5211894833da24f2269967cc7b976aaba08b1cc9ed09c36fabd98eab8cb1a4699ce324130
+  data.tar.gz: 6e3753e48e483d6a36974275f8522de03bfb729f660f8fa17d2ecb5816efa376ed474e0d00b2bb15cdad5eed8e12bb16230092c913da5cf851398b276f3c2721

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [1.2.1] - 2026-10-10
+
+- Fix an annoying deprecation warning
+
+## [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/authenticated_remote_command.rb

@@ -5,8 +5,8 @@ module Foobara
     class << self
       attr_accessor :auth_header_name, :auth_header_value
 
-      def subclass(auth_header:, **opts)
-        super(base: AuthenticatedRemoteCommand, **opts).tap do |klass|
+      def subclass(auth_header:, **)
+        super(base: AuthenticatedRemoteCommand, **).tap do |klass|
           klass.auth_header_name = auth_header[0]
           klass.auth_header_value = auth_header[1]
         end

data/src/foobara/remote_command.rb

@@ -58,9 +58,9 @@ module Foobara
     def cast_and_validate_inputs
       @inputs = if inputs_type.nil? && (raw_inputs.nil? || raw_inputs.empty?)
                   # TODO: test this path
-                  # :nocov:
+                  # simplecov:disable
                   {}
-                  # :nocov:
+                  # simplecov:enable
                 else
                   serializer_class = CommandConnectors::Serializers::EntitiesToPrimaryKeysSerializer
                   serializer = serializer_class.new(detached_to_primary_key: true)
@@ -138,17 +138,17 @@ module Foobara
               path: error["path"]
             )
           else
-            # :nocov:
+            # simplecov:disable
             raise "Bad error category: #{error["category"]}"
-            # :nocov:
+            # simplecov:enable
           end
         end
 
         halt!
       else
-        # :nocov:
+        # simplecov:disable
         raise UnexpectedError, "#{response.code} from #{url}: #{response.body}"
-        # :nocov:
+        # simplecov:enable
       end
     end
   end

data/src/foobara/remote_imports/already_imported.rb

@@ -10,7 +10,7 @@ module Foobara
       end
 
       def to_key(manifest)
-        [manifest.path.first.to_sym, manifest.reference.to_sym]
+        [manifest.manifest_path.first.to_sym, manifest.reference.to_sym]
       end
 
       def already_imported?(manifest)

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)
+          # simplecov:disable
+          raise "Could not get manifest from #{manifest_url}: " \
+                "#{response.code} #{response.message}"
+          # simplecov:enable
+        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?
@@ -185,9 +195,9 @@ module Foobara
       end
 
       def find_manifests_to_import
-        # :nocov:
+        # simplecov:disable
         raise "subclass responsibility"
-        # :nocov:
+        # simplecov:enable
       end
 
       def import_objects_from_manifests
@@ -204,9 +214,9 @@ module Foobara
       end
 
       def import_object_from_manifest
-        # :nocov:
+        # simplecov:disable
         raise "subclass responsibility"
-        # :nocov:
+        # simplecov:enable
       end
 
       def imported_objects

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,

data/src/foobara/remote_imports/import_error.rb

@@ -44,9 +44,9 @@ module Foobara
         base_error = if base_error_name
                        Foobara.foobara_root_namespace.foobara_lookup_error!(base_error_name)
                      else
-                       # :nocov:
+                       # simplecov:disable
                        Foobara::Error
-                       # :nocov:
+                       # simplecov:enable
                      end
 
         Foobara::Error.subclass(

data/src/foobara/remote_imports/import_type.rb

@@ -72,9 +72,9 @@ module Foobara
 
           model_base_class = declaration_data["model_base_class"]
           unless model_base_class == "Foobara::Entity"
-            # :nocov:
+            # simplecov:disable
             raise "Expected model base class to be Foobara::Entity, but was #{model_base_class}"
-            # :nocov:
+            # simplecov:enable
           end
 
           declaration_data["model_base_class"] = "Foobara::DetachedEntity"

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.1
 platform: ruby
 authors:
 - Miles Georgi
@@ -15,7 +15,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.7.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -25,7 +25,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.7.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.20
 specification_version: 4
 summary: Used to import commands/entities/whatever from another system into this one.
 test_files: []