hcl_parser 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99b2eea4da4681293e2c23c06758471554c56a34811c6ff6c0fff5381cbbdc88
-  data.tar.gz: 386ac2862e576b66272a277c44210cceea4b2aac7a25848517e0332f464fd261
+  metadata.gz: 6570c678f64e03d6dd6fca6b1bc4800cb7eafc3222ca02784e6f62c148279672
+  data.tar.gz: 0ea732a8d48b24527220721fb79bf9f2c28c38a35dc1bfe6953799cef90409db
 SHA512:
-  metadata.gz: ff94566dcf96f1228370731ff355934bd38dd2f67a7cb6558ec2829d0fd23060cb25bb639ec8559cb7d2cada4658bd84476654cc848c76b50ac4a4767467c553
-  data.tar.gz: ece0bd0213983d7619857db074105b950f681f82a395d3ef2acc792f043802987344f9ec684ebfa1a0687b5170cb05cb0ee1bfc7f5be1d975e7ed74becdfc3ec
+  metadata.gz: 778963fb140bc4fb1457370d930569a4901f0831c5471af1a977abba845d78a7ce732661eacd2abf1986b5fe26c907b27a7dd8c88876d0cce21c6927d51c4e63
+  data.tar.gz: 702c25648f6259a3f8dbae407768692b9969c033792e92d167f9d5f335b939c773829015536382b406afe69e3c73568ed9e6fa57ccca48adfadfb070034490c4

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.2.1] - 2021-11-28
+- [#2](https://github.com/boltops-tools/hcl_parser/pull/2) improve complex type parser: handle any
+
 ## [0.2.0] - 2021-11-25
 - [#1](https://github.com/boltops-tools/hcl_parser/pull/1) Complex types
 

data/lib/hcl_parser/loader.rb

@@ -32,14 +32,14 @@ module HclParser
       lines.each_with_index do |l,i|
         # We dont rewrite lines until the next line/iteration
         # This is actually the next iteration since we set rewrite_lines = true previously
-        # in rewrite_lines = has_complex_type?(lookahead_lines)
+        # in rewrite_lines = complex_type_lines?(lookahead_lines)
         if rewrite_lines
-          if simple_default_assignment?(l)
-            results << l
-          elsif simple_default_assignment?(l)
+          if complex_type_line?(l)
             # Doesnt matter what the default value is as long as there is one
             # Doing this in case the default value spans multiple lines
             results << '  default = "any"'
+          elsif simple_default_assignment?(l)
+            results << l
           else
             results << "# #{l}"
           end
@@ -54,7 +54,7 @@ module HclParser
           variable_start_index = i
           variable_end_index = variable_end_index(lines, variable_start_index)
           lookahead_lines = lines[variable_start_index..variable_end_index]
-          rewrite_lines = has_complex_type?(lookahead_lines)
+          rewrite_lines = complex_type_lines?(lookahead_lines)
         end
 
         # Disable rewriting before reaching the end of the variable definition so: i + 1
@@ -72,12 +72,16 @@ module HclParser
       line.match(/default\s*=\s*("|'|null)/)
     end
 
-    def has_complex_type?(lines)
+    def complex_type_lines?(lines)
       !!lines.find do |l|
-        l.match(/object\(/)
+        complex_type_line?(l)
       end
     end
 
+    def complex_type_line?(l)
+      l.match(/object\(/) || l.match(/=\s*"any/)
+    end
+
     def variable_end_index(lines, variable_start_index)
       end_variable_index = nil
       lines.each_with_index do |l,i|

data/lib/hcl_parser/version.rb

@@ -1,3 +1,3 @@
 module HclParser
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcl_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2021-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rhcl