config_context 0.6.2 → 0.7.0

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010-2030 Javier Juarez Martinez
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+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.

data/README.rdoc

@@ -5,79 +5,58 @@ Your minimal and DSL config context...
 
 == Installing
     
-The latest stable version is published in gemcutter.
+The latest stable version is published in rubygems.
 
   gem install config_context
 
 
-== How to use, some useful examples
+== How to use, well, look this useful examples:
 
   require 'rubygems'
   require 'config_context'
   
   ##
   # Puts all your configuration context in a block
-  #	
   ConfigContext.configure do |config|
 
     config.a = "Value of a"
     config.b = "Value of b"
-    config.c = { also:=>"complex", :values=>nil }
+    config.c = { also:=>"complex", :values=>['like', 'this'] }
   end
 	
   ##
   # Retrieve your properties
-  #
   puts ConfigContext.a
   puts ConfigContext.b
   puts ConfigContext.c
   
   ##
   # Check the presence of a property
-  #
-  puts ConfigContext.b if( ConfigContext.b? )
+  puts ConfigContext.b if ConfigContext.b?
 				
   ##
   # Load your config from a YAML file
-  #
   begin	
-    ConfigContext.load( "settings.yml" )
+    ConfigContext.configure("settings.yml")
   rescue ConfigContext::Error => e
-    fail( e.message )
+    fail e.message
   end
-  
-  puts ConfigContext.a if( ConfigContext.a? )
-  puts ConfigContext.to_hash.inspect
 
+  ##
+  # Load your config from a JSON file
+  begin	
+    ConfigContext.configure("settings.json")
+  rescue ConfigContext::Error => e
+    fail e.message
+  end
+  
+  puts ConfigContext
 
   ##
-  #
-  #
+  # Reset the context !!!
+  ConfigContext.erase!
+  ConfigContext.to_hash == {}	
 
 == TODO
 
- * ???
-
-
-== License
-
-Copyright (c) 2010-2030 Javier Juarez Martinez
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-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.
+ * Sugestions are wellcome guys

data/lib/config_context.rb

@@ -1,27 +1,13 @@
 require 'yaml'
+require 'json'
 
 
 module ConfigContext
   extend self
   
-  @config ||= {}
-  
   class ConfigError < StandardError; end
 
-  
   private
-  def _add_property(property, *arguments)
-    @config[property.to_s.delete("=?").to_sym] = arguments.length == 1 ? arguments[0] : arguments
-  end
-  
-  def _exist_property?(property)
-    @config.keys.include?(property.to_s.delete("=?").to_sym)
-  end
-  
-  def _get_property(property)
-    @config[property]
-  end
-
   def self.deprecate(old_method, new_method) 
 
     define_method(old_method) do |*arguments, &block|
@@ -35,37 +21,89 @@ module ConfigContext
   public
   def method_missing(method, *arguments, &block)
     
+    @config ||= { }
+    
     case method.to_s
-      when /(.+)=$/  then _add_property(method, *arguments)
-      when /(.+)\?$/ then _exist_property?(method)
+      when /(.+)=$/  then @config[method.to_s.delete("=").to_sym] = arguments.length == 1 ? arguments[0] : arguments
+      when /(.+)\?$/ then @config.keys.include?(method.to_s.delete("=?").to_sym)
     else
-      _get_property(method)
-    end
+
+      if @config.keys.include?(method)
+        @config[method]
+      else 
+        super
+      end
+    end    
+  end
+  
+  def erase!()
+    @config = { }
   end
   
-  def configure(*arguments, &block)
-   
-    case arguments[0]
-      when /\.(yml|yaml|conf|config)/i
-        @config.merge!(YAML.load_file(arguments[0]))
-      when Hash
-        @config.merge!(arguments[0])
-      else
+  # def configure(*arguments, &block)
+  # 
+  #   @config ||= { }
+  #   
+  #   source = arguments[0]
+  #   
+  #   case source
+  #     when /\.(yml|yaml)/i then @config.merge!(YAML.load_file(source)) rescue raise ConfigError.new("Problems loading the config file")
+  #     when /\.json/i       then @config.merge!(JSON.parse(File.read(source))) rescue raise ConfigError.new("Problems loading the config file")
+  #     when Hash            then @config.merge!(source)
+  #     when Symbol          then @config[source.to_sym] = { }
+  #   else yield self if block_given?
+  #   end
+  #   
+  #   self
+  # end
+
+  def configure(source=nil, options={}, &block)
+
+    @config ||= { }
+    
+    options = {:source=>nil, :context=>:root}.merge(options)
+    
+    if options[:context] == :root
+
+      case source
+        when /\.(yml|yaml)/i then @config.merge!(YAML.load_file(source)) rescue raise ConfigError.new("Problems loading file")
+        when /\.json/i       then @config.merge!(JSON.parse(File.read(source))) rescue raise ConfigError.new("Problems loading file")
+        when Hash            then @config.merge!(source)
+      else 
         yield self if block_given?
+      end
+    else
+
+      @config[options[:context]] ||= { }
+      
+      case source
+        when /\.(yml|yaml)/i then @config[options[:context]].merge!(YAML.load_file(source)) rescue raise ConfigError.new("Problems loading file")
+        when /\.json/i       then @config[options[:context]].merge!(JSON.parse(File.read(source))) rescue raise ConfigError.new("Problems loading file")
+        when Hash            then @config[options[:context]].merge!(source)
+      else 
+        yield self if block_given?
+      end
     end
     
     self
-  rescue StandardError=>e
-    raise ConfigError.new(e.message)
   end
 
-  def to_hash()
-    @config
+  def to_hash 
+    @config ||= { }
+  end
+    
+  def to_s
+    "#{@config.inspect}"
+  end
+  
+  def inspect
+    @config.inspect
   end
   
   ##
   # Backward compability...
   def [](key)
+    @config ||= { } 
     @config[key]
   end
   

data/lib/version.rb

@@ -3,8 +3,8 @@ module ConfigContext
     
     INFO = {
       :major =>0,
-      :minor =>6,
-      :patch =>2
+      :minor =>7,
+      :patch =>0
     }
     
     def self.number(version_info=INFO)

data/test/unit/test_config_context.rb

@@ -1,108 +1,169 @@
-$:.unshift( File.join( File.dirname( __FILE__ ), %w[.. .. lib] ) )
+$:.unshift(File.join(File.dirname(__FILE__), %w[.. .. lib]))
 
 
 require 'rubygems'
 require 'test/unit'
-require 'shoulda'
 require 'config_context'
 
 
 class TestConfigContext < Test::Unit::TestCase
 
-  context "A ConfigContext" do
+  TEST_SYMBOL = 'symbol value'
+  TEST_LIST   = [1, 2, 3]
+  TEST_HASH   = { "a"=>1, "b"=>2, "c"=>3 }
+   
+   
+  def setup
 
-    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.configure do |config|
+            
+      config.mysymbol = TEST_SYMBOL
+      config.mylist   = TEST_LIST
+      config.myhash   = TEST_HASH
     end
+  end
+  
+  
+  def teardown
     
-    should "configure properties" do
+    ConfigContext.erase!
+  end
+  
+  def test_configure_properties
+  
+    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
+
+  def test_check_the_presence_of_some_properties
+  
+    assert(ConfigContext.mysymbol?)
+    assert(ConfigContext.mylist?)
+    assert(ConfigContext.myhash?)
+    assert(!ConfigContext.thisdonotexist?)
+  end
+  
+  def test_retrive_all_properties
+   
+    assert_equal(ConfigContext.to_hash, { 
+      :mysymbol =>TEST_SYMBOL, 
+      :mylist   =>TEST_LIST, 
+      :myhash   =>TEST_HASH
+    })
+  end
+  
+  def test_retrieve_all_property_keys
+
+    [:mysymbol, :mylist, :myhash].each do |key|
     
-      assert_equal( ConfigContext.mysymbol, TEST_SYMBOL )
-      assert_equal( ConfigContext.mylist, TEST_LIST )
-      assert_equal( ConfigContext.myhash, TEST_HASH )
-      assert_equal( ConfigContext.mysymbol, ConfigContext[:mysymbol])
+      assert(ConfigContext.to_hash.keys.include?(key))
     end
+  end
 
-    should "check the presence of some properties" do
+  def test_update_properties
     
-      assert( ConfigContext.mysymbol? )
-      assert( ConfigContext.mylist? )
-      assert( ConfigContext.myhash? )
+    assert_equal(ConfigContext.mysymbol, TEST_SYMBOL)
+    ConfigContext.mysymbol = "A"
+    assert_equal(ConfigContext.mysymbol, "A")
 
-      assert( !ConfigContext.thisdonotexist? )
-    end
+    new_test_list = [4,5,6]
+    assert_equal(ConfigContext.mylist, TEST_LIST)
+    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 = new_hash
+    assert_equal(ConfigContext.myhash, new_hash)
+  end
+
+  def test_configure_from_a_hash
     
-    should "retrive all properties" do
-     
-      assert_equal( ConfigContext.to_hash, { 
-        :mysymbol =>TEST_SYMBOL, 
-        :mylist   =>TEST_LIST, 
-        :myhash   =>TEST_HASH
-      } )
-    end
+    config_hash = { 
+      :mysymbol =>TEST_SYMBOL, 
+      :mylist   =>TEST_LIST, 
+      :myhash   =>TEST_HASH 
+    }
     
-    should "retrieve all property keys" do
-
-      [ :mysymbol, :mylist, :myhash ].each do |key|
-      
-        assert( ConfigContext.to_hash.keys.include?( key ) )
-      end
+    ConfigContext.configure(config_hash)
+    assert_equal(ConfigContext.to_hash, config_hash)
+  end
+  
+  def test_configuration_from_a_file_that_not_exist
+  
+    ['json', 'yaml', 'yml'].each do |extension|
+    
+      assert_raises(ConfigContext::ConfigError) { ConfigContext.configure("this_file_do_not_exist.#{extension}") }
     end
-
-    should "configure from a Yaml file" do
-          
-      [ "yml", "yaml", "conf", "config" ].each do |extension|
-      
-        assert_raises( ConfigContext::ConfigError ) { 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, { 
+  end
+  
+  def test_configuration_from_a_bad_format_file
+  
+    ['foo', 'bar', 'bazz'].each do |extension|
+    
+      assert_equal(ConfigContext.configure("this_file_do_not_exist.#{extension}").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 
+  end
+  
+  def test_configure_from_a_yaml_file
+        
+    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
+  
+  def test_configure_from_a_yaml_file_in_a_context
+        
+    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.yml]), :context=>:yaml)
+    assert_equal(ConfigContext.to_hash, { 
+      :mysymbol =>TEST_SYMBOL, 
+      :mylist   =>TEST_LIST, 
+      :myhash   =>TEST_HASH,
+      :yaml=>{
+        "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
-      
-      assert_equal( ConfigContext.mysymbol, TEST_SYMBOL )
-      ConfigContext.mysymbol = "A"
-      assert_equal( ConfigContext.mysymbol, "A" )
+    })
+  end
 
-      new_test_list = [4,5,6]
-      assert_equal( ConfigContext.mylist, TEST_LIST )
-      ConfigContext.mylist = new_test_list
-      assert_equal( ConfigContext.mylist, new_test_list )
+  def test_configure_from_a_json_file
+        
+    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.json]))    
+    assert_equal(ConfigContext.to_hash, { 
+      :mysymbol =>TEST_SYMBOL, 
+      :mylist   =>TEST_LIST, 
+      :myhash   =>TEST_HASH, 
+      "mysymbol" =>TEST_SYMBOL, 
+      "mylist"   =>TEST_LIST, 
+      "myhash"   =>TEST_HASH
+    })
+  end
 
-      new_hash = { :d=>4, :e=>5, :f=>6 }
-      assert_equal( ConfigContext.myhash, TEST_HASH )
-      ConfigContext.myhash = new_hash
-      assert_equal( ConfigContext.myhash, new_hash )
-    end
+  def test_configure_from_a_json_file_in_a_context
+        
+    ConfigContext.configure(File.join(File.dirname(__FILE__), %w[ .. fixtures test.json]), :context=>:json)    
+    assert_equal(ConfigContext.to_hash, { 
+      :mysymbol =>TEST_SYMBOL, 
+      :mylist   =>TEST_LIST, 
+      :myhash   =>TEST_HASH, 
+      :json=>{
+        "mysymbol" =>TEST_SYMBOL, 
+        "mylist"   =>TEST_LIST, 
+        "myhash"   =>TEST_HASH
+      }
+    })
   end
 end

metadata

@@ -1,81 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: config_context
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 0.7.0
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 2
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Javier Juarez
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-06-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2156984360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
-  type: :development
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2156984360
+- !ruby/object:Gem::Dependency
   name: jeweler
+  requirement: &2156983600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156983600
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2156982360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156982360
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2156978880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
+  version_requirements: *2156978880
 description: My config DSL
 email: javier.juarez@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
+- LICENSE
 - README.rdoc
-files: 
+files:
 - lib/config_context.rb
 - lib/version.rb
 - test/unit/test_config_context.rb
+- LICENSE
 - README.rdoc
 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.8.5
 signing_key: 
 specification_version: 3
 summary: A Config Context for little applications
 test_files: []
-