dslh 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c4a01b781d577a7737b7b55519c525ef57c1dcc
-  data.tar.gz: 584b9e8b0b599b902cbc409cd3feede61a3ee8c8
+  metadata.gz: 1b673d3f47872a6187fcad5e8ca2129852d85f3b
+  data.tar.gz: 63f511214fb994063ce90fa20e86d003a6871f54
 SHA512:
-  metadata.gz: cd1dcc567b02b9c0c2130055d45cc4868300485bb5902afc529c4b8eb711b7e23833b7786cc7c7d5233409f3af1d92566b1e9fadcd866dd97e794a7925f8c858
-  data.tar.gz: fdf5c4bd7e8b95bac5e36a1c6aa56436aa3bd43dfc282c1d31b6b03b54471e63ce2f94ae5fa572bdced5f5f72b1916fe62a40c5a6505a2178251f5a4ad287178
+  metadata.gz: 4e0efa411f1ae09ce818e70ff172f0252f9e029311d5d9a56b2d43cc485b286cb34a1a89826eab752c8c0d2cd1871050d1d00e511062b354c907ed0ebeb6594a
+  data.tar.gz: 07ed4b621f2bf933511010ea1cd2b5a0c6a1caa1eeafa45cca8ca3d2e3bf52f8b3333dd99973b5a9580948447f0d05318638111d9fa14b0edd272cdda310e3e9

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/dslh.rb

@@ -53,7 +53,16 @@ class Dslh
       key_conv = @__options__[:key_conv] || @__options__[:conv]
       value_conv = @__options__[:value_conv] || @__options__[:conv]
 
-      nested_hash = block ? Dslh.eval(@__options__, &block) : nil
+      nested_hash = nil
+
+      if block
+        hash_orig = @__hash__
+        @__hash__ = {}
+        self.instance_eval(&block)
+        nested_hash = @__hash__
+        @__hash__ = hash_orig
+      end
+
       method_name = key_conv.call(method_name) if key_conv
 
       if args.empty?

data/spec/dslh_spec.rb

@@ -271,4 +271,34 @@ describe Dslh do
        :key2 => ["100", "200"]}
     )
   end
+
+  it 'should share context' do
+    h = Dslh.eval :value_conv => proc {|i| i.to_s } do
+      def func
+        123
+      end
+
+      var1 = 'FOO'
+      var2 = 'BAR'
+      var3 = 'ZOO'
+
+      key1 func
+      key2 do
+        key21 func
+        key22 do
+          key221 func
+          key222 var1
+        end
+        key23 var2
+      end
+      key3 var3
+    end
+
+    expect(h).to eq(
+      {:key1=>"123",
+       :key2=>
+        {:key21=>"123", :key22=>{:key221=>"123", :key222=>"FOO"}, :key23=>"BAR"},
+       :key3=>"ZOO"}
+    )
+  end
 end

metadata

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