konf 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/konf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "konf"
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov"]
-  s.date = "2011-12-21"
+  s.date = "2012-01-23"
   s.description = "minimalistic configuration reader"
   s.email = "oleg@khabarov.ca"
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "konf.gemspec",
     "lib/konf.rb",
+    "test/blank_config.yml",
     "test/config.yml",
     "test/konf_test.rb"
   ]

data/lib/konf.rb

@@ -2,14 +2,19 @@ require 'yaml'
 require 'erb'
 
 class Konf < Hash
-  class NotFound < StandardError; end
+  class NotFound  < StandardError; end
+  class Invalid   < StandardError; end
   
   def initialize(source, root = nil)
     hash = case source
     when Hash
       source
     else
-      YAML.load(ERB.new(File.read(source)).result).to_hash
+      if File.exists?(source.to_s) && yaml = YAML.load(ERB.new(File.read(source.to_s)).result)
+        yaml.to_hash
+      else
+        raise Invalid, "Invalid configuration input: #{source}"
+      end
     end
     if root
       hash = hash[root] or raise NotFound, "No configuration found for '#{root}'"

data/test/konf_test.rb

@@ -21,6 +21,16 @@ class KonfTest < Test::Unit::TestCase
     }), conf
   end
   
+  def test_initialization_as_invalid
+    [nil, 99, 'invalid.yml', File.expand_path('blank_config.yml', File.dirname(__FILE__))].each do |source|
+      begin
+        Konf.new(source)
+      rescue => e
+        assert_equal Konf::Invalid, e.class, e.inspect
+      end
+    end
+  end
+  
   def test_initialization_with_root
     conf = Konf.new({'a' => {'b' => 'c'}}, 'a')
     assert_equal ({'b' => 'c'}), conf
@@ -34,14 +44,6 @@ class KonfTest < Test::Unit::TestCase
     end
   end
   
-  def test_initialization_with_invalid_file
-    begin
-      conf = Konf.new('invalid')
-    rescue => e
-      assert_equal Errno::ENOENT, e.class
-    end
-  end
-  
   def test_initialization_with_invalid_root
     begin
       conf = Konf.new({'a' => {'b' => 'c'}}, 'd')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70176349459780 !ruby/object:Gem::Requirement
+  requirement: &70276412593660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70176349459780
+  version_requirements: *70276412593660
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70176349459300 !ruby/object:Gem::Requirement
+  requirement: &70276412593040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70176349459300
+  version_requirements: *70276412593040
 description: minimalistic configuration reader
 email: oleg@khabarov.ca
 executables: []
@@ -48,6 +48,7 @@ files:
 - VERSION
 - konf.gemspec
 - lib/konf.rb
+- test/blank_config.yml
 - test/config.yml
 - test/konf_test.rb
 homepage: http://github.com/GBH/konf
@@ -65,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2717882700731022676
+      hash: 2443533440992825314
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: