json-jwt 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59ada74491a32877d68647b1de5ce0ff3331362c
-  data.tar.gz: 23bc7bef812043123c2b44eee67d18c45d0309c4
+  metadata.gz: 9c915d6a8de83f170d97ca50cb41ce59daf27109
+  data.tar.gz: e07327aad3ed0772746939176c4941011cf53301
 SHA512:
-  metadata.gz: 20185284fe6e2fbc096d8de68eb3f8feb18c6efd67dac63b019dd6cdc5a22ee7ecd00b242f777a1b606c9fbaf720df40ecfeac610519c1e958b260d5d1a94e11
-  data.tar.gz: 8b89292996f79c0ad39a68279b1eab78d44e6b8b3dfac4d1fbe76a563aba9dd5debeb88a163a725603c386d562d27072c578c61ebd5b1c33f4f383963250554c
+  metadata.gz: 1e45a3641dacb886fc1b4984f9fe53d5b0189e66225bb05957ab60cc932075bf94e651d96387fdad26dec8fa4f99d7ed5c085706625f14d5043c5e9f1862a2e8
+  data.tar.gz: f49791f3062639f6cbd0bf09e24d4720566c012f4a81c122903d8b4432735d2efe83d647693acfe6ceb797a515696d7a60220b3fcd46f3081791ccf5c177f17d

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.8.0

data/lib/json/jwt.rb

@@ -102,8 +102,12 @@ module JSON
           jwe.header = MultiJson.load(
             UrlSafeBase64.decode64 jwt_string.split('.').first
           ).with_indifferent_access
-          jwe.decrypt! key_or_secret unless key_or_secret == :skip_decryption
-          jwe
+          if key_or_secret == :skip_decryption
+            jwe
+          else
+            jwe.decrypt! key_or_secret
+            JSON::JWT.decode jwe.plain_text, :skip_verification
+          end
         else
           raise InvalidFormat.new("Invalid JWT Format. JWT should include #{JWS::NUM_OF_SEGMENTS} or #{JWE::NUM_OF_SEGMENTS} segments.")
         end

data/spec/json/jwt_spec.rb

@@ -160,13 +160,14 @@ describe JSON::JWT do
       let(:shared_key) { SecureRandom.hex 16 } # default shared key is too short
 
       it 'should decryptable' do
-        JSON::JWT.decode(input, private_key).should be_a JSON::JWE
+        JSON::JWT.decode(input, private_key).should be_instance_of JSON::JWT
       end
 
       context 'when :skip_decryption given as secret/key' do
         it 'should skip verification' do
           expect do
             jwe = JSON::JWT.decode input, :skip_decryption
+            jwe.should be_instance_of JSON::JWE
             jwe.header.should == {'alg' => 'RSA1_5', 'enc' => 'A128CBC-HS256'}
           end.not_to raise_error
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and