openid_connect 0.0.20 → 0.0.21

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.19)
+    openid_connect (0.0.20)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)
       jwt (>= 0.1.3)
       rack-oauth2 (>= 0.9.4)
-      swd (>= 0.0.4)
+      swd (>= 0.0.6)
       tzinfo
       validate_email
       validate_url
@@ -64,7 +64,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    swd (0.0.4)
+    swd (0.0.6)
       activesupport (>= 3)
       attr_required (>= 0.0.3)
       httpclient (>= 2.2.1)

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/lib/openid_connect.rb

@@ -1,9 +1,14 @@
 require 'json'
 require 'logger'
+require 'swd'
 require 'rack/oauth2'
 require 'rack/oauth2/server/id_token_response'
 
 module OpenIDConnect
+  VERSION = ::File.read(
+    ::File.join(::File.dirname(__FILE__), '../VERSION')
+  )
+
   def self.logger
     @@logger
   end
@@ -17,19 +22,23 @@ module OpenIDConnect
     @@debugging
   end
   def self.debugging=(boolean)
+    SWD.debugging = boolean
     Rack::OAuth2.debugging = boolean
     @@debugging = boolean
   end
   def self.debug!
-    Rack::OAuth2.debugging = true
+    SWD.debug!
+    Rack::OAuth2.debug!
     self.debugging = true
   end
   def self.debug(&block)
+    swd_original = SWD.debugging?
     rack_oauth2_original = Rack::OAuth2.debugging?
     original = self.debugging?
     debug!
     yield
   ensure
+    SWD.debugging = swd_original
     Rack::OAuth2.debugging = rack_oauth2_original
     self.debugging = original
   end

data/lib/openid_connect/discovery/principal.rb

@@ -1,5 +1,3 @@
-require 'swd'
-
 module OpenIDConnect
   module Discovery
     class Principal

data/lib/openid_connect/response_object/id_token.rb

@@ -29,8 +29,6 @@ module OpenIDConnect
         def from_jwt(jwt_string, key_or_client)
           attributes = case key_or_client
           when Client
-            http_client = HTTPClient.new
-            http_client.request_filter << Debugger::RequestFilter
             resource_request do
               http_client.post key_or_client.check_session_uri, :id_token => jwt_string
             end
@@ -51,6 +49,16 @@ module OpenIDConnect
             raise HttpError.new(res.status, 'Unknown HttpError', res)
           end
         end
+
+        private
+
+        def http_client
+          _http_client_ = HTTPClient.new(
+            :agent_name => "OpenIDConnect (#{VERSION})"
+          )
+          _http_client_.request_filter << Debugger::RequestFilter.new if OpenIDConnect.debugging?
+          _http_client_
+        end
       end
     end
   end

data/openid_connect.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "validate_url"
   s.add_runtime_dependency "validate_email"
   s.add_runtime_dependency "jwt", ">= 0.1.3"
-  s.add_runtime_dependency "swd", ">= 0.0.4"
+  s.add_runtime_dependency "swd", ">= 0.0.6"
   s.add_runtime_dependency "rack-oauth2", ">= 0.9.4"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rcov", ">= 0.9"

data/spec/openid_connect_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe OpenIDConnect do
-  subject { OpenIDConnect }
   after { OpenIDConnect.debugging = false }
 
   its(:logger) { should be_a Logger }
@@ -15,20 +14,25 @@ describe OpenIDConnect do
   describe '.debug' do
     it 'should enable debugging within given block' do
       OpenIDConnect.debug do
+        SWD.debugging?.should be_true
         Rack::OAuth2.debugging?.should be_true
         OpenIDConnect.debugging?.should be_true
       end
+      SWD.debugging?.should be_false
       Rack::OAuth2.debugging?.should be_false
       OpenIDConnect.debugging?.should be_false
     end
 
     it 'should not force disable debugging' do
+      SWD.debug!
       Rack::OAuth2.debug!
       OpenIDConnect.debug!
       OpenIDConnect.debug do
+        SWD.debugging?.should be_true
         Rack::OAuth2.debugging?.should be_true
         OpenIDConnect.debugging?.should be_true
       end
+      SWD.debugging?.should be_true
       Rack::OAuth2.debugging?.should be_true
       OpenIDConnect.debugging?.should be_true
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openid_connect
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 0
-  - 20
-  version: 0.0.20
+  - 21
+  version: 0.0.21
 platform: ruby
 authors: 
 - nov matake
@@ -129,12 +129,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
         - 0
-        - 4
-        version: 0.0.4
+        - 6
+        version: 0.0.6
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency