renamed nest to nest_config

thinkerbot · Nov 22, 2010 · eed766b · eed766b
1 parent 083e3de
commit eed766b
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/lib/configurable/class_methods.rb b/lib/configurable/class_methods.rb
@@ -1,4 +1,5 @@
 require 'lazydoc'
+require 'configurable/config_classes'
 require 'configurable/config_hash'
 require 'configurable/conversions'
 
@@ -10,15 +11,14 @@ module Configurable
     :integer => ConfigClasses::IntegerConfig,
     :float   => ConfigClasses::FloatConfig,
     :string  => ConfigClasses::StringConfig,
-    :nest    => ConfigClasses::Nest,
+    :nest    => ConfigClasses::NestConfig,
     :obj     => ConfigClasses::Config
   }
 
   # ClassMethods extends classes that include Configurable and provides methods
   # for declaring configurations.
   module ClassMethods
     include ConfigClasses
-    include ConfigClasses
 
     # A hash of (key, Config) pairs tracking configs defined on self.  See the
     # configs method for all configs declared across all ancestors.
@@ -314,7 +314,7 @@ def check_infinite_nest(klass) # :nodoc:
       raise "infinite nest detected" if klass == self
 
       klass.configs.each_value do |config|
-        if config.kind_of?(Nest)
+        if config.kind_of?(NestConfig)
           check_infinite_nest(config.configurable.class)
         end
       end

diff --git a/lib/configurable/config_classes.rb b/lib/configurable/config_classes.rb
@@ -1,6 +1,6 @@
 require 'configurable/config_classes/config'
 require 'configurable/config_classes/list'
-require 'configurable/config_classes/nest'
+require 'configurable/config_classes/nest_config'
 require 'configurable/config_classes/string_config'
 require 'configurable/config_classes/boolean_config'
 require 'configurable/config_classes/integer_config'

diff --git a/lib/configurable/config_classes/nest.rb → ...onfigurable/config_classes/nest_config.rb b/lib/configurable/config_classes/nest.rb → ...onfigurable/config_classes/nest_config.rb
@@ -2,7 +2,7 @@ module Configurable
   module ConfigClasses
 
     # Represents a config where the input is expected to be Configurable.
-    class Nest < Config
+    class NestConfig < Config
       matches Configurable
 
       def configurable

diff --git a/lib/configurable/conversions.rb b/lib/configurable/conversions.rb
@@ -1,5 +1,4 @@
 require 'config_parser'
-require 'configurable/config_classes'
 
 module Configurable
 

diff --git a/.../configurable/config_classes/nest_test.rb → ...urable/config_classes/nest_config_test.rb b/.../configurable/config_classes/nest_test.rb → ...urable/config_classes/nest_config_test.rb
@@ -1,11 +1,9 @@
 require File.expand_path('../../../test_helper', __FILE__) 
 require 'configurable/config_classes'
-require 'configurable/config_classes'
 require 'configurable/config_hash'
 require 'ostruct'
 
-class NestTest < Test::Unit::TestCase
-  include Configurable::ConfigClasses
+class NestConfigTest < Test::Unit::TestCase
   include Configurable::ConfigClasses
   ConfigHash = Configurable::ConfigHash
 
@@ -30,7 +28,7 @@ def initialize_copy(orig)
 
   def setup
     Child.configs = {}
-    @nest = Nest.new(:key, :default => Child.new)
+    @nest = NestConfig.new(:key, :default => Child.new)
   end
 
   #

diff --git a/test/configurable/conversions_test.rb b/test/configurable/conversions_test.rb
@@ -3,7 +3,6 @@
 require 'configurable/config_classes'
 
 class ConversionsTest < Test::Unit::TestCase
-  include Configurable::ConfigClasses
   include Configurable::ConfigClasses
   Conversions = Configurable::Conversions
 

diff --git a/test/configurable_test.rb b/test/configurable_test.rb
@@ -497,7 +497,7 @@ class Outer
 
   def test_config_generates_a_nest_config_for_configurable_default
     config = NestClass.configs[:outer]
-    assert_equal Nest, config.class
+    assert_equal NestConfig, config.class
     assert_equal NestClass::Outer, config.configurable.class
     assert_equal({:inner => 1}, config.cast({'inner' => '1'}))
   end
@@ -509,7 +509,7 @@ class HashNestClass
 
   def test_config_generates_a_nest_config_and_configurable_class_for_hash_default
     config = HashNestClass.configs[:outer]
-    assert_equal Nest, config.class
+    assert_equal NestConfig, config.class
     assert_equal HashNestClass::Outer, config.configurable.class
     assert_equal({:inner => 1}, config.cast({'inner' => '1'}))
   end
@@ -523,7 +523,7 @@ class BlockNestClass
 
   def test_config_generates_a_nest_config_and_configurable_class_for_block
     config = BlockNestClass.configs[:outer]
-    assert_equal Nest, config.class
+    assert_equal NestConfig, config.class
     assert_equal BlockNestClass::Outer, config.configurable.class
     assert_equal({:inner => 1}, config.cast({'inner' => '1'}))
   end