foobara-http-api-command 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e260c28660b274db261a8cb7516ba3763ab534f7155b5f3dff42f6e14d735c2
-  data.tar.gz: 126c8c76cd2a14d54d5a3da3f44e79f2da110d253b8e7d387d002eb3b5c17e59
+  metadata.gz: 8b335997bb51113f94152e97d3c826f83e10a287fff2393f7cd74743e16b8646
+  data.tar.gz: dc639cf31c66346b20a3e0d644a6a0eff577620efbb370e714f2f71b231e0c8b
 SHA512:
-  metadata.gz: 1f5afa79b0cc20bbd8e1a056cac98e62e9490af23f085f3387a68f139eb30fc5ff31d24900ce249baa6910c7ad73dfd8e229aa7afcce9673c394dad4522cd77d
-  data.tar.gz: 2d892b329fa23240b6da945db808eac5f518d1a0cca1ff68f9be084d95e4fde0699bbbbb0529897bb9a6925ce6ec27faad40df4ebc986745671d067ead60d0ee
+  metadata.gz: 6d3fdd94f82b6acec6580ecfb880747257e1c942438925cdc53bebe42bc29536275302f2e25ff93741e197069dda9a8d51236b4a1ceb09b3c170fafdc0b93788
+  data.tar.gz: 98210d758a2d47d469594310789ddd919f7244fd5948d03e9a6ecd7067a07b0aa787052a4cb5c803d51086a408a9586f27a201324810dcd8bcf95f77b891c4e3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.0.8] - 2025-03-02
+
+- Fix bug caused by reusing Net::HTTP objects for ssl connections
+
+## [0.0.7] - 2025-02-27
+
+- Add http_timeout option
+- Bump Ruby to 3.4.2
+
 ## [0.0.6] - 2025-02-17
 
 - Support separate base_url and path helpers

data/src/foobara/concerns/url.rb

@@ -4,16 +4,29 @@ module Foobara
       module Url
         include Concern
 
+        def net_http
+          # unclear why, but, seems like if we're doing SSL we have to be single-use, hmmm...
+          return @net_http if @net_http && !@net_http.use_ssl?
+
+          @net_http ||= self.class.compute_http(self)
+        end
+
         def api_url
           @api_url ||= self.class.compute_api_url(self)
         end
 
+        def api_uri_object
+          @api_uri_object ||= self.class.compute_uri_object(self)
+        end
+
         inherited_overridable_class_attr_accessor :foobara_base_url_block,
                                                   :foobara_base_url,
                                                   :foobara_path,
+                                                  :foobara_path_block,
                                                   :foobara_url_block,
                                                   :foobara_url,
-                                                  :foobara_http_method
+                                                  :foobara_http_method,
+                                                  :foobara_http_timeout
 
         module ClassMethods
           def http_method(method = nil)
@@ -42,9 +55,21 @@ module Foobara
             end
           end
 
-          def path(path = nil)
-            if path
+          def path(path = nil, &block)
+            if block_given?
+              unless path.nil?
+                # :nocov:
+                raise ArgumentError, "Cannot specify both path and block"
+                # :nocov:
+              end
+
+              self.foobara_path_block = block
+            elsif path
               self.foobara_path = path
+            else
+              # :nocov:
+              raise ArgumentError, "No path specified"
+              # :nocov:
             end
           end
 
@@ -66,29 +91,79 @@ module Foobara
             end
           end
 
-          def compute_api_url(command)
-            if foobara_url
-              foobara_url
-            elsif foobara_url_block
-              command.instance_eval(&foobara_url_block)
-            elsif foobara_path
-              base = if foobara_base_url
-                       foobara_base_url
-                     elsif foobara_base_url_block
-                       command.instance_eval(&foobara_base_url_block)
-                     else
-                       # :nocov:
-                       raise "Not able to determine the api url. Did you remember to call .url or .path and .base_url?"
-                       # :nocov:
-                     end
-
-              "#{base}#{foobara_path}"
+          def http_timeout(timeout = nil)
+            if timeout
+              self.foobara_http_timeout = timeout
             else
-              # :nocov:
-              raise "Not able to determine the api url. Did you remember to call .url or .path and .base_url?"
-              # :nocov:
+              foobara_http_timeout
             end
           end
+
+          def compute_uri_object(command)
+            return @compute_uri_object if @compute_uri_object
+
+            uri = URI(compute_api_url(command))
+
+            unless foobara_base_url_block || foobara_path_block || foobara_url_block
+              @compute_uri_object = uri
+            end
+
+            uri
+          end
+
+          def compute_api_url(command)
+            return @compute_api_url if @compute_api_url
+
+            url = if foobara_url
+                    foobara_url
+                  elsif foobara_url_block
+                    command.instance_eval(&foobara_url_block)
+                  else
+                    path = if foobara_path
+                             foobara_path
+                           elsif foobara_path_block
+                             command.instance_eval(&foobara_path_block)
+                           end
+
+                    base = if foobara_base_url
+                             foobara_base_url
+                           elsif foobara_base_url_block
+                             command.instance_eval(&foobara_base_url_block)
+                           else
+                             # :nocov:
+                             raise "Not able to determine the api url. " \
+                                   "Did you remember to call .url or .path and .base_url?"
+                             # :nocov:
+                           end
+
+                    "#{base}#{path}"
+                  end
+
+            unless foobara_base_url_block || foobara_path_block || foobara_url_block
+              @compute_api_url = url
+            end
+
+            url
+          end
+
+          def compute_http(command)
+            # unclear why, but, seems like if we're doing SSL we have to be single-use, hmmm...
+            return @net_http if @net_http && !@net_http.use_ssl?
+
+            uri = URI(command.api_url)
+            computed_http = Net::HTTP.new(uri.host, uri.port).tap do |http|
+              http.use_ssl = uri.scheme == "https"
+              if http_timeout
+                http.read_timeout = http_timeout
+              end
+            end
+
+            unless foobara_base_url_block || foobara_path_block || foobara_url_block
+              @net_http = computed_http
+            end
+
+            computed_http
+          end
         end
       end
     end

data/src/foobara/http_api_command.rb

@@ -27,19 +27,28 @@ module Foobara
     end
 
     def issue_http_request
-      case self.class.http_method
-      when :get
-        uri = URI(api_url)
-        uri.query = URI.encode_www_form(request_body)
-        self.response = Net::HTTP.get_response(uri, request_headers)
-      when :post
-        uri = URI.parse(api_url)
-        self.response = Net::HTTP.post(uri, JSON.generate(request_body), request_headers)
-      else
-        # :nocov:
-        raise "Unknown http method #{self.class.http_method}"
-        # :nocov:
-      end
+      request = case self.class.http_method
+                when :get
+                  uri = if request_body.empty?
+                          api_uri_object
+                        else
+                          api_uri_object.dup.tap do |new_uri|
+                            new_uri.query = URI.encode_www_form(request_body)
+                          end
+                        end
+
+                  Net::HTTP::Get.new(uri.request_uri, request_headers)
+                when :post
+                  Net::HTTP::Post.new(api_uri_object.request_uri, request_headers).tap do |post|
+                    post.body = JSON.generate(request_body)
+                  end
+                else
+                  # :nocov:
+                  raise "Unknown http method #{self.class.http_method}"
+                  # :nocov:
+                end
+
+      self.response = net_http.request(request)
     end
 
     def build_result

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: foobara-http-api-command
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Miles Georgi
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foobara