roleable 0.0.2 → 0.1.0

data/README.md

@@ -86,7 +86,13 @@ Find the resources of a given class for which a user has a given role:
 
 ```ruby
 user.resources_with_role(:editor, Page)
-```  
+```
+
+Find the resource of a given class for which a user has _any_ of a list of roles:
+
+```ruby
+user.resources_with_role([:editor, :author], Page)
+```
 
 Find a user's roles for a given resource:
 
@@ -108,6 +114,12 @@ Find users with a given role:
 page.users_with_role(:editor)
 ```
 
+Find users matching _any_ of a list of roles:
+
+```ruby
+page.users_with_role([:editor, :author])
+```
+
 For more details check out the [API documentation](http://rubydoc.info/github/mcrowe/roleable/master/frames) on rubydoc.info.
  
 ## Requirements

data/lib/roleable/resource.rb

@@ -5,10 +5,12 @@ module Roleable::Resource
   end
 
   # Return a list of users that have the given role for this resource.
+  # If a list of role names is given, return users with any of those roles for this resource.
   #
   # ==== Examples
   #
   #   page.users_with_role(:editor)   # => [user1, user2, ...]
+  #   page.users_with_role([:editor, :author])   # => [user1, user2, ...]
   #
   def users_with_role(role_name)
     User.joins(:user_roles).merge(::UserRole.with_role_name(role_name).with_resource(self))

data/lib/roleable/subject.rb

@@ -54,10 +54,12 @@ module Roleable::Subject
   end
   
   # Return a list of resources of the given class, for which the user has the given role.
+  # If passed an array or roles, returns resources for which the user has any of the roles.
   #
   # ==== Examples
   #
   #   user.resources_with_role(:editor, Page)  # => [page1, page2, ...]
+  #   user.resources_with_role([:editor, :author], Page)  # => [page1, page2, ...]
   #
   def resources_with_role(role_name, resource_class)
     user_roles = ::UserRole.with_user(self).with_role_name(role_name).with_resource_class(resource_class)

data/lib/roleable/user_role.rb

@@ -17,12 +17,13 @@ module Roleable::UserRole
   end
 
   def with_role_name(role_name)
-    role = ::Role.find_by_name(role_name)
-    with_role(role)
+    roles = ::Role.find_all_by_name(role_name)
+    with_roles(roles)
   end
 
-  def with_role(role)
-    where(:role_id => role && role.id)
+  def with_roles(roles)
+    role_ids = roles.map { |r| r.id }
+    where(:role_id => role_ids)
   end
 
   def with_resource_class(resource_class)

data/lib/roleable/version.rb

@@ -1,3 +1,3 @@
 module Roleable
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/roleable.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sqlite3', '~> 1.3'
   gem.add_development_dependency 'activerecord', '~> 3.0'
   gem.add_development_dependency 'with_model', '~> 0.2'
-  
 end

data/spec/roleable/resource_spec.rb

@@ -9,38 +9,55 @@ describe Roleable::Resource do
     before do
       @page = Page.create
       @editor_role = Role.create(:name => 'editor')
+      @author_role = Role.create(:name => 'author')
     end
     
-    context 'with a role that doesnt exist' do
-      it 'returns an empty list' do
-        @page.users_with_role(:notarole).should be_empty
+    context 'with a single role' do
+      
+      context 'with a role that doesnt exist' do
+        it 'returns an empty list' do
+          @page.users_with_role(:notarole).should be_empty
+        end
       end
-    end
     
-    context 'when multiple users have the given role' do
+      context 'when multiple users have the given role' do
       
-      before do
-        3.times { User.create!.add_role(:editor, @page) }
-      end        
+        before do
+          3.times { User.create.add_role(:editor, @page) }
+        end        
         
-      it 'returns a list of the users' do    
-        users = @page.users_with_role(:editor)
+        it 'returns a list of the users' do    
+          users = @page.users_with_role(:editor)
         
-        users.length.should == 3
-        users.first.should be_a(User)
-      end
+          users.length.should == 3
+          users.first.should be_a(User)
+        end
       
-      it 'doesnt return users that dont have the role' do
-        other_page = Page.create
-        other_user = User.create!.add_role(:editor, other_page)
+        it 'doesnt return users that dont have the role' do
+          other_page = Page.create
+          other_user = User.create.add_role(:editor, other_page)
         
-        users = @page.users_with_role(:editor)
+          users = @page.users_with_role(:editor)
         
-        users.length.should == 3
+          users.length.should == 3
+        end
+      
       end
       
     end
     
+    context 'with a list of roles' do
+      it 'returns a list of users that have any of the given roles for this resource' do
+        3.times { User.create.add_role(:editor, @page) }
+        2.times { User.create.add_role(:author, @page) }
+        User.create
+        
+        users = @page.users_with_role([:editor, :author])
+      
+        users.length.should == 5
+      end
+    end
+    
   end
   
 end

data/spec/roleable/subject_spec.rb

@@ -8,6 +8,7 @@ describe Roleable::Subject do
     @user = User.create
     @admin_role = Role.create(:name => 'admin')
     @editor_role = Role.create(:name => 'editor')
+    @author_role = Role.create(:name => 'author')
   end
 
   describe '#add_role' do
@@ -160,23 +161,36 @@ describe Roleable::Subject do
 
   describe '#resources_with_role' do
   
-    context 'when the user has the given role for several resources of the given class' do
-      it 'returns a list containing those resources' do
-        3.times do 
-          page = Page.create
-          @user.add_role(:editor, page)
-        end
+    context 'with a single role' do
+    
+      context 'when the user has the given role for several resources of the given class' do
+        it 'returns a list containing those resources' do
+          3.times { @user.add_role(:editor, Page.create) }
       
-        pages = @user.resources_with_role(:editor, Page)
+          pages = @user.resources_with_role(:editor, Page)
         
-        pages.length.should == 3
-        pages.first.should be_a(Page)
+          pages.length.should == 3
+          pages.first.should be_a(Page)
+        end
       end
-    end
   
-    context 'when the user doesnt have the given role for any resources of the given class' do
-      it 'returns an empty list' do
-        @user.resources_with_role(:editor, Page).should be_empty        
+      context 'when the user doesnt have the given role for any resources of the given class' do
+        it 'returns an empty list' do
+          @user.resources_with_role(:editor, Page).should be_empty        
+        end
+      end
+      
+    end
+    
+    context 'with a list of roles' do
+      it 'returns a list of resources the user has those roles for' do
+        3.times { @user.add_role(:editor, Page.create) }
+        2.times { @user.add_role(:author, Page.create) }
+        Page.create
+        
+        pages = @user.resources_with_role([:editor, :author], Page)
+        
+        pages.length.should == 5        
       end
     end
   

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mitch Crowe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 -07:00
+date: 2012-05-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency