dslh 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed45c1e092e5109296acdff1cbdf5f04480d54ea
-  data.tar.gz: c01f03de3c202a12f34311ebd38355976547849f
+  metadata.gz: 21ed893265981c141c3c0d34d7c2b1f80fa72ac1
+  data.tar.gz: 41e7a5be1a5d6cc4cf0840c9aef97b1bef0ba0b8
 SHA512:
-  metadata.gz: 7a4334b6e9a8a5893090b0c94e1cb0bd2f96ada901d6bfa4781b65b1f8a50b013b614516a3c63043f7639e140444987b17f4f1db98abadc229a17807f2ba8e14
-  data.tar.gz: 12f0f82b30ccbd566b568d4cec226273d6ed96e2e6cc0ee7c4c90b18956e9b7b3d9cf2ab4eb8f97f46c37e9d256b6e430bc717200e0172424effa5fe497f50c0
+  metadata.gz: c73b4951338446b91966eeb8c0228b72d06dd6d9582acea5abf550d01d648e2b1660ddc1a979686b67bd6fee90bfc32eea0f4a0a472bf679790f89741fb2b233
+  data.tar.gz: 03b3a3a15244f67d8ef0ed5eb74c00af859185325749fe1f1f0ede1bf91030e7566d135d940a92e478bd9a1d0234202ccf9b887b4684b12bfc8cc2fed4ff028e

data/README.md

@@ -226,7 +226,6 @@ mapping:
             required:  yes
          "email":
             type:      str
-      EOS
 EOS
 
 begin

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/dslh.rb

@@ -27,11 +27,12 @@ class Dslh
     :initial_depth,
     :key_conv,
     :lineno,
+    :root_identify,
+    :schema,
     :scope_hook,
     :scope_vars,
     :time_inspecter,
     :use_braces_instead_of_do_end,
-    :schema,
     :value_conv,
   ]
 
@@ -146,13 +147,13 @@ class Dslh
   def deval(hash)
     buf = StringIO.new
     depth = @options[:initial_depth] || 0
-    deval0(hash, depth, buf)
+    deval0(hash, depth, buf, true)
     buf.string
   end
 
   private
 
-  def deval0(hash, depth, buf)
+  def deval0(hash, depth, buf, root = false)
     indent = (INDENT_SPACES * depth)
     key_conv = @options[:key_conv]
     value_conv = @options[:value_conv]
@@ -180,8 +181,15 @@ class Dslh
 
         buf.puts(indent + key_value)
       else
-        buf.print(indent + key)
-        value_proc(value, depth, buf, true, key)
+        if root and @options[:root_identify] and value.kind_of?(Hash)
+          value.each do |k, v|
+            buf.print(indent + key + ' ' + k.inspect)
+            value_proc(v, depth, buf, true, key)
+          end
+        else
+          buf.print(indent + key)
+          value_proc(value, depth, buf, true, key)
+        end
       end
     end
   end
@@ -330,9 +338,12 @@ class Dslh
       value_conv = @__options__[:value_conv]
       nested_hash = block ? ScopeBlock.nest(binding, 'block', method_name) : nil
       method_name = key_conv.call(method_name) if key_conv
+      exist_value = @__hash__[method_name]
 
-      if not @__options__[:allow_duplicate] and @__hash__.has_key?(method_name) and not (block and block.arity == -1)
-        raise "duplicate key #{method_name.inspect}"
+      if not @__options__[:allow_duplicate] and exist_value and not (block and block.arity == -1)
+        if args.length != 1 or not nested_hash or not exist_value.kind_of?(Hash)
+          raise "duplicate key #{method_name.inspect}"
+        end
       end
 
       push_to_hash = proc do |v|
@@ -350,7 +361,9 @@ class Dslh
         args = args.map {|i| value_conv.call(i) } if value_conv
         value = args.length > 1 ? args : args[0]
 
-        if nested_hash
+        if args.length == 1 and exist_value and nested_hash
+          exist_value[value] = nested_hash
+        elsif nested_hash
           push_to_hash.call(value => nested_hash)
         else
           push_to_hash.call(value)

data/spec/dslh_spec.rb

@@ -3025,4 +3025,67 @@ mapping:
       end
     end
   end
+
+  context 'idetify using root key' do
+    it 'eval' do
+      h = Dslh.eval do
+        employees "foo" do
+          code 101
+          email "foo@winebarrel.com"
+        end
+        employees "bar" do
+          code 102
+          email "bar@winebarrel.com"
+        end
+        employees2 "foo2" do
+          code 201
+          email "foo@winebarrel.com"
+        end
+        employees2 "bar2" do
+          code 202
+          email "bar@winebarrel.com"
+        end
+      end
+
+      expect(h).to eq(
+        {"employees"=>
+          {"foo"=>{"code"=>101, "email"=>"foo@winebarrel.com"},
+           "bar"=>{"code"=>102, "email"=>"bar@winebarrel.com"}},
+         "employees2"=>
+          {"foo2"=>{"code"=>201, "email"=>"foo@winebarrel.com"},
+           "bar2"=>{"code"=>202, "email"=>"bar@winebarrel.com"}}}
+      )
+    end
+
+    it 'deval' do
+      h = {"employees"=>
+            {"foo"=>{"code"=>101, "email"=>"foo@winebarrel.com"},
+             "bar"=>{"code"=>102, "email"=>"bar@winebarrel.com"}},
+           "employees2"=>
+            {"foo2"=>{"code"=>201, "email"=>"foo@winebarrel.com"},
+             "bar2"=>{"code"=>202, "email"=>"bar@winebarrel.com"}}}
+
+
+      dsl = Dslh.deval(h, :root_identify => true)
+
+      expect(dsl).to eq <<-EOS
+employees "foo" do
+  code 101
+  email "foo@winebarrel.com"
+end
+employees "bar" do
+  code 102
+  email "bar@winebarrel.com"
+end
+employees2 "foo2" do
+  code 201
+  email "foo@winebarrel.com"
+end
+employees2 "bar2" do
+  code 202
+  email "bar@winebarrel.com"
+end
+      EOS
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: It define Hash as a DSL.