dslh 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: accc36f444e49fdce316464ef42d7ab5dbee863c
-  data.tar.gz: 912a67f6db4edb45f73ef454a35016b4b42d1b9a
+  metadata.gz: eaa7072cea6f58fcbe9e341e3cfe3e6569ac7754
+  data.tar.gz: 9c35be524118f1a0a53ddf349688fdf6780cdeb7
 SHA512:
-  metadata.gz: e888126dcbbeb1b3045b38fe46a21ff9df09e4b3a1d65d59c93ed6f901f95359ca7102cbfabd73222c96ee38868e5034543199749107996b95ff7063b971af90
-  data.tar.gz: cc3ec0b4b6519080bec3742e47bde94d9d32f1c7cf01e1d3183491a533f6f21d1d67f49b3b31a28e2d318dc8796e4e934c5e5519266747f53c78b894dda076db
+  metadata.gz: 32898eaf5f6a60ce2eaa6c5e2e87a07e80ac389c6a62b163cd947fc3be03fc8797195c4770c5f93479d909020dbe6db635f10b715cfe725a92405a924fca5e5a
+  data.tar.gz: 86d4481731ac1549e55bd1d803dffe825258c7dcb590ffcc844f98aa38f27ad8111d4fadd558a2eafd80af0a480e3fdc0af4505123545eeaa8f278434c020de6

data/README.md

@@ -153,3 +153,47 @@ pp h
 #     {"title"=>"example glossary",
 #      "date"=>'2016-05-21 00:00:00 UTC'}]}
 ```
+
+### Use braces
+
+```ruby
+h = {"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"=>["GML", "XML"]},
+             "GlossSee"=>"markup"}}}}}
+
+dsl = Dslh.deval(h, :use_braces_instead_of_do_end => true)
+puts dsl
+#=> 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 "GML", "XML"
+#           }
+#           GlossSee "markup"
+#         }
+#       }
+#     }
+#   }
+```

data/lib/dslh.rb

@@ -41,7 +41,8 @@ class Dslh
     @options = {
       :time_inspecter => method(:inspect_time),
       :dump_old_hash_array_format => false,
-      :force_dump_braces => false
+      :force_dump_braces => false,
+      :use_braces_instead_of_do_end => false,
     }.merge(options)
 
     @options[:key_conv] ||= (@options[:conv] || proc {|i| i.to_s })
@@ -137,29 +138,33 @@ class Dslh
         value_buf.puts('(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')')
       else
         nested = true
-        value_buf.puts(' do')
+        value_buf.puts(@options[:use_braces_instead_of_do_end] ? ' {' : ' do')
         deval0(value, depth + 1, value_buf)
-        value_buf.puts(indent + 'end')
+        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) }}
         nested = true
 
         if not @options[:dump_old_hash_array_format] and value.all? {|i| i.kind_of?(Hash) }
-          value_buf.puts(' do |*|')
+          value_buf.puts(@options[:use_braces_instead_of_do_end] ? ' {|*|' : ' do |*|')
 
           value.each_with_index do |v, i|
             deval0(v, depth + 1, value_buf)
 
             if i < (value.length - 1)
-              value_buf.puts(indent + "end\n" + indent + curr_key + ' do |*|')
+              if @options[:use_braces_instead_of_do_end]
+                value_buf.puts(indent + "}\n" + indent + curr_key + ' {|*|')
+              else
+                value_buf.puts(indent + "end\n" + indent + curr_key + ' do |*|')
+              end
             end
           end
 
           if newline
-            value_buf.puts(indent + 'end')
+            value_buf.puts(indent + (@options[:use_braces_instead_of_do_end] ? '}' : 'end'))
           else
-            value_buf.print(indent + 'end')
+            value_buf.print(indent + (@options[:use_braces_instead_of_do_end] ? '}' : 'end'))
           end
         else
           value_buf.puts(' [')

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/spec/dslh_spec.rb

@@ -775,6 +775,14 @@ end
     expect(evaluated).to eq(template)
   end
 
+  it 'should convert json to dsl (use braces)' do
+    template = JSON.parse(drupal_multi_az_template)
+
+    dsl = Dslh.deval(template)
+    evaluated = Dslh.eval(dsl, :key_conv => proc {|i| i.to_s }, :use_braces_instead_of_do_end => true)
+    expect(evaluated).to eq(template)
+  end
+
   it 'should convert json to dsl with key_conf' do
     template = JSON.parse(drupal_multi_az_template)
 
@@ -2751,4 +2759,47 @@ glossary do
 end
     EOS
   end
+
+  it 'should convert hash to dsl (use braces)' do
+    h = {"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"=>["GML", "XML"]},
+                 "GlossSee"=>"markup"}}}}}
+
+    dsl = Dslh.deval(h, :use_braces_instead_of_do_end => true)
+    expect(dsl).to eq(<<-EOS)
+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 "GML", "XML"
+        }
+        GlossSee "markup"
+      }
+    }
+  }
+}
+    EOS
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Genki Sugawara