json-jwt 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c89e8876d50ba67374f768113e49c6f4e1486328
-  data.tar.gz: 4dc7ccdfd93385c4275b95ad7690d9f02521ac4b
+  metadata.gz: 1428e29258d5b0bf2e188fbd4522130ee706ef67
+  data.tar.gz: 55ef03a52120003084b689f5c28b92662da417b1
 SHA512:
-  metadata.gz: 2b1976c4c86abb0de914273c1594da22250b62d88b183e031f6e67b336f7ee98096a7e9605888fdccd7fd0a13bdf71088a39632c7ff107c12219ef6a65ca9ffe
-  data.tar.gz: 4a7f3f081a0adab03c6ea43154c329d52ee86dde606719b2391fda556490f1085f9f93090eb25ab1bb367ba230dd484fd39da55a765f154c073c4e7a4d3ddb48
+  metadata.gz: aba1048372d018ea9c65ed683c52d49e41ef6e348736d5dbc2ae7ec2d030f7128d42436933b79c4f8baeb5cb9e41d993e9c5ef082e461dc924253ee5464184ea
+  data.tar.gz: 690ee0ad3a43600f96b6bfc1e8acff7e7c6c1bdeba94d8a47f5717085b6b6afb1aed9b0e2c7ebf027a88b4b6e59fc09f0b8d041c756661cc76745639b300f1f1

data/.travis.yml

@@ -3,7 +3,6 @@ before_install:
   - git submodule update --init --recursive
 
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2

data/VERSION

@@ -1 +1 @@
-1.5.2
+1.6.0

data/lib/json/jwk.rb

@@ -18,6 +18,7 @@ module JSON
         super params
         merge! ex_params
       end
+      self[:kid] ||= thumbprint
     end
 
     def content_type

data/spec/json/jwe_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe JSON::JWE do
-  let(:shared_key) { SecureRandom.hex 16 } # default shared key is too short
+  let(:shared_key) { SecureRandom.hex 32 } # default shared key is too short
   let(:private_key_path) { der_file_path 'rsa/private_key' }
 
   describe '#content_type' do
@@ -248,8 +248,37 @@ describe JSON::JWE do
 
     context 'when alg=dir' do
       let(:alg) { :dir }
-      let(:key) { 'todo' }
-      it :TODO
+      let(:key) { shared_key }
+
+      context 'when enc=A128GCM' do
+        let(:enc) { :A128GCM }
+        if gcm_supported?
+          it_behaves_like :decryptable
+        else
+          it_behaves_like :gcm_decryption_unsupported
+        end
+      end
+
+      context 'when enc=A256GCM' do
+        let(:enc) { :A256GCM }
+        if gcm_supported?
+          it_behaves_like :decryptable
+        else
+          it_behaves_like :gcm_decryption_unsupported
+        end
+      end
+
+      context 'when enc=A128CBC-HS256' do
+        let(:enc) { :'A128CBC-HS256' }
+        it_behaves_like :decryptable
+        it_behaves_like :verify_cbc_authentication_tag
+      end
+
+      context 'when enc=A256CBC-HS512' do
+        let(:enc) { :'A256CBC-HS512' }
+        it_behaves_like :decryptable
+        it_behaves_like :verify_cbc_authentication_tag
+      end
     end
 
     context 'when unknonw/unsupported algorithm given' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json