activeclient_api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136adb83dc2e9881ef2deabecd688079c746e6bc2edfd29ec8c26b0f79953d3d
-  data.tar.gz: ad6b0220ac12f88f6f43f1e358c2cbb534b218e4cc863b44ff8cc80cade8ecd0
+  metadata.gz: 17397df41df4b55d54dc885d93b74652be2794ba7c30f5eedd60a6fdbdae9cc1
+  data.tar.gz: 8e0b93cb879059aab94a144665d26120186f504c258cc6a1a85b108164235017
 SHA512:
-  metadata.gz: 4cabe61dfd8c9ce420cac6d40393a916cf4bb42033b4aa1245edb4f1251bec51a1ccd6bb6484400ffeddc95b3d40f4bf1a83409ee85c7947ac8925ad6e4348de
-  data.tar.gz: 8fe1b2cf922dc9f7505ecd19b00ed07ff63c0139525e97c85c2741b2414355394fa4807d1fe5f2ba527dc3cb89d91be4983a46d2f005de73e6a88a86e484bd33
+  metadata.gz: 35cd5177011d95834c3a2b567c7ac19173301d655a08e370583bf4a2427c0c7edb38d996436b05d960a753fb6b36b8ca7fd4c63c4d5a5cf0a6517156901123a3
+  data.tar.gz: 74932e172488e41b68dd297db60a4d195ee67565fec08623be329668cb0f1bb9ee3d295f53f57105b1c8b0ca14787f8a676f40cc12f069f1c80ecfa578c8eb32

data/lib/active_client/base.rb

@@ -1,6 +1,19 @@
 class ActiveClient::Base
   Response = Struct.new(:body, :success?)
 
+  def self.with_persistent_connection(&)
+    @http = Net::HTTP::Persistent.new name: "gemini"
+
+    yield
+
+    @http.shutdown
+    @http = nil
+  end
+
+  def self.http
+    @http
+  end
+
   def get(path, skip_parsing: false, **query)
     make_request(Net::HTTP::Get, path, skip_parsing:, query:)
   end
@@ -29,17 +42,24 @@ class ActiveClient::Base
 
     def instrument(klass:, path:, query:, body:)
       uri, http, request = construct_request(klass:, path:, query:)
-      request.body = default_body.merge(body).to_json if body.present?
+
+      set_body(request, body)
+
       loggable = loggable_uri(uri)
       args = { name: self.class.name.demodulize, uri: loggable }
 
       ActiveSupport::Notifications.
-        instrument("request.active_client", args) { yield http, request }
+        instrument("request.active_client", args) { yield uri, http, request }
     end
 
     def make_request(klass, path, skip_parsing: false, query: {}, body: {})
-      instrument(klass:, path:, query:, body:) do |http, request|
-        response = http.request(request)
+      instrument(klass:, path:, query:, body:) do |uri, http, request|
+        response =
+          if http.is_a?(Net::HTTP::Persistent)
+            http.request(uri, request)
+          else
+            http.request(request)
+          end
 
         Response.new(parse_response(response.body, skip_parsing),
                      response.is_a?(Net::HTTPSuccess))
@@ -57,11 +77,13 @@ class ActiveClient::Base
     def construct_request(klass:, path:, query:)
       uri = construct_uri(path:, query:)
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = uri.instance_of?(URI::HTTPS)
-      http.read_timeout = 1200
+      http =
+        self.class.http.presence || Net::HTTP.new(uri.host, uri.port).tap do
+          it.use_ssl = uri.instance_of?(URI::HTTPS)
+          it.read_timeout = 1200
+        end
 
-      [uri, http, klass.new(uri.request_uri, default_headers)]
+      [uri, http, klass.new(uri.request_uri, default_headers(klass))]
     end
 
     def construct_uri(path:, query:)
@@ -78,7 +100,7 @@ class ActiveClient::Base
       uri.query = URI.encode_www_form(default_query.merge(query))
     end
 
-    def default_headers
+    def default_headers(_klass)
       { "Accept" => "application/json",
         "Content-Type" => "application/json" }
     end
@@ -116,7 +138,7 @@ class ActiveClient::Base
       end
     end
 
-    def deep_inheritable_options(obj)
+    def deep_inheritable_options(obj) # rubocop:disable Metrics/MethodLength
       case obj
       when Hash
         inherited = ActiveSupport::InheritableOptions.new
@@ -130,4 +152,17 @@ class ActiveClient::Base
         obj
       end
     end
+
+    def set_body(request, body)
+      if body.present? &&
+        request["Content-Type"] == "application/x-www-form-urlencoded"
+        set_form_data(request, body)
+      elsif body.present?
+        request.body = default_body.merge(body).to_json
+      end
+    end
+
+    def set_form_data(request, body)
+      request.set_form_data(default_body.merge(body))
+    end
 end

data/lib/active_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveClient
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeclient_api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Pezza
@@ -9,6 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -56,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Basic client for make api classes
 test_files: []