my_api_client 0.15.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b40beeb8a70a00452e59208a5c7e2d5dee2c8155d2e23b5cd950e1a7e6f3eb1
-  data.tar.gz: 15c927bb0954c12225a73955b23b7ccc71b784a2cb63832f7914a757f2ac2ed2
+  metadata.gz: 5609ea96b6fa8a515176a95b02ffedf732d4d1fe79a0885ed5a893c804000df7
+  data.tar.gz: ae8465d2dedbd0f1c3f06d2c00ede391959ed710c2c60cc00830bee2ba88975f
 SHA512:
-  metadata.gz: c57cfcf7db9a8b9d45ee0c603402c910d2ea59bc0f3b406ba2c91388e9b0bab0997fe948dea5944fbc06499ea259c83579a154158808cce7433ea8d0beb02236
-  data.tar.gz: acc4846d877c8aace073858a102c72cc13245d6b13c94542b90d5da43798d04a6317533797b3e92a7e7710f532936ae551a0fa9cb1dcc8151bf58c68f5f06e24
+  metadata.gz: 57d9a99fcba5b23a291817626d2d1813d3867335ce9129f74b2208cbed97c1b0ab9e63ee6ca3174f64bfacd43d3c6ff1d27e3c635e467d155c07772205816bb4
+  data.tar.gz: 63eb822667774d43a146407d413a873ddca0361f9aac1c1afad687a65626cc8fb5f5f162ba150cf08622a0f0ad8b0aec47daa32c4331c21f6dc3cf8dc60356bb

data/.circleci/config.yml

@@ -12,31 +12,38 @@ references:
   - &ruby_version
     ruby_version:
       type: enum
-      enum: ['2.4', '2.5', '2.6', '2.7']
-      default: '2.7'
+      enum: ['2.5', '2.6', '2.7', '3.0']
+      default: '3.0'
   - &rails_version
     rails_version:
       type: enum
-      enum: ['4.2', '5.0', '5.1', '5.2', '6.0']
-      default: '6.0'
+      enum: ['5.2', '6.0', '6.1']
+      default: '6.1'
   - &bundler_options
     bundler_options:
       type: string
       default: ''
 
 executors:
-  executor_for_api:
+  api_executor:
     parameters:
       <<: *ruby_version
     docker:
-      - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
+      - image: circleci/ruby:<< parameters.ruby_version >>
     working_directory: ~/repo/my_api
-  executor_for_gem:
+  gem_executor:
     parameters:
       <<: *ruby_version
     docker:
-       - image: circleci/ruby:<< parameters.ruby_version >>-node-browsers
+       - image: circleci/ruby:<< parameters.ruby_version >>
     working_directory: ~/repo
+  rails_executor:
+    parameters:
+      <<: *ruby_version
+      <<: *rails_version
+    docker:
+       - image: circleci/ruby:<< parameters.ruby_version >>
+    working_directory: ~/repo/rails_app/rails_<< parameters.rails_version >>
 
 commands:
   modify_active_support_version:
@@ -144,18 +151,18 @@ commands:
           path: ~/repo
       - run:
           name: Install Bundler 2.x
-          command: gem install bundler:2.1.2
+          command: gem install bundler -v '~> 2.0'
       - ruby-orbs/bundle-install:
           cache_key_prefix: v1-dependencies-<< parameters.ruby_version >>
           bundle_extra_args: << parameters.bundler_options >>
           restore_bundled_with: false
   test_and_deploy_for_api:
-    description: Build the API
+    description: Test and build the API
     steps:
       - run_rspec_for_api
       - deploy_api_server
   test_and_build_for_gem:
-    description: Build the RubyGem
+    description: Test and build the RubyGem
     parameters:
       <<: *rails_version
     steps:
@@ -163,13 +170,44 @@ commands:
           rails_version: << parameters.rails_version >>
       - run_rspec_for_gem
       - rake_build
+  verify_api_client_generator:
+    description: Verify the API client generator
+    parameters:
+      <<: *rails_version
+    steps:
+      - run:
+          name: Generate new API client files
+          command: |
+            bin/rails g api_client path/to/resource \
+              get:path/to/resource \
+              post:path/to/resource \
+              --endpoint https://example.com/myapi
+      - run:
+          name: Check the API client files exists
+          command: |
+            test -e "app/api_clients/application_api_client.rb" & \
+            test -e "app/api_clients/path/to/resource_api_client.rb" & \
+            test -e "spec/api_clients/path/to/resource_api_client_spec.rb"
+      - run:
+          name: Run rspec with the generated spec file
+          command: bundle exec rspec -f d spec/api_clients/path/to
 
 jobs:
+  test_api:
+    parameters:
+      <<: *ruby_version
+    executor:
+      name: api_executor
+      ruby_version: << parameters.ruby_version >>
+    steps:
+      - setup:
+          ruby_version: << parameters.ruby_version >>
+      - run_rspec_for_api
   deploy_api:
     parameters:
       <<: *ruby_version
     executor:
-      name: executor_for_api
+      name: api_executor
       ruby_version: << parameters.ruby_version >>
     steps:
       - setup:
@@ -181,7 +219,7 @@ jobs:
       <<: *rails_version
       <<: *bundler_options
     executor:
-      name: executor_for_gem
+      name: gem_executor
       ruby_version: << parameters.ruby_version >>
     steps:
       - setup:
@@ -189,33 +227,46 @@ jobs:
           bundler_options: << parameters.bundler_options >>
       - test_and_build_for_gem:
           rails_version: << parameters.rails_version >>
+  verify_generator:
+    parameters:
+      <<: *ruby_version
+      <<: *rails_version
+    executor:
+      name: rails_executor
+      ruby_version: << parameters.ruby_version >>
+      rails_version: << parameters.rails_version >>
+    steps:
+      - setup:
+          ruby_version: << parameters.ruby_version >>
+      - verify_api_client_generator:
+          rails_version: << parameters.rails_version >>
   upload-coverage:
-    executor: executor_for_gem
+    executor: gem_executor
     steps:
       - attach_workspace:
           at: ~/repo
       - code-climate/install
       - code-climate/sum-coverage:
           input: codeclimate.*.json
-          parts: 19
+          parts: 13
       - code-climate/upload-coverage
   rubocop:
-    executor: executor_for_gem
+    executor: gem_executor
     steps:
       - setup
       - rubocop
   yardoc:
-    executor: executor_for_gem
+    executor: gem_executor
     steps:
       - setup
       - yardoc
   rubocop_challenge:
-    executor: executor_for_gem
+    executor: gem_executor
     steps:
       - checkout
       - rubocop_challenge
   release:
-    executor: executor_for_gem
+    executor: gem_executor
     steps:
       - setup
       - release
@@ -225,34 +276,6 @@ workflows:
 
   commit:
     jobs:
-      - build_gem:
-          name: build_on_ruby_2.4_and_rails_4.2
-          ruby_version:  '2.4'
-          rails_version: '4.2'
-      - build_gem:
-          name: build_on_ruby_2.4_and_rails_5.0
-          ruby_version:  '2.4'
-          rails_version: '5.0'
-      - build_gem:
-          name: build_on_ruby_2.4_and_rails_5.1
-          ruby_version:  '2.4'
-          rails_version: '5.1'
-      - build_gem:
-          name: build_on_ruby_2.4_and_rails_5.2
-          ruby_version:  '2.4'
-          rails_version: '5.2'
-      - build_gem:
-          name: build_on_ruby_2.5_and_rails_4.2
-          ruby_version:  '2.5'
-          rails_version: '4.2'
-      - build_gem:
-          name: build_on_ruby_2.5_and_rails_5.0
-          ruby_version:  '2.5'
-          rails_version: '5.0'
-      - build_gem:
-          name: build_on_ruby_2.5_and_rails_5.1
-          ruby_version:  '2.5'
-          rails_version: '5.1'
       - build_gem:
           name: build_on_ruby_2.5_and_rails_5.2
           ruby_version:  '2.5'
@@ -262,17 +285,9 @@ workflows:
           ruby_version:  '2.5'
           rails_version: '6.0'
       - build_gem:
-          name: build_on_ruby_2.6_and_rails_4.2
-          ruby_version:  '2.6'
-          rails_version: '4.2'
-      - build_gem:
-          name: build_on_ruby_2.6_and_rails_5.0
-          ruby_version:  '2.6'
-          rails_version: '5.0'
-      - build_gem:
-          name: build_on_ruby_2.6_and_rails_5.1
-          ruby_version:  '2.6'
-          rails_version: '5.1'
+          name: build_on_ruby_2.5_and_rails_6.1
+          ruby_version:  '2.5'
+          rails_version: '6.1'
       - build_gem:
           name: build_on_ruby_2.6_and_rails_5.2
           ruby_version:  '2.6'
@@ -282,72 +297,131 @@ workflows:
           ruby_version:  '2.6'
           rails_version: '6.0'
       - build_gem:
-          name: build_on_ruby_2.7_and_rails_5.0
-          ruby_version:  '2.7'
-          rails_version: '5.0'
-      - build_gem:
-          name: build_on_ruby_2.7_and_rails_5.1
-          ruby_version:  '2.7'
-          rails_version: '5.1'
+          name: build_on_ruby_2.6_and_rails_6.1
+          ruby_version:  '2.6'
+          rails_version: '6.1'
       - build_gem:
           name: build_on_ruby_2.7_and_rails_5.2
           ruby_version:  '2.7'
           rails_version: '5.2'
       - build_gem:
-          name: build_on_ruby_2.7_and_rails_6.0_with_integrations
+          name: build_on_ruby_2.7_and_rails_6.0
           ruby_version:  '2.7'
           rails_version: '6.0'
+      - build_gem:
+          name: build_on_ruby_2.7_and_rails_6.1_with_integrations
+          ruby_version:  '2.7'
+          rails_version: '6.1'
           bundler_options: '--with integrations'
       - build_gem:
-          name: build_on_ruby_2.7_and_rails_6.0_without_integrations
+          name: build_on_ruby_2.7_and_rails_6.1_without_integrations
           ruby_version:  '2.7'
+          rails_version: '6.1'
+          bundler_options: '--without integrations'
+      - build_gem:
+          name: build_on_ruby_3.0_and_rails_6.0
+          ruby_version:  '3.0'
           rails_version: '6.0'
+      - build_gem:
+          name: build_on_ruby_3.0_and_rails_6.1_with_integrations
+          ruby_version:  '3.0'
+          rails_version: '6.1'
+          bundler_options: '--with integrations'
+      - build_gem:
+          name: build_on_ruby_3.0_and_rails_6.1_without_integrations
+          ruby_version:  '3.0'
+          rails_version: '6.1'
           bundler_options: '--without integrations'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.5_and_rails_5.2
+          ruby_version:  '2.5'
+          rails_version: '5.2'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.5_and_rails_6.0
+          ruby_version:  '2.5'
+          rails_version: '6.0'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.5_and_rails_6.1
+          ruby_version:  '2.5'
+          rails_version: '6.1'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.6_and_rails_5.2
+          ruby_version:  '2.6'
+          rails_version: '5.2'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.6_and_rails_6.0
+          ruby_version:  '2.6'
+          rails_version: '6.0'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.6_and_rails_6.1
+          ruby_version:  '2.6'
+          rails_version: '6.1'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.7_and_rails_5.2
+          ruby_version:  '2.7'
+          rails_version: '5.2'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.7_and_rails_6.0
+          ruby_version:  '2.7'
+          rails_version: '6.0'
+      - verify_generator:
+          name: verify_generator_on_ruby_2.7_and_rails_6.1
+          ruby_version:  '2.7'
+          rails_version: '6.1'
+      - verify_generator:
+          name: verify_generator_on_ruby_3.0_and_rails_6.0
+          ruby_version:  '3.0'
+          rails_version: '6.0'
+      - verify_generator:
+          name: verify_generator_on_ruby_3.0_and_rails_6.1
+          ruby_version:  '3.0'
+          rails_version: '6.1'
+      - test_api:
+          ruby_version:  '2.7' # Jets supports only Ruby 2.x
       - rubocop
       - yardoc
       - upload-coverage:
           requires:
-            - build_on_ruby_2.4_and_rails_4.2
-            - build_on_ruby_2.4_and_rails_5.0
-            - build_on_ruby_2.4_and_rails_5.1
-            - build_on_ruby_2.4_and_rails_5.2
-            - build_on_ruby_2.5_and_rails_4.2
-            - build_on_ruby_2.5_and_rails_5.0
-            - build_on_ruby_2.5_and_rails_5.1
             - build_on_ruby_2.5_and_rails_5.2
             - build_on_ruby_2.5_and_rails_6.0
-            - build_on_ruby_2.6_and_rails_4.2
-            - build_on_ruby_2.6_and_rails_5.0
-            - build_on_ruby_2.6_and_rails_5.1
+            - build_on_ruby_2.5_and_rails_6.1
             - build_on_ruby_2.6_and_rails_5.2
             - build_on_ruby_2.6_and_rails_6.0
-            - build_on_ruby_2.7_and_rails_5.0
-            - build_on_ruby_2.7_and_rails_5.1
+            - build_on_ruby_2.6_and_rails_6.1
             - build_on_ruby_2.7_and_rails_5.2
-            - build_on_ruby_2.7_and_rails_6.0_with_integrations
-            - build_on_ruby_2.7_and_rails_6.0_without_integrations
+            - build_on_ruby_2.7_and_rails_6.0
+            - build_on_ruby_2.7_and_rails_6.1_with_integrations
+            - build_on_ruby_2.7_and_rails_6.1_without_integrations
+            - build_on_ruby_3.0_and_rails_6.0
+            - build_on_ruby_3.0_and_rails_6.1_with_integrations
+            - build_on_ruby_3.0_and_rails_6.1_without_integrations
       - release:
           context: RubyGems API Key
           requires:
-            - build_on_ruby_2.4_and_rails_4.2
-            - build_on_ruby_2.4_and_rails_5.0
-            - build_on_ruby_2.4_and_rails_5.1
-            - build_on_ruby_2.4_and_rails_5.2
-            - build_on_ruby_2.5_and_rails_4.2
-            - build_on_ruby_2.5_and_rails_5.0
-            - build_on_ruby_2.5_and_rails_5.1
             - build_on_ruby_2.5_and_rails_5.2
             - build_on_ruby_2.5_and_rails_6.0
-            - build_on_ruby_2.6_and_rails_4.2
-            - build_on_ruby_2.6_and_rails_5.0
-            - build_on_ruby_2.6_and_rails_5.1
+            - build_on_ruby_2.5_and_rails_6.1
             - build_on_ruby_2.6_and_rails_5.2
             - build_on_ruby_2.6_and_rails_6.0
-            - build_on_ruby_2.7_and_rails_5.0
-            - build_on_ruby_2.7_and_rails_5.1
+            - build_on_ruby_2.6_and_rails_6.1
             - build_on_ruby_2.7_and_rails_5.2
-            - build_on_ruby_2.7_and_rails_6.0_with_integrations
-            - build_on_ruby_2.7_and_rails_6.0_without_integrations
+            - build_on_ruby_2.7_and_rails_6.0
+            - build_on_ruby_2.7_and_rails_6.1_with_integrations
+            - build_on_ruby_2.7_and_rails_6.1_without_integrations
+            - build_on_ruby_3.0_and_rails_6.0
+            - build_on_ruby_3.0_and_rails_6.1_with_integrations
+            - build_on_ruby_3.0_and_rails_6.1_without_integrations
+            - verify_generator_on_ruby_2.5_and_rails_5.2
+            - verify_generator_on_ruby_2.5_and_rails_6.0
+            - verify_generator_on_ruby_2.5_and_rails_6.1
+            - verify_generator_on_ruby_2.6_and_rails_5.2
+            - verify_generator_on_ruby_2.6_and_rails_6.0
+            - verify_generator_on_ruby_2.6_and_rails_6.1
+            - verify_generator_on_ruby_2.7_and_rails_5.2
+            - verify_generator_on_ruby_2.7_and_rails_6.0
+            - verify_generator_on_ruby_2.7_and_rails_6.1
+            - verify_generator_on_ruby_3.0_and_rails_6.0
+            - verify_generator_on_ruby_3.0_and_rails_6.1
             - rubocop
           filters:
             branches:

data/.dependabot/config.yml

@@ -2,16 +2,13 @@ version: 1
 update_configs:
   - package_manager: "ruby:bundler"
     directory: "/"
-    update_schedule: "weekly"
+    update_schedule: "live"
     default_reviewers:
       - "ryz310"
     default_assignees:
       - "ryz310"
     default_labels:
       - "dependabot"
-    ignored_updates:
-      - match:
-          dependency_name: "rubocop*"
     automerged_updates:
       - match:
           dependency_type: "development"
@@ -21,7 +18,7 @@ update_configs:
           update_type: "semver:patch"
   - package_manager: "ruby:bundler"
     directory: "/my_api"
-    update_schedule: "weekly"
+    update_schedule: "live"
     default_reviewers:
       - "ryz310"
     default_assignees:

data/.rubocop.yml

@@ -5,7 +5,11 @@ require:
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  NewCops: enable
+  Exclude:
+    - rails_app/**/*
+    - vendor/bundle/**/*
 
 Layout/LineLength:
   Max: 100