json-jwt 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a480bc0b191d4a57de3c18aee7e779cbe335523
-  data.tar.gz: be9244d6cf17e9b27922c0d71e48e61d29848c55
+  metadata.gz: a9b0839d9f0e6677ee341422becf2dd29c56091c
+  data.tar.gz: ad1de154945e36f96b2120c28366e1749bcc600f
 SHA512:
-  metadata.gz: 8d87f52f2d640f6eaca57131e351d2cecb4d81533360001960e1be4da0b461efcd0559a5d8d3828db1586fc2774ad38f07ea5d2169eb0fc3b838b7e2b01de166
-  data.tar.gz: c0bb0d3ac3f4b972cfc484bb58b794f3b392e60706e379cb819f5b4efae39c9bd7bd0c82d636b418958915442cb56ecba2a471833bad961b445585ec8b5a0d1d
+  metadata.gz: eb712d0cbfaac919e4ad1f0a26f0785e6de8f61b779dfc1daccc03c2314909c87dc7497c4f18d3e935bab6c306592e3198eb112add0378f5c0c62a7c2a72714a
+  data.tar.gz: 607af304e7dec5115cc0b86667315a0ead5eea5b31f539842251d3e1807d06b87685d22ac3c945fa821802e8d3c31f0e0aecb6adba9281949248e2b6975adaf1

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/json-jwt.gemspec

@@ -13,7 +13,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "multi_json", ">= 1.3"
   s.add_runtime_dependency "url_safe_base64"
   s.add_runtime_dependency "activesupport", ">= 2.3"
-  s.add_runtime_dependency "i18n"
   s.add_runtime_dependency "bindata"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "cover_me", ">= 1.2.0"

data/lib/json/jwe.rb

@@ -13,7 +13,7 @@ module JSON
       :master_key, :encrypted_master_key, :encryption_key, :integrity_key
     )
 
-    register_header_keys :enc, :epk, :zip, :jku, :jwk, :x5u, :x5t, :x5c, :kid, :typ, :cty, :apu, :apv, :epu, :epv
+    register_header_keys :enc, :epk, :zip, :apu, :apv
     alias_method :encryption_method, :enc
 
     def initialize(input)
@@ -123,8 +123,8 @@ module JSON
         master_key,
         encryption_key_size,
         encryption_method,
-        epu || 0,
-        epv || 0,
+        0,
+        0,
         'Encryption'
       ]
       integrity_segments = [
@@ -132,8 +132,8 @@ module JSON
         master_key,
         integrity_key_size,
         encryption_method,
-        epu || 0,
-        epv || 0,
+        0,
+        0,
         'Integrity'
       ]
       encryption_hash_input, integrity_hash_input = [encryption_segments, integrity_segments].collect do |segments|

data/lib/json/jwk.rb

@@ -6,6 +6,10 @@ module JSON
       replace encode(public_key, options)
     end
 
+    def content_type
+      'application/jwk+json'
+    end
+
     private
 
     def ecdsa_curve_name(ecdsa_key)

data/lib/json/jwk/set.rb

@@ -4,6 +4,10 @@ module JSON
       replace Array(jwks).flatten
     end
 
+    def content_type
+      'application/jwk-set+json'
+    end
+
     def as_json(options = {})
       # NOTE: Array.new wrapper is requied to avoid CircularReferenceError
       { :keys => Array.new(self) }

data/lib/json/jws.rb

@@ -4,8 +4,6 @@ module JSON
     class VerificationFailed < JWT::VerificationFailed; end
     class UnexpectedAlgorithm < JWT::UnexpectedAlgorithm; end
 
-    register_header_keys :jku, :kid, :x5u, :x5t
-
     def initialize(jwt)
       replace jwt
       raise InvalidFormat.new('Signature Algorithm Required') unless algorithm

data/lib/json/jwt.rb

@@ -28,10 +28,10 @@ module JSON
         end
       end
     end
-    register_header_keys :typ, :cty, :alg
+    register_header_keys :alg, :jku, :jwk, :x5u, :x5t, :x5c, :kid, :typ, :cty, :crit
     alias_method :algorithm, :alg
 
-    def initialize(claims)
+    def initialize(claims = {})
       self.typ = :JWT
       self.alg = :none
       [:exp, :nbf, :iat].each do |key|
@@ -62,6 +62,10 @@ module JSON
       jwe.encrypt! public_key_or_secret
     end
 
+    def content_type
+      "application/#{self.class.name.split('::').last.downcase}"
+    end
+
     def to_s
       [
         header.to_json,

data/spec/json/jwe_spec.rb

@@ -8,6 +8,13 @@ describe JSON::JWE do
   let(:shared_key) { SecureRandom.hex 16 } # default shared key is too short
   let(:private_key_path) { der_file_path 'rsa/private_key' }
 
+  describe '#content_type' do
+    let(:jwe) { JSON::JWE.new 'hello' }
+    it do
+      jwe.content_type.should == 'application/jwe'
+    end
+  end
+
   describe 'encrypt!' do
     shared_examples_for :gcm_encryption do
       context 'when enc=A128GCM' do

data/spec/json/jwk/set_spec.rb

@@ -4,6 +4,12 @@ describe JSON::JWK::Set do
   let(:jwk) { JSON::JWK.new public_key }
   let(:set) { JSON::JWK::Set.new jwk }
 
+  describe '#content_type' do
+    it do
+      set.content_type.should == 'application/jwk-set+json'
+    end
+  end
+
   context 'when single JWK given' do
     subject { JSON::JWK::Set.new jwk }
     it { should == [jwk] }

data/spec/json/jwk_spec.rb

@@ -1,6 +1,13 @@
 require 'spec_helper'
 
 describe JSON::JWK do
+  describe '#content_type' do
+    let(:jwk) { JSON::JWK.new public_key }
+    it do
+      jwk.content_type.should == 'application/jwk+json'
+    end
+  end
+
   context 'when RSA public key given' do
     let(:jwk) { JSON::JWK.new public_key }
     it { jwk.keys.should include :kty, :e, :n }

data/spec/json/jws_spec.rb

@@ -39,6 +39,12 @@ describe JSON::JWS do
     its(:signature) { should be_nil }
   end
 
+  describe '#content_type' do
+    it do
+      jws.content_type.should == 'application/jws'
+    end
+  end
+
   describe '#sign!' do
     shared_examples_for :generate_expected_signature do
       it do

data/spec/json/jwt_spec.rb

@@ -25,6 +25,12 @@ describe JSON::JWT do
     end
   end
 
+  describe '#content_type' do
+    it do
+      jwt.content_type.should == 'application/jwt'
+    end
+  end
+
   describe '#sign' do
     [:HS256, :HS384, :HS512].each do |algorithm|
       context algorithm do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-05 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bindata
   requirement: !ruby/object:Gem::Requirement