seibii-http 1.0.0 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049d320d3ad81582683158b91dc868413b5c4e169125b31c2a44f96c23ece44d'
-  data.tar.gz: 5807f9ba69b6d4f8ee5e08ddf0164fe0fe57ae140316a8b5a41d3a9545d145e1
+  metadata.gz: 695bc27dd326051ba625cff2aa68ea0588d4dc473ebe55de1f7d04a7d0910d3f
+  data.tar.gz: 198ce874071d08aec60edd8aaea8fb716e3872ac4fe7d23fdda3481bb3afc19e
 SHA512:
-  metadata.gz: c66ac55bb44a41272d1c77d0f57c328320307ed9077c4f8f32dcb92ee0487525fd0ee4d8a3e35b85a71b3a07b2a1abab0d707db8cd0cbff5c7327eb871016ea5
-  data.tar.gz: 445459558e6c883b0c5d8e921827469a87af65308aeefdd4eaa08ba0d36e516c2b4a7398bf48bcfa70843ee244c0ced97c57db1d82e630f271651ebaadc132d5
+  metadata.gz: 12178a3985e937a76355034bb2c2fade89220959d95b51e173038d090bbda94de6aeddcf6350225b07bb5d25c50e2d033259e6727a9ec4b0c617040211918eb1
+  data.tar.gz: c4c0e5a69b8c6d20be0416727a7002c694325f792c62f8b5b745815b49dfe1d03ec7bb8b290f6a014e9eb77c07ee31e64659147bd27b4564f0ec301701314676

data/.circleci/config.yml

@@ -17,7 +17,7 @@ restore_bundle_cache: &restore_bundle_cache
 jobs:
   build:
     docker:
-      - image: circleci/ruby
+      - image: circleci/ruby:2.7.2
     steps:
       - checkout
       - *restore_bundle_cache
@@ -29,7 +29,7 @@ jobs:
             - vendor/bundle
   rubocop:
     docker:
-      - image: circleci/ruby
+      - image: circleci/ruby:2.7.2
     steps:
       - checkout
       - *restore_bundle_cache
@@ -38,7 +38,7 @@ jobs:
       - run: bundle exec rubocop
   rspec:
     docker:
-      - image: circleci/ruby
+      - image: circleci/ruby:2.7.2
     steps:
       - checkout
       - *restore_bundle_cache

data/.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "11:00"
+    timezone: Asia/Tokyo
+  open-pull-requests-limit: 20
+  reviewers:
+  - avexbesuke
+  - amatotsuji
+  - yuta-sanada0089
+  ignore:
+  - dependency-name: codecov
+    versions:
+    - ">= 0.2.14.a, < 0.2.15"

data/Gemfile.lock

@@ -1,23 +1,21 @@
 PATH
   remote: .
   specs:
-    seibii-http (1.0.0)
+    seibii-http (1.0.4)
       oj
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    bigdecimal (2.0.0)
-    codecov (0.2.8)
-      json
-      simplecov
+    ast (2.4.2)
+    codecov (0.5.2)
+      simplecov (>= 0.15, < 0.22)
     coderay (1.1.3)
     diff-lcs (1.4.4)
-    docile (1.3.2)
-    ffi (1.13.1)
+    docile (1.3.5)
+    ffi (1.15.1)
     formatador (0.2.5)
-    guard (2.16.2)
+    guard (2.17.0)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
       lumberjack (>= 1.0.12, < 2.0)
@@ -31,66 +29,66 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    guard-rubocop (1.3.0)
+    guard-rubocop (1.4.0)
       guard (~> 2.0)
-      rubocop (~> 0.20)
-    json (2.3.1)
-    listen (3.2.1)
+      rubocop (< 2.0)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    lumberjack (1.2.7)
+    lumberjack (1.2.8)
     method_source (1.0.0)
     nenv (0.3.0)
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oj (3.10.12)
-      bigdecimal (>= 1.0, < 3)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    oj (3.11.7)
+    parallel (1.20.1)
+    parser (3.0.1.1)
       ast (~> 2.4.1)
-    pry (0.13.1)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rb-fsevent (0.10.4)
+    rake (13.0.3)
+    rb-fsevent (0.11.0)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.89.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.0)
+    rubocop (1.18.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    simplecov (0.19.0)
+    simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    thor (1.0.1)
-    unicode-display_width (1.7.0)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.2)
+    thor (1.1.0)
+    unicode-display_width (2.0.0)
 
 PLATFORMS
   ruby
@@ -108,4 +106,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -19,8 +19,11 @@ def get
     .request(
        method: :get, # required
        uri: URI.parse('https://example.com/example'), # required
+       read_timeout: 5, # optional, default set 60
+       write_timeout: 60, # optional, default set 60
        request_body: nil, # optional
-       headers: { Accept: '*/*' } # optional
+       headers: { Accept: '*/*' }, # optional
+       need_verify_cert: false # optional
     ) #=> response body String
 rescue Seibii::Http::ClientError => e # 404 will not raise exception but just return nil response
   p e
@@ -44,8 +47,11 @@ def post
     .request(
        method: :post, # required
        uri: URI.parse('https://example.com/example'), # required
+       read_timeout: 60, # optional, default set 60
+       write_timeout: 5, # optional, default set 60
        params: { a: 'b', c: 'd' }, # optional
-       headers: { Authorization: 'Bearer token' } # optional
+       headers: { Authorization: 'Bearer token' }, # optional
+       need_verify_cert: false # optional
     ) #=> response json hash
 rescue Seibii::Http::ClientError => e # 404 will not raise exception but just return nil response
   p e

data/lib/seibii/http/clients/base.rb

@@ -8,18 +8,21 @@ module Seibii
           @logger = logger
         end
 
-        def request(method:, uri:, request_body: nil, headers: {})
+        def request(method:, uri:, read_timeout: 60, write_timeout: 60, request_body: nil, headers: {}, need_verify_cert: false) # rubocop:disable Metrics/ParameterLists, Layout/LineLength
           parsed_uri = URI.parse(uri)
-          with_logging(uri) { http(parsed_uri).request(request_object(method, parsed_uri, request_body, headers)) }
+          http = http(parsed_uri, need_verify_cert)
+          http.read_timeout = read_timeout
+          http.write_timeout = write_timeout
+          with_logging(uri) { http.request(request_object(method, parsed_uri, request_body, headers)) }
             .yield_self { |response| handle_http_status(response) }
         end
 
         private
 
-        def http(uri)
+        def http(uri, need_verify_cert)
           @http ||= Net::HTTP.new(uri.host, uri.port).tap do |instance|
             instance.use_ssl = uri.scheme == 'https'
-            instance.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            instance.verify_mode = need_verify_cert ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
           end
         end
 
@@ -52,8 +55,8 @@ module Seibii
         def handle_http_status(response)
           case response.code.to_i
           when 404 then nil
-          when 400..499 then raise ClientError, response
-          when 500..599 then raise ServerError, response
+          when 400..499 then raise ClientError, response.body
+          when 500..599 then raise ServerError, response.body
           else response.body
           end
         end

data/lib/seibii/http/clients/json.rb

@@ -8,12 +8,15 @@ module Seibii
           @base = Base.new(logger: logger)
         end
 
-        def request(method:, uri:, params: nil, headers: {})
+        def request(method:, uri:, params: nil, headers: {}, need_verify_cert: false, read_timeout: 60, write_timeout: 60) # rubocop:disable Metrics/ParameterLists, Layout/LineLength
           response_body = @base.request(
             method: method,
             uri: uri,
             request_body: params&.yield_self { |p| Oj.dump(p, mode: :compat) },
-            headers: headers.merge('Accept': 'application/json', 'Content-Type': 'application/json')
+            headers: headers.merge(Accept: 'application/json', 'Content-Type': 'application/json'),
+            need_verify_cert: need_verify_cert,
+            read_timeout: read_timeout,
+            write_timeout: write_timeout
           )
           Oj.load(response_body, mode: :compat, symbol_keys: true)
         end

data/lib/seibii/http/version.rb

@@ -2,6 +2,6 @@
 
 module Seibii
   module Http
-    VERSION = '1.0.0'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seibii-http
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.4
 platform: ruby
 authors:
 - Yuji Ueki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -158,6 +158,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
+- ".github/dependabot.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".ruby-version"