yaml-file-db 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4700000d15653642b4406b061880362c02aaa98baed7ab989234299bd058443
-  data.tar.gz: 2b39ce455282320fe6eed78f75515988136c02f5b1be6c7aaf98719036cd7448
+  metadata.gz: becc9d0085a685c6a7b47e8d2fb32a372a6dd0d4af6f7bfc58b02ff896c8c90b
+  data.tar.gz: 6180250656d4c32731e5a77a9127fd17982b9fa48c0bcbff535c4575797890a8
 SHA512:
-  metadata.gz: 87b7ab971ba139a3293ea7761c091c610d8f71505df5f17d64199a635edef806bcbf365f6eb69ea05911d30d25bdfadb3d47b28efd37d6b43be5e5f665a26b09
-  data.tar.gz: 1c7e6cda53f628c4d3119954e09c179ba28ec38960d9ca529579a0af8a5d114293d0ddac1e21e8f5ee79a21db4ced29d81e773b221922bde2a4550a88597a922
+  metadata.gz: 4daf28abf27d81095e879eeac57d356315becbf88ccc30c6eed43fdeda22562f018554001e82120cb2a43209b1a8b05957342c3e07bc19f3496f31b6fd66c55b
+  data.tar.gz: 938c7c4a1c69ed176b0417346c87a35dbede5ec505f6b97c40a956caaedd9c4233885d8bfec95e005317680161d8bb4fbd980b55d9b4cff478d3abb3a98584fb

data/lib/yaml-file-db.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'active_support/inflector'
 require 'json-schema'
 require 'yaml'
 
-require 'yaml-file-db/database.rb'
-require 'yaml-file-db/exception.rb'
-require 'yaml-file-db/row.rb'
+require 'yaml-file-db/database'
+require 'yaml-file-db/exception'
+require 'yaml-file-db/row'

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

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module YDB
   class Database
-
-    INTERNAL_VARS = [:@errors, :@schemas, :@source].freeze
+    INTERNAL_VARS = %i[@errors @schemas @source].freeze
 
     attr_reader :errors, :schemas, :source
 
@@ -11,16 +12,16 @@ module YDB
       @source = source
     end
 
-    def build()
-      build_tables()
-      build_relationships()
-      check_relationships()
+    def build
+      build_tables
+      build_relationships
+      check_relationships
       self
     end
 
     private
 
-    def build_tables()
+    def build_tables
       Dir["#{@source}/*"].each do |table_path|
         table = {}
 
@@ -30,57 +31,51 @@ module YDB
         schema_path = "#{@schemas}/#{table_name.singularize}.yml"
 
         Dir["#{table_path}/*.yml"].each do |source|
-          begin
-            row = Object.const_get(klass_name).new(source, schema_path)
-            table[row.id] = row
-          rescue ValidationError => error
-            @errors << "[#{source.split("/")[-3..-1].join("/")}] #{error.to_s}"
-          end
+          row = Object.const_get(klass_name).new(source, schema_path)
+          table[row.id] = row
+        rescue ValidationError => e
+          @errors << "[#{source.split('/')[-3..].join('/')}] #{e}"
         end
 
         instance_variable_set("@#{table_name}", table)
-        self.class.send("attr_reader", table_name.to_sym)
+        self.class.send('attr_reader', table_name.to_sym)
       end
     end
 
-    def build_relationships()
+    def build_relationships
       keywords = keywords()
       iterate_over_rows do |row|
         row.build_relationships(self, keywords)
       end
     end
 
-    def check_relationships()
+    def check_relationships
       keywords = keywords()
       iterate_over_rows do |row|
         row.check_relationships(self, keywords)
       end
     end
 
-    private
-
-    def keywords()
+    def keywords
       keywords = []
-      (self.instance_variables - INTERNAL_VARS).each do |var|
-        keywords << var.to_s[1..-1]
-        keywords << var.to_s[1..-1].singularize
+      (instance_variables - INTERNAL_VARS).each do |var|
+        keywords << var.to_s[1..]
+        keywords << var.to_s[1..].singularize
       end
       keywords
     end
 
     def iterate_over_rows(&block)
-      self.instance_variables.each do |var|
+      instance_variables.each do |var|
         next if INTERNAL_VARS.include? var
+
         table = instance_variable_get var
-        table.each do |id, row|
-          begin
-            block.call(row)
-          rescue ValidationError => error
-            @errors << "[#{row.source.split("/")[-3..-1].join("/")}] #{error.to_s}"
-          end
+        table.each do |_id, row|
+          block.call(row)
+        rescue ValidationError => e
+          @errors << "[#{row.source.split('/')[-3..].join('/')}] #{e}"
         end
       end
     end
-
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module YDB
   class ValidationError < StandardError
   end

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

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 module YDB
   class Row
-    INTERNAL_VARS = [:@id, :@source].freeze
+    INTERNAL_VARS = %i[@id @source].freeze
 
     attr_reader :id, :source
 
     def initialize(source, schema_path)
-      @id = File.basename(source, ".yml")
+      @id = File.basename(source, '.yml')
       @source = source
 
-      validate_filename()
+      validate_filename
       build(source, schema_path)
     end
 
@@ -20,20 +22,22 @@ 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} isn't part of table #{key}") if row.nil?
+              raise ValidationError, "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} isn't part of table #{key}") if row.nil?
+            raise ValidationError, "Invalid primary_key: #{primary_key} isn't part of table #{key}" if row.nil?
+
             instance_variable_set("@#{key}", row)
           end
         end
       end
     end
 
-    def check_relationships(db, keywords)
+    def check_relationships(_db, keywords)
       iterate_over_columns do |key, value|
         if keywords.include?(key)
           # move row into array to make it iterable
@@ -41,11 +45,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, "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.new("Inconsistent relationship: #{row.id} doesn't link back to #{self.id}")
+                raise ValidationError, "Inconsistent relationship: #{row.id} doesn't link back to #{id}"
               end
             end
           end
@@ -56,35 +60,38 @@ module YDB
     private
 
     def build(source, schema_path)
-      doc = YAML.load(File.read(source))
-      raise ValidationError.new("Invalid YAML document") if doc == false
+      doc = YAML.safe_load(File.read(source))
+      raise ValidationError, 'Invalid YAML document' if doc.nil?
 
-      schema = YAML.load(File.read(schema_path))
+      schema = YAML.safe_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}")
+        JSON::Validator.validate!(schema, doc, parse_data: false)
+      rescue JSON::Schema::ValidationError => e
+        raise ValidationError, "Invalid data: #{e.message}"
       end
 
       doc.each do |name, value|
         instance_variable_set("@#{name}", value)
-        next if self.respond_to?(name.to_sym)
-        self.class.send("attr_reader", name.to_sym)
+        next if respond_to?(name.to_sym)
+
+        self.class.send('attr_reader', name.to_sym)
       end
     end
 
     def iterate_over_columns(&block)
-      self.instance_variables.each do |var|
+      instance_variables.each do |var|
         next if INTERNAL_VARS.include?(var)
-        key = var.to_s[1..-1]
+
+        key = var.to_s[1..]
         value = instance_variable_get(var)
         block.call(key, value)
       end
     end
 
-    def validate_filename()
-      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
+    def validate_filename
+      return if id =~ /\A[a-z\d][a-z\d-]*[a-z\d]\z/i
 
+      raise ValidationError, "Invalid filename: #{id} doesn't follow dash-case convention"
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaml-file-db
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Louis-Philippe Gauthier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -72,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="