my_api_client 0.18.0 → 0.22.0

data/lib/my_api_client/rspec/stub.rb

@@ -18,13 +18,17 @@ module MyApiClient
     # @example
     #   stub_api_client_all(
     #     ExampleApiClient,
+    #     get_users: {                                     # Returns an arbitrary pageable response
+    #       pageable: [ { id: 1 }, { id: 2 }]              # for `#pageable_get`.
+    #     },
     #     get_user: { response: { id: 1 } },               # Returns an arbitrary response.
     #     post_users: { id: 1 },                           # You can ommit `response` keyword.
     #     patch_user: ->(params) { { id: params[:id] } },  # Returns calculated result as response.
     #     put_user: { raise: MyApiClient::ClientError }    # Raises an arbitrary error.
     #     delete_user: {
     #       raise: MyApiClient::ClientError,
-    #       response: { errors: [{ code: 10 }] },          # You can stub response with exception.
+    #       response: { errors: [{ code: 10 }] },          # You can stub response and statu code
+    #       status_code: 429,                              # with an arbitrary error.
     #     }
     #   )
     #   response = ExampleApiClient.new.get_user(id: 123)
@@ -46,13 +50,17 @@ module MyApiClient
     # @example
     #   api_client = stub_api_client(
     #     ExampleApiClient,
+    #     get_users: {                                     # Returns an arbitrary pageable response
+    #       pageable: [ { id: 1 }, { id: 2 }]              # for `#pageable_get`.
+    #     },
     #     get_user: { response: { id: 1 } },               # Returns an arbitrary response.
     #     post_users: { id: 1 },                           # You can ommit `response` keyword.
     #     patch_user: ->(params) { { id: params[:id] } },  # Returns calculated result as response.
     #     put_user: { raise: MyApiClient::ClientError }    # Raises an arbitrary error.
     #     delete_user: {
     #       raise: MyApiClient::ClientError,
-    #       response: { errors: [{ code: 10 }] },          # You can stub response with exception.
+    #       response: { errors: [{ code: 10 }] },          # You can stub response and status code
+    #       status_code: 403,                              # with exception.
     #     }
     #   )
     #   response = api_client.get_user(id: 123)
@@ -67,25 +75,40 @@ module MyApiClient
 
     private
 
-    # rubocop:disable Metrics/AbcSize
     def stubbing(instance, action, options)
+      allow(instance).to receive(action) do |*request|
+        generate_stubbed_response(options, *request)
+      end
+    end
+
+    def generate_stubbed_response(options, *request) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       case options
       when Proc
-        allow(instance).to receive(action) { |*request| stub_as_resource(options.call(*request)) }
+        stub_as_resource(options.call(*request))
       when Hash
-        if options[:raise].present?
-          exception = process_raise_option(options[:raise], options[:response])
-          allow(instance).to receive(action).and_raise(exception)
+        if options[:raise] # rubocop:disable Style/GuardClause
+          raise process_raise_option(options[:raise], options[:response], options[:status_code])
         elsif options[:response]
-          allow(instance).to receive(action).and_return(stub_as_resource(options[:response]))
+          stub_as_resource(options[:response])
+        elsif options[:pageable].is_a?(Enumerable)
+          stub_as_pageable_resource(options[:pageable].each, *request)
         else
-          allow(instance).to receive(action).and_return(stub_as_resource(options))
+          stub_as_resource(options)
         end
       else
-        allow(instance).to receive(action).and_return(stub_as_resource(options))
+        stub_as_resource(options)
       end
     end
-    # rubocop:enable Metrics/AbcSize
+
+    def stub_as_pageable_resource(pager, *request)
+      Enumerator.new do |y|
+        loop do
+          y << generate_stubbed_response(pager.next, *request)
+        rescue StopIteration
+          break
+        end
+      end.lazy
+    end
 
     # Provides a shorthand for `raise` option.
     # `MyApiClient::Error` requires `MyApiClient::Params::Params` instance on
@@ -93,12 +116,14 @@ module MyApiClient
     # If given a error instance, it will return raw value without processing.
     #
     # @param exception [Clsas, MyApiClient::Error] Processing target.
+    # @param response [Hash] describe_response_here
+    # @param status_code [Integer] describe_status_code_here
     # @return [MyApiClient::Error] Processed exception.
     # @raise [RuntimeError] Unsupported error class was set.
-    def process_raise_option(exception, response = {})
+    def process_raise_option(exception, response, status_code)
       case exception
       when Class
-        params = MyApiClient::Params::Params.new(nil, stub_as_response(response))
+        params = MyApiClient::Params::Params.new(nil, stub_as_response(response, status_code))
         if exception == MyApiClient::NetworkError
           exception.new(params, Net::OpenTimeout.new)
         else
@@ -113,10 +138,10 @@ module MyApiClient
       end
     end
 
-    def stub_as_response(params)
+    def stub_as_response(params, status_code)
       instance_double(
         Sawyer::Response,
-        status: 400,
+        status: status_code.presence || 400,
         headers: {},
         data: stub_as_resource(params),
         timing: 0.123

data/lib/my_api_client/version.rb

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

data/my_api/.ruby-version

@@ -1 +1 @@
-2.5.7
+2.7.2

data/my_api/Gemfile

@@ -6,6 +6,9 @@ gem 'jets'
 
 gem 'dynomite'
 
+# See: https://github.com/boltops-tools/jets/issues/523
+gem 'nokogiri', '~> 1.12.5'
+
 # development and test groups are not bundled as part of the deployment
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

data/my_api/Gemfile.lock

@@ -1,43 +1,44 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      actionview (= 6.0.3.4)
-      activejob (= 6.0.3.4)
+    actionmailer (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      actionview (= 6.1.4.3)
+      activejob (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.3.4)
-      actionview (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-      rack (~> 2.0, >= 2.0.8)
+    actionpack (6.1.4.3)
+      actionview (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    actionview (6.1.4.3)
+      activesupport (= 6.1.4.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.3.4)
-      activesupport (= 6.0.3.4)
+    activejob (6.1.4.3)
+      activesupport (= 6.1.4.3)
       globalid (>= 0.3.6)
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activerecord (6.0.3.4)
-      activemodel (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.1.4.3)
+      activesupport (= 6.1.4.3)
+    activerecord (6.1.4.3)
+      activemodel (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
+    activesupport (6.1.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    addressable (2.7.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-mfa-secure (0.4.2)
+    aws-eventstream (1.2.0)
+    aws-mfa-secure (0.4.3)
       activesupport
       aws-sdk-core
       aws_config
@@ -45,65 +46,68 @@ GEM
       rainbow
       thor
       zeitwerk
-    aws-partitions (1.358.0)
-    aws-sdk-apigateway (1.49.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-partitions (1.541.0)
+    aws-sdk-apigateway (1.71.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.41.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudformation (1.63.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.34.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudwatchlogs (1.49.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.104.4)
+    aws-sdk-core (3.124.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.51.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-dynamodb (1.69.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.27.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kinesis (1.38.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.52.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.48.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-lambda (1.76.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.104.3)
+    aws-sdk-s3 (1.109.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.4)
+    aws-sdk-sns (1.49.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.29.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-sqs (1.48.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.30.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ssm (1.126.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.86.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     aws_config (0.1.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.34.0)
+    capybara (3.36.0)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    cfn-status (0.4.3)
+      aws-sdk-cloudformation
     cfn_camelizer (0.4.9)
       activesupport
       memoist
       rainbow
-    cfnresponse (0.4.0)
-    concurrent-ruby (1.1.7)
+    cfn_response (0.2.0)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
     diff-lcs (1.4.4)
     dotenv (2.7.6)
@@ -111,19 +115,19 @@ GEM
       activesupport
       aws-sdk-dynamodb
       rainbow
-    erubi (1.9.0)
+    erubi (1.10.0)
     gems (1.2.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    hashie (4.1.0)
-    i18n (1.8.5)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    hashie (5.0.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jets (2.3.17)
-      actionmailer (~> 6.0.0)
-      actionpack (~> 6.0.0)
-      actionview (~> 6.0.0)
-      activerecord (~> 6.0.0)
-      activesupport (~> 6.0.0)
+    jets (3.0.23)
+      actionmailer (~> 6.1.0)
+      actionpack (~> 6.1.0)
+      actionview (~> 6.1.0)
+      activerecord (~> 6.1.0)
+      activesupport (~> 6.1.0)
       aws-mfa-secure (~> 0.4.0)
       aws-sdk-apigateway
       aws-sdk-cloudformation
@@ -135,69 +139,70 @@ GEM
       aws-sdk-sns
       aws-sdk-sqs
       aws-sdk-ssm
+      cfn-status
       cfn_camelizer (~> 0.4.6)
-      cfnresponse
+      cfn_response
       dotenv
       gems
       hashie
-      jets-gems
       jets-html-sanitizer
       kramdown
       memoist
-      mimemagic
+      mini_mime
       rack
-      railties (~> 6.0.0)
+      railties (~> 6.1.0)
       rainbow
       recursive-open-struct
+      serverlessgems (~> 0.1.4)
       shotgun
       text-table
       thor
-      zeitwerk
-    jets-gems (0.2.2)
-      gems
+      zeitwerk (~> 2.4.0)
     jets-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
     jmespath (1.4.0)
-    kramdown (2.3.0)
+    kramdown (2.3.1)
       rexml
     launchy (2.5.0)
       addressable (~> 2.7)
-    loofah (2.7.0)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
+    matrix (0.4.2)
     memoist (0.16.2)
     method_source (1.0.0)
-    mimemagic (0.3.5)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.2)
-    nio4r (2.5.4)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
+    mini_mime (1.1.2)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
+    nio4r (2.5.8)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
     public_suffix (4.0.6)
-    puma (5.1.0)
+    puma (5.5.2)
       nio4r (~> 2.0)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.0.3.4)
-      actionpack (= 6.0.3.4)
-      activesupport (= 6.0.3.4)
+    railties (6.1.4.3)
+      actionpack (= 6.1.4.3)
+      activesupport (= 6.1.4.3)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.1)
-    recursive-open-struct (1.1.2)
-    regexp_parser (1.8.2)
-    rexml (3.2.4)
+    rake (13.0.6)
+    recursive-open-struct (1.1.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -213,16 +218,19 @@ GEM
     rspec-support (3.10.0)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
+    serverlessgems (0.1.6)
+      gems
+      memoist
+      zeitwerk
     shotgun (0.9.2)
       rack (>= 1.0)
     text-table (1.2.4)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -233,6 +241,7 @@ DEPENDENCIES
   dynomite
   jets
   launchy
+  nokogiri (~> 1.12.5)
   puma
   rack
   rspec

data/my_api/app/controllers/pagination_controller.rb

@@ -4,7 +4,7 @@
 class PaginationController < ApplicationController
   # GET pagination
   def index
-    case params[:page]
+    case params[:page]&.to_s
     when '1', nil
       render status: :ok, json: first_page
     when '2'
@@ -50,7 +50,7 @@ class PaginationController < ApplicationController
   #       but it should be `https://xxxxx.execute-api.ap-northeast-1.amazonaws.com/dev/pagination`.
   #       So this is workaround.
   def page_link(page)
-    query_strings = '?' + { page: page }.to_query
+    query_strings = "?#{{ page: page }.to_query}"
     uri = File.join(ENV['JETS_HOST'], ENV['JETS_STAGE'], pagination_path)
     uri.sub!('http://', 'https://')
     URI.join(uri, query_strings)

data/my_api/public/index.html

@@ -83,8 +83,8 @@
       <p>Also check out the <a href="http://rubyonjets.com/reference">Jets CLI reference</a>.</p>
     </div>
     <p class="version">
-      <strong>Jets version:</strong> 2.3.13<br />
-      <strong>Ruby version:</strong> 2.5.3
+      <strong>Jets version:</strong> 3.0.11<br />
+      <strong>Ruby version:</strong> 2.7.2
     </p>
   </div>
 </body>

data/my_api/spec/spec_helper.rb

@@ -18,7 +18,7 @@ require 'jets/spec_helpers'
 # Rspec helper module
 module Helpers
   def payload(name)
-    JSON.parse(IO.read("spec/fixtures/payloads/#{name}.json"))
+    JSON.parse(File.read("spec/fixtures/payloads/#{name}.json"))
   end
 end
 

data/my_api_client.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.5.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency 'activesupport', '>= 5.0.0'
+  spec.add_dependency 'activesupport', '>= 5.2.0'
   spec.add_dependency 'faraday', '>= 0.17.1'
   spec.add_dependency 'jsonpath'
   spec.add_dependency 'sawyer', '>= 0.8.2'
@@ -37,7 +37,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'simplecov', '0.17.1'
+  spec.add_development_dependency 'simplecov', '0.21.2'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'yard'
+  spec.metadata = {
+    'rubygems_mfa_required' => 'true',
+  }
 end