lib/ruby-conf.rb in ruby-conf-1.4.0 vs lib/ruby-conf.rb in ruby-conf-1.4.1

@@ -3,45 +3,96 @@
 # @author Hollin Wilkins & Curtis Schofield
 class RubyConf
   @@configs = {}
 
   class Config
+    attr_reader :attributes
+
     def initialize
       @attributes = {}
     end
 
     def [](name)
-      @attributes[name.to_sym]
+      value = @attributes[name.to_sym]
+
+      if value.is_a?(Proc)
+        value.call
+      else
+        value
+      end
     end
 
-    def method_missing(name, *args, &block)
-      case(args.size)
-      when 0:
-        if block_given?
-          @attributes[name.to_sym] = RubyConf.define(&block)
-        elsif @attributes.has_key? name.to_sym
-          value = @attributes[name.to_sym]
+    def []=(name,value)
+      @attributes[name.to_sym] = value
+    end
 
-          if value.is_a?(Proc)
-            value.call
-          else
-            value
-          end
-        else
-          super
-        end
-      when 1:
-        @attributes[name.to_sym] = args.first
-      else
-        @attributes[name.to_sym] = args
+    def inherit(name, parent)
+      self[name] = Config.new
+      self[name].attributes.merge! parent.attributes.clone
+    end
+
+    def []=(name,value)
+      @attributes[name.to_sym] = value
+    end
+
+    def method_missing(name, *args, &block)
+      if block_given?
+        _inherit(name, args)
+        _set_config_with_block(name,block)
+        return
       end
+
+      super if 0 == args.size && !@attributes.has_key?(name.to_sym)
+
+      _set_or_get_attribute(name, args)
     end
 
     def respond_to?(name)
       if @attributes.has_key? name.to_sym
         true
+      elsif @parent
+        @parent.respond_to?(name)
       else
         super
+      end
+    end
+
+    private
+
+    def _set_or_get_attribute(name, args)
+      case(args.size)
+      when 0:
+        # config.something 
+        # => 'value' 
+        self[name]
+      when 1:
+        # config.something "value"
+        self[name] = args.first
+      else
+        # config.something "value", "value2"
+        self[name] = args
+      end
+    end
+
+    def _update_config_with_block(name,block)
+      self[name].instance_eval(&block)
+    end
+
+    def _new_config_with_block(name, block)
+      self[name] = RubyConf.define(&block)
+    end
+
+    def _set_config_with_block(name, block)
+      if self[name].is_a?(Config)
+        _update_config_with_block(name,block)
+      else
+        _new_config_with_block(name,block)
+      end
+    end
+
+    def _inherit(name, args)
+      if args.size > 0 && args.first.is_a?(Hash) && args.first.has_key?(:inherits)
+        inherit name, args.first[:inherits]
       end
     end
   end
   #  Define a configuration:
   #