dslh 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7390c52a2f651e8ae19478c3b499fd156bfe9ce8
-  data.tar.gz: a417585a38c5a06e1cdfff655c60edbe5f50cb0e
+  metadata.gz: 7267513e3fe1badab65d769c081bb53f2404de4d
+  data.tar.gz: 63b83baed10b9303f5078ab2d6b63231d85dc602
 SHA512:
-  metadata.gz: 9fd88853d1941b413207e4b5616e6a20f38181f805e8a9038cfefcc51f993162318d368440c8941390abec7354f5be41a5414a01eba5075928bb04b17b384ad2
-  data.tar.gz: dae0498effdc33b5086711927e6d786433ac94dbe3febab0693f9d0cc8c70d52ad4a2f34ad60daadb38b042fe3a7dbab4666b367a284f0b04b7993ea18fc27bd
+  metadata.gz: 47010ec35a9c6c7e963569a3ecd6605d44c803efcd0911a65a142fe4d58d33c10a308972830d840498d919fcfd6289e1dc375361f63b3060d0fb02518ed4bfc7
+  data.tar.gz: c7dd1ad51654a185a51b2722e583ca261866d95c22d5a5048ebc16f7c8953275ade78eca8384e7f0c9ced5d27ce2bff7f57386b46abaa72a5338ed7b0c5e6539

data/lib/dslh.rb

@@ -134,7 +134,7 @@ class Dslh
 
     case value
     when Hash
-      if exclude_keys?(value.keys) or value.values.any? {|v| v == [] }
+      if exclude_keys?(value.keys)
         value_buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
       else
         nested = true
@@ -143,7 +143,9 @@ class Dslh
         value_buf.puts(indent + (@options[:use_braces_instead_of_do_end] ? '}' : 'end'))
       end
     when Array
-      if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
+      if value.empty?
+        value_buf.puts(" []")
+      elsif value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
         nested = true
 
         if not @options[:dump_old_hash_array_format] and value.all? {|i| i.kind_of?(Hash) and not exclude_keys?(i.keys) }

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/spec/dslh_spec.rb

@@ -2434,6 +2434,51 @@ end
     EOS
   end
 
+  it 'deval to hash from dsl that include empty array argument' do
+    dsl = <<-EOS
+glossary do
+  title "example glossary"
+  GlossDiv do
+    title "S"
+    GlossList do
+      GlossEntry do
+        ID "SGML"
+        SortAs "SGML"
+        GlossTerm "Standard Generalized Markup Language"
+        Acronym "SGML"
+        Abbrev "ISO 8879:1986"
+        GlossDef do
+          para "A meta-markup language, used to create markup languages such as DocBook."
+          GlossSeeAlso []
+        end
+        GlossSee "markup"
+      end
+    end
+  end
+end
+    EOS
+
+    h = Dslh.eval(dsl)
+    expect(h).to eq(
+      {"glossary"=>
+        {"title"=>"example glossary",
+         "GlossDiv"=>
+          {"title"=>"S",
+           "GlossList"=>
+            {"GlossEntry"=>
+              {"ID"=>"SGML",
+               "SortAs"=>"SGML",
+               "GlossTerm"=>"Standard Generalized Markup Language",
+               "Acronym"=>"SGML",
+               "Abbrev"=>"ISO 8879:1986",
+               "GlossDef"=>
+                {"para"=>
+                  "A meta-markup language, used to create markup languages such as DocBook.",
+                 "GlossSeeAlso"=>[]},
+               "GlossSee"=>"markup"}}}}}
+    )
+  end
+
   it 'should be hash that include empty array' do
     h = {"glossary"=>
           {"title"=>"example glossary",
@@ -2465,10 +2510,10 @@ glossary do
         GlossTerm "Standard Generalized Markup Language"
         Acronym "SGML"
         Abbrev "ISO 8879:1986"
-        GlossDef(
-          {"para"=>
-            "A meta-markup language, used to create markup languages such as DocBook.",
-           "GlossSeeAlso"=>[]})
+        GlossDef do
+          para "A meta-markup language, used to create markup languages such as DocBook."
+          GlossSeeAlso []
+        end
         GlossSee "markup"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler