hydra-role-management 1.0.2 → 1.1.0
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.
- checksums.yaml +4 -4
- data/.circleci/config.yml +161 -21
- data/.github_changelog_generator +2 -0
- data/.rubocop.yml +6 -2
- data/CHANGELOG.md +148 -5
- data/CONTRIBUTING.md +23 -1
- data/Gemfile +11 -4
- data/README.md +39 -22
- data/Rakefile +1 -0
- data/app/controllers/concerns/hydra/role_management/roles_behavior.rb +14 -10
- data/app/controllers/concerns/hydra/role_management/user_roles_behavior.rb +9 -7
- data/app/controllers/roles_controller.rb +1 -0
- data/app/controllers/user_roles_controller.rb +1 -0
- data/app/models/concerns/hydra/role_management/legacy_attribute_handling.rb +1 -0
- data/app/models/concerns/hydra/role_management/user_roles.rb +1 -0
- data/app/models/role.rb +4 -2
- data/config/routes.rb +2 -1
- data/hydra-role-management.gemspec +7 -3
- data/lib/generators/roles/roles_generator.rb +9 -8
- data/lib/generators/roles/templates/hydra_role_management_rails3.rb +2 -1
- data/lib/generators/roles/templates/migrations/user_roles.rb +3 -2
- data/lib/hydra/role_management/version.rb +2 -1
- data/lib/hydra/role_management.rb +1 -0
- data/lib/hydra-role-management.rb +2 -1
- data/spec/controllers/roles_controller_spec.rb +1 -0
- data/spec/controllers/user_roles_controller_spec.rb +2 -1
- data/spec/lib/user_roles_spec.rb +1 -0
- data/spec/models/role_spec.rb +1 -0
- data/spec/routing/role_management_routes_spec.rb +1 -0
- data/spec/spec_helper.rb +1 -0
- data/spec/test_app_templates/app/models/sample.rb +1 -0
- data/spec/test_app_templates/app/models/solr_document.rb +1 -1
- data/spec/test_app_templates/config/initializers/hydra_config.rb +1 -0
- data/spec/test_app_templates/lib/generators/test_app_generator.rb +1 -0
- metadata +43 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 61cbc32dc3e32c66c6d8e68507337815184f76ee15ed4a6f47b003525d66c672
|
|
4
|
+
data.tar.gz: f67e29bc421c18f92e22b471134cd1fe741d6defcef2c3b61ff8cd163f57e2f1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f608323776d336776049d75ac017b0e9069e278a2791efdd38335d77348c638732ea9e1fccdea59ac519be8d8add265bf4e5e0616d05c296195b8c76bdc82936
|
|
7
|
+
data.tar.gz: 168efd3ca4c09ef0e06f175526ad24674c7ac0d10866024595a437a6e37a8555c6ae284223627e4ac4ae28a4d9ad858bb99fe6d987036538c7ed555d095a3687
|
data/.circleci/config.yml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
version: 2.1
|
|
3
3
|
orbs:
|
|
4
|
-
samvera: samvera/circleci-orb@0
|
|
4
|
+
samvera: samvera/circleci-orb@1.0
|
|
5
5
|
jobs:
|
|
6
6
|
test:
|
|
7
7
|
parameters:
|
|
@@ -9,7 +9,7 @@ jobs:
|
|
|
9
9
|
type: string
|
|
10
10
|
bundler_version:
|
|
11
11
|
type: string
|
|
12
|
-
default:
|
|
12
|
+
default: 2.4.5
|
|
13
13
|
rails_version:
|
|
14
14
|
type: string
|
|
15
15
|
executor:
|
|
@@ -20,18 +20,33 @@ jobs:
|
|
|
20
20
|
NOKOGIRI_USE_SYSTEM_LIBRARIES: true
|
|
21
21
|
ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
|
|
22
22
|
steps:
|
|
23
|
+
- run:
|
|
24
|
+
name: Update the apt package repository cache
|
|
25
|
+
command: |
|
|
26
|
+
sudo apt-get update
|
|
27
|
+
- run:
|
|
28
|
+
name: Install required apt packages
|
|
29
|
+
command: |
|
|
30
|
+
sudo apt-get install -y libsqlite3-dev
|
|
23
31
|
- samvera/cached_checkout
|
|
24
|
-
-
|
|
32
|
+
- run:
|
|
33
|
+
name: Check for a branch named 'master'
|
|
34
|
+
command: |
|
|
35
|
+
git fetch --all --quiet --prune --prune-tags
|
|
36
|
+
if [[ -n "$(git branch --all --list master */master)" ]]; then
|
|
37
|
+
echo "A branch named 'master' was found. Please remove it."
|
|
38
|
+
echo "$(git branch --all --list master */master)"
|
|
39
|
+
fi
|
|
40
|
+
[[ -z "$(git branch --all --list master */master)" ]]
|
|
41
|
+
- samvera/bundle:
|
|
25
42
|
ruby_version: << parameters.ruby_version >>
|
|
26
43
|
bundler_version: << parameters.bundler_version >>
|
|
27
|
-
project: hydra-role-management
|
|
28
44
|
- samvera/rubocop
|
|
29
45
|
- samvera/engine_cart_generate:
|
|
30
46
|
cache_key: v1-internal-test-app-{{ checksum "hydra-role-management.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/roles/roles_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
|
|
31
|
-
- samvera/
|
|
47
|
+
- samvera/bundle:
|
|
32
48
|
ruby_version: << parameters.ruby_version >>
|
|
33
49
|
bundler_version: << parameters.bundler_version >>
|
|
34
|
-
project: hydra-role-management
|
|
35
50
|
- samvera/parallel_rspec
|
|
36
51
|
- persist_to_workspace:
|
|
37
52
|
root: ~/
|
|
@@ -42,27 +57,152 @@ jobs:
|
|
|
42
57
|
workflows:
|
|
43
58
|
ci:
|
|
44
59
|
jobs:
|
|
60
|
+
# Rails 7.0
|
|
45
61
|
- test:
|
|
46
|
-
name:
|
|
47
|
-
ruby_version: 2.
|
|
48
|
-
rails_version:
|
|
62
|
+
name: "ruby3-2_rails7-0"
|
|
63
|
+
ruby_version: 3.2.0
|
|
64
|
+
rails_version: 7.0.4.1
|
|
49
65
|
- test:
|
|
50
|
-
name:
|
|
51
|
-
ruby_version:
|
|
52
|
-
rails_version:
|
|
66
|
+
name: "ruby3-1_rails7-0"
|
|
67
|
+
ruby_version: 3.1.3
|
|
68
|
+
rails_version: 7.0.4.1
|
|
53
69
|
- test:
|
|
54
|
-
name:
|
|
55
|
-
ruby_version:
|
|
56
|
-
rails_version:
|
|
70
|
+
name: "ruby3-0_rails7-0"
|
|
71
|
+
ruby_version: 3.0.5
|
|
72
|
+
rails_version: 7.0.4.1
|
|
73
|
+
# Rails 6.1
|
|
57
74
|
- test:
|
|
58
|
-
name:
|
|
59
|
-
ruby_version: 2.
|
|
75
|
+
name: "ruby3-2_rails6-1"
|
|
76
|
+
ruby_version: 3.2.0
|
|
77
|
+
rails_version: 6.1.7.1
|
|
78
|
+
- test:
|
|
79
|
+
name: "ruby3-1_rails6-1"
|
|
80
|
+
ruby_version: 3.1.3
|
|
81
|
+
rails_version: 6.1.7.1
|
|
82
|
+
- test:
|
|
83
|
+
name: "ruby3-0_rails6-1"
|
|
84
|
+
ruby_version: 3.0.5
|
|
85
|
+
rails_version: 6.1.7.1
|
|
86
|
+
- test:
|
|
87
|
+
name: "ruby2-7_rails6-1"
|
|
88
|
+
ruby_version: 2.7.7
|
|
89
|
+
rails_version: 6.1.7.1
|
|
90
|
+
# Rails 6.0
|
|
91
|
+
- test:
|
|
92
|
+
name: "ruby3-2_rails6-0"
|
|
93
|
+
ruby_version: 3.2.0
|
|
94
|
+
rails_version: 6.0.6.1
|
|
95
|
+
- test:
|
|
96
|
+
name: "ruby3-1_rails6-0"
|
|
97
|
+
ruby_version: 3.1.3
|
|
98
|
+
rails_version: 6.0.6.1
|
|
99
|
+
- test:
|
|
100
|
+
name: "ruby3-0_rails6-0"
|
|
101
|
+
ruby_version: 3.0.5
|
|
102
|
+
rails_version: 6.0.6.1
|
|
103
|
+
- test:
|
|
104
|
+
name: "ruby2-7_rails6-0"
|
|
105
|
+
ruby_version: 2.7.7
|
|
106
|
+
rails_version: 6.0.6.1
|
|
107
|
+
- test:
|
|
108
|
+
name: "ruby2-6_rails6-0"
|
|
109
|
+
ruby_version: 2.6.10
|
|
110
|
+
rails_version: 6.0.6.1
|
|
111
|
+
# Rails 5.2
|
|
112
|
+
- test:
|
|
113
|
+
name: "ruby2-7_rails5-2"
|
|
114
|
+
ruby_version: 2.7.7
|
|
115
|
+
rails_version: 5.2.8.1
|
|
116
|
+
- test:
|
|
117
|
+
name: "ruby2-6_rails5-2"
|
|
118
|
+
ruby_version: 2.6.10
|
|
119
|
+
rails_version: 5.2.8.1
|
|
120
|
+
# Rails 5.1
|
|
121
|
+
- test:
|
|
122
|
+
name: "ruby2-7_rails5-1"
|
|
123
|
+
ruby_version: 2.7.7
|
|
60
124
|
rails_version: 5.1.7
|
|
61
125
|
- test:
|
|
62
|
-
name: ruby2-
|
|
63
|
-
ruby_version: 2.
|
|
126
|
+
name: "ruby2-6_rails5-1"
|
|
127
|
+
ruby_version: 2.6.10
|
|
128
|
+
rails_version: 5.1.7
|
|
129
|
+
|
|
130
|
+
nightly:
|
|
131
|
+
triggers:
|
|
132
|
+
- schedule:
|
|
133
|
+
cron: "0 0 * * *"
|
|
134
|
+
filters:
|
|
135
|
+
branches:
|
|
136
|
+
only:
|
|
137
|
+
- main
|
|
138
|
+
|
|
139
|
+
jobs:
|
|
140
|
+
# Rails 7.0
|
|
141
|
+
- test:
|
|
142
|
+
name: "ruby3-2_rails7-0"
|
|
143
|
+
ruby_version: 3.2.0
|
|
144
|
+
rails_version: 7.0.4.1
|
|
145
|
+
- test:
|
|
146
|
+
name: "ruby3-1_rails7-0"
|
|
147
|
+
ruby_version: 3.1.3
|
|
148
|
+
rails_version: 7.0.4.1
|
|
149
|
+
- test:
|
|
150
|
+
name: "ruby3-0_rails7-0"
|
|
151
|
+
ruby_version: 3.0.5
|
|
152
|
+
rails_version: 7.0.4.1
|
|
153
|
+
# Rails 6.1
|
|
154
|
+
- test:
|
|
155
|
+
name: "ruby3-2_rails6-1"
|
|
156
|
+
ruby_version: 3.2.0
|
|
157
|
+
rails_version: 6.1.7.1
|
|
158
|
+
- test:
|
|
159
|
+
name: "ruby3-1_rails6-1"
|
|
160
|
+
ruby_version: 3.1.3
|
|
161
|
+
rails_version: 6.1.7.1
|
|
162
|
+
- test:
|
|
163
|
+
name: "ruby3-0_rails6-1"
|
|
164
|
+
ruby_version: 3.0.5
|
|
165
|
+
rails_version: 6.1.7.1
|
|
166
|
+
- test:
|
|
167
|
+
name: "ruby2-7_rails6-1"
|
|
168
|
+
ruby_version: 2.7.7
|
|
169
|
+
rails_version: 6.1.7.1
|
|
170
|
+
# Rails 6.0
|
|
171
|
+
- test:
|
|
172
|
+
name: "ruby3-2_rails6-0"
|
|
173
|
+
ruby_version: 3.2.0
|
|
174
|
+
rails_version: 6.0.6.1
|
|
175
|
+
- test:
|
|
176
|
+
name: "ruby3-1_rails6-0"
|
|
177
|
+
ruby_version: 3.1.3
|
|
178
|
+
rails_version: 6.0.6.1
|
|
179
|
+
- test:
|
|
180
|
+
name: "ruby3-0_rails6-0"
|
|
181
|
+
ruby_version: 3.0.5
|
|
182
|
+
rails_version: 6.0.6.1
|
|
183
|
+
- test:
|
|
184
|
+
name: "ruby2-7_rails6-0"
|
|
185
|
+
ruby_version: 2.7.7
|
|
186
|
+
rails_version: 6.0.6.1
|
|
187
|
+
- test:
|
|
188
|
+
name: "ruby2-6_rails6-0"
|
|
189
|
+
ruby_version: 2.6.10
|
|
190
|
+
rails_version: 6.0.6.1
|
|
191
|
+
# Rails 5.2
|
|
192
|
+
- test:
|
|
193
|
+
name: "ruby2-7_rails5-2"
|
|
194
|
+
ruby_version: 2.7.7
|
|
195
|
+
rails_version: 5.2.8.1
|
|
196
|
+
- test:
|
|
197
|
+
name: "ruby2-6_rails5-2"
|
|
198
|
+
ruby_version: 2.6.10
|
|
199
|
+
rails_version: 5.2.8.1
|
|
200
|
+
# Rails 5.1
|
|
201
|
+
- test:
|
|
202
|
+
name: "ruby2-7_rails5-1"
|
|
203
|
+
ruby_version: 2.7.7
|
|
64
204
|
rails_version: 5.1.7
|
|
65
205
|
- test:
|
|
66
|
-
name: ruby2-
|
|
67
|
-
ruby_version: 2.
|
|
206
|
+
name: "ruby2-6_rails5-1"
|
|
207
|
+
ruby_version: 2.6.10
|
|
68
208
|
rails_version: 5.1.7
|
data/.rubocop.yml
CHANGED
|
@@ -2,7 +2,7 @@ inherit_gem:
|
|
|
2
2
|
bixby: bixby_default.yml
|
|
3
3
|
|
|
4
4
|
AllCops:
|
|
5
|
-
TargetRubyVersion: 2.
|
|
5
|
+
TargetRubyVersion: 2.6
|
|
6
6
|
|
|
7
7
|
Bundler/DuplicatedGem:
|
|
8
8
|
Exclude:
|
|
@@ -15,8 +15,9 @@ Metrics/BlockLength:
|
|
|
15
15
|
- 'spec/lib/user_roles_spec.rb'
|
|
16
16
|
- 'spec/models/role_spec.rb'
|
|
17
17
|
- 'spec/routing/role_management_routes_spec.rb'
|
|
18
|
+
- hydra-role-management.gemspec
|
|
18
19
|
|
|
19
|
-
|
|
20
|
+
Layout/LineLength:
|
|
20
21
|
Exclude:
|
|
21
22
|
- ''
|
|
22
23
|
- 'lib/generators/roles/roles_generator.rb'
|
|
@@ -48,3 +49,6 @@ Rails/HasAndBelongsToMany:
|
|
|
48
49
|
RSpec/DescribeClass:
|
|
49
50
|
Exclude:
|
|
50
51
|
- 'spec/routing/role_management_routes_spec.rb'
|
|
52
|
+
|
|
53
|
+
Style/Documentation:
|
|
54
|
+
Enabled: false
|
data/CHANGELOG.md
CHANGED
|
@@ -1,8 +1,151 @@
|
|
|
1
1
|
# Changelog
|
|
2
|
-
All notable changes to this project will be documented in this file.
|
|
3
2
|
|
|
4
|
-
|
|
3
|
+
## [1.0.3](https://github.com/samvera/hydra-role-management/tree/1.0.3) (2020-06-10)
|
|
5
4
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
5
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v1.0.2...1.0.3)
|
|
6
|
+
|
|
7
|
+
**Closed issues:**
|
|
8
|
+
|
|
9
|
+
- Add support for Rails 6.0.z releases [#56](https://github.com/samvera/hydra-role-management/issues/56)
|
|
10
|
+
- Add support for Ruby 2.7.z releases [#55](https://github.com/samvera/hydra-role-management/issues/55)
|
|
11
|
+
|
|
12
|
+
**Merged pull requests:**
|
|
13
|
+
|
|
14
|
+
- Adding Ruby 2.7.z and Rails 6.y.z to the CircleCI build configuration [#58](https://github.com/samvera/hydra-role-management/pull/58) ([randalldfloyd](https://github.com/randalldfloyd))
|
|
15
|
+
|
|
16
|
+
## [v1.0.2](https://github.com/samvera/hydra-role-management/tree/v1.0.2) (2019-09-24)
|
|
17
|
+
|
|
18
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v1.0.1...v1.0.2)
|
|
19
|
+
|
|
20
|
+
**Implemented enhancements:**
|
|
21
|
+
|
|
22
|
+
- Generate a changelog [#49](https://github.com/samvera/hydra-role-management/issues/49)
|
|
23
|
+
|
|
24
|
+
**Closed issues:**
|
|
25
|
+
|
|
26
|
+
- Json 1.8 dependency is incompatible with bundler 2.x [#53](https://github.com/samvera/hydra-role-management/issues/53)
|
|
27
|
+
|
|
28
|
+
**Merged pull requests:**
|
|
29
|
+
|
|
30
|
+
- Prep for 1.0.2 release [#54](https://github.com/samvera/hydra-role-management/pull/54) ([bess](https://github.com/bess))
|
|
31
|
+
- Allow for later json versions [#52](https://github.com/samvera/hydra-role-management/pull/52) ([bess](https://github.com/bess))
|
|
32
|
+
|
|
33
|
+
## [v1.0.1](https://github.com/samvera/hydra-role-management/tree/v1.0.1) (2019-09-13)
|
|
34
|
+
|
|
35
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v1.0.0...v1.0.1)
|
|
36
|
+
|
|
37
|
+
**Implemented enhancements:**
|
|
38
|
+
|
|
39
|
+
- Migrate from Waffle.io to GitHub Projects [#46](https://github.com/samvera/hydra-role-management/issues/46)
|
|
40
|
+
|
|
41
|
+
**Closed issues:**
|
|
42
|
+
|
|
43
|
+
- Test against Rails release 5.1.7 and Ruby releases 2.6.3, 2.5.5, and 2.4.6 [#47](https://github.com/samvera/hydra-role-management/issues/47)
|
|
44
|
+
- Use CircleCI for continuous integration [#44](https://github.com/samvera/hydra-role-management/issues/44)
|
|
45
|
+
- Link to the contributing guidelines in the README [#39](https://github.com/samvera/hydra-role-management/issues/39)
|
|
46
|
+
- Test using Ruby releases 2.5.1 and 2.4.4 (also, test using Rails 5.2.0, 5.1.6, and 5.0.7) [#38](https://github.com/samvera/hydra-role-management/issues/38)
|
|
47
|
+
- Replace "Hydra" with "Samvera" in CONTRIBUTING.md [#37](https://github.com/samvera/hydra-role-management/issues/37)
|
|
48
|
+
- Improve test coverage to 100% [#36](https://github.com/samvera/hydra-role-management/issues/36)
|
|
49
|
+
- Integrate RuboCop for enforcing styling guidelines [#34](https://github.com/samvera/hydra-role-management/issues/34)
|
|
50
|
+
- Email as User id [#21](https://github.com/samvera/hydra-role-management/issues/21)
|
|
51
|
+
- roles generator messes up routes file [#9](https://github.com/samvera/hydra-role-management/issues/9)
|
|
52
|
+
|
|
53
|
+
**Merged pull requests:**
|
|
54
|
+
|
|
55
|
+
- Releases version 1.0.1 [#51](https://github.com/samvera/hydra-role-management/pull/51) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
56
|
+
- Update CircleCI Ruby and Rails versions [#50](https://github.com/samvera/hydra-role-management/pull/50) ([botimer](https://github.com/botimer))
|
|
57
|
+
- Updates the CircleCI configuration to test against Rails release 5.1.7 and Ruby releases 2.6.3, 2.5.5, and 2.4.6 [#48](https://github.com/samvera/hydra-role-management/pull/48) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
58
|
+
- Integrates CircleCI for continuous integration [#45](https://github.com/samvera/hydra-role-management/pull/45) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
59
|
+
- Updating the dependencies to support bundler 2.0.x releases and to require engine_cart 2.1.x releases [#43](https://github.com/samvera/hydra-role-management/pull/43) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
60
|
+
- Updating the Travis CI build matrix to use Ruby 2.5.1 and 2.4.4 along with Rails 5.2.1, 5.1.6, and 5.0.7 [#41](https://github.com/samvera/hydra-role-management/pull/41) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
61
|
+
- Update docs according to templates [#40](https://github.com/samvera/hydra-role-management/pull/40) ([botimer](https://github.com/botimer))
|
|
62
|
+
- Integrating Bixby and RuboCop [#35](https://github.com/samvera/hydra-role-management/pull/35) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
63
|
+
- Ensures that more complex Devise routes are not broken by the insertion of mount Hydra::RoleManagement::Engine => '/' [#33](https://github.com/samvera/hydra-role-management/pull/33) ([jrgriffiniii](https://github.com/jrgriffiniii))
|
|
64
|
+
- Use user.id instead of user in the path for the "Remove User" delete ... [#32](https://github.com/samvera/hydra-role-management/pull/32) ([coblej](https://github.com/coblej))
|
|
65
|
+
|
|
66
|
+
## [v1.0.0](https://github.com/samvera/hydra-role-management/tree/v1.0.0) (2017-11-02)
|
|
67
|
+
|
|
68
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v1.0...v1.0.0)
|
|
69
|
+
|
|
70
|
+
## [v1.0](https://github.com/samvera/hydra-role-management/tree/v1.0) (2017-11-02)
|
|
71
|
+
|
|
72
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v0.2.2...v1.0)
|
|
73
|
+
|
|
74
|
+
**Closed issues:**
|
|
75
|
+
|
|
76
|
+
- This gem is incompatible with Rails 5.1.2 migrations [#27](https://github.com/samvera/hydra-role-management/issues/27)
|
|
77
|
+
|
|
78
|
+
**Merged pull requests:**
|
|
79
|
+
|
|
80
|
+
- Tagging version 1.0 [#31](https://github.com/samvera/hydra-role-management/pull/31) ([bess](https://github.com/bess))
|
|
81
|
+
- Update build matrix and README [#30](https://github.com/samvera/hydra-role-management/pull/30) ([bess](https://github.com/bess))
|
|
82
|
+
- Add coveralls and travis badges [#29](https://github.com/samvera/hydra-role-management/pull/29) ([bess](https://github.com/bess))
|
|
83
|
+
- version user_roles migration template [#28](https://github.com/samvera/hydra-role-management/pull/28) ([dunn](https://github.com/dunn))
|
|
84
|
+
- Remove i18n-tasks for testing [#26](https://github.com/samvera/hydra-role-management/pull/26) ([elrayle](https://github.com/elrayle))
|
|
85
|
+
- Use translations for labels [#24](https://github.com/samvera/hydra-role-management/pull/24) ([elrayle](https://github.com/elrayle))
|
|
86
|
+
- Update engine_cart to 1.x [#23](https://github.com/samvera/hydra-role-management/pull/23) ([mjgiarlo](https://github.com/mjgiarlo))
|
|
87
|
+
- Stop spamming IRC with Travis builds [#22](https://github.com/samvera/hydra-role-management/pull/22) ([mjgiarlo](https://github.com/mjgiarlo))
|
|
88
|
+
|
|
89
|
+
## [v0.2.2](https://github.com/samvera/hydra-role-management/tree/v0.2.2) (2015-08-14)
|
|
90
|
+
|
|
91
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v0.2.1...v0.2.2)
|
|
92
|
+
|
|
93
|
+
**Closed issues:**
|
|
94
|
+
|
|
95
|
+
- License missing from gemspec [#7](https://github.com/samvera/hydra-role-management/issues/7)
|
|
96
|
+
|
|
97
|
+
**Merged pull requests:**
|
|
98
|
+
|
|
99
|
+
- Remove outdated cancan fix. [#20](https://github.com/samvera/hydra-role-management/pull/20) ([rotated8](https://github.com/rotated8))
|
|
100
|
+
- Fix indenting on the lines generated into the User class [#19](https://github.com/samvera/hydra-role-management/pull/19) ([jcoyne](https://github.com/jcoyne))
|
|
101
|
+
- Added Apache 2.0 License. Fixes #7 [#18](https://github.com/samvera/hydra-role-management/pull/18) ([jcoyne](https://github.com/jcoyne))
|
|
102
|
+
|
|
103
|
+
## [v0.2.1](https://github.com/samvera/hydra-role-management/tree/v0.2.1) (2014-12-18)
|
|
104
|
+
|
|
105
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v0.2.0...v0.2.1)
|
|
106
|
+
|
|
107
|
+
**Merged pull requests:**
|
|
108
|
+
|
|
109
|
+
- bumps version to '0.2.1' [#17](https://github.com/samvera/hydra-role-management/pull/17) ([mkorcy](https://github.com/mkorcy))
|
|
110
|
+
- Upgrade issues [#16](https://github.com/samvera/hydra-role-management/pull/16) ([mkorcy](https://github.com/mkorcy))
|
|
111
|
+
|
|
112
|
+
## [v0.2.0](https://github.com/samvera/hydra-role-management/tree/v0.2.0) (2014-06-25)
|
|
113
|
+
|
|
114
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v0.1.0...v0.2.0)
|
|
115
|
+
|
|
116
|
+
**Closed issues:**
|
|
117
|
+
|
|
118
|
+
- Decouple from hydra-head [#12](https://github.com/samvera/hydra-role-management/issues/12)
|
|
119
|
+
- don't depend on devise-guests [#10](https://github.com/samvera/hydra-role-management/issues/10)
|
|
120
|
+
|
|
121
|
+
**Merged pull requests:**
|
|
122
|
+
|
|
123
|
+
- Upgrade to boostrap_form (instead of bootstrap_forms) [#14](https://github.com/samvera/hydra-role-management/pull/14) ([val99erie](https://github.com/val99erie))
|
|
124
|
+
- Remove dependency on hydra-head. Fixes #12 [#13](https://github.com/samvera/hydra-role-management/pull/13) ([jcoyne](https://github.com/jcoyne))
|
|
125
|
+
- Don't check guest? unless DeviseGuests is installed. [#11](https://github.com/samvera/hydra-role-management/pull/11) ([jcoyne](https://github.com/jcoyne))
|
|
126
|
+
- Support drawing routes on a path other than /roles [#8](https://github.com/samvera/hydra-role-management/pull/8) ([mbklein](https://github.com/mbklein))
|
|
127
|
+
|
|
128
|
+
## [v0.1.0](https://github.com/samvera/hydra-role-management/tree/v0.1.0) (2013-09-24)
|
|
129
|
+
|
|
130
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v0.0.2...v0.1.0)
|
|
131
|
+
|
|
132
|
+
**Implemented enhancements:**
|
|
133
|
+
|
|
134
|
+
- Add documentation about needed cancan abilities [#2](https://github.com/samvera/hydra-role-management/issues/2)
|
|
135
|
+
|
|
136
|
+
**Merged pull requests:**
|
|
137
|
+
|
|
138
|
+
- Rails4 support [#6](https://github.com/samvera/hydra-role-management/pull/6) ([acurley](https://github.com/acurley))
|
|
139
|
+
- Redirect to edit when user can't edit all roles but can edit the current role [#5](https://github.com/samvera/hydra-role-management/pull/5) ([cjcolvar](https://github.com/cjcolvar))
|
|
140
|
+
- Allow renaming roles and deleting roles [#4](https://github.com/samvera/hydra-role-management/pull/4) ([cjcolvar](https://github.com/cjcolvar))
|
|
141
|
+
- Testing notes in README; newline before User model injection; require bootstrap_forms [#1](https://github.com/samvera/hydra-role-management/pull/1) ([cjcolvar](https://github.com/cjcolvar))
|
|
142
|
+
|
|
143
|
+
## [v0.0.2](https://github.com/samvera/hydra-role-management/tree/v0.0.2) (2013-04-18)
|
|
144
|
+
|
|
145
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/v0.0.1...v0.0.2)
|
|
146
|
+
|
|
147
|
+
## [v0.0.1](https://github.com/samvera/hydra-role-management/tree/v0.0.1) (2013-04-18)
|
|
148
|
+
|
|
149
|
+
[Full Changelog](https://github.com/samvera/hydra-role-management/compare/0ab8d8ace4200cc7058e0cf1de77db6bb531ddf6...v0.0.1)
|
|
150
|
+
|
|
151
|
+
* _This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)_
|
data/CONTRIBUTING.md
CHANGED
|
@@ -22,6 +22,28 @@ https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Proper
|
|
|
22
22
|
|
|
23
23
|
You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
|
|
24
24
|
|
|
25
|
+
## Language
|
|
26
|
+
|
|
27
|
+
The language we use matters. Today, tomorrow, and for years to come
|
|
28
|
+
people will read the code we write. They will judge us for our
|
|
29
|
+
design, logic, and the words we use to describe the system.
|
|
30
|
+
|
|
31
|
+
Our words should be accessible. Favor descriptive words that give
|
|
32
|
+
meaning while avoiding reinforcing systemic inequities. For example,
|
|
33
|
+
in the Samvera community, we should favor using allowed\_list instead
|
|
34
|
+
of whitelist, denied\_list instead of blacklist, or source/copy
|
|
35
|
+
instead of master/slave.
|
|
36
|
+
|
|
37
|
+
We're going to get it wrong, but this is a call to keep working to
|
|
38
|
+
make it right. View our code and the words we choose as a chance to
|
|
39
|
+
have a conversation. A chance to grow an understanding of the systems
|
|
40
|
+
we develop as well as the systems in which we live.
|
|
41
|
+
|
|
42
|
+
See [“Blacklists” and “whitelists”: a salutary warning concerning the
|
|
43
|
+
prevalence of racist language in discussions of predatory
|
|
44
|
+
publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
|
|
45
|
+
further details.
|
|
46
|
+
|
|
25
47
|
## Contribution Tasks
|
|
26
48
|
|
|
27
49
|
* Reporting Issues
|
|
@@ -34,7 +56,7 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
|
|
|
34
56
|
### Reporting Issues
|
|
35
57
|
|
|
36
58
|
* Make sure you have a [GitHub account](https://github.com/signup/free)
|
|
37
|
-
* Submit a [Github issue](
|
|
59
|
+
* Submit a [Github issue](https://github.com/samvera/{{library}}/issues/) by:
|
|
38
60
|
* Clearly describing the issue
|
|
39
61
|
* Provide a descriptive summary
|
|
40
62
|
* Explain the expected behavior
|
data/Gemfile
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
-
|
|
2
|
+
|
|
3
|
+
source 'https://rubygems.org'
|
|
3
4
|
|
|
4
5
|
gem 'coveralls', require: false
|
|
5
6
|
|
|
@@ -8,8 +9,11 @@ gemspec
|
|
|
8
9
|
# BEGIN ENGINE_CART BLOCK
|
|
9
10
|
# engine_cart: 1.1.0
|
|
10
11
|
# engine_cart stanza: 0.10.0
|
|
11
|
-
# the below comes from engine_cart, a gem used to test this Rails engine gem
|
|
12
|
-
|
|
12
|
+
# the below comes from engine_cart, a gem used to test this Rails engine gem
|
|
13
|
+
# in the context of a Rails app.
|
|
14
|
+
file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] ||
|
|
15
|
+
ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app',
|
|
16
|
+
File.dirname(__FILE__)))
|
|
13
17
|
if File.exist?(file)
|
|
14
18
|
begin
|
|
15
19
|
eval_gemfile file
|
|
@@ -18,7 +22,8 @@ if File.exist?(file)
|
|
|
18
22
|
Bundler.ui.warn e.message
|
|
19
23
|
end
|
|
20
24
|
else
|
|
21
|
-
Bundler.ui.warn "[EngineCart]
|
|
25
|
+
Bundler.ui.warn "[EngineCart] Unmet dependencies in #{file}," \
|
|
26
|
+
' using placeholder dependencies'
|
|
22
27
|
|
|
23
28
|
if ENV['RAILS_VERSION']
|
|
24
29
|
if ENV['RAILS_VERSION'] == 'edge'
|
|
@@ -36,6 +41,8 @@ else
|
|
|
36
41
|
gem 'sass-rails', '>= 5.0'
|
|
37
42
|
when /^4.[01]/
|
|
38
43
|
gem 'sass-rails', '< 5.0'
|
|
44
|
+
when /^5.[12]/
|
|
45
|
+
gem 'sass-rails', '~> 5.0'
|
|
39
46
|
end
|
|
40
47
|
end
|
|
41
48
|
# END ENGINE_CART BLOCK
|
data/README.md
CHANGED
|
@@ -1,32 +1,31 @@
|
|
|
1
1
|
# hydra-role-management
|
|
2
2
|
|
|
3
3
|
Code:
|
|
4
|
-
[](https://circleci.com/gh/samvera/hydra-role-management)
|
|
5
4
|
[](https://badge.fury.io/rb/hydra-role-management)
|
|
6
|
-
[](https://circleci.com/gh/samvera/hydra-role-management)
|
|
6
|
+
[](https://coveralls.io/github/samvera/hydra-role-management?branch=main)
|
|
7
7
|
|
|
8
8
|
Docs:
|
|
9
9
|
[](./CONTRIBUTING.md)
|
|
10
10
|
[](./LICENSE.md)
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
[](http://slack.samvera.org/)
|
|
12
|
+
Community Support: [](http://slack.samvera.org/)
|
|
14
13
|
|
|
15
14
|
# What is hydra-role-management?
|
|
16
15
|
|
|
17
|
-
An engine gem to provide a RDBMS backed list of roles and their associated user.
|
|
16
|
+
An engine gem to provide a RDBMS backed list of roles and their associated user. This replaces the hydra default role mapper.
|
|
18
17
|
|
|
19
18
|
As of version 1.0, this gem only supports Rails 5.
|
|
20
19
|
|
|
21
20
|
## Product Owner & Maintenance
|
|
22
21
|
|
|
23
|
-
|
|
24
|
-
what this means can be found
|
|
25
|
-
[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
|
|
22
|
+
`hydra-role-management` was a Core Component of the Samvera Community. Given a decline in available labor required for maintenance, this project no longer has a dedicated Product Owner. The documentation for what this means can be found [here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
|
|
26
23
|
|
|
27
24
|
### Product Owner
|
|
28
25
|
|
|
29
|
-
|
|
26
|
+
**Vacant**
|
|
27
|
+
|
|
28
|
+
_Until a Product Owner has been identified, we ask that you please direct all requests for support, bug reports, and general questions to the [`#dev` Channel on the Samvera Slack](https://samvera.slack.com/app_redirect?channel=dev)._
|
|
30
29
|
|
|
31
30
|
# Help
|
|
32
31
|
|
|
@@ -34,10 +33,10 @@ The Samvera community is here to help. Please see our [support guide](./SUPPORT.
|
|
|
34
33
|
|
|
35
34
|
## Installing:
|
|
36
35
|
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
- Add: `gem 'hydra-role-management'` to your Gemfile and then `bundle install`
|
|
37
|
+
- `rails generate roles`
|
|
38
|
+
- `rake db:migrate`
|
|
39
|
+
- Add the following [cancan](https://github.com/ryanb/cancan) abilities:
|
|
41
40
|
|
|
42
41
|
```
|
|
43
42
|
# app/models/ability.rb
|
|
@@ -48,17 +47,35 @@ The Samvera community is here to help. Please see our [support guide](./SUPPORT.
|
|
|
48
47
|
|
|
49
48
|
## Testing:
|
|
50
49
|
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
50
|
+
- Install a system javascript runtime or uncomment therubyracer in spec/support/Gemfile
|
|
51
|
+
- Ensure that the testing app does not exist: `bundle exec rake engine_cart:clean`
|
|
52
|
+
- Set Rails version you want to test against. For example:
|
|
53
|
+
|
|
54
|
+
- `export RAILS_VERSION=5.1.4`
|
|
55
|
+
|
|
56
|
+
- Ensure that the correct version of Rails is installed: `bundle update`
|
|
57
|
+
|
|
58
|
+
- Build test app: `bundle exec rake engine_cart:generate`
|
|
59
|
+
|
|
60
|
+
- And run tests: `bundle exec rake ci`
|
|
61
|
+
|
|
62
|
+
## Releasing
|
|
63
|
+
|
|
64
|
+
1. `bundle install`
|
|
65
|
+
2. Increase the version number in `lib/hydra/role_management/version.rb`
|
|
66
|
+
3. Increase the same version number in `.github_changelog_generator`
|
|
67
|
+
4. Update `CHANGELOG.md` by running this command:
|
|
68
|
+
|
|
69
|
+
```
|
|
70
|
+
github_changelog_generator --user samvera --project hydra-role-management --token YOUR_GITHUB_TOKEN_HERE
|
|
71
|
+
```
|
|
72
|
+
|
|
73
|
+
5. Commit these changes to the main branch
|
|
74
|
+
|
|
75
|
+
6. Run `rake release`
|
|
58
76
|
|
|
59
77
|
# Acknowledgments
|
|
60
78
|
|
|
61
|
-
This software has been developed by and is brought to you by the Samvera community.
|
|
62
|
-
[Samvera website](http://samvera.org/).
|
|
79
|
+
This software has been developed by and is brought to you by the Samvera community. Learn more at the [Samvera website](http://samvera.org/).
|
|
63
80
|
|
|
64
81
|
|
data/Rakefile
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
module Hydra
|
|
3
4
|
module RoleManagement
|
|
4
5
|
# Module defining Controller actions for creating and managing Roles
|
|
@@ -22,7 +23,8 @@ module Hydra
|
|
|
22
23
|
def create
|
|
23
24
|
@role = Role.new(role_params)
|
|
24
25
|
if @role.save
|
|
25
|
-
redirect_to role_management.edit_role_path(@role),
|
|
26
|
+
redirect_to role_management.edit_role_path(@role),
|
|
27
|
+
notice: 'Role was successfully created.'
|
|
26
28
|
else
|
|
27
29
|
render action: 'new'
|
|
28
30
|
end
|
|
@@ -30,8 +32,9 @@ module Hydra
|
|
|
30
32
|
|
|
31
33
|
def update
|
|
32
34
|
@role = Role.find(params[:id])
|
|
33
|
-
if @role.
|
|
34
|
-
redirect_to role_management.edit_role_path(@role),
|
|
35
|
+
if @role.update(role_params)
|
|
36
|
+
redirect_to role_management.edit_role_path(@role),
|
|
37
|
+
notice: 'Role was successfully updated.'
|
|
35
38
|
else
|
|
36
39
|
render action: 'edit'
|
|
37
40
|
end
|
|
@@ -39,7 +42,8 @@ module Hydra
|
|
|
39
42
|
|
|
40
43
|
def destroy
|
|
41
44
|
if @role.destroy
|
|
42
|
-
redirect_to role_management.roles_path,
|
|
45
|
+
redirect_to role_management.roles_path,
|
|
46
|
+
notice: 'Role was successfully deleted.'
|
|
43
47
|
else
|
|
44
48
|
redirect_to role_management.roles_path
|
|
45
49
|
end
|
|
@@ -47,13 +51,13 @@ module Hydra
|
|
|
47
51
|
|
|
48
52
|
private
|
|
49
53
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
end
|
|
54
|
+
def role_params
|
|
55
|
+
if !ActionController.const_defined? :StrongParameters
|
|
56
|
+
params[:role]
|
|
57
|
+
else
|
|
58
|
+
params.require(:role).permit(:name)
|
|
56
59
|
end
|
|
60
|
+
end
|
|
57
61
|
end
|
|
58
62
|
end
|
|
59
63
|
end
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
module Hydra
|
|
3
4
|
module RoleManagement
|
|
4
5
|
# Module defining Controller actions for adding and managing Roles for Users
|
|
@@ -17,7 +18,8 @@ module Hydra
|
|
|
17
18
|
u.save!
|
|
18
19
|
redirect_to role_management.role_path(@role)
|
|
19
20
|
else
|
|
20
|
-
redirect_to role_management.role_path(@role),
|
|
21
|
+
redirect_to role_management.role_path(@role),
|
|
22
|
+
flash: { error: "Invalid user #{params[:user_key]}" }
|
|
21
23
|
end
|
|
22
24
|
end
|
|
23
25
|
|
|
@@ -29,13 +31,13 @@ module Hydra
|
|
|
29
31
|
|
|
30
32
|
protected
|
|
31
33
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
34
|
+
def find_user
|
|
35
|
+
::User.send("find_by_#{find_column}".to_sym, params[:user_key])
|
|
36
|
+
end
|
|
35
37
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
38
|
+
def find_column
|
|
39
|
+
Devise.authentication_keys.first
|
|
40
|
+
end
|
|
39
41
|
end
|
|
40
42
|
end
|
|
41
43
|
end
|
data/app/models/role.rb
CHANGED
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
# Class modeling Roles within the application
|
|
3
|
-
class Role <
|
|
4
|
+
class Role < ApplicationRecord
|
|
4
5
|
has_and_belongs_to_many :users
|
|
5
6
|
|
|
6
7
|
validates :name,
|
|
7
8
|
uniqueness: true,
|
|
8
9
|
format: {
|
|
9
10
|
with: /\A[a-zA-Z0-9._-]+\z/,
|
|
10
|
-
message: 'Only letters, numbers, hyphens,
|
|
11
|
+
message: 'Only letters, numbers, hyphens, ' \
|
|
12
|
+
'underscores and periods are allowed'
|
|
11
13
|
}
|
|
12
14
|
end
|
data/config/routes.rb
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
Hydra::RoleManagement::Engine.routes.draw do
|
|
3
4
|
# Generic file routes
|
|
4
5
|
resources :roles, Hydra::RoleManagement.route_options do
|
|
5
|
-
resources :users, only: [
|
|
6
|
+
resources :users, only: %i[create destroy], controller: 'user_roles'
|
|
6
7
|
end
|
|
7
8
|
end
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
-
|
|
2
|
+
|
|
3
|
+
require File.expand_path('lib/hydra/role_management/version', __dir__)
|
|
3
4
|
|
|
4
5
|
Gem::Specification.new do |gem|
|
|
5
6
|
gem.authors = ['Justin Coyne']
|
|
@@ -15,16 +16,19 @@ Gem::Specification.new do |gem|
|
|
|
15
16
|
gem.require_paths = ['lib']
|
|
16
17
|
gem.version = Hydra::RoleManagement::VERSION
|
|
17
18
|
gem.license = 'Apache 2.0'
|
|
19
|
+
gem.metadata = { "rubygems_mfa_required" => "true" }
|
|
18
20
|
|
|
19
21
|
gem.add_dependency 'blacklight'
|
|
20
22
|
gem.add_dependency 'bootstrap_form'
|
|
21
23
|
gem.add_dependency 'bundler', '>= 1.5'
|
|
22
24
|
gem.add_dependency 'cancancan'
|
|
23
25
|
gem.add_dependency 'json', '>= 1.8'
|
|
24
|
-
gem.
|
|
26
|
+
gem.add_dependency 'psych', "~> 3.0"
|
|
27
|
+
gem.add_development_dependency 'bixby'
|
|
25
28
|
gem.add_development_dependency 'engine_cart', '~> 2.1'
|
|
29
|
+
gem.add_development_dependency 'github_changelog_generator'
|
|
26
30
|
gem.add_development_dependency 'pry-byebug'
|
|
27
|
-
gem.add_development_dependency 'rails-controller-testing', '~>
|
|
31
|
+
gem.add_development_dependency 'rails-controller-testing', '~> 1'
|
|
28
32
|
gem.add_development_dependency 'rake'
|
|
29
33
|
gem.add_development_dependency 'rspec-its'
|
|
30
34
|
gem.add_development_dependency 'rspec-rails'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
|
|
2
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
3
3
|
require 'rails/generators'
|
|
4
4
|
require 'rails/generators/migration'
|
|
5
5
|
|
|
@@ -7,7 +7,7 @@ require 'rails/generators/migration'
|
|
|
7
7
|
class RolesGenerator < Rails::Generators::Base
|
|
8
8
|
include Rails::Generators::Migration
|
|
9
9
|
|
|
10
|
-
source_root File.expand_path('
|
|
10
|
+
source_root File.expand_path('templates', __dir__)
|
|
11
11
|
|
|
12
12
|
argument :model_name, type: :string, default: 'user'
|
|
13
13
|
desc '
|
|
@@ -68,16 +68,17 @@ This generator makes the following changes to your application:
|
|
|
68
68
|
# file will be added to config/initializers and the correct code will be added to the model at runtime.
|
|
69
69
|
def rails3_attr_accessible
|
|
70
70
|
return if ActionController.const_defined? :StrongParameters
|
|
71
|
+
|
|
71
72
|
Rails.logger.info 'Role model will include attr_accessible :name because you are installing this gem in a Rails 3 app.'
|
|
72
73
|
copy_file 'hydra_role_management_rails3.rb', 'config/initializers/hydra_role_management_rails3.rb'
|
|
73
74
|
end
|
|
74
75
|
|
|
75
76
|
private
|
|
76
77
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
78
|
+
def better_migration_template(file)
|
|
79
|
+
sleep 1 # ensure scripts have different time stamps
|
|
80
|
+
migration_template "migrations/#{file}", "db/migrate/#{file}"
|
|
81
|
+
rescue StandardError
|
|
82
|
+
Rails.logger.error " \e[1m\e[34mMigrations\e[0m " + $ERROR_INFO.message
|
|
83
|
+
end
|
|
83
84
|
end
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
class UserRoles < ActiveRecord::Migration[5.0]
|
|
3
4
|
def up
|
|
4
5
|
create_table :roles do |t|
|
|
@@ -8,8 +9,8 @@ class UserRoles < ActiveRecord::Migration[5.0]
|
|
|
8
9
|
t.references :role
|
|
9
10
|
t.references :user
|
|
10
11
|
end
|
|
11
|
-
add_index :roles_users, [
|
|
12
|
-
add_index :roles_users, [
|
|
12
|
+
add_index :roles_users, %i[role_id user_id]
|
|
13
|
+
add_index :roles_users, %i[user_id role_id]
|
|
13
14
|
end
|
|
14
15
|
|
|
15
16
|
def down
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
require 'hydra/role_management'
|
|
3
4
|
require 'bootstrap_form'
|
|
4
5
|
|
|
@@ -9,7 +10,7 @@ module Hydra
|
|
|
9
10
|
|
|
10
11
|
# Draws the routes with custom arguments passed to the #mount invocation
|
|
11
12
|
# @param router [ActionDispatch::Routing::Mapper] the Rails routing mapper
|
|
12
|
-
# @param opts [Hash]
|
|
13
|
+
# @param opts [Hash] passed to ActionDispatch::Routing::Mapper#mount
|
|
13
14
|
# @see http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Base.html
|
|
14
15
|
# (see ActionDispatch::Routing::Mapper::Base)
|
|
15
16
|
def self.draw_routes(router, opts = {})
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
describe UserRolesController do
|
|
3
4
|
let(:ability) do
|
|
4
5
|
ability = Object.new
|
|
@@ -37,7 +38,7 @@ describe UserRolesController do
|
|
|
37
38
|
allow(User).to receive(:find_by_email).and_return(nil)
|
|
38
39
|
post :create, params: { role_id: role, user_key: 'foo@example.com' }
|
|
39
40
|
expect(User).to have_received(:find_by_email).with('foo@example.com')
|
|
40
|
-
expect(flash[:error]).to eq '
|
|
41
|
+
expect(flash[:error]).to eq 'Invalid user foo@example.com'
|
|
41
42
|
end
|
|
42
43
|
it 'is able to add a user' do
|
|
43
44
|
u = User.create!(email: 'foo@example.com', password: 'password', password_confirmation: 'password')
|
data/spec/lib/user_roles_spec.rb
CHANGED
data/spec/models/role_spec.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
# frozen_string_literal: true
|
|
2
|
+
|
|
2
3
|
# The following lines determine which user attributes your hydrangea app will use
|
|
3
4
|
# This configuration allows you to use the out of the box ActiveRecord associations between users and user_attributes
|
|
4
5
|
# It also allows you to specify your own user attributes
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hydra-role-management
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0
|
|
4
|
+
version: 1.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Justin Coyne
|
|
8
|
-
autorequire:
|
|
8
|
+
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2023-01-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: blacklight
|
|
@@ -81,19 +81,33 @@ dependencies:
|
|
|
81
81
|
- !ruby/object:Gem::Version
|
|
82
82
|
version: '1.8'
|
|
83
83
|
- !ruby/object:Gem::Dependency
|
|
84
|
-
name:
|
|
84
|
+
name: psych
|
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
|
86
86
|
requirements:
|
|
87
87
|
- - "~>"
|
|
88
88
|
- !ruby/object:Gem::Version
|
|
89
|
-
version:
|
|
90
|
-
type: :
|
|
89
|
+
version: '3.0'
|
|
90
|
+
type: :runtime
|
|
91
91
|
prerelease: false
|
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
|
93
93
|
requirements:
|
|
94
94
|
- - "~>"
|
|
95
95
|
- !ruby/object:Gem::Version
|
|
96
|
-
version:
|
|
96
|
+
version: '3.0'
|
|
97
|
+
- !ruby/object:Gem::Dependency
|
|
98
|
+
name: bixby
|
|
99
|
+
requirement: !ruby/object:Gem::Requirement
|
|
100
|
+
requirements:
|
|
101
|
+
- - ">="
|
|
102
|
+
- !ruby/object:Gem::Version
|
|
103
|
+
version: '0'
|
|
104
|
+
type: :development
|
|
105
|
+
prerelease: false
|
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
107
|
+
requirements:
|
|
108
|
+
- - ">="
|
|
109
|
+
- !ruby/object:Gem::Version
|
|
110
|
+
version: '0'
|
|
97
111
|
- !ruby/object:Gem::Dependency
|
|
98
112
|
name: engine_cart
|
|
99
113
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -108,6 +122,20 @@ dependencies:
|
|
|
108
122
|
- - "~>"
|
|
109
123
|
- !ruby/object:Gem::Version
|
|
110
124
|
version: '2.1'
|
|
125
|
+
- !ruby/object:Gem::Dependency
|
|
126
|
+
name: github_changelog_generator
|
|
127
|
+
requirement: !ruby/object:Gem::Requirement
|
|
128
|
+
requirements:
|
|
129
|
+
- - ">="
|
|
130
|
+
- !ruby/object:Gem::Version
|
|
131
|
+
version: '0'
|
|
132
|
+
type: :development
|
|
133
|
+
prerelease: false
|
|
134
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
135
|
+
requirements:
|
|
136
|
+
- - ">="
|
|
137
|
+
- !ruby/object:Gem::Version
|
|
138
|
+
version: '0'
|
|
111
139
|
- !ruby/object:Gem::Dependency
|
|
112
140
|
name: pry-byebug
|
|
113
141
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -128,14 +156,14 @@ dependencies:
|
|
|
128
156
|
requirements:
|
|
129
157
|
- - "~>"
|
|
130
158
|
- !ruby/object:Gem::Version
|
|
131
|
-
version: '
|
|
159
|
+
version: '1'
|
|
132
160
|
type: :development
|
|
133
161
|
prerelease: false
|
|
134
162
|
version_requirements: !ruby/object:Gem::Requirement
|
|
135
163
|
requirements:
|
|
136
164
|
- - "~>"
|
|
137
165
|
- !ruby/object:Gem::Version
|
|
138
|
-
version: '
|
|
166
|
+
version: '1'
|
|
139
167
|
- !ruby/object:Gem::Dependency
|
|
140
168
|
name: rake
|
|
141
169
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -200,6 +228,7 @@ extensions: []
|
|
|
200
228
|
extra_rdoc_files: []
|
|
201
229
|
files:
|
|
202
230
|
- ".circleci/config.yml"
|
|
231
|
+
- ".github_changelog_generator"
|
|
203
232
|
- ".gitignore"
|
|
204
233
|
- ".rspec"
|
|
205
234
|
- ".rubocop.yml"
|
|
@@ -245,8 +274,9 @@ files:
|
|
|
245
274
|
homepage: https://github.com/samvera/hydra-role-management
|
|
246
275
|
licenses:
|
|
247
276
|
- Apache 2.0
|
|
248
|
-
metadata:
|
|
249
|
-
|
|
277
|
+
metadata:
|
|
278
|
+
rubygems_mfa_required: 'true'
|
|
279
|
+
post_install_message:
|
|
250
280
|
rdoc_options: []
|
|
251
281
|
require_paths:
|
|
252
282
|
- lib
|
|
@@ -261,8 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
261
291
|
- !ruby/object:Gem::Version
|
|
262
292
|
version: '0'
|
|
263
293
|
requirements: []
|
|
264
|
-
rubygems_version: 3.
|
|
265
|
-
signing_key:
|
|
294
|
+
rubygems_version: 3.4.1
|
|
295
|
+
signing_key:
|
|
266
296
|
specification_version: 4
|
|
267
297
|
summary: Rails engine to do user roles in an RDBMS for hydra-head
|
|
268
298
|
test_files:
|