credentials 2.3.0 → 2.3.1

data/VERSION

@@ -1 +1 @@
-2.3.0
+2.3.1

data/credentials.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{credentials}
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Powell"]
-  s.date = %q{2009-12-16}
+  s.date = %q{2009-12-17}
   s.description = %q{A generic actor/resource permission framework based on rules, not objects.}
   s.email = %q{fauxparse@gmail.com.com}
   s.extra_rdoc_files = [

data/lib/credentials/rule.rb

@@ -55,7 +55,7 @@ module Credentials
         case expected
         when :self then return false unless actual == args.first
         when Array then return false unless expected.any? { |item| (item === actual) || (item == :self && actual == args.first) }
-        else return false unless expected === actual
+        else return false unless expected == actual || expected === actual
         end
       end
       
@@ -104,13 +104,13 @@ module Credentials
           tr("-", "_").
           downcase
       end
-      
+
       if object.respond_to?(:id) && actual.respond_to?(:"#{lclass}_id")
-        return true if actual.send(:"#{lclass}_id") == object.id
+        return true if actual.send(:"#{lclass}_id").to_i == object.id.to_i
       end
       
       if actual.respond_to?(:id) && object.respond_to?(:"#{rclass}_id")
-        return true if object.send(:"#{rclass}_id") == actual.id
+        return true if object.send(:"#{rclass}_id").to_i == actual.id.to_i
       end
       
       (object.respond_to?(single) && (object.send(single) == actual)) || (object.respond_to?(plural) && (object.send(plural).include?(actual)))

data/spec/controllers/test_controller_spec.rb

@@ -5,7 +5,7 @@ if defined?(ActionController)
     self.current_user_method = :logged_in_user
     requires_permission_to :view, :stuff, :except => [ :public ]
     requires_permission_to :break, :stuff, :only => [ :dangerous ]
-    requires_permission_to :create, :stuff, :for => :account, :only => [ :create ]
+    requires_permission_to :create, Object, :for => :account, :only => [ :create ]
   
     def index; end
     def public; end
@@ -21,13 +21,15 @@ if defined?(ActionController)
     credentials do |user|
       user.can :view, :stuff
       user.can :break, :stuff, :if => :special?
-      user.can :create, :stuff, :for => :account
+      user.can :create, Object, :for => :account
       
-      def account; end
+      attr_accessor :test_account_id
     end
   end
   
-  class TestAccount; end
+  class TestAccount
+    attr_accessor :id
+  end
   
   describe TestController do
     it "should know how to specify access credentials" do
@@ -87,7 +89,8 @@ if defined?(ActionController)
 
       it "should be able to do stuff on its own account" do
         @my_account = TestAccount.new
-        @user.stub!(:account).and_return(@my_account)
+        @my_account.id = 5
+        @user.stub!(:test_account_id).and_return(@my_account.id)
         controller.stub!(:account).and_return(@my_account)
         lambda {
           get :create
@@ -98,7 +101,9 @@ if defined?(ActionController)
       it "should not be able to do stuff on someone else's account" do
         @my_account = TestAccount.new
         @your_account = TestAccount.new
-        @user.stub!(:account).and_return(@my_account)
+        @my_account.id = 5
+        @your_account.id = 6
+        @user.stub!(:test_account_id).and_return(@my_account.id)
         controller.stub!(:account).and_return(@your_account)
         lambda {
           get :create

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: credentials
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors: 
 - Matt Powell
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +13:00
+date: 2009-12-17 00:00:00 +13:00
 default_executable: 
 dependencies: []