my_api_client 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625b09ebe3b913ebf52c369554945368280eedb5610c6c9af64d0f0115ff4414
-  data.tar.gz: e2bd5807d57814f29ffed4cbc4a708f21925ab3546734d00e10296073a987240
+  metadata.gz: 04b65801b00f389260d1c5e565c9bf62141dca015f7d63a1f2f55a9432202971
+  data.tar.gz: 0cb50201bdc0877a6bff65300907be74910c62ee29112c782ac513f6e153c243
 SHA512:
-  metadata.gz: 7e4b479a449d2c7d06953b9daf954c37d4861fa02f42af93275774668c690792292784ca69cdc9fae68d3ee347bc09e595ac15837904ada9635526448afd146d
-  data.tar.gz: f0e4b6b765fb5e14080531ea09d51226cea45fa6b6ad81077b39ffa41ade1656dc4cf2818bbbded6955ed91117df7e2093ec0f89969990734a8b6d6baaccf3f0
+  metadata.gz: f2404378034857782c548971e5812a791ebe7902b5a73b63a56eb85a52e5d29aef6eee64c654377a4564ee33ac30f11e3d0c2e60dca391a658d7786cddb4ea50
+  data.tar.gz: 5daea5828a938350e909238b2c3d217e5dc49f792626689791b033648650ffc6b8f99eaa4edbe4a100d41212d811732d2072d40d4f79252752e034a4cbc413bd

data/.circleci/config.yml

@@ -12,12 +12,12 @@ references:
   - &ruby_version
     ruby_version:
       type: enum
-      enum: &ruby_version_enum ["2.7", "3.0", "3.1"]
-      default: "3.1"
+      enum: &ruby_version_enum ["2.7", "3.0", "3.1", "3.2"]
+      default: "3.2"
   - &rails_version
     rails_version:
       type: enum
-      enum: &rails_version_enum ["5.2", "6.0", "6.1", "7.0"]
+      enum: &rails_version_enum ["6.0", "6.1", "7.0"]
       default: "7.0"
   - &bundler_options
     bundler_options:
@@ -153,7 +153,7 @@ commands:
           name: Install Bundler 2.x
           command: gem install bundler -v '~> 2.0'
       - ruby-orbs/bundle-install:
-          cache_key_prefix: v1-dependencies-<< parameters.ruby_version >>
+          cache_key_prefix: v2-dependencies-<< parameters.ruby_version >>
           bundle_extra_args: << parameters.bundler_options >>
           restore_bundled_with: false
   test_and_deploy_for_api:
@@ -252,7 +252,7 @@ jobs:
       - code-climate/install
       - code-climate/sum-coverage:
           input: codeclimate.*.json
-          parts: 20
+          parts: 24
       - code-climate/upload-coverage
   rubocop:
     executor: gem_executor
@@ -287,30 +287,12 @@ workflows:
               ruby_version: *ruby_version_enum
               rails_version: *rails_version_enum
               bundler_options: ["--with integrations", "--without integrations"]
-            exclude:
-              - ruby_version: "3.0"
-                rails_version: "5.2"
-                bundler_options: "--with integrations"
-              - ruby_version: "3.0"
-                rails_version: "5.2"
-                bundler_options: "--without integrations"
-              - ruby_version: "3.1"
-                rails_version: "5.2"
-                bundler_options: "--with integrations"
-              - ruby_version: "3.1"
-                rails_version: "5.2"
-                bundler_options: "--without integrations"
       - verify_generator:
           name: verify_generator_on_ruby_<< matrix.ruby_version >>_and_rails_<< matrix.rails_version >>
           matrix:
             parameters:
               ruby_version: *ruby_version_enum
               rails_version: *rails_version_enum
-            exclude:
-              - ruby_version: "3.0"
-                rails_version: "5.2"
-              - ruby_version: "3.1"
-                rails_version: "5.2"
       - test_api:
           ruby_version: "2.7" # Jets supports only Ruby 2.x
       - rubocop

data/.rubocop.yml

@@ -1,5 +1,6 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 
 inherit_from: .rubocop_todo.yml
@@ -11,6 +12,9 @@ AllCops:
     - rails_app/**/*
     - vendor/bundle/**/*
 
+Gemspec/DevelopmentDependencies:
+  Enabled: false
+
 Layout/LineLength:
   Max: 100
   Exclude:
@@ -51,6 +55,9 @@ RSpec/FilePath:
     - "spec/lib/my_api_client/errors/**/*"
     - "spec/lib/my_api_client/rspec/**/*"
 
+RSpec/IndexedLet:
+  Max: 3
+
 RSpec/NestedGroups:
   Max: 5
 

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-10-23 23:31:24 UTC using RuboCop version 1.33.0.
+# on 2023-02-06 23:31:23 UTC using RuboCop version 1.41.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -22,6 +22,7 @@ Lint/MissingSuper:
     - 'lib/my_api_client/integrations/bugsnag.rb'
     - 'lib/my_api_client/request/executor.rb'
     - 'lib/my_api_client/sleeper.rb'
+    - 'spec/lib/my_api_client/rspec/matchers/be_handled_as_an_error_spec.rb'
 
 # Offense count: 6
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
@@ -32,7 +33,7 @@ Naming/VariableNumber:
     - 'spec/lib/my_api_client/error_handling_spec.rb'
     - 'spec/lib/my_api_client/request/executor_spec.rb'
 
-# Offense count: 60
+# Offense count: 101
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 15

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Change log
 
+## v0.26.0 (Jul 04, 2023)
+
+### Bugfix
+
+- [#914](https://github.com/ryz310/my_api_client/pull/914) Fix error that generating api client failed on Rails 7 ([@ryz310](https://github.com/ryz310))
+
+### Dependabot
+
+- [#889](https://github.com/ryz310/my_api_client/pull/889) Bump yard from 0.9.32 to 0.9.34 ([@ryz310](https://github.com/ryz310))
+- [#893](https://github.com/ryz310/my_api_client/pull/893) Bump jsonpath from 1.1.2 to 1.1.3 ([@ryz310](https://github.com/ryz310))
+- [#897](https://github.com/ryz310/my_api_client/pull/897) Bump rubocop-performance from 1.17.1 to 1.18.0 ([@ryz310](https://github.com/ryz310))
+- [#912](https://github.com/ryz310/my_api_client/pull/912) Bump activesupport from 7.0.5.1 to 7.0.6 ([@ryz310](https://github.com/ryz310))
+- [#913](https://github.com/ryz310/my_api_client/pull/913) Bump faraday from 2.7.8 to 2.7.9 ([@ryz310](https://github.com/ryz310))
+
+## v0.25.0 (Feb 12, 2023)
+
+### Breaking Change
+
+- [#864](https://github.com/ryz310/my_api_client/pull/864) Support Ruby 3.2 and drop support for Rails 5.2 ([@ryz310](https://github.com/ryz310))
+
+### Rubocop Challenge
+
+- [#809](https://github.com/ryz310/my_api_client/pull/809) Style/RedundantConstantBase-20221208233100 ([@ryz310](https://github.com/ryz310))
+- [#812](https://github.com/ryz310/my_api_client/pull/812) Lint/RedundantCopDisableDirective-20221211233112 ([@ryz310](https://github.com/ryz310))
+- [#862](https://github.com/ryz310/my_api_client/pull/862) Performance/StringInclude-20230206233100 ([@ryz310](https://github.com/ryz310))
+
+### Dependabot
+
+- [#830](https://github.com/ryz310/my_api_client/pull/830) ryz310/dependabot/bundler/simplecov-0.22.0 ([@ryz310](https://github.com/ryz310))
+- [#858](https://github.com/ryz310/my_api_client/pull/858) Bump faraday from 2.7.3 to 2.7.4 ([@ryz310](https://github.com/ryz310))
+- [#859](https://github.com/ryz310/my_api_client/pull/859) Bump activesupport from 7.0.4.1 to 7.0.4.2 ([@ryz310](https://github.com/ryz310))
+- [#863](https://github.com/ryz310/my_api_client/pull/863) Bump bugsnag from 6.25.1 to 6.25.2 ([@ryz310](https://github.com/ryz310))
+
 ## v0.24.0 (Nov 07, 2022)
 
 ### Feature

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    my_api_client (0.24.0)
-      activesupport (>= 5.2.0)
+    my_api_client (0.26.0)
+      activesupport (>= 6.0.0)
       faraday (>= 0.17.1)
       jsonpath
       sawyer (>= 0.8.2)
@@ -10,103 +10,113 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.0.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
-    bugsnag (6.24.2)
+    bugsnag (6.25.2)
       concurrent-ruby (~> 1.0)
     byebug (11.1.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
     docile (1.4.0)
-    faraday (2.6.0)
+    faraday (2.7.9)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
-    faraday-net_http (3.0.1)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.2)
-    jsonpath (1.1.2)
+    json (2.6.3)
+    jsonpath (1.1.3)
       multi_json
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    minitest (5.16.3)
+    minitest (5.18.1)
     multi_json (1.15.0)
-    parallel (1.22.1)
-    parser (3.1.2.1)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    pry (0.14.1)
+      racc
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.0)
+    public_suffix (5.0.1)
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.0)
+    regexp_parser (2.8.1)
     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.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.0)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (1.38.0)
+    rubocop (1.54.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.23.0, < 2.0)
+      rubocop-ast (>= 1.28.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.23.0)
-      parser (>= 3.1.1.0)
-    rubocop-performance (1.15.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
+    rubocop-performance (1.18.0)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rspec (2.15.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.22.0)
       rubocop (~> 1.33)
-    ruby-progressbar (1.11.0)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.5)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.4.2)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    yard (0.9.34)
 
 PLATFORMS
   ruby
@@ -121,10 +131,11 @@ DEPENDENCIES
   rspec_junit_formatter
   rubocop
   rubocop-performance
+  rubocop-rake
   rubocop-rspec
-  simplecov (= 0.21.2)
+  simplecov (= 0.22.0)
   webmock
   yard
 
 BUNDLED WITH
-   2.3.11
+   2.3.26

data/README.jp.md

@@ -12,8 +12,8 @@ MyApiClient は API リクエストクラスを作成するための汎用的な
 
 ## Supported Versions
 
-- Ruby 2.7, 3.0, 3.1
-- Rails 5.2, 6.0, 6.1, 7.0
+- Ruby 2.7, 3.0, 3.1, 3.2
+- Rails 6.0, 6.1, 7.0
 
 ## Installation
 
@@ -223,7 +223,6 @@ error_handling json: { '$.errors.code': 10..19 }, with: :my_error_handling
 
 `headers` には `Hash` の Key に レスポンスのヘッダーキーを指定して、 Value とマッチするかどうかでエラーハンドリングできます。Value には `String` `Regexp` が指定可能です。
 
-
 ```ruby
 error_handling headers: { 'www-authenticate': /invalid token/ }, with: :my_error_handling
 ```
@@ -237,7 +236,6 @@ www-authenticate: Bearer error="invalid_token", error_description="invalid token
 content-length: 104
 ```
 
-
 `with` にはインスタンスメソッド名を指定することで、エラーを検出した際、例外を発生させる前に任意のメソッドを実行させることができます。メソッドに渡される引数は `block` 定義の場合と同じく `params` と `logger` です。なお、 `block` と `with` は同時には利用できません。
 
 ```ruby

data/README.md

@@ -1,4 +1,8 @@
-[![CircleCI](https://circleci.com/gh/ryz310/my_api_client.svg?style=svg)](https://circleci.com/gh/ryz310/my_api_client) [![Gem Version](https://badge.fury.io/rb/my_api_client.svg)](https://badge.fury.io/rb/my_api_client) [![Maintainability](https://api.codeclimate.com/v1/badges/861a2c8f168bbe995107/maintainability)](https://codeclimate.com/github/ryz310/my_api_client/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/861a2c8f168bbe995107/test_coverage)](https://codeclimate.com/github/ryz310/my_api_client/test_coverage) [![Dependabot Status](https://api.dependabot.com/badges/status?host=github&repo=ryz310/my_api_client)](https://dependabot.com)
+[![CircleCI](https://circleci.com/gh/ryz310/my_api_client.svg?style=svg)](https://circleci.com/gh/ryz310/my_api_client)
+[![Gem Version](https://badge.fury.io/rb/my_api_client.svg)](https://badge.fury.io/rb/my_api_client)
+[![Maintainability](https://api.codeclimate.com/v1/badges/861a2c8f168bbe995107/maintainability)](https://codeclimate.com/github/ryz310/my_api_client/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/861a2c8f168bbe995107/test_coverage)](https://codeclimate.com/github/ryz310/my_api_client/test_coverage)
+![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/ryz310/my_api_client)
 
 日本語ドキュメントは [こちら](README.jp.md)
 
@@ -12,8 +16,8 @@ It is supposed to be used in Ruby on Rails, but it is made to work in other envi
 
 ## Supported Versions
 
-- Ruby 2.7, 3.0, 3.1
-- Rails 5.2, 6.0, 6.1, 7.0
+- Ruby 2.7, 3.0, 3.1, 3.2
+- Rails 6.0, 6.1, 7.0
 
 ## Installation
 

data/lib/generators/generator_helper.rb

@@ -3,6 +3,10 @@
 module MyApiClient
   # The helper module for source generators
   module GeneratorHelper
+    def self.included(base)
+      base.include(Rails::Generators::ResourceHelpers)
+    end
+
     def yeild_request_arguments
       requests.each do |request|
         http_method, pathname = request.split(':')

data/lib/my_api_client/rspec/stub.rb

@@ -86,7 +86,7 @@ module MyApiClient
       when Proc
         stub_as_resource(options.call(*request))
       when Hash
-        if options[:raise] # rubocop:disable Style/GuardClause
+        if options[:raise]
           raise process_raise_option(options[:raise], options[:response], options[:status_code])
         elsif options[:response]
           stub_as_resource(options[:response])

data/lib/my_api_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MyApiClient
-  VERSION = '0.24.0'
+  VERSION = '0.26.0'
 end

data/my_api/Gemfile

@@ -2,12 +2,12 @@
 
 source 'https://rubygems.org'
 
-gem 'jets', '~> 3.1.5'
+gem 'jets', '~> 4.0.1'
 
 gem 'dynomite'
 
 # See: https://github.com/boltops-tools/jets/issues/523
-gem 'nokogiri', '~> 1.13.8'
+gem 'nokogiri', '~> 1.15.2'
 
 # development and test groups are not bundled as part of the deployment
 group :development, :test do