config_context 0.3.1 → 0.3.3

data/lib/config_context.rb

@@ -12,8 +12,7 @@ module ConfigContext
   
     if( method.to_s =~ /(.+)=$/ )
     
-      config_key          = method.to_s.delete( '=' ).to_sym
-      @config[config_key] = (arguments.length == 1) ? arguments[0] : arguments
+      @config[method.to_s.delete( '=' ).to_sym] = (arguments.length == 1) ? arguments[0] : arguments
     elsif( method.to_s =~ /(.+)\?$/ )
       
       @config.has_key?( method.to_s.delete( '?' ).to_sym )
@@ -23,25 +22,39 @@ module ConfigContext
     end
   end
 
-  def configure; yield self; end
-
-  def []( key ) return @config[key]; end
-
-  def[]=( key, value ) @config[key] = value; end
-
-  def all; @config; end
-  
-  def keys; @config.keys; end
-
-
   def load( config_file, options = { :allow_collisions => true } )
     
     if( options[:allow_collisions] )
       @config.merge!( YAML.load_file( config_file ) )
     else
-      @config.merge!( YAML.load_file( config_file ) ) { |key, original_value, new_value| original_value }
+      @config.merge!( YAML.load_file( config_file ) ) { |k, ov, nv| ov }
     end
   rescue Exception => e
     raise ConfigContext::Error.new( e.message )
   end
+
+  def configure()
+    
+    yield self
+  end
+
+  def []( key ) 
+    
+    @config[key]
+  end
+
+  def []=( key, value ) 
+    
+    @config[key] = value
+  end
+
+  def all()
+    
+    @config
+  end
+  
+  def keys
+    
+    @config.keys
+  end
 end

data/lib/version.rb

@@ -1,12 +1,11 @@
-module ConfigContext
-  module Version
-    INFO = {
-      :major =>0,
-      :minor =>3,
-      :patch =>1
-    }
+module Version
+  INFO = {
+    :major =>0,
+    :minor =>3,
+    :patch =>3
+  }
 
-    NAME    = 'config_context'
-    VERSION = INFO.values.join( '.' )
-  end
-end
+  NAME    = 'config_context'
+  VERSION = [INFO[:major], INFO[:minor], INFO[:patch]].join( '.' )
+end
+  

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

@@ -66,7 +66,10 @@ class TestConfigContext < Test::Unit::TestCase
     
     should "retrieve all property keys" do
 
-      assert_equal( ConfigContext.keys, [ :mysymbol, :mylist, :myhash, :othersymbol, 'string' ] )
+      [ :mysymbol, :mylist, :myhash, 'string', :othersymbol ].each do |key|
+      
+        assert( ConfigContext.keys.include?( key ) )
+      end
     end
 
     should "load a Yaml file without keys collisions" do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: config_context
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 1
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors: 
 - Javier Juarez
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 +02:00
-default_executable: 
+date: 2011-04-27 00:00:00 Z
 dependencies: []
 
 description: My config DSL
@@ -30,9 +24,8 @@ extra_rdoc_files:
 files: 
 - lib/config_context.rb
 - lib/version.rb
-- test/unit/tc_config_context.rb
+- test/unit/test_config_context.rb
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/jjuarez/config_context
 licenses: 
 - MIT
@@ -46,25 +39,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: http://github.com/jjuarez/config_context
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Config Context for little applications
 test_files: 
-- test/unit/tc_config_context.rb
+- test/unit/test_config_context.rb