the_role 1.7.0 → 2.0.0

data/app/models/concerns/the_role_user_model.rb

@@ -0,0 +1,45 @@
+module TheRoleUserModel
+  extend ActiveSupport::Concern
+
+  include TheRoleBase
+
+  included do
+    belongs_to :role
+    before_validation :set_default_role, on: :create
+    after_save { |user| user.instance_variable_set(:@role_hash, nil) }
+  end
+
+  module ClassMethods
+    def with_role name
+      Role.where(name: name).first.users
+    end
+  end
+
+  def role_hash; @role_hash ||= role.try(:to_hash) || {} end
+
+  # FALSE if object is nil
+  # If object is a USER - check for youself
+  # Check for owner field - :user_id
+  # Check for owner _object_ if owner field is not :user_id
+  def owner? obj
+    return false unless obj
+    return true  if admin?
+
+    section_name = obj.class.to_s.tableize
+    return true  if moderator?(section_name)
+
+    return id == obj.id          if obj.is_a?(User)
+    return id == obj[:user_id]   if obj[:user_id]
+    return id == obj[:user][:id] if obj[:user]
+    false
+  end
+
+  private
+
+  def set_default_role
+    unless role
+      default_role = Role.where(name: TheRole.config.default_user_role).first
+      self.role = default_role if default_role
+    end
+  end
+end

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

@@ -1,53 +1,54 @@
-.well
-  %h3
-    %b= t '.role_name'
-    = role.name
-
-  %h5
-    %b= t '.title'
-    = role.title
-
-  %p.description
-    %b= t '.role_description'
-    = role.description
-
-- 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', :confirm => t('.section_delete_confirm')
-
-    - 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, :confirm => t('.rule_delete_confirm')
-
-%h4= t '.create_section'
-
-= 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
-
-%h4= t '.create_rule'
-
-= 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
-
-  = text_field_tag :rule_name, '', :class => 'input-large', :placeholder => t('.new_rule_placeholder')
-  = submit_tag t('.create_rule'), :class => :btn
+- content_for :role_main do
+  .well
+    %h3
+      %b= t '.role_name'
+      = role.name
+
+    %h5
+      %b= t '.title'
+      = role.title
+
+    %p.description
+      %b= t '.role_description'
+      = role.description
+
+  - 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', :confirm => t('.section_delete_confirm')
+
+      - 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, :confirm => t('.rule_delete_confirm')
+
+  %h4= t '.create_section'
+
+  = 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
+
+  %h4= t '.create_rule'
+
+  = 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
+
+    = 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

@@ -1,8 +1,11 @@
-- content_for :sidebar do
+- 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
 
   %p.new= link_to t('.new_role'),  new_admin_role_path

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

@@ -1,2 +1,2 @@
-= render :partial => 'sidebar'
-= render :partial => 'role', :locals => { :role => @role }
+= render partial: 'sidebar'
+= render partial: 'role', locals: { role: @role }

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

@@ -1,2 +1,2 @@
-= render :partial => 'sidebar'
-= render :partial => 'role', :locals => { :role => @roles.first }
+= render partial: 'sidebar'
+= render partial: 'role', locals: { role: @roles.first }

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

@@ -1,23 +1,24 @@
-= render :partial => 'sidebar'
+= render partial: 'sidebar'
 
-.well
-  - @role.errors.each do |field, message|
-    %p
-      = field
-      \:
-      = message
+- content_for :role_main do
+  .well
+    - @role.errors.each do |field, message|
+      %p
+        = field
+        \:
+        = message
 
-  .form
-    %h3= raw t('.create')
+    .form
+      %h3= raw t('.create')
 
-    = form_for(@role, :url => admin_roles_path) do |f|
-      %label= t('.name')
-      %p= f.text_field :name
+      = 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('.title')
+        %p= f.text_field :title
 
-      %label= t('.description')
-      %p= f.text_field :description
+        %label= t('.description')
+        %p= f.text_field :description
 
-      = f.submit t('.create'), :class => :btn
+        = f.submit t('.create'), :class => :btn

data/lib/generators/the_role/USAGE

@@ -0,0 +1,19 @@
+---------------------------------------
+TheRole
+---------------------------------------
+
+Description:
+  This generators helps to install TheRole gem into your Application
+
+This text:
+  bundle exec rails g the_role --help
+
+Generators:
+  bundle exec rails g the_role install
+
+Migrations:
+  bundle exec rake the_role_engine:install:migrations
+
+---------------------------------------
+TheRole
+---------------------------------------

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

@@ -0,0 +1,5 @@
+# TheRole.config.param_name => value
+
+TheRole.configure do |config|
+  config.layout = 'the_role'
+end

data/lib/generators/the_role/the_role_generator.rb

@@ -0,0 +1,23 @@
+class TheRoleGenerator < Rails::Generators::NamedBase
+  source_root File.expand_path('../templates', __FILE__)
+  # argument :xname, type: :string, default: :xname
+
+  def generate_controllers
+    if gen_name == 'install'
+      cp_setup
+    else
+      puts 'TheComments Generator - wrong Name'
+      puts 'Try to use install'
+    end
+  end
+
+  private
+
+  def gen_name
+    name.to_s.downcase
+  end
+
+  def cp_setup
+    copy_file 'the_role.rb', 'config/initializers/the_role.rb'
+  end
+end

data/lib/the_role/config.rb

@@ -0,0 +1,20 @@
+module TheRole
+  def self.configure(&block)
+    yield @config ||= TheRole::Configuration.new
+  end
+
+  def self.config
+    @config
+  end
+
+  # Configuration class
+  class Configuration
+    include ActiveSupport::Configurable
+    config_accessor :layout, :default_user_role
+  end
+
+  configure do |config|
+    config.layout = :application
+    config.default_user_role = nil
+  end
+end

data/lib/the_role/hash.rb

@@ -1,14 +1,10 @@
 # load 'the_role/hash.rb' - UPDATE, BUT NOT RELOAD [for console testing]
-
 class Hash
-  # 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
-
-  # RAILS 4 like methods for RAILS 3
-  # DEEP TRANSFORM HELPER METHODS
-  unless respond_to? :deep_transform_keys
+  # deep_transform_keys
+  # deep_stringify_keys
+  # underscorify_keys
+  # deep_reset
+  unless {}.respond_to?(:deep_transform_keys)
     def deep_transform_keys(&block)
       result = {}
       each do |key, value|
@@ -24,12 +20,9 @@ class Hash
       end
       self
     end
-    puts "[TheRole] RAILS 4 like method **deep_transform_keys** mixed to HASH class"
   end
 
-  # RAILS 4 like methods for RAILS 3
-  # DEEP TRANSFORM HELPER METHODS
-  unless respond_to? :deep_stringify_keys
+  unless {}.respond_to?(:deep_stringify_keys)
     def deep_stringify_keys
       deep_transform_keys{ |key| key.to_s }
     end
@@ -37,29 +30,29 @@ class 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
+  unless {}.respond_to?(:underscorify_keys)
+    def underscorify_keys
+      deep_transform_keys{ |key| TheRoleParam.process(key) }
+    end
 
-  def underscorify_keys!
-    replace underscorify_keys
+    def underscorify_keys!
+      replace underscorify_keys
+    end
   end
 
-  # 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
+  unless {}.respond_to?(:deep_reset)
+    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
-    hash
-  end
 
-  def deep_reset!(default = nil)
-    replace deep_reset(default)
+    def deep_reset!(default = nil)
+      replace deep_reset(default)
+    end
   end
 end

data/lib/the_role/param_helper.rb

@@ -1,15 +1,9 @@
 require "active_support/inflector"
 
-# TheRole::ParamHelper.prepare 'hello world'
+# TheRoleParam.process '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
+module TheRoleParam
+  def self.process param
+    param.to_s.parameterize.underscore
   end
-end
+end

data/lib/the_role/version.rb

@@ -1,3 +1,3 @@
 module TheRole
-  VERSION = "1.7.0"
+  VERSION = "2.0.0"
 end

data/lib/the_role.rb

@@ -1,21 +1,22 @@
 require 'haml'
 
-require 'the_role/param_helper'
 require 'the_role/hash'
-
-require 'the_role/engine'
+require 'the_role/config'
 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'
+require 'the_role/param_helper'
 
 module TheRole
-  # include TheRole::Base
-  # include TheRole::Requires
-  # include TheRole::UserModel
-  # include TheRole::RoleModel
-  # include TheRole::ParamHelper
+  class Engine < Rails::Engine
+    initializer "TheRole precompile hook", :group => :all do |app|
+      app.config.assets.precompile += %w( admin_the_role.js admin_the_role.css )
+    end
+
+    # http://stackoverflow.com/questions/6279325/adding-to-rails-autoload-path-from-gem
+
+    # config.to_prepare do
+    #   Role.send :include, TheRole::RoleModel if the_class_exists? :Role
+    #   User.send :include, TheRole::UserModel if the_class_exists? :User
+    #   ApplicationController.send :include, TheRole::Requires if the_class_exists? :ApplicationController
+    # end
+  end
 end

data/the_role.gemspec

@@ -13,10 +13,10 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "the_role"
 
-  s.files         = `git ls-files`.split("\n")
+  s.files         = `git ls-files`.split("\n").select{ |file_name| !(file_name =~ /^spec/) }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
   s.add_dependency 'haml'
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: the_role
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &21325720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21325720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Authorization lib for Rails 3 with Web Interface, aka CanCan killer
 email:
 - zykin-ilya@ya.ru
@@ -31,20 +36,18 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rvmrc.example
+- .travis.yml
 - Bye_bye_CanCan_I_got_the_Role.png
 - Gemfile
 - README.md
 - Rakefile
-- app/assets/javascripts/admin_the_role.js
-- app/assets/javascripts/bootstrap-alert.js
-- app/assets/javascripts/bootstrap-dropdown.js
-- app/assets/stylesheets/admin_the_role.css
-- app/assets/stylesheets/custom.css
-- app/assets/stylesheets/headers.css
-- app/assets/stylesheets/reset.css
-- app/assets/stylesheets/role_base.css
+- app/assets/stylesheets/the_role.css.scss
 - app/controllers/admin/role_sections_controller.rb
 - app/controllers/admin/roles_controller.rb
+- app/controllers/the_role_controller.rb
+- app/models/concerns/role_model.rb
+- app/models/concerns/the_role_base.rb
+- app/models/concerns/the_role_user_model.rb
 - app/views/admin/roles/_form.haml
 - app/views/admin/roles/_role.html.haml
 - app/views/admin/roles/_sidebar.html.haml
@@ -58,14 +61,13 @@ files:
 - config/locales/zh_CN.yml
 - config/routes.rb
 - db/migrate/20111025025129_create_roles.rb
+- lib/generators/the_role/USAGE
+- lib/generators/the_role/templates/the_role.rb
+- lib/generators/the_role/the_role_generator.rb
 - lib/tasks/roles.rake
 - lib/the_role.rb
-- lib/the_role/engine.rb
+- lib/the_role/config.rb
 - lib/the_role/hash.rb
-- lib/the_role/modules/base.rb
-- lib/the_role/modules/controller_requires.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
@@ -91,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: the_role
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Authorization lib for Rails 3 with Web Interface, aka CanCan killer

data/app/assets/javascripts/admin_the_role.js

@@ -1,4 +0,0 @@
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap-alert
-//= require bootstrap-dropdown

data/app/assets/javascripts/bootstrap-alert.js

@@ -1,90 +0,0 @@
-/* ==========================================================
- * bootstrap-alert.js v2.0.4
- * http://twitter.github.com/bootstrap/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
-
-  var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-      }
-
-  Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
-
-    if (!selector) {
-      selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-    }
-
-    $parent = $(selector)
-
-    e && e.preventDefault()
-
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
-
-    $parent.trigger(e = $.Event('close'))
-
-    if (e.isDefaultPrevented()) return
-
-    $parent.removeClass('in')
-
-    function removeElement() {
-      $parent
-        .trigger('closed')
-        .remove()
-    }
-
-    $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
-      removeElement()
-  }
-
-
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
-
-  $.fn.alert = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
-      if (typeof option == 'string') data[option].call($this)
-    })
-  }
-
-  $.fn.alert.Constructor = Alert
-
-
- /* ALERT DATA-API
-  * ============== */
-
-  $(function () {
-    $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
-  })
-
-}(window.jQuery);