config_context 0.4.1 → 0.5.0

data/README.rdoc

@@ -1,6 +1,7 @@
 = Config Context: 
 
-Your DSL config context...
+Your minimal and DSL config context...
+
 
 == Installing
     
@@ -8,7 +9,8 @@ The latest stable version is published in gemcutter.
 
   gem install config_context
 
-== How to use
+
+== How to use, some useful examples
 
   require 'rubygems'
   require 'config_context'
@@ -45,11 +47,16 @@ The latest stable version is published in gemcutter.
   end
   
   puts ConfigContext.a if( ConfigContext.a? )
-  puts ConfigContext.all.inspect
+  puts ConfigContext.to_hash.inspect
+
+
+  ##
+  #
+  #
 
 == TODO
 
-* Document all this stuff in english... I promise
+ * ???
 
 
 == License

data/lib/config_context.rb

@@ -4,35 +4,48 @@ require 'yaml'
 module ConfigContext
   extend self
   
-  @config = {}
+  @config = { }
   
   class Error < StandardError; end
   
+  
   private
+  
+  
+  def _method_to_key( method )
+    method.to_s.delete( '=?!' ).to_sym
+  end
+  
   def _add_property( method, *arguments )
-    
-    property_key          = method.to_s.delete( '=' ).to_sym
-    @config[property_key] = arguments.length == 1 ? arguments[0] : arguments
+    @config[_method_to_key( method )] = arguments.length == 1 ? arguments[0] : arguments
   end
   
   def _property?( method )
-    
-    property_key = method.to_s.delete( '?' ).to_sym
-    @config.keys.include?( property_key )
+    @config.keys.include?( _method_to_key( method ) )
   end
   
   def _get_property( method )
     @config[method]
   end
 
-  def configure_from_yaml( config_file ) 
+  def configure_from_hash( hash )
+    @config.merge!( hash )
+  end
+
+  def configure_from_yaml( config_file )
 
-    YAML.load_file( config_file ).each do |key,value|
-      
-      @config[key] = value
-    end
+    YAML.load_file( config_file ).each { |k, v| @config[k] = v }
   rescue Exception => e
     raise ConfigContext::Error.new( e.message )
+  end  
+
+  def self.deprecate( old_method, new_method ) 
+
+    define_method( old_method ) do |*arguments, &block|
+      
+      warn( "Warning: #{old_method}() is deprecated. Use #{new_method}() instead." )
+      send( new_method, *arguments, &block )
+    end 
   end
   
   
@@ -50,9 +63,11 @@ module ConfigContext
   
   def configure( *arguments, &block )
     
-    configuration = case arguments[0]
+    case arguments[0]
       when /\.(yml|yaml)/i
         configure_from_yaml( arguments[0] )
+      when Hash
+        configure_from_hash( arguments[0] )
       else
         yield self if block_given?
       end
@@ -61,8 +76,7 @@ module ConfigContext
   def to_hash()
     @config
   end
-
-  # Backward compat with older versions
-  alias :load :configure
-  alias :all :to_hash
+  
+  deprecate :load, :configure
+  deprecate :all,  :to_hash
 end

data/lib/version.rb

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

data/test/unit/test_config_context.rb

@@ -18,6 +18,7 @@ class TestConfigContext < Test::Unit::TestCase
     setup do
 
       ConfigContext.configure do |config|
+        
         config.mysymbol = TEST_SYMBOL
         config.mylist   = TEST_LIST
         config.myhash   = TEST_HASH
@@ -57,16 +58,29 @@ class TestConfigContext < Test::Unit::TestCase
       end
     end
 
-    should "load a Yaml file" do
+    should "configure from a Yaml file" do
           
-      assert_raises( ConfigContext::Error ) { ConfigContext.load( "very_bad_file.yml" ) }
+      assert_raises( ConfigContext::Error ) { ConfigContext.configure( "very_bad_file.yml" ) }
+      
       ConfigContext.configure( File.join( File.dirname( __FILE__ ), %w[ .. fixtures test.yml] ) )    
-      assert_equal( ConfigContext.all, { 
+      assert_equal( ConfigContext.to_hash, { 
         :mysymbol    =>TEST_SYMBOL, 
         :mylist      =>TEST_LIST, 
         :myhash      =>TEST_HASH 
       } )
     end
+
+    should "configurre from a Hash" do
+      
+      config_hash = { 
+        :mysymbol    =>TEST_SYMBOL, 
+        :mylist      =>TEST_LIST, 
+        :myhash      =>TEST_HASH 
+      }
+      
+      ConfigContext.configure( config_hash )
+      assert_equal( ConfigContext.to_hash, config_hash )
+    end
     
     should "update properties" do
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: config_context
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Javier Juarez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +02:00
+date: 2011-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency