json-jwt 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json-jwt (0.0.7)
+    json-jwt (0.1.2)
       activesupport (>= 2.3)
       i18n
       json (>= 1.4.3)

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/json/jwk.rb

@@ -1,20 +1,25 @@
 module JSON
-  class JWK
-    class << self
-      def encode(public_key, kid = nil)
-        json = case public_key
-        when OpenSSL::PKey::RSA
-          {
-            alg: :RSA,
-            exp: UrlSafeBase64.encode64(public_key.e.to_s(2)),
-            mod: UrlSafeBase64.encode64(public_key.n.to_s(2))
-          }
-        else
-          raise "Only OpenSSL::PKey::RSA is supported now"
-        end
-        json[:kid] = kid if kid.present?
-        json
+  class JWK < Hash
+    def initialize(public_key, options = {})
+      replace encode(public_key, options)
+    end
+
+    private
+
+    def encode(public_key, options = {})
+      hash = case public_key
+      when OpenSSL::PKey::RSA
+        {
+          alg: :RSA,
+          exp: UrlSafeBase64.encode64(public_key.e.to_s(2)),
+          mod: UrlSafeBase64.encode64(public_key.n.to_s(2))
+        }
+      else
+        raise "Only RSA is supported now"
       end
+      hash.merge(options)
     end
   end
-end
+end
+
+require 'json/jwk/set'

data/lib/json/jwk/set.rb

@@ -0,0 +1,11 @@
+module JSON
+  class JWK::Set < Array
+    def initialize(*jwks)
+      replace Array(jwks).flatten
+    end
+
+    def as_json
+      {:keys => self}
+    end
+  end
+end

data/lib/json/jws.rb

@@ -80,5 +80,14 @@ module JSON
         raise InvalidFormat.new('Unknown Signature Algorithm')
       end
     end
+
+    def replace(hash_or_jwt)
+      super
+      if hash_or_jwt.is_a? JSON::JWT
+        self.header = hash_or_jwt.header
+        self.signature = hash_or_jwt.signature
+      end
+      self
+    end
   end
 end

data/lib/json/jwt.rb

@@ -37,10 +37,6 @@ module JSON
       end
     end
 
-    def [](key)
-      super
-    end
-
     def to_s
       [
         header.to_json,
@@ -66,17 +62,6 @@ module JSON
         raise InvalidFormat.new("Invalid JSON Format")
       end
     end
-
-    private
-
-    def replace(hash_or_jwt)
-      super hash_or_jwt
-      if hash_or_jwt.is_a? JSON::JWT
-        self.header = hash_or_jwt.header
-        self.signature = hash_or_jwt.signature
-      end
-      self
-    end
   end
 end
 

data/spec/json/jwk/set_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe JSON::JWK::Set do
+  let(:jwk) { JSON::JWK.new public_key }
+
+  context 'when single JWK given' do
+    let(:set) { JSON::JWK::Set.new jwk }
+
+    it 'should become proper JWK set format' do
+      _set_ = set.as_json
+      _set_.should include :keys
+      _set_[:keys].should == [jwk]
+    end
+  end
+
+  context 'when multiple JWKs given' do
+    let(:set) { JSON::JWK::Set.new jwk, jwk }
+
+    it 'should become proper JWK set format' do
+      _set_ = set.as_json
+      _set_.should include :keys
+      _set_[:keys].should == [jwk, jwk]
+    end
+  end
+
+  context 'when an Array of JWKs given' do
+    let(:set) { JSON::JWK::Set.new [jwk, jwk] }
+
+    it 'should become proper JWK set format' do
+      _set_ = set.as_json
+      _set_.should include :keys
+      _set_[:keys].should == [jwk, jwk]
+    end
+  end
+end

data/spec/json/jwk_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe JSON::JWK do
+  let(:rsa_public_key) { public_key }
+
+  context 'when RSA public key given' do
+    let(:jwk) { JSON::JWK.new rsa_public_key }
+    it { jwk.should include :alg, :exp, :mod }
+    its(:alg) { jwk[:alg].should == :RSA }
+    its(:exp) { jwk[:exp].should == UrlSafeBase64.encode64(rsa_public_key.e.to_s(2)) }
+    its(:mod) { jwk[:mod].should == UrlSafeBase64.encode64(rsa_public_key.n.to_s(2)) }
+
+    context 'when kid/use options given' do
+      let(:jwk) { JSON::JWK.new rsa_public_key, :kid => '12345', :use => :sig }
+      it { jwk.should include :kid, :use }
+      its(:kid) { jwk[:kid].should == '12345' }
+      its(:use) { jwk[:use].should == :sig }
+    end
+  end
+end

data/spec/json/jws_spec.rb

@@ -79,7 +79,7 @@ describe JSON::JWS do
   describe '#verify' do
     shared_examples_for :succes_signature_verification do
       it do
-        expect { decoded }.should_not raise_error
+        expect { decoded }.not_to raise_error
         decoded.should be_a JSON::JWT
       end
 

data/spec/json/jwt_spec.rb

@@ -49,7 +49,7 @@ describe JSON::JWT do
         it do
           expect do
             jwt.verify(no_signed, '', 'secret')
-          end.should raise_error JSON::JWT::UnexpectedAlgorighm
+          end.to raise_error JSON::JWT::UnexpectedAlgorighm
         end
       end
 
@@ -57,7 +57,7 @@ describe JSON::JWT do
         it do
           expect do
             jwt.verify(no_signed, 'signature')
-          end.should raise_error JSON::JWT::VerificationFailed
+          end.to raise_error JSON::JWT::VerificationFailed
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -143,11 +143,14 @@ files:
 - json-jwt.gemspec
 - lib/json/jwe.rb
 - lib/json/jwk.rb
+- lib/json/jwk/set.rb
 - lib/json/jws.rb
 - lib/json/jwt.rb
 - spec/fixtures/rsa/private_key.pem
 - spec/fixtures/rsa/public_key.pem
 - spec/helpers/sign_key_fixture_helper.rb
+- spec/json/jwk/set_spec.rb
+- spec/json/jwk_spec.rb
 - spec/json/jws_spec.rb
 - spec/json/jwt_spec.rb
 - spec/spec_helper.rb
@@ -180,6 +183,8 @@ test_files:
 - spec/fixtures/rsa/private_key.pem
 - spec/fixtures/rsa/public_key.pem
 - spec/helpers/sign_key_fixture_helper.rb
+- spec/json/jwk/set_spec.rb
+- spec/json/jwk_spec.rb
 - spec/json/jws_spec.rb
 - spec/json/jwt_spec.rb
 - spec/spec_helper.rb