methodmissing-scrooge 2.2.1 → 2.2.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
-:major: 2
 :minor: 2
+:patch: 2
+:major: 2

data/lib/optimizations/columns/attributes_proxy.rb

@@ -1,21 +1,30 @@
-class Hash
-  
-  # TODO: Circumvent this hack  
-  alias_method :update_without_scrooge, :update
-  def update(other)
-    update_without_scrooge(other.to_hash)
-  end
-  
-end
-
 module Scrooge
   module Optimizations
     module Columns
-      class AttributesProxy < Hash
-        
-        # Hash like Proxy container for attributes
+      class UnscroogedAttributes < Hash
+
+        # Hash container for attributes when scrooge is not used
         #        
+
+        def self.setup(record)
+          new.replace(record)
+        end
+
+        # Must call to_hash - other hash may be ScroogedAttributes and
+        # must be fully fetched if so
+        #
+        def update(hash)
+          super(hash.to_hash)
+        end
+
+        alias_method :merge!, :update
+      end
+
+      class ScroogedAttributes < Hash
         
+        # Hash container for attributes with scrooge monitoring of attribute access
+        #        
+
         attr_accessor :callsite_signature, :scrooge_columns, :fully_fetched, :klass
 
         def self.setup(record, scrooge_columns, klass, callsite_signature)
@@ -88,7 +97,7 @@ module Scrooge
 
         def update(hash)
           @fully_fetched = true
-          super
+          super(hash.to_hash)
         end
         
         alias_method :merge!, :update
@@ -107,17 +116,15 @@ module Scrooge
 
           def fetch_remaining!( columns_to_fetch )
             begin
-              new_object = fetch_record_with_remaining_columns( columns_to_fetch )
+              remaining_attributes = fetch_record_with_remaining_columns( columns_to_fetch )
             rescue ActiveRecord::RecordNotFound
               raise ActiveRecord::MissingAttributeError, "scrooge cannot fetch missing attribute(s) #{columns_to_fetch.to_a.join(', ')} because record went away"
             end
-            replace(new_object.instance_variable_get(:@attributes).merge(self))
+            replace(remaining_attributes.merge(self))
           end
 
           def fetch_record_with_remaining_columns( columns_to_fetch )
-            @klass.send(:with_exclusive_scope) do
-              @klass.find(self[@klass.primary_key], :select=>@klass.scrooge_select_sql(columns_to_fetch))
-            end
+            @klass.scrooge_reload(self[@klass.primary_key], columns_to_fetch)
           end
 
           def interesting_for_scrooge?( attr_s )

data/lib/optimizations/columns/macro.rb

@@ -51,6 +51,14 @@ module Scrooge
           Marshal.load(str)
         end
         
+        # Efficient reloading - get the hash with missing attributes directly from the 
+        # underlying connection.
+        #
+        def scrooge_reload( p_key, missing_columns )
+          attributes = connection.send( :select, "SELECT #{scrooge_select_sql(missing_columns)} FROM #{quoted_table_name} WHERE #{quoted_table_name}.#{primary_key} = '#{p_key}'" ).first
+          attributes ? attributes : raise( ActiveRecord::RecordNotFound )
+        end
+        
         private
 
           # Only scope n-1 rows by default.
@@ -68,10 +76,16 @@ module Scrooge
             callsite_set = scrooge_callsite(callsite_signature).columns
             sql = sql.gsub(scrooge_select_regex, "SELECT #{scrooge_select_sql(callsite_set)} FROM")
             result = connection.select_all(sanitize_sql(sql), "#{name} Load Scrooged").collect! do |record|
-              instantiate( Scrooge::Optimizations::Columns::AttributesProxy.setup(record, callsite_set, self, callsite_signature) )
+              instantiate( Scrooge::Optimizations::Columns::ScroogedAttributes.setup(record, callsite_set, self, callsite_signature) )
             end
           end        
         
+          def find_by_sql_without_scrooge( sql )
+            result = connection.select_all(sanitize_sql(sql), "#{name} Load").collect! do |record|
+              instantiate( Scrooge::Optimizations::Columns::UnscroogedAttributes.setup(record) )
+            end
+          end
+          
             # Generate a regex that respects the table name as well to catch
             # verbose SQL from JOINS etc.
             # 
@@ -88,17 +102,18 @@ module Scrooge
       end
       
       module InstanceMethods
-        
+     
         def self.included( base )
           base.alias_method_chain :delete, :scrooge
           base.alias_method_chain :destroy, :scrooge
           base.alias_method_chain :respond_to?, :scrooge
+          base.alias_method_chain :attributes_from_column_definition, :scrooge
         end
         
         # Is this instance being handled by scrooge?
         #
         def scrooged?
-          @attributes.is_a?(Scrooge::Optimizations::Columns::AttributesProxy)
+          @attributes.is_a?(Scrooge::Optimizations::Columns::ScroogedAttributes)
         end        
         
         # Delete should fully load all the attributes before the @attributes hash is frozen
@@ -178,6 +193,12 @@ module Scrooge
           def scrooge_fetch_remaining
             @attributes.fetch_remaining if scrooged?
           end
+          
+          # New objects should get an UnscroogedAttributes as their @attributes hash
+          #
+          def attributes_from_column_definition_with_scrooge
+            UnscroogedAttributes.setup(attributes_from_column_definition_without_scrooge)
+          end
         
       end
       

data/lib/scrooge.rb

@@ -16,7 +16,6 @@ module ActiveRecord
       # Determine if a given SQL string is a candidate for callsite <=> columns
       # optimization.
       #     
-      alias :find_by_sql_without_scrooge :find_by_sql
       def find_by_sql(sql)
         if scope_with_scrooge?(sql)
           find_by_sql_with_scrooge(sql)

data/test/models/mysql_user.rb

@@ -1,4 +1,8 @@
 class MysqlUser < ActiveRecord::Base  
   set_table_name 'user'
   set_primary_key 'User'
+  
+  def after_initialize
+    max_connections if @attributes.has_key?("max_user_connections")
+  end
 end

data/test/scrooge_test.rb

@@ -63,6 +63,11 @@ class ScroogeTest < ActiveSupport::TestCase
     user.User
   end
   
+  test "should only fire after_initialize once" do
+    # should not raise ActiveRecord::MissingAttributeError
+    [:max_connections, :max_user_connections].each {|f| MysqlUser.find(:first).read_attribute(f)}
+  end
+  
   def first_callsite
     MysqlUser.scrooge_callsites.to_a.flatten.first
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: methodmissing-scrooge
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - "Lourens Naud\xC3\xA9"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -07:00
+date: 2009-03-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -20,8 +20,9 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README
+- README.textile
 files: 
 - Rakefile
 - README