darkhelmet-role_on 0.1.2 → 0.1.3

data/TODO

@@ -0,0 +1 @@
+* class methods on user to add helper methods for finding admins, etc

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/role_on.rb

@@ -20,16 +20,28 @@ module RoleOn
     end
   end
 
-  module RoleOnUserMethods
-    def has_role?(role)
-      return false if roles.nil?
-      roles.include?(Role[role])
+  module RoleOnUserInstanceMethods
+    def has_role?(*roles)
+      return false if self.roles.empty?
+      roles.reject { |r| self.roles.include?(Role[r]) }.empty?
+    end
+    alias :has_roles? :has_role?
+  end
+
+  module RoleOnUserClassMethods
+    def helper_for(role,name = role.to_s.pluralize)
+      (class << self; self; end).class_eval do
+        define_method("all_#{name}") do
+          User.find(:all, :conditions => [ 'roles.id is ? or roles.id != ?', nil, Role[role].id ], :include => :roles)
+        end
+      end
     end
   end
 
   def self.included(klass)
     if User == klass
-      klass.send(:include, RoleOnUserMethods)
+      klass.send(:include, RoleOnUserInstanceMethods)
+      klass.send(:extend, RoleOnUserClassMethods)
       klass.send(:has_and_belongs_to_many, :roles, :join_table => 'user_roles')
     elsif ApplicationController == klass
       klass.send(:extend, RoleOnControllerMethods)

data/role_on.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{role_on}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Huckstep"]
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
      "LICENSE",
      "README.md",
      "Rakefile",
+     "TODO",
      "VERSION",
      "generators/role_on/role_on_generator.rb",
      "generators/role_on/templates/app/models/role.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: darkhelmet-role_on
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -28,6 +28,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO
 - VERSION
 - generators/role_on/role_on_generator.rb
 - generators/role_on/templates/app/models/role.rb