dslh 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: bce00164dbac9519528c2fe51039b347f62cddce
-  data.tar.gz: d6623f383890d4e1942901e146dbf75de5ad26b2
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmJmOGFiMjc5MjczZmI1Y2IzZjhiODJmNTYyZmI4YzViMmIzNzVkMQ==
+  data.tar.gz: !binary |-
+    Y2FhNjliMDRjMGMwMzhhM2Y4YTliMGU0YWNkMTA1NDQzODY4N2EyNg==
 SHA512:
-  metadata.gz: a3589a330df396ef06d25a1dd50934ec30372b9f6f694b1e372ada3f528a6fdbb247eba1fcd0128766e4d93c3d1401cd0960d6f43bbcdc4949efce8a87c3425a
-  data.tar.gz: 8549ccdfb535a1065eaff69f155eae51f37577dd6a703ae687800db5f586a8198b636c0de94b2813c24bbe8389a266b89929d6aa7071b1b553c8ed74e24ce01e
+  metadata.gz: !binary |-
+    YzkzOTFmODIwMjY5ZWY5YzM5MGFlMDlhYzA5Y2E1MTNhZDA3NTM4YTViZmVl
+    MTUyZmYyMzdiZDIzZjhiNjcxNjk1YTkzMTU1OWVhYWE4YzNkOTZhNWFhZDVk
+    N2JjM2M5ZWM1NDNlYmM3NTJlYWZlMWIwOTU2OTJmZjE1NDgxMzU=
+  data.tar.gz: !binary |-
+    NThiOTQwYjRmYTA3MjFlZTQwZDE5ZjMyNDk1MzM0OGUwZGI2YzA1YmU3MDJm
+    Zjk0NjkzZjliNzNjMWIzMTMzZWIzNDc3Mzc2ZDEyNzZlODY2M2JkOWYwMzEw
+    ZmMzMjc0N2JkYmZkOWFlMmIxOWIxZTQ4NjY2OTM3MzMwNGQ4Yzc=

data/README.md

@@ -2,8 +2,8 @@
 
 It define Hash as a DSL.
 
-[![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)
+[![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)
 
 ## Installation
 

data/lib/dslh.rb

@@ -188,6 +188,11 @@ class Dslh
       if key
         key_conv = @__options__[:key_conv]
         key = key_conv.call(key) if key_conv
+
+        if not @__options__[:allow_duplicate] and @__hash__.has_key?(key)
+          raise "duplicate key #{key.inspect}"
+        end
+
         @__hash__[key] = nested_hash
       else
         return nested_hash
@@ -200,6 +205,10 @@ class Dslh
       nested_hash = ScopeBlock.nest(binding, 'block', method_name)
       method_name = key_conv.call(method_name) if key_conv
 
+      if not @__options__[:allow_duplicate] and @__hash__.has_key?(method_name)
+        raise "duplicate key #{method_name.inspect}"
+      end
+
       if args.empty?
         @__hash__[method_name] = nested_hash
       else

data/lib/dslh/version.rb

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

data/spec/dslh_spec.rb

@@ -523,6 +523,142 @@ end
     EOS
   end
 
+  it 'does not allow duplicate key' do
+    expect {
+      Dslh.eval do
+        key1 'value'
+        key2 100
+
+        key2 do
+          key31 "value31" do
+            key311 100
+            key312 '200'
+          end
+
+          key32 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.to raise_error('duplicate key :key2')
+
+    expect {
+      Dslh.eval do
+        key1 'value'
+        key2 100
+
+        key3 do
+          key31 "value31" do
+            key311 100
+            key312 '200'
+          end
+
+          key31 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.to raise_error('duplicate key :key31')
+
+    expect {
+      Dslh.eval do
+        key1 'value'
+        key2 100
+
+        key3 do
+          key31 "value31" do
+            key311 100
+            key311 '200'
+          end
+
+          key32 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.to raise_error('duplicate key :key311')
+  end
+
+  it 'allow duplicate key' do
+    expect {
+      Dslh.eval(:allow_duplicate => true) do
+        key1 'value'
+        key2 100
+
+        key2 do
+          key31 "value31" do
+            key311 100
+            key312 '200'
+          end
+
+          key32 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.to_not raise_error
+
+    expect {
+      Dslh.eval(:allow_duplicate => true) do
+        key1 'value'
+        key2 100
+
+        key3 do
+          key31 "value31" do
+            key311 100
+            key312 '200'
+          end
+
+          key31 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.to_not raise_error
+
+    expect {
+      Dslh.eval(:allow_duplicate => true) do
+        key1 'value'
+        key2 100
+
+        key3 do
+          key31 "value31" do
+            key311 100
+            key311 '200'
+          end
+
+          key32 do
+            key321 "value321" do
+              key3211 'XXX'
+              key3212 :XXX
+            end
+            key322 300
+          end
+        end
+      end
+    }.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.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-10 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.0.14
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: It define Hash as a DSL.
@@ -101,4 +101,3 @@ test_files:
 - spec/Drupal_Single_Instance.template
 - spec/dslh_spec.rb
 - spec/spec_helper.rb
-has_rdoc: