database_validations 0.8.5 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51bc2df5e836cbe85e6ec06cc3446652458093b3dba7d7dbd9123e579d67d6ce
-  data.tar.gz: 82b5fdfec69d72f1fecf811f6add8f4e5d606ed2adbd2a6fab1a90125b0e57e2
+  metadata.gz: b696cae920dc9834393d2cf25127c7d9c9504750ec32d58f57c2bc873f735709
+  data.tar.gz: d2235fff367e21b9684d245b13773099bc1a1c292b1590a9888be33ae4bd1ad9
 SHA512:
-  metadata.gz: 7a97f163683bc28f3884dbdd5b8d26a4059443199211bd4e5c980e5abdd1ef2b5d37efcc6c8557e0a853fe0fdb1f247f5677b6c0534b7f632bfb25af20e86606
-  data.tar.gz: 556d083c72c34d0b90e381e052999289eb797ba74cd1b938fe5a1a53cdd47511d41472671ea5c10902b6bc02049e1772a2d7b83f0ec0fd1ff43c8298235e4a50
+  metadata.gz: 9c5740414831fa3fffcd45d4acbc5771c6b4eb49eb30de1a221ecca7dd801b841a4c55939911fab66a30f5a641a8cef19ecd5a4efb13b2a2dfd2a8f1ae80864a
+  data.tar.gz: d3dd1b8fda9f3c187f0ecf14ecdc24322e76583bb9278cb0e1adb38decbb325be7064d24ec1ccf6cc393c5a2b72a86a7ce4e57b4026260ba0b31f88bb00b2085

data/lib/database_validations.rb

@@ -4,18 +4,19 @@ require 'database_validations/version'
 
 require 'database_validations/rails/railtie' if defined?(Rails)
 
-require 'database_validations/validations/uniqueness_handlers'
-require 'database_validations/validations/uniqueness_options'
+require 'database_validations/lib/validates_db_uniqueness_of/db_uniqueness_validator'
+require 'database_validations/lib/validates_db_uniqueness_of/uniqueness_handlers'
+require 'database_validations/lib/validates_db_uniqueness_of/uniqueness_options'
 
-require 'database_validations/validations/belongs_to_presence_validator'
-require 'database_validations/validations/belongs_to_handlers'
-require 'database_validations/validations/belongs_to_options'
+require 'database_validations/lib/db_belongs_to/db_presence_validator'
+require 'database_validations/lib/db_belongs_to/belongs_to_handlers'
+require 'database_validations/lib/db_belongs_to/belongs_to_options'
 
-require 'database_validations/validations/valid_without_database_validations'
-require 'database_validations/validations/options_storage'
-require 'database_validations/validations/errors'
-require 'database_validations/validations/helpers'
-require 'database_validations/validations/adapters'
+require 'database_validations/lib/rescuer'
+require 'database_validations/lib/options_storage'
+require 'database_validations/lib/errors'
+require 'database_validations/lib/helpers'
+require 'database_validations/lib/adapters'
 
 module DatabaseValidations
   extend ActiveSupport::Concern

data/lib/database_validations/{validations → lib}/adapters.rb

@@ -1,7 +1,7 @@
-require 'database_validations/validations/adapters/base_adapter'
-require 'database_validations/validations/adapters/sqlite_adapter'
-require 'database_validations/validations/adapters/postgresql_adapter'
-require 'database_validations/validations/adapters/mysql_adapter'
+require 'database_validations/lib/adapters/base_adapter'
+require 'database_validations/lib/adapters/sqlite_adapter'
+require 'database_validations/lib/adapters/postgresql_adapter'
+require 'database_validations/lib/adapters/mysql_adapter'
 
 module DatabaseValidations
   module Adapters

data/lib/database_validations/lib/db_belongs_to/belongs_to_handlers.rb

@@ -0,0 +1,20 @@
+module DatabaseValidations
+  module ClassMethods
+    def db_belongs_to(name, scope = nil, **options)
+      Helpers.cache_valid_method!(self)
+
+      @database_validations_opts ||= DatabaseValidations::OptionsStorage.new(self)
+
+      belongs_to(name, scope, options.merge(optional: true))
+
+      foreign_key = reflections[name.to_s].foreign_key
+
+      @database_validations_opts.push_belongs_to(foreign_key, name)
+
+      validates_with DatabaseValidations::DBPresenceValidator,
+                     DatabaseValidations::BelongsToOptions.validator_options(name, foreign_key)
+
+      include(DatabaseValidations::Rescuer)
+    end
+  end
+end

data/lib/database_validations/{validations → lib/db_belongs_to}/belongs_to_options.rb

@@ -1,5 +1,9 @@
 module DatabaseValidations
   class BelongsToOptions
+    def self.validator_options(association, foreign_key)
+      { attributes: association, foreign_key: foreign_key, message: :required }
+    end
+
     attr_reader :column, :adapter, :relation
 
     def initialize(column, relation, adapter)
@@ -27,10 +31,6 @@ module DatabaseValidations
       instance.errors.add(relation, :blank, message: :required)
     end
 
-    def validates_presence_options
-      { attributes: relation, message: :required }
-    end
-
     private
 
     def raise_if_foreign_key_missed!

data/lib/database_validations/lib/db_belongs_to/db_presence_validator.rb

@@ -0,0 +1,30 @@
+module DatabaseValidations
+  class DBPresenceValidator < ActiveRecord::Validations::PresenceValidator
+    # This is a hack to simulate presence validator
+    # It's used for cases when some 3rd parties are relies on the validators
+    # For example, +required+ option from simple_form checks the validator
+    def self.kind
+      :presence
+    end
+
+    attr_reader :foreign_key, :association
+
+    def initialize(options)
+      super(options)
+
+      @association = attributes.first
+      @foreign_key = options[:foreign_key]
+    end
+
+    # The else statement required only for optional: false
+    def validate(record)
+      if record._database_validations_fallback
+        super
+      else
+        return unless record.public_send(foreign_key).blank? && record.public_send(association).blank?
+
+        record.errors.add(association, :blank, message: :required)
+      end
+    end
+  end
+end

data/lib/database_validations/{validations → lib}/helpers.rb

@@ -2,6 +2,22 @@ module DatabaseValidations
   module Helpers
     module_function
 
+    def cache_valid_method!(klass)
+      return if klass.method_defined?(:valid_without_database_validations?)
+
+      klass.alias_method(:valid_without_database_validations?, :valid?)
+    end
+
+    def handle_error!(instance, error)
+      case error
+      when ActiveRecord::RecordNotUnique
+        handle_unique_error!(instance, error)
+      when ActiveRecord::InvalidForeignKey
+        handle_foreign_key_error!(instance, error)
+      else false
+      end
+    end
+
     def handle_unique_error!(instance, error) # rubocop:disable Metrics/AbcSize
       adapter = Adapters.factory(instance.class)
       index_key = generate_key_for_uniqueness_index(adapter.index_name(error.message))
@@ -12,7 +28,7 @@ module DatabaseValidations
         return storage[column_key].handle_unique_error(instance) if storage[column_key]
       end
 
-      raise error
+      false
     end
 
     def handle_foreign_key_error!(instance, error)
@@ -23,7 +39,7 @@ module DatabaseValidations
         return storage[column_key].handle_foreign_key_error(instance) if storage[column_key]
       end
 
-      raise error
+      false
     end
 
     def each_options_storage(klass)

data/lib/database_validations/lib/rescuer.rb

@@ -0,0 +1,31 @@
+module DatabaseValidations
+  module Rescuer
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method :validate, :valid?
+    end
+
+    attr_accessor :_database_validations_fallback
+
+    def valid?(context = nil)
+      self._database_validations_fallback = true
+      super(context)
+    end
+
+    def create_or_update(*args, &block)
+      self._database_validations_fallback = false
+      ActiveRecord::Base.connection.transaction(requires_new: true) { super }
+    rescue ActiveRecord::InvalidForeignKey, ActiveRecord::RecordNotUnique => error
+      raise error unless Helpers.handle_error!(self, error)
+
+      raise ActiveRecord::RecordInvalid, self
+    end
+
+    private
+
+    def perform_validations(options = {})
+      options[:validate] == false || valid_without_database_validations?(options[:context])
+    end
+  end
+end

data/lib/database_validations/lib/validates_db_uniqueness_of/db_uniqueness_validator.rb

@@ -0,0 +1,14 @@
+module DatabaseValidations
+  class DBUniquenessValidator < ActiveRecord::Validations::UniquenessValidator
+    # This is a hack to simulate presence validator
+    # It's used for cases when some 3rd parties are relies on the validators
+    # For example, +required+ option from simple_form checks the validator
+    def self.kind
+      :uniqueness
+    end
+
+    def validate(record)
+      super if record._database_validations_fallback
+    end
+  end
+end

data/lib/database_validations/lib/validates_db_uniqueness_of/uniqueness_handlers.rb

@@ -0,0 +1,20 @@
+module DatabaseValidations
+  module ClassMethods
+    def validates_db_uniqueness_of(*attributes)
+      Helpers.cache_valid_method!(self)
+
+      @database_validations_opts ||= DatabaseValidations::OptionsStorage.new(self)
+
+      options = attributes.extract_options!
+
+      attributes.each do |attribute|
+        @database_validations_opts.push_uniqueness(attribute, options.merge(attributes: attribute))
+      end
+
+      validates_with DatabaseValidations::DBUniquenessValidator,
+                     DatabaseValidations::UniquenessOptions.validator_options(attributes, options)
+
+      include(DatabaseValidations::Rescuer)
+    end
+  end
+end

data/lib/database_validations/{validations → lib/validates_db_uniqueness_of}/uniqueness_options.rb

@@ -3,6 +3,14 @@ module DatabaseValidations
     CUSTOM_OPTIONS = %i[where index_name].freeze
     DEFAULT_OPTIONS = { allow_nil: true, case_sensitive: true, allow_blank: false }.freeze
 
+    def self.validator_options(attributes, options)
+      DEFAULT_OPTIONS
+        .merge(attributes: attributes)
+        .merge(options)
+        .except(*CUSTOM_OPTIONS)
+        .tap { |opts| opts[:conditions] = -> { where(options[:where]) } if options[:where] }
+    end
+
     attr_reader :field
 
     def initialize(field, options, adapter)
@@ -21,22 +29,6 @@ module DatabaseValidations
       instance.errors.add(options[:attributes], :taken, error_options)
     end
 
-    # @return [Hash<Symbol, Object>]
-    def validates_uniqueness_options
-      where_clause_str = where_clause
-
-      DEFAULT_OPTIONS
-        .merge(options)
-        .except(*CUSTOM_OPTIONS)
-        .tap { |opts| opts[:conditions] = -> { where(where_clause_str) } if where_clause }
-    end
-
-    # @return [Boolean]
-    def if_and_unless_pass?(instance)
-      (options[:if].nil? || condition_passes?(options[:if], instance)) &&
-        (options[:unless].nil? || !condition_passes?(options[:unless], instance))
-    end
-
     # @return [String]
     def key
       @key ||= index_name ? Helpers.generate_key_for_uniqueness_index(index_name) : Helpers.generate_key_for_uniqueness(columns)
@@ -76,16 +68,6 @@ module DatabaseValidations
 
     attr_reader :adapter, :options
 
-    def condition_passes?(condition, instance)
-      if condition.is_a?(Symbol)
-        instance.__send__(condition)
-      elsif condition.is_a?(Proc) && condition.arity.zero?
-        instance.instance_exec(&condition)
-      else
-        instance.instance_eval(&condition)
-      end
-    end
-
     def raise_if_unsupported_options!
       options.except(:attributes).each_key do |option|
         unless adapter.support_option?(option)

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.8.5'.freeze
+  VERSION = '0.8.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -170,6 +170,21 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/database_validations.rb
+- lib/database_validations/lib/adapters.rb
+- lib/database_validations/lib/adapters/base_adapter.rb
+- lib/database_validations/lib/adapters/mysql_adapter.rb
+- lib/database_validations/lib/adapters/postgresql_adapter.rb
+- lib/database_validations/lib/adapters/sqlite_adapter.rb
+- lib/database_validations/lib/db_belongs_to/belongs_to_handlers.rb
+- lib/database_validations/lib/db_belongs_to/belongs_to_options.rb
+- lib/database_validations/lib/db_belongs_to/db_presence_validator.rb
+- lib/database_validations/lib/errors.rb
+- lib/database_validations/lib/helpers.rb
+- lib/database_validations/lib/options_storage.rb
+- lib/database_validations/lib/rescuer.rb
+- lib/database_validations/lib/validates_db_uniqueness_of/db_uniqueness_validator.rb
+- lib/database_validations/lib/validates_db_uniqueness_of/uniqueness_handlers.rb
+- lib/database_validations/lib/validates_db_uniqueness_of/uniqueness_options.rb
 - lib/database_validations/rails/railtie.rb
 - lib/database_validations/rspec/matchers.rb
 - lib/database_validations/rspec/uniqueness_validator_matcher.rb
@@ -177,20 +192,6 @@ files:
 - lib/database_validations/rubocop/cop/uniqueness_of.rb
 - lib/database_validations/rubocop/cops.rb
 - lib/database_validations/tasks/database_validations.rake
-- lib/database_validations/validations/adapters.rb
-- lib/database_validations/validations/adapters/base_adapter.rb
-- lib/database_validations/validations/adapters/mysql_adapter.rb
-- lib/database_validations/validations/adapters/postgresql_adapter.rb
-- lib/database_validations/validations/adapters/sqlite_adapter.rb
-- lib/database_validations/validations/belongs_to_handlers.rb
-- lib/database_validations/validations/belongs_to_options.rb
-- lib/database_validations/validations/belongs_to_presence_validator.rb
-- lib/database_validations/validations/errors.rb
-- lib/database_validations/validations/helpers.rb
-- lib/database_validations/validations/options_storage.rb
-- lib/database_validations/validations/uniqueness_handlers.rb
-- lib/database_validations/validations/uniqueness_options.rb
-- lib/database_validations/validations/valid_without_database_validations.rb
 - lib/database_validations/version.rb
 homepage: https://github.com/toptal/database_validations
 licenses:

data/lib/database_validations/validations/belongs_to_handlers.rb

@@ -1,58 +0,0 @@
-module DatabaseValidations
-  module BelongsToHandlers
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method :validate, :valid?
-    end
-
-    def valid?(context = nil)
-      output = super(context)
-
-      Helpers.each_belongs_to_presence_validator(self.class) do |validator|
-        next if validator.column_and_relation_blank_for?(self)
-
-        validates_with(ActiveRecord::Validations::PresenceValidator, validator.validates_presence_options)
-      end
-
-      errors.empty? && output
-    end
-
-    def save(opts = {})
-      ActiveRecord::Base.connection.transaction(requires_new: true) { super }
-    rescue ActiveRecord::InvalidForeignKey => e
-      Helpers.handle_foreign_key_error!(self, e)
-      false
-    end
-
-    def save!(opts = {})
-      ActiveRecord::Base.connection.transaction(requires_new: true) { super }
-    rescue ActiveRecord::InvalidForeignKey => e
-      Helpers.handle_foreign_key_error!(self, e)
-      raise ActiveRecord::RecordInvalid, self
-    end
-
-    private
-
-    def perform_validations(options = {})
-      options[:validate] == false || valid_without_database_validations?(options[:context])
-    end
-  end
-
-  module ClassMethods
-    def db_belongs_to(name, scope = nil, **options)
-      include(DatabaseValidations::ValidWithoutDatabaseValidations)
-      @database_validations_opts ||= DatabaseValidations::OptionsStorage.new(self)
-
-      belongs_to(name, scope, options.merge(optional: true))
-
-      foreign_key = reflections[name.to_s].foreign_key
-
-      validates_with DatabaseValidations::Validations::BelongsToPresenceValidator, column: foreign_key, relation: name
-
-      @database_validations_opts.push_belongs_to(foreign_key, name)
-
-      include(DatabaseValidations::BelongsToHandlers)
-    end
-  end
-end

data/lib/database_validations/validations/belongs_to_presence_validator.rb

@@ -1,25 +0,0 @@
-module DatabaseValidations
-  module Validations
-    class BelongsToPresenceValidator < ActiveModel::Validator
-      attr_reader :attributes
-
-      # This is a hack to simulate presence validator
-      # It's used for cases when some 3rd parties are relies on the validators
-      # For example, required option from simple_form checks the validator
-      def self.kind
-        :presence
-      end
-
-      def initialize(options = {})
-        @attributes = [options[:relation]]
-        super
-      end
-
-      def validate(record)
-        return unless record.public_send(options[:column]).blank? && record.public_send(options[:relation]).blank?
-
-        record.errors.add(options[:relation], :blank, message: :required)
-      end
-    end
-  end
-end

data/lib/database_validations/validations/uniqueness_handlers.rb

@@ -1,56 +0,0 @@
-module DatabaseValidations
-  module UniquenessHandlers
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method :validate, :valid?
-    end
-
-    def valid?(context = nil)
-      output = super(context)
-
-      Helpers.each_uniqueness_validator(self.class) do |validator|
-        if validator.if_and_unless_pass?(self)
-          validates_with(ActiveRecord::Validations::UniquenessValidator, validator.validates_uniqueness_options)
-        end
-      end
-
-      errors.empty? && output
-    end
-
-    def save(options = {})
-      ActiveRecord::Base.connection.transaction(requires_new: true) { super }
-    rescue ActiveRecord::RecordNotUnique => e
-      Helpers.handle_unique_error!(self, e)
-      false
-    end
-
-    def save!(options = {})
-      ActiveRecord::Base.connection.transaction(requires_new: true) { super }
-    rescue ActiveRecord::RecordNotUnique => e
-      Helpers.handle_unique_error!(self, e)
-      raise ActiveRecord::RecordInvalid, self
-    end
-
-    private
-
-    def perform_validations(options = {})
-      options[:validate] == false || valid_without_database_validations?(options[:context])
-    end
-  end
-
-  module ClassMethods
-    def validates_db_uniqueness_of(*attributes)
-      include(DatabaseValidations::ValidWithoutDatabaseValidations)
-      @database_validations_opts ||= DatabaseValidations::OptionsStorage.new(self)
-
-      options = attributes.extract_options!
-
-      attributes.each do |attribute|
-        @database_validations_opts.push_uniqueness(attribute, options.merge(attributes: attribute))
-      end
-
-      include(DatabaseValidations::UniquenessHandlers)
-    end
-  end
-end

data/lib/database_validations/validations/valid_without_database_validations.rb

@@ -1,9 +0,0 @@
-module DatabaseValidations
-  module ValidWithoutDatabaseValidations
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method :valid_without_database_validations?, :valid?
-    end
-  end
-end