database_validations 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f37a8d6c8fcdc4819f71e00044bdffddffafe2f485778bb53c3fb81293bd762
-  data.tar.gz: d0e1fb1c893b7127d184e55dbcf963a52e98adb49988fd67ccca13757e479714
+  metadata.gz: aefb40cecf33b68606f21a491cd41ffa3e1bc4ffcf891b837b9b8693e04f2239
+  data.tar.gz: ec3c2ab6955ec4f5da93804bcb6f2382d577331553b9d710af75a62cf9e8ccea
 SHA512:
-  metadata.gz: 14b3e4c95b471218acd03de35ab297709ae539b285d24fa00c200c922e969d3fadc06b1135156790f34397ef9c9fe3ade5f17d467981a8fbd5fa2e373b2c7876
-  data.tar.gz: 3b2320c372c8b376e3c8a0770a390c885844f58834b1bdfded46632df772365ac09c348ac104900a2bfe1e6d9b73f67a4b12305e2bf7494f21b363059e5464b2
+  metadata.gz: 1c341fa892d214a3fce105e683c90b5633c7c8ccc5917c675762e710cde2443e332bf66768831b772436c6eb6bfd823136411f409e0c16ef58cb85347f8b87c8
+  data.tar.gz: c6a838adc69c1558acede0e38df24d30bac20d7c348951c8059966daf59e649ae7887879810e68f88df88d69b277451a7fe476bca8a237842c970103184c073b

data/lib/database_validations.rb

@@ -3,6 +3,8 @@ require 'active_record'
 require 'database_validations/version'
 require 'database_validations/railtie' if defined?(Rails)
 require 'database_validations/uniqueness_validator'
+require 'database_validations/uniqueness_options'
+require 'database_validations/uniqueness_options_storage'
 require 'database_validations/errors'
 require 'database_validations/helpers'
 require 'database_validations/adapters'

data/lib/database_validations/adapters.rb

@@ -9,9 +9,9 @@ module DatabaseValidations
 
     def factory(model)
       case (database = model.connection.adapter_name.downcase.to_sym)
-      when :sqlite then Adapters::SqliteAdapter.new(model)
-      when :postgresql then Adapters::PostgresqlAdapter.new(model)
-      when :mysql2 then Adapters::MysqlAdapter.new(model)
+      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.new(database)
       end

data/lib/database_validations/adapters/base_adapter.rb

@@ -1,18 +1,44 @@
 module DatabaseValidations
   module Adapters
     class BaseAdapter
-      attr_reader :model
+      SUPPORTED_OPTIONS = [].freeze
+      ADAPTER = :base
 
       def initialize(model)
         @model = model
       end
 
-      def index_columns(index_name)
-        model.connection
-          .indexes(model.table_name)
-          .find { |index| index.name == index_name  }
-          .columns
+      def find_index_by_name(index_name)
+        indexes.find { |index| index.name == index_name }
+      end
+
+      def find_index_by_columns(index_columns)
+        indexes.find { |index| index.columns.map(&:to_s).sort == index_columns }
+      end
+
+      def indexes
+        model.connection.indexes(model.table_name).select(&:unique)
+      end
+
+      # @return [Symbol]
+      def adapter_name
+        self.class::ADAPTER
       end
+
+      # @param [Symbol] option_name
+      # @return [Boolean]
+      def support_option?(option_name)
+        supported_options.include?(option_name.to_sym)
+      end
+
+      # @return [Array<Symbol>]
+      def supported_options
+        self.class::SUPPORTED_OPTIONS
+      end
+
+      private
+
+      attr_reader :model
     end
   end
 end

data/lib/database_validations/adapters/mysql_adapter.rb

@@ -1,9 +1,12 @@
 module DatabaseValidations
   module Adapters
     class MysqlAdapter < BaseAdapter
+      SUPPORTED_OPTIONS = %i[scope message].freeze
+      ADAPTER = :mysql2
+
       def error_columns(error_message)
         index_name = error_message[/key '([^']+)'/, 1]
-        index_columns(index_name)
+        find_index_by_name(index_name).columns
       end
     end
   end

data/lib/database_validations/adapters/postgresql_adapter.rb

@@ -1,9 +1,12 @@
 module DatabaseValidations
   module Adapters
     class PostgresqlAdapter < BaseAdapter
+      SUPPORTED_OPTIONS = %i[scope message].freeze
+      ADAPTER = :postgresql
+
       def error_columns(error_message)
         index_name = error_message[/unique constraint "([^"]+)"/, 1]
-        index_columns(index_name)
+        find_index_by_name(index_name).columns
       end
     end
   end

data/lib/database_validations/adapters/sqlite_adapter.rb

@@ -1,6 +1,9 @@
 module DatabaseValidations
   module Adapters
     class SqliteAdapter < BaseAdapter
+      SUPPORTED_OPTIONS = %i[scope message].freeze
+      ADAPTER = :sqlite
+
       def error_columns(error_message)
         error_message.scan(/#{model.table_name}\.([^,:]+)/).flatten
       end

data/lib/database_validations/errors.rb

@@ -21,5 +21,16 @@ module DatabaseValidations
         super "Unknown database: #{self.database}"
       end
     end
+
+    class OptionIsNotSupported < Base
+      attr_reader :option, :database, :supported_options
+
+      def initialize(option, database, supported_options)
+        @option = option
+        @database = database
+        @supported_options = supported_options
+        super "Option #{self.option} is not supported for #{self.database}. Supported options are: #{self.supported_options}"
+      end
+    end
   end
 end

data/lib/database_validations/helpers.rb

@@ -2,39 +2,37 @@ module DatabaseValidations
   module Helpers
     module_function
 
-    def raise_if_index_missed!(model, columns)
-      index = model.connection
-                .indexes(model.table_name)
-                .select(&:unique)
-                .find { |index| index.columns.map(&:to_s).sort == columns }
+    def handle_unique_error!(instance, error)
+      key = generate_key(Adapters.factory(instance.class).error_columns(error.message))
 
-      raise Errors::IndexNotFound.new(columns) unless index
-    end
-
-    def handle_unique_error(instance, error)
-      columns = DatabaseValidations::Adapters
-                  .factory(instance.class)
-                  .error_columns(error.message)
-                  .map!(&:to_s)
-                  .sort!
-
-      options = uniqueness_validators_options(instance.class)[columns]
-
-      error_options = options.except(:case_sensitive, :scope, :conditions, :attributes)
-      error_options[:value] = instance.public_send(options[:attributes])
+      each_options_storage(instance.class) do |storage|
+        # storage has this then return
+        return storage[key].handle_unique_error(instance) if storage[key]
+      end
 
-      instance.errors.add(options[:attributes], :taken, error_options)
+      raise error
     end
 
-    def uniqueness_validators_options(klass)
-      validators_options = klass.instance_variable_get(:'@validates_db_uniqueness_opts') || {}
-
-      while klass.superclass.respond_to?(:validates_db_uniqueness_of)
-        validators_options.reverse_merge!(klass.superclass.instance_variable_get(:'@validates_db_uniqueness_opts') || {})
+    def each_options_storage(klass)
+      while klass.respond_to?(:validates_db_uniqueness_of)
+        storage = klass.instance_variable_get(:'@validates_db_uniqueness_opts')
+        yield(storage) if storage
         klass = klass.superclass
       end
+    end
+
+    def each_validator(klass)
+      each_options_storage(klass) do |storage|
+        storage.each_validator { |validator| yield(validator) }
+      end
+    end
+
+    def unify_columns(*columns)
+      columns.flatten.map(&:to_s).sort
+    end
 
-      validators_options
+    def generate_key(*columns)
+      unify_columns(columns).join('__')
     end
   end
 end

data/lib/database_validations/uniqueness_options.rb

@@ -0,0 +1,48 @@
+module DatabaseValidations
+  class UniquenessOptions
+    def initialize(field, options, adapter)
+      @field = field
+      @options = options
+      @adapter = adapter
+
+      raise_if_unsupported_options!
+      raise_if_index_missed! unless ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
+    end
+
+    def handle_unique_error(instance)
+      error_options = options.except(:case_sensitive, :scope, :conditions, :attributes)
+      error_options[:value] = instance.public_send(options[:attributes])
+
+      instance.errors.add(options[:attributes], :taken, error_options)
+    end
+
+    def validates_uniqueness_options
+      options.merge(allow_nil: true, case_sensitive: true, allow_blank: false)
+    end
+
+    def key
+      @key ||= Helpers.generate_key(columns)
+    end
+
+    def columns
+      @columns ||= Helpers.unify_columns(field, Array.wrap(options[:scope]))
+    end
+
+    def raise_if_unsupported_options!
+      options.except(:attributes).each_key do |option|
+        unless adapter.support_option?(option)
+          raise Errors::OptionIsNotSupported.new(option, adapter.adapter_name, adapter.supported_options)
+        end
+      end
+    end
+
+    def raise_if_index_missed!
+      raise Errors::IndexNotFound.new(columns) unless adapter.find_index_by_columns(columns)
+    end
+
+    private
+
+    attr_reader :adapter, :field, :options
+  end
+end
+

data/lib/database_validations/uniqueness_options_storage.rb

@@ -0,0 +1,26 @@
+module DatabaseValidations
+  class UniquenessOptionsStorage
+
+    def initialize(klass)
+      @adapter = Adapters.factory(klass)
+      @storage = {}
+    end
+
+    def push(field, options)
+      uniqueness_options = UniquenessOptions.new(field, options, adapter)
+      storage[uniqueness_options.key] = uniqueness_options
+    end
+
+    def [](key)
+      storage[key]
+    end
+
+    def each_validator
+      storage.each_value { |validator| yield(validator) }
+    end
+
+    private
+
+    attr_reader :storage, :adapter
+  end
+end

data/lib/database_validations/uniqueness_validator.rb

@@ -1,5 +1,5 @@
 module DatabaseValidations
-  module DatabaseUniquenessValidator
+  module UniquenessHandlers
     extend ActiveSupport::Concern
 
     included do
@@ -8,9 +8,8 @@ module DatabaseValidations
       def valid?(context = nil)
         output = super(context)
 
-
-        DatabaseValidations::Helpers.uniqueness_validators_options(self.class).each_value do |opts|
-          validates_with(ActiveRecord::Validations::UniquenessValidator, opts.merge(allow_nil: true))
+        Helpers.each_validator(self.class) do |validator|
+          validates_with(ActiveRecord::Validations::UniquenessValidator, validator.validates_uniqueness_options)
         end
 
         errors.empty? && output
@@ -22,14 +21,14 @@ module DatabaseValidations
     def save(options = {})
       ActiveRecord::Base.connection.transaction(requires_new: true) { super }
     rescue ActiveRecord::RecordNotUnique => e
-      DatabaseValidations::Helpers.handle_unique_error(self, e)
+      Helpers.handle_unique_error!(self, e)
       false
     end
 
     def save!(options = {})
       ActiveRecord::Base.connection.transaction(requires_new: true) { super }
     rescue ActiveRecord::RecordNotUnique => e
-      DatabaseValidations::Helpers.handle_unique_error(self, e)
+      Helpers.handle_unique_error!(self, e)
       raise ActiveRecord::RecordInvalid, self
     end
 
@@ -42,19 +41,15 @@ module DatabaseValidations
 
   module ClassMethods
     def validates_db_uniqueness_of(*attributes)
-      @validates_db_uniqueness_opts ||= {}
+      @validates_db_uniqueness_opts ||= DatabaseValidations::UniquenessOptionsStorage.new(self)
 
       options = attributes.extract_options!
 
       attributes.each do |attribute|
-        columns = [attribute, Array.wrap(options[:scope])].flatten!.map!(&:to_s).sort!
-
-        DatabaseValidations::Helpers.raise_if_index_missed!(self, columns) unless ENV['SKIP_DB_UNIQUENESS_VALIDATOR_INDEX_CHECK']
-
-        @validates_db_uniqueness_opts[columns] = options.merge(attributes: attribute)
+        @validates_db_uniqueness_opts.push(attribute, options.merge(attributes: attribute))
       end
 
-      include(DatabaseUniquenessValidator)
+      include(DatabaseValidations::UniquenessHandlers)
     end
   end
 end

data/lib/database_validations/version.rb

@@ -1,3 +1,3 @@
 module DatabaseValidations
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: database_validations
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Evgeniy Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,6 +152,8 @@ files:
 - lib/database_validations/errors.rb
 - lib/database_validations/helpers.rb
 - lib/database_validations/railtie.rb
+- lib/database_validations/uniqueness_options.rb
+- lib/database_validations/uniqueness_options_storage.rb
 - lib/database_validations/uniqueness_validator.rb
 - lib/database_validations/version.rb
 - lib/tasks/database_validations.rake