iqeo-conf 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iqeo-conf (0.0.4)
+    iqeo-conf (0.0.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -98,8 +98,7 @@ Need time (have motivation)...
 * Load configurations from a string or file after creation / in DSL block
 * Option to get hash directly to prevent polluting namespace with delegated hash methods
 * Blank slate for DSL ? - optional ?
-* Global configuration - watch for collisions ?
-* Issues around deferred interpolation / procs / lambdas etc...
+* Consider issues around deferred interpolation / procs / lambdas etc...
 * Load other formats into configuration - YAML, CSV, ...anything Enumerable should be easy enough.
 
 ## License

data/lib/iqeo/configuration/version.rb

@@ -1,5 +1,5 @@
 module Iqeo
   class Configuration
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/iqeo/configuration.rb

@@ -2,15 +2,15 @@
 require_relative "configuration/version"
 require_relative "configuration/hash_with_indifferent_access"
 
+# fix: nested configurations broken for DSL !!
+# todo: clean DSL syntax for creating a configuration - just a block ?
 # todo: configuration file load path - array of Dir.glob like file specs ?
 # todo: use an existing configuration for defaults
-# todo: clean DSL syntax for creating a configuration - just a block ?
 # todo: load configurations from a string or file after creation / in DSL block
 # todo: option to get hash directly to prevent polluting namespace with delegated hash methods
 # todo: blank slate for DSL - optional ?
-# todo: global configuration - watch for collisions ?
-# todo: deferred interpolation / procs / lambdas etc...
-# todo: load other formats from string & file - YAML, XML?
+# todo: consider issues around deferred interpolation / procs / lambdas etc...
+# todo: load other formats from string & file - YAML, CSV, ...anything Enumerable should be easy enough.
 
 module Iqeo
 
@@ -42,8 +42,8 @@ module Iqeo
       end
     end
 
-    def method_missing name, *values
-      return @items.send name, *values if @items.respond_to? name
+    def method_missing name, *values, &block
+      return @items.send name, *values if @items.respond_to? name    # @items methods are highest priority
       # this is unreachable since these methods are delegated to @items hash
       # but keep it around for when we make selective delegation an option
       #case name
@@ -51,9 +51,10 @@ module Iqeo
       #when :[]  then return _get values.shift
       #end
       name = name.to_s.chomp('=')        # todo: write a test case for a non-string object as key being converted by .to_s
-      return _get name if values.empty?
-      return _set name, values if values.size > 1
-      return _set name, values.first
+      return _set name, Configuration.new( &block ) if block_given?  # block is a nested configuration
+      return _get name if values.empty?                              # just get item
+      return _set name, values if values.size > 1                    # set item to multiple values
+      return _set name, values.first                                 # set item to single value
     end
 
     attr_accessor :_parent  # todo: should attr_writer be protected ?

data/spec/configuration_spec.rb

@@ -36,7 +36,7 @@ describe Configuration do
       conf_new.should be conf_yielded
     end
 
-  end
+  end # creation
 
   context 'settings retrieval' do
 
@@ -45,7 +45,7 @@ describe Configuration do
       conf.not_a_setting.should be_nil
     end
 
-  end
+  end # settings retrieval
 
   context 'single value setting' do
 
@@ -81,7 +81,7 @@ describe Configuration do
       conf.bravo[:c].should == 3
     end
 
-  end
+  end # single value setting
 
   context 'multiple value setting' do
 
@@ -107,7 +107,7 @@ describe Configuration do
       conf.alpha.should == [ 1, 2, 3, { 'a' => 4, 'b' => 5, 'c' => 6} ] and conf.alpha.should be_a Array
     end
 
-  end
+  end # multiple value setting
 
   context 'hash operators [] & []= access' do
 
@@ -130,7 +130,7 @@ describe Configuration do
       conf['alpha'].should == 1
     end
 
-  end
+  end # hash operators [] & []= access
 
   context 'nested configuration' do
 
@@ -208,120 +208,279 @@ describe Configuration do
       conf.alpha.bravo.level.should == 3
     end
 
-  end
-
-  context 'yield DSL' do
-
-    it 'accepts settings without =' do
-      conf = nil
-      expect do
-        conf = Configuration.new do |c|
-          c.alpha :value
-        end
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.should == :value
-    end
-
-    it 'accepts settings with =' do
-      conf = nil
-      expect do
-        conf = Configuration.new do |c|
-          c.alpha = :value
-        end
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.should == :value
-    end
-
-    it 'can refer to an existing setting' do
-      conf = nil
-      expect do
-        conf = Configuration.new do |c|
-          c.alpha = :value
-          c.bravo = c.alpha
-          c.charlie c.bravo
-        end
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.should == :value
-      conf.bravo.should == :value
-      conf.charlie.should == :value
-    end
-
-    it 'returns value when creating/changing a setting' do
-      conf = nil
-      expect do
-        conf = Configuration.new do |c|
-          c.bravo = c.alpha = :value
-        end
-      end.to_not raise_error
-      conf.alpha.should == :value
-      conf.bravo.should == :value
-    end
-
-  end
-
-  context 'instance_eval DSL' do
-
-    it 'accepts settings without =' do
-      conf = nil
-      expect do
-        conf = Configuration.new do
-          alpha :value
-        end
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.should == :value
-    end
-
-    it 'sets local variables with =' do
-      conf = alpha = nil
-      expect do
-        alpha = nil
-        conf = Configuration.new do
-          alpha = :value
-          bravo alpha
-        end
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.should be_nil
-      conf.bravo.should == :value
-      alpha.should == :value        # local alpha set by matching variables
-    end
-
-    it 'can refer to an existing setting' do
-      conf = nil
-      expect do
-        conf = Configuration.new do |c|
-          c.alpha :value
-          c.bravo c.alpha
-          c.charlie c.bravo
-        end
-      end.to_not raise_error
-      conf.should_not be_nil
-      conf.alpha.should == :value
-      conf.bravo.should == :value
-      conf.charlie.should == :value
-    end
-
-    it 'returns value when creating/changing a setting' do
-      conf = nil
-      expect do
-        conf = Configuration.new do
-          bravo alpha :value
-        end
-      end.to_not raise_error
-      conf.alpha.should == :value
-      conf.bravo.should == :value
-    end
-
-  end
+  end # nested configuration
+
+  context 'mode of usage' do
+
+    context 'explicit' do
+
+      it 'accepts settings without =' do
+        conf = nil
+        expect do
+          conf = Configuration.new
+          conf.alpha :value
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+      end
+
+      it 'accepts settings with =' do
+        conf = nil
+        expect do
+          conf = Configuration.new
+          conf.alpha = :value
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+      end
+
+      it 'can refer to an existing setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new
+          conf.alpha = :value
+          conf.bravo = conf.alpha
+          conf.charlie conf.bravo
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+        conf.bravo.should == :value
+        conf.charlie.should == :value
+      end
+
+      it 'returns value when creating/changing a setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new
+          conf.bravo = conf.alpha = :value
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+        conf.bravo.should == :value
+      end
+
+      it 'supports nested configuration via Configuration.new' do
+        conf = nil
+        expect do
+          conf = Configuration.new
+          conf.alpha true
+          conf.bravo Configuration.new
+          conf.bravo.charlie true
+          conf.bravo.delta Configuration.new
+          conf.bravo.delta.echo true
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+      end
+
+    end # explicit
+
+    context 'yield DSL' do
+
+      it 'accepts settings without =' do
+        conf = nil
+        expect do
+          conf = Configuration.new do |c|
+            c.alpha :value
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+      end
+
+      it 'accepts settings with =' do
+        conf = nil
+        expect do
+          conf = Configuration.new do |c|
+            c.alpha = :value
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+      end
+
+      it 'can refer to an existing setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new do |c|
+            c.alpha = :value
+            c.bravo = c.alpha
+            c.charlie c.bravo
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+        conf.bravo.should == :value
+        conf.charlie.should == :value
+      end
+
+      it 'returns value when creating/changing a setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new do |c|
+            c.bravo = c.alpha = :value
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+        conf.bravo.should == :value
+      end
+
+      it 'supports nested configuration via do..end' do
+        conf = nil
+        expect do
+          conf = Configuration.new do |c1|
+            c1.alpha true
+            c1.bravo do |c2|
+              c2.charlie true
+              c2.delta do |c3|
+                c3.echo true
+              end
+            end
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+      end
+
+      it 'supports nested configuration via {..}' do
+        conf = nil
+        expect do
+          conf = Configuration.new { |c1| c1.alpha true ; c1.bravo { |c2| c2.charlie true ; c2.delta { |c3| c3.echo true } } }
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+      end
+
+    end # yield DSL
+
+    context 'instance_eval DSL' do
+
+      it 'accepts settings without =' do
+        conf = nil
+        expect do
+          conf = Configuration.new do
+            alpha :value
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+      end
+
+      it 'sets local variables with =' do
+        conf = alpha = nil
+        expect do
+          alpha = nil
+          conf = Configuration.new do
+            alpha = :value
+            bravo alpha
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_nil
+        conf.bravo.should == :value
+        alpha.should == :value        # local alpha set by matching variables
+      end
+
+      it 'can refer to an existing setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new do
+            alpha :value
+            bravo alpha
+            charlie bravo
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+        conf.bravo.should == :value
+        conf.charlie.should == :value
+      end
+
+      it 'returns value when creating/changing a setting' do
+        conf = nil
+        expect do
+          conf = Configuration.new do
+            bravo alpha :value
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should == :value
+        conf.bravo.should == :value
+      end
+
+      it 'supports nested configuration via do..end' do
+        conf = nil
+        expect do
+          conf = Configuration.new do
+            alpha true
+            bravo do
+              charlie true
+              delta do
+                echo true
+              end
+            end
+          end
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+      end
+
+      it 'supports nested configuration via {..}' do
+        conf = nil
+        expect do
+          conf = Configuration.new { |c1| c1.alpha true ; c1.bravo { |c2| c2.charlie true ; c2.delta { |c3| c3.echo true } } }
+        end.to_not raise_error
+        conf.should_not be_nil
+        conf.alpha.should be_true
+        conf.bravo.should be_a Configuration
+        conf.bravo.alpha should be_true
+        conf.bravo.charlie should be_true
+        conf.bravo.delta.should be_a Configuration
+        conf.bravo.delta.alpha.should be_true
+        conf.bravo.delta.charlie.should be_true
+        conf.bravo.delta.echo.should be_true
+      end
+
+    end # instance_eval DSL
+
+  end # mode of usage
 
   context 'loads' do
 
-    it 'simple eval DSL from string' do
-      string = "alpha 1\nbravo 'two'\ncharlie 3.0\ndelta :four"
+    it 'simple instance_eval DSL from string' do
+      string = "alpha 1
+                bravo 'two'
+                charlie 3.0
+                delta :four"
       conf = nil
       expect do
         conf = Configuration.read string
@@ -333,8 +492,11 @@ describe Configuration do
       conf.delta.should   == :four and conf.delta.should be_a Symbol
     end
 
-    it 'simple eval DSL from file (by StringIO fake)' do
-      io = StringIO.new "alpha 1\nbravo 'two'\ncharlie 3.0\ndelta :four"
+    it 'simple instance_eval DSL from file (by StringIO fake)' do
+      io = StringIO.new  "alpha 1
+                          bravo 'two'
+                          charlie 3.0
+                          delta :four"
       conf = nil
       expect do
         conf = Configuration.file io
@@ -346,10 +508,13 @@ describe Configuration do
       conf.delta.should   == :four and conf.delta.should be_a Symbol
     end
 
-    it 'simple eval DSL from file (by mock and expected methods)' do
+    it 'simple instance_eval DSL from file (by mock and expected methods)' do
       file = mock
       file.should_receive( :respond_to? ).with( :read ).and_return true
-      file.should_receive( :read ).and_return "alpha 1\nbravo 'two'\ncharlie 3.0\ndelta :four"
+      file.should_receive( :read ).and_return  "alpha 1
+                                                bravo 'two'
+                                                charlie 3.0
+                                                delta :four"
       conf = nil
       expect do
         conf = Configuration.file file
@@ -361,8 +526,11 @@ describe Configuration do
       conf.delta.should   == :four and conf.delta.should be_a Symbol
     end
 
-    it 'simple eval DSL from filename (by expected methods)' do
-      File.should_receive( :read ).with( "filename" ).and_return "alpha 1\nbravo 'two'\ncharlie 3.0\ndelta :four"
+    it 'simple instance_eval DSL from filename (by expected methods)' do
+      File.should_receive( :read ).with( "filename" ).and_return "alpha 1
+                                                                  bravo 'two'
+                                                                  charlie 3.0
+                                                                  delta :four"
       conf = nil
       expect do
         conf = Configuration.file "filename"
@@ -374,7 +542,30 @@ describe Configuration do
       conf.delta.should   == :four and conf.delta.should be_a Symbol
     end
 
-  end
+    it 'complex instance_eval DSL from string' do
+      string = "alpha true
+                bravo do
+                  charlie true
+                  delta do
+                    echo true
+                  end
+                end"
+      conf = nil
+      expect do
+        conf = Configuration.read string
+      end.to_not raise_error
+      conf.should_not be_nil
+      conf.alpha.should be_true
+      conf.bravo.should be_a Configuration
+      conf.bravo.alpha should be_true
+      conf.bravo.charlie should be_true
+      conf.bravo.delta.should be_a Configuration
+      conf.bravo.delta.alpha.should be_true
+      conf.bravo.delta.charlie.should be_true
+      conf.bravo.delta.echo.should be_true
+    end
+
+  end # loads
 
   it 'delegates hash methods to internal hash' do
     conf = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqeo-conf
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -67,6 +67,7 @@ files:
 - pkg/iqeo-conf-0.0.2.gem
 - pkg/iqeo-conf-0.0.3.gem
 - pkg/iqeo-conf-0.0.4.gem
+- pkg/iqeo-conf-0.0.5.gem
 - spec/configuration_spec.rb
 - spec/spec_helper.rb
 homepage: http://iqeo.github.com/iqeo-conf