hydra-role-management 0.2.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: baf9353a04409963f28f95ea224b60c48168db9e
-  data.tar.gz: 29250a4135ab334b0623059089d134cf11d4e774
+  metadata.gz: 29cc644bd9c4ab4e8b33f15ac0391b512cbd0ed2
+  data.tar.gz: fae1f29f174e38105242a148bd04cde1d50cca15
 SHA512:
-  metadata.gz: 20a29eccb32ce9505bd897f3eedf45cff5e86d4c18e97c4ee2f27b6aba1df151aee85b3cd29d4ecaa8ade05ff865bae703c0f894072814eba0ca1388aec1d61b
-  data.tar.gz: c1a59c994d0e3a385ab36bc71cbea72ab23cea653e125ffbb07319fc0b02beeda0e431dbd8b54b4f50ae016aa9243319671ff5e8a2bd19f429cba01e727bcf7f
+  metadata.gz: 05c99ba950eba5d946efdfd33518e23de53c689c39c0e7b1e243b478da5daed56ce2ade1782c4b7a5aa44a261b4177e745163b3fe99ccc532bee54bac22d1053
+  data.tar.gz: 864ddfbd1372fda98f0bc004709f13a805ea45e498587c08745fd16bcb5229f0761fe4966965f6cfb94257bec2f44e18b22f557a0678bc09cb4a62468add1a75

data/.gitignore

@@ -6,3 +6,6 @@ pkg/
 
 .ruby-version
 .ruby-gemset
+
+.internal_test_app
+coverage

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -1,18 +1,11 @@
 language: ruby
+sudo: false
+cache:
+  bundler: true
 rvm:
-  - 2.0
-  - 2.1
+  - 2.4.2
 env:
   global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-notifications:
-  email:
-    recipients:
-      - "justin@curationexperts.com"
-    on_success: "change"
-    on_failure: "always"
-  irc:
-    channels:
-      - "irc.freenode.org#projecthydra"
-    template:
-      - "%{repository}//%{branch}@%{commit} by %{author}: %{message} - %{build_url}"
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+  matrix:
+    - RAILS_VERSION=5.1.4

data/CONTRIBUTING.md

@@ -3,6 +3,13 @@
 We want your help to make Project Hydra great.
 There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things.
 
+## Code of Conduct
+
+The Hydra community is dedicated to providing a welcoming and positive experience for all its
+members, whether they are at a formal gathering, in a social setting, or taking part in activities
+online.  Please see our [Code of Conduct](https://wiki.duraspace.org/display/hydra/Code+of+Conduct)
+for more information.
+
 ## Hydra Project Intellectual Property Licensing and Ownership
 
 All code contributors must have an Individual Contributor License Agreement (iCLA) on file with the Hydra Project Steering Group.
@@ -16,8 +23,10 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
 * Reporting Issues
 * Making Changes
+* Documenting Code
+* Committing Changes
 * Submitting Changes
-* Merging Changes
+* Reviewing and Merging Changes
 
 ### Reporting Issues
 
@@ -38,8 +47,28 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
   * Then checkout the new branch with `git checkout fix/master/my_contribution`.
   * Please avoid working directly on the `master` branch.
   * You may find the [hub suite of commands](https://github.com/defunkt/hub) helpful
+* Make sure you have added sufficient tests and documentation for your changes.
+  * Test functionality with RSpec; est features / UI with Capybara.
+* Run _all_ the tests to assure nothing else was accidentally broken.
+
+### Documenting Code
+
+* All new public methods, modules, and classes should include inline documentation in [YARD](http://yardoc.org/).
+  * Documentation should seek to answer the question "why does this code exist?"
+* Document private / protected methods as desired.
+* If you are working in a file with no prior documentation, do try to document as you gain understanding of the code.
+  * If you don't know exactly what a bit of code does, it is extra likely that it needs to be documented. Take a stab at it and ask for feedback in your pull request. You can use the 'blame' button on GitHub to identify the original developer of the code and @mention them in your comment.
+  * This work greatly increases the usability of the code base and supports the on-ramping of new committers.
+  * We will all be understanding of one another's time constraints in this area.
+* YARD examples:
+  * [Hydra::Works::RemoveGenericFile](https://github.com/projecthydra-labs/hydra-works/blob/master/lib/hydra/works/services/generic_work/remove_generic_file.rb)
+  * [ActiveTriples::LocalName::Minter](https://github.com/ActiveTriples/active_triples-local_name/blob/master/lib/active_triples/local_name/minter.rb)
+* [Getting started with YARD](http://www.rubydoc.info/gems/yard/file/docs/GettingStarted.md)
+
+### Committing changes
+
 * Make commits of logical units.
-  * Your commit should include a high level description of your work in HISTORY.textile 
+  * Your commit should include a high level description of your work in HISTORY.textile
 * Check for unnecessary whitespace with `git diff --check` before committing.
 * Make sure your commit messages are [well formed](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 * If you created an issue, you can close it by including "Closes #issue" in your commit message. See [Github's blog post for more details](https://github.com/blog/1386-closing-issues-via-commit-messages)
@@ -60,7 +89,9 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
 
         class PostsController
           def index
-            respond_with Post.limit(10)
+            respond_to do |wants|
+              wants.html { render 'index' }
+            end
           end
         end
 
@@ -72,38 +103,53 @@ You should also add yourself to the `CONTRIBUTORS.md` file in the root of the pr
       long to fit in 72 characters
 ```
 
-* Make sure you have added the necessary tests for your changes.
-* Run _all_ the tests to assure nothing else was accidentally broken.
-* When you are ready to submit a pull request
-
 ### Submitting Changes
 
-[Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
-
 * Read the article ["Using Pull Requests"](https://help.github.com/articles/using-pull-requests) on GitHub.
 * Make sure your branch is up to date with its parent branch (i.e. master)
   * `git checkout master`
   * `git pull --rebase`
   * `git checkout <your-branch>`
   * `git rebase master`
-  * It is likely a good idea to run your tests again.
-* Squash the commits for your branch into one commit
-  * `git rebase --interactive HEAD~<number-of-commits>` ([See Github help](https://help.github.com/articles/interactive-rebase))
-  * To determine the number of commits on your branch: `git log master..<your-branch> --oneline | wc -l`
+  * It is a good idea to run your tests again.
+* If you've made more than one commit take a moment to consider whether squashing commits together would help improve their logical grouping.
+  * [Detailed Walkthrough of One Pull Request per Commit](http://ndlib.github.io/practices/one-commit-per-pull-request/)
+  * `git rebase --interactive master` ([See Github help](https://help.github.com/articles/interactive-rebase))
   * Squashing your branch's changes into one commit is "good form" and helps the person merging your request to see everything that is going on.
 * Push your changes to a topic branch in your fork of the repository.
 * Submit a pull request from your fork to the project.
 
-### Merging Changes
+### Reviewing and Merging Changes
+
+We adopted [Github's Pull Request Review](https://help.github.com/articles/about-pull-request-reviews/) for our repositories.
+Common checks that may occur in our repositories:
+
+1. Travis CI - where our automated tests are running
+2. Hound CI - where we check for style violations
+3. Approval Required - Github enforces at least one person approve a pull request. Also, all reviewers that have chimed in must approve.
+4. CodeClimate - is our code remaining healthy (at least according to static code analysis)
+
+If one or more of the required checks failed (or are incomplete), the code should not be merged (and the UI will not allow it). If all of the checks have passed, then anyone on the project (including the pull request submitter) may merge the code.
+
+*Example: Carolyn submits a pull request, Justin reviews the pull request and approves. However, Justin is still waiting on other checks (Travis CI is usually the culprit), so he does not merge the pull request. Eventually, all of the checks pass. At this point, Carolyn or anyone else may merge the pull request.*
+
+#### Things to Consider When Reviewing
+
+First, the person contributing the code is putting themselves out there. Be mindful of what you say in a review.
+
+* Ask clarifying questions
+* State your understanding and expectations
+* Provide example code or alternate solutions, and explain why
+
+This is your chance for a mentoring moment of another developer. Take time to give an honest and thorough review of what has changed. Things to consider:
 
-* It is considered "poor from" to merge your own request.
-* Please take the time to review the changes and get a sense of what is being changed. Things to consider:
   * Does the commit message explain what is going on?
-  * Does the code changes have tests? _Not all changes need new tests, some changes are refactorings_
+  * Does the code changes have tests? _Not all changes need new tests, some changes are refactors_
+  * Do new or changed methods, modules, and classes have documentation?
   * Does the commit contain more than it should? Are two separate concerns being addressed in one commit?
-  * Did the Travis tests complete successfully?
-* If you are uncertain, bring other contributors into the conversation by creating a comment that includes their @username.
-* If you like the pull request, but want others to chime in, create a +1 comment and tag a user.
+  * Does the description of the new/changed specs match your understanding of what the spec is doing?
+
+If you are uncertain, bring other contributors into the conversation by assigning them as a reviewer.
 
 # Additional Resources
 

data/Gemfile

@@ -1,15 +1,41 @@
 source "https://rubygems.org"
 
+gem 'coveralls', require: false
+
 gemspec
 
-gem 'rspec-its'
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 1.1.0
+# engine_cart stanza: 0.10.0
+# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
+file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__
+)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
+else
+  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-# To avoid: 'Bundler could not find compatible versions for gem "sprockets":'
-gem 'sass', '~> 3.2.15'
-gem 'sprockets', '~> 2.11.0'
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
-file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
-if File.exists?(file)
-  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
-  instance_eval File.read(file)
+  case ENV['RAILS_VERSION']
+  when /^4.2/
+    gem 'responders', '~> 2.0'
+    gem 'sass-rails', '>= 5.0'
+    gem 'coffee-rails', '~> 4.1.0'
+  when /^4.[01]/
+    gem 'sass-rails', '< 5.0'
+  end
 end
+# END ENGINE_CART BLOCK

data/README.md

@@ -1,8 +1,13 @@
+# hydra-role-management
+
+[![Build Status](https://travis-ci.org/samvera/hydra-role-management.svg?branch=master)](https://travis-ci.org/samvera/hydra-role-management) [![Gem Version](https://badge.fury.io/rb/hydra-role-management.svg)](https://badge.fury.io/rb/hydra-role-management) [![Coverage Status](https://coveralls.io/repos/github/samvera/hydra-role-management/badge.svg?branch=master)](https://coveralls.io/github/samvera/hydra-role-management?branch=master)
+
+
 An engine gem to provide a RDBMS backed list of roles and their associated user.  This replaces the hydra default role mapper.
 
-This gem supports both Rails 3 and 4.
+As of version 1.0, this gem only supports Rails 5.
 
-##Installing:
+## Installing:
 
 * Add: ```gem 'hydra-role-management'``` to your Gemfile and then ```bundle install```
 * ```rails generate roles```
@@ -12,17 +17,16 @@ This gem supports both Rails 3 and 4.
 ```
   # app/models/ability.rb
   if current_user.admin?
-    can [:create, :show, :add_user, :remove_user, :index], Role
+    can [:create, :show, :add_user, :remove_user, :index, :edit, :update, :destroy], Role
   end
 ```
 
-##Testing:
-Given the need to support both Rails 3 and 4, the test suite has been parameterized to test against any version of Rails.
+## Testing:
 
 * Install a system javascript runtime or uncomment therubyracer in spec/support/Gemfile
 * Ensure that the testing app does not exist: ```bundle exec rake clean```
 * Set Rails version you want to test against.  For example:
-	* ```RAILS_VERSION=3.2.13``` or ```RAILS_VERSION=4.0.0```
+	* ```export RAILS_VERSION=5.1.4```
 * Ensure that the correct version of Rails is installed:  ```bundle update```
-* Build test app: ```bundle exec engine_cart:generate```
+* Build test app: ```bundle exec rake engine_cart:generate```
 * And run tests: ```bundle exec rake spec```

data/app/views/roles/edit.html.erb

@@ -1,26 +1,26 @@
-<h2>Role:</h2>
+<h2><%= t('role-management.edit.title') %></h2>
 <%= bootstrap_form_for @role, :url=>role_management.role_path(@role) do |f| %>
-  <%= f.text_field :name, :label=> 'Role name' %>
+  <%= f.text_field :name, :label=> t('role-management.edit.field_name') %>
 
-    <%= f.submit "Update" %>
+    <%= f.submit t('role-management.edit.update') %>
 
 <% end %>
 <% if can? :destroy, Role %>
-  <%= button_to "Delete", role_management.role_path(@role), :method=>:delete, :class=>'btn btn-danger' %>
+  <%= button_to t('role-management.edit.delete'), role_management.role_path(@role), :method=>:delete, :class=>'btn btn-danger' %>
 <% end %>
-<h3>Accounts:</h3>
+<h3><%= t('role-management.edit.accounts') %></h3>
 <ul>
   <% @role.users.each do |user| %>
     <li><%= user.user_key %>
       <% if can? :remove_user, Role %>
-        <%= button_to "Remove User", role_management.role_user_path(@role, user), :method=>:delete, :class=>'btn btn-danger' %>
+        <%= button_to t('role-management.edit.remove'), role_management.role_user_path(@role, user), :method=>:delete, :class=>'btn btn-danger' %>
       <% end %>
     </li>
   <% end %>
 </ul>
-<h3>Add a new account:</h3>
+<h3><%= t('role-management.edit.add_new_account') %></h3>
 <%= bootstrap_form_tag :url=> role_management.role_users_path(@role) do |f| %>
-  <%= f.text_field 'user_key', :label=>'User' %>
-  <%= f.submit "Add" %>
-  <%= link_to "Cancel", role_management.roles_path, :class => 'btn btn-default' %>
+  <%= f.text_field 'user_key', :label=>t('role-management.edit.user') %>
+  <%= f.submit t('role-management.edit.add') %>
+  <%= link_to t('role-management.edit.cancel'), role_management.roles_path, :class => 'btn btn-default' %>
 <% end %>

data/app/views/roles/index.html.erb

@@ -1,4 +1,4 @@
-<h2>Roles</h2>
+<h2><%= t('role-management.index.title') %></h2>
 <ul>
   <% @roles.each do |role| %>
     <li><%=link_to role.name, role_management.role_path(role) %></li>
@@ -6,6 +6,6 @@
 </ul>
 
 <% if can? :create, Role %>
-  <%= button_to "Create a new role", role_management.new_role_path, method: :get, class: 'btn btn-primary' %>
+  <%= button_to t('role-management.index.create'), role_management.new_role_path, method: :get, class: 'btn btn-primary' %>
 <% end %>
 

data/app/views/roles/new.html.erb

@@ -1,6 +1,6 @@
 <%= bootstrap_form_for @role, :url=>role_management.roles_path do |f| %>
-  <%= f.text_field :name, :label=> 'Role name' %>
-  <%= f.submit "Add" %>
-  <%= link_to "Cancel", role_management.roles_path, :class => 'btn btn-default' %>
+  <%= f.text_field :name, :label=> t('role-management.new.field_name') %>
+  <%= f.submit t('role-management.new.add') %>
+  <%= link_to t('role-management.new.cancel'), role_management.roles_path, :class => 'btn btn-default' %>
 <% end %>
 

data/app/views/roles/show.html.erb

@@ -1,17 +1,17 @@
-<h2>Role: <%= @role.name %></h2>
-<h3>Accounts:</h3>
+<h2><%= t('role-management.show.title') %> <%= @role.name %></h2>
+<h3><% t('role-management.show.accounts') %></h3>
 <ul>
   <% @role.users.each do |user| %>
     <li><%= user.user_key %>
       <% if can? :remove_user, Role %>
-        <%= button_to "Remove User", role_management.role_user_path(@role, user), :method=>:delete, :class=>'btn btn-danger' %>
+        <%= button_to t('role-management.show.remove'), role_management.role_user_path(@role, user), :method=>:delete, :class=>'btn btn-danger' %>
       <% end %>
     </li>
   <% end %>
 </ul>
-<h3>Add a new account:</h3>
+<h3><%= t('role-management.show.add_new_account') %></h3>
 <%= bootstrap_form_tag url: role_management.role_users_path(@role) do |f| %>
-    <%= f.text_field 'user_key', :label=>'User' %>
-    <%= f.submit "Add" %>
-    <%= link_to "Cancel", role_management.roles_path, :class => 'btn btn-default' %>
+    <%= f.text_field 'user_key', :label=>t('role-management.show.user') %>
+    <%= f.submit t('role-management.show.add') %>
+    <%= link_to t('role-management.show.cancel'), role_management.roles_path, :class => 'btn btn-default' %>
 <% end %>

data/config/locales/role-management.en.yml

@@ -0,0 +1,28 @@
+en:
+  role-management:
+    index:
+      title: 'Roles'
+      create: 'Create a new role'
+    new:
+      field_name: 'Role name'
+      add: 'Add'
+      cancel: 'Cancel'
+    show:
+      title: 'Role:'
+      accounts: 'Accounts:'
+      remove: 'Remove User'
+      add_new_account: 'Add a new account:'
+      user: 'User'
+      add: 'Add'
+      cancel: 'Cancel'
+    edit:
+      title: 'Role:'
+      field_name: 'Role name'
+      update: 'Update'
+      accounts: 'Accounts:'
+      delete: 'Delete'
+      remove: 'Remove User'
+      add_new_account: 'Add a new account:'
+      user: 'User'
+      add: 'Add'
+      cancel: 'Cancel'

data/config/locales/role-management.es.yml

@@ -0,0 +1,28 @@
+es:
+  role-management:
+    index:
+      title: 'Rols'
+      create: 'Crear un nuevo rol'
+    new:
+      field_name: 'Nombre de rol'
+      add: 'Añadir'
+      cancel: 'Cancelar'
+    show:
+      title: 'Rol:'
+      accounts: 'Cuentas:'
+      remove: 'Eliminar Usuario'
+      add_new_account: 'Añadir una cuenta nueva:'
+      user: 'Usuario'
+      add: 'Añadir'
+      cancel: 'Cancelar'
+    edit:
+      title: 'Rol:'
+      field_name: 'Nombre de rol'
+      update: 'Actualizar'
+      accounts: 'Cuentas:'
+      delete: 'Borrar'
+      remove: 'Eliminar Usuario'
+      add_new_account: 'Añadir una cuenta nueva:'
+      user: 'Usuario'
+      add: 'Añadir'
+      cancel: 'Cancelar'

data/hydra-role-management.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["justin@curationexperts.com"]
   gem.description   = %q{Rails engine to do user roles in an RDBMS for hydra-head}
   gem.summary       = %q{Rails engine to do user roles in an RDBMS for hydra-head}
-  gem.homepage      = "https://github.com/projecthydra/hydra-role-management"
+  gem.homepage      = "https://github.com/samvera/hydra-role-management"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -22,5 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'
-  gem.add_development_dependency 'engine_cart'
+  gem.add_development_dependency 'rails-controller-testing', '~> 0'
+  gem.add_development_dependency 'engine_cart', '~> 1.0'
 end

data/lib/generators/roles/templates/migrations/user_roles.rb

@@ -1,4 +1,4 @@
-class UserRoles < ActiveRecord::Migration
+class UserRoles < ActiveRecord::Migration<%= '[5.0]' if Rails::VERSION::MAJOR >= 5 %>
   def up
     create_table :roles do |t|
       t.string :name

data/lib/hydra/role_management/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module RoleManagement
-    VERSION = "0.2.2"
+    VERSION = "1.0.0"
   end
 end

data/spec/controllers/roles_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe RolesController do
   let(:ability) do
     ability = Object.new
@@ -12,28 +10,28 @@ describe RolesController do
     Role.create(name: 'foo')
   end
 
-  before(:each) do 
+  before(:each) do
     @routes = Hydra::RoleManagement::Engine.routes
   end
-  
+
   describe "with a user who cannot edit roles" do
     it "should not be able to view role index" do
-      expect {get :index}.to raise_error CanCan::AccessDenied
+      expect { get :index, params: {} }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to view role" do
-      expect {get :show, id: role}.to raise_error CanCan::AccessDenied
+      expect { get :show, params: { id: role } }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to view new role form" do
       expect { get :new }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to create a role" do
-      expect { post :create, :role=>{name: 'my_role'}}.to raise_error CanCan::AccessDenied
+      expect { post :create, params: { role: { name: 'my_role' } } }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to update a role" do
-      expect { put :update, id: role}.to raise_error CanCan::AccessDenied
+      expect { put :update, params: { id: role } }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to remove a role" do
-      expect { delete :destroy, id: role}.to raise_error CanCan::AccessDenied
+      expect { delete :destroy, params: { id: role } }.to raise_error CanCan::AccessDenied
     end
   end
 
@@ -48,7 +46,7 @@ describe RolesController do
     end
 
     it "should be able to see a single role" do
-      get :show, id: role
+      get :show, params: { id: role }
       expect(response).to be_successful
       expect(assigns[:role]).to eq role
     end
@@ -58,11 +56,11 @@ describe RolesController do
     it "should be redirected to edit" do
       ability.can :read, Role
       ability.can :update, Role, id: role.id
-      get :show, id: role
+      get :show, params: { id: role }
       expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
     end
   end
-  
+
   describe "with a user who can create roles" do
     before do
       ability.can :create, Role
@@ -74,13 +72,13 @@ describe RolesController do
     end
 
     it "should be able to create a new role" do
-      post :create, :role=>{name: 'my_role'} 
+      post :create, params: { role: { name: 'my_role' } }
       expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
       expect(assigns[:role]).not_to be_new_record
       expect(assigns[:role].name).to eq 'my_role'
     end
     it "should not create role with an error" do
-      post :create, :role=>{name: 'my role'} 
+      post :create, params: { role: { name: 'my role' } }
       expect(assigns[:role].name).to eq 'my role'
       expect(assigns[:role].errors[:name]).to eq ['Only letters, numbers, hyphens, underscores and periods are allowed']
       expect(response).to be_successful
@@ -93,13 +91,13 @@ describe RolesController do
     end
 
     it "should be able to update a role" do
-      put :update, id: role, :role=>{name: 'my_role'} 
+      put :update, params: { id: role, role: { name: 'my_role' } }
       expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
       expect(assigns[:role]).not_to be_new_record
       expect(assigns[:role].name).to eq 'my_role'
     end
     it "should not update role with an error" do
-      put :update,  id: role, :role=>{name: 'my role'} 
+      put :update,  params: { id: role, role: { name: 'my role' } }
       expect(assigns[:role].name).to eq 'my role'
       expect(assigns[:role].errors[:name]).to eq ['Only letters, numbers, hyphens, underscores and periods are allowed']
       expect(response).to be_successful
@@ -112,9 +110,8 @@ describe RolesController do
     end
 
     it "should be able to destroy a role" do
-      delete :destroy, id: role 
+      delete :destroy, params: { id: role }
       expect(response).to redirect_to @routes.url_helpers.roles_path
     end
   end
-
 end

data/spec/controllers/user_roles_controller_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe UserRolesController do
   let(:ability) do
     ability = Object.new
@@ -13,16 +11,16 @@ describe UserRolesController do
     Role.create(name: 'foo')
   end
 
-  before(:each) do 
+  before(:each) do
     @routes = Hydra::RoleManagement::Engine.routes
   end
 
   describe "with a user who cannot edit users" do
     it "should not be able to add a user" do
-      expect { post :create, role_id: role, user_key: 'foo@example.com'}.to raise_error CanCan::AccessDenied
+      expect { post :create, params: { role_id: role, user_key: 'foo@example.com' } }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to remove a user" do
-      expect { delete :destroy, role_id: role, id: 7}.to raise_error CanCan::AccessDenied
+      expect { delete :destroy, params: { role_id: role, id: 7 } }.to raise_error CanCan::AccessDenied
     end
   end
 
@@ -36,12 +34,12 @@ describe UserRolesController do
       end
       it "should not be able to add a user that doesn't exist" do
         expect(User).to receive(:find_by_email).with('foo@example.com').and_return(nil)
-        post :create, role_id: role, user_key: 'foo@example.com'
+        post :create, params: { role_id: role, user_key: 'foo@example.com' }
         expect(flash[:error]).to eq "Unable to find the user foo@example.com"
       end
       it "should be able to add a user" do
         u = User.create!(email: 'foo@example.com', password: 'password', password_confirmation: 'password')
-        post :create, role_id: role, user_key: 'foo@example.com'
+        post :create, params: { role_id: role, user_key: 'foo@example.com' }
         expect(role.reload.users).to eq [u]
       end
     end
@@ -57,10 +55,9 @@ describe UserRolesController do
       end
       it "should be able to remove a user" do
         expect(user.roles).to eq [role]
-        delete :destroy, role_id: role, id: user.id
+        delete :destroy, params: { role_id: role, id: user.id }
         expect(role.reload.users).to eq []
       end
     end
   end
 end
-

data/spec/lib/user_roles_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Hydra::RoleManagement::UserRoles do
   let(:librarian) { Role.create!(name: 'librarian') }
   describe "a real user" do

data/spec/models/role_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Role do
   it "should require a name" do
     expect(subject).not_to be_valid

data/spec/routing/role_management_routes_spec.rb

@@ -1,23 +1,21 @@
-require 'spec_helper'
-
 describe "Routes for role_management" do
   routes {
-    Hydra::RoleManagement::Engine.routes 
+    Hydra::RoleManagement::Engine.routes
   }
   context "default" do
-    it "should route index" do 
+    it "should route index" do
       expect(:get => '/roles').to route_to( :controller => "roles", :action => "index")
     end
-    it "should create roles" do 
+    it "should create roles" do
       expect(:post => '/roles').to route_to( :controller => "roles", :action => "create")
     end
-    it "should show roles" do 
+    it "should show roles" do
       expect(:get => '/roles/7').to route_to( :controller => "roles", :action => "show", :id => '7')
     end
-    it "should add users" do 
+    it "should add users" do
       expect(:post => '/roles/7/users').to route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
     end
-    it "should remove users" do 
+    it "should remove users" do
       expect(:delete => '/roles/7/users/5').to route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
     end
   end
@@ -36,7 +34,7 @@ describe "Routes for role_management" do
     end
 
     before(:each) do
-      @routes = Hydra::RoleManagement::Engine.routes 
+      @routes = Hydra::RoleManagement::Engine.routes
       # so we have to do this instead:
       # engine routes broke in rspec rails 2.12.1, so we had to add this:
       assertion_instance.instance_variable_set(:@routes, @routes)
@@ -47,19 +45,19 @@ describe "Routes for role_management" do
       Rails.application.reload_routes!
     end
 
-    it "should route index" do 
+    it "should route index" do
       expect(:get => '/admin/groups').to route_to( :controller => "roles", :action => "index")
     end
-    it "should create roles" do 
+    it "should create roles" do
       expect(:post => '/admin/groups').to route_to( :controller => "roles", :action => "create")
     end
-    it "should show roles" do 
+    it "should show roles" do
       expect(:get => '/admin/groups/7').to route_to( :controller => "roles", :action => "show", :id => '7')
     end
-    it "should add users" do 
+    it "should add users" do
       expect(:post => '/admin/groups/7/users').to route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
     end
-    it "should remove users" do 
+    it "should remove users" do
       expect(:delete => '/admin/groups/7/users/5').to route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
     end
   end

data/spec/spec_helper.rb

@@ -1,16 +1,22 @@
-require "bundler/setup"
-ENV["RAILS_ENV"] ||= 'test'
+require 'coveralls'
+Coveralls.wear!
 
+ENV["RAILS_ENV"] ||= 'test'
+require "bundler/setup"
 
 require 'engine_cart'
 EngineCart.load_application!
+
+require 'rails-controller-testing'
 require 'rspec/rails'
+require 'rspec/its'
 require 'hydra/role_management'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
-  config.before(:each, :type=>"controller") { @routes = Hydra::RoleManagement::Engine.routes }
-  config.include Devise::TestHelpers, :type => :controller
-
+  config.before(:each, type: :controller) do
+    @routes = Hydra::RoleManagement::Engine.routes
+  end
+  config.include Devise::Test::ControllerHelpers, type: :controller
   config.infer_spec_type_from_file_location!
 end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -1,30 +1,25 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root "./spec/test_app_templates"
+
   def add_gems
     gem 'blacklight', ">= 5.4"
   end
-  
+
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)       
+    say_status("warning", "GENERATING BL", :yellow)
 
     generate 'blacklight:install', '--devise'
   end
 
   def run_cancan_generator
-    say_status("warning", "GENERATING Ability", :yellow)       
+    say_status("warning", "GENERATING Ability", :yellow)
     generate 'cancan:ability'
   end
 
   def run_roles_generator
-    say_status("warning", "GENERATING ROLES", :yellow)       
-
+    say_status("warning", "GENERATING ROLES", :yellow)
     generate 'roles', '-f'
-
-  end
-
-  def copy_rspec_rake_task
-    copy_file "lib/tasks/rspec.rake"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-role-management
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap_form
@@ -95,19 +95,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: engine_cart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Rails engine to do user roles in an RDBMS for hydra-head
 email:
 - justin@curationexperts.com
@@ -116,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -133,6 +148,8 @@ files:
 - app/views/roles/index.html.erb
 - app/views/roles/new.html.erb
 - app/views/roles/show.html.erb
+- config/locales/role-management.en.yml
+- config/locales/role-management.es.yml
 - config/routes.rb
 - hydra-role-management.gemspec
 - lib/generators/roles/roles_generator.rb
@@ -152,7 +169,7 @@ files:
 - spec/test_app_templates/app/models/solr_document.rb
 - spec/test_app_templates/config/initializers/hydra_config.rb
 - spec/test_app_templates/lib/generators/test_app_generator.rb
-homepage: https://github.com/projecthydra/hydra-role-management
+homepage: https://github.com/samvera/hydra-role-management
 licenses:
 - Apache 2.0
 metadata: {}
@@ -172,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rails engine to do user roles in an RDBMS for hydra-head