the_role 1.3.1 → 1.4.0

data/README.md

@@ -36,17 +36,33 @@ rake db:roles:test
   >> Administrator, Moderator of pages, User, Demo
 ```
 
-Define alias method for **the_login_required** for correctly work of admin's controllers
+Define aliases method for correctly work TheRole's controllers
 
 **login_required** or any other method from your auth system
 
+**access_denied** or any other method for processing access denied situation
+
 ``` ruby
 class ApplicationController < ActionController::Base
   # You Auth system
   include AuthenticatedSystem
 
-  # TheRole login_required method alias
+  # define aliases for correctly work of TheRole gem
   alias_method :the_login_required, :login_required
+  alias_method :the_role_access_denied, :access_denied
+end
+```
+
+##  Using with controllers
+
+``` ruby
+class ArticlesController < ApplicationController
+  before_filter :login_required
+
+  before_filter :the_role_require
+  before_filter :the_role_object,   :only => [:new, :edit, :update, :destroy]
+  before_filter :the_owner_require, :only => [:new, :edit, :update, :destroy]
+
 end
 ```
 

data/app/controllers/admin/role_section_controller.rb

@@ -1,8 +1,10 @@
 class Admin::RoleSectionController < ApplicationController
   before_filter :login_required
   before_filter :the_role_require
-  before_filter :find_role, :only=>[:destroy, :delete_policy]
-  before_filter :the_owner_require, :only=>[:destroy, :delete_policy]
+
+  before_filter :the_role_find,     :only => [:destroy, :delete_policy]
+  before_filter :the_role_object,   :only => [:destroy, :delete_policy]
+  before_filter :the_owner_require, :only => [:destroy, :delete_policy]
   
   def destroy
     section_name = params[:id]
@@ -33,7 +35,7 @@ class Admin::RoleSectionController < ApplicationController
 
   protected
 
-  def find_role
+  def the_role_find
     @role = Role.find(params[:role_id])
   end
 end

data/app/controllers/admin/roles_controller.rb

@@ -4,7 +4,9 @@ class Admin::RolesController < ApplicationController
   layout 'the_role'
   before_filter :the_login_required
   before_filter :the_role_require
-  before_filter :find_role, :only => [:show, :edit, :update, :destroy, :new_role_section, :new_role_policy]
+  
+  before_filter :the_role_find,     :only => [:show, :edit, :update, :destroy, :new_role_section, :new_role_policy]
+  before_filter :the_role_object,   :only => [:show, :edit, :update, :destroy, :new_role_section, :new_role_policy]
   before_filter :the_owner_require, :only => [:show, :edit, :update, :destroy, :new_role_section, :new_role_policy]
   
   def index
@@ -100,7 +102,7 @@ class Admin::RolesController < ApplicationController
 
   protected
 
-  def find_role
+  def the_role_find
     @role = Role.find(params[:id])
   end
   

data/app/views/admin/roles/edit.html.haml

@@ -8,7 +8,7 @@
 %p= link_to raw(t('.back')), admin_roles_path
 
 %h2
-  = t('.name')
+  = raw t('.name')
   = @role.title
 
 = form_for :role, :url => {:action=> :update }, :html => {:method => :put, :class => :form } do |f|

data/app/views/admin/roles/new.html.haml

@@ -4,7 +4,7 @@
   %p= m
 
 .form
-  %h5= t('.create')
+  %h5= raw t('.create')
   = form_for(@role, :url => admin_roles_path) do |f|
     %label= t('.name')
     %p= f.text_field :name

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/lib/the_role.rb

@@ -104,7 +104,7 @@ module TheRole
       # define class variable for *the_owner_require* filter with Controller class name
       # @the_role_object = @article
       def the_role_object
-        variable_name   = "@" + self.class.to_s.underscore.split('_').first.singularize
+        variable_name   = self.to_s.tableize.split('_').first.singularize.split('/').last
         @the_role_object = self.instance_variable_get("@#{variable_name}")
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70239330 !ruby/object:Gem::Requirement
+  requirement: &77091770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239330
+  version_requirements: *77091770
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70239120 !ruby/object:Gem::Requirement
+  requirement: &77091560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70239120
+  version_requirements: *77091560
 description: TheRole - simple, but powerful role system for ROR applications
 email:
 - zykin-ilya@ya.ru