Rename member.has_role? to role?

app/controllers/crops_controller.rb

@@ -119,7 +119,7 @@ class CropsController < ApplicationController
   def create
     @crop = Crop.new(crop_params)
 
-    if current_member.has_role? :crop_wrangler
+    if current_member.role? :crop_wrangler
       @crop.creator = current_member
       success_msg = "Crop was successfully created."
     else
@@ -136,7 +136,7 @@ class CropsController < ApplicationController
         params[:sci_name].each do |index, value|
           create_name('scientific', value)
         end
-        unless current_member.has_role? :crop_wrangler
+        unless current_member.role? :crop_wrangler
           Role.crop_wranglers.each do |w|
             Notifier.new_crop_request(w, @crop).deliver_later!
           end

app/controllers/sessions_controller.rb

@@ -3,7 +3,7 @@ class SessionsController < Devise::SessionsController
 
   def create
     super do |resource|
-      if Crop.pending_approval.present? && current_member.has_role?(:crop_wrangler)
+      if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
         flash[:alert] = "There are crops waiting to be wrangled."
       end
     end

app/models/ability.rb

@@ -57,7 +57,7 @@ class Ability
     # note we don't support update for notifications
 
     # only crop wranglers can create/edit/destroy crops
-    if member.has_role? :crop_wrangler
+    if member.role? :crop_wrangler
       can :wrangle, Crop
       can :manage, Crop
       can :manage, ScientificName
@@ -124,7 +124,7 @@ class Ability
     can :destroy, Follow
     cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
-    return unless member.has_role? :admin
+    return unless member.role? :admin
 
     can :read, :all
     can :manage, :all

app/models/member.rb

@@ -100,7 +100,7 @@ class Member < ActiveRecord::Base
     login_name
   end
 
-  def has_role?(role_sym)
+  def role?(role_sym)
     roles.any? { |r| r.name.gsub(/\s+/, "_").underscore.to_sym == role_sym }
   end
 

app/views/layouts/_header.html.haml

@@ -67,11 +67,11 @@
                   = link_to(t('.inbox_unread', unread_count: current_member.notifications.unread_count), notifications_path)
                 - else
                   = link_to(t('.inbox'), notifications_path)
-              - if current_member.has_role?(:crop_wrangler) || current_member.has_role?(:admin)
+              - if current_member.role?(:crop_wrangler) || current_member.role?(:admin)
                 %li{:class => 'divider', :role => 'presentation'}
-                - if current_member.has_role?(:crop_wrangler)
+                - if current_member.role?(:crop_wrangler)
                   %li= link_to t('.crop_wrangling'), wrangle_crops_path
-                - if current_member.has_role?(:admin)
+                - if current_member.role?(:admin)
                   %li= link_to t('.admin'), admin_path
 
 

app/views/members/_account.html.haml

@@ -16,9 +16,9 @@
 %p
   %strong Member Roles:
   %br
-  - if member.has_role? :admin
+  - if member.role? :admin
     Administrator
-  - if member.has_role? :crop_wrangler
+  - if member.role? :crop_wrangler
     Crop Wrangler
   - else
     Member

app/views/orders/show.html.haml

@@ -22,7 +22,7 @@
     %strong Referral code:
     = @order.referral_code
 
-- if current_member.has_role? :admin
+- if current_member.role? :admin
   %p
     %strong Paypal Express token:
     = @order.paypal_express_token

config/initializers/comfortable_mexican_sofa.rb

@@ -95,7 +95,7 @@ end
 
 module CmsDeviseAuth
   def authenticate
-    return if current_member && current_member.has_role?(:admin)
+    return if current_member && current_member.role?(:admin)
     redirect_to root_path, alert: 'Permission denied. Please sign in as an admin user to use the CMS admin area.'
   end
 end

spec/models/ability_spec.rb

@@ -61,7 +61,7 @@ describe Ability do
       end
 
       it "has crop_wrangler role" do
-        member.has_role?(:crop_wrangler).should be true
+        member.role?(:crop_wrangler).should be true
       end
 
       it "can create crops" do
@@ -96,7 +96,7 @@ describe Ability do
       end
 
       it "has admin role" do
-        member.has_role?(:admin).should be true
+        member.role?(:admin).should be true
       end
 
       it "can read products" do
@@ -210,7 +210,7 @@ describe Ability do
       end
 
       it "has admin role" do
-        member.has_role?(:admin).should be true
+        member.role?(:admin).should be true
       end
 
       it "can read orders" do

spec/models/member_spec.rb

@@ -194,19 +194,19 @@ describe 'member' do
 
     it 'has a role' do
       member.roles.first.should eq role
-      member.has_role?(:moderator).should eq true
+      member.role?(:moderator).should eq true
     end
 
     it 'sets up roles in factories' do
       admin = FactoryGirl.create(:admin_member)
-      admin.has_role?(:admin).should eq true
+      admin.role?(:admin).should eq true
     end
 
     it 'converts role names properly' do
       # need to make sure spaces get turned to underscores
       role = FactoryGirl.create(:role, name: "a b c")
       member.roles << role
-      member.has_role?(:a_b_c).should eq true
+      member.role?(:a_b_c).should eq true
     end
   end