openid_connect 0.0.28 → 0.0.29

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    openid_connect (0.0.27)
+    openid_connect (0.0.28)
       activemodel (>= 3)
       attr_required (>= 0.0.3)
       json (>= 1.4.3)
-      jwt (>= 0.1.3)
+      json-jwt (>= 0.0.3)
       rack-oauth2 (>= 0.10.0)
       swd (>= 0.0.6)
       tzinfo
@@ -25,17 +25,20 @@ GEM
     addressable (2.2.6)
     attr_required (0.0.3)
     bcrypt-ruby (3.0.1)
+    bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
-    crack (0.1.8)
+    crack (0.3.0)
     diff-lcs (1.1.3)
     httpclient (2.2.1)
     i18n (0.6.0)
     jruby-openssl (0.7.4)
       bouncy-castle-java
     json (1.6.1)
-    jwt (0.1.3)
-      json (>= 1.2.4)
+    json (1.6.1-java)
+    json-jwt (0.0.3)
+      json (>= 1.4.3)
+      url_safe_base64
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -43,7 +46,7 @@ GEM
     mime-types (1.16)
     multi_json (1.0.3)
     polyglot (0.3.2)
-    rack (1.3.2)
+    rack (1.3.3)
     rack-oauth2 (0.11.0)
       activesupport (>= 2.3)
       attr_required (>= 0.0.3)
@@ -72,6 +75,7 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
+    url_safe_base64 (0.2.1)
     validate_email (0.1.5)
       activemodel (>= 3.0)
       mail (>= 2.2.5)

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

data/lib/openid_connect/response_object/id_token.rb

@@ -1,4 +1,4 @@
-require 'jwt'
+require 'json/jwt'
 
 module OpenIDConnect
   class ResponseObject
@@ -21,8 +21,12 @@ module OpenIDConnect
         raise InvalidToken.new('Invalid audience or expired')
       end
 
-      def to_jwt(key, algorithm = 'RS256')
-        JWT.encode as_json, key, algorithm
+      def to_jwt(key, algorithm = :RS256)
+        token = JSON::JWT.new as_json
+        if algorithm != :none
+          token = token.sign key, algorithm
+        end
+        token.to_s
       end
 
       class << self
@@ -33,7 +37,7 @@ module OpenIDConnect
               http_client.post key_or_client.check_session_uri, :id_token => jwt_string
             end
           else
-            JWT.decode(jwt_string, key_or_client).with_indifferent_access
+            JSON::JWT.decode(jwt_string, key_or_client).with_indifferent_access
           end
           new attributes
         end

data/openid_connect.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "activemodel", ">= 3"
   s.add_runtime_dependency "validate_url"
   s.add_runtime_dependency "validate_email"
-  s.add_runtime_dependency "jwt", ">= 0.1.3"
+  s.add_runtime_dependency "json-jwt", ">= 0.0.3"
   s.add_runtime_dependency "swd", ">= 0.0.6"
   s.add_runtime_dependency "rack-oauth2", ">= 0.10.0"
   s.add_development_dependency "rake", ">= 0.8"

metadata

@@ -2,7 +2,7 @@
 name: openid_connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors: 
 - nov matake
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-20 00:00:00 Z
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -79,14 +79,14 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: jwt
+  name: json-jwt
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 0.0.3
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency