database_validations 0.8.5 → 0.9.1

data/lib/database_validations/lib/validations.rb

@@ -0,0 +1,31 @@
+module DatabaseValidations
+  module Validations
+    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 => e
+      raise e unless Rescuer.handled?(self, e)
+
+      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/validators/db_presence_validator.rb

@@ -0,0 +1,63 @@
+module DatabaseValidations
+  class DbPresenceValidator < ActiveRecord::Validations::PresenceValidator
+    REFLECTION_MESSAGE = ActiveRecord::VERSION::MAJOR < 5 ? :blank : :required
+
+    attr_reader :klass
+
+    # Used to make 3rd party libraries work correctly
+    #
+    # @return [Symbol]
+    def self.kind
+      :presence
+    end
+
+    # @param [Hash] options
+    def initialize(options)
+      @klass = options[:class]
+
+      super
+
+      Injector.inject(klass)
+      Checkers::DbPresenceValidator.validate!(self)
+    end
+
+    # TODO: add support of optional db_belongs_to
+    def validate(record)
+      if record._database_validations_fallback
+        super
+      else
+        attributes.each do |attribute|
+          reflection = record.class._reflect_on_association(attribute)
+
+          next if reflection && record.public_send(reflection.foreign_key).present?
+
+          validate_each(record, attribute, record.public_send(attribute))
+        end
+      end
+    end
+
+    def apply_error(instance, attribute)
+      # Helps to avoid querying the database when attribute is association
+      instance.send("#{attribute}=", nil)
+      instance.errors.add(attribute, :blank, message: REFLECTION_MESSAGE)
+    end
+  end
+
+  module ClassMethods
+    def validates_db_presence_of(*attr_names)
+      validates_with(DatabaseValidations::DbPresenceValidator, _merge_attributes(attr_names))
+    end
+
+    def db_belongs_to(name, scope = nil, **options)
+      if ActiveRecord::VERSION::MAJOR < 5
+        options[:required] = false
+      else
+        options[:optional] = true
+      end
+
+      belongs_to(name, scope, options)
+
+      validates_with DatabaseValidations::DbPresenceValidator, _merge_attributes([name, message: DatabaseValidations::DbPresenceValidator::REFLECTION_MESSAGE]) # rubocop:disable Metrics/LineLength
+    end
+  end
+end

data/lib/database_validations/lib/validators/db_uniqueness_validator.rb

@@ -0,0 +1,48 @@
+module DatabaseValidations
+  class DbUniquenessValidator < ActiveRecord::Validations::UniquenessValidator
+    attr_reader :index_name, :where, :klass
+
+    # Used to make 3rd party libraries work correctly
+    #
+    # @return [Symbol]
+    def self.kind
+      :uniqueness
+    end
+
+    # @param [Hash] options
+    def initialize(options)
+      options[:allow_nil] = true
+      options[:allow_blank] = false
+
+      if options.key?(:where)
+        condition = options[:where]
+        options[:conditions] = -> { where(condition) }
+      end
+
+      @index_name = options.delete(:index_name) if options.key?(:index_name)
+      @where = options.delete(:where) if options.key?(:where)
+
+      super
+
+      Injector.inject(klass)
+      Checkers::DbUniquenessValidator.validate!(self)
+    end
+
+    def validate(record)
+      super if record._database_validations_fallback
+    end
+
+    def apply_error(instance, attribute)
+      error_options = options.except(:case_sensitive, :scope, :conditions)
+      error_options[:value] = instance.public_send(attribute)
+
+      instance.errors.add(attribute, :taken, error_options)
+    end
+  end
+
+  module ClassMethods
+    def validates_db_uniqueness_of(*attr_names)
+      validates_with(DatabaseValidations::DbUniquenessValidator, _merge_attributes(attr_names))
+    end
+  end
+end

data/lib/database_validations/rspec/uniqueness_validator_matcher.rb

@@ -41,29 +41,37 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field| # rubocop:disable M
     @case_sensitive = false
   end
 
+  chain(:case_sensitive) do
+    @case_sensitive = true
+  end
+
   match do |object|
     @validators = []
 
     model = object.is_a?(Class) ? object : object.class
 
-    DatabaseValidations::Helpers.each_uniqueness_validator(model) do |validator|
-      @validators << {
-        field: validator.field,
-        scope: validator.scope,
-        where: validator.where_clause,
-        message: validator.message,
-        index_name: validator.index_name,
-        case_sensitive: validator.case_sensitive
-      }
+    model.validators.grep(DatabaseValidations::DbUniquenessValidator).each do |validator|
+      validator.attributes.each do |attribute|
+        @validators << {
+          field: attribute,
+          scope: Array.wrap(validator.options[:scope]),
+          where: validator.where,
+          message: validator.options[:message],
+          index_name: validator.index_name,
+          case_sensitive: validator.options[:case_sensitive]
+        }
+      end
     end
 
+    case_sensitive_default = ActiveRecord::VERSION::MAJOR >= 6 ? nil : true
+
     @validators.include?(
       field: field,
       scope: Array.wrap(@scope),
       where: @where,
       message: @message,
       index_name: @index_name,
-      case_sensitive: @case_sensitive
+      case_sensitive: @case_sensitive.nil? ? case_sensitive_default : @case_sensitive
     )
   end
 
@@ -75,6 +83,7 @@ RSpec::Matchers.define :validate_db_uniqueness_of do |field| # rubocop:disable M
     desc += "where: '#{@where}'; " if @where
     desc += "index_name: '#{@index_name}'; " if @index_name
     desc += 'be case insensitive.' unless @case_sensitive
+    desc += 'be case sensitive.' if @case_sensitive
     desc
   end
 

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = '0.8.5'.freeze
+  VERSION = '0.9.1'.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.9.1
 platform: ruby
 authors:
 - Evgeniy Demin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-06 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: benchmark-ips
   requirement: !ruby/object:Gem::Requirement
@@ -50,56 +44,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: db-query-matchers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +178,24 @@ 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/attribute_validator.rb
+- lib/database_validations/lib/checkers/db_presence_validator.rb
+- lib/database_validations/lib/checkers/db_uniqueness_validator.rb
+- lib/database_validations/lib/errors.rb
+- lib/database_validations/lib/injector.rb
+- lib/database_validations/lib/key_generator.rb
+- lib/database_validations/lib/presence_key_extractor.rb
+- lib/database_validations/lib/rescuer.rb
+- lib/database_validations/lib/storage.rb
+- lib/database_validations/lib/uniqueness_key_extractor.rb
+- lib/database_validations/lib/validations.rb
+- lib/database_validations/lib/validators/db_presence_validator.rb
+- lib/database_validations/lib/validators/db_uniqueness_validator.rb
 - lib/database_validations/rails/railtie.rb
 - lib/database_validations/rspec/matchers.rb
 - lib/database_validations/rspec/uniqueness_validator_matcher.rb
@@ -177,26 +203,12 @@ 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:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -211,9 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Provide compatibility between database constraints and ActiveRecord validations
   with better performance and consistency.

data/lib/database_validations/validations/adapters.rb

@@ -1,20 +0,0 @@
-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'
-
-module DatabaseValidations
-  module Adapters
-    module_function
-
-    def factory(model)
-      case (database = model.connection_config[:adapter].downcase.to_sym)
-      when SqliteAdapter::ADAPTER then SqliteAdapter.new(model)
-      when PostgresqlAdapter::ADAPTER then PostgresqlAdapter.new(model)
-      when MysqlAdapter::ADAPTER then MysqlAdapter.new(model)
-      else
-        raise Errors::UnknownDatabase, database
-      end
-    end
-  end
-end

data/lib/database_validations/validations/adapters/mysql_adapter.rb

@@ -1,20 +0,0 @@
-module DatabaseValidations
-  module Adapters
-    class MysqlAdapter < BaseAdapter
-      SUPPORTED_OPTIONS = %i[scope message if unless index_name].freeze
-      ADAPTER = :mysql2
-
-      def index_name(error_message)
-        error_message[/key '([^']+)'/, 1]
-      end
-
-      def unique_error_columns(error_message)
-        find_index_by_name(index_name(error_message)).columns
-      end
-
-      def foreign_key_error_column(error_message)
-        error_message[/FOREIGN KEY \(`([^`]+)`\)/, 1]
-      end
-    end
-  end
-end

data/lib/database_validations/validations/adapters/postgresql_adapter.rb

@@ -1,20 +0,0 @@
-module DatabaseValidations
-  module Adapters
-    class PostgresqlAdapter < BaseAdapter
-      SUPPORTED_OPTIONS = %i[scope message where if unless index_name case_sensitive].freeze
-      ADAPTER = :postgresql
-
-      def index_name(error_message)
-        error_message[/unique constraint "([^"]+)"/, 1]
-      end
-
-      def unique_error_columns(error_message)
-        find_index_by_name(index_name(error_message)).columns
-      end
-
-      def foreign_key_error_column(error_message)
-        error_message[/Key \(([^)]+)\)/, 1]
-      end
-    end
-  end
-end