json-jwt 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/json/jwk.rb

@@ -41,7 +41,7 @@ module JSON
       when OpenSSL::PKey::RSA
         {
           alg: :RSA,
-          exp: UrlSafeBase64.encode64(public_key.e.to_s(2)),
+          xpo: UrlSafeBase64.encode64(public_key.e.to_s(2)),
           mod: UrlSafeBase64.encode64(public_key.n.to_s(2))
         }
       when OpenSSL::PKey::EC
@@ -61,7 +61,7 @@ module JSON
       def decode(jwk)
         case jwk[:alg].to_s
         when 'RSA'
-          exp = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:exp]), 2
+          exp = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:xpo]), 2
           mod = OpenSSL::BN.new UrlSafeBase64.decode64(jwk[:mod]), 2
           key = OpenSSL::PKey::RSA.new
           key.e = exp

data/spec/json/jwk_spec.rb

@@ -3,9 +3,9 @@ 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, :exp, :mod }
+    it { jwk.should include :alg, :xpo, :mod }
     its(:alg) { jwk[:alg].should == :RSA }
-    its(:exp) { jwk[:exp].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
+    its(:xpo) { jwk[:xpo].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
     its(:mod) { jwk[:mod].should == UrlSafeBase64.encode64(public_key.n.to_s(2)) }
 
     context 'when kid/use options given' do
@@ -68,10 +68,10 @@ describe JSON::JWK do
         JSON::JWK.decode(
           alg: :RSA,
           mod: mod,
-          exp: exp
+          xpo: xpo
         )
       end
-      let(:exp) { 'AQAB' }
+      let(:xpo) { 'AQAB' }
       let(:mod) { 'AK8ppaAGn6N3jDic2DhDN5mI5mWzvhfL1AFZOS9q2EBM8L5sjZbYiaHeNoKillZGmEF9a9g6Z20bDnoHTuHPsx93HYkZqPumFZ8K9lLCbqKAMWw2Qgk10RgrZ-kblJotTBCeer9-tZSWO-OWFzP4gp8MpSuQOQbwTJwDgEkFIQLUK2YgzWbn1PoW8xcfbVyWhZD880ELGRW6GhRgYAl0DN_EQS8kyUa0CusYCzOOg2W3-7qjYeojyP6jiOEr-eyjC7hcUvTVoTfz84BiZv72KS3i5JS8ZNNuRp5Ce51wjoDDUoNxDLWv6Da6qMaGpKz6NTSNbvhE_KFhpp4wf5yRQD8=' }
       let(:pem) do
         if RUBY_VERSION >= '1.9.3'
@@ -103,5 +103,38 @@ NrqoxoakrPo1NI1u+ET8oWGmnjB/nJFAPwIDAQAB
       it { should be_instance_of OpenSSL::PKey::RSA }
       its(:to_pem) { should == pem }
     end
+
+    context 'when ECDSA' do
+      it do
+        expect do
+          JSON::JWK.decode(
+            alg: :EC,
+            crv: 'crv',
+            x: 'x',
+            y: 'y'
+          )
+        end.to raise_error NotImplementedError
+      end
+    end
+
+    context 'when invalid algorithm' do
+      it do
+        expect do
+          JSON::JWK.decode(
+            alg: :XXX
+          )
+        end.to raise_error JSON::JWK::UnknownAlgorithm
+      end
+    end
+
+    context 'when no algorithm' do
+      it do
+        expect do
+          JSON::JWK.decode(
+            x: :x
+          )
+        end.to raise_error JSON::JWK::UnknownAlgorithm
+      end
+    end
   end
 end

data/spec/json/jwt_spec.rb

@@ -134,5 +134,23 @@ describe JSON::JWT do
         end.to raise_error JSON::JWT::InvalidFormat
       end
     end
+
+    context 'when unexpected format' do
+      context 'when too few dots' do
+        it do
+          expect do
+            JSON::JWT.decode 'header'
+          end.to raise_error JSON::JWT::InvalidFormat
+        end
+      end
+
+      context 'when too many dots' do
+        it do
+          expect do
+            JSON::JWT.decode 'header.payload.signature.something.wrong'
+          end.to raise_error JSON::JWT::InvalidFormat
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json