dslh 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21ed893265981c141c3c0d34d7c2b1f80fa72ac1
-  data.tar.gz: 41e7a5be1a5d6cc4cf0840c9aef97b1bef0ba0b8
+  metadata.gz: 90335d30a0a8550fac463effc4ae103bbc97ab2b
+  data.tar.gz: a2baa307388a8d6bfdcafd7ef6be5c6b2990b7e7
 SHA512:
-  metadata.gz: c73b4951338446b91966eeb8c0228b72d06dd6d9582acea5abf550d01d648e2b1660ddc1a979686b67bd6fee90bfc32eea0f4a0a472bf679790f89741fb2b233
-  data.tar.gz: 03b3a3a15244f67d8ef0ed5eb74c00af859185325749fe1f1f0ede1bf91030e7566d135d940a92e478bd9a1d0234202ccf9b887b4684b12bfc8cc2fed4ff028e
+  metadata.gz: b934b99328c9e461c3483cc24bbdf33e075709565ef87cfd0094c6b2a628fbe618e82623e28cadd5eb7e46e7ce64128a77578e053411e1c7067cc7f79c3098e7
+  data.tar.gz: 0f8755ccfe03468c91243ecfc1c8edca6d8ad8f17e3aea5274579bd6e41faf93c0bebf7df995771fcde52be7322c843f36703f7dade283c1f82a3eb57f1a48ec

data/lib/dslh.rb

@@ -134,7 +134,20 @@ class Dslh
 
       schema = Kwalify::Yaml.load(schema)
       validator = Kwalify::Validator.new(schema)
-      errors = validator.validate(retval)
+
+      if @options[:root_identify]
+        new_retval = {}
+
+        retval.each do |k, v|
+          new_retval[k] = v.map {|_id, attrs|
+            attrs.merge('_id' => _id)
+          }
+        end
+
+        errors = validator.validate(new_retval)
+      else
+        errors = validator.validate(retval)
+      end
 
       unless errors.empty?
         raise ValidationError, errors

data/lib/dslh/version.rb

@@ -1,3 +1,3 @@
 class Dslh
-  VERSION = '0.4.1'
+  VERSION = '0.4.2'
 end

data/spec/dslh_spec.rb

@@ -3087,5 +3087,111 @@ employees2 "bar2" do
 end
       EOS
     end
+
+    context 'with schema' do
+      let(:schema) do
+        <<-EOS
+type: map
+mapping:
+  "employees":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+         "_id":
+           type: str
+           required: yes
+         "code":
+           type: int
+           required: yes
+         "email":
+           type: str
+  "employees2":
+    type: seq
+    sequence:
+      - type: map
+        mapping:
+         "_id":
+           type: str
+           required: yes
+         "code":
+           type: int
+           required: yes
+         "email":
+           type: str
+        EOS
+      end
+
+      let(:expected_errmsg) do
+        <<-EOS.chomp
+[/employees/0/_id] '123': not a string.
+[/employees/1/email] '100': not a string.
+[/employees2/0] key 'code:' is required.
+[/employees2/0/code1] key 'code1:' is undefined.
+[/employees2/0/email1] key 'email1:' is undefined.
+[/employees3] key 'employees3:' is undefined.
+        EOS
+      end
+
+      it 'has no error' do
+        h = Dslh.eval(:schema => schema, :root_identify => true) do
+          employees "foo" do
+            code 101
+            email "foo@winebarrel.com"
+          end
+          employees "bar" do
+            code 102
+            email "bar@winebarrel.com"
+          end
+          employees2 "foo2" do
+            code 201
+            email "foo@winebarrel.com"
+          end
+          employees2 "bar2" do
+            code 202
+            email "bar@winebarrel.com"
+          end
+        end
+
+        expect(h).to eq(
+          {"employees"=>
+            {"foo"=>{"code"=>101, "email"=>"foo@winebarrel.com"},
+             "bar"=>{"code"=>102, "email"=>"bar@winebarrel.com"}},
+           "employees2"=>
+            {"foo2"=>{"code"=>201, "email"=>"foo@winebarrel.com"},
+             "bar2"=>{"code"=>202, "email"=>"bar@winebarrel.com"}}}
+        )
+      end
+
+      it 'has error' do
+        block = proc do
+          employees 123 do
+            code 101
+            email "foo@winebarrel.com"
+          end
+          employees "bar" do
+            code 102
+            email 100
+          end
+          employees2 "foo2" do
+            code1 201
+            email1 "foo@winebarrel.com"
+          end
+          employees3 "bar2" do
+            code 202
+            email "bar@winebarrel.com"
+          end
+        end
+
+        begin
+          h = Dslh.eval(:schema => schema, :root_identify => true, &block)
+          fail "must raise validation error"
+        rescue Dslh::ValidationError => e
+          errmsg = e.errors.map {|i| i.to_s }.join("\n")
+          expect(errmsg).to eq expected_errmsg
+          expect(e.message).to eq expected_errmsg
+        end
+      end
+    end
   end
 end

metadata

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