cancancan 2.1.3 → 2.1.4

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 (4) hide show
  1. checksums.yaml +5 -5
  2. data/lib/cancan/controller_additions.rb +3 -1
  3. data/lib/cancan/version.rb +1 -1
  4. metadata +19 -18
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA1:
3
- metadata.gz: de52624409f514745004820cec9c89f9c0ce7bd8
4
- data.tar.gz: aa37a4dc4a6ae653dc16011234c25836e0a91c95
2
+ SHA256:
3
+ metadata.gz: 6cb217274c85fd48abb32dd84f46bd09e32189bb50e945eed2bc1bdc17311004
4
+ data.tar.gz: 04bf927a117ecefa9375e01f0e170b284103562b4da0a1d72b8b8a56adf4f702
5
5
  SHA512:
6
- metadata.gz: 1c7fbce656e4036056222252e96b4990408ca98bc30af5d5a682b32e1903cab76852dea0e44a0d5a4eac731fd5eb95b2b3d527c48236b2463c2b4cc1fed2df20
7
- data.tar.gz: 7bc3653619d6fa4b9b833736f4e9467128edb388310056859c82ac86e98382e4c250bcce72961072e2406240288e59bf66d3066fdd9b747f8d5d5c596e7611ab
6
+ metadata.gz: d470789a6f4ad54825af660f82888b17b00b60a12ee9caa8473a522ed2ddbdf745121bab1d1eb65fb28de4ba6771ae03994641e257d46933de0455211f6949c3
7
+ data.tar.gz: 5b6c1bdf71f64d07c77c8362c6d43ed5e869fc7e8fd58be9951e4c7dc6d4492a6713c8975fff3269baa7e79fd3f06094ee30d58f50c5ec134ef4e620052552ba
data/lib/cancan/controller_additions.rb CHANGED
@@ -388,7 +388,9 @@ if defined? ActionController::Base
388
388
  ActionController::Base.class_eval do
389
389
  include CanCan::ControllerAdditions
390
390
  end
391
- elsif defined? ActionController::API
391
+ end
392
+
393
+ if defined? ActionController::API
392
394
  ActionController::API.class_eval do
393
395
  include CanCan::ControllerAdditions
394
396
  end
data/lib/cancan/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module CanCan
2
- VERSION = '2.1.3'.freeze
2
+ VERSION = '2.1.4'.freeze
3
3
  end
metadata CHANGED
@@ -1,47 +1,48 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cancancan
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alessandro Rodi (Renuo AG)
8
8
  - Bryan Rite
9
9
  - Ryan Bates
10
10
  - Richard Wilson
11
- autorequire:
11
+ autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2018-01-16 00:00:00.000000000 Z
14
+ date: 2018-04-09 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
+ name: bundler
17
18
  requirement: !ruby/object:Gem::Requirement
18
19
  requirements:
19
20
  - - "~>"
20
21
  - !ruby/object:Gem::Version
21
22
  version: '1.3'
22
- name: bundler
23
- prerelease: false
24
23
  type: :development
24
+ prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - "~>"
28
28
  - !ruby/object:Gem::Version
29
29
  version: '1.3'
30
30
  - !ruby/object:Gem::Dependency
31
+ name: rubocop
31
32
  requirement: !ruby/object:Gem::Requirement
32
33
  requirements:
33
34
  - - "~>"
34
35
  - !ruby/object:Gem::Version
35
36
  version: 0.48.1
36
- name: rubocop
37
- prerelease: false
38
37
  type: :development
38
+ prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
41
  - - "~>"
42
42
  - !ruby/object:Gem::Version
43
43
  version: 0.48.1
44
44
  - !ruby/object:Gem::Dependency
45
+ name: rake
45
46
  requirement: !ruby/object:Gem::Requirement
46
47
  requirements:
47
48
  - - "~>"
@@ -50,9 +51,8 @@ dependencies:
50
51
  - - ">="
51
52
  - !ruby/object:Gem::Version
52
53
  version: 10.1.1
53
- name: rake
54
- prerelease: false
55
54
  type: :development
55
+ prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
@@ -62,6 +62,7 @@ dependencies:
62
62
  - !ruby/object:Gem::Version
63
63
  version: 10.1.1
64
64
  - !ruby/object:Gem::Dependency
65
+ name: rspec
65
66
  requirement: !ruby/object:Gem::Requirement
66
67
  requirements:
67
68
  - - "~>"
@@ -70,9 +71,8 @@ dependencies:
70
71
  - - ">="
71
72
  - !ruby/object:Gem::Version
72
73
  version: 3.2.0
73
- name: rspec
74
- prerelease: false
75
74
  type: :development
75
+ prerelease: false
76
76
  version_requirements: !ruby/object:Gem::Requirement
77
77
  requirements:
78
78
  - - "~>"
@@ -82,6 +82,7 @@ dependencies:
82
82
  - !ruby/object:Gem::Version
83
83
  version: 3.2.0
84
84
  - !ruby/object:Gem::Dependency
85
+ name: appraisal
85
86
  requirement: !ruby/object:Gem::Requirement
86
87
  requirements:
87
88
  - - "~>"
@@ -90,9 +91,8 @@ dependencies:
90
91
  - - ">="
91
92
  - !ruby/object:Gem::Version
92
93
  version: 2.0.0
93
- name: appraisal
94
- prerelease: false
95
94
  type: :development
95
+ prerelease: false
96
96
  version_requirements: !ruby/object:Gem::Requirement
97
97
  requirements:
98
98
  - - "~>"
@@ -101,7 +101,8 @@ dependencies:
101
101
  - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: 2.0.0
104
- description: Simple authorization solution for Rails. All permissions are stored in a single location.
104
+ description: Simple authorization solution for Rails. All permissions are stored in
105
+ a single location.
105
106
  email: alessandro.rodi@renuo.ch
106
107
  executables: []
107
108
  extensions: []
@@ -139,7 +140,7 @@ homepage: https://github.com/CanCanCommunity/cancancan
139
140
  licenses:
140
141
  - MIT
141
142
  metadata: {}
142
- post_install_message:
143
+ post_install_message:
143
144
  rdoc_options: []
144
145
  require_paths:
145
146
  - lib
@@ -154,9 +155,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
154
155
  - !ruby/object:Gem::Version
155
156
  version: '0'
156
157
  requirements: []
157
- rubyforge_project:
158
- rubygems_version: 2.4.8
159
- signing_key:
158
+ rubyforge_project:
159
+ rubygems_version: 2.7.4
160
+ signing_key:
160
161
  specification_version: 4
161
162
  summary: Simple authorization solution for Rails.
162
163
  test_files: []