json-jwt 0.7.0.alpha2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a279683e6d96616536c1f63ccb1f1d51a37398f2
-  data.tar.gz: 5a3cbe00175853947bb1876b546c9061a465547e
+  metadata.gz: d95839ba6230af2b99ffc2fa11c6f4243a3a6284
+  data.tar.gz: 7e178d2d41f0ecbd3ec3baeab3b592e803f77c95
 SHA512:
-  metadata.gz: e94d5cd60ec9e4927a02e1aaefe7ede13322848111bab88ba44356e9131f435334d2cf12cdb062de025e68f7455ecc450a34e088e848cc1746730497e4bbe7ec
-  data.tar.gz: d143c8421971af2160ace61ea9a676864344025ebf950d14376a8d499250e3b9e0a268004a9945ebbc5a55230c07acbc32dc94871cd2122301589176edcd4fcc
+  metadata.gz: c83c62bbe8bb9ab18c2420be564ce54275ffd90f908951afafd904dacc4bc31b37891b2ddc3d2772daad190fc8614be0f393ce04c94399d8a8d78807c9b481b6
+  data.tar.gz: de9380f86c05ae0c23e37599676a6659ea174ecc2e424533f54fc8107057c42237361aaee1f2ae2e8e078ea3844eb304e5b71d003a0c9ffdb96cd2fb60fcf5e3

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.2
 
 before_install:
   - git submodule update --init --recursive

data/Rakefile

@@ -16,4 +16,4 @@ task :spec do
   Rake::Task[:'coverage:report'].invoke unless ENV['TRAVIS_RUBY_VERSION']
 end
 
-task :default => :spec
+task default: :spec

data/VERSION

@@ -1 +1 @@
-0.7.0.alpha2
+0.7.0

data/lib/json/jwk.rb

@@ -20,8 +20,8 @@ module JSON
         hex_x =  hex[2, data_len/2]
         hex_y = hex[2+data_len/2, data_len/2]
         @ecdsa_coodinates = {
-          :x => [hex_x].pack("H*"),
-          :y => [hex_y].pack("H*")
+          x: [hex_x].pack("H*"),
+          y: [hex_y].pack("H*")
         }
       end
       @ecdsa_coodinates
@@ -31,16 +31,16 @@ module JSON
       hash = case public_key
       when OpenSSL::PKey::RSA
         {
-          :kty => :RSA,
-          :e   => UrlSafeBase64.encode64(public_key.e.to_s(2)),
-          :n   => UrlSafeBase64.encode64(public_key.n.to_s(2)),
+          kty: :RSA,
+          e: UrlSafeBase64.encode64(public_key.e.to_s(2)),
+          n: UrlSafeBase64.encode64(public_key.n.to_s(2)),
         }
       when OpenSSL::PKey::EC
         {
-          :kty => :EC,
-          :crv => self.class.ecdsa_curve_identifier_for(public_key.group.curve_name),
-          :x   => UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:x].to_s),
-          :y   => UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:y].to_s),
+          kty: :EC,
+          crv: self.class.ecdsa_curve_identifier_for(public_key.group.curve_name),
+          x: UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:x].to_s),
+          y: UrlSafeBase64.encode64(ecdsa_coodinates(public_key)[:y].to_s),
         }
       else
         raise UnknownAlgorithm.new('Unknown Algorithm')
@@ -86,12 +86,16 @@ module JSON
           key.n = n
           key
         when 'EC'
-          key = OpenSSL::PKey::EC.new ecdsa_curve_name_for(jwk[:crv])
-          x, y = [jwk[:x], jwk[:y]].collect do |decoded|
-            OpenSSL::BN.new UrlSafeBase64.decode64(decoded), 2
+          if RUBY_VERSION >= '2.0.0'
+            key = OpenSSL::PKey::EC.new ecdsa_curve_name_for(jwk[:crv])
+            x, y = [jwk[:x], jwk[:y]].collect do |decoded|
+              OpenSSL::BN.new UrlSafeBase64.decode64(decoded), 2
+            end
+            key.public_key = OpenSSL::PKey::EC::Point.new(key.group).mul(x, y)
+            key
+          else
+            raise UnknownAlgorithm.new('ECDSA JWK Decoding requires Ruby 2.0+')
           end
-          key.public_key = OpenSSL::PKey::EC::Point.new(key.group).mul(x, y)
-          key
         else
           raise UnknownAlgorithm.new('Unknown Algorithm')
         end

data/lib/json/jwk/set.rb

@@ -10,7 +10,7 @@ module JSON
 
     def as_json(options = {})
       # NOTE: Array.new wrapper is requied to avoid CircularReferenceError
-      {:keys => Array.new(self)}
+      {keys: Array.new(self)}
     end
   end
 end

data/spec/json/jwk_spec.rb

@@ -120,13 +120,26 @@ NrqoxoakrPo1NI1u+ET8oWGmnjB/nJFAPwIDAQAB
     end
 
     context 'when ECDSA' do
-      it do
-        JSON::JWK.decode(
-          kty: :EC,
-          crv: 'P-256',
-          x: 'MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4',
-          y: '4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM'
-        ).should be_instance_of OpenSSL::PKey::EC
+      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
+        end
+      else
+        it do
+          expect do
+            JSON::JWK.decode(
+              kty: :EC,
+              crv: 'P-256',
+              x: 'MKBCTNIcKUSDii11ySs3526iDZ8AiTo7Tu6KPAqv7D4',
+              y: '4Etl6SRW2YiLUrN5vfvVHuhp7x8PxltmWWlbbM4IFyM'
+            )
+          end.to raise_error JSON::JWK::UnknownAlgorithm
+        end
       end
     end
 

data/spec/json/jwt_spec.rb

@@ -92,8 +92,8 @@ describe JSON::JWT do
 
     context 'when signed' do
       it 'should delegate verification to JWS' do
-        jws.should_receive(:verify)
-        JSON::JWS.should_receive(:new).and_return(jws)
+        expect(jws).to receive(:verify)
+        expect(JSON::JWS).to receive(:new).and_return(jws)
         jwt.verify 'shared_secret'
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.7.0.alpha2
+  version: 0.7.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -192,9 +192,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2