slim_scrooge 1.0.10 → 1.0.11

data/README.textile

@@ -113,3 +113,4 @@ h2. References
 h2. Authors
 * Stephen Sykes (sdsykes)
 * Special thanks to Lourens Naudé (methodmissing) for the original idea, and the C implementation of callsite_hash as well as some other bits of code that I borrowed from the original project.
+* Thanks to Steve Purcell for fixes and help

data/Rakefile

@@ -9,21 +9,3 @@ Rake::TestTask.new(:test_with_active_record) do |t|
   t.ruby_opts = ["-r #{File.join(File.dirname(__FILE__), 'test', 'active_record_setup')}"]
   t.verbose = true
 end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "slim_scrooge"
-    s.summary = "Slim_scrooge - serious optimisation for ActiveRecord"
-    s.email = "sdsykes@gmail.com"
-    s.homepage = "http://github.com/sdsykes/slim_scrooge"
-    s.description = "Slim scrooge boosts speed in Rails ActiveRecord Models by only querying the database for what is needed."
-    s.authors = ["Stephen Sykes"]
-    s.files = FileList["[A-Z]*", "{ext,lib,test}/**/*"]
-    s.extensions = "ext/Rakefile"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://
-gems.github.com"
-end

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :build: 
 :minor: 0
-:patch: 10
+:patch: 11

data/lib/slim_scrooge/monitored_hash.rb

@@ -29,7 +29,7 @@ module SlimScrooge
     #
     def new_column_access(name)
       if @callsite.columns_hash.has_key?(name)
-        @result_set.reload! if @result_set && name != @callsite.primary_key
+        @result_set.reload! if !@result_set.nil? && name != @callsite.primary_key
         Callsites.add_seen_column(@callsite, name)
       end
       @monitored_columns[name]
@@ -40,7 +40,7 @@ module SlimScrooge
     def []=(name, value)
       if has_key?(name)
         return super
-      elsif @result_set && @callsite.columns_hash.has_key?(name)
+      elsif !@result_set.nil? && @callsite.columns_hash.has_key?(name)
         @result_set.reload!
         Callsites.add_seen_column(@callsite, name)
       end
@@ -50,13 +50,13 @@ module SlimScrooge
     # Returns the column names
     #
     def keys
-      @result_set ? @callsite.columns_hash.keys : super | @monitored_columns.keys
+      !@result_set.nil? ? @callsite.columns_hash.keys : super | @monitored_columns.keys
     end
     
     # Check for a column name
     #
     def has_key?(name)
-      @result_set ? @callsite.columns_hash.has_key?(name) : super || @monitored_columns.has_key?(name)
+      !@result_set.nil? ? @callsite.columns_hash.has_key?(name) : super || @monitored_columns.has_key?(name)
     end
     
     alias_method :include?, :has_key?
@@ -64,12 +64,12 @@ module SlimScrooge
     # Called by Hash#update when reload is called on an ActiveRecord object
     #
     def to_hash
-      @result_set.reload! if @result_set
+      @result_set.reload! unless @result_set.nil?
       @monitored_columns.merge(self)
     end
     
     def freeze
-      @result_set.reload! if @result_set
+      @result_set.reload! unless @result_set.nil?
       @monitored_columns.freeze
       super
     end
@@ -87,17 +87,19 @@ module SlimScrooge
   end
 end
 
-# We need to change the update method of Hash so that it *always* calls
-# to_hash.  This is because it normally checks if other_hash is a kind of
-# Hash, and doesn't bother calling to_hash if so.  But we need it to call
-# to_hash, because otherwise update will not get the complete columns
-# from a MonitoredHash
+# We need to change the update method of Hash so that it *always*
+# calls to_hash on MonitoredHash instances.  This is because it
+# normally checks if other_hash is a kind of Hash, and doesn't bother
+# calling to_hash if so.  But we need it to call to_hash, because
+# otherwise update will not get the complete columns from a
+# MonitoredHash
 #
 # This is not harmful - to_hash in a regular Hash just returns self.
 #
 class Hash
   alias_method :c_update, :update
   def update(other_hash, &block)
-    c_update(other_hash.to_hash, &block)
+    c_update(other_hash.is_a?(::SlimScrooge::MonitoredHash) ? other_hash.to_hash : other_hash,
+             &block)
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slim_scrooge
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Stephen Sykes
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +03:00
+date: 2010-12-20 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -55,23 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Slim_scrooge - serious optimisation for ActiveRecord