dslh 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmJmOGFiMjc5MjczZmI1Y2IzZjhiODJmNTYyZmI4YzViMmIzNzVkMQ==
-  data.tar.gz: !binary |-
-    Y2FhNjliMDRjMGMwMzhhM2Y4YTliMGU0YWNkMTA1NDQzODY4N2EyNg==
+SHA1:
+  metadata.gz: fa4ee0d726af330efe68242aa1d5aa7d772266a4
+  data.tar.gz: d8235afa0db8146c8cc07da541914e03a83501c5
 SHA512:
-  metadata.gz: !binary |-
-    YzkzOTFmODIwMjY5ZWY5YzM5MGFlMDlhYzA5Y2E1MTNhZDA3NTM4YTViZmVl
-    MTUyZmYyMzdiZDIzZjhiNjcxNjk1YTkzMTU1OWVhYWE4YzNkOTZhNWFhZDVk
-    N2JjM2M5ZWM1NDNlYmM3NTJlYWZlMWIwOTU2OTJmZjE1NDgxMzU=
-  data.tar.gz: !binary |-
-    NThiOTQwYjRmYTA3MjFlZTQwZDE5ZjMyNDk1MzM0OGUwZGI2YzA1YmU3MDJm
-    Zjk0NjkzZjliNzNjMWIzMTMzZWIzNDc3Mzc2ZDEyNzZlODY2M2JkOWYwMzEw
-    ZmMzMjc0N2JkYmZkOWFlMmIxOWIxZTQ4NjY2OTM3MzMwNGQ4Yzc=
+  metadata.gz: 90d02012002838b554aa3a502668d5f9d9a6468aca98996f2a48a70d86a49b74f86c825109af5955cff06a2eed962d7964b7447d5a8b9a16d0b1a58ddda39e84
+  data.tar.gz: 076e581bfec7598fd68f05624a61bd8d2c8ac58b5f52bafe6c9f24bed1741eb0066e01c9e9e89e82a089e5e7e0f0103b1dd6be744b760ff0b438ea4b1d1cb667

data/README.md

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

data/lib/dslh.rb

@@ -200,9 +200,13 @@ class Dslh
     end
 
     def method_missing(method_name, *args, &block)
+      if args.empty? and not block and not @__options__[:allow_empty_args]
+        super
+      end
+
       key_conv = @__options__[:key_conv]
       value_conv = @__options__[:value_conv]
-      nested_hash = ScopeBlock.nest(binding, 'block', method_name)
+      nested_hash = block ? ScopeBlock.nest(binding, 'block', method_name) : nil
       method_name = key_conv.call(method_name) if key_conv
 
       if not @__options__[:allow_duplicate] and @__hash__.has_key?(method_name)

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/dslh_spec.rb

@@ -659,6 +659,63 @@ end
     }.to_not raise_error
   end
 
+  it 'does not allow empty args' do
+    expect {
+      Dslh.eval do
+        key1 'value'
+        key2 100
+
+        key3 do
+          key31 "value31" do
+            key311
+            key312 '200'
+          end
+
+          key32 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.to raise_error(NameError)
+  end
+
+  it 'does allow empty args' do
+    expect {
+      h = Dslh.eval(:allow_empty_args => true) do
+        key1 'value'
+        key2 100
+
+        key3 do
+          key31 "value31" do
+            key311
+            key312 '200'
+          end
+
+          key32 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        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}}}
+      )
+    }.to_not raise_error
+  end
+
   it 'should convert hash to dsl with value_conv' do
     h = {"glossary"=>
           {"title"=>"example glossary",

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: dslh
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.11.0
 description: It define Hash as a DSL.
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: It define Hash as a DSL.
@@ -101,3 +101,4 @@ test_files:
 - spec/Drupal_Single_Instance.template
 - spec/dslh_spec.rb
 - spec/spec_helper.rb
+has_rdoc: