fixing active record adapter behavior and improving specs for it

lib/cancan/model_adapters/active_record_adapter.rb

@@ -19,14 +19,26 @@ module CanCan
       def conditions
         if @rules.size == 1 && @rules.first.base_behavior
           # Return the conditions directly if there's just one definition
-          @rules.first.tableized_conditions.dup
+          tableized_conditions(@rules.first.conditions).dup
         else
           @rules.reverse.inject(false_sql) do |sql, rule|
-            merge_conditions(sql, rule.tableized_conditions.dup, rule.base_behavior)
+            merge_conditions(sql, tableized_conditions(rule.conditions).dup, rule.base_behavior)
           end
         end
       end
 
+      def tableized_conditions(conditions)
+        return conditions unless conditions.kind_of? Hash
+        conditions.inject({}) do |result_hash, (name, value)|
+          if value.kind_of? Hash
+            name = @model_class.reflect_on_association(name).table_name
+            value = tableized_conditions(value)
+          end
+          result_hash[name] = value
+          result_hash
+        end
+      end
+
       # Returns the associations used in conditions for the :joins option of a search.
       # See ActiveRecordAdditions#accessible_by for use in Active Record.
       def joins

lib/cancan/rule.rb

@@ -3,7 +3,7 @@ module CanCan
   # it holds the information about a "can" call made on Ability and provides
   # helpful methods to determine permission checking and conditions hash generation.
   class Rule # :nodoc:
-    attr_reader :base_behavior, :actions
+    attr_reader :base_behavior, :actions, :conditions
     attr_writer :expanded_actions
 
     # The first argument when initializing is the base_behavior which is a true/false
@@ -41,18 +41,6 @@ module CanCan
       end
     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
-          value = tableized_conditions(value)
-        end
-        result_hash[name] = value
-        result_hash
-      end
-    end
-
     def only_block?
       conditions_empty? && !@block.nil?
     end