my_api_client 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69428c98a5d5ed81629f33444ec91ed49937807a0f2f4ac16f3064536f4ca2de
-  data.tar.gz: e7343cb7c618e81ac462ab8cd25a0d498a5230f59e2aef796a6af9d54ab2162d
+  metadata.gz: cff6147b021565de2bbace815aad8f2f5f46429c206837a1c703474973c3e9e5
+  data.tar.gz: b64a9ecfcdbbe6b9b850650201df5eb36f9ff3c081d5f0426a4eeee03c5bac48
 SHA512:
-  metadata.gz: 37f6d35744b13c536e7c1ebeb346000d476d4c949797c93e78e66c15578a48db1d9410cc4a37a14ef6767d064438a71a4e78c39efab06e924d7219bbc601629f
-  data.tar.gz: 11db9f5cde2cd7d8bb1af0195d3fa9a6969838bb9d3cda158a8c1585e8f26d855f20a348dff9163c0405718502d67090cf00d38bfb4785c740e6a0aa9e7f3375
+  metadata.gz: ec4a16df9a544a84658a5df6953c0cb141ef8d8867091723fe6a538c5b77fd3ad2da3f0d1afff1eee7eae394692dbc99785d426005196089c181938614c6cb30
+  data.tar.gz: 624c0d500e344920206beeaaecbe9c24f1020850ab0181aca38499d474a7171335a8b4d85ab29317778880b98e052f9d90f4f08fa4a4d85fe915aaf636368d04

data/.gem_comet.yml

@@ -0,0 +1,6 @@
+version: 1
+
+release:
+  base_branch: master
+  release_branch: production
+  version_file_path: lib/my_api_client/version.rb

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-06-25 23:31:06 +0000 using RuboCop version 0.72.0.
+# on 2019-07-16 23:31:21 +0000 using RuboCop version 0.73.0.
 # 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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    my_api_client (0.6.2)
+    my_api_client (0.7.0)
       activesupport (>= 4.2.0)
       jsonpath
       sawyer
@@ -28,7 +28,7 @@ GEM
     docile (1.3.2)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    hashdiff (0.4.0)
+    hashdiff (1.0.0)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.3)
@@ -40,14 +40,9 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.1.1)
-    octokit (4.14.0)
-      sawyer (~> 0.8.0, >= 0.5.3)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
-    pr_comet (0.2.0)
-      octokit
-      rainbow
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -72,7 +67,7 @@ GEM
     rspec-support (3.8.2)
     rspec_junit_formatter (0.4.1)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.72.0)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -111,7 +106,6 @@ DEPENDENCIES
   bugsnag (>= 6.11.0)
   bundler (~> 1.16)
   my_api_client!
-  pr_comet
   pry-byebug
   rake (~> 10.0)
   rspec

data/README.jp.md

@@ -24,7 +24,7 @@ gem 'my_api_client'
 Ruby on Rails を利用している場合は `generator` 機能を利用できます。
 
 ```sh
-$ rails g api_client path/to/resource https://example.com get_user:get:path/to/resource
+$ rails g api_client path/to/resource get:path/to/resource
 
 create  app/api_clients/application_api_client.rb
 create  app/api_clients/path/to/resource_api_client.rb

data/lib/generators/generator_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module MyApiClient
+  # The helper module for source generators
+  module GeneratorHelper
+    def yeild_request_arguments
+      requests.each do |request|
+        http_method, pathname = request.split(':')
+        action = "#{http_method}_#{pathname.tr('/', '_')}"
+        yield action, http_method, pathname
+      end
+    end
+  end
+end

data/lib/generators/rails/USAGE

@@ -2,7 +2,7 @@ Description:
     Generate a new api client class files.
 
 Example:
-    `rails g api_client path/to/resource https://example.com get_user:get:path/to/resource`
+    `rails g api_client path/to/resource get:path/to/resource`
 
     This will create:
         create  app/api_clients/application_api_client.rb

data/lib/generators/rails/api_client_generator.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
+require_relative '../generator_helper'
+
 module Rails
   # rails g api_client
   class ApiClientGenerator < Rails::Generators::NamedBase
+    include MyApiClient::GeneratorHelper
+
     source_root File.expand_path('templates', __dir__)
     check_class_collision suffix: 'ApiClient'
 
-    argument :endpoint,
-             type: :string,
-             default: 'https://example.com',
-             banner: '{schema and hostname}'
     argument :requests,
              type: :array,
-             default: %w[get_resource:get:path/to/resource post_resource:post:path/to/resource],
-             banner: '{action}:{method}:{path} {action}:{method}:{path}'
+             default: %w[get:path/to/resource post:path/to/resource],
+             banner: '{method}:{path} {method}:{path}'
 
     def generate_root_class
       file_path = File.join('app/api_clients', 'application_api_client.rb')

data/lib/generators/rails/templates/api_client.rb.erb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class <%= "#{class_name}ApiClient" %> < ::ApplicationApiClient
-  endpoint '<%= endpoint %>'
+  endpoint '{ endpoint }'
 
   # error_handling json: { '$.errors.code': 10 } do |params, logger|
   #   # Behavior when detected an error.
@@ -10,9 +10,8 @@ class <%= "#{class_name}ApiClient" %> < ::ApplicationApiClient
   def initialize
   end
 
-<% requests.each do |request| -%>
-<% action, http_method, pathname = request.split(':') -%>
-  # <%= "#{http_method.upcase} #{endpoint}/#{pathname}" %>
+<% yeild_request_arguments do |action, http_method, pathname| -%>
+  # <%= "#{http_method.upcase} #{pathname}" %>
   #
   # @return [Sawyer::Resource] Description of the API response
   # @raise [MyApiClient::Error] Description of the error

data/lib/generators/rspec/USAGE

@@ -2,7 +2,7 @@ Description:
     Generate a new api client spec files.
 
 Example:
-    rails g rspec:api_client path/to/resource https://example.com get_user:get:path/to/resource`
+    rails g rspec:api_client path/to/resource get:path/to/resource`
 
     This will create:
         create  spec/api_clients/path/to/resource_api_client_spec.rb

data/lib/generators/rspec/api_client_generator.rb

@@ -1,21 +1,20 @@
 # frozen_string_literal: true
 
 require 'generators/rspec'
+require_relative '../generator_helper'
 
 module Rspec
   module Generators
     # rails g rspec:api_client
     class ApiClientGenerator < Base
+      include MyApiClient::GeneratorHelper
+
       source_root File.expand_path('templates', __dir__)
 
-      argument :endpoint,
-               type: :string,
-               default: 'https://example.com',
-               banner: '{schema and hostname}'
       argument :requests,
                type: :array,
-               default: %w[get_resource:get:path/to/resource post_resource:post:path/to/resource],
-               banner: '{action}:{method}:{path} {action}:{method}:{path}'
+               default: %w[get:path/to/resource post:path/to/resource],
+               banner: '{method}:{path} {method}:{path}'
 
       class_option :api_client_specs, type: :boolean, default: true
 

data/lib/generators/rspec/templates/api_client_spec.rb.erb

@@ -5,8 +5,7 @@ require 'rails_helper'
 RSpec.describe <%= "#{class_name}ApiClient" %>, <%= type_metatag(:api_client) %> do
   let(:api_client) { described_class.new }
 
-<% requests.each do |request| -%>
-<% action, http_method, pathname = request.split(':') -%>
+<% yeild_request_arguments do |action, http_method, pathname| -%>
   describe '#<%= action %>' do
   end
 <% end -%>

data/lib/my_api_client/error_handling.rb

@@ -49,7 +49,7 @@ module MyApiClient
         return true if operator.nil?
 
         case operator
-        when String, Integer
+        when String, Integer, TrueClass, FalseClass
           operator == target
         when Range
           operator.include?(target)

data/lib/my_api_client/params/params.rb

@@ -60,6 +60,7 @@ module MyApiClient
             response_status: response.status,
             response_headers: response.headers,
             response_body: body,
+            duration: response.timing,
           }.compact
         else
           {}

data/lib/my_api_client/version.rb

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

data/my_api_client.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'sawyer'
 
   spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'pr_comet'
   spec.add_development_dependency 'pry-byebug'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_api_client
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - ryz310
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-03 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: pr_comet
-  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'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -229,6 +215,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".envrc.skeleton"
+- ".gem_comet.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -241,12 +228,12 @@ files:
 - README.md
 - Rakefile
 - bin/console
-- bin/release
 - bin/setup
 - gemfiles/rails_4.2.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- lib/generators/generator_helper.rb
 - lib/generators/rails/USAGE
 - lib/generators/rails/api_client_generator.rb
 - lib/generators/rails/templates/api_client.rb.erb

data/bin/release

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-# usage: bin/release VERSION
-
-require 'bundler/setup'
-require 'pr_comet'
-
-VERSION_FORMAT = /\A\d+\.\d+\.\d+(\.(pre|beta|rc)\d?)?\z/.freeze
-version = ARGV[0]
-pr_comet = PrComet.new(base: 'master', branch: "update/v#{version}")
-
-# Verifying
-abort 'usage: bin/release VERSION' if version.nil?
-abort 'A version must be like a `1.2.3`' unless version =~ VERSION_FORMAT
-
-# Modify a version file
-pr_comet.commit ':comet: Update version' do
-  File.write('lib/my_api_client/version.rb', <<~VERSION)
-    # frozen_string_literal: true
-
-    module MyApiClient
-      VERSION = '#{version}'
-    end
-  VERSION
-end
-
-# Bundle Update
-pr_comet.commit ':comet: Run $ bundle update' do
-  `bundle update`
-end
-
-# Create a pull request
-pr_comet.create!(title: "Update v#{version}", body: '')