slim_scrooge 1.0.3 → 1.0.4

data/README.textile

@@ -30,7 +30,9 @@ Requirements: Rails 2.2 or above, Ruby 1.8.6 or above.  (Ruby 1.9 to be tested)
   sudo gem install slim_scrooge
 </pre>
 
-Then add this to your Rails::Initializer section in environment.rb:
+If the C extension does not build (perhaps you are on windows and do not have a C compiler), then do not worry - SlimScrooge has a second way of generating callsite information.  Ignore the error and carry on with the next step.
+
+Next add this to your Rails::Initializer section in environment.rb:
 
 <pre>
   config.gem 'slim_scrooge'
@@ -70,10 +72,20 @@ In fact for efficiency, column accesses are only recorded when they are for newl
 
 h2. Caveats
 
-It is possible to delete an object and then to try to use its attributes to access another object that perhaps must be also deleted (like the option :dependent=>:destroy in Rails associations).
+* It is possible to delete an object and then to try to use its attributes to access another object that perhaps must be also deleted (like the option :dependent=>:destroy in Rails associations).
 
 This situation is likely to be found rarely because SlimScrooge particularly checks for columns used by :dependent=>:destroy, but if you are doing something similar manually in your code then you may run into problems.  Your attempt to access the key of the dependent object could cause a reload if the column is not already noted by SlimScrooge, and the reload will fail if you have already destroyed the parent object.
 
+* Some users have complained that running their test suite is slower when SlimScrooge is enabled.  This is expected - it's doing a little more work for each query, and most queries in tests are only executed once.
+
+If it proves to be a problem, you can try this in environment.rb:
+
+<pre>
+  config.gem 'slim_scrooge' unless Rails.env.test?
+</pre>
+
+I do recommend you test with SlimScrooge enabled at some point though, to make sure that everything is working as expected.
+
 h2. Tests
 
 SlimScrooge performs the full activerecord test suite without errors, except for a couple of tests that check the number of queries performed.

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 1
-:minor: 0
 :build: 
+:minor: 0

data/lib/slim_scrooge/callsite.rb

@@ -9,7 +9,7 @@ module SlimScrooge
     ScroogeRegexJoin = /(?:LEFT|INNER|OUTER|CROSS)*\s*(?:STRAIGHT_JOIN|JOIN)/i
 
     attr_accessor :seen_columns
-    attr_reader :columns_hash, :primary_key, :model_class
+    attr_reader :columns_hash, :primary_key, :model_class_name
 
     class << self
       # Make a callsite if the query is of the right type for us to optimise
@@ -40,19 +40,19 @@ module SlimScrooge
 
     def initialize(model_class)
       @all_columns = SimpleSet.new(model_class.column_names)
-      @model_class = model_class
+      @model_class_name = model_class.to_s
       @quoted_table_name = model_class.quoted_table_name
       @primary_key = model_class.primary_key
       @quoted_primary_key = model_class.connection.quote_column_name(@primary_key)
       @columns_hash = model_class.columns_hash
       @select_regexp = self.class.select_regexp(model_class.table_name)
-      @seen_columns = SimpleSet.new(essential_columns)
+      @seen_columns = SimpleSet.new(essential_columns(model_class))
     end
 
     # List of columns that should always be fetched no matter what
     #
-    def essential_columns
-      @model_class.reflect_on_all_associations.inject([@primary_key]) do |arr, assoc|
+    def essential_columns(model_class)
+      model_class.reflect_on_all_associations.inject([@primary_key]) do |arr, assoc|
         if assoc.options[:dependent] && assoc.macro == :belongs_to
           arr << assoc.association_foreign_key
         end
@@ -81,11 +81,15 @@ module SlimScrooge
       "SELECT #{cols} FROM #{@quoted_table_name} WHERE #{@quoted_primary_key} IN (#{sql_keys})"
     end
 
+    def connection
+      @model_class_name.constantize.connection
+    end
+
     # Change a set of columns into a correctly quoted comma separated list
     #
     def scrooge_select_sql(set)
       set.collect do |name|
-        "#{@quoted_table_name}.#{@model_class.connection.quote_column_name(name)}"
+        "#{@quoted_table_name}.#{connection.quote_column_name(name)}"
       end.join(ScroogeComma)
     end
   end

data/lib/slim_scrooge/result_set.rb

@@ -26,8 +26,7 @@ module SlimScrooge
       callsite = Callsites[@callsite_key]
       rows_hash = rows_by_key(callsite.primary_key)
       sql = callsite.reload_sql(rows_hash.keys, @fetched_columns)
-      model_class = callsite.model_class
-      new_rows = model_class.connection.send(:select, sql, "#{model_class.name} Reload SlimScrooged")
+      new_rows = callsite.connection.send(:select, sql, "#{callsite.model_class_name} Reload SlimScrooged")
       new_rows.each do |row|
         if old_row = rows_hash[row[callsite.primary_key]]
           old_row.result_set = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: slim_scrooge
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +02:00
+date: 2009-12-26 00:00:00 +02:00
 default_executable: 
 dependencies: []