more bug fixes

bangthetable · Apr 4, 2012 · 4f8de03 · 4f8de03
1 parent 249eccc
commit 4f8de03
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/acts_as_authoritah/core.rb b/lib/acts_as_authoritah/core.rb
@@ -13,7 +13,8 @@ module Core
      module InstanceMethods
        def can?(identifier, options={})
          klass = self.class
-         klass.send(:default_acl).match_identifier(identifier)[self.usertype(options)] || klass.send(:whitelist)
+         h = klass.send(:default_acl).match_identifier(identifier)
+         h.empty? ? !klass.send(:whitelist) : h[self.usertype(options)]
        end
      end
 
@@ -29,7 +30,7 @@ def default_acl
        end
 
        def whitelist
-         !@@whitelist
+         @@whitelist
        end
      end
   end

diff --git a/spec/acts_as_authoritah/core_spec.rb b/spec/acts_as_authoritah/core_spec.rb
@@ -1,3 +1,5 @@
+require 'spec_helper'
+
 describe ActsAsAuthoritah::Core do
   before :each do 
     class Foo
@@ -29,7 +31,7 @@ def usertype(options)
     before :each do
       class Foo
         include ActsAsAuthoritah::Core
-        acts_as_authoritah "spec/data/default.xls"
+        acts_as_authoritah "spec/data/default.xls", :whitelist => false
 
         def usertype(options)
           "admin"