Make InheritableOptions's constructor more flexible.

rails · Sep 27, 2010 · 8cda132 · 8cda132
1 parent 918dc27
commit 8cda132
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
@@ -30,7 +30,7 @@ def config
           superclass.config.inheritable_copy
         else
           # create a new "anonymous" class that will host the compiled reader methods
-          Class.new(Configuration).new({})
+          Class.new(Configuration).new
         end
       end
 

diff --git a/activesupport/lib/active_support/ordered_options.rb b/activesupport/lib/active_support/ordered_options.rb
@@ -36,8 +36,12 @@ def method_missing(name, *args)
   end
 
   class InheritableOptions < OrderedOptions
-    def initialize(parent)
+    def initialize(parent = nil)
-      super() { |h,k| parent[k] }
+      if parent
+        super() { |h,k| parent[k] }
+      else
+        super()
+      end
     end
 
     def inheritable_copy