openbd_api 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d7dbb8431a3263434f2803c4d6ddfe812b45638
-  data.tar.gz: c8418e54012fef1faaed816df101b5d51d22633e
+  metadata.gz: 7677573ec1279c4f8264add004da473f3a82b9c0
+  data.tar.gz: c4c9a33631c29b4930a4b39015ff8fd6cddcb506
 SHA512:
-  metadata.gz: cdb36dd3ebb4a0fb33daa50781a3b7199906740af32c60e7c24cb2dd700b8181139b9434cf298a521bd72366397ddca5b041bf2fdcd28afc1630b392cccef03b
-  data.tar.gz: 768c10f9b655a6f8c33b370979c14f54ba240751f7a8c8ff800834e09cf31165acddf785508c7d0065f3d788095709006ee31f66c76e4059d0ecbd16d232e5e5
+  metadata.gz: d4b4a92fb6f95ef1fa03ab7b939cac8524dbc1afe23e50bf8d09439eef8db0a5346f1cce05d53ce1dd522bcb9c746ecfb7c9505a6dbad84b8bbdcf9015acae42
+  data.tar.gz: 3c6a6ede00bbdf0db98d23344e3932fc7471de927ca9651483ae7c0bde498dd4134c8a1ecd0483f05f5a69746013899613603784619db82a1fbb9a4fe31f1689

data/.travis.yml

@@ -1,6 +1,7 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.2.6
+  - 2.3.3
   - 2.4.0
 before_install: gem install bundler -v 1.14.3

data/lib/openbd/client.rb

@@ -1,51 +1,49 @@
-require 'net/http'
+require 'faraday'
+require 'faraday_middleware'
 require 'json'
 
 class OpenBD
-  API_BASE_URL = 'http://api.openbd.jp/v1/'.freeze
+  API_BASE_URL = 'http://api.openbd.jp/'.freeze
+  PATH_TO_GET = 'v1/get'
+  PATH_TO_COVERAGE = 'v1/coverage'
+  PATH_TO_SCHEMA = 'v1/schema'
 
   class << self
     def get(isbns)
-      request_url = prepare_url('get', isbns)
-      response = Net::HTTP.get_response(URI::parse(request_url))
-      create_body(response).select { |item| item != nil }
+      response = get_request(PATH_TO_GET, { isbn: normalize_isbns(isbns) })
+      response.body
     end
 
     def bulk_get(isbns)
-      request_url = prepare_url('get')
-      response = Net::HTTP.post_form(URI::parse(request_url), isbn: normalize_isbns(isbns))
-      create_body(response).select { |item| item != nil }
+      response = post_request(PATH_TO_GET, { isbn: isbns })
+      response.body
     end
 
     def coverage
-      request_url = prepare_url('coverage')
-      response = Net::HTTP.get_response(URI::parse(request_url))
-      create_body(response)
+      response = get_request(PATH_TO_COVERAGE)
+      response.body
     end
 
     def schema
-      request_url = prepare_url('schema')
-      response = Net::HTTP.get_response(URI::parse(request_url))
-      create_body(response)
+      response = get_request(PATH_TO_SCHEMA)
+      response.body
     end
 
-    def create_body(response)
-      JSON.parse response.body
+    def connection
+      Faraday::Connection.new(url: API_BASE_URL) do |connection|
+        connection.adapter :net_http
+        connection.response :json
+      end
     end
 
-    def prepare_url(method, isbns = nil)
-      case isbns
-      when String
-        params = normalize_isbns(isbns)
-        "#{API_BASE_URL}#{method}?isbn=#{params}"
-      when Numeric
-        params = normalize_isbns(isbns)
-        "#{API_BASE_URL}#{method}?isbn=#{params}"
-      when Array
-        params = normalize_isbns(isbns)
-        "#{API_BASE_URL}#{method}?isbn=#{params}"
-      else
-        "#{API_BASE_URL}#{method}"
+    def get_request(method, params = nil)
+      faraday_response = connection.get(method, params)
+    end
+
+    def post_request(method, params)
+      faraday_response = connection.post do |req|
+        req.url method
+        req.body = "isbn=#{normalize_isbns(params[:isbn])}"
       end
     end
 

data/lib/openbd/version.rb

@@ -1,3 +1,3 @@
 module Openbd
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/openbd_api.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/nasum/openbd"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = '~> 2.2'
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
@@ -25,4 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_runtime_dependency "slop", "~> 4.4"
+  spec.add_runtime_dependency "faraday", "~> 0.11"
+  spec.add_runtime_dependency "faraday_middleware", "~> 0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openbd_api
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - nasum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.4'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: This gem wraps openBD Web API.
 email:
 - tomato.wonder.life@gmail.com
@@ -99,9 +127,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="