config_context 0.3.4 → 0.3.5

data/README.rdoc

@@ -2,13 +2,11 @@
 
 Your DSL config context...
 
-
 == Installing
     
 The latest stable version is published in gemcutter.
 
   gem install config_context
-  
 
 == How to use
 
@@ -20,11 +18,9 @@ The latest stable version is published in gemcutter.
   #	
   ConfigContext.configure do |config|
 
-    config.a             = "Value of a"
-    config.b             = "Value of b"
-    config.c             = { also:=>"complex", :values=>nil }
-    config[:d]           = [ "Value", "of", :d ]
-    config['String key'] = "My value"
+    config.a = "Value of a"
+    config.b = "Value of b"
+    config.c = { also:=>"complex", :values=>nil }
   end
 	
   ##
@@ -33,9 +29,6 @@ The latest stable version is published in gemcutter.
   puts ConfigContext.a
   puts ConfigContext.b
   puts ConfigContext.c
-  puts ConfigContext.d
-  puts ConfigContext[:d]
-  puts ConfigContext['String key']
   
   ##
   # Check the presence of a property
@@ -43,18 +36,16 @@ The latest stable version is published in gemcutter.
   puts ConfigContext.b if( ConfigContext.b? )
 				
   ##
-  # Load your config from a YAML file and overrides some properties...
+  # Load your config from a YAML file
   #
   begin	
-    ConfigContext.load( "settings.yml", :allow_collisions=>true )
+    ConfigContext.load( "settings.yml" )
   rescue ConfigContext::Error => e
     fail( e.message )
   end
   
   puts ConfigContext.a if( ConfigContext.a? )
   puts ConfigContext.all.inspect
-  puts ConfigContext.keys
-   
 
 == TODO
 
@@ -82,4 +73,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/config_context.rb

@@ -4,59 +4,57 @@ require 'yaml'
 module ConfigContext
   extend self
   
-  @config = { }
+  @config = Hash.new
   
   class Error < StandardError; end
   
-  def method_missing( method, *arguments, &block )
+  private
+  def _add_property( method, *arguments )
+    
+    property_key          = method.to_s.delete( '=' ).to_sym
+    @config[property_key] = arguments.length == 1 ? arguments[0] : arguments
+  end
   
-    if( method.to_s =~ /(.+)=$/ )
+  def _property?( method )
+    
+    property_key = method.to_s.delete( '?' ).to_sym
     
-      @config[method.to_s.delete( '=' ).to_sym] = (arguments.length == 1) ? arguments[0] : arguments
+    @config.keys.include?( property_key )
+  end
+  
+  def _get_property( method )
+    
+    @config[method]
+  end
+  
+  
+  public
+  def method_missing( method, *arguments, &block )
+    
+    if( method.to_s =~ /(.+)=$/ )
+      _add_property( method, *arguments )
     elsif( method.to_s =~ /(.+)\?$/ )
-      
-      @config.has_key?( method.to_s.delete( '?' ).to_sym )
+      _property?( method )
     else
-      
-      @config[method] if @config.has_key?( method )
+      _get_property( method )
     end
   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 ) ) { |k, ov, nv| ov }
+  def load( config_file ) 
+
+    YAML.load_file( config_file ).each do |key,value|
+      
+      @config[key] = value
     end
-    
-    @config
   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

@@ -2,10 +2,9 @@ module Version
   INFO = {
     :major =>0,
     :minor =>3,
-    :patch =>4
+    :patch =>5
   }
 
   NAME    = 'config_context'
   VERSION = [INFO[:major], INFO[:minor], INFO[:patch]].join( '.' )
-end
-  
+end

data/test/unit/test_config_context.rb

@@ -11,24 +11,17 @@ class TestConfigContext < Test::Unit::TestCase
 
   context "A ConfigContext" do
 
-    TEST_SYMBOL      = 'symbol'
-    TEST_LIST        = [1, 2, 3]
-    TEST_HASH        = { :a=>1, :b=>2, :c=>3 }
-    TEST_STRING      = 'string'
-    TEST_OTHERSYMBOL = "othersymbol"
-    
-    
+    TEST_SYMBOL = 'symbol value'
+    TEST_LIST   = [1, 2, 3]
+    TEST_HASH   = { :a=>1, :b=>2, :c=>3 }
+     
     setup do
 
       ConfigContext.configure do |config|
-
         config.mysymbol = TEST_SYMBOL
         config.mylist   = TEST_LIST
         config.myhash   = TEST_HASH
       end
-
-      ConfigContext[TEST_STRING]  = TEST_STRING
-      ConfigContext[:othersymbol] = TEST_OTHERSYMBOL
     end
     
     should "configure properties" do
@@ -36,9 +29,6 @@ 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[TEST_STRING], TEST_STRING )
-      assert_equal( ConfigContext.othersymbol, TEST_OTHERSYMBOL )
-      assert_equal( ConfigContext[:othersymbol], TEST_OTHERSYMBOL )
     end
 
     should "check the presence of some properties" do
@@ -46,9 +36,6 @@ class TestConfigContext < Test::Unit::TestCase
       assert( ConfigContext.mysymbol? )
       assert( ConfigContext.mylist? )
       assert( ConfigContext.myhash? )
-      assert( ConfigContext.othersymbol? )
-
-      assert( !ConfigContext.string? ) # Pay attention to this behaviour!!!
 
       assert( !ConfigContext.thisdonotexist? )
     end
@@ -56,54 +43,30 @@ class TestConfigContext < Test::Unit::TestCase
     should "retrive all properties" do
      
       assert_equal( ConfigContext.all, { 
-        :mysymbol    =>TEST_SYMBOL, 
-        :mylist      =>TEST_LIST, 
-        :myhash      =>TEST_HASH, 
-        'string'     =>TEST_STRING,
-        :othersymbol =>TEST_OTHERSYMBOL
+        :mysymbol =>TEST_SYMBOL, 
+        :mylist   =>TEST_LIST, 
+        :myhash   =>TEST_HASH
       } )
     end
     
     should "retrieve all property keys" do
 
-      [ :mysymbol, :mylist, :myhash, 'string', :othersymbol ].each do |key|
+      [ :mysymbol, :mylist, :myhash ].each do |key|
       
-        assert( ConfigContext.keys.include?( key ) )
+        assert( ConfigContext.all.keys.include?( key ) )
       end
     end
 
-    should "load a Yaml file without keys collisions" do
+    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] ) )    
       assert_equal( ConfigContext.all, { 
         :mysymbol    =>TEST_SYMBOL, 
         :mylist      =>TEST_LIST, 
-        :myhash      =>TEST_HASH, 
-        'string'     =>TEST_STRING,
-        :othersymbol =>TEST_OTHERSYMBOL
+        :myhash      =>TEST_HASH 
       } )
     end
-        
-    should "load a Yaml file with key collisions" do
-    
-      original_value = "The Original value is here"
-      
-      ConfigContext.configure { |config| config.mysymbol = original_value }
-
-      ConfigContext.load( File.join( File.dirname( __FILE__ ), %w[ .. fixtures test.yml] ), :allow_collisions=>false )    
-      assert_equal( ConfigContext.all, { 
-        :mysymbol    =>original_value, 
-        :mylist      =>TEST_LIST, 
-        :myhash      =>TEST_HASH, 
-        'string'     =>TEST_STRING,
-        :othersymbol =>TEST_OTHERSYMBOL
-      } )
-    end
-    
-    should "load a Yaml file with error" do
-        
-      assert_raises( ConfigContext::Error ) { ConfigContext.load( "very bad file.yml" ) }
-    end
     
     should "update properties" do
       
@@ -111,13 +74,15 @@ class TestConfigContext < Test::Unit::TestCase
       ConfigContext.mysymbol = "A"
       assert_equal( ConfigContext.mysymbol, "A" )
 
+      new_test_list = [4,5,6]
       assert_equal( ConfigContext.mylist, TEST_LIST )
-      ConfigContext.mylist = [4,5,6]
-      assert_equal( ConfigContext.mylist, [4,5,6] )
+      ConfigContext.mylist = new_test_list
+      assert_equal( ConfigContext.mylist, new_test_list )
 
+      new_hash = { :d=>4, :e=>5, :f=>6 }
       assert_equal( ConfigContext.myhash, TEST_HASH )
-      ConfigContext.myhash= { :d=>4, :e=>5, :f=>6 }
-      assert_equal( ConfigContext.myhash, { :d=>4, :e=>5, :f=>6 } )
+      ConfigContext.myhash = new_hash
+      assert_equal( ConfigContext.myhash, new_hash )
     end
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: config_context
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
-  version: 0.3.4
+  segments: 
+  - 0
+  - 3
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Javier Juarez
@@ -10,9 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 Z
-dependencies: []
-
+date: 2011-04-29 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"
+  name: jeweler
+  version_requirements: *id001
+  prerelease: false
 description: My config DSL
 email: javier.juarez@gmail.com
 executables: []
@@ -26,6 +45,7 @@ files:
 - lib/version.rb
 - test/unit/test_config_context.rb
 - README.rdoc
+has_rdoc: true
 homepage: http://github.com/jjuarez/config_context
 licenses: 
 - MIT
@@ -39,17 +59,23 @@ 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.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Config Context for little applications