Annotated metaprogramming code across ActiveSupport

3 files changed, 73 insertions, 73 deletions

diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
index 186ca69c05..6b2ac8b38b 100644
--- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb
@@ -10,18 +10,18 @@ class Class
   def cattr_reader(*syms)
     syms.flatten.each do |sym|
       next if sym.is_a?(Hash)
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}   # unless defined @@property
+          @@#{sym} = nil           #   @@property = nil
+        end                        # end
 
-        def self.#{sym}
-          @@#{sym}
-        end
+        def self.#{sym}            # def self.property
+          @@#{sym}                 #   @@property
+        end                        # end
 
-        def #{sym}
-          @@#{sym}
-        end
+        def #{sym}                 # def property
+          @@#{sym}                 #   @@property
+        end                        # end
       EOS
     end
   end
@@ -29,19 +29,19 @@ class Class
   def cattr_writer(*syms)
     options = syms.extract_options!
     syms.flatten.each do |sym|
-      class_eval(<<-EOS, __FILE__, __LINE__)
-        unless defined? @@#{sym}
-          @@#{sym} = nil
-        end
-
-        def self.#{sym}=(obj)
-          @@#{sym} = obj
-        end
-
-        #{"
-        def #{sym}=(obj)
-          @@#{sym} = obj
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        unless defined? @@#{sym}   # unless defined? @@property
+          @@#{sym} = nil           #   @@property = nil
+        end                        # end
+                                   
+        def self.#{sym}=(obj)      # def self.property=(obj)
+          @@#{sym} = obj           #   @@property
+        end                        # end
+                                   
+        #{"                        
+        def #{sym}=(obj)           # def property=(obj)
+          @@#{sym} = obj           #   @@property = obj
+        end                        # end
         " unless options[:instance_writer] == false }
       EOS
     end
diff --git a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
index 368317df9b..3b093a9a65 100644
--- a/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/delegating_attributes.rb
@@ -8,33 +8,33 @@ class Class
   def superclass_delegating_reader(*names)
     class_name_to_stop_searching_on = self.superclass.name.blank? ? "Object" : self.superclass.name
     names.each do |name|
-      class_eval <<-EOS
-      def self.#{name}
-        if defined?(@#{name})
-          @#{name}
-        elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name})
-          superclass.#{name}
-        end
-      end
-      def #{name}
-        self.class.#{name}
-      end
-      def self.#{name}?
-        !!#{name}
-      end
-      def #{name}?
-        !!#{name}
-      end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+      def self.#{name}                                                                            # def self.property
+        if defined?(@#{name})                                                                     #   if defined?(@property)
+          @#{name}                                                                                #     @property
+        elsif superclass < #{class_name_to_stop_searching_on} && superclass.respond_to?(:#{name}) #   elseif superclass < Object && superclass.respond_to?(:property)
+          superclass.#{name}                                                                      #     superclass.property
+        end                                                                                       #   end
+      end                                                                                         # end
+      def #{name}                                                                                 # def property
+        self.class.#{name}                                                                        #   self.class.property
+      end                                                                                         # end
+      def self.#{name}?                                                                           # def self.property?
+        !!#{name}                                                                                 #   !!property
+      end                                                                                         # end
+      def #{name}?                                                                                # def property?
+        !!#{name}                                                                                 #   !!property
+      end                                                                                         # end
       EOS
     end
   end
 
   def superclass_delegating_writer(*names)
     names.each do |name|
-      class_eval <<-EOS
-        def self.#{name}=(value)
-          @#{name} = value
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{name}=(value)     # def self.property=(value)
+          @#{name} = value           #   @property = value
+        end                          # end
       EOS
     end
   end
diff --git a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
index e6143a274b..8d0233ce9a 100644
--- a/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
+++ b/activesupport/lib/active_support/core_ext/class/inheritable_attributes.rb
@@ -10,14 +10,14 @@ class Class # :nodoc:
   def class_inheritable_reader(*syms)
     syms.each do |sym|
       next if sym.is_a?(Hash)
-      class_eval <<-EOS
-        def self.#{sym}
-          read_inheritable_attribute(:#{sym})
-        end
-
-        def #{sym}
-          self.class.#{sym}
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}                         # def self.after_add
+          read_inheritable_attribute(:#{sym})   #   read_inheritable_attribute(:after_add)
+        end                                     # end
+
+        def #{sym}                              # def after_add
+          self.class.#{sym}                     #   self.class.after_add
+        end                                     # end
       EOS
     end
   end
@@ -25,15 +25,15 @@ class Class # :nodoc:
   def class_inheritable_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
-      class_eval <<-EOS
-        def self.#{sym}=(obj)
-          write_inheritable_attribute(:#{sym}, obj)
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                         # def self.property=(obj)
+          write_inheritable_attribute(:#{sym}, obj)   #   write_inheritable_attribute(:property, obj)
+        end                                           # end
 
         #{"
-        def #{sym}=(obj)
-          self.class.#{sym} = obj
-        end
+        def #{sym}=(obj)                              # def property=(obj)
+          self.class.#{sym} = obj                     #   self.class.property = obj
+        end                                           # end
         " unless options[:instance_writer] == false }
       EOS
     end
@@ -42,15 +42,15 @@ class Class # :nodoc:
   def class_inheritable_array_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
-      class_eval <<-EOS
-        def self.#{sym}=(obj)
-          write_inheritable_array(:#{sym}, obj)
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                         # def self.property=(obj)
+          write_inheritable_array(:#{sym}, obj)       #   write_inheritable_array(:property, obj)
+        end                                           # end
 
         #{"
-        def #{sym}=(obj)
-          self.class.#{sym} = obj
-        end
+        def #{sym}=(obj)                              # def property=(obj)
+          self.class.#{sym} = obj                     #   self.class.property = obj
+        end                                           # end
         " unless options[:instance_writer] == false }
       EOS
     end
@@ -59,15 +59,15 @@ class Class # :nodoc:
   def class_inheritable_hash_writer(*syms)
     options = syms.extract_options!
     syms.each do |sym|
-      class_eval <<-EOS
-        def self.#{sym}=(obj)
-          write_inheritable_hash(:#{sym}, obj)
-        end
+      class_eval(<<-EOS, __FILE__, __LINE__ + 1)
+        def self.#{sym}=(obj)                         # def self.property=(obj)
+          write_inheritable_hash(:#{sym}, obj)        #   write_inheritable_hash(:property, obj)
+        end                                           # end
 
         #{"
-        def #{sym}=(obj)
-          self.class.#{sym} = obj
-        end
+        def #{sym}=(obj)                              # def property=(obj)
+          self.class.#{sym} = obj                     #   self.class.property = obj
+        end                                           # end
         " unless options[:instance_writer] == false }
       EOS
     end