roleable 0.0.1 → 0.0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
 ## v0.0.1
 
-* Initial release
+* Initial release
+
+## v0.0.2
+
+* Fix a bug that allowed users not associated with a resource to be listed in Resource#users_with_role.

data/lib/roleable/resource.rb

@@ -11,8 +11,7 @@ module Roleable::Resource
   #   page.users_with_role(:editor)   # => [user1, user2, ...]
   #
   def users_with_role(role_name)
-    user_roles = ::UserRole.with_role_name(role_name)
-    User.joins(:user_roles).merge(user_roles)
+    User.joins(:user_roles).merge(::UserRole.with_role_name(role_name).with_resource(self))
   end
   
 end

data/lib/roleable/user_role.rb

@@ -33,7 +33,7 @@ module Roleable::UserRole
   # that already have those attributes.
   #
   # Returns the record if it was saved, otherwise nil.
-  def create_if_unique!(attributes)
+  def create_if_unique!(attributes)  
     user_role = new(attributes)
     
     record_attributes = user_role.attributes.reject do |k, v| 

data/lib/roleable/version.rb

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

data/spec/roleable/resource_spec.rb

@@ -18,17 +18,27 @@ describe Roleable::Resource do
     end
     
     context 'when multiple users have the given role' do
-      it 'returns a list of the users' do
-        3.times do
-          user = User.create
-          user.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)
         
         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)
+        
+        users = @page.users_with_role(:editor)
+        
+        users.length.should == 3
+      end
+      
     end
     
   end

metadata

@@ -1,78 +1,108 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: roleable
-version: !ruby/object:Gem::Version
-  version: 0.0.1
+version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
-authors:
+authors: 
 - Mitch Crowe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2156383080 !ruby/object:Gem::Requirement
+
+date: 2012-04-20 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.9'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
+  prerelease: false
+  name: rake
+  version_requirements: *id001
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 8
+        version: "2.8"
   prerelease: false
-  version_requirements: *2156383080
-- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156382260 !ruby/object:Gem::Requirement
+  version_requirements: *id002
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.8'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   prerelease: false
-  version_requirements: *2156382260
-- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156381480 !ruby/object:Gem::Requirement
+  version_requirements: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   prerelease: false
-  version_requirements: *2156381480
-- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156380900 !ruby/object:Gem::Requirement
+  version_requirements: *id004
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 0
+        - 2
+        version: "0.2"
   prerelease: false
-  version_requirements: *2156380900
-- !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &2156380280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.2'
+  version_requirements: *id005
   type: :development
-  prerelease: false
-  version_requirements: *2156380280
 description: Roles solution for active-record-backed Rails 3 applications
-email:
+email: 
 - crowe.mitch@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -97,37 +127,41 @@ files:
 - spec/roleable/subject_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_contexts.rb
+has_rdoc: true
 homepage: https://github.com/mcrowe/roleable
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1300429085112405941
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 1300429085112405941
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.9.4
 signing_key: 
 specification_version: 3
 summary: Roles solution for active-record-backed Rails 3 applications
-test_files:
+test_files: 
 - spec/roleable/resource_spec.rb
 - spec/roleable/subject_spec.rb
 - spec/spec_helper.rb