mv-core 2.2.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da6a7fa2769528ae88761953e67477adf81ea121
-  data.tar.gz: de4fbd347817757c7b89b80d82f332bbc3a7b40d
+  metadata.gz: 43d849d82d3b77d137a4c1b0dfb2e58918da9696
+  data.tar.gz: 83e484aa9a40f6946f5b8ef77d52f642c375a548
 SHA512:
-  metadata.gz: 91e68192f6cd1c01c98534dfc5410d521123cf8e00e01aa86cba47460a96a04932d696be09b1fb800ac371b84b20d2a4af341f0f26df75cd1aa02c9e8869e47d
-  data.tar.gz: 0ff2511ee62f1ac595b9e91f2d67c2c78a1b7c31c9c02df571bb5dfa0273981d1c518d9cb96c20b410febf2d4a9740b57af1b52b48ef2525b4e41eea7cc6917f
+  metadata.gz: fafd65fbeeac4a274152bc694faf1f81925fccdf5b35244d0d9350016c38bd37b228176a23c28a874800ec61fbd5243865e04e3e61681ba27a1e0d276dad8b3b
+  data.tar.gz: 4d7bd7089b3b0d448f3b7dbcff1daf917063d2b28c2cce94c96654f8d12b4d3b2fe46dacfb83506df57c53bf77f60edc25b6a1aa3b8d9f62d575e0ac6291bd2c

data/lib/mv/core/constraint/base.rb

@@ -1,4 +1,4 @@
-require 'mv/core/constraint/description'
+require_relative 'description'
 
 module Mv
   module Core
@@ -18,7 +18,7 @@ module Mv
         def <=> other_constraint
           [self.class.name, description, validations.sort] <=> [other_constraint.class.name, other_constraint.description, other_constraint.validations.sort]
         end
-        
+
         def create
         end
 
@@ -30,4 +30,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/constraint/builder/factory.rb

@@ -1,5 +1,5 @@
-require 'mv/core/constraint/builder/index'
-require 'mv/core/constraint/builder/trigger'
+require_relative 'index'
+require_relative 'trigger'
 
 module Mv
   module Core
@@ -17,7 +17,7 @@ module Mv
           end
 
           def register_builders opts
-            opts.each do |constraint_class, builder_class| 
+            opts.each do |constraint_class, builder_class|
               register_builder(constraint_class, builder_class)
             end
           end
@@ -31,7 +31,7 @@ module Mv
 
           def factory_map
             @factory_map ||= {
-              Mv::Core::Constraint::Index => Mv::Core::Constraint::Builder::Index, 
+              Mv::Core::Constraint::Index => Mv::Core::Constraint::Builder::Index,
               Mv::Core::Constraint::Trigger => Mv::Core::Constraint::Builder::Trigger
             }
           end
@@ -39,4 +39,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/constraint/builder/index.rb

@@ -1,4 +1,4 @@
-require 'mv/core/constraint/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -15,7 +15,7 @@ module Mv
           end
 
           def delete
-            super 
+            super
 
             constraint.validations.group_by(&:table_name).each do |table_name, validations|
               remove_index(table_name)
@@ -23,7 +23,7 @@ module Mv
           end
 
           def update new_constraint_builder
-            super 
+            super
 
             delete
             new_constraint_builder.create
@@ -32,12 +32,12 @@ module Mv
           private
 
           def index_exists?(table_name)
-            db.table_exists?(table_name) && 
-            db.index_name_exists?(table_name, name, false) 
+            db.data_source_exists?(table_name) &&
+            db.index_name_exists?(table_name, name, false)
           end
 
           def remove_index(table_name)
-            db.remove_index!(table_name, name) if index_exists?(table_name)
+            db.remove_index(table_name, name: name) if index_exists?(table_name)
           end
 
           def add_index(table_name, columns)
@@ -47,4 +47,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/constraint/builder/trigger.rb

@@ -1,4 +1,4 @@
-require 'mv/core/constraint/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -10,4 +10,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/constraint/factory.rb

@@ -1,5 +1,5 @@
-require 'mv/core/constraint/trigger'
-require 'mv/core/constraint/index'
+require_relative 'trigger'
+require_relative 'index'
 
 module Mv
   module Core
@@ -19,15 +19,15 @@ module Mv
           delegate :create_constraint, :register_constraint, to: :instance
         end
 
-        private 
+        private
 
         def factory_map
           @factory_map ||= {
-            trigger: Mv::Core::Constraint::Trigger,  
+            trigger: Mv::Core::Constraint::Trigger,
             index: Mv::Core::Constraint::Index
           }
         end
       end
     end
   end
-end
+end

data/lib/mv/core/constraint/index.rb

@@ -1,13 +1,10 @@
-require 'mv/core/constraint/base'
+require_relative 'base'
 
 module Mv
   module Core
     module Constraint
       class Index < Base
-        def initialize description
-          super
-        end
       end
     end
   end
-end
+end

data/lib/mv/core/constraint/trigger.rb

@@ -1,13 +1,13 @@
-require 'mv/core/constraint/base'
+require_relative 'base'
 
 module Mv
   module Core
     module Constraint
       class Trigger < Base
         attr_reader :event
-        
+
         def initialize description
-          super 
+          super
           @event = @description.options[:event].try(:to_sym)
         end
 
@@ -17,4 +17,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/db/helpers/column_validators.rb

@@ -1,5 +1,5 @@
 require 'mv/core/validation/factory'
-require 'mv/core/db/helpers/table_validators'
+require_relative 'table_validators'
 
 module Mv
   module Core
@@ -20,10 +20,10 @@ module Mv
             update_column_validator(validation_type, opts)
           end
 
-          def delete_column_validator 
+          def delete_column_validator
             delete_validators(column_validators) > 0
           end
-          
+
           def update_column_validator validation_type, opts
             return delete_validators(column_validators.where(validation_type: validation_type)) if opts == false
 
@@ -44,9 +44,9 @@ module Mv
 
           def raise_column_validation_error validation_type, opts
             raise Mv::Core::Error.new(
-              table_name: table_name, 
-              column_name: column_name, 
-              validation_type: validation_type, 
+              table_name: table_name,
+              column_name: column_name,
+              validation_type: validation_type,
               options: opts,
               error: 'Validator can not be removed when new column is being added'
             )
@@ -55,4 +55,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/db/helpers/table_validators.rb

@@ -1,4 +1,4 @@
-require 'mv/core/db/migration_validator'
+require_relative '../migration_validator'
 
 module Mv
   module Core
@@ -6,7 +6,7 @@ module Mv
       module Helpers
         module TableValidators
           attr_accessor :table_name
-          
+
           def table_validators
             Mv::Core::Db::MigrationValidator.where(table_name: table_name)
           end
@@ -21,7 +21,7 @@ module Mv
 
           private
 
-          def say(message) 
+          def say(message)
             ::ActiveRecord::Migration.say(message, true)
           end
 
@@ -35,4 +35,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/migration/operations/factory.rb

@@ -1,9 +1,9 @@
-require 'mv/core/migration/operations/add_column'
-require 'mv/core/migration/operations/change_column'
-require 'mv/core/migration/operations/drop_table'
-require 'mv/core/migration/operations/remove_column'
-require 'mv/core/migration/operations/rename_column'
-require 'mv/core/migration/operations/rename_table'
+require_relative 'add_column'
+require_relative 'change_column'
+require_relative 'drop_table'
+require_relative 'remove_column'
+require_relative 'rename_column'
+require_relative 'rename_table'
 
 module Mv
   module Core
@@ -17,4 +17,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/services/create_migration_validators_table.rb

@@ -3,24 +3,24 @@ module Mv
     module Services
       class CreateMigrationValidatorsTable
         attr_reader :db
-        delegate :create_table, :table_exists?, :add_index, to: :db
+        delegate :create_table, :data_source_exists?, :add_index, to: :db
 
         def initialize db = ::ActiveRecord::Base.connection
           @db = db
         end
 
         def execute
-          unless table_exists?(:migration_validators)
+          unless data_source_exists?(:migration_validators)
             ::ActiveRecord::Migration.say_with_time('initialize migration_validators table') do
               create_table(:migration_validators) do |table|
                 table.string :table_name, null: false
                 table.string :column_name, null: false
                 table.string :validation_type, null: false
                 table.string :options
-              end 
+              end
 
-              add_index(:migration_validators, 
-                        [:table_name, :column_name, :validation_type], 
+              add_index(:migration_validators,
+                        [:table_name, :column_name, :validation_type],
                         name: 'unique_idx_on_migration_validators')
             end
           end
@@ -28,4 +28,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/services/uninstall.rb

@@ -5,11 +5,11 @@ module Mv
     module Services
       class Uninstall
         def execute
-          if db.table_exists?(:migration_validators)
+          if db.data_source_exists?(:migration_validators)
             Mv::Core::Services::DeleteConstraints.new.execute
-            
+
             ::ActiveRecord::Migration.say_with_time('drop migration_validators table') do
-              db.drop_table(:migration_validators)         
+              db.drop_table(:migration_validators)
             end
           end
         end
@@ -22,4 +22,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/absence.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -36,4 +36,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/absence.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/active_model_presenter/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -12,4 +12,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/exclusion.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/active_model_presenter/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -16,4 +16,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/factory.rb

@@ -1,9 +1,9 @@
-require 'mv/core/validation/active_model_presenter/exclusion'
-require 'mv/core/validation/active_model_presenter/inclusion'
-require 'mv/core/validation/active_model_presenter/length'
-require 'mv/core/validation/active_model_presenter/presence'
-require 'mv/core/validation/active_model_presenter/absence'
-require 'mv/core/validation/active_model_presenter/uniqueness'
+require_relative 'exclusion'
+require_relative 'inclusion'
+require_relative 'length'
+require_relative 'presence'
+require_relative 'absence'
+require_relative 'uniqueness'
 
 module Mv
   module Core
@@ -48,4 +48,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/inclusion.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/active_model_presenter/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -16,4 +16,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/length.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/active_model_presenter/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -16,4 +16,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/presence.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/active_model_presenter/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -12,4 +12,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/active_model_presenter/uniqueness.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/active_model_presenter/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -12,4 +12,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/base_collection.rb

@@ -0,0 +1,38 @@
+require 'mv/core/validators/array_validator'
+require_relative 'base'
+
+module Mv
+  module Core
+    module Validation
+      class BaseCollection < Base
+        include ActiveModel::Validations
+
+        attr_reader :in
+
+        validates :in, presence: true, array: true
+
+        def initialize(table_name, column_name, opts)
+          opts = opts.is_a?(Hash) ? opts : { in: opts }
+
+          super(table_name, column_name, opts)
+
+          @in = opts.with_indifferent_access[:in]
+        end
+
+        def to_a
+          prepared_in = self.in.is_a?(Range) ? range_to_a : self.in.try(:sort)
+          super + [prepared_in]
+        end
+
+        protected
+
+        def range_to_a
+          min = self.in.min
+          max = self.in.exclude_end? ? self.in.last - 0.000000001.second : self.in.last
+
+          [min, max]
+        end
+      end
+    end
+  end
+end

data/lib/mv/core/validation/builder/absence.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -16,4 +16,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/builder/custom.rb

@@ -1,15 +1,15 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
-    module Validation 
+    module Validation
       module Builder
         class Custom < Base
           delegate :statement, to: :validation
 
           def conditions
             [{
-              statement: apply_allow_nil_and_blank("(#{preprocess_statement})"), 
+              statement: apply_allow_nil_and_blank("(#{preprocess_statement})"),
               message: message
             }]
           end
@@ -23,4 +23,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/builder/exclusion.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -9,7 +9,7 @@ module Mv
 
           def conditions
             [{
-              statement: apply_allow_nil_and_blank(apply_in(column_reference)), 
+              statement: apply_allow_nil_and_blank(apply_in(column_reference)),
               message: message
             }]
           end
@@ -19,10 +19,10 @@ module Mv
           def db_value value
             return value if value.is_a?(Integer) or value.is_a?(Float)
             return "'#{value.to_s}'" if value.is_a?(String)
-            raise Mv::Core::Error.new(table_name: table_name, 
-                                      column_name: column_name, 
-                                      validation_type: :inclusion, 
-                                      options: { in: value }, 
+            raise Mv::Core::Error.new(table_name: table_name,
+                                      column_name: column_name,
+                                      validation_type: :inclusion,
+                                      options: { in: value },
                                       error: "#{value.class} is not supported as :in value")
           end
 
@@ -32,11 +32,11 @@ module Mv
             else
               prepared_in = self.in.to_a.collect{ |v| db_value(v) }
 
-              "#{stmt} NOT IN (#{prepared_in.join(', ')})" 
+              "#{stmt} NOT IN (#{prepared_in.join(', ')})"
             end
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/core/validation/builder/factory.rb

@@ -1,10 +1,10 @@
-require 'mv/core/validation/builder/exclusion'
-require 'mv/core/validation/builder/inclusion'
-require 'mv/core/validation/builder/length'
-require 'mv/core/validation/builder/presence'
-require 'mv/core/validation/builder/absence'
-require 'mv/core/validation/builder/uniqueness'
-require 'mv/core/validation/builder/custom'
+require_relative 'exclusion'
+require_relative 'inclusion'
+require_relative 'length'
+require_relative 'presence'
+require_relative 'absence'
+require_relative 'uniqueness'
+require_relative 'custom'
 
 module Mv
   module Core
@@ -42,4 +42,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/builder/inclusion.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -9,7 +9,7 @@ module Mv
 
           def conditions
             [{
-              statement: apply_allow_nil_and_blank(apply_in(column_reference)), 
+              statement: apply_allow_nil_and_blank(apply_in(column_reference)),
               message: message
             }]
           end
@@ -19,10 +19,10 @@ module Mv
           def db_value value
             return value if value.is_a?(Integer) or value.is_a?(Float)
             return "'#{value.to_s}'" if value.is_a?(String)
-            raise Mv::Core::Error.new(table_name: table_name, 
-                                      column_name: column_name, 
-                                      validation_type: :inclusion, 
-                                      options: { in: value }, 
+            raise Mv::Core::Error.new(table_name: table_name,
+                                      column_name: column_name,
+                                      validation_type: :inclusion,
+                                      options: { in: value },
                                       error: "#{value.class} is not supported as :in value")
           end
 
@@ -32,11 +32,11 @@ module Mv
             else
               prepared_in = self.in.to_a.collect{ |v| db_value(v) }
 
-              "#{stmt} IN (#{prepared_in.join(', ')})" 
+              "#{stmt} IN (#{prepared_in.join(', ')})"
             end
           end
         end
       end
-    end 
+    end
   end
-end
+end

data/lib/mv/core/validation/builder/length.rb

@@ -1,14 +1,14 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
     module Validation
       module Builder
         class Length < Base
-          delegate :in, 
-                   :within, 
-                   :is, 
-                   :maximum, 
+          delegate :in,
+                   :within,
+                   :is,
+                   :maximum,
                    :minimum,
                    to: :validation
 
@@ -20,7 +20,7 @@ module Mv
             res = apply_minimum(column_reference) if minimum && !maximum
             res = apply_minimum_and_maximum(column_reference) if minimum && maximum
 
-            res.collect do |condition| 
+            res.collect do |condition|
               { statement: apply_allow_nil_and_blank(condition[:statement]), message: condition[:message] }
             end
           end
@@ -61,7 +61,7 @@ module Mv
 
           def apply_minimum_and_maximum stmt
             if too_long == too_short
-              [{ statement: "LENGTH(#{stmt}) BETWEEN #{minimum} AND #{maximum}", 
+              [{ statement: "LENGTH(#{stmt}) BETWEEN #{minimum} AND #{maximum}",
                 message: message }]
             else
               [apply_minimum(stmt), apply_maximum(stmt)].flatten
@@ -71,4 +71,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/builder/presence.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -16,4 +16,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/builder/uniqueness.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/builder/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -6,8 +6,8 @@ module Mv
       module Builder
         class Uniqueness < Base
           def conditions
-            res = "NOT EXISTS(SELECT #{column_name} 
-                                FROM #{table_name} 
+            res = "NOT EXISTS(SELECT #{column_name}
+                                FROM #{table_name}
                                WHERE #{column_reference} = #{column_name})"
 
             [{statement: apply_allow_nil_and_blank(res).squish, message: message}]
@@ -16,4 +16,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/custom.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -7,10 +7,10 @@ module Mv
         attr_reader :statement
 
         validates :statement, presence: true
-        
+
         def initialize(table_name, column_name, opts)
           opts = opts.is_a?(Hash) ? opts : { statement: opts }
-          
+
           super(table_name, column_name, opts)
 
           @statement = opts.with_indifferent_access[:statement]
@@ -28,4 +28,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/exclusion.rb

@@ -1,29 +1,9 @@
-require 'mv/core/validation/base'
-require 'mv/core/validators/array_validator'
+require_relative 'base_collection'
 
 module Mv
   module Core
     module Validation
-      class Exclusion < Base
-        include ActiveModel::Validations
-
-        attr_reader :in
-
-        validates :in, presence: true, array: true
-
-        def initialize(table_name, column_name, opts)
-          opts = opts.is_a?(Hash) ? opts : { in: opts }
-          
-          super(table_name, column_name, opts)
-
-          @in = opts.with_indifferent_access[:in]
-        end
-
-        def to_a
-          prepared_in = self.in.is_a?(Range) ? [self.in.min, self.in.max] : self.in.try(:sort)
-          super + [prepared_in]
-        end
-
+      class Exclusion < BaseCollection
         protected
 
         def default_message
@@ -32,4 +12,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/factory.rb

@@ -1,11 +1,11 @@
-require 'mv/core/validation/uniqueness'
-require 'mv/core/validation/exclusion'
-require 'mv/core/validation/inclusion'
-require 'mv/core/validation/length'
-require 'mv/core/validation/presence'
-require 'mv/core/validation/absence'
-require 'mv/core/validation/custom'
 require 'mv/core/error'
+require_relative 'uniqueness'
+require_relative 'exclusion'
+require_relative 'inclusion'
+require_relative 'length'
+require_relative 'presence'
+require_relative 'absence'
+require_relative 'custom'
 
 module Mv
   module Core
@@ -16,14 +16,14 @@ module Mv
         def create_validation table_name, column_name, validation_type, opts
           validation_class = factory_map[validation_type.to_sym]
 
-          raise Mv::Core::Error.new(table_name: table_name, 
-                                    column_name: column_name, 
-                                    validation_type: validation_type, 
-                                    opts: opts, 
+          raise Mv::Core::Error.new(table_name: table_name,
+                                    column_name: column_name,
+                                    validation_type: validation_type,
+                                    opts: opts,
                                     error: "Validation '#{validation_type}' is not supported") unless validation_class
 
           validation_class.new(table_name, column_name, opts)
-        end 
+        end
 
         def register_validation validation_type, klass
           factory_map[validation_type.to_sym] = klass
@@ -40,20 +40,20 @@ module Mv
         end
 
         class << self
-          delegate :create_validation, 
-                   :registered_validations, 
+          delegate :create_validation,
+                   :registered_validations,
                    :register_validation,
                    :register_validations, to: :instance
         end
 
-        private 
+        private
 
         def factory_map
           @factory_map ||= {
-            uniqueness: Mv::Core::Validation::Uniqueness, 
-            exclusion: Mv::Core::Validation::Exclusion, 
-            inclusion: Mv::Core::Validation::Inclusion, 
-            length: Mv::Core::Validation::Length, 
+            uniqueness: Mv::Core::Validation::Uniqueness,
+            exclusion: Mv::Core::Validation::Exclusion,
+            inclusion: Mv::Core::Validation::Inclusion,
+            length: Mv::Core::Validation::Length,
             presence: Mv::Core::Validation::Presence,
             absence: Mv::Core::Validation::Absence,
             custom: Mv::Core::Validation::Custom
@@ -62,4 +62,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/inclusion.rb

@@ -1,29 +1,9 @@
-require 'mv/core/validation/base'
-require 'mv/core/validators/array_validator'
+require_relative 'base_collection'
 
 module Mv
   module Core
     module Validation
-      class Inclusion < Base
-        include ActiveModel::Validations
-
-        attr_reader :in
-
-        validates :in, presence: true, array: true
-
-        def initialize(table_name, column_name, opts)
-          opts = opts.is_a?(Hash) ? opts : { in: opts }
-          
-          super(table_name, column_name, opts)
-
-          @in = opts.with_indifferent_access[:in]
-        end
-        
-        def to_a
-          prepared_in = self.in.is_a?(Range) ? [self.in.min, self.in.max] : self.in.try(:sort)
-          super + [prepared_in]
-        end
-
+      class Inclusion < BaseCollection
         protected
 
         def default_message
@@ -32,4 +12,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/length.rb

@@ -1,5 +1,5 @@
-require 'mv/core/validation/base'
 require 'mv/core/validators/integers_array_validator'
+require_relative 'base'
 
 module Mv
   module Core
@@ -7,7 +7,7 @@ module Mv
       class Length < Base
         include ActiveModel::Validations
 
-        attr_reader :in, :within, :is, :maximum, :minimum, 
+        attr_reader :in, :within, :is, :maximum, :minimum,
                     :too_long, :too_short
 
         validates :in, :within, presence: true, allow_nil: true, integers_array: true
@@ -16,7 +16,7 @@ module Mv
         validate :in_within_is_maximum_minimum_allowance
 
         def initialize(table_name, column_name, opts)
-          unless opts.is_a?(Hash) 
+          unless opts.is_a?(Hash)
             opts = { in: opts } if opts.respond_to?(:to_a)
             opts = { is: opts } if opts.is_a?(Integer)
           end
@@ -42,7 +42,7 @@ module Mv
           too_long ? compose_full_message(too_long) : nil
         end
 
-        protected 
+        protected
 
         def to_a
           super + [self.in.try(:sort), within.try(:sort), is.to_s, maximum.to_s, minimum.to_s, too_short.to_s, too_long.to_s]
@@ -63,9 +63,9 @@ module Mv
         private
 
         def in_within_is_maximum_minimum_allowance
-          not_null_attrs = [[is, :is], 
-                            [within, :within], 
-                            [self.in, :in], 
+          not_null_attrs = [[is, :is],
+                            [within, :within],
+                            [self.in, :in],
                             [maximum || minimum, :minimum_or_maximum]]
                           .select(&:first).collect(&:second)
 
@@ -83,4 +83,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/presence.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -28,4 +28,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/core/validation/uniqueness.rb

@@ -1,4 +1,4 @@
-require 'mv/core/validation/base'
+require_relative 'base'
 
 module Mv
   module Core
@@ -14,7 +14,7 @@ module Mv
           opts = opts == true ? {} : opts
 
           super(table_name, column_name, opts)
-          
+
           @index_name = opts.with_indifferent_access[:index_name] || default_index_name
         end
 
@@ -22,7 +22,7 @@ module Mv
           super + [index_name.to_s]
         end
 
-        protected 
+        protected
 
         def available_as
           super + [:index]
@@ -48,4 +48,4 @@ module Mv
       end
     end
   end
-end
+end

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: mv-core
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 3.0.0
 platform: ruby
 authors:
 - Valeriy Prokopchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.5'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
 description: DB constraints in migrations similiar to ActiveRecord validations. Core
@@ -234,6 +234,7 @@ files:
 - lib/mv/core/validation/active_model_presenter/presence.rb
 - lib/mv/core/validation/active_model_presenter/uniqueness.rb
 - lib/mv/core/validation/base.rb
+- lib/mv/core/validation/base_collection.rb
 - lib/mv/core/validation/builder/absence.rb
 - lib/mv/core/validation/builder/base.rb
 - lib/mv/core/validation/builder/custom.rb
@@ -263,17 +264,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 2.2.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: DB constraints in migrations similiar to ActiveRecord validations. Core classes