mix-auth 0.3.4 → 0.4.0

data/app/models/ability.rb

@@ -0,0 +1,28 @@
+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 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

data/app/models/user.rb

@@ -1,5 +1,10 @@
 class User
   include Mongoid::Document
+
+  ROLES = %w[admin content_manager]
+
+  attr_accessible :roles
+
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
   # :lockable, :timeoutable and :omniauthable
@@ -26,6 +31,7 @@ class User
   field :last_sign_in_at,    :type => Time
   field :current_sign_in_ip, :type => String
   field :last_sign_in_ip,    :type => String
+  
 
   ## Confirmable
   # field :confirmation_token,   :type => String
@@ -40,4 +46,23 @@ 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
+
 end

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

@@ -0,0 +1,7 @@
+= f.input :email,         as: 'string'
+= f.input :password,      as: 'password'
+- for role in User::ROLES
+  = check_box_tag "user[roles][#{role}]", role, @user.roles.include?(role), {:name => "user[roles][]"}
+  = label_tag "user_roles_#{role}", role.humanize
+  %br
+= hidden_field_tag "user[roles][]", ""

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

@@ -0,0 +1,7 @@
+%dl
+  %dt= t('albums.name')
+  %dd= resource.name
+  %dt= t('albums.date')
+  %dd= resource.date
+
+= render('admix/photos/upload')

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

@@ -0,0 +1,4 @@
+= link_to image_tag('albums/photos.png'), resource_url([resource, :photos])
+= link_to image_tag('admix/zoom.png'), resource_url(resource)
+= link_to image_tag('admix/page_edit.png'), edit_resource_url(resource)
+= link_to image_tag('admix/cancel.png'), resource_url(resource), method: :delete, data: { confirm: t('admix.crud.destroy_confirm') }

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mix-auth
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,6 +76,22 @@ dependencies:
     - - ~>
       - !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: mix-rails
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +137,11 @@ files:
 - app/assets/javascripts/admix/users.js
 - app/helpers/admix/users_helper.rb
 - app/models/admix/users_datagrid.rb
+- app/models/ability.rb
 - app/models/user.rb
+- app/views/admix/users/_show.html.haml
+- app/views/admix/users/_table_actions.html.haml
+- app/views/admix/users/_form_fields.html.haml
 - config/locales/auth.en.yml
 - config/locales/devise.pt-BR.yml
 - config/locales/devise.en.yml
@@ -150,7 +170,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1870393188419666116
+      hash: 2479283267806110614
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1870393188419666116
+      hash: 2479283267806110614
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24