config_context 0.7.2 → 0.7.3

data/lib/config_context.rb

@@ -16,33 +16,43 @@ module ConfigContext
       send(new_method, *arguments, &block)
     end 
   end
-  
+
+  def init
+    @config ||= Hash.new
+  end
   
   public
   def method_missing(method, *arguments, &block)
     
-    @config ||= { }
+    @config || init
     
     case method.to_s
-      when /(.+)=$/  then @config[method.to_s.delete("=").to_sym] = arguments.length == 1 ? arguments[0] : arguments
-      when /(.+)\?$/ then @config.keys.include?(method.to_s.delete("=?").to_sym)
+      when /(.+)=$/  then
+        property_key = method.to_s.delete('=').to_sym
+        
+        @config[property_key] = (arguments.size == 1) ? arguments[0] : arguments
+      
+      when /(.+)\?$/ then 
+        property_key = method.to_s.delete('?').to_sym
+
+        @config.keys.include?(property_key) #true/false
     else
 
-      if @config.keys.include?(method)
+      if @config.keys.include?(method) # any type
         @config[method]
-      else 
+     else
         super
       end
     end    
   end
   
   def erase!()
-    @config = { }
+    @config = Hash.new
   end
   
   def configure(source=nil, options={}, &block)
 
-    @config ||= { }
+    @config || init
     
     options = {:source=>nil, :context=>:root}.merge(options)
     
@@ -57,12 +67,13 @@ module ConfigContext
       end
     else
 
-      @config[options[:context]] ||= { }
+      context          = options[:context]
+      @config[context] ||= { } # New context
       
       case source
-        when /\.(yml|yaml)/i then @config[options[:context]].merge!(YAML.load_file(source)) rescue raise ConfigError.new("Problems loading file: #{source}")
-        when /\.json/i       then @config[options[:context]].merge!(JSON.parse(File.read(source))) rescue raise ConfigError.new("Problems loading file: #{source}")
-        when Hash            then @config[options[:context]].merge!(source)
+        when /\.(yml|yaml)/i then @config[context].merge!(YAML.load_file(source)) rescue raise ConfigError.new("Problems loading file: #{source}")
+        when /\.json/i       then @config[context].merge!(JSON.parse(File.read(source))) rescue raise ConfigError.new("Problems loading file: #{source}")
+        when Hash            then @config[context].merge!(source)
       else 
         yield self if block_given?
       end
@@ -72,24 +83,38 @@ module ConfigContext
   end
 
   def to_hash 
-    @config ||= { }
+    @config || init
   end
     
-  def to_s
-    "#{@config.inspect}"
-  end
-  
   def inspect
+    
+    @config || init
     @config.inspect
   end
+
+  def to_s
+    "#{@config.inspect}"
+  end  
   
   ##
   # Backward compability...
   def [](key)
-    @config ||= { } 
+    
+    @config || init 
     @config[key]
   end
   
+  def fetch(key,default=nil)
+    
+    @config || init
+    if @config.include?(key)
+      
+      @config[key]
+    else
+      default ? default : nil
+    end 
+  end
+  
   deprecate :load, :configure
   deprecate :all,  :to_hash
 end

data/lib/version.rb

@@ -4,7 +4,7 @@ module ConfigContext
     INFO = {
       :major =>0,
       :minor =>7,
-      :patch =>2
+      :patch =>3
     }
     
     def self.number(version_info=INFO)

data/test/{unit/test_config_context.rb → test_config_context.rb}

@@ -1,4 +1,4 @@
-$:.unshift(File.join(File.dirname(__FILE__), %w[.. .. lib]))
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. lib]))
 
 
 require 'rubygems'
@@ -8,9 +8,11 @@ require 'config_context'
 
 class TestConfigContext < Test::Unit::TestCase
 
-  TEST_SYMBOL = 'symbol value'
-  TEST_LIST   = [1, 2, 3]
-  TEST_HASH   = { "a"=>1, "b"=>2, "c"=>3 }
+  TEST_FILE_JSON = File.join(File.dirname(__FILE__), %w[fixtures test.json])
+  TEST_FILE_YAML = File.join(File.dirname(__FILE__), %w[fixtures test.yml])
+  TEST_SYMBOL    = 'symbol value'
+  TEST_LIST      = [1, 2, 3]
+  TEST_HASH      = { "a"=>1, "b"=>2, "c"=>3 }
    
    
   def setup
@@ -29,6 +31,7 @@ class TestConfigContext < Test::Unit::TestCase
     ConfigContext.erase!
   end
   
+  
   def test_configure_properties
   
     assert_equal(ConfigContext.mysymbol, TEST_SYMBOL)
@@ -37,6 +40,7 @@ class TestConfigContext < Test::Unit::TestCase
     assert_equal(ConfigContext.mysymbol, ConfigContext[:mysymbol])
   end
 
+
   def test_check_the_presence_of_some_properties
   
     assert(ConfigContext.mysymbol?)
@@ -44,6 +48,7 @@ class TestConfigContext < Test::Unit::TestCase
     assert(ConfigContext.myhash?)
     assert(!ConfigContext.thisdonotexist?)
   end
+
   
   def test_retrive_all_properties
    
@@ -53,6 +58,18 @@ class TestConfigContext < Test::Unit::TestCase
       :myhash   =>TEST_HASH
     })
   end
+
+
+  def test_retrive_all_properties_with_defaults
+   
+    assert(!ConfigContext.fetch(:mysymbol_))
+
+    assert_equal(ConfigContext.fetch(:mysymbol,  "default value"), "symbol value")
+    assert_equal(ConfigContext.fetch(:mysymbol_, "default value"), "default value")
+    assert_equal(ConfigContext.fetch(:mysymbol_, [1,2,3]), [1,2,3])
+    assert_equal(ConfigContext.fetch(:mysymbol_, {:a=>'a', :b=>'b'}), {:a=>'a', :b=>'b'})
+  end
+
   
   def test_retrieve_all_property_keys
 
@@ -79,6 +96,7 @@ class TestConfigContext < Test::Unit::TestCase
     assert_equal(ConfigContext.myhash, new_hash)
   end
 
+
   def test_configure_from_a_hash
     
     config_hash = { 
@@ -90,6 +108,7 @@ class TestConfigContext < Test::Unit::TestCase
     ConfigContext.configure(config_hash)
     assert_equal(ConfigContext.to_hash, config_hash)
   end
+
   
   def test_configuration_from_a_file_that_not_exist
   
@@ -98,6 +117,7 @@ class TestConfigContext < Test::Unit::TestCase
       assert_raises(ConfigContext::ConfigError) { ConfigContext.configure("this_file_do_not_exist.#{extension}") }
     end
   end
+
   
   def test_configuration_from_a_bad_format_file
   
@@ -109,24 +129,34 @@ class TestConfigContext < Test::Unit::TestCase
         :myhash   =>TEST_HASH 
         })
     end
+    
+    ConfigContext.erase!
+    
+    ['foo', 'bar', 'bazz'].each do |extension|
+    
+      assert_equal(ConfigContext.configure("this_file_do_not_exist.#{extension}").to_hash, {})
+    end
   end
+
   
   def test_configure_from_a_yaml_file
         
-    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.yml]))    
+    ConfigContext.configure(TEST_FILE_YAML)    
     assert_equal(ConfigContext.to_hash, { 
-      :mysymbol =>TEST_SYMBOL, 
-      :mylist   =>TEST_LIST, 
-      :myhash   =>TEST_HASH, 
+      :mysymbol  =>TEST_SYMBOL, 
+      :mylist    =>TEST_LIST, 
+      :myhash    =>TEST_HASH, 
       "mysymbol" =>TEST_SYMBOL, 
       "mylist"   =>TEST_LIST, 
       "myhash"   =>TEST_HASH
     })
   end
+
   
   def test_configure_from_a_yaml_file_in_a_context
         
-    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.yml]), :context=>:yaml)
+    ConfigContext.configure(TEST_FILE_YAML, :context=>:yaml)
+
     assert_equal(ConfigContext.to_hash, { 
       :mysymbol =>TEST_SYMBOL, 
       :mylist   =>TEST_LIST, 
@@ -137,24 +167,34 @@ class TestConfigContext < Test::Unit::TestCase
         "myhash"   =>TEST_HASH
       }
     })
+    
+    assert_equal(ConfigContext.yaml, { 
+      "mysymbol" =>TEST_SYMBOL, 
+      "mylist"   =>TEST_LIST, 
+      "myhash"   =>TEST_HASH
+    })
   end
 
+
   def test_configure_from_a_json_file
         
-    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.json]))    
+    ConfigContext.configure(TEST_FILE_JSON)    
+
     assert_equal(ConfigContext.to_hash, { 
-      :mysymbol =>TEST_SYMBOL, 
-      :mylist   =>TEST_LIST, 
-      :myhash   =>TEST_HASH, 
+      :mysymbol  =>TEST_SYMBOL, 
+      :mylist    =>TEST_LIST, 
+      :myhash    =>TEST_HASH, 
       "mysymbol" =>TEST_SYMBOL, 
       "mylist"   =>TEST_LIST, 
       "myhash"   =>TEST_HASH
     })
   end
 
+
   def test_configure_from_a_json_file_in_a_context
         
-    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.json]), :context=>:json)    
+    ConfigContext.configure(TEST_FILE_JSON, :context=>:json)    
+    
     assert_equal(ConfigContext.to_hash, { 
       :mysymbol =>TEST_SYMBOL, 
       :mylist   =>TEST_LIST, 
@@ -165,5 +205,11 @@ class TestConfigContext < Test::Unit::TestCase
         "myhash"   =>TEST_HASH
       }
     })
+    
+    assert_equal(ConfigContext.json, { 
+      "mysymbol" =>TEST_SYMBOL, 
+      "mylist"   =>TEST_LIST, 
+      "myhash"   =>TEST_HASH
+    })
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: config_context
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-30 00:00:00.000000000Z
+date: 2011-07-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153672740 !ruby/object:Gem::Requirement
+  requirement: &2156468160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153672740
+  version_requirements: *2156468160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153671400 !ruby/object:Gem::Requirement
+  requirement: &2156460860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153671400
+  version_requirements: *2156460860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153670380 !ruby/object:Gem::Requirement
+  requirement: &2156459540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153670380
+  version_requirements: *2156459540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153669100 !ruby/object:Gem::Requirement
+  requirement: &2156458460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153669100
+  version_requirements: *2156458460
 description: My config DSL
 email: javier.juarez@gmail.com
 executables: []
@@ -65,7 +65,7 @@ extra_rdoc_files:
 files:
 - lib/config_context.rb
 - lib/version.rb
-- test/unit/test_config_context.rb
+- test/test_config_context.rb
 - LICENSE
 - README.rdoc
 homepage: http://github.com/jjuarez/config_context