configru 0.2.0 → 0.3.0

data/ChangeLog.md

@@ -0,0 +1,5 @@
+# Change Log
+
+## 0.2.0 (19 July 2011)
+
+ * Added loading defaults from file

data/README.md

@@ -139,6 +139,11 @@ Configru.load do
 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`.
+
 ## License
 
 Copyright (c) 2011, Curtis McEnroe <programble@gmail.com>

data/lib/configru/dsl.rb

@@ -40,6 +40,12 @@ module Configru
           @verify_hash = HashDSL.new(block).hash
         end
       end
+
+      def options(&block)
+        hashes = DoubleHashDSL.new(block)
+        @defaults_hash = hashes.hash2
+        @verify_hash = hashes.hash1
+      end
     end
     
     class HashDSL
@@ -59,5 +65,29 @@ module Configru
         end
       end
     end
+
+    class DoubleHashDSL
+      attr_reader :hash1, :hash2
+
+      def initialize(block)
+        @hash1 = {}
+        @hash2 = {}
+        instance_eval(&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
+      end
+    end
   end
 end

data/lib/configru/version.rb

@@ -1,3 +1,3 @@
 module Configru
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/configru.rb

@@ -26,15 +26,20 @@ module Configru
   
   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|
-        @config.merge!(YAML.load_file(file) || {}) if File.file?(file)
+        if File.file?(file)
+          @config.merge!(YAML.load_file(file) || {})
+          @loaded_files << file
+        end
       end
     end
     
@@ -64,6 +69,10 @@ module Configru
       @verify_stack.shift
     end
   end
+
+  def self.loaded_files
+    @loaded_files
+  end
   
   def self.[](key)
     @config[key]

data/test/hashdsl_test.rb

@@ -39,3 +39,45 @@ context 'HashDSL - keys with underscores' do
 
   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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Curtis McEnroe
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-19 00:00:00 -04:00
+date: 2011-07-30 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- ChangeLog.md
 - Gemfile
 - README.md
 - Rakefile