Merge pull request martinrehfeld#15 from james2m/master

update mask_for, fix rdoc deprecation and remove Gemfile.lock.
james2m · Mar 26, 2012 · 1624020 · 1624020
2 parents 565e919 + 9d766b0
commit 1624020
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 33 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,4 @@ pkg
 
 ## PROJECT::SPECIFIC
 .rvmrc
+Gemfile.lock
diff --git a/Gemfile b/Gemfile
@@ -3,5 +3,6 @@ source 'http://rubygems.org'
 group :development do
   gem 'jeweler',       '>=1.5.2'
   gem 'rspec',         '~> 2'
+  gem 'rdoc',          '>=2.4.2'
   gem 'autotest'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/Rakefile b/Rakefile
@@ -40,8 +40,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

diff --git a/lib/role_model/class_methods.rb b/lib/role_model/class_methods.rb
@@ -19,10 +19,11 @@ def roles_attribute=(name)
     end
 
     def mask_for(*roles)
-      sanitized_roles = roles.map { |role| role.is_a?(Set) ? role.to_a : role }.flatten.map(&:to_sym)
+      sanitized_roles = roles.map { |role| Array(role) }.flatten.map(&:to_sym)
+
       (valid_roles & sanitized_roles).inject(0) { |sum, role| sum + 2**valid_roles.index(role) }
     end
-
+    
     protected
 
     # :call-seq: