dslh 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90335d30a0a8550fac463effc4ae103bbc97ab2b
-  data.tar.gz: a2baa307388a8d6bfdcafd7ef6be5c6b2990b7e7
+  metadata.gz: ba8a8dcc743beceda02fefe5c864909276880831
+  data.tar.gz: 60551002e3cc93d2d0e1a5ccc620a9ee722019ae
 SHA512:
-  metadata.gz: b934b99328c9e461c3483cc24bbdf33e075709565ef87cfd0094c6b2a628fbe618e82623e28cadd5eb7e46e7ce64128a77578e053411e1c7067cc7f79c3098e7
-  data.tar.gz: 0f8755ccfe03468c91243ecfc1c8edca6d8ad8f17e3aea5274579bd6e41faf93c0bebf7df995771fcde52be7322c843f36703f7dade283c1f82a3eb57f1a48ec
+  metadata.gz: 839419e273e655b10f0df3ba24470fdc16461e2605549d1f805a8a0b723e58c6db6f193815ee7d2f13b2d1f5bc57c000a0c2ab97c2f800efd85c5b4de5ad421f
+  data.tar.gz: 03421bff73686c0d7d6e176f28295d1727333bf031965ae4454f57ed2fe3218e279c52f8bccd3718b3c9d175622c423ce866dc424aeb6b88c14cbf9e7bfdf811

data/lib/dslh.rb

@@ -145,6 +145,19 @@ class Dslh
         end
 
         errors = validator.validate(new_retval)
+
+        errors.each do |e|
+          path = e.path.split('/', 4)[1..-1]
+          root_key = path.shift
+          _id = path.shift.to_i
+
+          if _id_orig = new_retval.fetch(root_key, {})[_id]
+            _id = _id_orig['_id'] || _id
+          end
+
+          path = '/' + ([root_key, _id] + path).join('/')
+          e.path.replace(path)
+        end
       else
         errors = validator.validate(retval)
       end

data/lib/dslh/version.rb

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

data/spec/dslh_spec.rb

@@ -3098,38 +3098,38 @@ mapping:
     sequence:
       - type: map
         mapping:
-         "_id":
-           type: str
-           required: yes
-         "code":
-           type: int
-           required: yes
-         "email":
-           type: str
+          "_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
+          "_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.
+[/employees/123/_id] '123': not a string.
+[/employees/bar/email] '100': not a string.
+[/employees2/foo2] key 'code:' is required.
+[/employees2/foo2/code1] key 'code1:' is undefined.
+[/employees2/foo2/email1] key 'email1:' is undefined.
+[/employees3/bar2] key 'employees3:' is undefined.
         EOS
       end
 

metadata

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