json-jwt 0.4.1 → 0.4.2

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    json-jwt (0.4.1)
+    json-jwt (0.4.2)
       activesupport (>= 2.3)
       i18n
-      json (>= 1.4.3)
+      multi_json (>= 1.3)
       url_safe_base64
 
 GEM
@@ -21,8 +21,6 @@ GEM
     diff-lcs (1.1.3)
     hashie (1.2.0)
     i18n (0.6.1)
-    json (1.7.6)
-    json (1.7.6-java)
     multi_json (1.5.0)
     rake (10.0.2)
     rspec (2.12.0)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/json-jwt.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_runtime_dependency "json", ">= 1.4.3"
+  s.add_runtime_dependency "multi_json", ">= 1.3"
   s.add_runtime_dependency "url_safe_base64"
   s.add_runtime_dependency "activesupport", ">= 2.3"
   s.add_runtime_dependency "i18n"

data/lib/json/jwk.rb

@@ -1,5 +1,5 @@
 module JSON
-  class JWK < Hash
+  class JWK < ActiveSupport::HashWithIndifferentAccess
     class UnknownAlgorithm < JWT::Exception; end
 
     def initialize(public_key, options = {})

data/lib/json/jwt.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'active_support/core_ext'
 
 module JSON
-  class JWT < Hash
+  class JWT < ActiveSupport::HashWithIndifferentAccess
     attr_accessor :header, :signature
 
     class Exception < StandardError; end
@@ -55,7 +55,7 @@ module JSON
             UrlSafeBase64.decode64 segment.to_s
           end
           header, claims = [header, claims].collect do |json|
-            JSON.parse json, :symbolize_names => true, :symbolize_keys => true
+            MultiJson.load(json).with_indifferent_access
           end
           signature_base_string = jwt_string.split('.')[0, 2].join('.')
           jwt = new claims
@@ -74,7 +74,7 @@ module JSON
         else
           raise InvalidFormat.new('Invalid JWT Format. JWT should include 2 or 3 dots.')
         end
-      rescue JSON::ParserError
+      rescue MultiJson::DecodeError
         raise InvalidFormat.new("Invalid JSON Format")
       end
     end

data/spec/json/jwk_spec.rb

@@ -3,14 +3,14 @@ require 'spec_helper'
 describe JSON::JWK do
   context 'when RSA public key given' do
     let(:jwk) { JSON::JWK.new public_key }
-    it { jwk.should include :alg, :e, :n }
+    it { jwk.keys.should include :alg, :e, :n }
     its(:alg) { jwk[:alg].should == :RSA }
     its(:e) { jwk[:e].should == UrlSafeBase64.encode64(public_key.e.to_s(2)) }
     its(:n) { jwk[:n].should == UrlSafeBase64.encode64(public_key.n.to_s(2)) }
 
     context 'when kid/use options given' do
       let(:jwk) { JSON::JWK.new public_key, kid: '12345', use: :sig }
-      it { jwk.should include :kid, :use }
+      it { jwk.keys.should include :kid, :use }
       its(:kid) { jwk[:kid].should == '12345' }
       its(:use) { jwk[:use].should == :sig }
     end
@@ -36,7 +36,7 @@ describe JSON::JWK do
     [256, 384, 512].each do |digest_length|
       describe "EC#{digest_length}" do
         let(:jwk) { JSON::JWK.new public_key(:ecdsa, digest_length: digest_length) }
-        it { jwk.should include :alg, :crv, :x, :y }
+        it { jwk.keys.should include :alg, :crv, :x, :y }
         its(:alg) { jwk[:alg].should == :EC }
         its(:x) { jwk[:x].should == expected_coodinates[digest_length][:x] }
         its(:y) { jwk[:y].should == expected_coodinates[digest_length][:y] }

data/spec/json/jwt_spec.rb

@@ -12,8 +12,8 @@ describe JSON::JWT do
     {
       iss: 'joe',
       exp: 1300819380,
-      :'http://example.com/is_root' => true
-    }
+      'http://example.com/is_root' => true
+    }.with_indifferent_access
   end
   let(:no_signed) do
     'eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJpc3MiOiJqb2UiLCJleHAiOjEzMDA4MTkzODAsImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.'
@@ -50,7 +50,7 @@ describe JSON::JWT do
           UrlSafeBase64.decode64 segment.to_s
         end
         header, claims = [header_base64, claims_base64].collect do |json|
-          JSON.parse json, symbolize_names: true, symbolize_keys: true
+          MultiJson.load(json).with_indifferent_access
         end
         jwt = JSON::JWT.new claims
         jwt.header = header

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,16 +9,16 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: url_safe_base64
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 294812964750732279
+      hash: 2523711638554282787
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -183,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 294812964750732279
+      hash: 2523711638554282787
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24