hydra-role-management 0.2.1 → 1.0.3

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/config/routes.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 Hydra::RoleManagement::Engine.routes.draw do
   # Generic file routes
   resources :roles, Hydra::RoleManagement.route_options do
-    resources :users, :only=>[:create, :destroy], :controller => "user_roles"
+    resources :users, only: %i[create destroy], controller: 'user_roles'
   end
 end
-

data/hydra-role-management.gemspec

@@ -1,25 +1,34 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require File.expand_path('../lib/hydra/role_management/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Justin Coyne"]
-  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.authors       = ['Justin Coyne']
+  gem.email         = ['jcoyne@justincoyne.com']
+  gem.description   = 'Rails engine to do user roles in an RDBMS for hydra-head'
+  gem.summary       = 'Rails engine to do user roles in an RDBMS for hydra-head'
+  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) }
+  gem.files         = `git ls-files`.split($OUTPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = "hydra-role-management"
-  gem.require_paths = ["lib"]
+  gem.name          = 'hydra-role-management'
+  gem.require_paths = ['lib']
   gem.version       = Hydra::RoleManagement::VERSION
+  gem.license       = 'Apache 2.0'
 
-  gem.add_dependency 'bootstrap_form'
   gem.add_dependency 'blacklight'
+  gem.add_dependency 'bootstrap_form'
+  gem.add_dependency 'bundler', '>= 1.5'
   gem.add_dependency 'cancancan'
+  gem.add_dependency 'json', '>= 1.8'
+  gem.add_development_dependency 'bixby', '~> 1.0.0'
+  gem.add_development_dependency 'engine_cart', '~> 2.1'
+  gem.add_development_dependency 'github_changelog_generator'
+  gem.add_development_dependency 'pry-byebug'
+  gem.add_development_dependency 'rails-controller-testing', '~> 0'
   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 'rspec-rails'
+  gem.add_development_dependency 'rspec_junit_formatter'
 end

data/lib/generators/roles/roles_generator.rb

@@ -1,27 +1,30 @@
-# -*- encoding : utf-8 -*-
+
+# frozen_string_literal: true
+
 require 'rails/generators'
-require 'rails/generators/migration'     
+require 'rails/generators/migration'
 
+# Class definition for the Rails Generator integrating Roles
 class RolesGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
 
   source_root File.expand_path('../templates', __FILE__)
-  
-  argument     :model_name, :type => :string , :default => "user"
-  desc """
+
+  argument :model_name, type: :string, default: 'user'
+  desc '
 This generator makes the following changes to your application:
  1. Creates several database migrations if they do not exist in /db/migrate
  2. Adds user behavior to the user model
  2. Adds routes
-       """ 
+       '
 
   # Implement the required interface for Rails::Generators::Migration.
   # taken from http://github.com/rails/rails/blob/master/activerecord/lib/generators/active_record.rb
-  def self.next_migration_number(path)
-    unless @prev_migration_nr
-      @prev_migration_nr = Time.now.utc.strftime("%Y%m%d%H%M%S").to_i
-    else
+  def self.next_migration_number(_path)
+    if @prev_migration_nr
       @prev_migration_nr += 1
+    else
+      @prev_migration_nr = Time.now.utc.strftime('%Y%m%d%H%M%S').to_i
     end
     @prev_migration_nr.to_s
   end
@@ -29,7 +32,7 @@ This generator makes the following changes to your application:
   # Setup the database migrations
   def copy_migrations
     # Can't get this any more DRY, because we need this order.
-    %w{user_roles.rb}.each do |f|
+    %w[user_roles.rb].each do |f|
       better_migration_template f
     end
   end
@@ -37,67 +40,45 @@ This generator makes the following changes to your application:
   # Add behaviors to the user model
   def inject_user_roles_behavior
     file_path = "app/models/#{model_name.underscore}.rb"
-    if File.exists?(file_path)
-      place_marker = if File.read(file_path).match(/include Hydra::User/)
-        /include Hydra::User/
-      elsif File.read(file_path).match(/include Blacklight::User/)
-       /include Blacklight::User/ 
-      end
-      if place_marker 
-        code = "\n # Connects this user object to Role-management behaviors. " +
-          "\n include Hydra::RoleManagement::UserRoles\n"        
-        inject_into_file file_path, code, { :after => place_marker }
+    if File.exist?(file_path)
+      place_marker = if File.read(file_path).match?(/include Hydra::User/)
+                       /include Hydra::User/
+                     elsif File.read(file_path).match?(/include Blacklight::User/)
+                       /include Blacklight::User/
+                     end
+      if place_marker
+        code = "\n  # Connects this user object to Role-management behaviors.\n" \
+               "  include Hydra::RoleManagement::UserRoles\n\n"
+        inject_into_file file_path, code, after: place_marker
       else
-        puts "     \e[31mFailure\e[0m  Hydra::User is not included in #{file_path}.  Add 'include Hydra::User' and rerun."
+        Rails.logger.error "     \e[31mFailure\e[0m  Hydra::User is not included in #{file_path}.  Add 'include Hydra::User' and rerun."
       end
     else
-      puts "     \e[31mFailure\e[0m  hydra-role-management requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g roles client" 
-    end    
+      Rails.logger.error "     \e[31mFailure\e[0m  hydra-role-management requires a user object. This generators assumes that the model is defined in the file #{file_path}, which does not exist.  If you used a different name, please re-run the generator and provide that name as an argument. Such as \b  rails -g roles client"
+    end
   end
 
   # The engine routes have to come after the devise routes so that /users/sign_in will work
   def inject_routes
     routing_code = "mount Hydra::RoleManagement::Engine => '/'"
-    sentinel = /devise_for :users/
-    inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
-  end
-
-  # As of 7.23.2013 cancan support for Rails 4 is weak and requires monkey-patching.
-  # More information can be found at https://github.com/ryanb/cancan/issues/835
-  def rails4_application_controller_patch
-    if Rails::VERSION::MAJOR == 4
-      puts "Adding before_filter to application_controller to help Cancan work with Rails 4."
-      file_path = "app/controllers/application_controller.rb"
-      code = "\n  before_filter do" +
-        "\n    resource = controller_path.singularize.gsub('/', '_').to_sym \n" + 
-        '    method = "#{resource}_params"'+ 
-        "\n    params[resource] &&= send(method) if respond_to?(method, true)" + 
-        "\n  end"
-
-      inject_into_file file_path, code, {after: 'class ApplicationController < ActionController::Base'}
-    end
+    sentinel = /devise_for :users(.*)$/
+    inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", after: sentinel, verbose: false
   end
 
   # If this gem is installed under Rails 3, an attr_accessible method is required for the Role model.  This
   # file will be added to config/initializers and the correct code will be added to the model at runtime.
   def rails3_attr_accessible
-    if !ActionController.const_defined? :StrongParameters
-      puts "Role model will include attr_accessible :name because you are installing this gem in a Rails 3 app."
-      copy_file "hydra_role_management_rails3.rb", "config/initializers/hydra_role_management_rails3.rb"
-    end
-  end
-
-  private  
-  
-  def better_migration_template (file)
-    begin
-      sleep 1 # ensure scripts have different time stamps
-      migration_template "migrations/#{file}", "db/migrate/#{file}"
-    rescue
-      puts "  \e[1m\e[34mMigrations\e[0m  " + $!.message
-    end
+    return if ActionController.const_defined? :StrongParameters
+    Rails.logger.info 'Role model will include attr_accessible :name because you are installing this gem in a Rails 3 app.'
+    copy_file 'hydra_role_management_rails3.rb', 'config/initializers/hydra_role_management_rails3.rb'
   end
 
-end  
-
+  private
 
+  def better_migration_template(file)
+    sleep 1 # ensure scripts have different time stamps
+    migration_template "migrations/#{file}", "db/migrate/#{file}"
+  rescue StandardError
+    Rails.logger.error "  \e[1m\e[34mMigrations\e[0m  " + $ERROR_INFO.message
+  end
+end

data/lib/generators/roles/templates/hydra_role_management_rails3.rb

@@ -1 +1,3 @@
-Role.send :include, Hydra::RoleManagement::LegacyAttributeHandling
+# frozen_string_literal: true
+
+Role.send :include, Hydra::RoleManagement::LegacyAttributeHandling

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

@@ -1,14 +1,16 @@
-class UserRoles < ActiveRecord::Migration
+# frozen_string_literal: true
+
+class UserRoles < ActiveRecord::Migration[5.0]
   def up
     create_table :roles do |t|
       t.string :name
     end
-    create_table :roles_users, :id => false do |t|
+    create_table :roles_users, id: false do |t|
       t.references :role
       t.references :user
     end
-    add_index :roles_users, [:role_id, :user_id]
-    add_index :roles_users, [:user_id, :role_id]
+    add_index :roles_users, %i[role_id user_id]
+    add_index :roles_users, %i[user_id role_id]
   end
 
   def down

data/lib/hydra-role-management.rb

@@ -1,12 +1,19 @@
-require "hydra/role_management"
+# frozen_string_literal: true
+
+require 'hydra/role_management'
 require 'bootstrap_form'
 
 module Hydra
   module RoleManagement
     mattr_accessor :route_options
     self.route_options = {}
-    
-    def self.draw_routes(router, opts={})
+
+    # Draws the routes with custom arguments passed to the #mount invocation
+    # @param router [ActionDispatch::Routing::Mapper] the Rails routing mapper
+    # @param opts [Hash] passed to ActionDispatch::Routing::Mapper#mount
+    # @see http://api.rubyonrails.org/classes/ActionDispatch/Routing/Mapper/Base.html
+    # (see ActionDispatch::Routing::Mapper::Base)
+    def self.draw_routes(router, opts = {})
       self.route_options = opts
       router.instance_exec do
         mount Hydra::RoleManagement::Engine => '/'

data/lib/hydra/role_management.rb

@@ -1,12 +1,15 @@
+# frozen_string_literal: true
+
 require 'cancan'
 module Hydra
   module RoleManagement
+    # Class definition for the Rails Engine
     class Engine < ::Rails::Engine
       engine_name 'role_management'
 
       # Rails 4 should do this automatically:
-      config.paths.add "app/controllers/concerns", eager_load: true
-      config.paths.add "app/models/concerns", eager_load: true
+      config.paths.add 'app/controllers/concerns', eager_load: true
+      config.paths.add 'app/models/concerns', eager_load: true
     end
   end
 end

data/lib/hydra/role_management/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Hydra
   module RoleManagement
-    VERSION = "0.2.1"
+    VERSION = '1.0.3'
   end
 end

data/spec/controllers/roles_controller_spec.rb

@@ -1,120 +1,115 @@
-require 'spec_helper'
+# frozen_string_literal: true
 
 describe RolesController do
+  routes { Hydra::RoleManagement::Engine.routes }
   let(:ability) do
     ability = Object.new
     ability.extend(CanCan::Ability)
     allow(controller).to receive(:current_ability).and_return(ability)
     ability
   end
-
   let(:role) do
     Role.create(name: 'foo')
   end
 
-  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
+  describe 'with a user who cannot edit roles' do
+    it 'is not able to view role index' do
+      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
+    it 'is not able to view role' do
+      expect { get :show, params: { id: role } }.to raise_error CanCan::AccessDenied
     end
-    it "should not be able to view new role form" do
+    it 'is not 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
+    it 'is not able to create a role' do
+      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
+    it 'is not able to update a role' do
+      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
+    it 'is not able to remove a role' do
+      expect { delete :destroy, params: { id: role } }.to raise_error CanCan::AccessDenied
     end
   end
 
-  describe "with a user who can read roles" do
+  describe 'with a user who can read roles' do
     before do
       ability.can :read, Role
     end
-    it "should be able to see the list of roles" do
+    it 'is able to see the list of roles' do
       get :index
       expect(response).to be_successful
       expect(assigns[:roles]).to eq [role]
     end
 
-    it "should be able to see a single role" do
-      get :show, id: role
+    it 'is able to see a single role' do
+      get :show, params: { id: role }
       expect(response).to be_successful
       expect(assigns[:role]).to eq role
     end
   end
 
   describe "with a user who can only update role 'foo'" do
-    it "should be redirected to edit" do
+    it 'is redirected to edit' do
       ability.can :read, Role
       ability.can :update, Role, id: role.id
-      get :show, id: role
-      expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[: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
+
+  describe 'with a user who can create roles' do
     before do
       ability.can :create, Role
     end
-    it "should be able to make a new role" do
+    it 'is able to make a new role' do
       get :new
       expect(response).to be_successful
       expect(assigns[:role]).to be_kind_of Role
     end
 
-    it "should be able to create a new role" do
-      post :create, :role=>{name: 'my_role'} 
-      expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
+    it 'is able to create a new role' do
+      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'} 
+    it 'does not create role with an error' do
+      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
     end
   end
 
-  describe "with a user who can update roles" do
+  describe 'with a user who can update roles' do
     before do
       ability.can :update, Role
     end
 
-    it "should be able to update a role" do
-      put :update, id: role, :role=>{name: 'my_role'} 
-      expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
+    it 'is able to update a role' do
+      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'} 
+    it 'does not update role with an error' do
+      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
     end
   end
 
-  describe "with a user who can remove roles" do
+  describe 'with a user who can remove roles' do
     before do
       ability.can :destroy, Role
     end
 
-    it "should be able to destroy a role" do
-      delete :destroy, id: role 
-      expect(response).to redirect_to @routes.url_helpers.roles_path
+    it 'is able to destroy a role' do
+      delete :destroy, params: { id: role }
+      expect(response).to redirect_to routes.url_helpers.roles_path
     end
   end
-
 end