yaml-file-db 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc25fcf9d40ac078b11014d04c8a6ab2bf178f2b7efa72f91aae2405938cb0c
-  data.tar.gz: 7f1b29cad5a5f17622b5e695be73d1eb7cd20dc1614d364a3ae9c7a5a6a24573
+  metadata.gz: e267ac60c172096d2484e3e86854886c4c4dbbeb7c895cae083eea0781d4fb00
+  data.tar.gz: 96258128806aea1f96017700203a485f204da736ab0ebcffce36fbfdc2654f57
 SHA512:
-  metadata.gz: 5d90892c09e9770d05d627d7ceec0bd3b6fd1a7ff04c35a37e3530ee8c143d2be3686eda81f53d4c2706ded127bf1e14687ef0922cce8f1135e469eabee44983
-  data.tar.gz: 194504c256053d88b1b75685249e0d08b7c8549b8267df71a67da314c39a60ce3171732253cfd205930bf67db02552b339661c16a401edf2c47aef877ead0608
+  metadata.gz: 34099bed1433f9fe540fb4a0f5f1a9a16c63b44f17b2809f6a535438da4968b6e1ae7874278b1628335f391b8fa280af442cd03235b6235764fe01b2501b4c73
+  data.tar.gz: ef76c1a1cafe075452fdaaf0d2f0250c0141a05cf81edf028c76bdf54cfb8e22653464df87e15e7430bebcc76367f650f838ff937f6ea3b3b5ac630fe4f950fa

data/lib/yaml-file-db/database.rb

@@ -71,9 +71,9 @@ module YDB
 
         table = instance_variable_get var
         table.each do |_id, row|
-          block.call(row)
-        rescue ValidationError => e
-          @errors << "[#{row.source.split('/')[-3..].join('/')}] #{e}"
+          block.call(row).each do |error|
+            @errors << "[#{row.source.split('/')[-3..].join('/')}] #{error}"
+          end
         end
       end
     end

data/lib/yaml-file-db/row.rb

@@ -15,6 +15,7 @@ module YDB
     end
 
     def build_relationships(db, keywords)
+      errors = []
       iterate_over_columns do |key, value|
         if keywords.include?(key)
           if key.pluralize == key
@@ -22,39 +23,41 @@ module YDB
             table = db.public_send(key.to_sym)
             value.each do |primary_key|
               row = table[primary_key]
-              raise ValidationError, "Invalid primary_key: #{primary_key} isn't part of table #{key}" if row.nil?
-
+              errors << "Invalid primary_key: #{primary_key} isn't part of table #{key}" if row.nil?
               rows << row
             end
             instance_variable_set("@#{key}", rows)
           else
             row = db.public_send(key.pluralize.to_sym)[value]
-            raise ValidationError, "Invalid primary_key: #{value} isn't part of table #{key.pluralize}" if row.nil?
-
+            errors << "Invalid primary_key: #{value} isn't part of table #{key.pluralize}" if row.nil?
             instance_variable_set("@#{key}", row)
           end
         end
       end
+      errors
     end
 
     def check_relationships(_db, keywords)
+      errors = []
       iterate_over_columns do |key, value|
         if keywords.include?(key)
-          # move row into array to make it iterable
+          next if value.nil?
+
           value = [value] if value.is_a?(YDB::Row)
           value.each do |row|
             if row.respond_to?(self.class.to_s.downcase.to_sym)
               unless row.public_send(self.class.to_s.downcase.to_sym) == self
-                raise ValidationError, "Inconsistent relationship: #{row.id} doesn't link back to #{id}"
+                errors << "Inconsistent relationship: #{row.id} doesn't link back to #{id}"
               end
             elsif row.respond_to?(self.class.to_s.downcase.pluralize.to_sym)
               unless row.public_send(self.class.to_s.downcase.pluralize.to_sym).include?(self)
-                raise ValidationError, "Inconsistent relationship: #{row.id} doesn't link back to #{id}"
+                errors << "Inconsistent relationship: #{row.id} doesn't link back to #{id}"
               end
             end
           end
         end
       end
+      errors
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-file-db
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Louis-Philippe Gauthier