configatron 4.1.1 → 4.2.0

data/History.txt

@@ -1,3 +1,7 @@
+=== 4.2.0
+
+* [backwards-incompatible] Make to_h/to_hash recursively hashify Configatron::Stores, and resolve Configatron::Procs.
+
 === 4.1.1
 
 * Fix delayed attributes

data/lib/configatron/root_store.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'forwardable'
 
 # This is the root configatron object, and contains methods which
 # operate on the entire configatron hierarchy.

data/lib/configatron/store.rb

@@ -92,6 +92,13 @@ class Configatron
       Store.new(@root_store, @name, @attributes.clone)
     end
 
+    def to_h
+      @attributes.each_with_object({}) do |(k, v), h|
+        v = v.call if ::Configatron::Proc === v
+        h[k] = Store === v ? v.to_h : v
+      end
+    end
+
     # So that puts works (it expects the object to respond to to_ary)
     def to_ary
       nil
@@ -127,12 +134,11 @@ class Configatron
 
     alias :[]= :store
     alias :has_key? :key?
+    alias :to_hash :to_h
 
     def_delegator :@attributes, :values
     def_delegator :@attributes, :keys
     def_delegator :@attributes, :each
-    def_delegator :@attributes, :to_h
-    def_delegator :@attributes, :to_hash
     def_delegator :@attributes, :delete
     # def_delegator :@attributes, :fetch
     # def_delegator :@attributes, :has_key?

data/lib/configatron/version.rb

@@ -1,3 +1,3 @@
 class Configatron
-  VERSION = "4.1.1"
+  VERSION = "4.2.0"
 end

data/test/functional/configatron.rb

@@ -94,4 +94,17 @@ class Critic::Functional::ConfigatronTest < Critic::Functional::Test
       assert_equal('hi', @kernel.foo.catch)
     end
   end
+
+  describe 'to_h and to_hash' do
+    before do
+      @kernel.a = 1
+      @kernel.b.c = Configatron::Delayed.new{ @kernel.a + 3 }
+    end
+
+    it 'returns a hash representation' do
+      expected_hash = { a: 1, b: { c: 4 } }
+      assert_equal(expected_hash, @kernel.to_h)
+      assert_equal(expected_hash, @kernel.to_hash)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: configatron
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2777108850332874749
+      hash: -3864894795624167904
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2777108850332874749
+      hash: -3864894795624167904
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25