rails-canhaz 1.0.4 → 1.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -66,7 +66,7 @@ module CanHaz
66
66
  # @param permission [String, Symbol] The name of the permission
67
67
  # @return The macthing objects in an array
68
68
  def objects_with_permission(type, permission)
69
- 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)
69
+ type.joins("INNER JOIN can_haz_permissions ON can_haz_permissions.cobject_id = #{type.table_name}.id").where('cobject_type = ? AND csubject_id = ?', type.to_s, self.id).where('permission_name = ?', permission)
70
70
  end
71
71
 
72
72
  def canhaz_subject?
data/rails-canhaz.gemspec CHANGED
@@ -1,7 +1,7 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'rails-canhaz'
3
- s.version = '1.0.4'
4
- s.date = '2012-11-01'
3
+ s.version = '1.0.5'
4
+ s.date = '2012-11-07'
5
5
  s.summary = "A simple gem for managing permissions between rails models"
6
6
  s.description = "A simple gem for managing permissions between rails models"
7
7
  s.authors = ["Adrien Siami (Intrepidd)"]
data/test/test_canhaz.rb CHANGED
@@ -60,9 +60,15 @@ class CanHazTest < Test::Unit::TestCase
60
60
  subject = SubjectModel.new
61
61
  subject.save
62
62
 
63
+ subject2 = SubjectModel.new
64
+ subject2.save
65
+
63
66
  object = ObjectModel.new
64
67
  object.save
65
68
 
69
+ subject2.can!(:foo, object)
70
+ subject2.can!(:bar, object)
71
+
66
72
  assert subject.can?(:foo, object) == false
67
73
  assert subject.can?(:bar, object) == false
68
74
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rails-canhaz
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.4
4
+ version: 1.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-01 00:00:00.000000000 Z
12
+ date: 2012-11-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activerecord