hydra-role-management 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 019d9799498cd996b1206a5979af5f312ec82f4e
-  data.tar.gz: b23a8554dc4227f60635bf6d99ba4c1699130a74
+  metadata.gz: b39aee0a1843b7757cddd4c4c92855619c527285
+  data.tar.gz: b9c227a38b244b07c2db9f15ca7542630be413f6
 SHA512:
-  metadata.gz: ca61c77684d0ac4cd468074afb51e58dce7d5cc271bdd8aa661a4b3102df600a05549926e0d5ae3e1cb5aa1733141ad6d26fe23f5cf6118c3fa35b05a59e3ee3
-  data.tar.gz: e8bbaf0a58a66214faccf4f50c2ee3b40cad43a12f54fa9900d20cbff3faca4ae77fdf4b9cccbe4dba9ec36c472165bd04e232e03fce356a56ef58031cb7f089
+  metadata.gz: 11eeaa238371f79a82e34b222505b3abf2e10066f61831abeb0eff31cb628456bd7a28d1acb7cff48ffed60369fb968e5bb497028930858aaaa64a5607fcd424
+  data.tar.gz: 465692f1adcbf16fe1a2f1e1518f3aeb461a87c39e593607e0192b1ee5463e810c77d8fac02d7a5ba81ec6ad9eaf952b96b3f34c44cd8ef7b3335d954d0d1782

data/app/controllers/concerns/hydra/role_management/user_roles_behavior.rb

@@ -28,7 +28,7 @@ module Hydra
       protected
 
       def find_user
-        User.send("find_by_#{find_column}".to_sym, params[:user_key])
+        ::User.send("find_by_#{find_column}".to_sym, params[:user_key])
       end
 
       def find_column

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

@@ -1,9 +1,9 @@
 <h2>Role:</h2>
 <%= bootstrap_form_for @role, :url=>role_management.role_path(@role) do |f| %>
   <%= f.text_field :name, :label=> 'Role name' %>
-  <%= f.actions do %>
+
     <%= f.submit "Update" %>
-  <% end %>
+
 <% end %>
 <% if can? :destroy, Role %>
   <%= button_to "Delete", role_management.role_path(@role), :method=>:delete, :class=>'btn btn-danger' %>
@@ -19,10 +19,8 @@
   <% end %>
 </ul>
 <h3>Add a new account:</h3>
-<%= bootstrap_form_tag role_management.role_users_path(@role) do %>
-  <%= bootstrap_text_field_tag 'user_key', '', :label=>'User' %>
-  <%= bootstrap_actions do %>
-    <%= bootstrap_submit_tag "Add" %>
-    <%= bootstrap_cancel_tag %>
-  <% end %>
+<%= 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' %>
 <% end %>

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

@@ -1,5 +1,6 @@
 <%= bootstrap_form_for @role, :url=>role_management.roles_path do |f| %>
   <%= f.text_field :name, :label=> 'Role name' %>
-  <%= f.actions %>
+  <%= f.submit "Add" %>
+  <%= link_to "Cancel", role_management.roles_path, :class => 'btn btn-default' %>
 <% end %>
 

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

@@ -10,10 +10,8 @@
   <% end %>
 </ul>
 <h3>Add a new account:</h3>
-<%= bootstrap_form_tag role_management.role_users_path(@role) do %>
-  <%= bootstrap_text_field_tag 'user_key', '', :label=>'User' %>
-  <%= bootstrap_actions do %>
-    <%= bootstrap_submit_tag "Add" %>
-    <%= bootstrap_cancel_tag %>
-  <% end %>
+<%= 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' %>
 <% end %>

data/lib/hydra/role_management/version.rb

@@ -1,5 +1,5 @@
 module Hydra
   module RoleManagement
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/spec/controllers/roles_controller_spec.rb

@@ -4,7 +4,7 @@ describe RolesController do
   let(:ability) do
     ability = Object.new
     ability.extend(CanCan::Ability)
-    controller.stub(:current_ability).and_return(ability)
+    allow(controller).to receive(:current_ability).and_return(ability)
     ability
   end
 
@@ -18,22 +18,22 @@ describe RolesController do
   
   describe "with a user who cannot edit roles" do
     it "should not be able to view role index" do
-      lambda { get :index }.should raise_error CanCan::AccessDenied
+      expect {get :index}.to raise_error CanCan::AccessDenied
     end
     it "should not be able to view role" do
-      lambda { get :show, id: role }.should raise_error CanCan::AccessDenied
+      expect {get :show, id: role}.to raise_error CanCan::AccessDenied
     end
     it "should not be able to view new role form" do
-      lambda { get :new }.should raise_error CanCan::AccessDenied
+      expect { get :new }.to raise_error CanCan::AccessDenied
     end
     it "should not be able to create a role" do
-      lambda { post :create, :role=>{name: 'my_role'}}.should raise_error CanCan::AccessDenied
+      expect { post :create, :role=>{name: 'my_role'}}.to raise_error CanCan::AccessDenied
     end
     it "should not be able to update a role" do
-      lambda { put :update, id: role}.should raise_error CanCan::AccessDenied
+      expect { put :update, id: role}.to raise_error CanCan::AccessDenied
     end
     it "should not be able to remove a role" do
-      lambda { delete :destroy, id: role}.should raise_error CanCan::AccessDenied
+      expect { delete :destroy, id: role}.to raise_error CanCan::AccessDenied
     end
   end
 
@@ -43,14 +43,14 @@ describe RolesController do
     end
     it "should be able to see the list of roles" do
       get :index
-      response.should be_successful
-      assigns[:roles].should == [role]
+      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
-      response.should be_successful
-      assigns[:role].should == role
+      expect(response).to be_successful
+      expect(assigns[:role]).to eq role
     end
   end
 
@@ -59,7 +59,7 @@ describe RolesController do
       ability.can :read, Role
       ability.can :update, Role, id: role.id
       get :show, id: role
-      response.should redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
+      expect(response).to redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
     end
   end
   
@@ -69,21 +69,21 @@ describe RolesController do
     end
     it "should be able to make a new role" do
       get :new
-      response.should be_successful
-      assigns[:role].should be_kind_of Role
+      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'} 
-      response.should redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
-      assigns[:role].should_not be_new_record
-      assigns[:role].name.should == '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'} 
-      assigns[:role].name.should == 'my role'
-      assigns[:role].errors[:name].should == ['Only letters, numbers, hyphens, underscores and periods are allowed']
-      response.should be_successful
+      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
 
@@ -94,15 +94,15 @@ describe RolesController do
 
     it "should be able to update a role" do
       put :update, id: role, :role=>{name: 'my_role'} 
-      response.should redirect_to @routes.url_helpers.edit_role_path(assigns[:role])
-      assigns[:role].should_not be_new_record
-      assigns[:role].name.should == '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'} 
-      assigns[:role].name.should == 'my role'
-      assigns[:role].errors[:name].should == ['Only letters, numbers, hyphens, underscores and periods are allowed']
-      response.should be_successful
+      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
 
@@ -113,7 +113,7 @@ describe RolesController do
 
     it "should be able to destroy a role" do
       delete :destroy, id: role 
-      response.should redirect_to @routes.url_helpers.roles_path
+      expect(response).to redirect_to @routes.url_helpers.roles_path
     end
   end
 

data/spec/controllers/user_roles_controller_spec.rb

@@ -4,7 +4,8 @@ describe UserRolesController do
   let(:ability) do
     ability = Object.new
     ability.extend(CanCan::Ability)
-    controller.stub(:current_ability).and_return(ability)
+    allow(controller).to receive(:current_ability).and_return(ability)
+
     ability
   end
 
@@ -18,10 +19,10 @@ describe UserRolesController do
 
   describe "with a user who cannot edit users" do
     it "should not be able to add a user" do
-      lambda { post :create, role_id: role, user_key: 'foo@example.com'}.should raise_error CanCan::AccessDenied
+      expect { post :create, role_id: role, user_key: 'foo@example.com'}.to raise_error CanCan::AccessDenied
     end
     it "should not be able to remove a user" do
-      lambda { delete :destroy, role_id: role, id: 7}.should raise_error CanCan::AccessDenied
+      expect { delete :destroy, role_id: role, id: 7}.to raise_error CanCan::AccessDenied
     end
   end
 
@@ -34,14 +35,14 @@ describe UserRolesController do
         ability.can :add_user, Role
       end
       it "should not be able to add a user that doesn't exist" do
-        User.should_receive(:find_by_email).with('foo@example.com').and_return(nil)
+        expect(User).to receive(:find_by_email).with('foo@example.com').and_return(nil)
         post :create, role_id: role, user_key: 'foo@example.com'
-        flash[:error].should == "Unable to find the user 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'
-        role.reload.users.should == [u]
+        expect(role.reload.users).to eq [u]
       end
     end
     describe "removing users" do
@@ -55,9 +56,9 @@ describe UserRolesController do
         u
       end
       it "should be able to remove a user" do
-        user.roles.should == [role]
+        expect(user.roles).to eq [role]
         delete :destroy, role_id: role, id: user.id
-        role.reload.users.should == []
+        expect(role.reload.users).to eq []
       end
     end
   end

data/spec/lib/user_roles_spec.rb

@@ -8,7 +8,7 @@ describe Hydra::RoleManagement::UserRoles do
     end
 
     it "should have admin?" do
-      subject.should_not be_admin
+      expect(subject).not_to be_admin
     end
 
     describe "with roles" do

data/spec/models/role_spec.rb

@@ -2,34 +2,34 @@ require 'spec_helper'
 
 describe Role do
   it "should require a name" do
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
     subject.name = 'foo'
-    subject.should be_valid
+    expect(subject).to be_valid
   end
 
   it "should not allow space in the name" do
     subject.name = 'foo bar'
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "should not allow comma in the name" do
     subject.name = 'foo,bar'
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "should not allow ampersand in the name" do
     subject.name = 'foo&bar'
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "should not allow less-than in the name" do
     subject.name = 'foo<bar'
-    subject.should_not be_valid
+    expect(subject).not_to be_valid
   end
 
   it "should validate uniqueness" do
     subject.name ='foo'
     subject.save!
-    Role.new(name: 'foo').should_not be_valid
+    expect(Role.new(name: 'foo')).not_to be_valid
   end
 end

data/spec/routing/role_management_routes_spec.rb

@@ -6,19 +6,19 @@ describe "Routes for role_management" do
   }
   context "default" do
     it "should route index" do 
-      { :get => '/roles' }.should route_to( :controller => "roles", :action => "index")
+      expect(:get => '/roles').to route_to( :controller => "roles", :action => "index")
     end
     it "should create roles" do 
-      { :post => '/roles' }.should route_to( :controller => "roles", :action => "create")
+      expect(:post => '/roles').to route_to( :controller => "roles", :action => "create")
     end
     it "should show roles" do 
-      { :get => '/roles/7' }.should route_to( :controller => "roles", :action => "show", :id => '7')
+      expect(:get => '/roles/7').to route_to( :controller => "roles", :action => "show", :id => '7')
     end
     it "should add users" do 
-      { :post => '/roles/7/users' }.should route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
+      expect(:post => '/roles/7/users').to route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
     end
     it "should remove users" do 
-      { :delete => '/roles/7/users/5' }.should route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
+      expect(:delete => '/roles/7/users/5').to route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
     end
   end
 
@@ -48,19 +48,19 @@ describe "Routes for role_management" do
     end
 
     it "should route index" do 
-      { :get => '/admin/groups' }.should route_to( :controller => "roles", :action => "index")
+      expect(:get => '/admin/groups').to route_to( :controller => "roles", :action => "index")
     end
     it "should create roles" do 
-      { :post => '/admin/groups' }.should route_to( :controller => "roles", :action => "create")
+      expect(:post => '/admin/groups').to route_to( :controller => "roles", :action => "create")
     end
     it "should show roles" do 
-      { :get => '/admin/groups/7' }.should route_to( :controller => "roles", :action => "show", :id => '7')
+      expect(:get => '/admin/groups/7').to route_to( :controller => "roles", :action => "show", :id => '7')
     end
     it "should add users" do 
-      { :post => '/admin/groups/7/users' }.should route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
+      expect(:post => '/admin/groups/7/users').to route_to( :controller => "user_roles", :role_id=>'7', :action => "create")
     end
     it "should remove users" do 
-      { :delete => '/admin/groups/7/users/5' }.should route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
+      expect(:delete => '/admin/groups/7/users/5').to route_to( :controller => "user_roles", :role_id=>'7', :id=>'5', :action => "destroy")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hydra-role-management
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap_form