json-jwt 0.3.3 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.4.0

data/lib/json/jwk.rb

@@ -41,9 +41,8 @@ module JSON
       when OpenSSL::PKey::RSA
         {
           alg: :RSA,
-          xpo: UrlSafeBase64.encode64(public_key.e.to_s(2)),
-          exp: UrlSafeBase64.encode64(public_key.e.to_s(2)),
-          mod: UrlSafeBase64.encode64(public_key.n.to_s(2))
+          e: UrlSafeBase64.encode64(public_key.e.to_s(2)),
+          n: UrlSafeBase64.encode64(public_key.n.to_s(2))
         }
       when OpenSSL::PKey::EC
         {
@@ -62,11 +61,11 @@ module JSON
       def decode(jwk)
         case jwk[:alg].to_s
         when 'RSA'
-          exp = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:xpo] || jwk[:exp]), 2
-          mod = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:mod]), 2
+          e = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:e]), 2
+          n = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:n]), 2
           key = OpenSSL::PKey::RSA.new
-          key.e = exp
-          key.n = mod
+          key.e = e
+          key.n = n
           key
         when 'EC'
           raise NotImplementedError.new('Not Implemented Yet')

data/spec/json/jwk_spec.rb

@@ -3,11 +3,10 @@ require 'spec_helper'
 describe JSON::JWK do
   context 'when RSA public key given' do
     let(:jwk) { JSON::JWK.new public_key }
-    it { jwk.should include :alg, :xpo, :exp, :mod }
+    it { jwk.should include :alg, :e, :n }
     its(:alg) { jwk[:alg].should == :RSA }
-    its(:xpo) { jwk[:xpo].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
-    its(:exp) { jwk[:exp].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
-    its(:mod) { jwk[:mod].should == UrlSafeBase64.encode64(public_key.n.to_s(2)) }
+    its(:e) { jwk[:e].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
+    its(:n) { jwk[:n].should == UrlSafeBase64.encode64(public_key.n.to_s(2)) }
 
     context 'when kid/use options given' do
       let(:jwk) { JSON::JWK.new public_key, kid: '12345', use: :sig }
@@ -68,12 +67,12 @@ describe JSON::JWK do
       subject do
         JSON::JWK.decode(
           alg: :RSA,
-          mod: mod,
-          xpo: xpo
+          n: n,
+          e: e
         )
       end
-      let(:xpo) { 'AQAB' }
-      let(:mod) { 'AK8ppaAGn6N3jDic2DhDN5mI5mWzvhfL1AFZOS9q2EBM8L5sjZbYiaHeNoKillZGmEF9a9g6Z20bDnoHTuHPsx93HYkZqPumFZ8K9lLCbqKAMWw2Qgk10RgrZ-kblJotTBCeer9-tZSWO-OWFzP4gp8MpSuQOQbwTJwDgEkFIQLUK2YgzWbn1PoW8xcfbVyWhZD880ELGRW6GhRgYAl0DN_EQS8kyUa0CusYCzOOg2W3-7qjYeojyP6jiOEr-eyjC7hcUvTVoTfz84BiZv72KS3i5JS8ZNNuRp5Ce51wjoDDUoNxDLWv6Da6qMaGpKz6NTSNbvhE_KFhpp4wf5yRQD8=' }
+      let(:e) { 'AQAB' }
+      let(:n) { 'AK8ppaAGn6N3jDic2DhDN5mI5mWzvhfL1AFZOS9q2EBM8L5sjZbYiaHeNoKillZGmEF9a9g6Z20bDnoHTuHPsx93HYkZqPumFZ8K9lLCbqKAMWw2Qgk10RgrZ-kblJotTBCeer9-tZSWO-OWFzP4gp8MpSuQOQbwTJwDgEkFIQLUK2YgzWbn1PoW8xcfbVyWhZD880ELGRW6GhRgYAl0DN_EQS8kyUa0CusYCzOOg2W3-7qjYeojyP6jiOEr-eyjC7hcUvTVoTfz84BiZv72KS3i5JS8ZNNuRp5Ce51wjoDDUoNxDLWv6Da6qMaGpKz6NTSNbvhE_KFhpp4wf5yRQD8=' }
       let(:pem) do
         if RUBY_VERSION >= '1.9.3'
           <<-PEM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2012-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -172,18 +172,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4331477712692770542
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4331477712692770542
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24