ruby_jwt 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c26f05952897384ad7d987c432d6e256dd0b4643
-  data.tar.gz: acdab5df412b9b6bcda49c0a2d2dc6fc4565ceef
+  metadata.gz: 199f5c150078773e4e54fc314b2c88af5daf4437
+  data.tar.gz: 22a70e353f73a61ee4f2fd6fd2397921b5a60e37
 SHA512:
-  metadata.gz: c07bd70e45037595948e4685519b52baf4cc6dbad02f3ab51e1d3b9879cc185f5980044f6ca830f316a9fc651a26a9a2d2c8ab77c519b3462a61214997da5c6e
-  data.tar.gz: ecf1f0ab9e80f552dc954fa1c1b6e69288d001544f3c4313eedb8c9e3c89c645b71945cc23fda1fecd8db1a8cf295a3744f09b47eee6f7af99048268bd799991
+  metadata.gz: f6d7786ddfcdc959caefe9a39a89c0d9b2504fcbdd6b6b725fb8ea586affdce966ac86d9204544f84e2f3ecc1a4cf220be3abd7938e31b14aeb3278095ff8e75
+  data.tar.gz: 4a441182be11449f484e0260c781db49cf8cbc595d7f26c2840081b9a9f212b7a2f538ddf6e3633a0544bf7be2880c4dd9e613200df7df388cb38ba0b20ac06f

data/lib/ruby_jwt.rb

@@ -41,8 +41,9 @@ module JWT
 			payload_options[:nbf] += payload[:iat]
 		end
 		payload.merge!(payload_options)
-		jwt_parts << encode_header(header_options)
-		jwt_parts << encode_payload(payload)
+		header_options[:typ] = header_options[:typ] || "JWT"
+		jwt_parts << encode_data(header_options)
+		jwt_parts << encode_data(payload)
 		jwt_parts << encode_signature(jwt_parts.join("."),key, header_options[:alg])
 		return jwt_parts.join(".")
 	end
@@ -97,13 +98,8 @@ module JWT
 		return JSON.parse(base64urldecode(data),{:symbolize_names => true})
 	end
 
-	def encode_header(header_options)
-		header  = {:typ => "JWT"}.merge(header_options)
-		return base64urlencode(JSON.generate(header))
-	end
-
-	def encode_payload(payload)
-		return base64urlencode(JSON.generate(payload))
+	def encode_data(data)
+		return base64urlencode(JSON.generate(data))
 	end
 
 	def encode_signature(data,key,alg)

data/lib/ruby_jwt/version.rb

@@ -1,3 +1,3 @@
 module RubyJwt
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/test/dummy/log/test.log

@@ -7108,3 +7108,198 @@ RubyJwtTest: test_should_encode_and_decode_and_verify_hmac
 RubyJwtTest: test_should_encode_and_decode_none
 -----------------------------------------------
    (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+RubyJwtTest: test_decodes_and_verifies_existing_token
+-----------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------
+RubyJwtTest: test_returns_decode_error_for_invalid_base64
+---------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------
+RubyJwtTest: test_returns_false_if_before_nbf
+---------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------
+RubyJwtTest: test_returns_false_if_expired
+------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------
+RubyJwtTest: test_returns_false_if_invalid_signature
+----------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+RubyJwtTest: test_returns_false_if_wrong_audience
+-------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_returns_false_if_wrong_issuer
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------
+RubyJwtTest: test_returns_not_implemented_error_for_unsupported_algorithm
+-------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_returns_sign_error_for_no_key
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_ECDSA
+------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_RSA
+----------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_and_verify_hmac
+----------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_none
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+RubyJwtTest: test_decodes_and_verifies_existing_token
+-----------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------
+RubyJwtTest: test_returns_decode_error_for_invalid_base64
+---------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------
+RubyJwtTest: test_returns_false_if_before_nbf
+---------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------
+RubyJwtTest: test_returns_false_if_expired
+------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------
+RubyJwtTest: test_returns_false_if_invalid_signature
+----------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-------------------------------------------------
+RubyJwtTest: test_returns_false_if_wrong_audience
+-------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_returns_false_if_wrong_issuer
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------
+RubyJwtTest: test_returns_not_implemented_error_for_unsupported_algorithm
+-------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_returns_sign_error_for_no_key
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_ECDSA
+------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_RSA
+----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_and_verify_hmac
+----------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_none
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+-----------------------------------------------------
+RubyJwtTest: test_decodes_and_verifies_existing_token
+-----------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------------------
+RubyJwtTest: test_returns_decode_error_for_invalid_base64
+---------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+---------------------------------------------
+RubyJwtTest: test_returns_false_if_before_nbf
+---------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+------------------------------------------
+RubyJwtTest: test_returns_false_if_expired
+------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------
+RubyJwtTest: test_returns_false_if_invalid_signature
+----------------------------------------------------
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------
+RubyJwtTest: test_returns_false_if_wrong_audience
+-------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_returns_false_if_wrong_issuer
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-------------------------------------------------------------------------
+RubyJwtTest: test_returns_not_implemented_error_for_unsupported_algorithm
+-------------------------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_returns_sign_error_for_no_key
+-----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+------------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_ECDSA
+------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_RSA
+----------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+----------------------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_and_verify_hmac
+----------------------------------------------------------
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+-----------------------------------------------
+RubyJwtTest: test_should_encode_and_decode_none
+-----------------------------------------------
+   (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_jwt
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Chris Weston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-22 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails