the_role 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fe7a9a634b09aac64fa6ee91b0508785b9586d
-  data.tar.gz: a07bb7473cd3f2023f8ba2642345c1fda8c95c61
+  metadata.gz: 27c23d0e82c72b3aa2f3f2c846d62424f50bb349
+  data.tar.gz: e7f1057d85c4ec5b0a8d60a227d7504810eedde9
 SHA512:
-  metadata.gz: d9dd558bf8605e39cfb74d0aedc35bf737c8da9d8b6ec5a21b1190e1ca52011551137e0d14ae4d8b503f89aae926ed6d1f344969acd361ca292b3be045d0ffb4
-  data.tar.gz: a9c9c751e67ce55f69af149fafafdb17bd26a63d1c92b72e2cc3adf867cab416961b7be0fad7e7f98e2158891430264929258b96e63a39681b6c228c7a94ea9a
+  metadata.gz: fab50cb0f7259c5a0902f1b2647078e978171eacb42e33a4bde402cf6bb86a5f4fcd814a2d3e27a975bbf3af0ea70278b9b4ebafd76832e1856d359fe21b70f7
+  data.tar.gz: f69efe7d0fe26e0b7d6a5423932e8c9f316f416b3fc0b9c6651da6990e80025cb9af1ea1cecfc0461ab905f8666a6b301fcd6f0c7cd2b37d2d491218765a2717

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .rvmrc
+spec/the_role_on_devise/public/assets

data/README.md

@@ -52,7 +52,7 @@ gem 'the_role', '~> 2.0.0'
 
 ### Understanding
 
-* [TheRole instead CanCan?](#therole-instead-cancan)
+* [TheRole instead of CanCan?](#therole-instead-of-cancan)
 * [What does it mean semantic?](#what-does-it-mean-semantic)
 * [Virtual sections and rules](#virtual-sections-and-rules)
 * [Using with Views](#using-with-views)
@@ -385,6 +385,9 @@ Has user got an access to **rule** of **section** (action of controller)?
 @user.has_role?(:pages,    :show)  => true | false
 @user.has_role?(:blogs,    :new)   => true | false
 @user.has_role?(:articles, :edit)  => true | false
+
+# return true if one of roles is true
+@user.any_role?(pages: :show, posts: :show) => true | false
 ```
 
 Is user **Owner** of object?
@@ -406,6 +409,9 @@ Is user **Owner** of object?
 @role.has?(:pages, :show)       => true | false
 @role.moderator?(:pages)        => true | false
 @role.admin?                    => true | false
+
+# return true if one of roles is true
+@role.any?(pages: :show, posts: :show) => true | false
 ```
 
 #### CREATE
@@ -470,6 +476,7 @@ new_role_hash = {
 
 #### Changelog
 
+* 2.1.0 - User#any_role? & Role#any?
 * 2.0.3 - create role fix, cleanup
 * 2.0.2 - code cleanup, readme
 * 2.0.1 - code cleanup
@@ -492,6 +499,8 @@ new_role_hash = {
 
 **zh_CN** by @doabit & @linjunpop
 
+**PL** by @egb3
+
 ### MIT-LICENSE
 
 ##### Copyright (c) 2012 [Ilya N.Zykin]

data/app/assets/javascripts/the_role.js.coffee

@@ -0,0 +1,31 @@
+showForm = (event) ->
+  item   = $ event
+
+  a_item = item.children('span.a')
+  b_item = item.children('span.b')
+
+  a_item.hide().off 'click'
+  b_item.css('visibility', 'visible')
+
+  item.find('.btn-warning').click ->
+    hideForm(event)
+    event.parentNode.reset()
+
+  item.find('.btn-success').click -> event.parentNode.submit()
+  
+  b_item.find('input').keypress (e) ->
+    ENTER = 13
+    event.parentNode.submit() if e.which is ENTER
+
+hideForm = (event) ->
+  item   = $ event
+  a_item = item.children('span.a')
+  b_item = item.children('span.b')
+  
+  a_item.show()
+  b_item.css('visibility', 'hidden')
+  item.find('.btn').off('click')
+  a_item.click -> showForm(event)
+
+$ ->
+  $('span.a', '.title, .name, .description').click -> showForm @parentNode

data/app/controllers/admin/roles_controller.rb

@@ -5,8 +5,8 @@ class Admin::RolesController < ApplicationController
   before_filter :login_required
   before_filter :role_required
 
-  before_filter :role_find,      only: [:edit, :update, :destroy]
-  before_filter :owner_required, only: [:edit, :update, :destroy]
+  before_filter :role_find,      only: [:edit, :update, :destroy, :change]
+  before_filter :owner_required, only: [:edit, :update, :destroy, :change]
 
   def index
     @roles = Role.all.order('created_at ASC')
@@ -38,6 +38,15 @@ class Admin::RolesController < ApplicationController
     end
   end
 
+  def change
+    if @role.update_attributes!(role_params)
+      flash[:notice] = t 'the_role.role_updated'
+      redirect_to_edit
+    else
+      render :action => :edit
+    end
+  end
+
   def destroy
     @role.destroy
     flash[:notice] = t 'the_role.role_deleted'

data/app/models/concerns/the_role_user_model.rb

@@ -28,9 +28,14 @@ module TheRoleUserModel
     section_name = obj.class.to_s.tableize
     return true  if moderator?(section_name)
 
-    return id == obj.id          if obj.is_a?(User)
+    # obj is User, simple way to define user_id
+    return id == obj.id if obj.is_a?(User)
+
+    # few ways to define user_id
+    return id == obj.user_id     if obj.respond_to? :user_id
     return id == obj[:user_id]   if obj[:user_id]
     return id == obj[:user][:id] if obj[:user]
+
     false
   end
 
@@ -39,7 +44,11 @@ module TheRoleUserModel
   def set_default_role
     unless role
       default_role = Role.where(name: TheRole.config.default_user_role).first
-      self.role = default_role if default_role
+      self.role    = default_role if default_role
+    end
+
+    if User.count.zero? && TheRole.config.first_user_should_be_admin
+      self.role = TheRole.create_admin
     end
   end
 end

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

@@ -1,16 +1,38 @@
 - content_for :role_main do
   .well
-    %h3
-      %b= t '.role_name'
-      = role.name
+    = form_for(role, :url => change_admin_role_path(role)) do |f|
+      %h3.name
+        %b= t '.role_name'
+        %span.a= role.name
+        %span.b{style: 'visibility:hidden'}
+          = f.text_field :name
+          .btn-group
+            %a.btn.btn-warning
+              %i.icon-repeat
+            %a.btn.btn-success
+              %i.icon-ok
 
-    %h5
-      %b= t '.title'
-      = role.title
+      %h5.title
+        %b= t '.title'
+        %span.a= role.title
+        %span.b{style: 'visibility:hidden'}
+          = f.text_field :title
+          .btn-group
+            %a.btn.btn-warning
+              %i.icon-repeat
+            %a.btn.btn-success
+              %i.icon-ok
 
-    %p.description
-      %b= t '.role_description'
-      = role.description
+      %h5.description
+        %b= t '.role_description'
+        %span.a= role.description
+        %span.b{style: 'visibility:hidden'}
+          = f.text_field :description
+          .btn-group
+            %a.btn.btn-warning
+              %i.icon-repeat
+            %a.btn.btn-success
+              %i.icon-ok
 
   - role.to_hash.each_pair do |section, rules|
     .section

data/config/locales/en.yml

@@ -5,15 +5,15 @@ en:
     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_rule_created:     "Section rule created"
+    section_rule_not_created: "Section rule not created"
+    section_rule_on:          "Section rule is enable"
+    section_rule_off:         "Section rule is disable"
+    state_not_changed:        "Section 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"
+    section_rule_deleted:     "Section rule deleted"
+    section_rule_not_deleted: "Section rule not deleted"
 
   admin:
     roles:
@@ -39,4 +39,4 @@ en:
       sidebar:
         roles_list: Roles list
         new_role: Create new role
-        delete_role_confirm: 'Are you sure? It can dangerous!'
+        delete_role_confirm: 'Are you sure? It can be dangerous!'

data/config/locales/pl.yml

@@ -0,0 +1,42 @@
+pl:
+  the_role:
+    role_created:             Rola dodana
+    role_updated:             Rola zaktualizowana
+    role_deleted:             Role skasowana
+    section_created:          Sekcja utworzona
+    section_not_created:      Sekcja nie utworzona
+    section_rule_created:     "Reguła utworzona"
+    section_rule_not_created: "Reguła nie utworzona"
+    section_rule_on:          "Reguła uruchomiona"
+    section_rule_off:         "Reguła wyłączona"
+    state_not_changed:        "Reguła nie zmieniona"
+    section_deleted:          Sekcja skasowana
+    section_not_deleted:      Sekcja nie skasowana
+    section_rule_deleted:     "Reguła skasowana"
+    section_rule_not_deleted: "Reguła nie skasowana"
+
+  admin:
+    roles:
+      new:
+        create: Utwórz nową rolę
+        name: Nazwa roli
+        title: Tytuł roli (text)
+        description: Opis roli (text)
+      role:
+        role_name: 'Nazwa roli:'
+        title:     'Tytuł:'
+        role_description: 'Opis roli:'
+        delete_section: Skasuj sekcje
+        section_delete_confirm: 'Czy aby napewno chcesz skasować sekcję?'
+        rule_delete_confirm: 'Czy aby na pewno chcesz usunąć rolę?'
+        enable: Włącz
+        disable: Wyłącz
+        delete_rule: Skasuj regułę
+        new_section_placeholder: Nazwa nowej sekcji
+        create_section: Utwórz nową sekcję
+        new_rule_placeholder: Nazwa nowej reguły
+        create_rule: Utwórz nową regułę
+      sidebar:
+        roles_list: Lista ról
+        new_role: Utwórz nową rolę
+        delete_role_confirm: 'Jesteś pewien? To może być niebezpieczne!'

data/config/locales/ru.yml

@@ -38,5 +38,5 @@ ru:
         create_rule: Создать правило
       sidebar:
         roles_list: Список ролей
-        new_role: Создать новое праивло
+        new_role: Создать новое правило
         delete_role_confirm: 'Удалить роль? Это может быть опасно! Уверены?'

data/config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   namespace :admin do
     resources :roles, :except => :show do
+      patch 'change', on: :member
       resources :sections, :controller => :role_sections, :only => :none do
         collection do
           post :create

data/lib/tasks/roles.rake

@@ -8,20 +8,7 @@ namespace :db do
       puts 'TheRole'
       puts '~'*40
 
-      unless Role.with_name(:admin)
-        role = Role.create(
-          name: :admin,
-          title: "Role for admin",
-          description:"This user can do anything"
-        )
-
-        role.create_rule(:system, :administrator)
-        role.rule_on(:system, :administrator)
-
-        puts "Admin role created"
-      else
-        puts "Admin role exists"
-      end
+      TheRole.create_admin
 
       puts "Now you can makes any user as Admin:"
       puts "> rails c"
@@ -33,15 +20,7 @@ namespace :db do
     desc 'create roles'
     task :test => :environment do
       # ADMIN
-      role = Role.create(
-        name: :admin,
-        title: "Role for admin",
-        description:"This user can do anything"
-      )
-
-      role.create_rule(:system, :administrator)
-      role.rule_on(:system, :administrator)
-
+      Rake::Task["db:roles:admin"].invoke
       puts 'Administrator'
 
       # MODERATOR

data/lib/the_role/config.rb

@@ -10,11 +10,14 @@ module TheRole
   # Configuration class
   class Configuration
     include ActiveSupport::Configurable
-    config_accessor :layout, :default_user_role
+    config_accessor :layout,
+                    :default_user_role,
+                    :first_user_should_be_admin
   end
 
   configure do |config|
-    config.layout = :application
-    config.default_user_role = nil
+    config.layout                     = :application
+    config.default_user_role          = nil
+    config.first_user_should_be_admin = false
   end
 end

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/the_role.rb

@@ -6,6 +6,19 @@ require 'the_role/version'
 require 'the_role/param_helper'
 
 module TheRole
+  class << self
+    def create_admin
+      admin_role = Role.where(name: :admin).first_or_create(
+        name: :admin,
+        title: "Role for admin",
+        description:"This user can do anything"
+      )
+      admin_role.create_rule(:system, :administrator)
+      admin_role.rule_on(:system, :administrator)
+      admin_role
+    end
+  end
+
   class Engine < Rails::Engine
     # initializer "TheRole precompile hook", group: :all do |app|
     #   app.config.assets.precompile += %w( x.js y.css )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ilya N. Zykin [the-teacher]
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -38,6 +38,8 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/assets/javascripts/.keep
+- app/assets/javascripts/the_role.js.coffee
 - app/assets/stylesheets/the_role.css.scss
 - app/assets/stylesheets/the_role/bootstrap_sass.css.scss
 - app/controllers/admin/role_sections_controller.rb
@@ -53,6 +55,7 @@ files:
 - app/views/admin/roles/new.html.haml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/pl.yml
 - config/locales/ru.yml
 - config/locales/zh_CN.yml
 - config/routes.rb