summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-07-06 13:59:46 -0600
committermo khan <mo@mokhan.ca>2025-07-06 13:59:46 -0600
commitbba121d0242323f83e298c3725ac4df176c62417 (patch)
tree3bff02fa0650c86da84818d6d940b9b81cc3a359
parentd36b6e4f7c99b96aee01656e2ca57312d77a55b6 (diff)
parent58d4e9be69cf5fbc951bc63858ac899dded47bee (diff)
resolve: merge conflicts with main branch
- Merge latest main branch changes including Ruby 3.2+ requirement - Combine new stdlib dependencies with Rust extension support - Maintain backward compatibility while adding new features 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
-rw-r--r--.github/workflows/ci.yml4
-rw-r--r--.rubocop.yml11
-rw-r--r--CHANGELOG.md24
-rw-r--r--README.md9
-rw-r--r--lib/net/hippie.rb2
-rw-r--r--lib/net/hippie/client.rb2
-rw-r--r--lib/net/hippie/connection.rb2
-rw-r--r--lib/net/hippie/version.rb2
-rw-r--r--net-hippie.gemspec10
-rw-r--r--test/fixtures/get_root.yml21
-rw-r--r--test/net/client_test.rb18
-rw-r--r--test/test_helper.rb3
12 files changed, 71 insertions, 37 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 23dde06..2371b82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- ruby-version: ['2.5', '2.6', '2.7', '3.0']
+ ruby-version: ['3.2', '3.3', '3.4']
steps:
- uses: actions/checkout@v2
- name: Set up Ruby
@@ -25,7 +25,7 @@ jobs:
- uses: actions/checkout@v2
- uses: ruby/setup-ruby@v1
with:
- ruby-version: '3.0'
+ ruby-version: '3.4'
bundler-cache: true
- name: Running style checks…
run: sh bin/style
diff --git a/.rubocop.yml b/.rubocop.yml
index 1daf778..5e336fb 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,10 +6,19 @@ AllCops:
- 'tmp/**/*'
- 'vendor/**/*'
NewCops: enable
- TargetRubyVersion: 2.5
+ TargetRubyVersion: 3.2
+
+Gemspec/DevelopmentDependencies:
+ EnforcedStyle: gemspec
Layout/ParameterAlignment:
EnforcedStyle: with_fixed_indentation
+Naming/BlockForwarding:
+ Enabled: false
+
Naming/RescuedExceptionsVariableName:
PreferredName: error
+
+Style/ArgumentsForwarding:
+ Enabled: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6bda81..bb1ede0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-Version 1.1.1
+Version 1.3.0
# Changelog
All notable changes to this project will be documented in this file.
@@ -7,9 +7,24 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
+
+## [1.3.0] - 2025-04-30
+### Changed
+- Ruby 2.3+ required
+
+### Fixed
+- Add explicit dependency on `base64` gem
+- Add explicit dependency on `json` gem
+- Add explicit dependency on `net-http` gem
+- Add explicit dependency on `openssl` gem
+
+## [1.2.0] - 2024-12-05
+### Changed
+- Disable logger by default
+
## [1.1.1] - 2021-01-30
### Changed
-- Update
+- Update Gem Metadata
## [1.1.0] - 2020-12-26
### Added
@@ -80,7 +95,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- with\_retry.
- authorization header helpers
-[Unreleased]: https://github.com/xlgmokha/net-hippie/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/xlgmokha/net-hippie/compare/v1.3.0...HEAD
+[1.3.0]: https://github.com/xlgmokha/net-hippie/compare/v1.2.0...v1.3.0
+[1.2.0]: https://github.com/xlgmokha/net-hippie/compare/v1.1.1...v1.2.0
+[1.1.1]: https://github.com/xlgmokha/net-hippie/compare/v1.1.0...v1.1.1
[1.1.0]: https://github.com/xlgmokha/net-hippie/compare/v1.0.1...v1.1.0
[1.0.1]: https://github.com/xlgmokha/net-hippie/compare/v1.0.0...v1.0.1
[1.0.0]: https://github.com/xlgmokha/net-hippie/compare/v0.3.2...v1.0.0
diff --git a/README.md b/README.md
index 1c9db30..c9179e0 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
# Net::Hippie
[![Gem Version](https://badge.fury.io/rb/net-hippie.svg)](https://rubygems.org/gems/net-hippie)
-[![Build Status](https://github.com/xlgmokha/net-hippie/workflows/Test/badge.svg)](https://github.com/xlgmokha/net-hippie/actions)
+[![Build Status](https://github.com/xlgmokha/net-hippie/actions/workflows/ci.yml/badge.svg))](https://github.com/xlgmokha/net-hippie/actions)
+
`Net::Hippie` is a light weight wrapper around `net/http` that defaults to
sending `JSON` messages.
@@ -65,6 +66,12 @@ client = Net::Hippie::Client.new(
)
```
+To disable logging you will need to override the default logger.
+
+```ruby
+client = Net::Hippie::Client.new(logger: nil)
+```
+
### Basic Auth
```ruby
diff --git a/lib/net/hippie.rb b/lib/net/hippie.rb
index b19ab63..d057f52 100644
--- a/lib/net/hippie.rb
+++ b/lib/net/hippie.rb
@@ -32,7 +32,7 @@ module Net
].freeze
def self.logger
- @logger ||= Logger.new($stderr)
+ @logger ||= Logger.new(nil)
end
def self.logger=(logger)
diff --git a/lib/net/hippie/client.rb b/lib/net/hippie/client.rb
index 5beec1e..340531b 100644
--- a/lib/net/hippie/client.rb
+++ b/lib/net/hippie/client.rb
@@ -84,7 +84,7 @@ module Net
raise error if attempt == max
delay = ((2**attempt) * 0.1) + Random.rand(0.05) # delay + jitter
- logger.warn("`#{error.message}` #{attempt + 1}/#{max} Delay: #{delay}s")
+ logger&.warn("`#{error.message}` #{attempt + 1}/#{max} Delay: #{delay}s")
sleep delay
end
diff --git a/lib/net/hippie/connection.rb b/lib/net/hippie/connection.rb
index 35a478a..83097ff 100644
--- a/lib/net/hippie/connection.rb
+++ b/lib/net/hippie/connection.rb
@@ -49,7 +49,7 @@ module Net
http.open_timeout = options.fetch(:open_timeout, 10)
http.use_ssl = scheme == 'https'
http.verify_mode = options.fetch(:verify_mode, Net::Hippie.verify_mode)
- http.set_debug_output(options.fetch(:logger, Net::Hippie.logger))
+ http.set_debug_output(options[:logger]) if options[:logger]
apply_client_tls_to(http, options)
@http = http
end
diff --git a/lib/net/hippie/version.rb b/lib/net/hippie/version.rb
index 87af671..07de45b 100644
--- a/lib/net/hippie/version.rb
+++ b/lib/net/hippie/version.rb
@@ -2,6 +2,6 @@
module Net
module Hippie
- VERSION = '1.1.1'
+ VERSION = '1.3.0'
end
end
diff --git a/net-hippie.gemspec b/net-hippie.gemspec
index e62f947..3cd47fe 100644
--- a/net-hippie.gemspec
+++ b/net-hippie.gemspec
@@ -15,7 +15,8 @@ Gem::Specification.new do |spec|
spec.homepage = 'https://rubygems.org/gems/net-hippie'
spec.license = 'MIT'
spec.metadata = {
- 'source_code_uri' => 'https://github.com/xlgmokha/net-hippie'
+ 'source_code_uri' => 'https://github.com/xlgmokha/net-hippie',
+ 'rubygems_mfa_required' => 'true'
}
spec.files = `git ls-files -z`.split("\x0").reject do |f|
@@ -24,12 +25,17 @@ Gem::Specification.new do |spec|
spec.bindir = 'exe'
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']
- spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+ spec.required_ruby_version = Gem::Requirement.new('>= 3.2.0')
# Rust extension support
spec.extensions = ['extconf.rb']
spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+ spec.add_dependency 'base64', '~> 0.1'
+ spec.add_dependency 'json', '~> 2.0'
+ spec.add_dependency 'logger', '~> 1.0'
+ spec.add_dependency 'net-http', '~> 0.6'
+ spec.add_dependency 'openssl', '~> 3.0'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rubocop', '~> 1.9'
diff --git a/test/fixtures/get_root.yml b/test/fixtures/get_root.yml
index d57b7cd..a0d255f 100644
--- a/test/fixtures/get_root.yml
+++ b/test/fixtures/get_root.yml
@@ -3,18 +3,11 @@ http_interactions:
- request:
method: get
uri: https://www.mokhan.ca/
- body:
- encoding: US-ASCII
- string: ''
headers:
Accept:
- application/json
Content-Type:
- application/json
- User-Agent:
- - net/hippie 0.2.4
- Accept-Encoding:
- - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
response:
status:
code: 200
@@ -30,22 +23,10 @@ http_interactions:
- Wed, 05 Dec 2018 08:57:44 GMT
Last-Modified:
- Wed, 05 Dec 2018 05:45:13 GMT
- Server:
- - AmazonS3
- Vary:
- - Accept-Encoding
- Age:
- - '53062'
- X-Cache:
- - Hit from cloudfront
- Via:
- - 1.1 39174a6a452e175e6e614ff396a4ca4f.cloudfront.net (CloudFront)
- X-Amz-Cf-Id:
- - mGugayoZK2mUAfj9WuV5O9c9_uzocRazyLFGqNdDjKQpniAmpFU6gA==
body:
encoding: ASCII-8BIT
string: !binary |-
<!DOCTYPE html>
<html lang="en">
  <head>
    <meta charset='utf-8'>
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <meta name="referrer" content="no-referrer">
    <link rel="canonical" href="https://www.mokhan.ca/">
    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<meta name="msapplication-TileColor" content="#da532c">
<meta name="theme-color" content="#ffffff">

    <!-- Begin Jekyll SEO tag v2.5.0 -->
<title>mo khan | My thoughts belong to me</title>
<meta name="generator" content="Jekyll v3.8.5" />
<meta property="og:title" content="mo khan" />
<meta name="author" content="mo" />
<meta property="og:locale" content="en" />
<meta name="description" content="My thoughts belong to me" />
<meta property="og:description" content="My thoughts belong to me" />
<link rel="canonical" href="https://www.mokhan.ca/" />
<meta property="og:url" content="https://www.mokhan.ca/" />
<meta property="og:site_name" content="mo khan" />
<script type="application/ld+json">
{"@type":"WebSite","headline":"mo khan","url":"https://www.mokhan.ca/","publisher":{"@type":"Organization","logo":{"@type":"ImageObject","url":"https://www.mokhan.ca/images/avatar.jpg"},"name":"mo"},"name":"mo khan","author":{"@type":"Person","name":"mo"},"description":"My thoughts belong to me","@context":"http://schema.org"}</script>
<!-- End Jekyll SEO tag -->

    <link type="application/atom+xml" rel="alternate" href="https://www.mokhan.ca/atom.xml" title="mo khan" />
    <link rel="stylesheet" integrity="sha256-hQZZ6gi+pyIpYo9loSb495pS0K5zcBlRNxPu80eCuD8=" crossorigin="anonymous" href="/assets/style-850659ea08bea72229628f65a126f8f79a52d0ae737019513713eef34782b83f.css">
    <script src="/assets/js/application.js" async></script>
  <script async src="https://www.googletagmanager.com/gtag/js?id=UA-242918-1"></script>
</head>
  <body>
    <main>
      <a href="#main_content" class="skip">Skip to content</a>
      <div class="container">
        <section id="main_content">
          <h1 id="hi-my-name-is-mo">Hi, my name is <code class="highlighter-rouge">Mo</code></h1>

<p><strong>tl;dr</strong> <a href="https://github.com/mokhan/">GitHub</a>, <a href="https://rubygems.org/profiles/mokha">RubyGems</a>, <a href="https://www.linkedin.com/in/mokhancalgary">LinkedIn</a></p>

<hr />

<p>I ♥ <a href="https://www.ruby-lang.org/">Ruby</a>. It’s a very fun and
expressive programming language.</p>

<div class="language-ruby highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1"># moo.rb</span>
<span class="nb">require</span> <span class="s1">'bundler/inline'</span>                         <span class="c1"># も ruby moo.rb</span>
                                                 <span class="c1">#   ----</span>
<span class="n">gemfile</span> <span class="k">do</span>                                       <span class="c1"># &lt; moo! &gt;</span>
  <span class="n">source</span> <span class="s1">'https://rubygems.org'</span>                  <span class="c1">#   ----</span>
  <span class="n">gem</span> <span class="s1">'net-hippie'</span>                               <span class="c1">#         \   ^__^</span>
<span class="k">end</span>                                              <span class="c1">#          \  (oo)\_______</span>
<span class="n">client</span> <span class="o">=</span> <span class="no">Net</span><span class="o">::</span><span class="no">Hippie</span><span class="o">::</span><span class="no">Client</span><span class="p">.</span><span class="nf">new</span>                 <span class="c1">#             (__)\       )\/\</span>
<span class="n">url</span> <span class="o">=</span> <span class="s2">"https://www.mokhan.ca/"</span>                   <span class="c1">#                 ||----w |</span>
<span class="n">body</span> <span class="o">=</span> <span class="n">client</span><span class="p">.</span><span class="nf">get</span><span class="p">(</span><span class="n">url</span><span class="p">).</span><span class="nf">body</span>                      <span class="c1">#                 ||     ||</span>
<span class="nb">puts</span> <span class="n">body</span><span class="p">[</span><span class="o">-</span><span class="mi">150</span><span class="o">..-</span><span class="mi">1</span><span class="p">]</span>                              <span class="c1"># --&gt;</span>

</code></pre></div></div>

<p>I wrote <a href="https://rubygems.org/gems/saml-kit">saml-kit</a>,
<a href="https://rubygems.org/gems/net-hippie">net-hippie</a>,
<a href="https://rubygems.org/gems/incognito">incognito</a>,
<a href="https://rubygems.org/gems/xsay">xsay</a>,
<a href="https://rubygems.org/gems/del">del</a> and many more gems.</p>

<div class="language-ruby highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="c1">#!/bin/sh</span>
<span class="n">gem</span> <span class="n">install</span> <span class="n">xsay</span>                                 <span class="c1"># も xsay random Hello</span>
<span class="n">xsay</span> <span class="n">random</span> <span class="no">Hello</span>                                <span class="c1">#   -----</span>
                                                 <span class="c1"># &lt; Hello &gt;</span>
                                                 <span class="c1">#   -----</span>
                                                 <span class="c1">#       ."`".</span>
                                                 <span class="c1">#   .-./ _=_ \.-.</span>
                                                 <span class="c1">#  {  (,(oYo),)  }</span>
                                                 <span class="c1">#  {  |   "   |  }</span>
                                                 <span class="c1">#  { { \(---)/ } }</span>
                                                 <span class="c1">#  { { }'-=-'{ } }</span>
                                                 <span class="c1">#  { { }._:_.{ } }</span>
                                                 <span class="c1">#  { { } -:- { } }</span>
                                                 <span class="c1">#  {_{ }`===`{  _}</span>
                                                 <span class="c1"># ((((\)     (/))))</span>

</code></pre></div></div>

          <hr />
        </section>
      </div>
    </main>
    <footer>
      <img class="center" integrity="sha256-0OOxgeimIJlnsTPk5io3mFOS08hEWvXZwGRJwHkbpYk=" crossorigin="anonymous" src="/assets/1b2647-1dc1e940eb4b2d42eeaa8ccb4bdf1365c7d2f72afc930cff8192dc553c7e1b43.jpg">
      <p class="text-center">My thoughts belong to me<a href="/❤️.html" class="category">.</a></p>
      <p class="text-center">
        <a href="https://github.com/mokhan/">GitHub</a> |
        <a href="https://rubygems.org/profiles/mokha">RubyGems</a> |
        <a href="https://www.linkedin.com/in/mokhancalgary">LinkedIn</a>
      </p>
      <p class="text-center">
        &copy; 2005-2018
        mo [at] mokhan [dot] ca
        <a href="https://www.mokhan.ca">www.mokhan.ca</a>
      </p>
    </footer>
  <script>
  window.dataLayer = window.dataLayer || [];
  function gtag(){dataLayer.push(arguments);}
  gtag('js', new Date());
  gtag('config', 'UA-242918-1', {
    'page_title': 'mo khan',
    'page_location': 'https://www.mokhan.ca/',
    'page_path': '/',
    'anonymize_ip': true,
  });
</script>
</body>
</html>
<!--
 _____
< moo >
 -----
        \   ^__^
         \  (oo)\_______
            (__)\       )\/\
                ||----w |
                ||     ||
-->


- http_version:
+ http_version:
recorded_at: Wed, 06 Feb 2019 17:45:16 GMT
recorded_with: VCR 4.0.0
diff --git a/test/net/client_test.rb b/test/net/client_test.rb
index 0b8b3ea..45ea419 100644
--- a/test/net/client_test.rb
+++ b/test/net/client_test.rb
@@ -3,8 +3,7 @@ require 'test_helper'
class ClientTest < Minitest::Test
attr_reader :subject
- def initialize(*args)
- super
+ def setup
@subject = Net::Hippie::Client.new
end
@@ -303,4 +302,19 @@ class ClientTest < Minitest::Test
end
assert(@called)
end
+
+ def test_logger
+ VCR.turned_off do
+ WebMock.allow_net_connect!
+ StringIO.open do |io|
+ subject = Net::Hippie::Client.new(logger: Logger.new(io, level: :debug))
+ response = subject.get('https://www.example.org/')
+
+ refute_nil response
+ assert_kind_of Net::HTTPOK, response
+ io.rewind
+ assert_match %r{^(opening connection to www.example.org:443)}, io.read
+ end
+ end
+ end
end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index a645fac..9971d92 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -6,8 +6,7 @@ require 'net/hippie'
require 'securerandom'
require 'vcr'
require 'webmock'
-
-Net::Hippie.logger = ENV['CIBUILD'] ? Logger.new('/dev/null') : Logger.new(STDERR)
+require 'webmock/minitest'
VCR.configure do |config|
config.cassette_library_dir = 'test/fixtures'