mv-core 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98227c28745a49420cc684f8098cf870db2bd444
-  data.tar.gz: 6d6b2f996839eae4233098b9f87dec56b82e13ef
+  metadata.gz: 24ffb629e586415bc6671bc83c69ab96f61c1133
+  data.tar.gz: 1a7d2b792298becc6cba981959ad868887921264
 SHA512:
-  metadata.gz: 8ff9e5d4efa377b0f8d3d6910cf841dda1d2a35fd32ba8fefc717951bad87a77e3a048ed04421f2de9b6fd41a4cb0986188b18c1f870d2d68adbc8a1fedba927
-  data.tar.gz: 42c43363d8bcf604ee87e9c30973586a141238161bf221a4c268e9f1d143cd9b8a88f932848694191cb1abf3f8c6ae61e9227c3598c85462ebace2d262bcd04e
+  metadata.gz: 9d38da1fab2a62805a97466da3c5ee6d43596d1ff207bf8fb4343983df89b56b524d6a83be938557a36a3b8df8e3e9266b4c92c05898961d376e82f839206074
+  data.tar.gz: 20c0fcb064136a2bf20623b96c4137557f82e54b32b075f594b6a89c8779b047f206c4c2b7bdadc73734c6a3d797272d8b3afed80750e0643ae73f6e7ae82c47

data/README.md

@@ -61,7 +61,7 @@ This gem is not intended to be installed directly and referenced from within the
   Update validator definition: 
 
   ```ruby
-  validates :table_name, :str_column, :exclusion: { in: [1,2,3] }
+  validates :table_name, :str_column, exclusion: { in: [1,2,3] }
   ```
 
   Remove existing validators: 
@@ -79,15 +79,13 @@ This gem is not intended to be installed directly and referenced from within the
   as trigger:
 
   ```ruby
-  validates :table_name, :str_column, validates: { uniqueness: true, 
-                                                   as: :trigger }
+  validates :table_name, :str_column, uniqueness: { as: :trigger }
   ```
 
   as check constraint:
 
   ```ruby
-  validates :table_name, :str_column, validates: { uniqueness: true, 
-                                                   as: :check }
+  validates :table_name, :str_column, uniqueness: { as: :check }
   ```
 
   Also there is possibility to define when validations should occur: 
@@ -95,18 +93,40 @@ This gem is not intended to be installed directly and referenced from within the
   when new record created: 
 
   ```ruby
-  validates :table_name, :str_column, validates: { uniqueness: true, 
-                                                   on: :create }
+  validates :table_name, :str_column, uniqueness: { on: :create }
   ```
 
   or when existing record updated:
 
   ```ruby
-  validates :table_name, :str_column, validates: { uniqueness: true, 
-                                                   on: :update }
+  validates :table_name, :str_column, uniqueness: { on: :update }
   ```
 
-  Supported validators and their properties might vary from one db driver to another. See detailed properties description in correspondent driver section.  
+  And if you need to define some custom validation you can use custom validation (version >= 2.1 is required): 
+
+  ```ruby
+  validates :table_name, :str_column, 
+                    custom: { statement: 'LENGTH(TRIM({str_column})) > 10', 
+                              on: :update }
+  ```
+
+  as result only values with length greater than 10 will be allowed and that condition will be implemented inside ON UPDATE trigger
+  
+  Almost all validations supports shorter notation (simplification) that is not compatible with ActiveRecord validation but much shorter (version >= 2.1 is required): 
+
+  ```ruby
+  validates :table_name, :str_column, uniqueness: true, presence: true
+  ```
+
+  ```ruby
+  validates :table_name, :str_column, length: 1..3
+  ```
+
+  ```ruby
+  validates :table_name, :str_column, custom: 'LENGTH(TRIM({str_column})) > 10'
+  ```
+
+  Supported validators, simplification and their properties might vary from one db driver to another. See detailed properties description in correspondent driver section.  
 
 # Maintenance tasks
 

data/lib/mv/core/active_record/connection_adapters/abstract_adapter_decorator.rb

@@ -1,4 +1,5 @@
 require 'mv/core/migration/base'
+require 'mv/core/services/parse_validation_options'
 
 module Mv
   module Core
@@ -6,7 +7,7 @@ module Mv
       module ConnectionAdapters
         module AbstractAdapterDecorator
           def add_column table_name, column_name, type, opts
-            Mv::Core::Migration::Base.add_column(table_name, column_name, opts.delete(:validates))  
+            Mv::Core::Migration::Base.add_column(table_name, column_name, params(opts))  
             
             super 
           end
@@ -24,7 +25,7 @@ module Mv
           end
 
           def change_column table_name, column_name, type, opts
-            Mv::Core::Migration::Base.change_column(table_name, column_name, opts.delete(:validates))
+            Mv::Core::Migration::Base.change_column(table_name, column_name, params(opts))
 
             super
           end
@@ -44,6 +45,12 @@ module Mv
 
             super
           end
+
+          private
+
+          def params opts
+            Mv::Core::Services::ParseValidationOptions.new(opts).execute
+          end
         end
       end
     end

data/lib/mv/core/active_record/connection_adapters/table_definition_decorator.rb

@@ -1,4 +1,5 @@
 require 'mv/core/migration/base'
+require 'mv/core/services/parse_validation_options'
 
 module Mv
   module Core
@@ -6,7 +7,7 @@ module Mv
       module ConnectionAdapters
         module TableDefinitionDecorator
           def column column_name, type, opts = {}
-            Mv::Core::Migration::Base.add_column(name, column_name, opts.delete(:validates))  
+            Mv::Core::Migration::Base.add_column(name, column_name, params(opts))  
 
             super
           end
@@ -14,6 +15,12 @@ module Mv
           def validates column_name, opts
             Mv::Core::Migration::Base.change_column(name, column_name, opts)  
           end
+
+          private
+
+          def params opts
+            Mv::Core::Services::ParseValidationOptions.new(opts).execute
+          end
         end
       end
     end

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

@@ -1,3 +1,4 @@
+require 'mv/core/validation/factory'
 require 'mv/core/db/helpers/table_validators'
 
 module Mv
@@ -27,7 +28,7 @@ module Mv
             return delete_validators(column_validators.where(validation_type: validation_type)) if opts == false
 
             column_validators.where(validation_type: validation_type).first_or_initialize.tap do |validator|
-              validator.options = normalize_opts(opts)
+              validator.options = normalize_opts(validation_type, opts)
             end.save!
           end
 
@@ -37,8 +38,8 @@ module Mv
 
           private
 
-          def normalize_opts opts
-            opts == true ? {} : opts
+          def normalize_opts validation_type, opts
+            Mv::Core::Validation::Factory.create_validation(table_name, column_name, validation_type, opts).options
           end
 
           def raise_column_validation_error validation_type, opts

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

@@ -0,0 +1,28 @@
+require 'mv/core/validation/factory'
+
+module Mv
+  module Core
+    module Services
+      class ParseValidationOptions
+        attr_reader :opts
+
+        def initialize(opts)
+          @opts = opts || {}
+        end
+
+        def execute
+          validates = opts.delete(:validates) || opts.delete("validates")
+
+          return validates if validates.is_a?(Hash)
+          return { custom: validates } if validates.present?
+
+          Mv::Core::Validation::Factory.registered_validations.inject({}) do |res, validation_type|
+            validation_options = opts.delete(validation_type.to_sym) || opts.delete(validation_type.to_s)
+            res[validation_type] = validation_options if validation_options
+            res
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Mv
         validate :nil_and_blank_can_not_be_both_denied
 
         def initialize(table_name, column_name, opts)
-          super(table_name, column_name, opts)
+          super(table_name, column_name, opts == true ? {} : opts)
         end
 
         protected

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

@@ -0,0 +1,26 @@
+require 'mv/core/validation/builder/base'
+
+module Mv
+  module Core
+    module Validation 
+      module Builder
+        class Custom < Base
+          delegate :statement, to: :validation
+
+          def conditions
+            [{
+              statement: apply_allow_nil_and_blank("(#{preprocess_statement})"), 
+              message: message
+            }]
+          end
+
+          private
+
+          def preprocess_statement
+            statement.gsub(/\{\s*#{column_name}\s*\}/, column_reference.to_s)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ 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'
 
 module Mv
   module Core
@@ -33,7 +34,8 @@ module Mv
               Mv::Core::Validation::Length => Mv::Core::Validation::Builder::Length,
               Mv::Core::Validation::Presence => Mv::Core::Validation::Builder::Presence,
               Mv::Core::Validation::Absence => Mv::Core::Validation::Builder::Absence,
-              Mv::Core::Validation::Uniqueness => Mv::Core::Validation::Builder::Uniqueness
+              Mv::Core::Validation::Uniqueness => Mv::Core::Validation::Builder::Uniqueness,
+              Mv::Core::Validation::Custom => Mv::Core::Validation::Builder::Custom
             }
           end
         end

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

@@ -0,0 +1,25 @@
+require 'mv/core/validation/base'
+
+module Mv
+  module Core
+    module Validation
+      class Custom < Base
+        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]
+        end
+
+        def to_a
+          super + [statement.to_s]
+        end
+      end
+    end
+  end
+end

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

@@ -12,6 +12,8 @@ module Mv
         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]

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

@@ -4,6 +4,7 @@ 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'
 
 module Mv
@@ -13,7 +14,7 @@ module Mv
         include Singleton
 
         def create_validation table_name, column_name, validation_type, opts
-          validation_class = factroy_map[validation_type.to_sym]
+          validation_class = factory_map[validation_type.to_sym]
 
           raise Mv::Core::Error.new(table_name: table_name, 
                                     column_name: column_name, 
@@ -25,7 +26,7 @@ module Mv
         end 
 
         def register_validation validation_type, klass
-          factroy_map[validation_type.to_sym] = klass
+          factory_map[validation_type.to_sym] = klass
         end
 
         def register_validations opts
@@ -34,20 +35,28 @@ module Mv
           end
         end
 
+        def registered_validations
+          factory_map.keys
+        end
+
         class << self
-          delegate :create_validation, :register_validation, :register_validations, to: :instance
+          delegate :create_validation, 
+                   :registered_validations, 
+                   :register_validation,
+                   :register_validations, to: :instance
         end
 
         private 
 
-        def factroy_map
+        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, 
             presence: Mv::Core::Validation::Presence,
-            absence: Mv::Core::Validation::Absence
+            absence: Mv::Core::Validation::Absence,
+            custom: Mv::Core::Validation::Custom
           }
         end
       end

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

@@ -12,6 +12,8 @@ module Mv
         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]

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

@@ -16,6 +16,11 @@ module Mv
         validate :in_within_is_maximum_minimum_allowance
 
         def initialize(table_name, column_name, opts)
+          unless opts.is_a?(Hash) 
+            opts = { in: opts } if opts.respond_to?(:to_a)
+            opts = { is: opts } if opts.is_a?(Integer)
+          end
+
           super(table_name, column_name, opts)
 
           opts.with_indifferent_access.tap do |opts|

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

@@ -9,7 +9,7 @@ module Mv
         validate :nil_and_blank_can_not_be_both_allowed
 
         def initialize(table_name, column_name, opts)
-          super(table_name, column_name, opts)
+          super(table_name, column_name, opts == true ? {} : opts)
         end
 
         private

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

@@ -11,6 +11,8 @@ module Mv
         validates :index_name, absence: { message: 'allowed when :as == :index' }, unless: :index?
 
         def initialize(table_name, column_name, opts)
+          opts = opts == true ? {} : opts
+
           super(table_name, column_name, opts)
           
           @index_name = opts.with_indifferent_access[:index_name] || default_index_name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mv-core
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Valeriy Prokopchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-19 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -218,6 +218,7 @@ files:
 - lib/mv/core/services/create_migration_validators_table.rb
 - lib/mv/core/services/delete_constraints.rb
 - lib/mv/core/services/load_constraints.rb
+- lib/mv/core/services/parse_validation_options.rb
 - lib/mv/core/services/say_constraints_diff.rb
 - lib/mv/core/services/show_constraints.rb
 - lib/mv/core/services/synchronize_constraints.rb
@@ -226,12 +227,14 @@ files:
 - lib/mv/core/validation/base.rb
 - lib/mv/core/validation/builder/absence.rb
 - lib/mv/core/validation/builder/base.rb
+- lib/mv/core/validation/builder/custom.rb
 - lib/mv/core/validation/builder/exclusion.rb
 - lib/mv/core/validation/builder/factory.rb
 - lib/mv/core/validation/builder/inclusion.rb
 - lib/mv/core/validation/builder/length.rb
 - lib/mv/core/validation/builder/presence.rb
 - lib/mv/core/validation/builder/uniqueness.rb
+- lib/mv/core/validation/custom.rb
 - lib/mv/core/validation/exclusion.rb
 - lib/mv/core/validation/factory.rb
 - lib/mv/core/validation/inclusion.rb