dslh 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03bc40c96b4543fc6f64a2c59c7d5232d774e2d8
-  data.tar.gz: 7de70d4ee2eea8fbf6a3a98c06065b6dbca8c8c6
+  metadata.gz: 069a25cadfe07e5fb94b13999c621805b209934f
+  data.tar.gz: 61352ba15ae2c64775f6ee6498142cf4343f3004
 SHA512:
-  metadata.gz: ae912dc62430f939a902962a34e81ded1d847b2915de51d169bc0413bb60ac48ddb7d975b3f35431a30df3b9f78f9ee6d9761a3aabb1af9af84da75b299eee1a
-  data.tar.gz: 48b171525b578a2228e0068fa29b77bf6af71570b85231688923b38f4e9e8777b041156ff530f438be8afa21450b5fdd0e05f21addc79b14274d802bde89fb98
+  metadata.gz: cee130b7d63b7288c7b4db402117562d290fc1d29dbf9a94a494d7f27d7ef992685df441b8510a050b40b3f3f6db66a9766cc40262d3de617b239895c391acbf
+  data.tar.gz: 2d76120513c6ce2b5fdff0236b1c3e4160d548f8523c30d61ed70c623c9611f640a8983b47639150336da8a0d3632fb590237db5ef4d7cd350eb5b7f2ca73437

data/README.md

@@ -62,22 +62,22 @@ pp h
 
 ```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=>
+{"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"}}}}}
+           "GlossSeeAlso"=>["GML", "XML"]},
+         "GlossSee"=>"markup"}}}}}
 ```
 
 ### deval

data/lib/dslh.rb

@@ -39,7 +39,7 @@ class Dslh
 
   def initialize(options = {})
     @options = options.dup
-    @options[:key_conv] ||= @options[:conv]
+    @options[:key_conv] ||= (@options[:conv] || proc {|i| i.to_s })
     @options[:value_conv] ||= @options[:conv]
   end
 

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/dslh_spec.rb

@@ -19,8 +19,8 @@ describe Dslh do
     end
 
     expect(h).to eq({
-      :key1 => 'value',
-      :key2 => 100,
+      'key1' => 'value',
+      'key2' => 100,
     })
   end
 
@@ -46,12 +46,12 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>100,
-       :key3=>
-        {:key31=>{"value31"=>{:key311=>100, :key312=>"200"}},
-         :key32=>
-          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}}, :key322=>300}}}
+      {'key1'=>"value",
+       'key2'=>100,
+       'key3'=>
+        {'key31'=>{"value31"=>{'key311'=>100, 'key312'=>"200"}},
+         'key32'=>
+          {'key321'=>{"value321"=>{'key3211'=>"XXX", 'key3212'=>:XXX}}, 'key322'=>300}}}
     )
   end
 
@@ -77,12 +77,12 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>100,
-       :key3=>
-        {:key31=>{:key311=>100, :key312=>"200"},
+      {'key1'=>"value",
+       'key2'=>100,
+       'key3'=>
+        {'key31'=>{'key311'=>100, 'key312'=>"200"},
          'key32'=>
-          {:key321=>{:key3211=>"XXX", :key3212=>:XXX}, :key322=>300}}}
+          {'key321'=>{'key3211'=>"XXX", 'key3212'=>:XXX}, 'key322'=>300}}}
     )
   end
 
@@ -108,12 +108,12 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>100,
-       :key3=>
-        {:key31=>{"value31"=>{:key311=>100, :key312=>"200 key3 key31"}},
-         :key32=>
-          {:key321=>{"value321"=>{:key3211=>"XXX key3 key32 key321", :key3212=>:XXX}}, :key322=>300}}}
+      {'key1'=>"value",
+       'key2'=>100,
+       'key3'=>
+        {'key31'=>{"value31"=>{'key311'=>100, 'key312'=>"200 key3 key31"}},
+         'key32'=>
+          {'key321'=>{"value321"=>{'key3211'=>"XXX key3 key32 key321", 'key3212'=>:XXX}}, 'key322'=>300}}}
     )
   end
 
@@ -137,15 +137,15 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>100,
-       :key3=>{100=>200, "XXX"=>:XXX},
-       :key4=>{:key41=>{"300"=>"400", :FOO=>:BAR}, :key42=>100}}
+      {'key1'=>"value",
+       'key2'=>100,
+       'key3'=>{100=>200, "XXX"=>:XXX},
+       'key4'=>{'key41'=>{"300"=>"400", :FOO=>:BAR}, 'key42'=>100}}
     )
   end
 
   it 'should convert hash key/value' do
-    h = Dslh.eval :conv => proc {|i| i.to_s } do
+    h = Dslh.eval :conv => proc {|i| i.to_s.to_sym } do
       key1 'value'
       key2 100
 
@@ -166,18 +166,18 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {"key1"=>"value",
-       "key2"=>"100",
-       "key3"=>
-        {"key31"=>{"value31"=>{"key311"=>"100", "key312"=>"200"}},
-         "key32"=>
-          {"key321"=>{"value321"=>{"key3211"=>"XXX", "key3212"=>"XXX"}},
-           "key322"=>"300"}}}
+      {:key1=>:value,
+       :key2=>:"100",
+       :key3=>
+        {:key31=>{:value31=>{:key311=>:"100", :key312=>:"200"}},
+         :key32=>
+          {:key321=>{:value321=>{:key3211=>:XXX, :key3212=>:XXX}},
+           :key322=>:"300"}}}
     )
   end
 
   it 'should convert hash key' do
-    h = Dslh.eval :key_conv => proc {|i| i.to_s } do
+    h = Dslh.eval :key_conv => proc {|i| i.to_s.to_sym } do
       key1 'value'
       key2 100
 
@@ -198,13 +198,13 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {"key1"=>"value",
-       "key2"=>100,
-       "key3"=>
-        {"key31"=>{"value31"=>{"key311"=>100, "key312"=>"200"}},
-         "key32"=>
-          {"key321"=>{"value321"=>{"key3211"=>"XXX", "key3212"=>:XXX}},
-           "key322"=>300}}}
+      {:key1=>"value",
+       :key2=>100,
+       :key3=>
+        {:key31=>{"value31"=>{:key311=>100, :key312=>"200"}},
+         :key32=>
+          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}},
+           :key322=>300}}}
     )
   end
 
@@ -230,13 +230,13 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>"100",
-       :key3=>
-        {:key31=>{"value31"=>{:key311=>"100", :key312=>"200"}},
-         :key32=>
-          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>"XXX"}},
-           :key322=>"300"}}}
+      {"key1"=>"value",
+       "key2"=>"100",
+       "key3"=>
+        {"key31"=>{"value31"=>{"key311"=>"100", "key312"=>"200"}},
+         "key32"=>
+          {"key321"=>{"value321"=>{"key3211"=>"XXX", "key3212"=>"XXX"}},
+           "key322"=>"300"}}}
     )
   end
 
@@ -257,10 +257,10 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>["value", "value2"],
-       :key2=>[100, 200],
-       :key3=>{:key31=>[:FOO, :BAR], :key32=>["ZOO", "BAZ"]},
-       :key4=>{["value4", "value42"]=>{:key41=>100, :key42=>"200"}}}
+      {"key1"=>["value", "value2"],
+       "key2"=>[100, 200],
+       "key3"=>{"key31"=>[:FOO, :BAR], "key32"=>["ZOO", "BAZ"]},
+       "key4"=>{["value4", "value42"]=>{"key41"=>100, "key42"=>"200"}}}
     )
   end
 
@@ -288,12 +288,12 @@ describe Dslh do
     h = Dslh.eval(expr)
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>100,
-       :key3=>
-        {:key31=>{"value31"=>{:key311=>100, :key312=>"200"}},
-         :key32=>
-          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}}, :key322=>300}}}
+      {"key1"=>"value",
+       "key2"=>100,
+       "key3"=>
+        {"key31"=>{"value31"=>{"key311"=>100, "key312"=>"200"}},
+         "key32"=>
+          {"key321"=>{"value321"=>{"key3211"=>"XXX", "key3212"=>:XXX}}, "key322"=>300}}}
     )
   end
 
@@ -321,12 +321,12 @@ describe Dslh do
     h = Dslh.eval(expr, :filename => 'my.rb', :lineno => 100)
 
     expect(h).to eq(
-      {:key1=>"value",
-       :key2=>100,
-       :key3=>
-        {:key31=>{"value31"=>{:key311=>100, :key312=>"200"}},
-         :key32=>
-          {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}}, :key322=>300}}}
+      {"key1"=>"value",
+       "key2"=>100,
+       "key3"=>
+        {"key31"=>{"value31"=>{"key311"=>100, "key312"=>"200"}},
+         "key32"=>
+          {"key321"=>{"value321"=>{"key3211"=>"XXX", "key3212"=>:XXX}}, "key322"=>300}}}
     )
   end
 
@@ -337,8 +337,8 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1 => ["value1", "value2"],
-       :key2 => ["100", "200"]}
+      {"key1" => ["value1", "value2"],
+       "key2" => ["100", "200"]}
     )
   end
 
@@ -365,10 +365,10 @@ describe Dslh do
     end
 
     expect(h).to eq(
-      {:key1=>"123",
-       :key2=>
-        {:key21=>"123", :key22=>{:key221=>"123", :key222=>"FOO"}, :key23=>"BAR"},
-       :key3=>"ZOO"}
+      {"key1"=>"123",
+       "key2"=>
+        {"key21"=>"123", "key22"=>{"key221"=>"123", "key222"=>"FOO"}, "key23"=>"BAR"},
+       "key3"=>"ZOO"}
     )
   end
 
@@ -391,7 +391,7 @@ describe Dslh do
       end
     end
 
-    expect(h).to eq({:key1=>123, :key2=>{:key21=>123, :key22=>{:key221=>123}}})
+    expect(h).to eq({"key1"=>123, "key2"=>{"key21"=>123, "key22"=>{"key221"=>123}}})
   end
 
   it 'should convert hash to dsl' do
@@ -544,7 +544,7 @@ end
           end
         end
       end
-    }.to raise_error('duplicate key :key2')
+    }.to raise_error('duplicate key "key2"')
 
     expect {
       Dslh.eval do
@@ -566,7 +566,7 @@ end
           end
         end
       end
-    }.to raise_error('duplicate key :key31')
+    }.to raise_error('duplicate key "key31"')
 
     expect {
       Dslh.eval do
@@ -588,7 +588,7 @@ end
           end
         end
       end
-    }.to raise_error('duplicate key :key311')
+    }.to raise_error('duplicate key "key311"')
   end
 
   it 'allow duplicate key' do
@@ -706,12 +706,12 @@ end
       end
 
       expect(h).to eq(
-        {:key1=>"value",
-         :key2=>100,
-         :key3=>
-          {:key31=>{"value31"=>{:key311=>nil, :key312=>"200"}},
-           :key32=>
-            {:key321=>{"value321"=>{:key3211=>"XXX", :key3212=>:XXX}}, :key322=>300}}}
+        {"key1"=>"value",
+         "key2"=>100,
+         "key3"=>
+          {"key31"=>{"value31"=>{"key311"=>nil, "key312"=>"200"}},
+           "key32"=>
+            {"key321"=>{"value321"=>{"key3211"=>"XXX", "key3212"=>:XXX}}, "key322"=>300}}}
       )
     }.to_not raise_error
   end
@@ -2524,10 +2524,53 @@ end
 
     expect(h).to eq(
       {"system"=>
-        {:key1=>"value",
-         :key2=>100,
-         :key3=>{100=>200, "XXX"=>:XXX},
-         :key4=>{"system"=>{"300"=>"400", :FOO=>:BAR}, :key42=>100}}}
+        {"key1"=>"value",
+         "key2"=>100,
+         "key3"=>{100=>200, "XXX"=>:XXX},
+         "key4"=>{"system"=>{"300"=>"400", :FOO=>:BAR}, "key42"=>100}}}
     )
   end
+
+  it 'should convert hash to dsl (symbol key)' 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)
+    expect(dsl).to eq(<<-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 "GML", "XML"
+        end
+        GlossSee "markup"
+      end
+    end
+  end
+end
+    EOS
+  end
 end

metadata

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