config_context 0.5.0 → 0.6.0

data/lib/config_context.rb

@@ -4,79 +4,75 @@ require 'yaml'
 module ConfigContext
   extend self
   
-  @config = { }
+  @config ||= {}
   
   class Error < StandardError; end
-  
+
   
   private
-  
-  
-  def _method_to_key( method )
-    method.to_s.delete( '=?!' ).to_sym
+  def _add_property(property, *arguments)
+    @config[property.to_s.delete("=?").to_sym] = arguments.length == 1 ? arguments[0] : arguments
   end
   
-  def _add_property( method, *arguments )
-    @config[_method_to_key( method )] = arguments.length == 1 ? arguments[0] : arguments
+  def _exist_property?(property)
+    @config.keys.include?(property.to_s.delete("=?").to_sym)
   end
   
-  def _property?( method )
-    @config.keys.include?( _method_to_key( method ) )
-  end
-  
-  def _get_property( method )
-    @config[method]
-  end
-
-  def configure_from_hash( hash )
-    @config.merge!( hash )
+  def _get_property(property)
+    @config[property]
   end
 
-  def configure_from_yaml( config_file )
+  def self.deprecate(old_method, new_method) 
 
-    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|
+    define_method(old_method) do |*arguments, &block|
       
-      warn( "Warning: #{old_method}() is deprecated. Use #{new_method}() instead." )
-      send( new_method, *arguments, &block )
+      warn("#{old_method}() is deprecated. Use #{new_method}() instead.")
+      send(new_method, *arguments, &block)
     end 
   end
   
   
-  public  
-  def method_missing( method, *arguments, &block )
+  public
+  def method_missing(method, *arguments, &block)
     
-    if( method.to_s =~ /(.+)=$/ )
-      _add_property( method, *arguments )
-    elsif( method.to_s =~ /(.+)\?$/ )
-      _property?( method )
+    case method.to_s
+      when /(.+)=$/  then _add_property(method, *arguments)
+      when /(.+)\?$/ then _exist_property?(method)
     else
-      _get_property( method )
+      _get_property(method)
     end
   end
   
-  def configure( *arguments, &block )
-    
+  def configure(*arguments, &block)
+   
     case arguments[0]
-      when /\.(yml|yaml)/i
-        configure_from_yaml( arguments[0] )
+      when /\.(yml|yaml|conf|config)/i
+        if(File.exist?(arguments[0]))
+          @config.merge!(YAML.load_file(arguments[0]))
+        else
+          raise ConfigContext::Error.new("The config file: #{arguments[0]} do not exist")
+        end
       when Hash
-        configure_from_hash( arguments[0] )
+        @config.merge!(arguments[0])
       else
         yield self if block_given?
-      end
+    end
+    
+    self
+  rescue Exception=>e
+    raise ConfigContext::Error.new(e.message)
   end
 
   def to_hash()
     @config
   end
   
+  ##
+  # Backward compability...
+  def [](key)
+    @config[key]
+  end
+  
   deprecate :load, :configure
   deprecate :all,  :to_hash
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Version
   INFO = {
     :major =>0,
-    :minor =>5,
+    :minor =>6,
     :patch =>0
   }
 

data/test/unit/test_config_context.rb

@@ -30,6 +30,7 @@ class TestConfigContext < Test::Unit::TestCase
       assert_equal( ConfigContext.mysymbol, TEST_SYMBOL )
       assert_equal( ConfigContext.mylist, TEST_LIST )
       assert_equal( ConfigContext.myhash, TEST_HASH )
+      assert_equal( ConfigContext.mysymbol, ConfigContext[:mysymbol])
     end
 
     should "check the presence of some properties" do
@@ -60,22 +61,27 @@ class TestConfigContext < Test::Unit::TestCase
 
     should "configure from a Yaml file" do
           
-      assert_raises( ConfigContext::Error ) { ConfigContext.configure( "very_bad_file.yml" ) }
+      [ "yml", "yaml", "conf", "config" ].each do |extension|
+      
+        assert_raises( ConfigContext::Error ) { ConfigContext.configure( "this_file_do_not_exist.#{extension}" ) }
+      end
+      
+      assert_equal( ConfigContext.to_hash, ConfigContext.configure( "total_foo_bar.file" ).to_hash )
       
       ConfigContext.configure( File.join( File.dirname( __FILE__ ), %w[ .. fixtures test.yml] ) )    
       assert_equal( ConfigContext.to_hash, { 
-        :mysymbol    =>TEST_SYMBOL, 
-        :mylist      =>TEST_LIST, 
-        :myhash      =>TEST_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 
+        :mysymbol =>TEST_SYMBOL, 
+        :mylist   =>TEST_LIST, 
+        :myhash   =>TEST_HASH 
       }
       
       ConfigContext.configure( config_hash )

metadata

@@ -1,83 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: config_context
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 0.6.0
   prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
 platform: ruby
-authors: 
+authors:
 - Javier Juarez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-20 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+date: 2011-06-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: *id001
+  requirement: &2156909680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *2156909680
 description: My config DSL
 email: javier.juarez@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - lib/config_context.rb
 - lib/version.rb
 - test/unit/test_config_context.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jjuarez/config_context
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: http://github.com/jjuarez/config_context
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A Config Context for little applications
 test_files: []
-