yaml-file-db 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdec368220bb1f0c3075bc77ce04deee5d71b589dedfe4768c12a91c963b5373
-  data.tar.gz: 64a96c084ff0d6a622c787c84632fb9163f8218151e1575a71b0ca02bc10413d
+  metadata.gz: f4700000d15653642b4406b061880362c02aaa98baed7ab989234299bd058443
+  data.tar.gz: 2b39ce455282320fe6eed78f75515988136c02f5b1be6c7aaf98719036cd7448
 SHA512:
-  metadata.gz: 83182ca75c22109d1e0a8c117cfae4d75551b9d6f363b4a244d596864fb9b6e657e49b29312ea1b235a0e607ca656a69238acbfa88a4359d7303994d16e7da69
-  data.tar.gz: 2d7e1a93edefba627b2da0bb473398e35dd84343070268256eb3b198d60cfd3bb1b24ad0aa0f16fc621efb1fb8c117ee39f2c9b8b7e9dff2d6d4ac69611df987
+  metadata.gz: 87b7ab971ba139a3293ea7761c091c610d8f71505df5f17d64199a635edef806bcbf365f6eb69ea05911d30d25bdfadb3d47b28efd37d6b43be5e5f665a26b09
+  data.tar.gz: 1c7e6cda53f628c4d3119954e09c179ba28ec38960d9ca529579a0af8a5d114293d0ddac1e21e8f5ee79a21db4ced29d81e773b221922bde2a4550a88597a922

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

@@ -34,7 +34,7 @@ module YDB
             row = Object.const_get(klass_name).new(source, schema_path)
             table[row.id] = row
           rescue ValidationError => error
-            @errors << "#{source}: #{error.to_s}"
+            @errors << "[#{source.split("/")[-3..-1].join("/")}] #{error.to_s}"
           end
         end
 
@@ -76,7 +76,7 @@ module YDB
           begin
             block.call(row)
           rescue ValidationError => error
-            @errors << "#{row.source}: #{error.to_s}"
+            @errors << "[#{row.source.split("/")[-3..-1].join("/")}] #{error.to_s}"
           end
         end
       end

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

@@ -20,13 +20,13 @@ module YDB
             table = db.public_send(key.to_sym)
             value.each do |primary_key|
               row = table[primary_key]
-              raise ValidationError.new("invalid primary_key: #{primary_key} is not part of #{key}") if row.nil?
+              raise ValidationError.new("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.new("invalid primary_key: #{primary_key} is not part of #{key}") if row.nil?
+            raise ValidationError.new("Invalid primary_key: #{primary_key} isn't part of table #{key}") if row.nil?
             instance_variable_set("@#{key}", row)
           end
         end
@@ -41,11 +41,11 @@ module YDB
           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.new("inconsistent relationship: #{row.id} doesn't link back to #{self.id}")
+                raise ValidationError.new("Inconsistent relationship: #{row.id} doesn't link back to #{self.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.new("inconsistent relationship: #{row.id} doesn't link back to #{self.id}")
+                raise ValidationError.new("Inconsistent relationship: #{row.id} doesn't link back to #{self.id}")
               end
             end
           end
@@ -57,13 +57,13 @@ module YDB
 
     def build(source, schema_path)
       doc = YAML.load(File.read(source))
-      raise ValidationError.new("invalid YAML") if doc == false
+      raise ValidationError.new("Invalid YAML document") if doc == false
 
       schema = YAML.load(File.read(schema_path))
       begin
         JSON::Validator.validate!(schema, doc, :parse_data => false)
       rescue JSON::Schema::ValidationError => error
-        raise ValidationError.new("invalid data (#{error.message})")
+        raise ValidationError.new("Invalid data: #{error.message}")
       end
 
       doc.each do |name, value|
@@ -83,7 +83,7 @@ module YDB
     end
 
     def validate_filename()
-      raise ValidationError.new("invalid filename") unless self.id =~ /^[\w-]+$/
+      raise ValidationError.new("Invalid filename: #{self.id} doesn't follow dash-case convention") unless self.id =~ /\A[a-z\d][a-z\d-]*[a-z\d]\z/i
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-file-db
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Louis-Philippe Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport