json-jwt 1.7.2 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46d454bd2e6047b03449919478ce749c216d507f
-  data.tar.gz: 8bb092a222022eb55a515b336c3f23efb7d6dbc8
+  metadata.gz: e6b7a5b50715a737924990c594c6c250ec31f59d
+  data.tar.gz: 64dd632640ef8abe3c445c016fe5771e722d7bdc
 SHA512:
-  metadata.gz: '0588ce6501e5f3dc41e11d27c6c93113cb7758b2d6c4a44e840406a0cddb873357adb7f63b00ccb584811ac57d39a1bfe90bfc7510673ddef1a996383d8bab6f'
-  data.tar.gz: 8b96d92f4291a7e3565a69ca46da45b8fdb913a5c04b8c980ddbb3f2b8b71ee52b7fcb9d240355e9313ae2786a7e2ee92efc8b564c429567c555a8363da87508
+  metadata.gz: 703cb245eba43a33a0c7127d3692edb293ce08d174da433e8e4f03c6d3419ebefc9f8367f231231129fd6f8bc07db0c4c3a884f2dfc92eb9e430d339c4b90411
+  data.tar.gz: 49e2fe3619e3d0e539fa42ac515643a710ec7f6011dc25051acc5b7c4d90f8ebefdc3d5ddfae731bb62a0c0f223cde260e447e1a486855f88d7c2dabaff757a4

data/VERSION

@@ -1 +1 @@
-1.7.2
+1.8.0

data/json-jwt.gemspec

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

data/lib/json/jose.rb

@@ -51,7 +51,7 @@ module JSON
         else
           decode_compact_serialized input, key_or_secret
         end
-      rescue MultiJson::DecodeError
+      rescue JSON::ParserError
         raise JWT::InvalidFormat.new("Invalid JSON Format")
       end
     end

data/lib/json/jwe.rb

@@ -92,10 +92,6 @@ module JSON
 
     # common
 
-    def gcm_supported?
-      RUBY_VERSION >= '2.0.0' && OpenSSL::OPENSSL_VERSION >= 'OpenSSL 1.0.1'
-    end
-
     def gcm?
       [:A128GCM, :A256GCM].include? encryption_method.try(:to_sym)
     end
@@ -109,11 +105,8 @@ module JSON
     end
 
     def cipher
-      @cipher ||= if gcm? && !gcm_supported?
-        raise UnexpectedAlgorithm.new('AEC GCM requires Ruby 2.0+ and OpenSSL 1.0.1c+')
-      else
-        OpenSSL::Cipher.new cipher_name
-      end
+      raise "#{cipher_name} isn't supported" unless OpenSSL::Cipher.ciphers.include?(cipher_name)
+      @cipher ||= OpenSSL::Cipher.new cipher_name
     end
 
     def cipher_name
@@ -263,7 +256,7 @@ module JSON
           UrlSafeBase64.decode64 segment
         end
         jwe.auth_data = input.split('.').first
-        jwe.header = MultiJson.load(_header_json_).with_indifferent_access
+        jwe.header = JSON.load(_header_json_).with_indifferent_access
         jwe.decrypt! private_key_or_secret unless private_key_or_secret == :skip_decryption
         jwe
       end
@@ -286,4 +279,4 @@ module JSON
       end
     end
   end
-end
+end

data/lib/json/jws.rb

@@ -140,7 +140,7 @@ module JSON
           UrlSafeBase64.decode64 segment.to_s
         end
         header, claims = [header, claims].collect do |json|
-          MultiJson.load(json).with_indifferent_access
+          JSON.load(json).with_indifferent_access
         end
         jws = new claims
         jws.header = header

data/lib/json/jwt.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 require 'url_safe_base64'
-require 'multi_json'
 require 'active_support'
 require 'active_support/core_ext'
 require 'json/jose'

data/spec/spec_helper.rb

@@ -15,7 +15,9 @@ RSpec.configure do |config|
 end
 
 def gcm_supported?
-  RUBY_VERSION >= '2.0.0' && OpenSSL::OPENSSL_VERSION >= 'OpenSSL 1.0.1'
+  ['aes-128-gcm', 'aes-128-gcm'].all? do |alg|
+    OpenSSL::Cipher.ciphers.include? alg
+  end
 end
 
 require 'helpers/sign_key_fixture_helper'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.8.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: url_safe_base64
   requirement: !ruby/object:Gem::Requirement