permissive 0.2.8.alpha → 0.2.9.alpha

data/VERSION

@@ -1 +1 @@
-0.2.8.alpha
+0.2.9.alpha

data/lib/permissive/permission.rb

@@ -9,7 +9,12 @@ module Permissive
     named_scope :on, lambda {|scoped_object|
       case scoped_object
       when ActiveRecord::Base
-        {:conditions => {:scoped_object_id => scoped_object.id, :scoped_object_type => scoped_object.class.to_s}}
+        {
+          :conditions => [
+            "#{table_name}.scoped_object_type = :object_type AND (#{table_name}.scoped_object_id = :object_id OR #{table_name}.scoped_object_id IS NULL)",
+            {:object_id => scoped_object.id, :object_type => scoped_object.class.name}
+          ]
+        }
       when Class
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => scoped_object.name}}
       when String, Symbol

data/spec/scoping_permissions_spec.rb

@@ -72,10 +72,15 @@ describe Permissive, "scoped permissions" do
   end
 
   describe "on classes" do
-    it "should ignore instance-specific permissions" do
+    it "should trump instance-specific permissions" do
       @user.can!(:punch, :on => Permissive::User)
       @user.can?(:punch, :on => Permissive::User).should be_true
-      @user.can?(:punch, :on => Permissive::User.create).should be_false
+      @user.can?(:punch, :on => Permissive::User.create).should be_true
+    end
+
+    it "should not be trumped by instances" do
+      @user.can!(:punch, :on => Permissive::User.create)
+      @user.can?(:punch, :on => Permissive::User).should be_false
     end
 
     it "should interpolate symbols" do

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 8
+  - 9
   - alpha
-  version: 0.2.8.alpha
+  version: 0.2.9.alpha
 platform: ruby
 authors: 
 - Flip Sasser
@@ -32,7 +32,6 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- .gemspec
 - .gitignore
 - CHANGELOG
 - MIT-LICENSE