rails-canhaz 1.0.1 → 1.0.4

data/README.md

@@ -75,7 +75,7 @@ user.can?(:read, article) # Will be true
 
 user.objects_with_permission(Article, :read) # Will return all the articles w/ read permissions for this user
 
-artice.subjects_with_permission(User, :read) # Will return all the users hat are able to read this article
+article.subjects_with_permission(User, :read) # Will return all the users hat are able to read this article
 
 #You can also remove permissions
 

data/lib/rails-canhaz/extensions_object.rb

@@ -17,11 +17,7 @@ module CanHaz
       # @param type [Class] The type of the subjects we're looking for
       # @param permission [String, Symbol] The permission
       def subjects_with_permission(type, permission)
-        results = CanHazPermission.where('cobject_id = ? AND cobject_type = ?', self.id, self.class.to_s).where('csubject_type = ?', type.to_s).where('permission_name = ?', permission)
-
-        ids = results.collect { |r| r.csubject_id }
-
-        type.where('id IN (?)', ids)
+        type.joins("INNER JOIN can_haz_permissions ON can_haz_permissions.csubject_id = #{type.table_name}.id").where('cobject_id = ? AND cobject_type = ?', self.id, self.class.to_s).where('csubject_type = ?', type.to_s).where('permission_name = ?', permission)
       end
 
       # Removes all rights on this object

data/lib/rails-canhaz/extensions_subject.rb

@@ -65,12 +65,8 @@ module CanHaz
       # @param type [Class] The type of the objects
       # @param permission [String, Symbol] The name of the permission
       # @return The macthing objects in an array
-      def objects_with_permission(type, permission = nil)
-        results = CanHazPermission.where('csubject_id = ? AND csubject_type = ?', self.id, self.class.to_s).where('cobject_type = ?', type.to_s).where('permission_name = ?', permission)
-
-        ids = results.collect { |r| r.cobject_id }
-
-        type.where('id IN (?)', ids)
+      def objects_with_permission(type, permission)
+        type.joins("INNER JOIN can_haz_permissions ON can_haz_permissions.cobject_id = #{type.table_name}.id").where('cobject_type = ?', type.to_s).where('permission_name = ?', permission)
       end
 
       def canhaz_subject?

data/rails-canhaz.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'rails-canhaz'
-  s.version     = '1.0.1'
-  s.date        = '2012-06-19'
+  s.version     = '1.0.4'
+  s.date        = '2012-11-01'
   s.summary     = "A simple gem for managing permissions between rails models"
   s.description = "A simple gem for managing permissions between rails models"
   s.authors     = ["Adrien Siami (Intrepidd)"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-canhaz
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord