hocon 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 336e47bf6c04b6b8c7d9fe769cfb5a7d80227e5d
-  data.tar.gz: a74955786d95546de69fc8c5bb98634848387a74
+  metadata.gz: b83f298bac04a371f8806c9eb4ab4813430fdad4
+  data.tar.gz: ee461805b59d80a73c578f07d911fd34fffc7d72
 SHA512:
-  metadata.gz: 1ee3d3aaa08eaaf337fd8fd32ecc3b184401b0335a430b544d7ab1d7e691905526c4c727e56be82e0a70bb77556d6cf5effb12359e734e9d9ad796a22b50aaa4
-  data.tar.gz: b8fd8823f59d498714ba09a9f68fe1e069d2861cd393b08c5970b8c1630dc80b1ba5acd5de99a9dd4e6e09775c60ca1746f61139cfa4a03162f82ed8108b353c
+  metadata.gz: 7aeca7ac2e5493aabacadfb1b9d68038b2b47221229cdb310c180e1df9184a1e975eaa7e67d4828913e272d43d09c4fe1b875fd8c87d69d7e030f94e2c80d5e5
+  data.tar.gz: f0f17f65d42707a65688911d3d3848a4fcb47c477b89945fc2de970cd12b9a0636fa376b52d9a6ef161d26c336eda1a05566ca049c96be9f52962989f6c56faa

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.1
+
+This is a bugfix release.
+* Fixed a bug wherein ugly configurations were being generated due to the addition of new objects when a setting
+  is set at a path that does not currently exist in the configuration. Previously, these new objects were being
+  added as single-line objects. They will now be added as multi-line objects if the parent object is a multi-line
+  object or is an empty root object.
+
 ## 0.9.0
 
 This is a promotion of the 0.1.0 release with one small bug fix:

data/lib/hocon/impl/config_node_object.rb

@@ -126,6 +126,10 @@ class Hocon::Impl::ConfigNodeObject
     seen_new_line = false
     indentation = []
 
+    if @children.empty?
+      return indentation
+    end
+
     @children.each_index do |i|
       unless seen_new_line
         if @children[i].is_a?(Hocon::Impl::ConfigNodeSingleToken) && Tokens.newline?(@children[i].token)
@@ -151,13 +155,14 @@ class Hocon::Impl::ConfigNodeObject
       last = @children[-1]
       if last.is_a?(Hocon::Impl::ConfigNodeSingleToken) && last.token.equal?(Tokens::CLOSE_CURLY)
         beforeLast = @children[-2]
+        indent = ""
         if beforeLast.is_a?(Hocon::Impl::ConfigNodeSingleToken) &&
             Tokens.ignored_whitespace?(beforeLast.token)
           indent = beforeLast.token.token_text
-          indent += "  "
-          indentation.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens.new_ignored_whitespace(nil, indent)))
-          return indentation
         end
+        indent += "  "
+        indentation.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens.new_ignored_whitespace(nil, indent)))
+        return indentation
       end
     end
 
@@ -176,7 +181,7 @@ class Hocon::Impl::ConfigNodeObject
     else
       indented_value = value
     end
-    same_line = !(indentation[0].is_a?(Hocon::Impl::ConfigNodeSingleToken) &&
+    same_line = !(indentation.length > 0 && indentation[0].is_a?(Hocon::Impl::ConfigNodeSingleToken) &&
                     Tokens.newline?(indentation[0].token))
 
     # If the path is of length greater than one, see if the value needs to be added further down
@@ -211,7 +216,10 @@ class Hocon::Impl::ConfigNodeObject
       # If the path is of length greater than one add the required new objects along the path
       new_object_nodes = []
       new_object_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens::OPEN_CURLY))
-      new_object_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens.new_ignored_whitespace(nil, ' ')))
+      if indentation.empty?
+        new_object_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens.new_line(nil)))
+      end
+      new_object_nodes += indentation
       new_object_nodes.push(Hocon::Impl::ConfigNodeSingleToken.new(Tokens::CLOSE_CURLY))
       new_object = self.class.new(new_object_nodes)
       new_nodes.push(new_object.add_value_on_path(desired_path.sub_path(1), indented_value, flavor))

data/lib/hocon/impl/tokens.rb

@@ -166,7 +166,7 @@ class Hocon::Impl::Tokens
       sb << " ("
       sb << message
       sb << ")"
-      sb.to_s
+      sb.string
     end
 
     def can_equal(other)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hocon
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Chris Price
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-10 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: HOCON Config Library