the_role 1.4.1 → 1.5.0

data/app/controllers/admin/role_sections_controller.rb

@@ -0,0 +1,55 @@
+class Admin::RoleSectionsController < ApplicationController
+  include TheRole::Requires
+
+  before_filter :role_login_required
+  before_filter :role_require
+  before_filter :role_find,           :only => [:create, :create_rule, :destroy, :destroy_rule]
+  before_filter :owner_require,       :only => [:create, :create_rule, :destroy, :destroy_rule]
+
+  def create
+    if @role.create_section params[:section_name]
+      flash[:notice] = t('the_role.section_created')
+      redirect_to edit_admin_role_path(@role)
+    else
+      render :action => :edit
+    end
+  end
+  
+  def create_rule
+    if @role.create_rule(params[:section_name], params[:section_rule])
+      flash[:notice] = t('the_role.section_created')
+      redirect_to edit_admin_role_path(@role)
+    else
+      render :action => :edit
+    end
+  end
+  
+  def destroy
+    section_name = params[:id]
+
+    if @role.delete_section section_name
+      flash[:notice] = t('the_role.section_deleted')
+      redirect_to edit_admin_role_path(@role)
+    else
+      render :action => :edit
+    end   
+  end
+  
+  def destroy_rule
+    section_name = params[:id]
+    rule_name    = params[:name]
+    if @role.delete_rule(section_name, rule_name)
+      flash[:notice] = t('the_role.section_rule_deleted')
+      redirect_to edit_admin_role_path(@role)
+    else
+      render :action => :edit
+    end
+  end
+
+  protected
+
+  def role_find
+    @role = Role.find params[:role_id]
+    @object_for_ownership_checking = @role
+  end
+end

data/app/controllers/admin/roles_controller.rb

@@ -1,14 +1,11 @@
-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
@@ -31,69 +28,13 @@ class Admin::RolesController < ApplicationController
   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
@@ -102,8 +43,9 @@ class Admin::RolesController < ApplicationController
 
   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

data/app/views/admin/roles/_form.haml

@@ -1,4 +1,4 @@
-- role = TheRole.get(@role.the_role)
+- role = @role.to_hash
 
 - if role.blank?
   %h3= t('.empty')
@@ -7,7 +7,7 @@
     %h4
       = name
       %span.controls
-        = link_to(t('.delete'), admin_role_section_url(@role, name), :method => :delete, :confirm => t('.destroy_section_confirm'))
+        = link_to(t('.delete'), admin_role_section_path(@role, name), :method => :delete, :confirm => t('.destroy_section_confirm'))
 
     - if set.is_a?(Hash)
       %ul.rights
@@ -16,7 +16,7 @@
             = check_box_tag "role[the_role][#{name}][#{n}]", true, v
             = n
             .controls
-              = link_to t('.delete'), delete_policy_admin_role_section_path(@role, name, :name => n), :method => :delete, :confirm => t('.delete_policy_confirm')
+              = link_to t('.delete'), destroy_rule_admin_role_section_path(@role, name, :name => n), :method => :delete, :confirm => t('.delete_rule_confirm')
 
   = f.submit button
 

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

@@ -1,37 +1,42 @@
 - content_for :title do
   = t('.title')
 
-%p= flash[:notice]
-
-%h1= t('.title')
-
-%p= link_to raw(t('.back')), admin_roles_path
-
-%h2
-  = raw t('.name')
-  = @role.title
-
-= form_for :role, :url => {:action=> :update }, :html => {:method => :put, :class => :form } do |f|
-  = render :partial => 'form', :locals => {:f => f, :button => t('.update')}
-
-%h4= t('.create_section')
-- role = TheRole.get(@role.the_role)
-  
-= form_tag(new_role_section_admin_role_path, :method => :post, :class => :new_action) do
-  = text_field_tag :section_name
-  = submit_tag t('.create_section')
-
-%h4= t('.create_access_policy')
-
-- unless role.empty?
-  = form_tag(new_role_policy_admin_role_path(@role), :method => :post, :class => :new_action) do
-    = text_field_tag :section_policy
-
-    %select{ :name => :section_name }
-      -role.each do |name, set|
-        %option{ :value => name }
-          = name
-        
-      %input{ :type => :submit, :value => t('.create_policy') }
-- else
-  %p= t('.section_needs')
+- content_for :css do
+  = stylesheet_link_tag   'the_role/style'
+  = stylesheet_link_tag   'the_role/headers'
+  = stylesheet_link_tag   'the_role/form'
+
+.the_role
+  %p= flash[:notice]
+
+  %h1= t('.title')
+
+  %p= link_to raw(t('.back')), admin_roles_path
+
+  %h2
+    = @role.name
+    \-
+    = @role.title
+
+  = form_for :role, :url => {:action=> :update }, :html => {:method => :put, :class => :the_form } do |f|
+    = render :partial => 'form', :locals => {:f => f, :button => t('.update')}
+
+  %h4= t('.create_section')
+  - role = @role.to_hash
+  = form_tag(admin_role_sections_path(@role), :method => :post, :class => :new_rule) do
+    = text_field_tag :section_name
+    = submit_tag t('.create_section')
+
+  %h4= t('.create_access_rule')
+  - unless @role.to_hash.empty?
+    = form_tag(create_rule_admin_role_sections_path(@role), :method => :post, :class => :new_rule) do
+      = text_field_tag :section_rule
+
+      %select{ :name => :section_name }
+        -role.each do |name, set|
+          %option{ :value => name }
+            = name
+          
+        %input{ :type => :submit, :value => t('.create_rule') }
+  - else
+    %p= t('.section_needs')

data/app/views/admin/roles/index.haml

@@ -1,9 +1,15 @@
-%h3= t('.list')
-%ul.index
-  - @roles.each do |role|
-    %li
-      %p
-        = link_to role.title, edit_admin_role_url(role)
-        = link_to t('.delete') + role.title , admin_role_url(role), :method => :delete, :class => :delete
+- content_for :css do
+  = stylesheet_link_tag   'the_role/style'
+  = stylesheet_link_tag   'the_role/headers'
+  = stylesheet_link_tag   'the_role/form'
 
-%p= link_to t('.new'),  new_admin_role_path
+.the_role
+  %h3= t('.list')
+  %ul.index
+    - @roles.each do |role|
+      %li
+        %p
+          = link_to role.title, edit_admin_role_url(role)
+          = link_to t('.delete'), admin_role_url(role), :method => :delete, :title => role.title, :confirm => t('the_role.delete_role'), :class => :delete
+
+  %p= link_to t('.new'),  new_admin_role_path

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

@@ -1,13 +1,22 @@
-%p= link_to raw(t('.back')),  admin_roles_path
-
-- @role.errors.each do |f, m|
-  %p= m
-
-.form
-  %h5= raw t('.create')
-  = form_for(@role, :url => admin_roles_path) do |f|
-    %label= t('.name')
-    %p= f.text_field :name
-    %label= t('.title')
-    %p= f.text_field :title
-    = f.submit t('.new')
+.the_role
+  %p= link_to raw(t('.back')),  admin_roles_path
+
+  - @role.errors.each do |field, message|
+    %p
+      = field
+      \:
+      = message
+
+  .form
+    %h5= raw t('.create')
+    = form_for(@role, :url => admin_roles_path) do |f|
+      %label= t('.name')
+      %p= f.text_field :name
+
+      %label= t('.title')
+      %p= f.text_field :title
+
+      %label= t('.description')
+      %p= f.text_field :description
+
+      = f.submit t('.new')

data/config/locales/en.yml

@@ -1,42 +1,43 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-ru:
+en:
   the_role:
-    name_presence: Установите имя роли
-    title_presence: Установите название роли
-    section_created: Правовая группа успешно создана
-    section_policy_created: В заданной группе успешно создана политика доступа
-    section_deleted: Политика доступа удалена
-    section_policy_deleted: Политика доступа удалена
-    section_name_is_wrong: Ошибочное название правовой группы
-    section_policy_wrong_name: Ошибочное название правовой политики
-    section_name_is_blank: Имя правовой группы оказалось пустым
-    section_exists: Правовая группа уже существует
-    role_created: Роль успешно создана
-    role_updated: Роль успешно обновлена
+    name_presence: Set the role name
+    title_presence: Set title of role
+    section_created: Section is successfully created
+    section_rule_created: In a given group is successfully created an access rule
+    section_deleted: access rule is removed
+    section_rule_deleted: access rule is removed
+    section_name_is_wrong: Wrong name of Role
+    section_rule_wrong_name: Wrong name of Rule
+    section_name_is_blank: The name of the Role team was empty
+    section_exists: Section already exists
+    role_created: The Role of successfully established
+    role_updated: Role updated successfully
+    delete_role: It is can make big problems. Delete this role?
   admin:
     roles:
       index:
-        list: Список ролей
-        delete: 'Удалить роль '
-        new: Создать новую роль
+        list: list of roles
+        delete: 'Delete Role'
+        new: Create a new role
       edit:
-        title: Редактирование роли
-        back: '← К списку ролей'
-        name: 'Название роли — '
-        create_section: Создать правовую группу
-        create_access_policy: Создать политику доступа
-        create_policy: Создать политику
-        section_needs: Создайте хотя бы одну правовую группу
-        update: Обновить
+        title: Editing role
+        back: '← To the list of roles'
+        name: 'Name of role -'
+        create_section: Create a Section
+        create_access_rule: Create an access rule
+        create_rule: New Rule
+        section_needs: Create at least one Section
+        update: Update
       form:
-        destroy_section_confirm: Удалить правовую группу?
-        empty: Нет ни одной правовой группы
-        delete_policy_confirm: Удалить политику доступа?
-        delete: Удалить
+        destroy_section_confirm: Remove a role section?
+        empty: There is no role section
+        delete_rule_confirm: Remove the access rule?
+        delete: Delete
       new:
-        back: '← К списку ролей'
-        create: Создать новую роль
-        name: Имя роли (латиницей)
-        title: Название роли
-        new: Создать
+        back: '← To the list of roles'
+        create: Create a new role
+        name: Name of the role (Latin)
+        title: Title of role
+        new: Create

data/config/locales/ru.yml

@@ -1,42 +1,43 @@
 # Sample localization file for English. Add more files in this directory for other locales.
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-en:
+ru:
   the_role:
-    name_presence: Set the role name
-    title_presence: Set title of role
-    section_created: Role group is successfully created
-    section_policy_created: In a given group is successfully created an access policy
-    section_deleted: access policy is removed
-    section_policy_deleted: access policy is removed
-    section_name_is_wrong: Wrong name of Role
-    section_policy_wrong_name: Wrong name of Role Policy
-    section_name_is_blank: The name of the Role team was empty
-    section_exists: Role group already exists
-    role_created: The Role of successfully established
-    role_updated: Role updated successfully
+    name_presence: Установите имя роли
+    title_presence: Установите название роли
+    section_created: Правовая группа успешно создана
+    section_rule_created: В заданной группе успешно создана политика доступа
+    section_deleted: Политика доступа удалена
+    section_rule_deleted: Политика доступа удалена
+    section_name_is_wrong: Ошибочное название правовой группы
+    section_rule_wrong_name: Ошибочное название правовой политики
+    section_name_is_blank: Имя правовой группы оказалось пустым
+    section_exists: Правовая группа уже существует
+    role_created: Роль успешно создана
+    role_updated: Роль успешно обновлена
+    delete_role: Удаление роли может повлиять не работу всей системы. Удалить эту роль?
   admin:
     roles:
       index:
-        list: list of roles
-        delete: 'Delete role: '
-        new: Create a new role
+        list: Список ролей
+        delete: 'Удалить роль '
+        new: Создать новую роль
       edit:
-        title: Editing role
-        back: '← To the list of roles'
-        name: 'Name of role -'
-        create_section: Create a Role group
-        create_access_policy: Create an access policy
-        create_policy: New Policy
-        section_needs: Create at least one Role group
-        update: Update
+        title: Редактирование роли
+        back: '← К списку ролей'
+        name: 'Название роли — '
+        create_section: Создать правовую группу
+        create_access_rule: Создать политику доступа
+        create_rule: Создать политику
+        section_needs: Создайте хотя бы одну правовую группу
+        update: Обновить
       form:
-        destroy_section_confirm: Remove a role section?
-        empty: There is no role section
-        delete_policy_confirm: Remove the access policy?
-        delete: Delete
+        destroy_section_confirm: Удалить правовую группу?
+        empty: Нет ни одной правовой группы
+        delete_rule_confirm: Удалить политику доступа?
+        delete: Удалить
       new:
-        back: '← To the list of roles'
-        create: Create a new role
-        name: Name of the role (Latin)
-        title: Title of role
-        new: Create
+        back: '← К списку ролей'
+        create: Создать новую роль
+        name: Имя роли (латиницей)
+        title: Название роли
+        new: Создать