confuse 0.0.1 → 0.1.0

data/lib/confuse/config_item.rb

@@ -20,13 +20,13 @@ module Confuse
       @type
     end
 
-    def default(default = nil)
-      @default = default unless default.nil?
-      @default
+    def default(value = nil, &block)
+      @default_value = value unless value.nil?
+      @default_value = block unless block.nil?
     end
 
     def value
-      @value || @default
+      @value || @default_value
     end
   end
 end

data/lib/confuse/config_mixin.rb

@@ -31,7 +31,7 @@ module Confuse
       rest_of_key = rest_of_key(key, namespace)
       ns = namespaces[namespace]
       return ns unless rest_of_key
-      ns[rest_of_key]
+      ns[rest_of_key, self]
     end
 
     # We allow the namespace and the key to be concatenated with an '_', so this

data/lib/confuse/configurable.rb

@@ -1,4 +1,4 @@
-require 'configuration'
+require 'confuse'
 
 # Monkey patch class to easily allow a class to be configurable.
 class Class

data/lib/confuse/dsl.rb

@@ -47,7 +47,7 @@ module Confuse
           end
         else
           define_method(name) do
-            config[namespace][name]
+            config[namespace][name, config]
           end
         end
       end

data/lib/confuse/namespace.rb

@@ -26,8 +26,13 @@ module Confuse
       @strict_flag = true
     end
 
-    def [](key)
-      (i = get_item(key)) && i.value
+    def [](key, config = nil)
+      value = (i = get_item(key)) && i.value
+      if value.respond_to?(:call) && !config.nil?
+        value.call(config)
+      else
+        value
+      end
     end
 
     def []=(key, value)
@@ -39,7 +44,7 @@ module Confuse
       if @supress_warnings_flag
         puts "Warning: config includes unknown option '#{key}'"
       end
-      @items[key] = ConfigItem.new(key, &(Proc.new {})) unless @strict_flag
+      @items[key] = ConfigItem.new(key, &nil) unless @strict_flag
     end
 
     def get_item(key)

data/lib/confuse/version.rb

@@ -1,3 +1,3 @@
 module Confuse
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confuse
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Tom Chipchase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-01 00:00:00 Z
+date: 2013-10-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inifile