roles_controller.rb in the_role-1.5.0

- old
+ new

@@ -1,16 +1,13 @@
-require 'the_role'
-
 class Admin::RolesController < ApplicationController
-  layout 'the_role'
-  before_filter :the_login_required
-  before_filter :the_role_require
-  
-  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]
-  
+  include TheRole::Requires
+
+  before_filter :role_login_required
+  before_filter :role_require
+  before_filter :role_find,           :only => [:show, :edit, :update, :destroy]
+  before_filter :owner_require,       :only => [:show, :edit, :update, :destroy]
+
   def index
     @roles = Role.all(:order => "created_at ASC")
   end
 
   def new
@@ -29,81 +26,26 @@
       render :action => :new
     end
   end
 
   def update
-    role = TheRole.get(@role.the_role).the_reset!
-    new_role = params[:role] ? params[:role][:the_role] : Hash.new
-    role.the_merge!(new_role)
-    if @role.update_attribute(:the_role, role.to_yaml)
+    if @role.update_role params[:role].try(:[],:the_role)
       flash[:notice] = t('the_role.role_updated')
       redirect_to edit_admin_role_path(@role)
     else
       render :action => :edit
     end
   end
-  
-  def new_role_section
-    # validate 1
-    if params[:section_name].blank?
-      flash[:error] = t('the_role.section_name_is_blank')
-      redirect_to edit_admin_role_path(@role) and return
-    end
 
-    # validate 2
-    section_name = params[:section_name]
-    unless section_name.match(TheRole::NAME_SYMBOLS)
-      flash[:error] = t('the_role.section_name_is_wrong')
-      redirect_to edit_admin_role_path(@role) and return
-    end
-
-    section_name.downcase!
-    role = TheRole.get(@role.the_role)
-
-    # validate 3
-    if role[section_name.to_sym]
-      flash[:error] = t('the_role.section_exists')
-      redirect_to edit_admin_role_path(@role) and return
-    end
-
-    role[section_name.to_sym] = Hash.new
-    
-    if @role.update_attributes({:the_role => role.to_yaml})
-      flash[:notice] = t('the_role.section_created')
-      redirect_to edit_admin_role_path(@role)
-    else
-      render :action => :edit
-    end
-  end#new_role_section
-  
-  def new_role_policy
-    params[:section_policy].downcase!
-    
-    # validate 1
-    unless params[:section_policy].match(TheRole::NAME_SYMBOLS)
-      flash[:error] = t('the_role.section_policy_wrong_name')
-      redirect_to edit_admin_role_path(@role)
-    end
-
-    role = TheRole.get(@role.the_role)
-    role[params[:section_name].to_sym][params[:section_policy].to_sym] = true 
-
-    if @role.update_attributes({:the_role => role.to_yaml})
-      flash[:notice] = t('the_role.section_policy_created')
-      redirect_to edit_admin_role_path(@role)
-    else
-      render :action => :edit
-    end
-  end#new_role_policy
-
   def destroy
     @role.destroy
     redirect_to admin_roles_url
   end
 
   protected
 
-  def the_role_find
-    @role = Role.find(params[:id])
+  def role_find
+    @role = Role.find params[:id]
+    @object_for_ownership_checking = @role
   end
   
 end