og_pilot_ruby 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c13264ba768430bb4aba5a662b4957fe73c01a87ac5ba953897b35335686ab3
-  data.tar.gz: 699f6f44f60db4eb9afb36a1eb17e6be4d3c80d8acabe0868140be522866d700
+  metadata.gz: 8c58555c3ed39eb0b1bd4948ef10c79492111730917b25ba1d30455079447917
+  data.tar.gz: 12b44e9f843610011c42a308a2907449c30598f413aa3a1edc8fa3a3c73b653f
 SHA512:
-  metadata.gz: dd5ab6d159c8a38f0e1d89742e0112bdc258f3b16f1a770ac5427d0524a1082db68b92658b8be5666f43642092dbfb2a19b5e655b913c1ab29900c41bd229288
-  data.tar.gz: fdf1e6bb75fef728a3422f6ce47326744c8b8052ec53723df1cfe19a32ba6b140b433096f3f55858ed13a1b28bd69471e81db0da6b725410084f8dc09766f363
+  metadata.gz: 9f99983ecc6ee9de233d087ca93ea3b82f84a7f89c1d5aa75d79c8dbe1aa4bd7ad312cf752ed8f614af04e445028e84c4a8b8969836dd9bb3a51f6d8d6f6feb1
+  data.tar.gz: cc38075c320be5bfda43e9d1d0d957ecb8a67564908e56e6b04c5d003ff04cc3098f9b91b11ccda2f43bd37483dc2715ac7c7d58b03c7efd16113bdc80ad000f

data/lib/og_pilot_ruby/client.rb

@@ -10,6 +10,7 @@ require_relative "jwt_encoder"
 module OgPilotRuby
   class Client
     ENDPOINT_PATH = "/api/v1/images"
+    MAX_REDIRECTS = 5
 
     def initialize(config)
       @config = config
@@ -24,12 +25,12 @@ module OgPilotRuby
       params[:path] = manual_path.to_s.strip.empty? ? resolved_path(default:) : normalize_path(manual_path)
 
       uri = build_uri(params, iat:)
-      response = request(uri, json:, headers:)
+      response, final_uri = request(uri, json:, headers:)
 
       if json
         JSON.parse(response.body)
       else
-        response["Location"] || uri.to_s
+        response["Location"] || final_uri.to_s
       end
     end
 
@@ -37,18 +38,35 @@ module OgPilotRuby
 
       attr_reader :config
 
-      def request(uri, json:, headers:)
+      def request(uri, json:, headers:, method: :post, redirects_left: MAX_REDIRECTS)
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = uri.scheme == "https"
         http.open_timeout = config.open_timeout if config.open_timeout
         http.read_timeout = config.read_timeout if config.read_timeout
 
-        request = Net::HTTP::Post.new(uri)
+        request = build_http_request(method, uri)
         request["Accept"] = "application/json" if json
         headers.each { |key, value| request[key] = value }
 
         response = http.request(request)
-        return response unless response.is_a?(Net::HTTPClientError) || response.is_a?(Net::HTTPServerError)
+        if response.is_a?(Net::HTTPRedirection)
+          location = response["Location"]
+          if location && !location.empty?
+            raise OgPilotRuby::RequestError, "OG Pilot request failed with too many redirects" if redirects_left <= 0
+
+            redirect_uri = URI.join(uri.to_s, location)
+            redirect_method = redirect_method_for(response, method)
+            return request(
+              redirect_uri,
+              json:,
+              headers:,
+              method: redirect_method,
+              redirects_left: redirects_left - 1
+            )
+          end
+        end
+
+        return [response, uri] unless response.is_a?(Net::HTTPClientError) || response.is_a?(Net::HTTPServerError)
 
         raise OgPilotRuby::RequestError, "OG Pilot request failed with status #{response.code}: #{response.body}"
       rescue OpenSSL::SSL::SSLError => e
@@ -63,6 +81,24 @@ module OgPilotRuby
         raise OgPilotRuby::RequestError, "OG Pilot request failed with unauthorized: #{e.message}"
       end
 
+      def build_http_request(method, uri)
+        case method
+        when :post
+          Net::HTTP::Post.new(uri)
+        when :get
+          Net::HTTP::Get.new(uri)
+        else
+          raise ArgumentError, "Unsupported HTTP method: #{method.inspect}"
+        end
+      end
+
+      def redirect_method_for(response, current_method)
+        return current_method unless current_method == :post
+
+        status_code = response.code.to_i
+        [307, 308].include?(status_code) ? :post : :get
+      end
+
       def build_uri(params, iat:)
         payload = build_payload(params, iat:)
         token = OgPilotRuby::JwtEncoder.encode(payload, api_key!)

data/lib/og_pilot_ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OgPilotRuby
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: og_pilot_ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sunergos IT LLC
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Ruby client for the OG Pilot Open Graph image generator.
 test_files: []