configru 0.5.0 → 2.0.0

data/.gitignore

@@ -1,4 +1,4 @@
-*.gem
+coverage
+coverage.data
 .bundle
-Gemfile.lock
-pkg/*
+pkg

data/.rspec

@@ -0,0 +1 @@
+--color --require spec_helper

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  #- rbx-19mode # SimpleCov breaks
+
+notifications:
+  webhooks:
+    - http://rcmp.tenthbit.net/

data/Gemfile

@@ -1,9 +1,9 @@
-source "http://rubygems.org"
+source :rubygems
 
 group :development do
-  gem "riot", ">= 0"
-  gem "bundler", "~> 1.0.0"
+  gem 'rake', '>= 0'
+  gem 'rspec', '~> 2.8.0'
+  gem 'simplecov', '~> 0.6.0'
 end
 
-# Specify your gem's dependencies in configru.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    configru (2.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    multi_json (1.3.6)
+    rake (0.9.2.2)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    simplecov (0.6.4)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.5.3)
+    simplecov-html (0.5.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  configru!
+  rake
+  rspec (~> 2.8.0)
+  simplecov (~> 0.6.0)

data/README.md

@@ -1,195 +1,19 @@
 # Configru
 
-Versatile configuration file loader for Ruby
+[![Build Status](https://secure.travis-ci.org/programble/configru.png?branch=master)](http://travis-ci.org/programble/configru)
 
-# Installation
+YAML configuration file loader
 
-    gem install configru
-
-# Usage
-
-Configru loads YAML configuration files and provides a simple way to access
-configuration options.
-
-## Loading Configuration Files
-
-Configru provides a DSL for loading configuration files.
-
-```ruby
-require 'configru'
-
-Configru.load do
-  # Things
-end
-```
-
-At the very least, the block passed to `Configru.load` must tell Configru which
-files it should load. There are two different methods of loading configuration
-files available.
-
-### Just load a file already!
-
-This is the simplest method of loading. It just loads a file.
-
-```ruby
-Configru.load do
-  just 'foo.yml'
-end
-```
-
-### First-of Loading
-
-This method loads the first file that exists, ignoring all other files.
-
-```ruby
-Configru.load do
-  first_of 'foo.yml', '~/foo.yml', '/etc/foo.yml'
-end
-```
-
-### Cascading Loading
-
-This method loads every file that exists in reverse order. Files listed first
-overwrite the values from files listed later. (Files are listed in high to low
-cascade priority)
-
-```ruby
-Configru.load do
-  cascade '~/foo.yml', '/etc/foo.yml'
-end
-```
-
-## Accessing Options
-
-Configuration options can be accessed as methods of the `Configru` module, or
-`Configru` can be used as a Hash.
-
-`foo.yml`
-
-```yaml
-nick: bob
-server:
-  address: foo.net
-  port: 6782
-```
-
-`foo.rb`
-
-```ruby
-require 'configru'
-require 'socket'
-
-Configru.load do
-  just 'foo.yml'
-end
-
-s = TCPSocket.new(Configru.server.address, Configru['server']['port'])
-s.puts "Hello, I am #{Configru.nick}"
-```
-
-Configuration options with hyphens can be accessed as methods by replacing the
-hyphens with underscores.
-
-## Defaults
-
-Configru's load DSL allows for setting configuration defaults using a block.
-If no configuration files are found or if the configuration file omits an
-option, the values in `defaults` will be used.
-
-
-```ruby
-require 'configru'
-
-Configru.load do
-  just 'foo.yml'
-  defaults do
-    nick 'Dr. Nader'
-    server do
-      address 'abcd.com'
-      port 1111
-    end
-  end
-end
-```
-
-The above `defaults` block is equivalent to the following YAML:
-
-```yaml
-nick: Dr. Nader
-server:
-  address: abcd.com
-  port: 1111
-```
-
-Defaults can also be set using a Hash instead of a block.
-
-```ruby
-Configru.load do
-  just 'foo.yml'
-  defaults 'nick' => 'Dr. Nader',
-           'server' => {'address' => 'abcd.com', 'port' => 1111}
-end
-```
-
-Defaults can also be loaded from a YAML file by passing the filename to
-`defaults`.
-
-```ruby
-Configru.load do
-  just 'foo.yml'
-  defaults 'foo.yml.dist'
-end
-```
-
-## Verifying options
-
-Configru provides a way to verify that configuration options meet certain
-requirements. This is done using a `verify` block in `Configru.load`.
+## Usage
 
 ```ruby
-Configru.load do
-  just 'foo.yml'
-  verify do
-    foo Fixnum
-    bar /^a+$/
-    baz ['one', 'two']
-  end
-end
+# Gemfile
+gem 'configru', '~> 2.0.0'
 ```
 
-Upon loading the configuration, Configru checks each option against this verify
-block. In most cases, the `===` operator is used to compare the values, but
-there are some special cases. If the verification value is a class, `is_a?` is
-used. If the verification value is an array, `include?` is used. This
-effectively means that with a class, the value must be an instance of that
-class, and with an array, the value must be one of the values in the array.
-
-FIXME: Talk about how Configru deals with invalid options
-
-## Doing two things at once
-
-Configru also has an `options` block in `Configru.load` which allows for
-combining the `defaults` and `verify` blocks.
-
-```ruby
-Configru.load do
-  just 'foo.yml'
-  options do
-    nick String, 'Dr. Nader'
-    server do
-      address String, 'abcd.com'
-      port (0..65535), 1111
-    end
-  end
-end
-```
-
-In the `options` block, each option takes two arguments, the first being the
-verification value, and the second being the default value.
-
 # License
 
-Copyright (c) 2011, Curtis McEnroe <programble@gmail.com>
+Copyright (c) 2011-2012, Curtis McEnroe <programble@gmail.com>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -1,15 +1,11 @@
+require 'bundler/setup'
 require 'bundler/gem_tasks'
 
-require 'rake'
-require 'rake/testtask'
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-desc "Run all tests"
-task :test do
-  Rake::TestTask.new do |t|
-    t.libs << "test"
-    t.pattern = "test/**/*_test.rb"
-    t.verbose = false
-  end
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :test
+task :default => :spec

data/configru.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Curtis McEnroe"]
   s.email       = ["programble@gmail.com"]
   s.homepage    = "https://github.com/programble/configru"
-  s.summary     = %q{Versatile configuration file loader}
+  s.summary     = %q{YAML configuration file loader}
   s.description = s.summary
 
   s.files         = `git ls-files`.split("\n")

data/lib/configru/dsl.rb

@@ -1,106 +1,46 @@
+require 'configru/option'
+
 module Configru
   module DSL
-    class LoadDSL
-      attr_reader :defaults_hash, :verify_hash, :files_array, :load_method
+    class OptionGroup
+      attr_reader :options
 
-      def initialize(block)
-        @defaults_hash = {}
-        @verify_hash = {}
-        @files_array = []
-        @load_method = :first
+      def initialize(&block)
+        @options = {}
         instance_eval(&block)
       end
 
-      def files(*args)
-        if args[0].is_a?(String) && args[1].is_a?(Array)
-          @files_array = args[1].map {|x| File.join(x, args[0])}
-        else
-          @files_array = args
-        end
-      end
-
-      def method(m)
-        @load_method = m
-      end
-
-      def first_of(*args)
-        method(:first)
-        files(*args)
-      end
-
-      alias :just :first_of
-
-      def cascade(*args)
-        method(:cascade)
-        files(*args)
-      end
-
-      def defaults(arg=nil, &block)
-        if arg.is_a? String
-          @defaults_hash = YAML.load_file(arg)
-        elsif arg
-          @defaults_hash = arg
-        elsif block
-          @defaults_hash = HashDSL.new(block).hash
-        end
-      end
-
-      def verify(hash=nil, &block)
-        if hash
-          @verify_hash = hash
-        elsif block
-          @verify_hash = HashDSL.new(block).hash
-        end
+      def option(name, type = Object, default = nil, validate = nil, &block)
+        option = Configru::Option.new(type, default, validate, nil)
+        Option.new(option, &block) if block
+        @options[name.to_s] = option
       end
 
-      def options(&block)
-        hashes = DoubleHashDSL.new(block)
-        @defaults_hash = hashes.hash2
-        @verify_hash = hashes.hash1
+      def option_group(name, &block)
+        @options[name.to_s] = OptionGroup.new(&block).options
       end
     end
 
-    class HashDSL
-      attr_reader :hash
-
-      def initialize(block)
-        @hash = {}
+    class Option
+      def initialize(option, &block)
+        @option = option
         instance_eval(&block)
       end
 
-      def method_missing(method, *args, &block)
-        key = method.to_s.gsub('_', '-')
-        if block
-          @hash[key] = HashDSL.new(block).hash
-        else
-          # Simulate method requiring 1 argument
-          raise ArgumentError, "wrong number of arguments(#{args.length} for 1)" unless args.length == 1
-          @hash[key] = args[0]
-        end
+      def type(t)
+        @option.type = t
       end
-    end
 
-    class DoubleHashDSL
-      attr_reader :hash1, :hash2
+      def default(d)
+        @option.default = d
+      end
 
-      def initialize(block)
-        @hash1 = {}
-        @hash2 = {}
-        instance_eval(&block)
+      def validate(v = nil, &block)
+        @option.validate = v || block
       end
 
-      def method_missing(method, *args, &block)
-        key = method.to_s.gsub('_', '-')
-        if block
-          child = DoubleHashDSL.new(block)
-          @hash1[key] = child.hash1
-          @hash2[key] = child.hash2
-        else
-          # Simulate method requiring 2 arguments
-          raise ArgumentError, "wrong number of arguments(#{args.length} for 2)" unless args.length == 2
-          @hash1[key] = args[0]
-          @hash2[key] = args[1]
-        end
+      def transform(&block)
+        @option.transform = block
       end
     end
   end

data/lib/configru/option.rb

@@ -0,0 +1,3 @@
+module Configru
+  Option = Struct.new(:type, :default, :validate, :transform)
+end

data/lib/configru/structhash.rb

@@ -0,0 +1,7 @@
+module Configru
+  class StructHash < Hash
+    def method_missing(key)
+      self[key.to_s]
+    end
+  end
+end

data/lib/configru/version.rb

@@ -1,3 +1,3 @@
 module Configru
-  VERSION = "0.5.0"
+  VERSION = "2.0.0"
 end

data/lib/configru.rb

@@ -1,88 +1,110 @@
-$: << File.dirname(__FILE__) unless $:.include?(File.dirname(__FILE__))
-
-require 'configru/confighash'
 require 'configru/dsl'
+require 'configru/option'
+require 'configru/structhash'
 
 require 'yaml'
 
 module Configru
-  class ConfigurationError < RuntimeError; end
-
-  def self.load(load_method=:first, files=[], defaults={}, verify={}, &block)
-    if block
-      dsl = DSL::LoadDSL.new(block)
-      @load_method = dsl.load_method
-      @files = dsl.files_array.map {|x| File.expand_path(x)}
-      @defaults = dsl.defaults_hash
-      @verify = dsl.verify_hash
-    else
-      @load_method = load_method
-      @files = files
-      @defaults = defaults
-      @verify = verify
+  class OptionError < RuntimeError
+    def initialize(path, message)
+      super("#{path.join('.')}: #{message}")
+    end
+  end
+
+  class OptionTypeError < OptionError
+    def initialize(path, expected, got)
+      super(path, "expected #{expected}, got #{got}")
+    end
+  end
+
+  class OptionValidationError < OptionError
+    def initialize(path, validation = nil)
+      if validation
+        super(path, "failed validation `#{validation.inspect}`")
+      else
+        super(path, "failed validation")
+      end
     end
+  end
+
+  def self.load(*files, &block)
+    @files = files.flatten
+    @options = DSL::OptionGroup.new(&block).options
+    @root = StructHash.new
     self.reload
   end
 
   def self.reload
-    @config = ConfigHash.new(@defaults)
-    @loaded_files = []
-
-    case @load_method
-    when :first
-      if file = @files.find {|file| File.file?(file)} # Intended
-        @config.merge!(YAML.load_file(file) || {})
-        @loaded_files << file
-      end
-    when :cascade
-      @files.reverse_each do |file|
-        if File.file?(file)
-          @config.merge!(YAML.load_file(file) || {})
-          @loaded_files << file
-        end
+    loaded_files = []
+    @files.each do |file|
+      if File.file?(file) && !File.zero?(file)
+        self.load_file(file)
+        loaded_files << file
       end
     end
 
-    self.verify(@config, @verify)
+    # Load all defaults if no files were loaded
+    # TODO: loaded_files as instance var?
+    # TODO: Better way to load defaults?
+    @option_path = []
+    self.load_group(@options, @root, {}) if loaded_files.empty?
   end
 
-  @verify_stack = []
-  def self.verify(hash, criteria)
-    hash.each do |key, value|
-      next unless criteria[key]
-      @verify_stack.unshift(key)
-
-      result = case criteria[key]
-      when Hash
-        self.verify(value, criteria[key])
-        true # If it failed, an exception will have been raised
-      when Array
-        criteria[key].include?(value)
+  def self.load_file(file)
+    @option_path = []
+    self.load_group(@options, @root, YAML.load_file(file) || {})
+  end
+
+  def self.load_group(option_group, output, input)
+    option_group.each do |key, option|
+      @option_path << key
+
+      # option is a group
+      if option.is_a? Hash
+        if input.has_key?(key) && !input[key].is_a?(Hash)
+          raise OptionTypeError.new(@option_path, Hash, input[key].class)
+        end
+        group_output = output[key] || StructHash.new
+        self.load_group(option, group_output, input[key] || {})
+        output[key] = group_output
+        @option_path.pop
+        next
+      end
+
+      if input.include? key
+        value = input[key]
       else
-        criteria[key] === value
+        value = option.default
       end
 
-      raise ConfigurationError, "configuration option '#{@verify_stack.reverse.join('.')}' is invalid" unless result
+      unless value.is_a? option.type
+        raise OptionTypeError.new(@option_path, option.type, value.class)
+      end
 
-      @verify_stack.shift
-    end
-  end
+      if option.validate.is_a? Proc
+        unless option.validate[value]
+          raise OptionValidationError.new(@option_path)
+        end
+      elsif option.validate
+        unless option.validate === value
+          raise OptionValidationError.new(@option_path, option.validate)
+        end
+      end
 
-  def self.loaded_files
-    @loaded_files
-  end
+      output[key] = option.transform ? option.transform[value] : value
 
-  def self.raw
-    @config
+      @option_path.pop
+    end
   end
 
   def self.[](key)
-    @config[key]
+    @root[key]
   end
 
-  def self.method_missing(key, *args)
-    # Simulate NoMethodError if it looks like they really wanted a method
-    raise NoMethodError, "undefined method `#{key.to_s}' for #{self.inspect}:#{self.class}" unless args.empty?
-    self[key]
+  def self.method_missing(method, *args)
+    # Let super raise the appropriate exception if it looks like the caller
+    # wants a real method
+    super(method, *args) unless args.empty?
+    @root.send(method)
   end
 end

data/spec/configru_spec.rb

@@ -0,0 +1,116 @@
+describe Configru do
+  def example_file(x)
+    "spec/example_files/example_#{x}.yml"
+  end
+
+  it 'loads defaults if no files are given' do
+    Configru.load do
+      option :example, String, 'example'
+    end
+
+    Configru.example.should == 'example'
+  end
+
+  it 'behaves like a hash' do
+    Configru.load do
+      option :example, String, 'example'
+    end
+
+    Configru['example'].should == 'example'
+  end
+
+  it 'loads defaults if no files exist' do
+    Configru.load(example_file :z) do
+      option :example, String, 'example'
+    end
+
+    Configru.example.should == 'example'
+  end
+
+  it 'loads defaults if file is empty' do
+    Configru.load(example_file :e) do
+      option :example, String, 'example'
+    end
+
+    Configru.example.should == 'example'
+  end
+
+  it 'loads defaults if file contains only whitespace' do
+    Configru.load(example_file :f) do
+      option :example, String, 'example'
+    end
+
+    Configru.example.should == 'example'
+  end
+
+  it 'loads a file' do
+    Configru.load(example_file :a) do
+      option :example
+    end
+
+    Configru.example.should == 'example_a'
+  end
+
+  it 'loads files in order' do
+    Configru.load(example_file(:a), example_file(:b)) do
+      option :example
+    end
+
+    Configru.example.should == 'example_b'
+  end
+
+  it 'loads a file with a group' do
+    Configru.load(example_file :c) do
+      option_group :example_group do
+        option :example
+      end
+    end
+
+    Configru.example_group.example.should == 'example_c'
+  end
+
+  it 'checks that group values are Hashes' do
+    expect do
+      Configru.load(example_file :a) do
+        option_group :example do
+        end
+      end
+    end.to raise_error(Configru::OptionTypeError)
+  end
+
+  it 'checks option types' do
+    expect do
+      Configru.load(example_file :d) do
+        option :string, String, ''
+      end
+    end.to raise_error(Configru::OptionTypeError)
+  end
+
+  it 'validates options against values' do
+    expect do
+      Configru.load(example_file :d) do
+        option :example, String, 'test', /test/
+      end
+    end.to raise_error(Configru::OptionValidationError)
+  end
+
+  it 'validates options against blocks' do
+    expect do
+      Configru.load(example_file :d) do
+        option :example, String, '' do
+          validate { false }
+        end
+      end
+    end.to raise_error(Configru::OptionValidationError)
+  end
+
+  it 'applies transformations to options' do
+    Configru.load(example_file :d) do
+      option :example, String, '' do
+        transform {|x| x + 't' }
+      end
+    end
+
+    Configru.example.should == 'example_dt'
+  end
+end

data/spec/dsl_spec.rb

@@ -0,0 +1,111 @@
+describe Configru::DSL::Option do
+  before do
+    @option = Configru::Option.new(:type, :default, :validate, :transform)
+  end
+
+  it 'sets option type' do
+    described_class.new(@option) do
+      type String
+    end
+
+    @option.type.should == String
+  end
+
+  it 'sets option default' do
+    described_class.new(@option) do
+      default 'Example'
+    end
+
+    @option.default.should == 'Example'
+  end
+
+  it 'sets option validate value' do
+    described_class.new(@option) do
+      validate /example/
+    end
+
+    @option.validate.should == /example/
+  end
+
+  it 'sets option validate block' do
+    described_class.new(@option) do
+      validate do
+        :example
+      end
+    end
+
+    @option.validate.should be_a(Proc)
+    @option.validate.call.should == :example
+  end
+
+  it 'sets option transofmr block' do
+    described_class.new(@option) do
+      transform do
+        :example
+      end
+    end
+
+    @option.transform.should be_a(Proc)
+    @option.transform.call.should == :example
+  end
+end
+
+describe Configru::DSL::OptionGroup do
+  it 'creates an option' do
+    group = described_class.new do
+      option 'example'
+    end
+
+    group.options.should have_key('example')
+    group.options['example'].should be_a(Configru::Option)
+  end
+
+  it 'converts option names to strings' do
+    group = described_class.new do
+      option :example
+    end
+
+    group.options.should have_key('example')
+  end
+
+  it 'creates a default option' do
+    group = described_class.new do
+      option 'example'
+    end
+
+    group.options['example'].type.should == Object
+    group.options['example'].default.should be_nil
+    group.options['example'].validate.should be_nil
+    group.options['example'].transform.should be_nil
+  end
+
+  it 'runs the Option DSL' do
+    group = described_class.new do
+      option 'example' do
+        type String
+      end
+    end
+
+    group.options['example'].type.should == String
+  end
+
+  it 'creates a group' do
+    group = described_class.new do
+      option_group 'example' do
+        option 'nested'
+      end
+    end
+
+    group.options['example'].should be_a(Hash)
+    group.options['example'].should have_key('nested')
+  end
+
+  it 'converts group names to strings' do
+    group = described_class.new do
+      option_group :example do
+      end
+    end
+
+    group.options.should have_key('example')
+  end
+end

data/spec/example_files/example_a.yml

@@ -0,0 +1 @@
+example: example_a

data/spec/example_files/example_b.yml

@@ -0,0 +1 @@
+example: example_b

data/spec/example_files/example_c.yml

@@ -0,0 +1,2 @@
+example_group:
+  example: example_c

data/spec/example_files/example_d.yml

@@ -0,0 +1,2 @@
+string: 1
+example: example_d

data/spec/example_files/example_f.yml

@@ -0,0 +1,2 @@
+ 
+

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'bundler/setup'
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
+require 'rspec'
+require 'configru'

data/spec/structhash_spec.rb

@@ -0,0 +1,18 @@
+describe Configru::StructHash do
+  before do
+    @hash = Configru::StructHash.new
+  end
+
+  it 'is a hash' do
+    @hash.should be_a_kind_of(Hash)
+  end
+
+  it 'returns nil for missing method key' do
+    @hash.example.should be_nil
+  end
+
+  it 'returns value for method key' do
+    @hash['example'] = :example
+    @hash.example.should == :example
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configru
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-28 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies: []
-description: Versatile configuration file loader
+description: YAML configuration file loader
 email:
 - programble@gmail.com
 executables: []
@@ -19,19 +19,29 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - ChangeLog.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - configru.gemspec
 - lib/configru.rb
-- lib/configru/confighash.rb
 - lib/configru/dsl.rb
+- lib/configru/option.rb
+- lib/configru/structhash.rb
 - lib/configru/version.rb
-- test/confighash_test.rb
-- test/hashdsl_test.rb
-- test/loaddsl_test.rb
-- test/teststrap.rb
+- spec/configru_spec.rb
+- spec/dsl_spec.rb
+- spec/example_files/example_a.yml
+- spec/example_files/example_b.yml
+- spec/example_files/example_c.yml
+- spec/example_files/example_d.yml
+- spec/example_files/example_e.yml
+- spec/example_files/example_f.yml
+- spec/spec_helper.rb
+- spec/structhash_spec.rb
 homepage: https://github.com/programble/configru
 licenses: []
 post_install_message: 
@@ -44,20 +54,32 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2633773784802344253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2633773784802344253
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Versatile configuration file loader
+summary: YAML configuration file loader
 test_files:
-- test/confighash_test.rb
-- test/hashdsl_test.rb
-- test/loaddsl_test.rb
-- test/teststrap.rb
+- spec/configru_spec.rb
+- spec/dsl_spec.rb
+- spec/example_files/example_a.yml
+- spec/example_files/example_b.yml
+- spec/example_files/example_c.yml
+- spec/example_files/example_d.yml
+- spec/example_files/example_e.yml
+- spec/example_files/example_f.yml
+- spec/spec_helper.rb
+- spec/structhash_spec.rb

data/lib/configru/confighash.rb

@@ -1,33 +0,0 @@
-module Configru
-  class ConfigHash < Hash
-    def initialize(hash={})
-      super
-      merge!(hash)
-    end
-
-    def merge!(hash)
-      hash.each do |key, value|
-        if value.is_a?(Hash) && self[key].is_a?(ConfigHash)
-          self[key].merge!(value)
-        elsif value.is_a?(Hash)
-          self[key] = ConfigHash.new(value)
-        else
-          self[key] = value
-        end
-      end
-    end
-
-    def [](key)
-      key = key.to_s if key.is_a?(Symbol)
-      # Allow for accessing keys with hyphens using underscores
-      key = key.gsub('_', '-') unless self.include?(key)
-      # For some reason, super(key) returns {} instead of nil when the key
-      # doesn't exist :\
-      super(key) if self.include?(key)
-    end
-
-    def method_missing(key, *args)
-      self[key]
-    end
-  end
-end

data/test/confighash_test.rb

@@ -1,63 +0,0 @@
-require 'teststrap'
-
-context 'ConfigHash - ' do
-  setup { Configru::ConfigHash.new }
-  
-  context 'empty' do
-    asserts('[:quux]') { topic[:quux] }.nil
-    asserts(:quux).nil
-  end
-  
-  context 'non-empty' do
-    hookup do
-      topic.merge!({'foo' => 1, 'bar' => 2, 'baz' => 3})
-    end
-    
-    # Testing access methods
-    asserts("['foo']") { topic['foo'] }.equals(1)
-    asserts('[:foo]') { topic[:foo] }.equals(1)
-    asserts(:foo).equals(1)
-  end
-  
-  context 'overwriting a value by merge' do
-    hookup do
-      topic.merge!({'foo' => 1, 'bar' => 2, 'baz' => 3})
-      topic.merge!({'bar' => 4})
-    end
-    asserts(:bar).equals(4)
-  end
-  
-  context 'merging a nested Hash' do
-    hookup do
-      topic.merge!({'foo' => 1, 'bar' => 2, 'baz' => 3})
-      topic.merge!({'bar' => 4})
-      topic.merge!({'baz' => {'quux' => 5}})
-    end
-    
-    asserts(:baz).kind_of(Configru::ConfigHash)
-    asserts('baz.quux') { topic.baz.quux }.equals(5)
-  end
-  
-  context 'recursively merging a nested Hash' do
-    hookup do
-      topic.merge!({'foo' => 1, 'bar' => 2, 'baz' => 3})
-      topic.merge!({'bar' => 4})
-      topic.merge!({'baz' => {'quux'  => 5}})
-      topic.merge!({'baz' => {'apple' => 6}})
-    end
-    
-    asserts(:baz).kind_of(Configru::ConfigHash)
-    asserts('baz.apple') { topic.baz.apple }.equals(6)
-    asserts('baz.quux') { topic.baz.quux }.equals(5)
-  end
-
-  context 'keys with hyphens' do
-    hookup do
-      topic.merge!({'foo-bar-baz' => 1})
-    end
-
-    asserts('foo_bar_baz') { topic.foo_bar_baz }.equals(1)
-    asserts('[:foo_bar_baz]') { topic[:foo_bar_baz] }.equals(1)
-    asserts("['foo_bar_baz']") { topic['foo_bar_baz'] }.equals(1)
-  end
-end

data/test/hashdsl_test.rb

@@ -1,83 +0,0 @@
-require 'teststrap'
-require 'configru/dsl'
-
-context 'HashDSL - flat' do
-  setup do
-    block = proc do
-      foo 1
-      bar 2
-    end
-    Configru::DSL::HashDSL.new(block).hash
-  end
-
-  asserts_topic.equals({'foo' => 1, 'bar' => 2})
-end
-
-context 'HashDSL - nested' do
-  setup do
-    block = proc do
-      foo 1
-      bar do
-        baz 2
-        quux 3
-      end
-    end
-    Configru::DSL::HashDSL.new(block).hash
-  end
-
-  asserts_topic.equals({'foo' => 1, 'bar' => {'baz' => 2, 'quux' => 3}})
-end
-
-context 'HashDSL - keys with underscores' do
-  setup do
-    block = proc do
-      foo_bar 1
-      baz_quux 2
-    end
-    Configru::DSL::HashDSL.new(block).hash
-  end
-
-  asserts_topic.equals({'foo-bar' => 1, 'baz-quux' => 2})
-end
-
-context 'DoubleHashDSL - flat' do
-  setup do
-    block = proc do
-      foo 1, 2
-      bar 3, 4
-    end
-    Configru::DSL::DoubleHashDSL.new(block)
-  end
-
-  asserts(:hash1).equals({'foo' => 1, 'bar' => 3})
-  asserts(:hash2).equals({'foo' => 2, 'bar' => 4})
-end
-
-context 'DoubleHashDSL - nested' do
-  setup do
-    block = proc do
-      foo 1, 2
-      bar do
-        baz 3, 4
-        quux 5, 6
-      end
-    end
-    Configru::DSL::DoubleHashDSL.new(block)
-  end
-
-  asserts(:hash1).equals({'foo' => 1, 'bar' => {'baz' => 3, 'quux' => 5}})
-  asserts(:hash2).equals({'foo' => 2, 'bar' => {'baz' => 4, 'quux' => 6}})
-end
-
-context 'DoubleHashDSL - keys with underscores' do
-  setup do
-    block = proc do
-      foo_bar 1, 2
-      baz_quux 3, 4
-    end
-    Configru::DSL::DoubleHashDSL.new(block)
-  end
-
-  asserts(:hash1).equals({'foo-bar' => 1, 'baz-quux' => 3})
-  asserts(:hash2).equals({'foo-bar' => 2, 'baz-quux' => 4})
-end

data/test/loaddsl_test.rb

@@ -1,24 +0,0 @@
-require 'teststrap'
-require 'configru/dsl'
-
-context 'LoadDSL - Files' do
-  setup do
-    block = proc do
-      cascade 'a', 'b', 'c'
-    end
-    Configru::DSL::LoadDSL.new(block).files_array
-  end
-
-  asserts_topic.equals(['a', 'b', 'c'])
-end
-
-context 'LoadDSL - File-directories' do
-  setup do
-    block = proc do
-      cascade 'a', ['b', 'c']
-    end
-    Configru::DSL::LoadDSL.new(block).files_array
-  end
-
-  asserts_topic.equals([File.join('b', 'a'), File.join('c', 'a')])
-end

data/test/teststrap.rb

@@ -1,11 +0,0 @@
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'riot'
-require 'configru'
-