database_consistency 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86853e78b9e1bb68f9e34dbea3b23de33890760a3598b954cd8e89f3ddf88193
-  data.tar.gz: '082c7135a3057bbe59b78d463b62fd522cfcfc3bd0c8b452bb591375d72d962d'
+  metadata.gz: 93c3eb656f1f4ca77b34a647a612db82f713d624c672e7205a79ffc2c4715608
+  data.tar.gz: 879befe9d7b24ae68f1ef492b9f32ae1e166c9d32ff9706bc0aebd68007d0511
 SHA512:
-  metadata.gz: a82a054afba3dac8b0c75bbfaeab357f4c9f9c20d50f854cf0ae30442dbcae1dd18d4223c6e5d31545aa8927c0cd16c243bdc45aeca25102e2a74bee5da097b7
-  data.tar.gz: e0a898d8f10bbf2c47ec4fd397f1b2f01f4696f0ee23bcce47c6ee0d2efa4a2aa0d5caefc219f621fa14701d86fb3aecad3ff414190efbf4542360c5a7f2085c
+  metadata.gz: bcb8edf4ae4fd959295dbdb1782c1f099c540b1c30d7d317da5f8164928502cd27666da9097059cbbfdc1f0ac060ed1ac90cab7aaf4cd6b2be683aad08c8010b
+  data.tar.gz: a3ee3f2e85349980cad0d06e273ba77c889e5bd262b17df3dfb2fda5440b3aac97acf4e69e9287f5ea98b7368535de882031aeef73a3f2c98f54dd5294ba8c20

data/lib/database_consistency/column_verifiers/presence_missing_verifier.rb

@@ -5,7 +5,9 @@ module DatabaseConsistency
       VALIDATOR_MISSING = 'is required but do not have presence validator'.freeze
 
       def verify
-        result(:fail, Helper.message(model, column, VALIDATOR_MISSING)) unless skip? || validator?
+        return if skip? || presence_validator? || inclusion_validator? || belongs_to_reflection?
+
+        result(:fail, Helper.message(model, column, VALIDATOR_MISSING))
       end
 
       private
@@ -16,9 +18,21 @@ module DatabaseConsistency
           (model.record_timestamps? && %w[created_at updated_at].include?(column.name))
       end
 
-      def validator?
+      def presence_validator?
         model.validators.grep(ActiveModel::Validations::PresenceValidator).any? do |validator|
-          validator.attributes.include?(column.name) || validator.attributes.include?(column.name.to_sym)
+          Helper.check_inclusion?(validator.attributes, column.name)
+        end
+      end
+
+      def inclusion_validator?
+        model.validators.grep(ActiveModel::Validations::InclusionValidator).any? do |validator|
+          Helper.check_inclusion?(validator.attributes, column.name)
+        end
+      end
+
+      def belongs_to_reflection?
+        model.reflect_on_all_associations.grep(ActiveRecord::Reflection::BelongsToReflection).any? do |reflection|
+          Helper.check_inclusion?([reflection.foreign_key, reflection.foreign_type], column.name)
         end
       end
     end

data/lib/database_consistency/database_processor.rb

@@ -6,7 +6,7 @@ module DatabaseConsistency
     ].freeze
 
     def reports
-      Helper.models.flat_map do |model|
+      Helper.parent_models.flat_map do |model|
         model.columns.flat_map do |column|
           VERIFIERS.map do |verifier|
             verifier.verify(model, column)

data/lib/database_consistency/helper.rb

@@ -5,7 +5,14 @@ module DatabaseConsistency
 
     # Returns list of models to check
     def models
-      ActiveRecord::Base.descendants.select { |model| model.validators.any? }
+      ActiveRecord::Base.descendants.delete_if(&:abstract_class?)
+    end
+
+    # Return list of not inherited models
+    def parent_models
+      models.group_by(&:table_name).each_value.map do |models|
+        models.min_by { |model| models.include?(model.superclass) ? 1 : 0 }
+      end
     end
 
     # Loads all models
@@ -20,9 +27,14 @@ module DatabaseConsistency
 
     # @return [String]
     def message(model, column, template = nil)
-      str = "column #{column.name} of table #{model.table_name}"
+      str = "column #{column.name} of table #{model.table_name} of model #{model.name}"
       str += " #{template}" if template
       str
     end
+
+    # @return [Boolean]
+    def check_inclusion?(array, element)
+      array.include?(element.to_s) || array.include?(element.to_sym)
+    end
   end
 end

data/lib/database_consistency/report.rb

@@ -9,7 +9,7 @@ module DatabaseConsistency
 
     def result(status, message)
       {
-        status:  status,
+        status: status,
         message: message
       }.tap { |hash| hash[:opts] = opts unless opts.empty? }
     end

data/lib/database_consistency/version.rb

@@ -1,3 +1,3 @@
 module DatabaseConsistency
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/lib/database_consistency/writers/simple_writer.rb

@@ -10,6 +10,7 @@ module DatabaseConsistency
       def format
         results.map do |result|
           next unless write?(result[:status])
+
           line(result)
         end.tap(&:compact!).map(&:lstrip).delete_if(&:empty?).join(delimiter)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_consistency
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord