json-jwt 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,15 +1,21 @@
 PATH
   remote: .
   specs:
-    json-jwt (0.0.2)
+    json-jwt (0.0.3)
+      activesupport (>= 2.3)
+      i18n
       json (>= 1.4.3)
       url_safe_base64
 
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.1.0)
+      multi_json (~> 1.0)
     diff-lcs (1.1.3)
+    i18n (0.6.0)
     json (1.6.1)
+    multi_json (1.0.3)
     rake (0.9.2)
     rcov (0.9.10)
     rspec (2.6.0)

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/json-jwt.gemspec

@@ -12,6 +12,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_runtime_dependency "json", ">= 1.4.3"
   s.add_runtime_dependency "url_safe_base64"
+  s.add_runtime_dependency "activesupport", ">= 2.3"
+  s.add_runtime_dependency "i18n"
   s.add_development_dependency "rake", ">= 0.8"
   s.add_development_dependency "rcov", ">= 0.9"
   s.add_development_dependency "rspec", ">= 2"

data/lib/json/jws.rb

@@ -21,7 +21,7 @@ module JSON
     private
 
     def algorithm
-      header[:alg] || header['alg']
+      header[:alg]
     end
 
     def digest

data/lib/json/jwt.rb

@@ -1,6 +1,7 @@
 require 'openssl'
 require 'url_safe_base64'
 require 'json'
+require 'active_support/core_ext'
 
 module JSON
   class JWT < Hash
@@ -27,8 +28,7 @@ module JSON
     end
 
     def verify(signature_base_string, signature = '', public_key_or_secret = nil)
-      case header[:alg]
-      when :none
+      if header[:alg].to_s == 'none'
         signature == '' or raise VerificationFailed
       else
         JWS.new(self).verify(signature_base_string, signature, public_key_or_secret)
@@ -45,15 +45,24 @@ module JSON
       end.join('.')
     end
 
+    def [](key)
+      if key.respond_to? :to_sym
+        super key.to_sym or
+        super key.to_s
+      else
+        super
+      end
+    end
+
     class << self
       def decode(jwt_string, public_key_or_secret = nil)
         raise InvalidFormat.new('Invalid JWT Format. JWT should include 2 dots.') unless jwt_string.count('.') == 2
-        header, claims, signature = jwt_string.split('.').collect do |segment|
+        header, claims, signature = jwt_string.split('.', 3).collect do |segment|
           UrlSafeBase64.decode64 segment.to_s
         end
-        signature_base_string = jwt_string.split('.')[0,2].join('.')
+        signature_base_string = jwt_string.split('.')[0, 2].join('.')
         jwt = new JSON.parse(claims)
-        jwt.header = JSON.parse header
+        jwt.header = JSON.parse(header).with_indifferent_access
         jwt.verify signature_base_string, signature, public_key_or_secret
         jwt
       rescue JSON::ParserError
@@ -75,4 +84,4 @@ module JSON
 end
 
 require 'json/jws'
-require 'json/jwe'
+require 'json/jwe'

data/spec/json/jws_spec.rb

@@ -87,15 +87,20 @@ describe JSON::JWS do
         let(:header) { decoded.header }
         it 'should be parsed successfully' do
           header['typ'].should == 'JWT'
+          header[:typ].should == 'JWT'
           header['alg'].should == alg.to_s
+          header[:alg].should == alg.to_s
         end
       end
 
       describe 'claims' do
         it 'should be parsed successfully' do
           decoded['iss'].should == 'joe'
+          decoded[:iss].should == 'joe'
           decoded['exp'].should == 1300819380
+          decoded[:exp].should == 1300819380
           decoded['http://example.com/is_root'] == true
+          decoded[:'http://example.com/is_root'] == true
         end
       end
     end

data/spec/json/jwt_spec.rb

@@ -41,14 +41,14 @@ describe JSON::JWT do
     context 'when not signed nor encrypted' do
       context 'no signature given' do
         it do
-          jwt.verify(no_signed.chop).should be_true
+          jwt.verify(no_signed).should be_true
         end
       end
 
       context 'otherwise' do
         it do
           expect do
-            jwt.verify(no_signed.chop, 'signature')
+            jwt.verify(no_signed, 'signature')
           end.should raise_error JSON::JWT::VerificationFailed
         end
       end
@@ -64,4 +64,14 @@ describe JSON::JWT do
       end
     end
   end
-end
+
+  describe '.decode' do
+    context 'when not signed nor encrypted' do
+      context 'no signature given' do
+        it do
+          JSON::JWT.decode(no_signed).should == jwt.with_indifferent_access
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,82 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: json-jwt
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70225743843840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *70225743843840
+- !ruby/object:Gem::Dependency
   name: url_safe_base64
+  requirement: &70225743735080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70225743735080
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70225743717540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70225743717540
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70225743696960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70225743696960
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70225743690140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.8"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70225743690140
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70225743687880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70225743687880
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70225743683940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "2"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id005
-description: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON Web Key) in Ruby
-email: 
+  prerelease: false
+  version_requirements: *70225743683940
+description: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption
+  and JSON Web Key) in Ruby
+email:
 - nov@matake.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -98,32 +117,30 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/nov/json-jwt
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
-summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON Web Key) in Ruby
-test_files: 
+summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and
+  JSON Web Key) in Ruby
+test_files:
 - spec/fixtures/rsa/private_key.pem
 - spec/fixtures/rsa/public_key.pem
 - spec/helpers/sign_key_fixture_helper.rb