dslh 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f54e329df51e56943cdc60617113f7ef8a8ea225
-  data.tar.gz: 913c752ede8898f9a1b0af78f7e76046fabfa17f
+  metadata.gz: bce00164dbac9519528c2fe51039b347f62cddce
+  data.tar.gz: d6623f383890d4e1942901e146dbf75de5ad26b2
 SHA512:
-  metadata.gz: 431c84f8b8fc1c5508e0c98bbe6482d8148c803f35f0de60e257f2d4e4c09dc1ed0124794d46576954e5968134d921a672a4bfb4eebb71b567368ba012cfac6a
-  data.tar.gz: e9cb7c46c181de6934a4fd717fdff6d24986221f7ea18d39d5e6c0df4b7a70307ef4d958795b7a0932fc62aadcf84160264e853becb26dcc2881a8a385d5263f
+  metadata.gz: a3589a330df396ef06d25a1dd50934ec30372b9f6f694b1e372ada3f528a6fdbb247eba1fcd0128766e4d93c3d1401cd0960d6f43bbcdc4949efce8a87c3425a
+  data.tar.gz: 8549ccdfb535a1065eaff69f155eae51f37577dd6a703ae687800db5f586a8198b636c0de94b2813c24bbe8389a266b89929d6aa7071b1b553c8ed74e24ce01e

data/README.md

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

data/lib/dslh.rb

@@ -182,8 +182,16 @@ class Dslh
   end
 
   class Scope
-    def _(&block)
-      ScopeBlock.nest(binding, 'block')
+    def _(key = nil, &block)
+      nested_hash = ScopeBlock.nest(binding, 'block')
+
+      if key
+        key_conv = @__options__[:key_conv]
+        key = key_conv.call(key) if key_conv
+        @__hash__[key] = nested_hash
+      else
+        return nested_hash
+      end
     end
 
     def method_missing(method_name, *args, &block)

data/lib/dslh/version.rb

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

data/spec/dslh_spec.rb

@@ -55,6 +55,37 @@ describe Dslh do
     )
   end
 
+  it 'should be nested hash with _()' do
+    h = Dslh.eval do
+      key1 'value'
+      key2 100
+
+      _(:key3) do
+        _(:key31) do
+          key311 100
+          key312 '200'
+        end
+
+        _('key32') do
+          key321 do
+            key3211 'XXX'
+            key3212 :XXX
+          end
+          key322 300
+        end
+      end
+    end
+
+    expect(h).to eq(
+      {:key1=>"value",
+       :key2=>100,
+       :key3=>
+        {:key31=>{:key311=>100, :key312=>"200"},
+         'key32'=>
+          {:key321=>{:key3211=>"XXX", :key3212=>:XXX}, :key322=>300}}}
+    )
+  end
+
   it 'should be nested hash with block args' 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.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler