confuse 0.1.1 → 0.1.2

data/lib/confuse/config.rb

@@ -14,8 +14,8 @@ module Confuse
 
     def initialize(*paths)
       load_namespaces(self.class.namespaces)
-      read_files(self.class.config_path)
-      read_files(paths)
+      read_files(self.class.config_path.flatten)
+      read_files(paths.flatten)
     end
 
     def config

data/lib/confuse/config_item.rb

@@ -7,7 +7,7 @@ module Confuse
 
     def initialize(name, &block)
       @key = name
-      instance_eval(&block)
+      instance_eval(&block) unless block.nil?
     end
 
     def description(description = nil)

data/lib/confuse/config_mixin.rb

@@ -34,6 +34,15 @@ module Confuse
       ns[rest_of_key, self]
     end
 
+    def to_hash
+      namespaces.reduce({}) do |memo, (name, namespace)|
+        namespace.keys.each do |key|
+          memo["#{name}_#{key}"] = namespace[key, self]
+        end
+        memo
+      end
+    end
+
     # We allow the namespace and the key to be concatenated with an '_', so this
     # method is to search the possible substrings that could make up the
     # namespace for a key.
@@ -78,8 +87,9 @@ module Confuse
 
     def mixin_config!(config)
       config.each do |key, value|
-        namespace = @namespaces[find_namespace(key) || :default]
-        if value.respond_to? :keys
+        namespace_name = find_namespace(key) || :default
+        namespace = @namespaces[namespace_name]
+        if value.respond_to?(:keys)
           # if its a hash, set each key in the hash as a config item in the
           # namespace
           value.each do |k, v|
@@ -87,7 +97,7 @@ module Confuse
           end
         else
           # otherwise, set it directly in the namespace
-          namespace[key] = value
+          namespace[rest_of_key(key, namespace_name)] = value
         end
       end
     end

data/lib/confuse/namespace.rb

@@ -40,6 +40,10 @@ module Confuse
       item && item.value = value
     end
 
+    def keys
+      @items.keys
+    end
+
     def create_new_key(key, value)
       if @supress_warnings_flag
         puts "Warning: config includes unknown option '#{key}'"

data/lib/confuse/version.rb

@@ -1,3 +1,3 @@
 module Confuse
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: confuse
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Tom Chipchase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-03 00:00:00 Z
+date: 2013-10-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: inifile