json-jwt 1.5.1 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +5 -3
  3. data/VERSION +1 -1
  4. data/lib/json/jws.rb +2 -3
  5. data/spec/helpers/nimbus_spec_helper.rb +3 -2
  6. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 6c556b283e2c0c8c4d09eb134c300bad571d22fe
4
- data.tar.gz: 54ebd68df1a534dc5499c9176b67767c54922e50
3
+ metadata.gz: c89e8876d50ba67374f768113e49c6f4e1486328
4
+ data.tar.gz: 4dc7ccdfd93385c4275b95ad7690d9f02521ac4b
5
5
  SHA512:
6
- metadata.gz: bf0549d83a08baaffad7e7df06f591e7ea3fc983b165747d87e23995a42a55e1c3b0d6366ef0a269787822449f0d478a5d69f226f11ef93cdc583489509d9f3d
7
- data.tar.gz: 92af636c0e452cbfca9a3445d285b2b7c6399c281190a542fe8a5a0432120cb979ab259c14506a058f1d688ad856b5e5ef0f86d00d803fbfd74593e519fc3e73
6
+ metadata.gz: 2b1976c4c86abb0de914273c1594da22250b62d88b183e031f6e67b336f7ee98096a7e9605888fdccd7fd0a13bdf71088a39632c7ff107c12219ef6a65ca9ffe
7
+ data.tar.gz: 4a7f3f081a0adab03c6ea43154c329d52ee86dde606719b2391fda556490f1085f9f93090eb25ab1bb367ba230dd484fd39da55a765f154c073c4e7a4d3ddb48
data/.travis.yml CHANGED
@@ -1,8 +1,10 @@
1
+ before_install:
2
+ - gem install bundler
3
+ - git submodule update --init --recursive
4
+
1
5
  rvm:
2
6
  - 1.9.3
3
7
  - 2.0
4
8
  - 2.1
5
9
  - 2.2
6
-
7
- before_install:
8
- - git submodule update --init --recursive
10
+ - 2.3.0
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.5.1
1
+ 1.5.2
data/lib/json/jws.rb CHANGED
@@ -27,15 +27,14 @@ module JSON
27
27
  end
28
28
  end
29
29
 
30
- def update_with_jose_attributes(hash_or_jwt)
31
- update_without_jose_attributes hash_or_jwt
30
+ def update(hash_or_jwt)
31
+ super
32
32
  if hash_or_jwt.is_a? JSON::JWT
33
33
  self.header = hash_or_jwt.header
34
34
  self.signature = hash_or_jwt.signature
35
35
  end
36
36
  self
37
37
  end
38
- alias_method_chain :update, :jose_attributes
39
38
 
40
39
  private
41
40
 
data/spec/helpers/nimbus_spec_helper.rb CHANGED
@@ -5,11 +5,12 @@ module NimbusSpecHelper
5
5
  nimbus_path = File.expand_path(
6
6
  File.join(
7
7
  File.dirname(__FILE__),
8
- 'json-jwt-nimbus'
8
+ 'json-jwt-nimbus',
9
+ 'nimbus_jwe.rb'
9
10
  )
10
11
  )
11
12
  if File.exist? nimbus_path
12
- require File.join(nimbus_path, 'nimbus_jwe')
13
+ require nimbus_path
13
14
  end
14
15
  end
15
16
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: json-jwt
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.1
4
+ version: 1.5.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - nov matake
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-09-14 00:00:00.000000000 Z
11
+ date: 2016-01-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: multi_json
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
202
202
  version: '0'
203
203
  requirements: []
204
204
  rubyforge_project:
205
- rubygems_version: 2.4.5
205
+ rubygems_version: 2.5.1
206
206
  signing_key:
207
207
  specification_version: 4
208
208
  summary: JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and