chimera_http_client 1.3.1 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b68f9f3f76d137690c9f3fd9345b835efadee680ba8cd6b964095c554f9cb96
-  data.tar.gz: 7a86650670f451558d407c04a9870f522cf6805413f256dfc453622c9c55263f
+  metadata.gz: d44d96daf4357f5f997f4874569c0f92bddeab9f945d5c950f8066d937c8d92b
+  data.tar.gz: 71eadaa902be940979f3fff031bddb78469beefafed2f605a19199ca54ce14f7
 SHA512:
-  metadata.gz: 8a12bdf778c260bdfe95f529e7d94dbecf6b0d041f21da25a5f3503c185db8aaaa041d27d01b98767ddb98466e684c2fc266cab3e0bbaf8cb61b7353a8f37071
-  data.tar.gz: 7da871e77ae5d29d207c5e6c4d95f3cdc831a15202cf7bf0a3f73ee44c8610ba1760189b542f86ff161b963640d448ac7a28fbeaa04845a1c8f462a28f13245c
+  metadata.gz: 7efe9e56feff54e326a568817cd2edde14ca7988188f67a150d6a4c507d0c87e6d4e08ab159102fdf91f6a86684acb18386cd9b433a63bc5b98e22a92b4e18d9
+  data.tar.gz: 97fa3cbea4100201f44264efccd9d5e574abbac20dcc36ef3cfdfd5b9aac16d993ba065b39fa56d2c6b31f9c1cbc2476ab58621bb0815aaa6343419e48c0dcff

data/.rubocop.yml

@@ -1,11 +1,18 @@
+require:
+  - rubocop-rake
+  - rubocop-rspec
+
 AllCops:
-  DisplayCopNames: true
   TargetRubyVersion: 2.5
+  DisplayCopNames: true
+  NewCops: enable # but feel free to disable them below
   Exclude:
       - vendor/**/*
       - config.ru
 
-# Cop supports --auto-correct.
+Layout/EmptyLineBetweenDefs:
+  AllowAdjacentOneLineDefs: true
+
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
@@ -20,6 +27,24 @@ Layout/LineLength:
 Metrics:
   Enabled: false
 
+RSpec/ContextWording:
+  Enabled: false
+
+RSpec/ExampleLength:
+  Max: 25
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Enabled: false
+
+RSpec/NestedGroups:
+  Max: 4
+
+Style/CaseLikeIf:
+  Enabled: false
+
 Style/CommentedKeyword:
   Enabled: false
 
@@ -28,7 +53,6 @@ Style/Documentation:
 
 Style/DoubleNegation:
   Enabled: true
-
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -44,11 +68,22 @@ Style/StringLiterals:
     - single_quotes
     - double_quotes
 
-# Cop supports --auto-correct.
 Style/NumericLiterals:
   MinDigits: 15
 
-# Cop supports --auto-correct.
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: ()
+    "%": ()
+    "%i": ()
+    "%q": ()
+    "%Q": ()
+    "%r": "{}"
+    "%s": ()
+    "%w": ()
+    "%W": ()
+    "%x": ()
+
 # Configuration parameters: AllowAsExpressionSeparator.
 Style/Semicolon:
   AllowAsExpressionSeparator: true
@@ -56,7 +91,6 @@ Style/Semicolon:
 Style/SymbolProc:
   Enabled: false
 
-# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
 # SupportedStyles: comma, consistent_comma, no_comma
 Style/TrailingCommaInArrayLiteral:
@@ -65,7 +99,6 @@ Style/TrailingCommaInArrayLiteral:
 Style/TrailingCommaInHashLiteral:
   EnforcedStyleForMultiline: comma
 
-# Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, MinSize, WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.0.1

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 
 rvm:
-  - ruby-head
+  - 3.0
+  - 2.7
   - 2.6
   - 2.5
   - jruby
@@ -16,10 +17,10 @@ matrix:
 before_install:
   - 'echo ''gem: --no-ri --no-rdoc'' > ~/.gemrc'
 
-bundler_args: --jobs 3 --retry 3
+bundler_args: --jobs 4 --retry 4
 
 before_script:
 
 # execute rspec tests, rubocop and bundle:audit
 script:
-  bundle exec rake
+  bundle exec rake ci

data/README.markdown

@@ -17,13 +17,14 @@ The only other runtime dependency is Ruby's latest code loader [**zeitwerk**](ht
 
 ### Ruby version
 
-| Chimera version | Ruby version |
-|:----------------|:-------------|
-| >= 1.1          | >= 2.5       |
-| =  1.0          | >= 2.4       |
-| <= 0.5          | >= 2.1       |
-
-The test suite of v1.3 and newer also passes on **JRuby** and on **TruffleRuby**.
+| Chimera version | Ruby version                       |
+|:----------------|:-----------------------------------|
+| >= 1.4          | >= 2.5 (3.0 compatibility ensured) |
+| >= 1.1          | >= 2.5                             |
+| =  1.0          | >= 2.4, <= 3.0                     |
+| <= 0.5          | >= 2.1, <= 3.0                     |
+
+The test suite of v1.4 passes on **MRI Ruby** (2.5, 2.6, 2.7, 3.0) and on **JRuby**, but not on **TruffleRuby**.
 
 ### ENV variables
 

data/Rakefile

@@ -1,17 +1,23 @@
 require "bundler/audit/task"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop/rake_task"
 
+# setup task bundle:audit
 Bundler::Audit::Task.new
 
+# setup taks rspec
 RSpec::Core::RakeTask.new(:rspec) do |t|
   # t.exclude_pattern = "**/server/*_spec.rb" # skip real http server specs
   # t.exclude_pattern = "**/stubbed/*_spec.rb" # skip the stubbed Typhoeus specs
 end
 
+# setup taks rubocop and rubocop:auto_correct
+RuboCop::RakeTask.new
+
 desc "Open a console with the ChimeraHttpClient loaded"
 task :console do
-  puts "Console with the gem and awesome_print loaded:"
+  puts "Console with the gem and amazing_print loaded:"
   ARGV.clear
   require "irb"
   require "ap"
@@ -19,15 +25,7 @@ task :console do
   IRB.start
 end
 
-desc "Run Rubocop"
-task :rubocop do
-  system "bundle exec rubocop -c .rubocop.yml"
-end
-
-desc "Run Rubocop and auto-correct issues"
-task :rubocopa do
-  system "bundle exec rubocop -c .rubocop.yml -a"
-end
+desc "Run rubocop and the specs and check for known CVEs"
+task ci: %i(rubocop rspec bundle:audit)
 
-desc "Run all the tests"
-task default: %i[rspec rubocop bundle:audit]
+task default: :ci

data/chimera_http_client.gemspec

@@ -32,14 +32,15 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "zeitwerk", ">= 2.0"
 
   # general development and test dependencies
-  spec.add_development_dependency "awesome_print",      "~> 1.8"
+  spec.add_development_dependency "amazing_print",      ">= 1.2"
   spec.add_development_dependency "bundler",            ">= 1.0"
-  spec.add_development_dependency "bundler-audit",      "~> 0.6"
-  spec.add_development_dependency "irb",                "~> 1.0"
+  spec.add_development_dependency "bundler-audit",      ">= 0.6"
+  spec.add_development_dependency "irb",                ">= 1.0"
   spec.add_development_dependency "rake",               ">= 10.0"
   spec.add_development_dependency "rspec",              "~> 3.0"
-  spec.add_development_dependency "rubocop",            "~> 0.50"
-  spec.add_development_dependency "rubocop-rspec",      "~> 1.4"
+  spec.add_development_dependency "rubocop",            "~> 1.12"
+  spec.add_development_dependency "rubocop-rake",       "~> 0.5"
+  spec.add_development_dependency "rubocop-rspec",      "~> 2.2"
 
   # only for server specs with real HTTP requests
   spec.add_development_dependency "capybara",           "~> 3.0"
@@ -47,4 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sinatra",            "~> 2.0"
   spec.add_development_dependency "sinatra-contrib",    "~> 2.0"
   spec.add_development_dependency "webmock",            "~> 3.0"
+  spec.add_development_dependency "webrick"
 end

data/lib/chimera_http_client.rb

@@ -7,5 +7,5 @@ module ChimeraHttpClient
   loader.setup
 
   # as Zeitwerk can't handle innner classes properly :-/
-  require_relative "./chimera_http_client/error.rb"
+  require_relative "./chimera_http_client/error"
 end

data/lib/chimera_http_client/base.rb

@@ -56,7 +56,7 @@ module ChimeraHttpClient
 
     # Remove leading and trailing "/" from a give part of a String (usually URL or endpoint)
     def trim(element)
-      element.to_s.sub(%r{^\/}, "").chomp("/")
+      element.to_s.sub(%r{^/}, "").chomp("/")
     end
   end
 end

data/lib/chimera_http_client/connection.rb

@@ -23,7 +23,7 @@ module ChimeraHttpClient
     private
 
     def run(method, endpoint, options = {})
-      options[:body_optional] = true if %i[get delete head options trace].include?(method)
+      options[:body_optional] = true if %i(get delete head options trace).include?(method)
       body = extract_body(options)
       headers = extract_headers(options, default_headers)
 
@@ -37,7 +37,7 @@ module ChimeraHttpClient
     # end
     #
     def define_http_methods
-      %i[get post put patch delete head options trace].each do |method_name|
+      %i(get post put patch delete head options trace).each do |method_name|
         self.class.send(:define_method, method_name) do |endpoint, options = {}|
           send(:run, method_name, endpoint, options)
         end

data/lib/chimera_http_client/error.rb

@@ -10,6 +10,8 @@ module ChimeraHttpClient
       @response = response # contains the request
 
       @deserializer = options[:deserializer][:error]
+
+      super(response.body)
     end
 
     def error?

data/lib/chimera_http_client/queue.rb

@@ -2,7 +2,7 @@ module ChimeraHttpClient
   class Queue < Base
     def add(method, endpoint, options = {})
       http_method = method.downcase.to_sym
-      options[:body_optional] = true if %i[get delete head options trace].include?(http_method)
+      options[:body_optional] = true if %i(get delete head options trace).include?(http_method)
 
       queued_requests << create_request(
         method: http_method,

data/lib/chimera_http_client/version.rb

@@ -1,3 +1,3 @@
 module ChimeraHttpClient
-  VERSION = "1.3.1".freeze
+  VERSION = "1.4.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chimera_http_client
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.1
 platform: ruby
 authors:
 - Andreas Finger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: amazing_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -70,28 +70,28 @@ dependencies:
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: irb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -128,28 +128,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '1.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.50'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   The Chimera http client offers an easy to learn interface and consistent error handling.
   It is lightweight, fast and enables you to queue HTTP requests to run them in parallel
@@ -271,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: General http client functionality to quickly connect to JSON REST API endpoints