the_role 1.5.1 → 1.6.0

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

@@ -1,42 +1,2 @@
-- content_for :title do
-  = t('.title')
-
-- 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')
+= render :partial => 'sidebar'
+= render :partial => 'role', :locals => { :role => @role }

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

@@ -1,15 +1,2 @@
-- content_for :css do
-  = stylesheet_link_tag   'the_role/style'
-  = stylesheet_link_tag   'the_role/headers'
-  = stylesheet_link_tag   'the_role/form'
-
-.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
+= render :partial => 'sidebar'
+= render :partial => 'role', :locals => { :role => @roles.first }

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

@@ -1,6 +1,6 @@
-.the_role
-  %p= link_to raw(t('.back')),  admin_roles_path
+= render :partial => 'sidebar'
 
+.well
   - @role.errors.each do |field, message|
     %p
       = field
@@ -8,7 +8,8 @@
       = message
 
   .form
-    %h5= raw t('.create')
+    %h3= raw t('.create')
+
     = form_for(@role, :url => admin_roles_path) do |f|
       %label= t('.name')
       %p= f.text_field :name
@@ -19,4 +20,4 @@
       %label= t('.description')
       %p= f.text_field :description
 
-      = f.submit t('.new')
+      = f.submit t('.new'), :class => :btn

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

@@ -0,0 +1,24 @@
+!!! 5
+%html
+  %head
+    %meta{ :charset => 'utf-8' }
+    %title Bye bye, CanCan, I got the Role!
+    = stylesheet_link_tag    'admin_the_role'
+    = javascript_include_tag 'admin_the_role'
+    = csrf_meta_tags
+  %body
+    .the_role
+      %h3
+        = link_to 'The Role', 'https://github.com/the-teacher/the_role'
+        \|
+        Role system for Rails Apps
+        \|
+        User: #{current_user.try(:name) || current_user.id}
+    .crusty
+      .container
+        .row
+          .span3
+            .sidebar= yield :sidebar
+          .span9
+            .content= yield
+    

data/config/routes.rb

@@ -1,12 +1,16 @@
 Rails.application.routes.draw do
   namespace :admin do
-    resources :roles do
+    resources :roles, :except => :show do
       resources :sections, :controller => :role_sections, :only => :none do
         collection do
           post :create
           post :create_rule
         end
+
         member do
+          put :rule_on
+          put :rule_off
+
           delete :destroy
           delete :destroy_rule
         end

data/lib/the_role/engine.rb

@@ -8,5 +8,5 @@ module TheRole
       User.send :include, TheRole::UserModel if the_class_exists? :User
       ApplicationController.send :include, TheRole::Requires if the_class_exists? :ApplicationController
     end
-  end#Engine
-end#TheRole
+  end
+end

data/lib/the_role/hash.rb

@@ -1,29 +1,65 @@
+# load 'the_role/hash.rb' - UPDATE, BUT NOT RELOAD [for console testing]
+
 class Hash
-  # load 'the_role/hash.rb' - UPDATE, BUT NOT RELOAD
+  # Puts message about potential compatibility problem
+  if respond_to? :underscorify_keys
+    puts "\nWARNING!\nHASH#underscorify_keys detected.\nIf now it's native active_support/core_ext/hash method,\nyou should to create new issue for https://github.com/the-teacher/the_role\n\n"
+  end
 
-  # {'a b' => 1, "x y" => {'hello' => 1, :hello => 2} }.underscorify_keys => {:a_b=>1, :x_y=>{:hello=>2}}
-  def underscorify_keys
-    hash = {}
-    self.each do |key, value|
-      new_key       = key.to_s.parameterize.underscore.to_sym
-      hash[new_key] = self[key].is_a?(Hash) ? self[key].underscorify_keys : value
+  # RAILS 4 like methods for RAILS 3
+  # DEEP TRANSFORM HELPER METHODS
+  unless respond_to? :deep_transform_keys
+    def deep_transform_keys(&block)
+      result = {}
+      each do |key, value|
+        result[yield(key)] = value.is_a?(Hash) ? value.deep_transform_keys(&block) : value
+      end
+      result
     end
-    hash
+
+    def deep_transform_keys!(&block)
+      keys.each do |key|
+        value = delete(key)
+        self[yield(key)] = value.is_a?(Hash) ? value.deep_transform_keys!(&block) : value
+      end
+      self
+    end
+    puts "TheRole => RAILS 4 like method **deep_transform_keys** mixed to HASH class"
   end
 
-  def deep_reset(default = false)
-    hash = dup
-    hash.each do |key, value|
-      hash[key] = hash[key].is_a?(Hash) ? hash[key].deep_reset(default) : default
+  # RAILS 4 like methods for RAILS 3
+  # DEEP TRANSFORM HELPER METHODS
+  unless respond_to? :deep_stringify_keys
+    def deep_stringify_keys
+      deep_transform_keys{ |key| key.to_s }
     end
-    hash
+
+    def deep_stringify_keys!
+      deep_transform_keys!{ |key| key.to_s }
+    end
+    puts "TheRole => RAILS 4 like method **deep_stringify_keys** mixed to HASH class"
+  end
+
+  # Potential compatibility problem with RAILS_VERSION > 4.0
+  # But I hope nobody will create function with this name
+  def underscorify_keys
+    deep_transform_keys{ |key| TheRole::ParamHelper.prepare(key) }
   end
 
   def underscorify_keys!
     replace underscorify_keys
   end
 
-  def deep_reset!(default = false)
+  # DEEP RESET VALUES
+  def deep_reset(default = nil)
+    hash = dup
+    hash.each do |key, value|
+      hash[key] = hash[key].is_a?(Hash) ? hash[key].deep_reset(default) : default
+    end
+    hash
+  end
+
+  def deep_reset!(default = nil)
     replace deep_reset(default)
   end
 end

data/lib/the_role/modules/base.rb

@@ -4,8 +4,8 @@ module TheRole
       hash         =  role_hash
       section_name =  param_prepare(section_name)
       rule_name    =  param_prepare(rule_name)
-      return true  if hash[:system]    and hash[:system][:administrator]
-      return true  if hash[:moderator] and hash[:moderator][section_name]
+      return true  if hash['system']    and hash['system']['administrator']
+      return true  if hash['moderator'] and hash['moderator'][section_name]
       return false unless hash[section_name]
       return false unless hash[section_name].key? rule_name
       hash[section_name][rule_name]
@@ -13,11 +13,11 @@ module TheRole
 
     def moderator? section_name
       section_name = param_prepare(section_name)
-      has_role? section_name, :any_crazy_name
+      has_role? section_name, 'any_crazy_name'
     end
 
     def admin?
-      has_role? :any_crazy_name, :any_crazy_name
+      has_role? 'any_crazy_name', 'any_crazy_name'
     end
   end
 end

data/lib/the_role/modules/controller_requires.rb

@@ -1,28 +1,17 @@
 module TheRole
   module Requires
     private
-    
       def role_access_denied
         flash[:error] = t('the_role.access_denied')
         redirect_to root_path
       end
-      
-      # before_filter :role_require
-      def role_require
-        role_access_denied unless current_user.has_role?(controller_name, action_name)
-      end
 
-      # before_filter :simple_object_finder
-      # define class variable for *owner_require* filter with Controller class name
-      # @object_for_ownership_checking = @article
-      def simple_object_finder
-        variable_name                  = self.class.to_s.tableize.split('_').first.singularize.split('/').last
-        @object_for_ownership_checking = self.instance_variable_get("@#{variable_name}")
+      def role_required
+        role_access_denied unless current_user.has_role?(controller_name, action_name)
       end
 
-      # before_filter :owner_require
-      def owner_require
-        role_access_denied unless current_user.owner?(@object_for_ownership_checking)
+      def owner_required
+        role_access_denied unless current_user.owner?(@ownership_checking_object)
       end
   end
 end

data/lib/the_role/modules/role_model.rb

@@ -17,9 +17,10 @@ module TheRole
         validates :name,        :presence => true, :uniqueness => true
         validates :title,       :presence => true, :uniqueness => true
         validates :description, :presence => true
+
         before_create do
-          self.name     = param_prepare(name) 
-          self.the_role = {}.to_yaml
+          self.name     = param_prepare(name)
+          self.the_role = {}.to_json if self.the_role.blank?
         end
 
         # C
@@ -31,7 +32,7 @@ module TheRole
           return false if section_name.blank?
           return true  if role[section_name]
           role[section_name] = {}
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
                 
         def create_rule section_name, rule_name
@@ -41,16 +42,16 @@ module TheRole
           section_name =  param_prepare(section_name)
           return true  if role[section_name][rule_name]
           role[section_name][rule_name] = false
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
 
         # R
 
         def to_hash
-          begin YAML::load(the_role) rescue {} end
+          begin JSON.load(the_role) rescue {} end
         end
 
-        def to_yaml
+        def to_json
           the_role
         end
 
@@ -62,14 +63,14 @@ module TheRole
 
         # source_hash will be reset to false
         # except true items from new_role_hash
-        # all keys will become symbols
+        # all keys will become 'strings'
         # look at lib/the_role/hash.rb to find definition of *underscorify_keys* method
         def update_role new_role_hash
           new_role_hash = new_role_hash.try(:to_hash) || {}
           new_role      = new_role_hash.underscorify_keys
-          role          = to_hash.underscorify_keys.deep_reset
+          role          = to_hash.underscorify_keys.deep_reset(false)
           role.deep_merge! new_role
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
 
         def rule_on section_name, rule_name
@@ -80,7 +81,7 @@ module TheRole
           return false unless role[section_name].key? rule_name
           return true  if     role[section_name][rule_name]
           role[section_name][rule_name] = true
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
 
         def rule_off section_name, rule_name
@@ -91,7 +92,7 @@ module TheRole
           return false unless role[section_name].key? rule_name
           return true  unless role[section_name][rule_name]
           role[section_name][rule_name] = false
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
 
         # D
@@ -103,7 +104,7 @@ module TheRole
           return false if section_name.blank?
           return false unless role[section_name]
           role.delete  section_name
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
 
         def delete_rule section_name, rule_name
@@ -113,7 +114,7 @@ module TheRole
           return false unless role[section_name]
           return false unless role[section_name].key? rule_name
           role[section_name].delete rule_name
-          update_attributes(:the_role => role.to_yaml)
+          update_attributes(:the_role => role.to_json)
         end
       end
     end

data/lib/the_role/param_helper.rb

@@ -0,0 +1,15 @@
+require "active_support/inflector"
+
+# TheRole::ParamHelper.prepare 'hello world'
+
+module TheRole
+  module ParamHelper
+    def param_prepare param
+      param.to_s.parameterize.underscore
+    end
+
+    def self.prepare param
+      param.to_s.parameterize.underscore
+    end
+  end
+end

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 end

data/lib/the_role.rb

@@ -1,16 +1,18 @@
-require "haml"
-require "sass"
+require 'haml'
+require 'sass'
+require 'less-rails'
 
-require "the_role/hash"
-require "the_role/engine"
-require "the_role/version"
-require "the_role/the_class_exists"
+require 'the_role/param_helper'
+require 'the_role/hash'
 
-require "the_role/modules/base"
-require "the_role/modules/param_helper"
-require "the_role/modules/user_model"
-require "the_role/modules/role_model"
-require "the_role/modules/controller_requires"
+require 'the_role/engine'
+require 'the_role/version'
+require 'the_role/the_class_exists'
+
+require 'the_role/modules/base'
+require 'the_role/modules/user_model'
+require 'the_role/modules/role_model'
+require 'the_role/modules/controller_requires'
 
 module TheRole
   # include TheRole::Base

data/the_role.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Ilya N. Zykin"]
   s.email       = ["zykin-ilya@ya.ru"]
   s.homepage    = "https://github.com/the-teacher/the_role"
-  s.summary     = %q{TheRole, Role system with Web Interface, aka CanCan killer}
-  s.description = %q{TheRole, Role system with Web Interface, aka CanCan killer}
+  s.summary     = %q{Authorization lib for Rails 3 with Web Interface, aka CanCan killer}
+  s.description = %q{Authorization lib for Rails 3 with Web Interface, aka CanCan killer}
 
   s.rubyforge_project = "the_role"
 
@@ -22,4 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sass'
   s.add_dependency 'sass-rails'
   s.add_dependency 'coffee-rails'
+  # less for tw bootstrap 
+  s.add_dependency 'therubyracer'
+  s.add_dependency 'less-rails'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-05 00:00:00.000000000Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &73560920 !ruby/object:Gem::Requirement
+  requirement: &20233640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73560920
+  version_requirements: *20233640
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &73560710 !ruby/object:Gem::Requirement
+  requirement: &20327080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73560710
+  version_requirements: *20327080
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &73560500 !ruby/object:Gem::Requirement
+  requirement: &20326120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73560500
+  version_requirements: *20326120
 - !ruby/object:Gem::Dependency
   name: coffee-rails
-  requirement: &73560290 !ruby/object:Gem::Requirement
+  requirement: &20324120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,8 +54,30 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *73560290
-description: TheRole, Role system with Web Interface, aka CanCan killer
+  version_requirements: *20324120
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: &20323460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *20323460
+- !ruby/object:Gem::Dependency
+  name: less-rails
+  requirement: &20322540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *20322540
+description: Authorization lib for Rails 3 with Web Interface, aka CanCan killer
 email:
 - zykin-ilya@ya.ru
 executables: []
@@ -64,19 +86,39 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc.example
+- Bye_bye_CanCan_I_got_the_Role.png
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/stylesheets/the_role/form.css
-- app/assets/stylesheets/the_role/headers.css.scss
-- app/assets/stylesheets/the_role/style.css.scss
+- app/assets/javascripts/admin_the_role.js
+- app/assets/javascripts/bootstrap-dropdown.js
+- app/assets/stylesheets/admin_the_role.css
+- app/assets/stylesheets/alerts.less
+- app/assets/stylesheets/button-groups.less
+- app/assets/stylesheets/buttons.less
+- app/assets/stylesheets/custom.scss
+- app/assets/stylesheets/dropdowns.less
+- app/assets/stylesheets/forms.less
+- app/assets/stylesheets/grid.less
+- app/assets/stylesheets/headers.scss
+- app/assets/stylesheets/layouts.less
+- app/assets/stylesheets/mix.scss
+- app/assets/stylesheets/mixins.less
+- app/assets/stylesheets/reset.css
+- app/assets/stylesheets/role_set.less
+- app/assets/stylesheets/scaffolding.less
+- app/assets/stylesheets/variables.less
+- app/assets/stylesheets/wells.less
 - app/controllers/admin/role_sections_controller.rb
 - app/controllers/admin/roles_controller.rb
 - app/views/admin/roles/_form.haml
+- app/views/admin/roles/_role.html.haml
+- app/views/admin/roles/_sidebar.html.haml
 - app/views/admin/roles/edit.html.haml
 - app/views/admin/roles/index.haml
 - app/views/admin/roles/new.html.haml
+- app/views/layouts/the_role.html.haml
 - config/locales/en.yml
 - config/locales/ru.yml
 - config/routes.rb
@@ -87,9 +129,9 @@ files:
 - lib/the_role/hash.rb
 - lib/the_role/modules/base.rb
 - lib/the_role/modules/controller_requires.rb
-- lib/the_role/modules/param_helper.rb
 - lib/the_role/modules/role_model.rb
 - lib/the_role/modules/user_model.rb
+- lib/the_role/param_helper.rb
 - lib/the_role/the_class_exists.rb
 - lib/the_role/version.rb
 - pic.png
@@ -117,5 +159,5 @@ rubyforge_project: the_role
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
-summary: TheRole, Role system with Web Interface, aka CanCan killer
+summary: Authorization lib for Rails 3 with Web Interface, aka CanCan killer
 test_files: []

data/app/assets/stylesheets/the_role/form.css

@@ -1,57 +0,0 @@
-.the_role{
-  .the_form{
-    background:#EEE;
-    padding:5px;
-    margin:0 0 15px 0;
-    border:2px solid gray;
-    -moz-border-radius:5px;
-  }
-  .the_form label{
-    display:block;
-  }
-  .the_form .input{
-    border:1px solid #000;
-    padding:2px 0 2px 5px;
-    font-size:13pt;
-    color:DarkBlue;
-  }
-  .the_form .textarea{
-    font-size:13pt;
-    padding:2px;
-  }
-  .the_form .message_textarea{
-    font-size:13pt;
-    padding:2px;
-    border:1px solid black;
-    height: 200px;
-  }
-  .the_form .submit{
-    font-size:16pt;
-  }
-  .article_buttons{
-    margin:0 0 10px 0;
-    padding:0 0 5px 0;
-    border-bottom:1px dashed gray;
-  }
-  .article_buttons input{
-    margin-right:10px;
-  }
-  .submit_button{
-    margin-bottom:10px;
-  }
-  .moderation_buttons{
-    background:silver;
-    margin:3px 3px 10px 3px;
-    padding:5px;
-    border:2px solid blue;
-  }
-  .delete_button{
-    background: none repeat scroll 0 0 lightGrey;
-    border: 1px dashed gray;
-    padding: 5px 0;
-    text-align: right;
-  }
-  .delete_button input{
-    color:Crimson;
-  } 
-}

data/app/assets/stylesheets/the_role/headers.css.scss

@@ -1,15 +0,0 @@
-.the_role{
-  h1,h2,h3,h4,h5,h6{
-    font-family: Verdana, Arial;
-    color:#333;
-    font-weight:normal;
-    line-height:100%;
-    margin-bottom:15px;
-  }
-  h1{font-size:3em;}
-  h2{font-size:2.8em;}
-  h3{font-size:2.6em;}
-  h4{font-size:2.4em;}
-  h5{font-size:2.2em;}
-  h6{font-size:2em;}  
-}