From d77deb89d54b18c662ae3de103802e4d7a9d7d08 Mon Sep 17 00:00:00 2001
From: "Michael S. Klishin" <michael@novemberain.com>
Date: Sun, 28 Dec 2008 13:21:10 +0300
Subject: Annotated metaprogramming code across ActiveSupport

---
 .../core_ext/module/attribute_accessors.rb         | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'activesupport/lib/active_support/core_ext/module')

diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
index 51e1c9af90..9467eb71ac 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors.rb
@@ -14,18 +14,18 @@ class Module
   def mattr_reader(*syms)
     syms.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
@@ -33,19 +33,19 @@ class Module
   def mattr_writer(*syms)
     options = syms.extract_options!
     syms.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 = obj
+        end                      # end
+                                 
+        #{"                      
+        def #{sym}=(obj)         # def property=(obj)
+          @@#{sym} = obj         #   @@property = obj
+        end                      # end
         " unless options[:instance_writer] == false }
       EOS
     end
-- 
cgit v1.2.3


From c1aa5b0e14cd4bd27a5d8bd85cf7c36fa5911830 Mon Sep 17 00:00:00 2001
From: Yehuda Katz and Carl Lerche <wycats@gmail.com>
Date: Tue, 7 Apr 2009 14:57:18 -0700
Subject: Add depends_on, use, and setup to abstract up ideas about module
 inheritance.

---
 .../lib/active_support/core_ext/module/setup.rb    | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 activesupport/lib/active_support/core_ext/module/setup.rb

(limited to 'activesupport/lib/active_support/core_ext/module')

diff --git a/activesupport/lib/active_support/core_ext/module/setup.rb b/activesupport/lib/active_support/core_ext/module/setup.rb
new file mode 100644
index 0000000000..e6dfd0cf56
--- /dev/null
+++ b/activesupport/lib/active_support/core_ext/module/setup.rb
@@ -0,0 +1,26 @@
+class Module
+  attr_accessor :_setup_block
+  attr_accessor :_dependencies
+  
+  def setup(&blk)
+    @_setup_block = blk
+  end
+  
+  def use(mod)
+    return if self < mod
+    
+    (mod._dependencies || []).each do |dep|
+      use dep
+    end
+    # raise "Circular dependencies" if self < mod
+    include mod
+    extend mod.const_get("ClassMethods") if mod.const_defined?("ClassMethods")
+    class_eval(&mod._setup_block) if mod._setup_block
+  end
+  
+  def depends_on(mod)
+    return if self < mod
+    @_dependencies ||= []
+    @_dependencies << mod
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.3