From 30472d4244f08ad861590fb41dd75efb5f274422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 19 Apr 2011 17:56:46 +0200
Subject: Avoid define_method if possible.

---
 activemodel/lib/active_model/attribute_methods.rb  | 51 +++++++++++++++++-----
 .../lib/active_record/attribute_methods/read.rb    |  2 +-
 .../lib/active_record/attribute_methods/write.rb   |  2 +-
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/activemodel/lib/active_model/attribute_methods.rb b/activemodel/lib/active_model/attribute_methods.rb
index be55581c66..137657bd29 100644
--- a/activemodel/lib/active_model/attribute_methods.rb
+++ b/activemodel/lib/active_model/attribute_methods.rb
@@ -56,6 +56,8 @@ module ActiveModel
   module AttributeMethods
     extend ActiveSupport::Concern
 
+    COMPILABLE_REGEXP = /^[a-zA-Z_]\w*[!?=]?$/
+
     included do
       class_attribute :attribute_method_matchers, :instance_writer => false
       self.attribute_method_matchers = []
@@ -106,13 +108,16 @@ module ActiveModel
         if block_given?
           sing.send :define_method, name, &block
         else
-          if name =~ /^[a-zA-Z_]\w*[!?=]?$/
-            sing.class_eval <<-eorb, __FILE__, __LINE__ + 1
-                def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
-            eorb
+          # If we can compile the method name, do it. Otherwise use define_method.
+          # This is an important *optimization*, please don't change it. define_method
+          # has slower dispatch and consumes more memory.
+          if name =~ COMPILABLE_REGEXP
+            sing.class_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{name}; #{value.nil? ? 'nil' : value.to_s.inspect}; end
+            RUBY
           else
             value = value.to_s if value
-            sing.send(:define_method, name) { value }
+            sing.send(:define_method, name) { value && value.dup }
           end
         end
       end
@@ -232,8 +237,19 @@ module ActiveModel
 
       def alias_attribute(new_name, old_name)
         attribute_method_matchers.each do |matcher|
-          define_method(matcher.method_name(new_name)) do |*args|
-            send(matcher.method_name(old_name), *args)
+          matcher_new = matcher.method_name(new_name).to_s
+          matcher_old = matcher.method_name(old_name).to_s
+
+          if matcher_new =~ COMPILABLE_REGEXP && matcher_old =~ COMPILABLE_REGEXP
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{matcher_new}(*args)
+                send(:#{matcher_old}, *args)
+              end
+            RUBY
+          else
+            define_method(matcher_new) do |*args|
+              send(matcher_old, *args)
+            end
           end
         end
       end
@@ -276,14 +292,25 @@ module ActiveModel
             else
               method_name = matcher.method_name(attr_name)
 
-              generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
+              generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
                 if method_defined?('#{method_name}')
                   undef :'#{method_name}'
                 end
-                define_method('#{method_name}') do |*args|
-                  send('#{matcher.method_missing_target}', '#{attr_name}', *args)
-                end
-              STR
+              RUBY
+
+              if method_name.to_s =~ COMPILABLE_REGEXP
+                generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                  def #{method_name}(*args)
+                    send(:#{matcher.method_missing_target}, '#{attr_name}', *args)
+                  end
+                RUBY
+              else
+                generated_attribute_methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
+                  define_method('#{method_name}') do |*args|
+                    send('#{matcher.method_missing_target}', '#{attr_name}', *args)
+                  end
+                RUBY
+              end
             end
           end
         end
diff --git a/activerecord/lib/active_record/attribute_methods/read.rb b/activerecord/lib/active_record/attribute_methods/read.rb
index a248eb3a7b..aef99e3129 100644
--- a/activerecord/lib/active_record/attribute_methods/read.rb
+++ b/activerecord/lib/active_record/attribute_methods/read.rb
@@ -79,7 +79,7 @@ module ActiveRecord
             #
             # The second, slower, branch is necessary to support instances where the database
             # returns columns with extra stuff in (like 'my_column(omg)').
-            if method_name =~ /^[a-zA-Z_]\w*[!?=]?$/
+            if method_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
               generated_attribute_methods.module_eval <<-STR, __FILE__, __LINE__
                 def _#{method_name}
                   #{access_code}
diff --git a/activerecord/lib/active_record/attribute_methods/write.rb b/activerecord/lib/active_record/attribute_methods/write.rb
index 7661676f8c..c77a3ac145 100644
--- a/activerecord/lib/active_record/attribute_methods/write.rb
+++ b/activerecord/lib/active_record/attribute_methods/write.rb
@@ -10,7 +10,7 @@ module ActiveRecord
       module ClassMethods
         protected
           def define_method_attribute=(attr_name)
-            if attr_name =~ /^[a-zA-Z_]\w*[!?=]?$/
+            if attr_name =~ ActiveModel::AttributeMethods::COMPILABLE_REGEXP
               generated_attribute_methods.module_eval("def #{attr_name}=(new_value); write_attribute('#{attr_name}', new_value); end", __FILE__, __LINE__)
             else
               generated_attribute_methods.send(:define_method, "#{attr_name}=") do |new_value|
-- 
cgit v1.2.3