authlete 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7654558117fbc2aa82e0b85086b663f709d162b
-  data.tar.gz: 756edef67e1137db22548eafa97d4a5226faa822
+  metadata.gz: 77582cfeb5b4bb0276c0e3040a61cdf7c5515fa6
+  data.tar.gz: 6229901177d39f4ff62348231699d99a0bc534b5
 SHA512:
-  metadata.gz: a782c1b18f97515e1e3afab5688dd55b78a10f2524144b60fa249f0d8a425352abea6207d6e83c177e57a372fa945bb2d64455368c4bcea067d428ce67a349ea
-  data.tar.gz: a2b5b0dc9ab9477d95011c29d39eaab24fcc178315123c710b643ab19d3e2f9f6a2ade526814afc35c77731409f2990dbbe2295b4eb56c96a115071781e8cde8
+  metadata.gz: 20dd499cd219ce97c08c48c5c186deb39a04b9b23e036abf3117f14bc5779008851593764e8e5a0c3abeba39065d5d8a8ba51013d6b8e5d9139d85b81e875b5e
+  data.tar.gz: e57907b65b09a2e213a6bc8fff05b9f59d208e8649aeded4640f3b9b23c9ac7a744a4dd7005da47b83fabc590329e672a2f4289c9a4027112df762c00cd11ba4

data/lib/authlete.rb

@@ -25,6 +25,7 @@ require 'authlete/version'
 module Authlete
   autoload :AuthenticationServer, 'authlete/authentication-server'
   autoload :Api, 'authlete/api'
+  autoload :Exception, 'authlete/exception'
   autoload :Host, 'authlete/host'
   autoload :Utility, 'authlete/utility'
 

data/lib/authlete/api.rb

@@ -47,6 +47,8 @@ module Authlete
     # Extra HTTP headers
     attr_accessor :extra_headers
 
+    private
+
     # The constructor which takes a hash containing configuration
     # parameters. Valid configuration parameter names are as follows.
     #
@@ -64,8 +66,6 @@ module Authlete
       @service_api_secret       = extract_value(config, :service_api_secret)
     end
 
-    private
-
     def call_api(method, path, content_type, payload, user, password)
       headers = {}
 
@@ -77,14 +77,14 @@ module Authlete
         headers.merge!(@extra_headers)
       end
 
-      response = RestClient::Request.new(
+      response = execute(
         :method   => method,
         :url      => @host + path,
         :headers  => headers,
         :payload  => payload,
         :user     => user,
         :password => password
-      ).execute
+      )
 
       body = body_as_string(response)
 
@@ -95,6 +95,61 @@ module Authlete
       JSON.parse(response.body.to_s, :symbolize_names => true)
     end
 
+    def execute(parameters)
+      begin
+        return RestClient::Request.new(parameters).execute
+      rescue => e
+        raise_api_exception(e)
+      end
+    end
+
+    def raise_api_exception(exception)
+      message  = exception.message
+      response = exception.response
+
+      if response.nil?
+        # Raise an error without HTTP response information.
+        raise Authlete::Exception.new(:message => message)
+      end
+
+      # Raise an error with HTTP response information.
+      raise_api_exception_with_http_response_info(message, response.code, response.body)
+    end
+
+    def raise_api_exception_with_http_response_info(message, status_code, response_body)
+      # Parse the response body as a json.
+      json = parse_response_body(response_body, message, status_code)
+
+      # If the json has the HTTP response information from an Authlete API.
+      if has_authlete_api_response_info(json)
+        # Raise an error with it.
+        hash = json.merge!(:statusCode => status_code)
+        raise Authlete::Exception.new(hash)
+      end
+
+      # Raise an error with 'status_code' and the original error message.
+      raise Authlete::Exception.new(
+        :message     => message,
+        :status_code => status_code
+      )
+    end
+
+    def parse_response_body(response_body, message, status_code)
+      begin
+        return JSON.parse(response_body.to_s, :symbolize_names => true)
+      rescue
+        # Failed to parse the response body as a json.
+        raise Authlete::Exception.new(
+          :message     => message,
+          :status_code => status_code
+        )
+      end
+    end
+
+    def has_authlete_api_response_info(json)
+      json && json.key?(:resultCode) && json.key?(:resultMessage)
+    end
+
     def body_as_string(response)
       if response.body.nil?
         return nil
@@ -340,7 +395,7 @@ module Authlete
     # throws <tt>RestClient::Exception</tt>.
     def introspection(token, scopes = nil, subject = nil)
       hash = call_api_json_service('/api/auth/introspection',
-        :token => token, :scopes => scopes, :subject => subject)
+                                   :token => token, :scopes => scopes, :subject => subject)
 
       Authlete::Response::IntrospectionResponse.new(hash)
     end

data/lib/authlete/exception.rb

@@ -0,0 +1,48 @@
+# :nodoc:
+#
+# Copyright (C) 2015 Authlete, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module Authlete
+  class Exception < StandardError
+    # The HTTP status code of the error.
+    attr_reader :status_code
+
+    # The code of the result of an Authlete API call.
+    attr_reader :result_code
+
+    # The messasge of the result of an Authlete API call.
+    attr_reader :result_message
+
+    private
+
+    def initialize(hash = {})
+      @message        = hash[:message]
+      @status_code    = hash[:statusCode]
+      @result_code    = hash[:resultCode]
+      @result_message = hash[:resultMessage]
+    end
+
+    public
+
+    def message
+      @result_message || @message || self.class.default_message
+    end
+
+    def self.default_message
+      self.name
+    end
+  end
+end

data/lib/authlete/version.rb

@@ -1,3 +1,3 @@
 module Authlete
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authlete
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Takahiko Kawasaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -69,6 +69,7 @@ files:
 - lib/authlete.rb
 - lib/authlete/api.rb
 - lib/authlete/authentication-server.rb
+- lib/authlete/exception.rb
 - lib/authlete/host.rb
 - lib/authlete/model/client-list.rb
 - lib/authlete/model/client.rb