mix-rails-auth 0.16.0 → 0.22.0

data/app/controllers/admix/roles_controller.rb

@@ -0,0 +1,3 @@
+class Admix::RolesController < Admix::InheritedController
+  
+end

data/app/models/admix/roles_datagrid.rb

@@ -0,0 +1,14 @@
+class Admix::RolesDatagrid
+
+  include Datagrid
+  extend AdmixHelper
+
+  scope do
+    Role.all
+  end
+
+  column :name, header: input_label(:role, :name)
+
+  include Admix::TableActions
+
+end

data/app/models/role.rb

@@ -0,0 +1,19 @@
+class Role
+  include Mongoid::Document
+  
+  has_and_belongs_to_many :users
+  belongs_to :resource, :polymorphic => true
+  
+  field :name, :type => String
+  index({ :name => 1 }, { :unique => true })
+
+
+  index({
+    :name => 1,
+    :resource_type => 1,
+    :resource_id => 1
+  },
+  { :unique => true})
+  
+  scopify
+end

data/app/models/user.rb

@@ -1,9 +1,9 @@
 class User
   include Mongoid::Document
+  rolify
+  include Authority::UserAbilities
 
-  ROLES = %w[admin content_manager]
-
-  #attr_accessible :roles
+  ROLES = %w[admin manager]
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
@@ -46,23 +46,7 @@ class User
 
   ## Token authenticatable
   # field :authentication_token, :type => String
-
-
-  #field :role,    :type => String
-  field :roles_mask, :type => Integer
-
-  def roles=(roles)
-    self.roles_mask = (roles & ROLES).map { |r| 2**ROLES.index(r) }.inject(0, :+)
-  end
-
-  def roles
-    ROLES.reject do |r|
-      ((roles_mask || 0) & 2**ROLES.index(r)).zero?
-    end
-  end
-
-  def is?(role)
-    roles.include?(role.to_s)
-  end
+  
+  #has_and_belongs_to_many :roles
 
 end

data/app/views/admix/roles/_form_fields.html.haml

@@ -0,0 +1,2 @@
+= f.input :name, as: 'string'
+= f.association :users, as: :check_boxes, collection: User.all, label_method: :email, value_method: :id

data/app/views/admix/roles/_show.html.haml

@@ -0,0 +1,4 @@
+%dl
+  %dt= input_label(:roles, :name)
+  %dd= resource.name
+

data/app/views/admix/roles/_table_actions.html.haml

@@ -0,0 +1,3 @@
+= link_to image_tag('admix/zoom.png'), resource_url(resource), class: 'btn', title:'Visualizar'
+= link_to image_tag('admix/page_edit.png'), edit_resource_url(resource), class: 'btn', title:'Editar'
+= link_to image_tag('admix/cancel.png'), resource_url(resource), method: :delete, data: { confirm: t('admix.crud.destroy_confirm') }, class: 'btn', title:'Deletar'

data/app/views/admix/users/_form_fields.html.haml

@@ -1,10 +1,3 @@
 = f.input :email, as: 'string'
 = f.input :password, as: 'password'
-
-- User::ROLES.each do |role|
-  .control-group
-    = label_tag "user_roles_#{role}", role.humanize, class: 'control-label'
-    .controls
-      = check_box_tag "user[roles][#{role}]", role, @user.roles.include?(role), {:name => "user[roles][]"}
-
-= hidden_field_tag "user[roles][]", ""
+= f.input :roles, :as => :select, :collection => Role.all

data/config/initializers/rolify.rb

@@ -0,0 +1,8 @@
+Rolify.configure do |config|
+  # By default ORM adapter is ActiveRecord. uncomment to use mongoid
+  config.use_mongoid
+  
+  # Dynamic shortcuts for User class (user.is_admin? like methods). Default is: false
+  # Enable this feature _after_ running rake db:migrate as it relies on the roles table
+  # config.use_dynamic_shortcuts
+end

data/config/locales/auth.pt-BR.yml

@@ -22,3 +22,5 @@ pt-BR:
     fields:
       last_sign_in_at: 'Último login'
       email: 'E-mail'
+  roles:
+    roles: 'Papéis'

data/config/routes.rb

@@ -5,6 +5,7 @@ Rails.application.routes.draw do
   scope Admix::namespace_path, as: :admix, module: :admix do
     devise_for :users, sign_out_via: 'get', controllers: {sessions: 'admix/sessions', passwords: 'admix/passwords'}, :path_names => { :sign_in => 'login', :sign_out => 'logout' }
     resources :users
+    resources :roles
   end
 
 end

data/lib/mix-rails-auth/engine.rb

@@ -11,7 +11,7 @@ module MixRailsAuth
 
               submenu.instance_eval do
                 def can_render?(current_user)
-                  current_user.is?(:admin)  
+                  current_user.has_role? :admin
                 end
               end
 

data/lib/mix-rails-auth/version.rb

@@ -1,7 +1,7 @@
 module MixRailsAuth
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 16
+    MINOR = 22
     TINY  = 0
     PRE   = nil
 

data/lib/mix-rails-auth.rb

@@ -1,5 +1,6 @@
 require "mix-rails-auth/engine"
 require 'devise'
+require 'rolify'
 
 module Auth
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-rails-auth
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.22.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -60,54 +60,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.15
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.0.15
-- !ruby/object:Gem::Dependency
-  name: cancan
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: will_paginate_mongoid
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This is the auth module of mix-rails
 email:
 - sadjow@gmail.com
@@ -116,25 +68,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/controllers/admix/roles_controller.rb
+- app/controllers/admix/users_controller.rb
 - app/assets/stylesheets/admix/users.css
 - app/assets/javascripts/admix/users.js
-- app/views/admix/users/_form_fields.html.haml
-- app/views/admix/users/_table_actions.html.haml
-- app/views/admix/users/_show.html.haml
-- app/controllers/admix/users_controller.rb
-- app/models/user.rb
-- app/models/admix/users_datagrid.rb
-- app/models/ability.rb
 - app/helpers/admix/users_helper.rb
-- config/initializers/devise.rb
-- config/routes.rb
+- app/models/admix/roles_datagrid.rb
+- app/models/admix/users_datagrid.rb
+- app/models/user.rb
+- app/models/role.rb
+- app/views/admix/roles/_show.html.haml
+- app/views/admix/roles/_table_actions.html.haml
+- app/views/admix/roles/_form_fields.html.haml
+- app/views/admix/users/_show.html.haml
+- app/views/admix/users/_table_actions.html.haml
+- app/views/admix/users/_form_fields.html.haml
 - config/sessions.rb
+- config/locales/auth.en.yml
 - config/locales/devise.pt-BR.yml
-- config/locales/auth.pt-BR.yml
 - config/locales/devise.en.yml
-- config/locales/auth.en.yml
-- lib/mix-rails-auth.rb
+- config/locales/auth.pt-BR.yml
+- config/initializers/rolify.rb
+- config/initializers/devise.rb
+- config/routes.rb
 - lib/tasks/auth_tasks.rake
+- lib/mix-rails-auth.rb
 - lib/mix-rails-auth/version.rb
 - lib/mix-rails-auth/engine.rb
 - MIT-LICENSE
@@ -154,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3132266013216500903
+      hash: -1563147382618436220
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3132266013216500903
+      hash: -1563147382618436220
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/app/models/ability.rb

@@ -1,28 +0,0 @@
-class Ability
-  include CanCan::Ability
-
-  def initialize(user)
-    # Define abilities for the passed in user here. For example:
-    #
-    user ||= User.new # guest user (not logged in)
-    if true #user.is?(:admin)
-      can :manage, :all
-    else
-      can :read, :all
-    end
-    #
-    # The first argument to `can` is the action you are giving the user permission to do.
-    # If you pass :manage it will apply to every action. Other common actions here are
-    # :read, :create, :update and :destroy.
-    #
-    # The second argument is the resource the user can perform the action on. If you pass
-    # :all it will apply to every resource. Otherwise pass a Ruby class of the resource.
-    #
-    # The third argument is an optional hash of conditions to further filter the objects.
-    # For example, here the user can only update published articles.
-    #
-    #   can :update, Article, :published => true
-    #
-    # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
-  end
-end