json-jwt 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d95839ba6230af2b99ffc2fa11c6f4243a3a6284
-  data.tar.gz: 7e178d2d41f0ecbd3ec3baeab3b592e803f77c95
+  metadata.gz: 59ada74491a32877d68647b1de5ce0ff3331362c
+  data.tar.gz: 23bc7bef812043123c2b44eee67d18c45d0309c4
 SHA512:
-  metadata.gz: c83c62bbe8bb9ab18c2420be564ce54275ffd90f908951afafd904dacc4bc31b37891b2ddc3d2772daad190fc8614be0f393ce04c94399d8a8d78807c9b481b6
-  data.tar.gz: de9380f86c05ae0c23e37599676a6659ea174ecc2e424533f54fc8107057c42237361aaee1f2ae2e8e078ea3844eb304e5b71d003a0c9ffdb96cd2fb60fcf5e3
+  metadata.gz: 20185284fe6e2fbc096d8de68eb3f8feb18c6efd67dac63b019dd6cdc5a22ee7ecd00b242f777a1b606c9fbaf720df40ecfeac610519c1e958b260d5d1a94e11
+  data.tar.gz: 8b89292996f79c0ad39a68279b1eab78d44e6b8b3dfac4d1fbe76a563aba9dd5debeb88a163a725603c386d562d27072c578c61ebd5b1c33f4f383963250554c

data/README.rdoc

@@ -34,7 +34,7 @@ JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON
 
   # With signature & encryption
   jwe = jws.encrypt(key, algorithm, encryption_method) # algorithm & encryption_method are optional. default RSA1_5 & A128CBC-HS256
-  jws.to_s # => header.encrypted_key.iv.cipher_text.authentication_tag
+  jwe.to_s # => header.encrypted_key.iv.cipher_text.authentication_tag
 
 For details about <code>key</code> and <code>algorithm</code>, see
 {JWS Spec}[https://github.com/nov/json-jwt/blob/master/spec/json/jws_spec.rb] and

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/json/jwe.rb

@@ -27,7 +27,7 @@ module JSON
     end
 
     def encrypt!(public_key_or_secret)
-      self.mode = :encyption
+      self.mode = :encryption
       self.plain_text = input
       self.public_key_or_secret = public_key_or_secret
       cipher.encrypt
@@ -48,7 +48,7 @@ module JSON
     end
 
     def to_s
-      if mode == :encyption
+      if mode == :encryption
         [
           header.to_json,
           jwe_encrypted_key,
@@ -132,7 +132,7 @@ module JSON
       self
     end
 
-    # encyption
+    # encryption
 
     def jwe_encrypted_key
       @jwe_encrypted_key ||= case algorithm.to_s

data/lib/json/jwt.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'url_safe_base64'
 require 'multi_json'
+require 'active_support'
 require 'active_support/core_ext'
 
 module JSON

data/spec/json/jwk_spec.rb

@@ -121,13 +121,30 @@ NrqoxoakrPo1NI1u+ET8oWGmnjB/nJFAPwIDAQAB
 
     context 'when ECDSA' do
       if RUBY_VERSION >= '2.0.0'
-        it do
-          JSON::JWK.decode(
-            kty: :EC,
-            crv: 'P-256',
-            x: 'MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4',
-            y: '4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM'
-          ).should be_instance_of OpenSSL::PKey::EC
+        [{
+          alg: 'EC',
+          crv: 'P-256',
+          kty: 'EC',
+          x: 'eZXWiRe0I3TvHPXiGnvO944gjF1o4UmitH2CVwYIrPg',
+          y: 'AKFNss7S35tOsp5iY7-YuLGs2cLrTKFk80JvgVzMPHQ3'
+        }, {
+          alg: 'EC',
+          crv: 'P-384',
+          kty: 'EC',
+          x: 'XGp9ovRmtaBjlZKGI1XDBUB6F3d4Xov4JFKUCaeVjMD0_GAp20IB_wZz6howe3yi',
+          y: 'Vhy6zh3KOkDqSA5WP6BtDyS9CZR7RoCCWfwymBB3HIBIR_yl32hnSYXtlwEr2EoK'
+        }, {
+          alg: 'EC',
+          crv: 'P-521',
+          kty: 'EC',
+          x: 'KrVaPTvvYmUUSf_1UpwJt_Lg9UT-8OHD_AUd-d7-Q8Rfs4t-lTJ5KEyjbfMzTHsvNulWftuaMH6Ap3l5vbDb2nQ',
+          y: 'AIxSEGvlKlWZiN_Rc3VjBs5oVB5l-JfCZHm2LyZpOxAzWrpjHlK121H2ZngM8Ra8ggKa64hEMDE1fMV__C_EZv9m'
+        }].each do |jwk|
+          describe jwk['crv'] do
+            it do
+              JSON::JWK.decode(jwk).should be_instance_of OpenSSL::PKey::EC
+            end
+          end
         end
       else
         it do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json