ruby-conf 1.4.0 → 1.4.1

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/lib/ruby-conf.rb

@@ -5,44 +5,95 @@ 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 []=(name,value)
+      @attributes[name.to_sym] = value
+    end
+
+    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)
-      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]
-
-          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
+      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:
   #

data/ruby-conf.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruby-conf}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Curtis Schofield & Hollin Wilkins"]

data/spec/lib/ruby-conf_spec.rb

@@ -14,7 +14,7 @@ require 'ruby-conf'
 
 describe RubyConf do
   subject { RubyConf }
-  
+   
   describe ".define" do
     context "no arguments" do
       it "returns anonymous config" do
@@ -24,6 +24,36 @@ describe RubyConf do
         config.equality.should be_true
       end
     end
+    context ":inherit" do
+      let(:inherited_config) do 
+        RubyConf.define "inherited_config" do
+          basic do
+            thing do
+              origin "swamp"
+            end
+          end
+
+          laboritory :inherits => basic do
+            thing do
+              strong true
+            end
+          end
+
+          city :inherits => basic do
+            thing do
+              origin "ocean"
+            end
+          end
+
+        end
+      end
+      it "pre-loads a config with a existing config" do
+        inherited_config.laboritory.thing.origin.should == inherited_config.basic.thing.origin
+      end
+      it "does not overwrite values" do
+        inherited_config.city.thing.origin.should == "ocean"
+      end
+    end
     context ":as" do 
       it "creates a global Constant" do
         subject.define "rails_database", :as => :RailsDatabase do
@@ -34,6 +64,19 @@ describe RubyConf do
         ::RailsDatabase.production[:password].should_not be_nil
       end
     end
+    it "can reopen configs" do
+      config = subject.define do
+        godzilla do
+          spines false
+          awesome true
+        end
+      end
+      config.godzilla do
+        spines true
+      end
+      config.godzilla.spines.should == true
+      config.godzilla.awesome.should == true
+    end
     it "returns a named config" do
       config = subject.define "a_name" do
         something "hi"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-conf
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 4
-  - 0
-  version: 1.4.0
+  - 1
+  version: 1.4.1
 platform: ruby
 authors: 
 - Curtis Schofield & Hollin Wilkins