json-jwt 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c556b283e2c0c8c4d09eb134c300bad571d22fe
-  data.tar.gz: 54ebd68df1a534dc5499c9176b67767c54922e50
+  metadata.gz: c89e8876d50ba67374f768113e49c6f4e1486328
+  data.tar.gz: 4dc7ccdfd93385c4275b95ad7690d9f02521ac4b
 SHA512:
-  metadata.gz: bf0549d83a08baaffad7e7df06f591e7ea3fc983b165747d87e23995a42a55e1c3b0d6366ef0a269787822449f0d478a5d69f226f11ef93cdc583489509d9f3d
-  data.tar.gz: 92af636c0e452cbfca9a3445d285b2b7c6399c281190a542fe8a5a0432120cb979ab259c14506a058f1d688ad856b5e5ef0f86d00d803fbfd74593e519fc3e73
+  metadata.gz: 2b1976c4c86abb0de914273c1594da22250b62d88b183e031f6e67b336f7ee98096a7e9605888fdccd7fd0a13bdf71088a39632c7ff107c12219ef6a65ca9ffe
+  data.tar.gz: 4a7f3f081a0adab03c6ea43154c329d52ee86dde606719b2391fda556490f1085f9f93090eb25ab1bb367ba230dd484fd39da55a765f154c073c4e7a4d3ddb48

data/.travis.yml

@@ -1,8 +1,10 @@
+before_install:
+  - gem install bundler
+  - git submodule update --init --recursive
+
 rvm:
   - 1.9.3
   - 2.0
   - 2.1
   - 2.2
-
-before_install:
-  - git submodule update --init --recursive
+  - 2.3.0

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.5.2

data/lib/json/jws.rb

@@ -27,15 +27,14 @@ module JSON
       end
     end
 
-    def update_with_jose_attributes(hash_or_jwt)
-      update_without_jose_attributes hash_or_jwt
+    def update(hash_or_jwt)
+      super
       if hash_or_jwt.is_a? JSON::JWT
         self.header = hash_or_jwt.header
         self.signature = hash_or_jwt.signature
       end
       self
     end
-    alias_method_chain :update, :jose_attributes
 
     private
 

data/spec/helpers/nimbus_spec_helper.rb

@@ -5,11 +5,12 @@ module NimbusSpecHelper
     nimbus_path = File.expand_path(
       File.join(
         File.dirname(__FILE__),
-        'json-jwt-nimbus'
+        'json-jwt-nimbus',
+        'nimbus_jwe.rb'
       )
     )
     if File.exist? nimbus_path
-      require File.join(nimbus_path, 'nimbus_jwe')
+      require nimbus_path
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-14 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and