carsensor-api 0.0.1.alpha.1 → 0.0.1.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df4d8bdfa2ef6e4210bfae98f7801b1571cac2d794c5f618c1833c5f590d48f8
-  data.tar.gz: 7159a8f0944360ea6f935c710c043d569d4d841fde069e17b8ac2751d1be7649
+  metadata.gz: 538bfeef5a5107c35cf56609afeba4e3877543121e4269fd7dd6ac6dd245104a
+  data.tar.gz: bd877ad61e56a4fdfe942629e5c935701645f5cd67f43f0a66493eced170a7fb
 SHA512:
-  metadata.gz: 6d1f1111efd31f7548472191fb5cb179e02855fa12434cf73f07b00426382bd64ac19cb75e38cb74a854ab351e3b5401b9ff1a76176fc90ac158846acba4f558
-  data.tar.gz: cf7aef493c202fa72e5bb8c25d13f4ffe7b0946a960e8602094093948e01a236cf40fde58446111eee3d4c7a7c63909e9637a8d11c060690c0212c4d465a7e88
+  metadata.gz: 0a58a0d7500ecd48dc06ab7a3253f87fa95b24751caa4a2d7c513caf12167ad543eabdc8181073dd0330dffcc1904edcbb24f1a2424856b7ca2b5072e43d222e
+  data.tar.gz: 60e5338ced38e7ca10f20c8e83feb07778687bc32fab9a2c194ea4eec380f013f4b0c402e37b3c21ae865c96bd5a665dbe0e1cd36159cfadd957a797cc64cee0

data/carsensor-api.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rack'
+  spec.add_dependency 'retriable', '~>3.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'pry-byebug'

data/lib/carsensor/api.rb

@@ -1,19 +1,25 @@
 # frozen_string_literal: true
 
+require 'logger'
 require 'uri'
 require 'open-uri'
 require 'carsensor/api/version'
 require 'rack/utils'
+require 'retriable'
 
 module Carsensor
-  # A thin wrapper for Carsensor Web API at (https://webservice.recruit.co.jp/carsensor/reference.html
+  # A thin wrapper for Carsensor Web API at https://webservice.recruit.co.jp/carsensor/reference.html
   class API
     # Exception class for errors which would occur during invocation of Carsensor API
     class Error < StandardError
       # @param message [String] Message for the exception
       # @param code [Integer,String] Error code of API itself or error status of HTTP
-      def initialize(message:, code:)
-        super('%s(code: %s)' % [message, code])
+      def initialize(message:, code: nil)
+        if code
+          super('%s(code: %s)' % [message, code])
+        else
+          super(message)
+        end
       end
     end
 
@@ -25,10 +31,12 @@ module Carsensor
     end
 
     # @param key [String] The API key
-    def initialize(key:)
+    def initialize(key:, logger: Logger.new(STDOUT), tries: 3)
       raise ArgumentError, 'key: must be a String' unless key.is_a?(String)
 
       @key = key
+      @logger = logger
+      @tries = tries
     end
 
     # Returns bodies for given criterion
@@ -97,13 +105,33 @@ module Carsensor
     private
 
     def call_api(root, path, **query)
-      (method(:build_uri) >> method(:read_uri) >> method(:parse_body) >> method(:extract_result).curry[root]).(path, query)
+      Retriable.retriable(tries: @tries, on: [Error], on_retry: on_retry_proc(path, query)) do
+        (method(:build_uri) >> method(:read_uri) >> method(:parse_body) >> method(:extract_result).curry[root]).(path, query)
+      end
+    end
+
+    def on_retry_proc(path, **query)
+      lambda do |exception, _try, _elapsed_time, _next_interval|
+        return unless @logger
+
+        @logger.info(retry_message(exception, path, query))
+      end
+    end
+
+    def retry_message(exception, path, **query)
+      query_string = build_query_string(query)
+      request = query_string.length.zero? ? path : path + '?' + query_string
+      '%s %s %s' % [exception.class, exception.message, request]
+    end
+
+    def build_query_string(**query)
+      Rack::Utils.build_query(key: @key, format: 'json', **query.transform_values {|v| v.is_a?(Array) ? v.join(',') : v })
     end
 
     def build_uri(path, **query)
       ENDPOINT_BASE_URI.dup.tap do |u|
         u.path = path
-        u.query = Rack::Utils.build_query(key: @key, format: 'json', **query.transform_values {|v| v.is_a?(Array) ? v.join(',') : v })
+        u.query = build_query_string(query)
       end
     end
 
@@ -112,6 +140,8 @@ module Carsensor
     rescue OpenURI::HTTPError => e
       status = e.io.status
       raise Error.new(message: status[1], code: status[0])
+    rescue SocketError => e
+      raise Error.new(message: e.message)
     end
 
     def parse_body(body)
@@ -119,6 +149,8 @@ module Carsensor
         api_error = data.dig(:results, :error, 0)
         raise Error.new(**api_error) if api_error
       end
+    rescue JSON::ParserError => e
+      raise Error.new(message: e.message)
     end
 
     def extract_result(root, data)

data/lib/carsensor/api/version.rb

@@ -2,6 +2,6 @@
 
 module Carsensor
   class API
-    VERSION = '0.0.1.alpha.1'
+    VERSION = '0.0.1.alpha.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carsensor-api
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.1
+  version: 0.0.1.alpha.2
 platform: ruby
 authors:
 - OZAWA Sakuro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement