the_role 1.6.3 → 1.6.4

data/README.md

@@ -1,4 +1,4 @@
-# gem 'the_role' (alpha v0.1)
+# gem 'the_role' (alpha v0.2)
 
 | Bye bye CanCan, I got The Role! | Description |
 |:------------- |:-------------|
@@ -362,4 +362,31 @@ new_role_hash = {
 
 # delete rule in section
 @role.delete_rule(:pages, :show)
-```
+```
+
+### Changelog
+
+* 1.6.4 - En locale (alpha 0.2)
+* 1.6.3 - notifications
+* 1.6.0 - stabile release (alpha 0.1)
+
+##### Copyright (c) 2012 [Ilya N.Zykin]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/app/controllers/admin/role_sections_controller.rb

@@ -1,5 +1,4 @@
 class Admin::RoleSectionsController < ApplicationController
-  include TheRole::Requires
   layout 'the_role'
 
   before_filter :login_required
@@ -32,7 +31,7 @@ class Admin::RoleSectionsController < ApplicationController
     if @role.rule_on section_name, rule_name
       flash[:notice] = t 'the_role.section_rule_on'
     else
-      flash[:error]  = t 'the_role.section_rule_state_not_changed'
+      flash[:error]  = t 'the_role.state_not_changed'
     end
     redirect_to_edit
   end
@@ -43,7 +42,7 @@ class Admin::RoleSectionsController < ApplicationController
     if @role.rule_off section_name, rule_name
       flash[:notice] = t 'the_role.section_rule_off'
     else
-      flash[:error]  = t 'the_role.section_rule_state_not_changed'
+      flash[:error]  = t 'the_role.state_not_changed'
     end
     redirect_to_edit
   end

data/app/controllers/admin/roles_controller.rb

@@ -1,5 +1,4 @@
 class Admin::RolesController < ApplicationController
-  include TheRole::Requires
   layout 'the_role'
 
   before_filter :login_required
@@ -9,7 +8,7 @@ class Admin::RolesController < ApplicationController
   before_filter :owner_required, :only => [:edit, :update, :destroy]
 
   def index
-    @roles = Role.all(:order => "created_at ASC")
+    @roles = Role.all :order => 'created_at ASC'
   end
 
   def new
@@ -19,11 +18,11 @@ class Admin::RolesController < ApplicationController
   def edit; end
 
   def create
-    @role = Role.new(params[:role])
+    @role = Role.new params[:role]
 
     if @role.save
-      flash[:notice] = t('the_role.role_created')
-      redirect_to edit_admin_role_path(@role)
+      flash[:notice] = t 'the_role.role_created'
+      redirect_to_edit
     else
       render :action => :new
     end
@@ -31,8 +30,8 @@ class Admin::RolesController < ApplicationController
 
   def update
     if @role.update_role params[:role].try(:[],:the_role)
-      flash[:notice] = t('the_role.role_updated')
-      redirect_to edit_admin_role_path(@role)
+      flash[:notice] = t 'the_role.role_updated'
+      redirect_to_edit
     else
       render :action => :edit
     end
@@ -40,6 +39,7 @@ class Admin::RolesController < ApplicationController
 
   def destroy
     @role.destroy
+    flash[:notice] = t 'the_role.role_deleted'
     redirect_to admin_roles_url
   end
 
@@ -49,5 +49,9 @@ class Admin::RolesController < ApplicationController
     @role = Role.find params[:id]
     @ownership_checking_object = @role
   end
+
+  def redirect_to_edit
+    redirect_to edit_admin_role_path @role
+  end
   
 end

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

@@ -1,14 +1,14 @@
 .well
   %h3
-    %b Role name:
+    %b= t '.role_name'
     = role.name
 
   %h5
-    %b Title: 
+    %b= t '.title'
     = role.title
 
   %p.description
-    %b Description of role:
+    %b= t '.role_description'
     = role.description
 
 - role.to_hash.each_pair do |section, rules|
@@ -16,7 +16,7 @@
     %h3= section
     .delete
       .btn-group
-        = button_to 'Delete section', admin_role_section_path(role, section), :method => :delete, :class => 'btn btn-danger', :confirm => 'Are you sure?'
+        = button_to t('.delete_section'), admin_role_section_path(role, section), :method => :delete, :class => 'btn btn-danger', :confirm => t('.section_delete_confirm')
 
     - rules.each_pair do |rule, value|
       .rule
@@ -26,21 +26,21 @@
         .controls
           .btn-group
             - klass = value ? :success : :info
-            - state = value ? :Enable : :Disable
+            - state = value ? t('.enable') : t('.disable')
             %button{ :class => "btn btn-#{klass}" }= state
             %button{ :class => "btn btn-#{klass} dropdown-toggle", 'data-toggle' => :dropdown }
               %span.caret
             %ul.dropdown-menu
-              %li.success= link_to 'Enable',  rule_on_admin_role_section_path(role, section, :name => rule), :method => :put
-              %li.info=    link_to 'Disable', rule_off_admin_role_section_path(role, section, :name => rule), :method => :put
+              %li.success= link_to t('.enable'),  rule_on_admin_role_section_path(role, section, :name => rule), :method => :put
+              %li.info=    link_to t('.disable'), rule_off_admin_role_section_path(role, section, :name => rule), :method => :put
               %li.divider
-              %li.error= link_to 'Delete rule', destroy_rule_admin_role_section_path(role, section, :name => rule), :method => :delete, :confirm => 'Are you sure?'
+              %li.error= link_to t('.delete_rule'), destroy_rule_admin_role_section_path(role, section, :name => rule), :method => :delete, :confirm => t('.rule_delete_confirm')
 
 %h4 Create new section
 
 = form_tag admin_role_sections_path(role), :class => 'well form-inline' do |f|
-  = text_field_tag :section_name, '', :class => 'input-xlarge', :placeholder => "New Section Name"
-  = submit_tag 'Create Section', :class => :btn
+  = text_field_tag :section_name, '', :class => 'input-xlarge', :placeholder => t('.new_section_placeholder')
+  = submit_tag t('.create_section'), :class => :btn
 
 %h4 Create new rule
 
@@ -49,5 +49,5 @@
     - role.to_hash.each_pair do |section, rules|
       %option{ :value => section }= section
 
-  = text_field_tag :rule_name, '', :class => 'input-large', :placeholder => "New Rule Name"
-  = submit_tag 'Create Rule', :class => :btn
+  = text_field_tag :rule_name, '', :class => 'input-large', :placeholder => t('.new_rule_placeholder')
+  = submit_tag t('.create_rule'), :class => :btn

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

@@ -3,6 +3,6 @@
   - (@roles || Role.all).each do |role|
     %p
       = link_to role.title, edit_admin_role_url(role)
-      = link_to raw('×'), admin_role_url(role), :method => :delete, :title => role.title, :confirm => t('the_role.delete_role'), :class => :delete
+      = link_to raw('×'), admin_role_url(role), :method => :delete, :title => role.title, :confirm => t('.delete_role_confirm'), :class => :delete
 
   %p.new= link_to t('.new_role'),  new_admin_role_path

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

@@ -20,4 +20,4 @@
       %label= t('.description')
       %p= f.text_field :description
 
-      = f.submit t('.new'), :class => :btn
+      = f.submit t('.create'), :class => :btn

data/app/views/layouts/the_role.html.haml

@@ -13,12 +13,13 @@
         \|
         Role system for Rails Apps
         \|
-        User: #{current_user.try(:name) || current_user.id}
+        - u = current_user
+        User: #{u.try(:name) || u.try(:username) || u.try(:login)|| u.try(:email) || u.id}
     .crusty
       .container
 
         - if flash[:notice]
-          .alert.alert-block
+          .alert.alert-success
             %a.close{:href => '#', 'data-dismiss' => :alert } ×
             = flash[:notice]
 

data/config/locales/en.yml

@@ -1,44 +1,41 @@
-# 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:
   the_role:
-    name_presence: Set the role name
-    title_presence: Set title of role
-    section_created: Section is successfully created
-    section_not_created: Section is not 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?
+    role_created:             Role created
+    role_updated:             Role updated
+    role_deleted:             Role deleted
+    section_created:          Section created
+    section_not_created:      Section not created
+    section_rule_created:     "Section's rule created"
+    section_rule_not_created: "Section's rule not created"
+    section_rule_on:          "Section's rule is enable"
+    section_rule_off:         "Section's rule is disable"
+    state_not_changed:        "Section's rule not changed"
+    section_deleted:          Section deleted
+    section_not_deleted:      Section not deleted
+    section_rule_deleted:     "Section's rule deleted"
+    section_rule_not_deleted: "Section's rule not deleted"
+
   admin:
     roles:
-      index:
-        list: list of roles
-        delete: 'Delete Role'
-        new: Create a new role
-      edit:
-        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: Remove a role section?
-        empty: There is no role section
-        delete_rule_confirm: Remove the access rule?
-        delete: 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
+        create: Create new Role
+        name: Name of role (underscored latin string)
+        title: Title of role (text)
+        description: Description of role (text)
+      role:
+        role_name: 'Role name:'
+        title:     'Title:'
+        role_description: 'Description of role:'
+        delete_section: Delete section
+        section_delete_confirm: 'Do you want to delete section?'
+        rule_delete_confirm: 'Do you want to delete rule?'
+        enable: Enable
+        disable: Disable
+        delete_rule: Delete rule
+        new_section_placeholder: New section name
+        create_section: Create new section
+        new_rule_placeholder: New rule name
+        create_rule: Create new rule
+      sidebar:
+        new_role: Create new role
+        delete_role_confirm: 'Are you sure? It can dangerous!'

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "1.6.3"
+  VERSION = "1.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &11730300 !ruby/object:Gem::Requirement
+  requirement: &15825160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11730300
+  version_requirements: *15825160
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &11729380 !ruby/object:Gem::Requirement
+  requirement: &15824720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11729380
+  version_requirements: *15824720
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &11822780 !ruby/object:Gem::Requirement
+  requirement: &15824280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11822780
+  version_requirements: *15824280
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &11821140 !ruby/object:Gem::Requirement
+  requirement: &15823820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11821140
+  version_requirements: *15823820
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &11819800 !ruby/object:Gem::Requirement
+  requirement: &15823380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11819800
+  version_requirements: *15823380
 - !ruby/object:Gem::Dependency
   name: less-rails
-  requirement: &11818680 !ruby/object:Gem::Requirement
+  requirement: &15822820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11818680
+  version_requirements: *15822820
 description: Authorization lib for Rails 3 with Web Interface, aka CanCan killer
 email:
 - zykin-ilya@ya.ru