dslh 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 448c7a38e72cbc66a338013c5b594d15501675b5
-  data.tar.gz: 500c4decaa985b8682c123c8b2d58f0e82566d6a
+  metadata.gz: 2ee7c54ea949ae371f63dccec99e030e724782cf
+  data.tar.gz: 2600505830a26c4d8679dcba4e46590cec3453e6
 SHA512:
-  metadata.gz: 61bdc03040f883968193fc63a7fbb4c9d7d1e9f6b1d26af00478b65266d659ab382687488940cf0d870f62d7da31323c499d704c35a9d6f0d5510d9efcc18c4e
-  data.tar.gz: 1137178d9f9b748198787b5747b63745cc09dba6baeee17836e56bb0f087dfa927e63d1894084cdcb57c8905d2ef2bbfa5f0aabde88ae7dbceeec9583af13f16
+  metadata.gz: 9ae3e9132526fb7f9755bfd7014563bd719e081fb936cfa815f706039b90a1d0ad58e2b02a2e3ec1cb7e77e5b00397608296d5781c4d1a4ba23de021fab6458e
+  data.tar.gz: 6e7893c3bd777f65989828bd8f8d262e5a4e25baef78ddb9bda1ab23ea832f92193482a66f50bfcb2c0c01b766e5994ec570dd8c5b4e848ad91901e26e61edaf

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+test.rb

data/README.md

@@ -80,6 +80,50 @@ pp h
          :GlossSee=>"markup"}}}}}
 ```
 
+### deval
+
+```ruby
+require 'dslh'
+
+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"}}}}}
+
+puts Dslh.deval(h) # => 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 "GML", "XML"
+                   #            end
+                   #            GlossSee "markup"
+                   #          end
+                   #        end
+                   #      end
+                   #    end
+```
+
 ## Contributing
 
 1. Fork it ( http://github.com/<my-github-username>/dslh/fork )

data/lib/dslh.rb

@@ -1,5 +1,6 @@
 require 'dslh/version'
 require 'stringio'
+require 'pp'
 
 class Dslh
   INDENT_SPACES = '  '
@@ -71,25 +72,44 @@ class Dslh
   private
 
   def deval0(hash, depth, buf)
-    hash.each do |key, value|
-      key_conv = @options[:key_conv] || @options[:conv]
-      value_conv = @options[:value_conv] || @options[:conv]
+    indent = (INDENT_SPACES * depth)
+    next_indent = (INDENT_SPACES * (depth + 1))
+    key_conv = @options[:key_conv] || @options[:conv]
+    value_conv = @options[:value_conv] || @options[:conv]
+    exclude_key = @options[:exclude_key] || proc {|k| k.to_s !~ /\A[_a-z]\w+\Z/i }
+
+    if exclude_key and (key_conv ? hash.keys.map {|k| key_conv.call(k) } : hash.keys).any? {|k| exclude_key.call(k) }
+      buf.puts '(' + ("\n" + hash.pretty_inspect.strip).gsub("\n", "\n" + indent) + ')'
+      return
+    end
 
+    hash.each do |key, value|
       key = key_conv.call(key) if key_conv
-      indent = (INDENT_SPACES * depth)
-
       buf.print(indent + key)
 
       case value
       when Hash
-        buf.puts(' do')
-        deval0(value, depth + 1, buf)
-        buf.puts(indent + 'end')
+        if exclude_key and (key_conv ? value.keys.map {|k| key_conv.call(k) } : value.keys).any? {|k| exclude_key.call(k) }
+          buf.puts '(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')'
+        else
+          buf.puts(' do')
+          deval0(value, depth + 1, buf)
+          buf.puts(indent + 'end')
+        end
       when Array
-        buf.puts ' ' + value.map {|v|
-          v = value_conv.call(v) if value_conv
-          v.inspect
-        }.join(', ')
+        if value.any? {|v| [Array, Hash].any? {|c| v.kind_of?(c) }}
+          buf.puts '(' + ("\n" + value.pretty_inspect.strip).gsub("\n", "\n" + next_indent) + ')'
+        else
+          buf.puts ' ' + value.map {|v|
+            v = value_conv.call(v) if value_conv
+
+            if v.kind_of?(Hash)
+              '(' + v.inspect + ')'
+            else
+              v.inspect
+            end
+          }.join(', ')
+        end
       else
         value = value_conv.call(value) if value_conv
         buf.puts ' ' + value.inspect

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/spec/dslh_spec.rb

@@ -495,4 +495,14 @@ glossary do
 end
     EOS
   end
+
+  it 'should convert json to dsl' do
+    url = 'https://s3.amazonaws.com/cloudformation-templates-us-east-1/Drupal_Multi_AZ.template'
+    template = open(url) {|f| f.read }
+    template = JSON.parse(template)
+
+    dsl = Dslh.deval(template)
+    evaluated = Dslh.eval(dsl, :key_conv => proc {|i| i.to_s })
+    expect(evaluated).to eq(template)
+  end
 end

data/spec/spec_helper.rb

@@ -1 +1,3 @@
 require 'dslh'
+require 'json'
+require 'open-uri'

metadata

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