hcl2-rb 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d51dffee490023cce7a09c6ddec262ea198ef287e24d4e8ea536335ca1c37a
-  data.tar.gz: cbcc946ca6cd61ada79732035840fd768dda94546e55fbe030c2c0a203d9e606
+  metadata.gz: da8df68511ccd65a048c216406ece161d869e2b8180a3ad3ac52e77b7526bcd4
+  data.tar.gz: 7b247239df05a67799097c6bf254f6ad15bd4afdfd36ac7fbb2d965786db8eff
 SHA512:
-  metadata.gz: 3a71b1889c3bdfb4ce20b6634a5d5b2ece063b87d82c5c1f90dbe68c8c31615e736cfd18bef16a5c1d676af2c5fbadee4a77f99f02682c795ef69dff2212e60e
-  data.tar.gz: 55d7a452386ab3c8146afc4feddf9aee1b95ba0f51e7b450afc3adb801d36b8b47c8a6d31ed95fad82bb6008aeee5bd8abae397f6aa73f3bdddf5c5a269b9b9f
+  metadata.gz: 00cba379c4e4c17690c5112b5a86c2fdd2057040c5266b06b4f96dc018c2784744280d99a09ecb5536bfd2d56efaa4f69d7304bf2e589c75d6de1b79e132d21b
+  data.tar.gz: ba89c043c9a91503e8716aeb8280f76e1889d9727ec7ae4ac8405e9f3f08e8ca18f49a2992b520f9fce7f1ed3c4bd2b47fe0396e64fb9dc2d952361be3f6b6ec

data/lib/hcl2-rb/formatter.rb

@@ -9,25 +9,33 @@ class Hash
     true
   end
 
-  def to_hcl2(level: 0, spaces: 2)
+  def to_hcl2(spaces: 2, tab: 0)
     hcl2 = []
 
     each do |k, v|
       case v
-      when Numeric, String, TrueClass, FalseClass, Array
+      when Numeric, String, TrueClass, FalseClass
         hcl2.push("#{k} = #{v.to_hcl2}\n")
+      when Array
+        if v.has_child?
+          v.each do |child|
+            hcl2.push({ "#{k}": child }.to_hcl2)
+          end
+        else
+          hcl2.push("#{k} = #{v.to_hcl2}")
+        end
       when Hash
         labels = HCL2::Helpers.dfs(v)
         labels.each do |label|
           # It creates a label string and we shouldn't
           # forget about addition space before this one
-          n = label.empty? ? nil : label.map { |l| l&.to_hcl2 }.join('').prepend(' ') # It creates label string
+          n = label.empty? ? nil : label.map { |l| l&.to_hcl2 }.join(' ').prepend(' ') # It creates label string
 
           # We should go deeper to format child attributes
           c = label.empty? ? v : v.dig(*label)
 
           hcl2.push("#{k}#{n} {")
-          hcl2.push(c.to_hcl2(level: level + 1))
+          hcl2.push(c.to_hcl2(spaces: spaces, tab: 1))
           hcl2.push("}\n")
         end
       else
@@ -35,7 +43,23 @@ class Hash
       end
     end
 
-    hcl2.map { |v| v.prepend(' ' * (spaces * level)) }.join("\n")
+    hcl2.map { |v| v.prepend(' ' * spaces * tab) }.join("\n")
+  end
+end
+
+class Array
+  def has_child?
+    return false if empty?
+
+    each do |v|
+      return false unless v.is_a?(Hash)
+    end
+
+    true
+  end
+
+  def to_hcl2
+    to_s
   end
 end
 
@@ -68,9 +92,3 @@ class FalseClass
     to_s
   end
 end
-
-class Array
-  def to_hcl2
-    to_s
-  end
-end

data/lib/hcl2-rb/helpers.rb

@@ -2,7 +2,7 @@
 module HCL2
   module Helpers
     # This is just the Deep Find Search algorithm
-    # using to flatten Hash like it make HCL2
+    # using to flatten Hash like it made at HCL2
     def self.dfs(g)
       def self.f(g, r, c)
         unless g.has_child?

data/spec/formatter_spec.rb

@@ -1,100 +1,187 @@
 require 'spec_helper'
 
 RSpec.describe Numeric do
-  it 'format Numeric to_hcl2' do
+  it 'format to hcl2' do
     expect(12_345.to_hcl2).to eq('12345')
   end
 end
 
 RSpec.describe String do
-  it 'format String to_hcl2' do
+  it 'format to hcl2' do
     expect('string'.to_hcl2).to eq('"string"')
   end
 end
 
 RSpec.describe Symbol do
-  it 'format Symbol to_hcl2' do
+  it 'format to hcl2' do
     expect(:symbol.to_hcl2).to eq('"symbol"')
   end
 end
 
 RSpec.describe TrueClass do
-  it 'format TrueClass to_hcl2' do
+  it 'format to hcl2' do
     expect(true.to_hcl2).to eq('true')
   end
 end
 
 RSpec.describe FalseClass do
-  it 'format FalseClass to_hcl2' do
+  it 'format to hcl2' do
     expect(false.to_hcl2).to eq('false')
   end
 end
 
 RSpec.describe Array do
-  it 'format Array to_hcl2' do
+  it 'format to hcl2' do
     expect([1, 2, 'three'].to_hcl2).to eq('[1, 2, "three"]')
   end
 end
 
 RSpec.describe Hash do
-  fix = {
+  fixture = {
     ui: true,
     listener: {
       tcp: {
-        address: '127.0.0.1:8200'
+        address: '0.0.0.0:8200'
       },
       unix: {
         address: '/run/vault.sock'
       }
-    },
-    telemetry: {
-      statsite_address: 'statsite.company.local:8125'
-    },
-    advanced: {
-      foo: {
-        bar: {
-          bim: 'bam'
-        }
-      },
-      it: 'works?'
     }
   }
 
-  it 'has child' do
-    expect(fix.has_child?).to eq(false)
-    expect(fix[:listener].has_child?).to eq(true)
+  expectation = <<~EXP
+    ui = true
+
+    listener "tcp" {
+      address = "0.0.0.0:8200"
+
+    }
+
+    listener "unix" {
+      address = "/run/vault.sock"
+
+    }
+  EXP
+
+  it 'check childs' do
+    expect(fixture[:listener].has_child?).to eq(true)
+    expect(fixture[:listener][:tcp].has_child?).to eq(false)
   end
 
-  it 'format Hash to_hcl2' do
-    exp = <<~EXP
-      ui = true
+  it 'format to hcl2' do
+    expect(fixture.to_hcl2).to eq(expectation)
+  end
+end
+
+RSpec.describe 'Advanced cases' do
+  it 'check array objects formating' do
+    fixture = {
+      listener: [{
+        tcp: {
+          address: '0.0.0.0:8200'
+        }
+      }, {
+        tcp: {
+          address: '127.0.0.1:8201'
+        }
+      }]
+    }
 
+    expectation = <<~EXP
       listener "tcp" {
-        address = "127.0.0.1:8200"
+        address = "0.0.0.0:8200"
 
       }
 
-      listener "unix" {
-        address = "/run/vault.sock"
+      listener "tcp" {
+        address = "127.0.0.1:8201"
 
       }
+    EXP
 
-      telemetry {
-        statsite_address = "statsite.company.local:8125"
+    expect(fixture.to_hcl2).to eq(expectation)
+  end
+
+  it 'check nested object' do
+    fixture = {
+      resource: {
+        openstack_compute_flavor_v2: {
+          this: {
+            name: 'this',
+            region: 'region_a',
+            ram: 4,
+            vcpus: 2
+          }
+        },
+        openstack_networking_port_v2: {
+          this: {
+            name: 'this',
+            region: 'region_a'
+          }
+        }
+      }
+    }
+
+    expectation = <<~EXP
+      resource "openstack_compute_flavor_v2" "this" {
+        name = "this"
+
+        region = "region_a"
+
+        ram = 4
+
+        vcpus = 2
+
+      }
+
+      resource "openstack_networking_port_v2" "this" {
+        name = "this"
+
+        region = "region_a"
 
       }
+    EXP
 
-      advanced {
-        foo "bar" {
-          bim = "bam"
+    expect(fixture.to_hcl2).to eq(expectation)
+  end
+end
 
+RSpec.describe 'HashiCorp examples' do
+  it 'Vault' do
+    fixture = {
+      ui: true,
+      listener: {
+        tcp: {
+          address: '127.0.0.1:8200'
+        },
+        unix: {
+          address: '/run/vault.sock'
         }
+      },
+      telemetry: {
+        statsite_address: 'statsite.company.local:8125'
+      }
+    }
 
-        it = "works?"
+    expectation = <<~EXP
+      ui = true
+
+      listener "tcp" {
+        address = "127.0.0.1:8200"
+
+      }
+
+      listener "unix" {
+        address = "/run/vault.sock"
+
+      }
+
+      telemetry {
+        statsite_address = "statsite.company.local:8125"
 
       }
     EXP
 
-    expect(fix.to_hcl2).to eq(exp)
+    expect(fixture.to_hcl2).to eq(expectation)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hcl2-rb
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - iveahugeship
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies: []
 description: |2
       Ruby common data types formatter to HCL2.