httpi 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b488ad4ac7b6d32a313798d387be88d00976ffe2533a1413836bd7e102cfda83
-  data.tar.gz: f555c552fbdfa36b727c75e5bf2b3a9a19559098145ce3f969c94f250380b185
+  metadata.gz: cd06f829b3d33418dfe3ef465949f504f6acde0e9f5988edea9615e700bb8f23
+  data.tar.gz: '00197cf31c50d34768c76325d42cc8dc325774ffe5a2ecaf6feb33f7d22c382c'
 SHA512:
-  metadata.gz: fccd5e6e95668a6b49e440eee050a2e8f7e456434e6a973bd2cc8d54c97854c1961fc5e941456ff6e3a4356a03bb6b8a7aad023fd7b8d74f0d73a2e1a18fd682
-  data.tar.gz: 825d197e0ccb00ba983aba28a40cb6c0f1789bc6ae9cb3ba82363548330fd66609c5c4e904285038d67de6c95850f1ccaca3901f7698b7317657e754f1035f7d
+  metadata.gz: 81a2a86d8a7784711c0a72995a21262c7bcdfb17d9127a06a9573c50f7eaffde7e544c07b332e905da3fb1b177d867d34c2b59a75f0605182a6d278db9eda4a6
+  data.tar.gz: e59a0468efe743db6a4b4d7eff007714cb739e928396b7ff8797896a346e7808a2635185ccf1a9eb53db64d149626782a4f3dc530f3e9644c21923ce6a4a0f3d

data/.devcontainer/devcontainer.json

@@ -0,0 +1,22 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/ruby
+{
+	"name": "Ruby",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/ruby:1-3.2-bullseye"
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "ruby --version",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

data/.github/workflows/development.yml

@@ -14,9 +14,10 @@ jobs:
           - ubuntu
         
         ruby:
-          - "2.6"
-          - "2.7"
           - "3.0"
+          - "3.1"
+          - "3.2"
+          - "3.3"
         
         experimental: [false]
         env: [""]
@@ -33,7 +34,7 @@ jobs:
             experimental: true
     
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     
     - name: Install dependencies
       run: sudo apt-get install libcurl4-openssl-dev

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### Unreleased
+
+* Improvement: [#237](https://github.com/savonrb/httpi/pull/237) Implemented `adapter_client_setup`.
+
+### 3.0.2 (2024-02-10)
+
+* Add support for ruby 3.1, 3.2, 3.3. Drop support for ruby 2.7 and below.
+
+### 3.0.1 (2021-12-17)
+
+* Fix: [#230](https://github.com/savonrb/httpi/pull/230) Make rack a runtime dependency.
+
 ### 3.0.0 (2021-10-19)
 
 * Improvement: [#225](https://github.com/savonrb/httpi/pull/225) Make rack and socksify dependencies optional.

data/Gemfile

@@ -10,12 +10,12 @@ gem 'httpclient',          '~> 2.3',    :require => false
 gem 'curb',                '~> 0.8',    :require => false, :platforms => [:ruby]
 gem 'em-http-request',                  :require => false, :platforms => [:ruby]
 gem 'em-synchrony',                     :require => false, :platforms => [:ruby, :jruby]
-gem 'excon',               '~> 0.21',   :require => false, :platforms => [:ruby, :jruby]
+gem 'excon',               '~> 0.71',   :require => false, :platforms => [:ruby, :jruby]
 gem 'net-http-persistent', '~> 4.0',    :require => false
 gem 'http',                             :require => false
 
 # adapter extensions
-gem 'rack'
+gem 'rack', '< 3'
 gem 'socksify'
 
 # coverage

data/README.md

@@ -2,8 +2,7 @@
 
 A common interface for Ruby's HTTP libraries.
 
-[Documentation](https://www.rubydoc.info/gems/httpi) |
-[Mailing list](https://groups.google.com/forum/#!forum/httpirb)
+[Documentation](https://www.rubydoc.info/gems/httpi)
 
 [![Development](https://github.com/savonrb/httpi/actions/workflows/development.yml/badge.svg)](https://github.com/savonrb/httpi/actions/workflows/development.yml)
 
@@ -39,10 +38,6 @@ HTTPI.adapter = :httpclient
 HTTPI.request(:custom, request)
 ```
 
-### Rack Mock Adapter
-
-To use the Rack mock adapter, please add the `rack` gem to your gemfile.
-
 ### SOCKS Proxy Support
 
 To use the the SOCKS proxy support, please add the `socksify` gem to your gemfile, and add the following code:

data/httpi.gemspec

@@ -8,14 +8,24 @@ Gem::Specification.new do |s|
   s.version     = HTTPI::VERSION
   s.authors     = ['Daniel Harrington', 'Martin Tepper']
   s.email       = 'me@rubiii.com'
-  s.homepage    = "http://github.com/savonrb/#{s.name}"
+  s.homepage    = "https://github.com/savonrb/httpi"
   s.summary     = "Common interface for Ruby's HTTP libraries"
   s.description = s.summary
+  s.metadata    = { 'bug_tracker_uri' => 'https://github.com/savonrb/httpi/issues',
+                    'changelog_uri' => 'https://github.com/savonrb/httpi/blob/master/CHANGELOG.md',
+                    'source_code_uri' => s.homepage,
+                    'wiki_uri' => 'https://github.com/savonrb/httpi/wiki',
+                    'documentation_uri' => 'https://www.rubydoc.info/gems/httpi' }
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 3.0'
 
   s.license = 'MIT'
 
+  s.add_dependency 'rack', '< 3'
+  s.add_dependency 'nkf'
+  s.add_dependency 'base64'
+  s.add_dependency 'mutex_m'
+
   s.add_development_dependency 'rubyntlm', '~> 0.3.2'
   s.add_development_dependency 'rake',     '~> 13.0'
   s.add_development_dependency 'rspec',    '~> 3.5'
@@ -23,6 +33,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'puma',     '~> 5.0'
   s.add_development_dependency 'webmock'
 
+  s.metadata["rubygems_mfa_required"] = "true"
+
   s.files = `git ls-files`.split("\n")
   s.require_path = 'lib'
 end

data/lib/httpi/adapter.rb

@@ -34,6 +34,8 @@ module HTTPI
         @adapter ||= default_adapter
       end
 
+      attr_accessor :client_setup_block
+
       def identify(adapter_class)
         ADAPTER_CLASS_MAP[adapter_class]
       end

data/lib/httpi/version.rb

@@ -1,3 +1,3 @@
 module HTTPI
-  VERSION = '3.0.0'
+  VERSION = '3.0.2'
 end

data/lib/httpi.rb

@@ -154,7 +154,8 @@ module HTTPI
     # Executes an HTTP request for the given +method+.
     def request(method, request, adapter = nil, redirects = 0)
       adapter_class = load_adapter(adapter, request)
-
+      
+      Adapter.client_setup_block.call(adapter_class.client) if Adapter.client_setup_block
       yield adapter_class.client if block_given?
       log_request(method, request, Adapter.identify(adapter_class.class))
 
@@ -174,6 +175,10 @@ module HTTPI
       Adapter.use = adapter
     end
 
+    def adapter_client_setup=(block)
+      Adapter.client_setup_block = block
+    end
+
     private
 
     def request_and_adapter_from(args)

data/spec/httpi/adapter/httpclient_spec.rb

@@ -215,7 +215,8 @@ describe HTTPI::Adapter::HTTPClient do
     end
   end
 
-  it "supports NTLM authentication" do
+  # TODO: ntlm_openssl3 https://github.com/WinRb/rubyntlm/issues/57
+  xit "supports NTLM authentication" do
     request = HTTPI::Request.new(@server.url + "ntlm-auth")
 
     request.auth.ntlm("tester", "vReqSoafRe5O")

data/spec/httpi/httpi_spec.rb

@@ -33,6 +33,18 @@ describe HTTPI do
     end
   end
 
+  describe ".adapter_client_setup=" do
+    after do
+      HTTPI.adapter_client_setup = nil
+    end
+
+    it "sets the adapter client setup block" do
+      block = proc { }
+      HTTPI.adapter_client_setup = block
+      expect(HTTPI::Adapter.client_setup_block).to eq(block)
+    end
+  end
+
   describe ".query_builder" do
     it "gets flat builder by default" do
       expect(client.query_builder).to eq(HTTPI::QueryBuilder::Flat)
@@ -281,6 +293,18 @@ describe HTTPI do
 
       client.request(:custom, request, :httpclient)
     end
+
+    describe "client setup block present" do
+      around do |example|
+        HTTPI::Adapter.client_setup_block = proc { |client| client.base_url = 'https://google.com'  }
+        example.run
+        HTTPI::Adapter.client_setup_block = nil
+      end
+
+      it 'calls client setup block' do
+        client.request(:get, request, :httpclient) { |client| expect(client.base_url).to eq('https://google.com') }
+      end
+    end
   end
 
   HTTPI::REQUEST_METHODS.each do |method|

data/spec/integration/net_http_spec.rb

@@ -138,7 +138,8 @@ describe HTTPI::Adapter::NetHTTP do
         to raise_error(HTTPI::NotSupportedError, /does not support HTTP digest authentication/)
     end
 
-    it "supports ntlm authentication" do
+    # TODO: ntlm_openssl3 https://github.com/WinRb/rubyntlm/issues/57
+    xit "supports ntlm authentication" do
       request = HTTPI::Request.new(@server.url + "ntlm-auth")
       request.auth.ntlm("tester", "vReqSoafRe5O")
 
@@ -166,7 +167,8 @@ describe HTTPI::Adapter::NetHTTP do
       HTTPI::Adapter::NetHTTP.any_instance.unstub(:check_net_ntlm_version!)
     end
 
-    it "does check ntlm when ntlm authentication is requested" do
+    # TODO: ntlm_openssl3 https://github.com/WinRb/rubyntlm/issues/57
+    xit "does check ntlm when ntlm authentication is requested" do
       request = HTTPI::Request.new(@server.url + "ntlm-auth")
       request.auth.ntlm("tester", "vReqSoafRe5O")
 
@@ -183,7 +185,8 @@ describe HTTPI::Adapter::NetHTTP do
       HTTPI::Adapter::NetHTTP.any_instance.unstub(:ntlm_version)
     end
 
-    it "does not crash when authenticate header is missing (on second request)" do
+    # TODO: ntlm_openssl3 https://github.com/WinRb/rubyntlm/issues/57
+    xit "does not crash when authenticate header is missing (on second request)" do
       request = HTTPI::Request.new(@server.url + "ntlm-auth")
       request.auth.ntlm("tester", "vReqSoafRe5O")
 

metadata

@@ -1,16 +1,72 @@
 --- !ruby/object:Gem::Specification
 name: httpi
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Daniel Harrington
 - Martin Tepper
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-18 00:00:00.000000000 Z
+date: 2024-02-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: nkf
+  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: base64
+  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: mutex_m
+  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: rubyntlm
   requirement: !ruby/object:Gem::Requirement
@@ -101,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/devcontainer.json"
 - ".github/workflows/development.yml"
 - ".gitignore"
 - ".rspec"
@@ -173,11 +230,17 @@ files:
 - spec/support/error_helper.rb
 - spec/support/fixture.rb
 - spec/support/matchers.rb
-homepage: http://github.com/savonrb/httpi
+homepage: https://github.com/savonrb/httpi
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  bug_tracker_uri: https://github.com/savonrb/httpi/issues
+  changelog_uri: https://github.com/savonrb/httpi/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/savonrb/httpi
+  wiki_uri: https://github.com/savonrb/httpi/wiki
+  documentation_uri: https://www.rubydoc.info/gems/httpi
+  rubygems_mfa_required: 'true'
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -185,15 +248,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.7
-signing_key:
+rubygems_version: 3.4.10
+signing_key: 
 specification_version: 4
 summary: Common interface for Ruby's HTTP libraries
 test_files: []