resolve issue 149

wigsgiw · Sep 16, 2010 · f236b1b · f236b1b
1 parent 0b270f2
commit f236b1b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/lib/cancan/can_definition.rb b/lib/cancan/can_definition.rb
@@ -41,6 +41,7 @@ def matches_conditions?(action, subject, extra_args)
     end
 
     def tableized_conditions(conditions = @conditions)
+      return conditions unless conditions.kind_of? Hash
       conditions.inject({}) do |result_hash, (name, value)|
         if value.kind_of? Hash
           name = name.to_s.tableize.to_sym
@@ -63,15 +64,15 @@ def associations_hash(conditions = @conditions)
       hash = {}
       conditions.map do |name, value|
         hash[name] = associations_hash(value) if value.kind_of? Hash
-      end
+      end if conditions.kind_of? Hash
       hash
     end
 
     def attributes_from_conditions
       attributes = {}
       @conditions.each do |key, value|
         attributes[key] = value unless [Array, Range, Hash].include? value.class
-      end
+      end if conditions.kind_of? Hash
       attributes
     end