f_http_client 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 043b1047145e6431224027e68000eb4397224d1cd36da84766fa272aa9b472a2
-  data.tar.gz: 660c261f27d5654909d338729ed8a8ad5166ec1038c978f05b3ba2ef6c0c0242
+  metadata.gz: bac525ad09c72f1354f9e12325df3954162a0a403a1490954965ebe0857cf1f8
+  data.tar.gz: 8dcf73d13e10dac54c0f8160b315c0cfb832b316d7b15f37b1484bfa71e9a173
 SHA512:
-  metadata.gz: 46118f4a70d1715d4c0fe3c86243f8ca80ccf2248c4c257b4b7ba69b3b3d089d6481e92299dcbf84f9675aacd5f8729a4df68037b156213dbcf4f32fc0cb35f8
-  data.tar.gz: 146d096e199781aee21e17054994c93d9961886a454bc4bdbcabb45f9b0a4a12060c5d3149d991ff4b54ca1c96ee73320bcbd35d81114d91635c61ed690a1bba
+  metadata.gz: dc919bb2e2ec31f726a15cb4d811909678daaf76ca63ce0bc2d87d816af9c3cc5f26a4fda77c18909ba0428439fb9e5559c07eecd8bbf7d2354b70ae974edb75
+  data.tar.gz: 40452092e5d0a7635c5bbf227750a2d32baf88f0d39eca5a1cd87a1f22af821990568989a8be3438cdbadaa4640dcaac795af4f5402a66136f0c09e5467c41be

data/.rubocop.yml

@@ -1,6 +1,7 @@
-require:
+plugins:
   - rubocop-rspec
   - rubocop-performance
+  - rubocop-vicenzo
 
 AllCops:
   TargetRubyVersion: 3.0
@@ -15,6 +16,14 @@ AllCops:
 
 ##### LAYOUT #####
 
+Layout/ArgumentAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Layout/FirstArgumentIndentation:
+  Enabled: true
+  EnforcedStyle: consistent
+
 Layout/FirstArrayElementIndentation:
   Enabled: true
   EnforcedStyle: consistent
@@ -23,10 +32,44 @@ Layout/FirstHashElementIndentation:
   Enabled: true
   EnforcedStyle: consistent
 
+Layout/FirstMethodArgumentLineBreak:
+  Enabled: true
+
 Layout/LineLength:
   Max: 120
   AllowedPatterns: ['(\A|\s)#']
 
+Layout/MultilineMethodArgumentLineBreaks:
+  Enabled: true
+
+Layout/MultilineMethodCallBraceLayout:
+  Enabled: true
+  EnforcedStyle: new_line
+
+Layout/MultilineMethodCallIndentation:
+  Enabled: true
+  EnforcedStyle: indented
+
+Layout/FirstArrayElementLineBreak:
+  Enabled: true
+
+Layout/MultilineArrayLineBreaks:
+  Enabled: true
+
+Layout/MultilineArrayBraceLayout:
+  Enabled: true
+  EnforcedStyle: new_line
+
+Layout/FirstHashElementLineBreak:
+  Enabled: true
+
+Layout/MultilineHashKeyLineBreaks:
+  Enabled: true
+
+Layout/MultilineHashBraceLayout:
+  Enabled: true
+  EnforcedStyle: new_line
+
 ##### STYLE #####
 
 Style/PreferredHashMethods:
@@ -57,9 +100,6 @@ Style/LambdaCall:
 Style/Documentation:
   Enabled: false
 
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 ##### LINT #####
 
 Lint/MissingSuper:
@@ -70,7 +110,7 @@ Lint/MissingSuper:
 Naming/InclusiveLanguage:
   Enabled: false
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   ForbiddenPrefixes:
     - is_
     - have_
@@ -110,12 +150,38 @@ RSpec/ContextWording:
 RSpec/ExampleLength:
   Max: 20
 
-RSpec/FilePath:
-  CustomTransform:
-    FHTTPClient: f_http_client
+RSpec/MultipleExpectations:
+  Exclude:
+    - 'spec/f_http_client/rspec/matchers/**/*'
+
+  # This directory contains specs for custom RSpec matchers.
+  # These examples intentionally use nested `expect { ... }.to raise_error(...)`
+  # to assert on matcher failure messages, which inherently requires more than
+  # one `expect` per example and conflicts with the MultipleExpectations cop.
+  #
+  # Using `:aggregate_failures` here is not an option, because it captures the
+  # inner expectation failure and re-raises an aggregated error, so the outer
+  # `raise_error` matcher no longer sees the original `ExpectationNotMetError`
+  # and the specs for the failure messages become impossible to express.
 
 RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
 RSpec/NestedGroups:
   Enabled: false
+
+RSpec/SpecFilePathFormat:
+  CustomTransform:
+    FHTTPClient: f_http_client
+
+##### RUBYGEMS #####
+Gemspec/RequireMFA:
+  Enabled: false
+
+##### Vicenzo #####
+
+Vicenzo/Style/MultilineMethodCallParentheses:
+  AllowedMethods:
+    - to
+    - not_to
+    - to_not

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+- Add `f_http_client_response_including` RSpec matcher for testing HTTParty::Response objects with nested matchers
+- Fix Ruby 4.0+ compatibility by adding activesupport >= 7.2, ostruct, and csv dependencies
+- Change Disable rubygems MFA checking #14
+
 ## [0.2.1] - 2023-09-27
 
 - Add rescue to SocketError exception. #12

data/Gemfile

@@ -6,12 +6,17 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
+  gem 'benchmark' # Required by rubocop on Ruby 4+
+  gem 'racc' # Required by parser on Ruby 4+
   gem 'rubocop'
   gem 'rubocop-performance'
   gem 'rubocop-rspec'
+  gem 'rubocop-vicenzo'
 end
 
 group :test do
+  gem 'csv' # Required by httparty on Ruby 4+ (moved from stdlib)
+  gem 'ostruct' # Required by simplecov on Ruby 4+ (moved from stdlib)
   gem 'rspec', '~> 3.0'
   gem 'simplecov'
   gem 'webmock'

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    f_http_client (0.2.1)
-      activesupport
+    f_http_client (0.3.0)
+      activesupport (>= 7.2)
       addressable
       dry-configurable
       dry-initializer
@@ -12,113 +12,154 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.8)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (8.1.2)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      json
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    ast (2.4.2)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
+    ast (2.4.3)
+    base64 (0.3.0)
+    benchmark (0.5.0)
+    bigdecimal (4.0.1)
     coderay (1.1.3)
-    concurrent-ruby (1.2.2)
-    crack (0.4.5)
+    concurrent-ruby (1.3.6)
+    connection_pool (3.0.2)
+    crack (1.0.1)
+      bigdecimal
       rexml
-    diff-lcs (1.5.0)
-    docile (1.4.0)
-    dry-configurable (1.1.0)
-      dry-core (~> 1.0, < 2)
+    csv (3.3.5)
+    diff-lcs (1.6.2)
+    docile (1.4.1)
+    drb (2.2.3)
+    dry-configurable (1.3.0)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-core (1.0.1)
+    dry-core (1.2.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-initializer (3.1.1)
-    f_service (0.3.0)
-    hashdiff (1.0.1)
-    httparty (0.21.0)
+    dry-initializer (3.2.0)
+    f_service (0.3.1)
+    hashdiff (1.2.1)
+    httparty (0.24.2)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.1)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    method_source (1.0.0)
+    json (2.18.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    method_source (1.1.0)
     mini_mime (1.1.5)
-    minitest (5.20.0)
-    multi_xml (0.6.0)
-    parallel (1.22.1)
-    parser (3.2.1.0)
+    minitest (6.0.1)
+      prism (~> 1.5)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parser (3.3.10.1)
       ast (~> 2.4.1)
+      racc
+    prism (1.9.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-nav (1.0.0)
       pry (>= 0.9.10, < 0.15)
-    public_suffix (5.0.1)
+    public_suffix (7.0.2)
+    racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rexml (3.4.4)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.45.1)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    rubocop (1.84.0)
       json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
-      rubocop (~> 1.41)
-    rubocop-performance (1.16.0)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.18.1)
-      rubocop (~> 1.33)
-      rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.49.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.7)
+    rubocop-performance (1.26.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
+    rubocop-rspec (3.9.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.81)
+    rubocop-vicenzo (0.3.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.2)
+      rubocop-rspec (>= 3.5.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
-    webmock (3.18.1)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.2.0)
+    uri (1.1.1)
+    webmock (3.26.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.6.12)
+    zeitwerk (2.7.4)
 
 PLATFORMS
+  x86_64-darwin-24
   x86_64-linux
 
 DEPENDENCIES
+  benchmark
+  csv
   f_http_client!
+  ostruct
   pry
   pry-nav
+  racc
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop
   rubocop-performance
   rubocop-rspec
+  rubocop-vicenzo
   simplecov
   webmock
 

data/README.md

@@ -109,6 +109,47 @@ The class *FHTTPClient::Base* provides the following options to help building th
 - *options*: can be used provide any other option for HTTParty;
 - *path_params*, can be used to fills params which is in the request path.
 
+## RSpec Matchers
+
+### `f_http_client_response_including`
+
+Tests HTTParty::Response objects with support for nested RSpec matchers.
+
+```rb
+require 'f_http_client/rspec'
+
+RSpec.describe MyApi::Products::List do
+  it 'returns successful response with products' do
+    stub_request(:get, "https://api.example.com/products")
+      .to_return(status: 200, body: { products: [{id: 1}, {id: 2}] }.to_json)
+
+    service_result = described_class.()
+
+    # Use with FService matchers
+    expect(service_result)
+      .to have_succeed_with(:ok, :successful)
+      .and_value(f_http_client_response_including(products: have_attributes(size: 2), page: be_a(Integer)))
+  end
+
+  it 'supports nested matchers' do
+    stub_request(:get, "https://api.example.com/products")
+      .to_return(status: 200, body: { items: [{id: 1}] }.to_json)
+
+    response = described_class.().value
+
+    # Direct response testing
+    expect(response)
+      .to f_http_client_response_including(items: a_collection_containing_exactly(a_hash_including(id: 1)))
+  end
+end
+```
+
+The matcher:
+- Automatically calls `parsed_response` on HTTParty::Response objects
+- Supports any nested RSpec matchers (`have_attributes`, `a_hash_including`, `be_a`, etc.)
+- Works seamlessly with FService's `.and_value()` and `.and_error()` matchers
+- Provides clear failure messages showing expected vs actual
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests.

data/lib/f_http_client/base.rb

@@ -23,7 +23,8 @@ module FHTTPClient
         FHTTPClient::Processor::Response.(response: response, log_strategy: log_strategy)
       end
     rescue StandardError => e
-      FHTTPClient::Processor::Exception.(error: e, log_strategy: log_strategy)
+      FHTTPClient::Processor::Exception
+        .(error: e, log_strategy: log_strategy)
         .on_failure(:uncaught_error) { raise e }
     end
 

data/lib/f_http_client/cache/rails.rb

@@ -2,7 +2,8 @@
 
 module FHTTPClient
   module Cache
-    RailsNotDefined = Class.new(StandardError)
+    class RailsNotDefined < StandardError
+    end
 
     class Rails
       class << self

data/lib/f_http_client/processor/exception.rb

@@ -31,6 +31,8 @@ module FHTTPClient
           :connection_refused
         when 'SocketError'
           :connection_error
+        when 'OpenSSL::SSL::SSLError'
+          :ssl_error
         when /timeout/i
           :timeout
         else

data/lib/f_http_client/processor/response.rb

@@ -81,10 +81,10 @@ module FHTTPClient
       # # => "Unprocessable Entity"
       def message
         @message ||= response_class
-                     .to_s
-                     .delete_prefix('Net::HTTP')
-                     .gsub(/([A-Z]+)([A-Z][a-z])/, '\1 \2')
-                     .gsub(/([a-z])([A-Z])/, '\1 \2')
+          .to_s
+          .delete_prefix('Net::HTTP')
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1 \2')
+          .gsub(/([a-z])([A-Z])/, '\1 \2')
       end
 
       # Private

data/lib/f_http_client/rspec/matchers/f_http_client_response_including.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+RSpec::Matchers.define :f_http_client_response_including do |expected_hash|
+  match do |actual|
+    return false unless actual.respond_to?(:parsed_response)
+
+    @actual_parsed = actual.parsed_response
+
+    # Check if all expected key-value pairs are present in actual
+    expected_hash.all? do |expected_key, expected_value|
+      actual_value = @actual_parsed[expected_key]
+      # Use values_match? to support nested matchers
+      values_match?(expected_value, actual_value)
+    end
+  end
+
+  failure_message do |actual|
+    if actual.respond_to?(:parsed_response)
+      "expected HTTParty::Response parsed_response to include #{expected_hash.inspect}, " \
+        "but got #{@actual_parsed.inspect}"
+    else
+      "expected an HTTParty::Response, but got #{actual.class}"
+    end
+  end
+
+  diffable
+end

data/lib/f_http_client/rspec/matchers.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative 'matchers/f_http_client_response_including'

data/lib/f_http_client/rspec.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require_relative 'rspec/support'
+require_relative 'rspec/matchers'

data/lib/f_http_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FHTTPClient
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/f_http_client.rb

@@ -3,6 +3,7 @@
 require_relative 'f_http_client/version'
 require 'active_support/core_ext/array'
 require 'active_support/core_ext/enumerable'
+require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/string'
 require 'addressable'
 require 'dry-configurable'

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: f_http_client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Fretadao Tech Team
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +93,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - tech@fretadao.com.br
 executables: []
@@ -125,6 +123,8 @@ files:
 - lib/f_http_client/processor/exception.rb
 - lib/f_http_client/processor/response.rb
 - lib/f_http_client/rspec.rb
+- lib/f_http_client/rspec/matchers.rb
+- lib/f_http_client/rspec/matchers/f_http_client_response_including.rb
 - lib/f_http_client/rspec/support.rb
 - lib/f_http_client/rspec/support/helpers.rb
 - lib/f_http_client/rspec/support/helpers/fake_response.rb
@@ -141,7 +141,6 @@ metadata:
   source_code_uri: https://github.com/Fretadao/f_http_client
   changelog_uri: https://github.com/Fretadao/f_http_client/blob/master/CHANGELOG.md
   rubygems_mfa_required: 'false'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key: 
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Gem to provade a base for an HTTP client using FService architecture
 test_files: []