slim_scrooge 1.0.1 → 1.0.2

data/README.textile

@@ -20,6 +20,8 @@ In future releases I expect further gains.
 
 h2. Installation
 
+Requirements: Rails 2.2 or above, Ruby 1.8.6 or above.  (Ruby 1.9 to be tested)
+
 <pre>
   # if you haven't already, add gemcutter to your gem sources
   sudo gem install gemcutter
@@ -70,7 +72,7 @@ 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).
 
-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.
+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.
 
 h2. Tests
 

data/VERSION.yml

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

data/lib/slim_scrooge/callsite.rb

@@ -43,6 +43,7 @@ module SlimScrooge
       @model_class = model_class
       @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)
@@ -51,7 +52,7 @@ module SlimScrooge
     # List of columns that should always be fetched no matter what
     #
     def essential_columns
-      @model_class.reflect_on_all_associations.inject([@model_class.primary_key]) do |arr, assoc|
+      @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
@@ -77,7 +78,7 @@ module SlimScrooge
     def reload_sql(primary_keys, fetched_columns)
       sql_keys = primary_keys.collect{|pk| "'#{pk}'"}.join(ScroogeComma)
       cols = scrooge_select_sql(missing_columns(fetched_columns))
-      "SELECT #{cols} FROM #{@quoted_table_name} WHERE #{@quoted_table_name}.#{@primary_key} IN (#{sql_keys})"
+      "SELECT #{cols} FROM #{@quoted_table_name} WHERE #{@quoted_primary_key} IN (#{sql_keys})"
     end
 
     # Change a set of columns into a correctly quoted comma separated list

data/lib/slim_scrooge/callsites.rb

@@ -24,7 +24,7 @@ module SlimScrooge
       # together with the callsite_hash generated by callsite_hash.c
       #
       def callsite_key(callsite_hash, sql)
-        callsite_hash + sql.gsub(/WHERE.*/i, "").hash
+        callsite_hash + sql.gsub(/\sWHERE.*/i, "").hash
       end
 
       # Create a new callsite

data/lib/slim_scrooge/monitored_hash.rb

@@ -68,6 +68,12 @@ module SlimScrooge
       @monitored_columns.merge(self)
     end
     
+    def freeze
+      @result_set.reload! if @result_set
+      @monitored_columns.freeze
+      super
+    end
+    
     # Marshal
     # Dump a real hash - can't dump a monitored hash due to default proc
     #

metadata

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