rakuten_web_service 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdc0f4711fe39be535cfe9b4bd83cf03fc7244eb
-  data.tar.gz: adaab1f25a06aa9d7910605361c8d740ebf5b08d
+  metadata.gz: b7f33b3d1527b11476b4da96985d7be2806a46af
+  data.tar.gz: a1968049850a302e5f66f6e3dc53233be5565287
 SHA512:
-  metadata.gz: 0ee1fcaa7e933d364b77fe00a60166448b1c207d7d55c5714acaef28bff6ea27f8536848c1a20514d720d0e70a2b8f4ab150479094adefef177f905a800aba5b
-  data.tar.gz: cca0e966fb91d68e25d650024eb6bfc71b37a5be0fc71ed79341818435572eee47099412d64b8e7a112c130eb04856291b0a95be3c1a948736cc56cb61fac8fb
+  metadata.gz: 0695e2c151da45d995de251b2db22af6ed087d90f3c65345c768214107e5bcf7a58cb33bb5a3a609ac88a6857d14dbff913fe71d3b5742910db1f25835010ba9
+  data.tar.gz: 60612ca32c7f9b5cdac8133869d4a38674cf78f2af5c6e04d75932675ef08fad92e9e65eb25a45f74a7fee1027c9585cf2b9f1dd947f59164290406db93fdddf

data/CHANGELOG.md

@@ -1,4 +1,11 @@
-# v1.0.0
+# v1.1.0 (2016/09/12)
+
+## Enhancements
+
+* Remove the dependency on faraday, using `Net::HTTP`. [#39](https://github.com/rakuten-ws/rws-ruby-sdk/pull/39)
+* Allows users to rescue any exception with `RakutenWebService::Error` which is a superclass of all the error class like `RakutenWebService::NotFound`. [#41](https://github.com/rakuten-ws/rws-ruby-sdk/pull/41)
+
+# v1.0.0 (2016/07/29)
 
 ## Enhancements
 
@@ -25,7 +32,7 @@ At first, I should appreciate all users of the gems.
 One of the enhancements, supporting Gora APIs, is realized by @kamatama41 's seminal work.
 Thank you for your contribution!
 
-# v0.6.3
+# v0.6.3 (2015/07/03)
 
 * Update a gem dependency by @45deg
 * Fix typo by @45deg

data/README.md

@@ -1,8 +1,9 @@
 # RakutenWebService
 
-[![Build Status](https://travis-ci.org/rakuten-ws/rws-ruby-sdk.png?branch=master)](https://travis-ci.org/rakuten-ws/rws-ruby-sdk)
-[![Gem Version](https://badge.fury.io/rb/rakuten_web_service.png)](http://badge.fury.io/rb/rakuten_web_service)
+[![Build Status](https://travis-ci.org/rakuten-ws/rws-ruby-sdk.svg?branch=master)](https://travis-ci.org/rakuten-ws/rws-ruby-sdk)
+[![Gem Version](https://badge.fury.io/rb/rakuten_web_service.svg)](https://badge.fury.io/rb/rakuten_web_service)
 [![Coverage Status](https://coveralls.io/repos/github/rakuten-ws/rws-ruby-sdk/badge.svg?branch=master)](https://coveralls.io/github/rakuten-ws/rws-ruby-sdk?branch=master)
+[![Code Climate](https://codeclimate.com/github/rakuten-ws/rws-ruby-sdk/badges/gpa.svg)](https://codeclimate.com/github/rakuten-ws/rws-ruby-sdk)
 
 This gem provides a client for easily accessing [Rakuten Web Service APIs](https://webservice.rakuten.co.jp/).
 

data/lib/rakuten_web_service/client.rb

@@ -1,55 +1,38 @@
 require 'uri'
-require 'faraday'
-require 'faraday_middleware'
-
+require 'json'
 require 'rakuten_web_service/response'
+require 'rakuten_web_service/error'
 
 module RakutenWebService
-  class WrongParameter < StandardError; end
-  class NotFound < StandardError; end
-  class TooManyRequests < StandardError; end
-  class SystemError < StandardError; end
-  class ServiceUnavailable < StandardError; end
-
   class Client
-    attr_reader :url, :path
+    attr_reader :url
 
     def initialize(resource_class)
       @resource_class = resource_class
-      url = URI.parse(@resource_class.endpoint)
-      @url = "#{url.scheme}://#{url.host}"
-      @path = url.path
+      @url = URI.parse(@resource_class.endpoint)
     end
 
     def get(params)
       params = RakutenWebService.configuration.generate_parameters(params)
-      response = connection.get(path, params)
-      case response.status
-      when 200
-        return RakutenWebService::Response.new(@resource_class, response.body)
-      when 400
-        raise WrongParameter, response.body['error_description']
-      when 404
-        raise NotFound, response.body['error_description']
-      when 429
-        raise TooManyRequests, response.body['error_description']
-      when 500
-        raise SystemError, response.body['error_description']
-      when 503
-        raise ServiceUnavailable, response.body['error_description']
+      response = request(url.path, params)
+      body = JSON.parse(response.body)
+
+      if Net::HTTPSuccess === response
+        return RakutenWebService::Response.new(@resource_class, body)
+      else
+        raise RakutenWebService::Error.repository[response.code.to_i], body['error_description']
       end
     end
 
     private
-    def connection
-      return @connection if @connection
-      @connection = Faraday.new(:url => url) do |conn|
-        conn.request :url_encoded
-        conn.response :json
-        conn.response :logger if RakutenWebService.configuration.debug
-        conn.adapter Faraday.default_adapter
-        conn.headers['User-Agent'] = "RakutenWebService SDK for Ruby v#{RWS::VERSION}(ruby-#{RUBY_VERSION} [#{RUBY_PLATFORM}])"
-      end
+    def request(path, params)
+      http = Net::HTTP.new(@url.host, @url.port)
+      http.use_ssl = true
+      path = "#{path}?#{params.map { |k, v| "#{k}=#{URI.encode(v.to_s)}" }.join('&')}"
+      header = {
+        'User-Agent' => "RakutenWebService SDK for Ruby v#{RWS::VERSION}(ruby-#{RUBY_VERSION} [#{RUBY_PLATFORM}])"
+      }
+      http.get(path, header)
     end
   end
 end

data/lib/rakuten_web_service/error.rb

@@ -0,0 +1,26 @@
+module RakutenWebService
+  class Error < StandardError
+    def self.register(status_code, error)
+      repository[status_code] = error
+    end
+
+    def self.repository
+      @repository ||= {}
+    end
+  end
+
+  class WrongParameter < Error; end
+  Error.register(400, WrongParameter)
+
+  class NotFound < Error; end
+  Error.register(404, NotFound)
+
+  class TooManyRequests < Error; end
+  Error.register(429, TooManyRequests)
+
+  class SystemError < Error; end
+  Error.register(500, SystemError)
+
+  class ServiceUnavailable < Error; end
+  Error.register(503, ServiceUnavailable)
+end

data/lib/rakuten_web_service/version.rb

@@ -1,3 +1,3 @@
 module RakutenWebService
-  VERSION = "1.0.0".freeze
+  VERSION = "1.1.0".freeze
 end

data/rakuten_web_service.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rakuten_web_service/version'
@@ -14,14 +13,10 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.required_ruby_version = '>= 2.1.0'
 
-  spec.add_dependency 'faraday', '~> 0.9.0'
-  spec.add_dependency 'faraday_middleware'
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "webmock", "~> 1.20.4"

data/spec/rakuten_web_service/client_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RakutenWebService::Client do
-  let(:endpoint) { 'http://api.example.com/resources' }
+  let(:endpoint) { 'https://api.example.com/resources' }
   let(:resource_class) do
     double('resource_class', endpoint: endpoint)
   end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ end
 require File.expand_path(File.join(__dir__, '..', 'lib', 'rakuten_web_service'))
 
 require 'webmock/rspec'
+require 'tapp'
 
 Dir[File.expand_path(File.join(__dir__, "support/**/*.rb"))].each { |f| require f }
 

data/spec/support/fixture_suppot.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 module FixtureSupport
   def fixture(path)
     fixture_path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'fixtures', path))

metadata

@@ -1,111 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rakuten_web_service
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tatsuya Sato
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.20.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.20.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: tapp
   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'
 description: Ruby Client for Rakuten Web Service
@@ -115,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -143,6 +115,7 @@ files:
 - lib/rakuten_web_service/books/total.rb
 - lib/rakuten_web_service/client.rb
 - lib/rakuten_web_service/configuration.rb
+- lib/rakuten_web_service/error.rb
 - lib/rakuten_web_service/genre.rb
 - lib/rakuten_web_service/gora.rb
 - lib/rakuten_web_service/gora/course.rb
@@ -219,17 +192,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Client for Rakuten Web Service