database_validations 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9b338c0155871428c1d59ed10ef0a15f1c87a909b37f634eb63dfd9f442683
-  data.tar.gz: 71b95e1f2f73ee07aec4948540abf620ca33d162d6de8e5d4c1617442f3e9530
+  metadata.gz: 56c892c79d9621f4bd44320198ddc1a982a45f5e8c03099cb8ce50bff1292983
+  data.tar.gz: '09c4a8c5cd90672af903a20c6608d22a019cf252fc2ebe7ad324abfe70b3fa32'
 SHA512:
-  metadata.gz: c29b334bf891fbe940d6e2f2873db03110708614aec60075453702be5c5aca0ac6ccde30d24c18d7530a49bc6646fbb3f417f94802f5ca5b7ff02ef51d7c8235
-  data.tar.gz: a635e8d67bf1135bd5325e34667407c87ef0dc360bff2e031fdc36bdd907ae41059dde31ebb6b46fd99a5346a840ae9191cc28507ed387df84ad7dc643cc16ba
+  metadata.gz: e5435113bf31727fc907ddb1d4ac38534f36e6a2f8d410c14b90e8b3fa589dc630b5620aedb4043606c653d575808f530e0d265360b9588965df4b0d43b74679
+  data.tar.gz: 5edde842f3003a572f8cf89ca69d025261b8ed277c61fa992abc6338c6de6ea1adb9d64f7946550a443c154c94de555921e8c77378f44308a6508fa1bfad4aab

data/lib/database_validations/validations/belongs_to_handlers.rb

@@ -4,12 +4,22 @@ module DatabaseValidations
 
     included do
       alias_method :validate, :valid?
+
+      validate do
+        Helpers.each_belongs_to_presence_validator(self.class) do |validator|
+          next unless validator.column_and_relation_nil_for?(self)
+
+          errors.add(validator.relation, :blank, message: :required)
+        end
+      end
     end
 
     def valid?(context = nil)
       output = super(context)
 
       Helpers.each_belongs_to_presence_validator(self.class) do |validator|
+        next if validator.column_and_relation_nil_for?(self)
+
         validates_with(ActiveRecord::Validations::PresenceValidator, validator.validates_presence_options)
       end
 
@@ -17,8 +27,6 @@ module DatabaseValidations
     end
 
     def save(opts = {})
-      return false unless Helpers.check_foreign_key_missing(self)
-
       ActiveRecord::Base.connection.transaction(requires_new: true) { super }
     rescue ActiveRecord::InvalidForeignKey => e
       Helpers.handle_foreign_key_error!(self, e)
@@ -26,8 +34,6 @@ module DatabaseValidations
     end
 
     def save!(opts = {})
-      raise ActiveRecord::RecordInvalid, self unless Helpers.check_foreign_key_missing(self)
-
       ActiveRecord::Base.connection.transaction(requires_new: true) { super }
     rescue ActiveRecord::InvalidForeignKey => e
       Helpers.handle_foreign_key_error!(self, e)

data/lib/database_validations/validations/belongs_to_options.rb

@@ -16,6 +16,11 @@ module DatabaseValidations
       Helpers.generate_key_for_belongs_to(column)
     end
 
+    # @return [Boolean]
+    def column_and_relation_nil_for?(instance)
+      instance.public_send(column).nil? && instance.public_send(relation).nil?
+    end
+
     def handle_foreign_key_error(instance)
       # Hack to not query the database because we know the result already
       instance.send("#{relation}=", nil)

data/lib/database_validations/validations/helpers.rb

@@ -26,15 +26,6 @@ module DatabaseValidations
       raise error
     end
 
-    def check_foreign_key_missing(instance)
-      Helpers.each_belongs_to_presence_validator(instance.class) do |validator|
-        if instance.public_send(validator.column).nil? && instance.public_send(validator.relation).nil?
-          instance.errors.add(validator.relation, :blank, message: :required)
-        end
-      end
-      instance.errors.empty?
-    end
-
     def each_options_storage(klass)
       while klass.respond_to?(:validates_db_uniqueness_of)
         storage = klass.instance_variable_get(:'@database_validations_opts')

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.8.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord