hocon 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 313f7a6dd2e038b4a470e80d8342bc3e7607ed0c
-  data.tar.gz: 945e4bbde03daafdb38cb99e412e7ce448ff7c81
+  metadata.gz: 638d35f7a8e826220dcb4375b9f26bff467b317e
+  data.tar.gz: 3770d5073fc07bdfa4601950cb873f69c6642591
 SHA512:
-  metadata.gz: 151f0721cb1d6a82951eb6811f4d841d64070a51073b4836c6f0e7ef7629444049f2d53a9286a4d29c6ee5f514d02285e7322c972ac1fd7275f7752a59c41bb1
-  data.tar.gz: 55c1486bccf6850ef061101d89c57df90757650b222d8f1824b013c589156b1ac644514cc39b280eba943c302402f477c8f429714b3fdd89ab0b540f80951bcc
+  metadata.gz: 5de129112ffe9e9fc0970d1075df7f0ab5581984a96bb91e84f95ba41aa70babc8351556dab354ec406c25e8accaec0725b6358799293bfbe72913941d1858ee
+  data.tar.gz: 291f399b5bf93cdd6c4fedd597f0720956ee58baf26e7c1ab0d31a5677f5100b4d2371fe088dc5773b1864a54f2147f658f34720814dd15c8d9e1365d1e522f3

data/README.md

@@ -1,7 +1,6 @@
-[![Build Status](https://travis-ci.org/puppetlabs/ruby-hocon.png?branch=master)](https://travis-ci.org/puppetlabs/ruby-hocon)
-
 ruby-hocon
 ==========
+[![Gem Version](https://badge.fury.io/rb/hocon.svg)](https://badge.fury.io/rb/hocon) [![Build Status](https://travis-ci.org/puppetlabs/ruby-hocon.png?branch=master)](https://travis-ci.org/puppetlabs/ruby-hocon)
 
 This is a port of the [Typesafe Config](https://github.com/typesafehub/config) library to Ruby.
 
@@ -94,8 +93,3 @@ Unsupported features include:
 * Duration and size settings
 * Java system properties
 
-## Maintainence
-
-Maintainers: Joe Pinsonault <joe.pinsonault@puppet.com>, Chris Price <chris@puppet.com>, Kevin Corcoran <kevin.corcoran@puppet.com>
-
-Tickets: https://tickets.puppetlabs.com/browse/HC

data/lib/hocon.rb

@@ -33,15 +33,19 @@ module Hocon
     resolved_config = Hocon::ConfigFactory.load_from_config(
         config, Hocon::ConfigResolveOptions.defaults)
 
-    return resolved_config.root.unwrapped
+    resolved_config.root.unwrapped
   end
 
   def self.parse(string)
-    # doing this require lazily, because otherwise, classes that need to
+    # doing these requires lazily, because otherwise, classes that need to
     # `require 'hocon'` to get the module into scope will end up recursing
     # through this require and probably ending up with circular dependencies.
     require 'hocon/config_factory'
+    require 'hocon/config_resolve_options'
     config = Hocon::ConfigFactory.parse_string(string)
-    return config.root.unwrapped
+    resolved_config = Hocon::ConfigFactory.load_from_config(
+        config, Hocon::ConfigResolveOptions.defaults)
+
+    resolved_config.root.unwrapped
   end
 end

data/spec/fixtures/hocon/with_substitution/subst.conf

@@ -0,0 +1,2 @@
+a: true
+b: ${a}

data/spec/unit/hocon/hocon_spec.rb

@@ -98,6 +98,17 @@ describe Hocon do
     end
   end
 
+  context "loading config that includes substitutions" do
+    it "should be able to `load` from a file" do
+      expect(Hocon.load("#{FIXTURE_DIR}/hocon/with_substitution/subst.conf")).
+          to eq({"a" => true, "b" => true})
+    end
+    it "should be able to `parse` from a string" do
+      expect(Hocon.parse(File.read("#{FIXTURE_DIR}/hocon/with_substitution/subst.conf"))).
+          to eq({"a" => true, "b" => true})
+    end
+  end
+
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hocon
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Chris Price
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -142,6 +142,7 @@ files:
 - spec/fixtures/hocon/by_extension/cat.conf
 - spec/fixtures/hocon/by_extension/cat.test
 - spec/fixtures/hocon/by_extension/cat.test-json
+- spec/fixtures/hocon/with_substitution/subst.conf
 - spec/fixtures/parse_render/example1/input.conf
 - spec/fixtures/parse_render/example1/output.conf
 - spec/fixtures/parse_render/example1/output_nocomments.conf
@@ -203,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: HOCON Config Library