the_role 2.1.1 → 2.3

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

@@ -1,76 +1,97 @@
-- content_for :role_main do
-  .well
-    = 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.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
-
-      %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
+- content_for :role_update_btn_set do
+  .btn-group
+    %a.btn.btn-warning
+      %i.icon-repeat.glyphicon.glyphicon-repeat
+    %a.btn.btn-success
+      %i.icon-ok.glyphicon.glyphicon-ok
 
-  - role.to_hash.each_pair do |section, rules|
-    .section
-      %h3= section
-      .delete
-        .btn-group
-          = button_to t('.delete_section'), admin_role_section_path(role, section), method: :delete, class: 'btn btn-danger', data: { confirm: t('.section_delete_confirm') }
+- content_for :role_main do
+  - hidden = 'visibility:hidden'
+  .panel.panel-primary
+    .panel-heading Role Info (edit in place)
+    .panel-body
+      = form_for(role, url: change_admin_role_path(role), html: { class: "form-inline" } ) do |f|
+        .row
+          .col-md-12
+            %h3.holder
+              = t '.role_name'
+              %span.a= role.name
+              %span.b{ style: hidden }
+                .form-group= f.text_field :name, class: "form-control"
+                = yield(:role_update_btn_set)
 
-      - rules.each_pair do |rule, value|
-        .rule
-          %h4
-            →
-            = rule
-          .controls
-            .btn-group
-              - klass = value ? :success : :info
-              - 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 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 t('.delete_rule'), destroy_rule_admin_role_section_path(role, section, :name => rule), method: :delete, data: { confirm: t(".rule_delete_confirm") }
+        .row
+          .col-md-12
+            %h5.holder
+              = t '.title'
+              %span.a= role.title
+              %span.b{ style: hidden }
+                .form-group= f.text_field :title, class: "form-control"
+                = yield(:role_update_btn_set)
 
-  %h4= t '.create_section'
+        .row
+          .col-md-12
+            %h5.holder
+              = t '.role_description'
+              %span.a= role.description
+              %span.b{ style: hidden }
+                .form-group= f.text_field :description, class: "form-control"
+                = yield(:role_update_btn_set)
 
-  = form_tag admin_role_sections_path(role), class: 'well form-inline' do |f|
-    = text_field_tag :section_name, '', class: 'input-xlarge', :placeholder => t('.new_section_placeholder')
-    = submit_tag t('.create_section'), class: :btn
+  .panel.panel-primary
+    .panel-heading Role rules
+    .panel-body
+      - role.to_hash.each_pair do |section, rules|
+        .panel.panel-info
+          .panel-heading
+            .row
+              .col-md-9
+                %h5= section
+              .col-md-3
+                .delete
+                  .btn-group
+                    = button_to t('.delete_section'), admin_role_section_path(role, section), method: :delete, class: 'btn btn-danger', data: { confirm: t('.section_delete_confirm') }
 
-  %h4= t '.create_rule'
+          .panel-body
+            .rules
+              - rules.each_pair do |rule, value|
+                .row
+                  .col-md-9
+                    %h4
+                      →
+                      = rule
+                  .col-md-3
+                    .controls
+                      .btn-group
+                        - klass = value ? :success : :info
+                        - 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 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 t('.delete_rule'), destroy_rule_admin_role_section_path(role, section, :name => rule), method: :delete, data: { confirm: t(".rule_delete_confirm") }
 
-  = form_tag create_rule_admin_role_sections_path(role), class:  'well form-inline' do |f|
-    %select.span3{ :name => :section_name }
-      - role.to_hash.each_pair do |section, rules|
-        %option{ :value => section }= section
+  .panel.panel-success
+    .panel-heading
+      = t '.create_section'
+    .panel-body
+      = form_tag admin_role_sections_path(role), class: "form-inline"do |f|
+        .form-group
+          = text_field_tag :section_name, '', class: "form-control", placeholder: t('.new_section_placeholder')
+        = submit_tag t('.create_section'), class: "btn btn-success"
 
-    = text_field_tag :rule_name, '', class:  'input-large', :placeholder => t('.new_rule_placeholder')
-    = submit_tag t('.create_rule'), class:  :btn
+  .panel.panel-success
+    .panel-heading
+      = t '.create_rule'
+    .panel-body
+      = form_tag create_rule_admin_role_sections_path(role), role: :form, class: "form-inline" do |f|
+        .form-group
+          %select.form-control{ name: :section_name }
+            - role.to_hash.each_pair do |section, rules|
+              %option{ value: section }= section
+        .form-group
+          = text_field_tag :rule_name, '', class: "form-control", placeholder: t('.new_rule_placeholder')
+        = submit_tag t('.create_rule'), class: "btn btn-success"

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

@@ -1,11 +1,18 @@
 - content_for :role_sidebar do
-  %h3= link_to raw('← Home'), root_path
-  %br
-  %h3= t '.roles_list'
-  - (@roles || Role.all).each do |role|
-    %p
-      = link_to role.title, edit_admin_role_url(role)
-      (#{role.users.count})
-      = link_to raw('×'), admin_role_url(role), :method => :delete, :title => role.title, :confirm => t('.delete_role_confirm'), :class => :delete
+  .panel.panel-primary
+    .panel-heading Role Nav
+    .panel-body
+      %h4= link_to raw('← Home'), root_path
 
-  %p.new= link_to t('.new_role'),  new_admin_role_path
+  .panel.panel-primary
+    .panel-heading= t '.roles_list'
+    .panel-body
+  
+      - (@roles || Role.all).each do |role|
+        %p
+          = link_to role.title, edit_admin_role_url(role)
+          (#{role.users.count})
+          = link_to admin_role_url(role), method: :delete, title: role.title, confirm: t('.delete_role_confirm'), class: :delete do
+            %i.icon-remove.glyphicon.glyphicon-remove
+
+      %p.new= link_to t('.new_role'),  new_admin_role_path

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

@@ -1,24 +1,25 @@
 = render partial: 'sidebar'
 
 - content_for :role_main do
-  .well
+  - unless @role.errors.blank?
     - @role.errors.each do |field, message|
-      %p
-        = field
+      .alert.alert-danger
+        %b= t(".#{field}")
         \:
         = message
 
-    .form
-      %h3= raw t('.create')
+  .panel.panel-success
+    .panel-heading= raw t('.create')
 
-      = form_for(@role, :url => admin_roles_path) do |f|
+    .panel-body
+      = form_for(@role, url: admin_roles_path, role: :form) do |f|
         %label= t('.name')
-        %p= f.text_field :name
+        %p= f.text_field :name, class: "form-control"
 
         %label= t('.title')
-        %p= f.text_field :title
+        %p= f.text_field :title, class: "form-control"
 
         %label= t('.description')
-        %p= f.text_field :description
+        %p= f.text_field :description, class: "form-control"
 
-        = f.submit t('.create'), :class => :btn
+        = f.submit t('.create'), class: "btn btn-success"

data/config/locales/en.yml

@@ -14,6 +14,7 @@ en:
     section_not_deleted:      Section not deleted
     section_rule_deleted:     "Section rule deleted"
     section_rule_not_deleted: "Section rule not deleted"
+    access_denied: "Access Denied"
 
   admin:
     roles:

data/config/locales/es.yml

@@ -1,42 +1,42 @@
 es:
   the_role:
-    role_created: Establecer el rol
-    role_updated: Actualizar el rol
-    role_deleted: Eliminar el rol
-    section_created: Crear sección
+    role_created: Rol creado
+    role_updated: Rol actualizado
+    role_deleted: Rol eliminado
+    section_created: Sección creada
     section_not_created: Sección no creada
-    section_rule_created: Sección de roles creado
-    section_rule_not_created: Sección de roles no creado
-    section_rule_on: Rol de acceso incluye
-    section_rule_off: Deshabilitar el rol
-    state_not_changed: Rol de estado no se ha modificado
-    section_deleted: sección eliminada
-    section_not_deleted: Sección no se ha sido eliminada
-    section_rule_deleted: Regla eliminada
-    section_rule_not_deleted: Regla no ha sido eliminada
+    section_rule_created: Regla de sección creada
+    section_rule_not_created: Regla de sección no creada
+    section_rule_on: Regla de sección activada
+    section_rule_off: Regla de sección desactivada
+    state_not_changed: Regla de sección no modificada
+    section_deleted: Sección eliminada
+    section_not_deleted: Sección no eliminada
+    section_rule_deleted: Regla de sección eliminada
+    section_rule_not_deleted: Regla de sección no eliminada
 
   admin:
     roles:
       new:
-        create: Crear un nuevo rol
-        name: El nombre de la función (una cadena de caracteres simples + subrayado)
-        title: título del rol
+        create: Crear nuevo rol
+        name: Nombre del rol (cadena de caracteres simples + guión bajo)
+        title: Título del rol
         description: Descripción del rol
       role:
-        role_name: 'Nombre del rol'
-        title: 'Título'
-        role_description: 'Descripción'
+        role_name: 'Nombre del rol:'
+        title: 'Título:'
+        role_description: 'Descripción del rol:'
         delete_section: Eliminar sección
-        section_delete_confirm: "¿Quiere borrar la sección?"
-        rule_delete_confirm: "¿Quieres eliminar una regla?"
-        enable: Habilitar
+        section_delete_confirm: "¿Quieres borrar la sección?"
+        rule_delete_confirm: "¿Quieres eliminar la regla?"
+        enable: Activar
         disable: Desactivar
         delete_rule: Eliminar regla
-        new_section_placeholder: Nombre de un nuevo tema
-        create_section: "Crear una sección"
-        new_rule_placeholder: El nombre de la nueva regla
-        create_rule: Nueva regla
+        new_section_placeholder: Nombre de la nueva sección
+        create_section: Crear nueva sección
+        new_rule_placeholder: Nombre de la nueva regla
+        create_rule: Crear nueva regla
       sidebar:
-        roles_list: Lista de funciones
+        roles_list: Lista de roles
         new_role: Crear nuevo rol
-        delete_role_confirm: "Quitar el rol? Puede ser peligroso! ¿Está seguro?"
+        delete_role_confirm: "¿Estás seguro? ¡Puede ser peligroso!"

data/config/locales/ru.yml

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

data/db/migrate/20111025025129_create_roles.rb

@@ -5,7 +5,13 @@ class CreateRoles < ActiveRecord::Migration
       t.string :name,        :null => false
       t.string :title,       :null => false
       t.text   :description, :null => false
-      t.text   :the_role,    :null => false
+      #Use Postgresql's native json
+      #Remove this test if you using PostgreSQL prior to 9.2
+      if   ::ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        t.json :the_role, :null => false
+      else
+        t.text :the_role, :null => false
+      end
 
       t.timestamps
     end

data/lib/generators/the_role/USAGE

@@ -12,7 +12,7 @@ Generators:
   > bundle exec rails g the_role install
   - Install config file and models
 
-  > bundle exec rails g the_role setup
+  > bundle exec rails g the_role config
   - Install config file
 
   > bundle exec rails g the_role models

data/lib/generators/the_role/templates/the_role.rb

@@ -1,6 +1,11 @@
 # TheRole.config.param_name => value
 
 TheRole.configure do |config|
-  config.layout            = :application # default Layout for TheRole UI
-  config.default_user_role = nil          # set default role (name)
+  # config.layout                     = :application
+
+  # config.default_user_role          = nil
+  # config.first_user_should_be_admin = false
+  # config.access_denied_method       = :access_denied
+  # config.login_required_method      = :authenticate_user!
+  # config.destroy_strategy           = :restrict_with_exception # can be nil
 end

data/lib/generators/the_role/the_role_generator.rb

@@ -4,10 +4,10 @@ class TheRoleGenerator < Rails::Generators::NamedBase
 
   def generate_controllers
     if gen_name == 'install'
-      cp_setup
+      cp_config
       cp_models
-    elsif gen_name == 'setup'
-      cp_setup
+    elsif gen_name == 'config'
+      cp_config
     elsif gen_name == 'models'
       cp_models
     elsif gen_name == 'admin'
@@ -20,15 +20,18 @@ class TheRoleGenerator < Rails::Generators::NamedBase
 
   private
 
+  def root_path; TheRole::Engine.root; end
+
   def gen_name
     name.to_s.downcase
   end
 
   def cp_models
-    copy_file 'role.rb', 'app/models/role.rb'
+    copy_file "#{root_path}/app/models/_templates_/role.rb",
+              "app/models/role.rb"
   end
 
-  def cp_setup
+  def cp_config
     copy_file 'the_role.rb', 'config/initializers/the_role.rb'
   end
 

data/lib/tasks/roles.rake

@@ -8,7 +8,7 @@ namespace :db do
       puts 'TheRole'
       puts '~'*40
 
-      TheRole.create_admin
+      TheRole.create_admin!
 
       puts "Now you can makes any user as Admin:"
       puts "> rails c"

data/lib/the_role/activerecord.rb

@@ -0,0 +1,11 @@
+module TheRole
+  module ActiveRecord
+    def has_role
+      include TheRole::User
+    end
+
+    def acts_as_role
+      include TheRole::Role
+    end
+  end
+end

data/lib/the_role/config.rb

@@ -11,13 +11,20 @@ module TheRole
   class Configuration
     include ActiveSupport::Configurable
     config_accessor :layout,
+                    :destroy_strategy,
                     :default_user_role,
+                    :access_denied_method,
+                    :login_required_method,
                     :first_user_should_be_admin
   end
 
   configure do |config|
     config.layout                     = :application
+
     config.default_user_role          = nil
     config.first_user_should_be_admin = false
+    config.access_denied_method       = :access_denied
+    config.login_required_method      = :authenticate_user!
+    config.destroy_strategy           = :restrict_with_exception # can be nil
   end
 end

data/lib/the_role/version.rb

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

data/lib/the_role.rb

@@ -4,14 +4,15 @@ require 'the_role/hash'
 require 'the_role/config'
 require 'the_role/version'
 require 'the_role/param_helper'
+require 'the_role/activerecord'
 
 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"
+    def create_admin_role!
+      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)
@@ -27,4 +28,17 @@ module TheRole
     # http://stackoverflow.com/questions/6279325/adding-to-rails-autoload-path-from-gem
     # config.to_prepare do; end
   end
+end
+
+_root_ = File.expand_path('../../',  __FILE__)
+
+# Loading of concerns
+require "#{_root_}/app/controllers/concerns/controller.rb"
+
+%w[ base role user ].each do |concern|
+  require "#{_root_}/app/models/concerns/#{concern}.rb"
+end
+
+if defined?(ActiveRecord::Base)
+  ActiveRecord::Base.extend TheRole::ActiveRecord
 end

data/spec/dummy_app/.gitignore

@@ -0,0 +1,18 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.db
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+.rvmrc
+/log/*.log
+/tmp

data/spec/dummy_app/.rspec

@@ -0,0 +1 @@
+--color

data/spec/dummy_app/Gemfile

@@ -0,0 +1,32 @@
+source 'https://rubygems.org'
+
+gem 'rails', '~> 4.0.0'
+gem 'rake',  '~> 10.0.4'
+
+gem 'sqlite3'
+gem 'state_machine', '~> 1.2.0'
+gem 'devise', git: 'https://github.com/plataformatec/devise.git'
+
+gem 'sprockets-rails', github: 'rails/sprockets-rails'
+gem 'coffee-rails',    github: 'rails/coffee-rails'
+gem 'sass-rails',      github: 'rails/sass-rails'
+
+gem 'bootstrap-sass', github: 'thomas-mcdonald/bootstrap-sass'
+
+gem 'faker'
+gem 'uglifier'
+
+gem 'jquery-rails'
+gem 'jbuilder', '~> 1.0.1'
+
+gem 'the_role' , path: '../../'
+gem 'haml' ,     git: 'https://github.com/haml/haml.git', tag: '4.0.1'
+
+group :test do
+  gem 'factory_girl_rails', '~> 4.0'
+  gem 'database_cleaner', git: 'https://github.com/bmabey/database_cleaner.git', tag: 'v1.0.0'
+
+  gem 'rspec', '2.14.1'
+  gem 'rspec-core', '2.14.4'
+  gem 'rspec-rails', '2.14.0'
+end

data/spec/dummy_app/README.md

@@ -0,0 +1,39 @@
+## TheRole test App
+
+App for development and testing TheRole gem
+
+### How to get?
+
+```
+git clone git@github.com:the-teacher/the_role.git
+
+cd the_role/spec/the_role_on_devise/
+
+bundle
+```
+
+### Start it!
+
+```
+rake db:test_launch
+
+rails s
+```
+
+### Test it!
+
+```
+rake db:bootstrap RAILS_ENV=test
+rspec --format documentation
+
+rspec spec/models/ --format documentation
+```
+
+### Production mode
+
+```
+rake assets:build   RAILS_ENV=production
+rake db:test_launch RAILS_ENV=production
+
+rails s -e production
+```

data/spec/dummy_app/Rakefile

@@ -0,0 +1,6 @@
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+require File.expand_path('../config/application', __FILE__)
+
+Rails.application.load_tasks

data/spec/dummy_app/app/assets/javascripts/application.js

@@ -0,0 +1,17 @@
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
+//= require jquery
+//= require jquery_ujs
+
+//= require bootstrap
+//= require the_role_editinplace

data/spec/dummy_app/app/assets/stylesheets/app/style.css.scss

@@ -0,0 +1,23 @@
+.header{
+  margin: 10px 0;
+  background-color: #DCEAF4;
+  padding: 5px 10px 10px 10px;
+  border-radius: 5px;
+}
+
+.manage_panel, .main_content{
+  background-color: #DCEAF4;
+  padding: 5px 10px 10px 10px;
+  border-radius: 5px;
+}
+
+.main_content{
+  h1{
+    padding-bottom: 10px;
+    border-bottom: 1px solid gray;
+  }
+}
+
+.edit_role{
+  input{ margin: 0; }
+}

data/spec/dummy_app/app/assets/stylesheets/application.css

@@ -0,0 +1,3 @@
+/*
+  //= require bootstrap
+*/