config_context 0.3.5 → 0.4.0

data/lib/config_context.rb

@@ -4,7 +4,7 @@ require 'yaml'
 module ConfigContext
   extend self
   
-  @config = Hash.new
+  @config = {}
   
   class Error < StandardError; end
   
@@ -18,17 +18,25 @@ module ConfigContext
   def _property?( method )
     
     property_key = method.to_s.delete( '?' ).to_sym
-    
     @config.keys.include?( property_key )
   end
   
   def _get_property( method )
-    
     @config[method]
   end
+
+  def configure_from_yaml( config_file ) 
+
+    YAML.load_file( config_file ).each do |key,value|
+      
+      @config[key] = value
+    end
+  rescue Exception => e
+    raise ConfigContext::Error.new( e.message )
+  end
   
   
-  public
+  public  
   def method_missing( method, *arguments, &block )
     
     if( method.to_s =~ /(.+)=$/ )
@@ -39,22 +47,22 @@ module ConfigContext
       _get_property( method )
     end
   end
-
-  def load( config_file ) 
-
-    YAML.load_file( config_file ).each do |key,value|
-      
-      @config[key] = value
-    end
-  rescue Exception => e
-    raise ConfigContext::Error.new( e.message )
-  end
-
-  def configure()
-    yield self
+  
+  def configure( *arguments, &block )
+    
+    configuration = case arguments[0]
+      when /\.(yml|yaml)/i
+        configure_from_yaml( arguments[0] )
+      else
+        yield self if block_given?
+      end
   end
 
-  def all()
+  def to_hash()
     @config
   end
+
+  # Backward compat with older versions
+  alias :load :configure
+  alias :all :to_hash
 end

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Version
   INFO = {
     :major =>0,
-    :minor =>3,
-    :patch =>5
+    :minor =>4,
+    :patch =>0
   }
 
   NAME    = 'config_context'

data/test/unit/test_config_context.rb

@@ -42,7 +42,7 @@ class TestConfigContext < Test::Unit::TestCase
     
     should "retrive all properties" do
      
-      assert_equal( ConfigContext.all, { 
+      assert_equal( ConfigContext.to_hash, { 
         :mysymbol =>TEST_SYMBOL, 
         :mylist   =>TEST_LIST, 
         :myhash   =>TEST_HASH
@@ -53,14 +53,14 @@ class TestConfigContext < Test::Unit::TestCase
 
       [ :mysymbol, :mylist, :myhash ].each do |key|
       
-        assert( ConfigContext.all.keys.include?( key ) )
+        assert( ConfigContext.to_hash.keys.include?( key ) )
       end
     end
 
     should "load a Yaml file" do
           
       assert_raises( ConfigContext::Error ) { ConfigContext.load( "very_bad_file.yml" ) }
-      ConfigContext.load( File.join( File.dirname( __FILE__ ), %w[ .. fixtures test.yml] ) )    
+      ConfigContext.configure( File.join( File.dirname( __FILE__ ), %w[ .. fixtures test.yml] ) )    
       assert_equal( ConfigContext.all, { 
         :mysymbol    =>TEST_SYMBOL, 
         :mylist      =>TEST_LIST, 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: config_context
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 5
-  version: 0.3.5
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Javier Juarez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 +02:00
+date: 2011-05-19 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,5 +79,5 @@ rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Config Context for little applications
-test_files: 
-- test/unit/test_config_context.rb
+test_files: []
+