dslh 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb83267e46deb85fd756f9944f66a5ad898551a0
-  data.tar.gz: 11fab0af1cd6c6202a3fa92ce88ffbf7c453cf05
+  metadata.gz: f54e329df51e56943cdc60617113f7ef8a8ea225
+  data.tar.gz: 913c752ede8898f9a1b0af78f7e76046fabfa17f
 SHA512:
-  metadata.gz: c39c110477cc9cb2ba1cbbdae481fb13e08160a4b1e7f8de0f6081fc375179bd51d6fc81da76fc7f9029596e438429b0aa625fa5075ceb5791cd7d64dde53fd8
-  data.tar.gz: db1cdd35bbe981c41e590882fe8a1ff08663279d1673b21f3606d3af5efa05a2469baa4f0836f9bf6a1c8d187a71717472b66e0d5ae996694cf5eafd43df677c
+  metadata.gz: 431c84f8b8fc1c5508e0c98bbe6482d8148c803f35f0de60e257f2d4e4c09dc1ed0124794d46576954e5968134d921a672a4bfb4eebb71b567368ba012cfac6a
+  data.tar.gz: e9cb7c46c181de6934a4fd717fdff6d24986221f7ea18d39d5e6c0df4b7a70307ef4d958795b7a0932fc62aadcf84160264e853becb26dcc2881a8a385d5263f

data/README.md

@@ -2,8 +2,8 @@
 
 It define Hash as a DSL.
 
-[![Gem Version](https://badge.fury.io/rb/dslh.png?201403022334)](http://badge.fury.io/rb/dslh)
-[![Build Status](https://drone.io/github.com/winebarrel/dslh/status.png?201403022334)](https://drone.io/github.com/winebarrel/dslh/latest)
+[![Gem Version](https://badge.fury.io/rb/dslh.png?201403041920)](http://badge.fury.io/rb/dslh)
+[![Build Status](https://drone.io/github.com/winebarrel/dslh/status.png?201403041920)](https://drone.io/github.com/winebarrel/dslh/latest)
 
 ## Installation
 

data/lib/dslh.rb

@@ -189,7 +189,7 @@ class Dslh
     def method_missing(method_name, *args, &block)
       key_conv = @__options__[:key_conv]
       value_conv = @__options__[:value_conv]
-      nested_hash = ScopeBlock.nest(binding, 'block')
+      nested_hash = ScopeBlock.nest(binding, 'block', method_name)
       method_name = key_conv.call(method_name) if key_conv
 
       if args.empty?
@@ -212,12 +212,32 @@ class Dslh
   end # of Scope
 
   class ScopeBlock
-    def self.nest(bind, block_var)
+    def self.nest(bind, block_var, key = nil)
+      block_call = nil
+
+      if key
+        block_call = <<-EOS
+          #{block_var}_ = proc do
+            if #{block_var}.arity.zero?
+              #{block_var}.call
+            else
+              #{block_var}.call(#{key.inspect})
+            end
+          end
+
+          self.instance_eval(&#{block_var}_)
+        EOS
+      else
+        block_call = <<-EOS
+          self.instance_eval(&#{block_var})
+        EOS
+      end
+
       eval(<<-EOS, bind)
         if #{block_var}
           __hash_orig = @__hash__
           @__hash__ = {}
-          self.instance_eval(&#{block_var})
+          #{block_call}
           __nested_hash = @__hash__
           @__hash__ = __hash_orig
           __nested_hash

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/dslh_spec.rb

@@ -55,6 +55,37 @@ describe Dslh do
     )
   end
 
+  it 'should be nested hash with block args' do
+    h = Dslh.eval do
+      key1 'value'
+      key2 100
+
+      key3 do |a1|
+        key31 "value31" do |a2|
+          key311 100
+          key312 "200 #{a1} #{a2}"
+        end
+
+        key32 do |a3|
+          key321 "value321" do |a4|
+            key3211 "XXX #{a1} #{a3} #{a4}"
+            key3212 :XXX
+          end
+          key322 300
+        end
+      end
+    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}}}
+    )
+  end
+
   it 'can pass hash argument' do
     h = Dslh.eval do
       key1 'value'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler