Associations test cases

lib/optimizations/associations/macro.rb

@@ -107,17 +107,19 @@ def association_instance_set(name, association)
           instance_variable_set("@#{name}", association)
         end
 
-        # Register an association with Scrooge
-        #
-        def scrooge_seen_association!( association )
-          if scrooged? && !scrooge_seen_association?( association )
-            @attributes.scrooge_associations << association
-            self.class.scrooge_callsite( @attributes.callsite_signature ).association!( association ) 
-          end
-        end
-
         private
 
+          # Register an association with Scrooge
+          #
+          def scrooge_seen_association!( association )
+            if scrooged? && !scrooge_seen_association?( association )
+              @attributes.scrooge_associations << association
+              self.class.scrooge_callsite( @attributes.callsite_signature ).association!( association ) 
+            end
+          end        
+
+          # Has this association already been flagged for the callsite ? 
+          #
           def scrooge_seen_association?( association )
             @attributes.scrooge_associations.include?( association )
           end

lib/optimizations/columns/macro.rb

@@ -168,6 +168,12 @@ def respond_to_with_scrooge?(symbol, include_private=false)
             respond_to_without_scrooge?(symbol, include_private)
           end
         end
+
+        # Expose this record's callsite signature
+        #
+        def callsite_signature
+          scrooged? ? @attributes.callsite_signature : nil
+        end
 
         private
 

lib/scrooge.rb

@@ -79,4 +79,4 @@ def callsite_signature( call_stack, supplementary )
 end
 
 Scrooge::Optimizations::Columns::Macro.install!
-Scrooge::Optimizations::Associations::Macro.install!
+Scrooge::Optimizations::Associations::Macro.install!

test/helper.rb

@@ -31,7 +31,7 @@ def active_record_test_files
       end
 
       def test_files
-        glob( "#{File.dirname(__FILE__)}/*_test.rb" )
+        glob( "#{File.dirname(__FILE__)}/**/*_test.rb" )
       end
 
       private

test/models/mysql_host.rb

@@ -0,0 +1,5 @@
+class MysqlHost < ActiveRecord::Base  
+  set_table_name 'host'
+  set_primary_key 'Host'
+
+end  

test/models/mysql_user.rb

@@ -3,6 +3,8 @@ class MysqlUser < ActiveRecord::Base
   set_primary_key 'User'
 
   has_many :table_privileges, :class_name => 'MysqlTablePrivilege', :foreign_key => 'User'
+  has_many :column_privileges, :class_name => 'MysqlColumnPrivilege', :foreign_key => 'User'
+  belongs_to :host, :class_name => 'MysqlHost', :foreign_key => 'Host'
 
   def after_initialize
     max_connections if @attributes.has_key?("max_user_connections")

test/optimizations/associations/macro_test.rb

@@ -0,0 +1,31 @@
+require "#{File.dirname(__FILE__)}/../../helper"
+
+Scrooge::Test.prepare!
+
+class OptimizationsAssociationsMacroTest < ActiveSupport::TestCase
+
+  test "should flag a record as being scrooged when found through a supported SQL query" do
+    assert MysqlUser.find(:first).scrooged?
+  end
+
+  test "should be able to flag any associations instantiated from a record" do
+    @user = MysqlUser.find(:first)
+    @user.host
+    assert_equal MysqlUser.scrooge_callsite( @user.callsite_signature ).associations, Set[:host]
+  end
+
+  test "should only flag preloadable associations" do
+    Scrooge::Callsite.any_instance.expects(:association!).once
+    @user = MysqlUser.find(:first)
+    @user.table_privileges
+    assert_equal MysqlUser.scrooge_callsite( @user.callsite_signature ).associations, Set.new
+  end
+
+  test "should be able to identify all preloadable associations for a given Model" do
+    assert_equal MysqlUser.preloadable_associations, [:host]
+    assert_equal MysqlHost.preloadable_associations, []
+    assert_equal MysqlColumnPrivilege.preloadable_associations, [:mysql_user]
+    assert_equal MysqlTablePrivilege.preloadable_associations, [:mysql_user, :column_privilege]
+  end
+
+end