mv-core 0.1.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 175b29c2732cf8425f8a8b94c623b878519b4852
+  data.tar.gz: 901c6991b9f82011409146b4230ce4b399bb2aba
+SHA512:
+  metadata.gz: 79a5f8408f2d70deb379c1482639d34e56aeb292ce1c8bbd0a0ffab7d1fc6f1293c40a99864953f1a3ef590280fe530bc6e44ee452aba9f92b36ed246e046172
+  data.tar.gz: 2f76dbeeb166d54ae2a7a1880f8a3ee9f327e806b89a1c5fe0c2858bcaea9f070a2f5cbf531adc8c855d8dbbb2017010a35f0b1151274324781da741e118f135

data/README.rdoc

@@ -10,6 +10,20 @@ Main goal of the project is to allow developer to express database constraints i
 
 mv-core is a set of core classes that are used everywhere across Migration Validators project gems. 
 
+= Install
+
+  PostgreSQL:
+
+  gem install mv-postgresql
+
+  MySQL:
+
+  gem install mv-mysql
+
+  SQLite: 
+
+  gem install mv-sqlite
+ 
 = Usage
 
   Create new table:
@@ -55,7 +69,7 @@ mv-core is a set of core classes that are used everywhere across Migration Valid
 
   or while updating of existing record:
 
-  validate_column :table_name, :str_column, :validates => {:uniqueness => true, :on => :create }
+  validate_column :table_name, :str_column, :validates => {:uniqueness => true, :on => :update }
 
   Supported validators and their properties might vary from one db driver to another. See detailed properties description in correspondent driver section.  
 

data/lib/migration_validators/active_record/base.rb

@@ -1,9 +1,10 @@
 module MigrationValidators
   module ActiveRecord
     module Base
-      def self.included(base)
-        base.extend ClassMethods
-        base.class_eval do
+      extend ActiveSupport::Concern
+
+      included do
+        class_eval do
           class << self
             alias_method_chain :establish_connection, :validators
           end
@@ -17,6 +18,10 @@ module MigrationValidators
           connection.class.class_eval {
             include MigrationValidators::ActiveRecord::ConnectionAdapters::NativeAdapter
           } unless connection.class.include?(MigrationValidators::ActiveRecord::ConnectionAdapters::NativeAdapter)
+
+          connection.class.class_eval {
+            include MigrationValidators::ActiveRecord::ConnectionAdapters::AbstractAdapter
+          } unless connection.class.include?(MigrationValidators::ActiveRecord::ConnectionAdapters::AbstractAdapter)
         end
       end
     end

data/lib/migration_validators/active_record/connection_adapters/abstract_adapter.rb

@@ -2,8 +2,10 @@ module MigrationValidators
   module ActiveRecord
     module ConnectionAdapters 
       module AbstractAdapter 
-        def self.included(base)
-          base.class_eval do
+        extend ActiveSupport::Concern
+
+        included do
+          class_eval do
             alias_method_chain :initialize_schema_migrations_table, :validators
           end
         end
@@ -16,8 +18,8 @@ module MigrationValidators
               t.string :table_name, :null => false, :limit => 255
               t.string :column_name, :null => true, :limit => 255
               t.string :validator_name, :null => false, :limit => 255
-              t.text :options
-              t.text :constraints
+              t.text :options#, default: {}.to_yaml
+              t.text :constraints#, default: [].to_yaml
             end 
 
             add_index migrations_table, :table_name

data/lib/migration_validators/active_record/connection_adapters/native_adapter.rb

@@ -1,9 +1,13 @@
+# DbValidator = MigrationValidators::Core::DbValidator
+
 module MigrationValidators
   module ActiveRecord
     module ConnectionAdapters 
       module NativeAdapter 
-        def self.included(base)
-          base.class_eval do
+        extend ActiveSupport::Concern
+
+        included do
+          class_eval do
             alias_method_chain :drop_table, :validators
             alias_method_chain :remove_column, :validators
             alias_method_chain :rename_column, :validators
@@ -23,10 +27,16 @@ module MigrationValidators
             if validator_options.blank?
               raise MigrationValidatorsException.new("use false to remove column validator") unless validator_options == false
 
-              MigrationValidators::Core::DbValidator.remove_column_validator table_name, column_name, validator_name
+              MigrationValidators::Core::DbValidator.on_table(table_name)
+                                                    .on_column(column_name)
+                                                    .with_name(validator_name)
+                                                    .delayed_destroy
             else 
               validator_options = {} if validator_options == true
-              MigrationValidators::Core::DbValidator.add_column_validator table_name, column_name, validator_name, validator_options
+              MigrationValidators::Core::DbValidator.new(table_name: table_name, 
+                                                         column_name: column_name, 
+                                                         validator_name: validator_name, 
+                                                         options: validator_options).delayed_save
             end
           end
         end
@@ -65,14 +75,15 @@ module MigrationValidators
 
 
         def drop_table_with_validators table_name
-          do_enabled { MigrationValidators::Core::DbValidator.remove_table_validators table_name }
+          do_enabled { MigrationValidators::Core::DbValidator.on_table(table_name).delayed_destroy }
           do_internally { drop_table_without_validators table_name }
         end
 
         def remove_column_with_validators table_name, *column_names
           do_enabled do
             column_names.flatten.each do |column_name| 
-              MigrationValidators::Core::DbValidator.remove_column_validators table_name, column_name 
+              # MigrationValidators::Core::DbValidator.remove_column_validators table_name, column_name 
+              MigrationValidators::Core::DbValidator.on_table(table_name).on_column(column_name).delayed_destroy
             end
           end
 
@@ -100,7 +111,7 @@ module MigrationValidators
         def change_column_with_validators table_name, column_name, type, opts
           validates = opts.delete(:validates)
 
-          do_enabled { MigrationValidators::Core::DbValidator.remove_column_validators table_name, column_name }
+          do_enabled { MigrationValidators::Core::DbValidator.on_table(table_name).on_column(column_name).delayed_destroy }
 
           do_internally { change_column_without_validators table_name, column_name, type, opts }
 

data/lib/migration_validators/active_record/connection_adapters/table.rb

@@ -2,8 +2,10 @@ module MigrationValidators
   module ActiveRecord
     module ConnectionAdapters
       module Table
-        def self.included(base)
-          base.class_eval do
+        extend ActiveSupport::Concern
+
+        included do
+          class_eval do
             def change_validates column_name, opts
               ::ActiveRecord::Base.connection.validate_column(@table_name, column_name, opts) unless opts.blank?
             end

data/lib/migration_validators/active_record/connection_adapters/table_definition.rb

@@ -2,8 +2,10 @@ module MigrationValidators
   module ActiveRecord
     module ConnectionAdapters
       module TableDefinition
-        def self.included(base)
-          base.class_eval do
+        extend ActiveSupport::Concern
+
+        included do
+          class_eval do
             alias_method_chain :column, :validators
 
             def change_validates *args

data/lib/migration_validators/active_record/migration.rb

@@ -1,11 +1,12 @@
 module MigrationValidators
   module ActiveRecord
     module Migration
-      def self.included(base)
-        base.extend ClassMethods
-        base.class_eval do
+      extend ActiveSupport::Concern
+
+     included do
+        class_eval do
           class << self
-            alias_method_chain :migrate, :validators
+            self.alias_method_chain :migrate, :validators
           end
         end
       end

data/lib/migration_validators/active_record/schema.rb

@@ -1,9 +1,10 @@
 module MigrationValidators
   module ActiveRecord
     module Schema
-      def self.included(base)
-        base.extend ClassMethods
-        base.class_eval do
+      extend ActiveSupport::Concern
+
+      included do
+        class_eval do
           class << self
             alias_method_chain :define, :validators
           end

data/lib/migration_validators/active_record/schema_dumper.rb

@@ -1,8 +1,10 @@
 module MigrationValidators
   module ActiveRecord
     module SchemaDumper
-      def self.included(base)
-        base.class_eval do
+      extend ActiveSupport::Concern
+
+      included do
+        class_eval do
           alias_method_chain :tables, :validators
         end
       end
@@ -12,13 +14,10 @@ module MigrationValidators
 
         stream.puts ""
         stream.puts "  #Validators"
-        MigrationValidators::Core::DbValidator.find(:all, :order => "table_name, column_name").each do |validator|
+        MigrationValidators::Core::DbValidator.order([:table_name, :column_name]).each do |validator|
           stream.puts "  validate_column :#{validator.table_name}, :#{validator.column_name}, :#{validator.validator_name} => #{validator.options.inspect}"
         end
       end
-
-      private 
-        
     end
   end
 end

data/lib/migration_validators/adapters/containers.rb

@@ -1,9 +1,7 @@
 module MigrationValidators
   module Adapters
     module Containers
-      def self.included(base)
-        base.extend ClassMethods
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods
         def containers
@@ -29,10 +27,10 @@ module MigrationValidators
             end
 
             operation :create do |stmt, trigger_name, group_name|
-              "CREATE TRIGGER #{trigger_name} BEFORE INSERT ON #{group_name.first} FOR EACH ROW
-               BEGIN
-                #{stmt};
-               END;"
+              ["CREATE TRIGGER #{trigger_name} BEFORE INSERT ON #{group_name.first} FOR EACH ROW",
+               "BEGIN",
+               "#{stmt}; ",
+               "END;"].join(' ')
             end
 
             operation :drop do |stmt, trigger_name, group_name|
@@ -59,10 +57,10 @@ module MigrationValidators
             end
 
             operation :create do |stmt, trigger_name, group_name|
-              "CREATE TRIGGER #{trigger_name} BEFORE UPDATE ON #{group_name.first} FOR EACH ROW
-               BEGIN
-                #{stmt};
-               END;"
+              ["CREATE TRIGGER #{trigger_name} BEFORE UPDATE ON #{group_name.first} FOR EACH ROW",
+               "BEGIN",
+                "#{stmt}; ",
+                "END;"].join(' ')
             end
 
             operation :drop do |stmt, trigger_name, group_name|

data/lib/migration_validators/adapters/routing.rb

@@ -1,9 +1,7 @@
 module MigrationValidators
   module Adapters
     module Routing
-      def self.included(base)
-        base.extend ClassMethods
-      end
+      extend ActiveSupport::Concern
 
       ###################################################################
       ## UNIQUENESS

data/lib/migration_validators/adapters/syntax.rb

@@ -1,9 +1,7 @@
 module MigrationValidators
   module Adapters
     module Syntax
-      def self.included(base)
-        base.extend ClassMethods
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods
         def define_base_syntax

data/lib/migration_validators/adapters/validator_definitions.rb

@@ -1,9 +1,7 @@
 module MigrationValidators
   module Adapters
     module ValidatorDefinitions
-      def self.included(base)
-        base.extend ClassMethods
-      end
+      extend ActiveSupport::Concern
 
       module ClassMethods
         def validators
@@ -11,15 +9,20 @@ module MigrationValidators
         end
 
         def validator name, opts = {}, &block
-          validator = validators[name] ||= MigrationValidators::Core::ValidatorDefinition.new(syntax)
+          validator = validators[name]
+
+          unless validator
+            validator = validators[name] = MigrationValidators::Core::ValidatorDefinition.new(syntax)
 
-          validator.post :allow_nil => true do
-            self.wrap.or(column.db_name.null)
-          end if opts[:allow_nil] || !opts.key?(:allow_nil)
+            validator.post :allow_nil => true do
+              self.wrap.or(column.db_name.null)
+            end if opts[:allow_nil] || !opts.key?(:allow_nil)
+
+            validator.post :allow_blank => true do
+              self.wrap.or(column.db_name.coalesce.trim.length.equal_to(0))
+            end if opts[:allow_blank] || !opts.key?(:allow_blank)
+          end
 
-          validator.post :allow_blank => true do
-            self.wrap.or(column.db_name.coalesce.trim.length.equal_to(0))
-          end if opts[:allow_blank] || !opts.key?(:allow_blank)
 
           validator.instance_eval(&block) if block
         end 
@@ -119,9 +122,7 @@ module MigrationValidators
 
           validator :uniqueness do
             property do |value|
-              "NOT EXISTS(SELECT #{column}  
-                            FROM #{validator.table_name}
-                           WHERE (#{column.db_name} = #{column}))"
+              "NOT EXISTS(SELECT #{column.to_s} FROM #{validator.table_name} tbl WHERE (#{column.db_name} = #{column.to_s}))"
             end
           end
         end

data/lib/migration_validators/core/db_validator.rb

@@ -1,7 +1,11 @@
 module MigrationValidators
   module Core
     class DbValidator < ::ActiveRecord::Base
-      set_table_name MigrationValidators.migration_validators_table_name
+      @@validators_to_remove = []
+      @@validators_to_add = []
+
+
+      self.table_name = MigrationValidators.migration_validators_table_name
 
       validates_presence_of :table_name
       validates_length_of :table_name, :maximum => 255
@@ -23,13 +27,20 @@ module MigrationValidators
       before_save :prepare_options
 
       serialize :options, Hash
-      serialize :constraints, Array
+      serialize :constraints, ValidatorConstraintsList
+
+      scope :on_table, -> (table_name) { where table_name: table_name }
+      scope :on_column, -> (column_name) { where column_name: column_name }
+      scope :with_name, -> (validator_name) { where validator_name: validator_name }
+
+      def options
+        attributes['options'] ||= {}
+      end
 
       def name
         "#{table_name}_#{column_name}_#{validator_name}"
       end
 
-
       def error_message
         unless (options.blank? || (message = options[:message]).blank?)
           message
@@ -42,135 +53,77 @@ module MigrationValidators
         return true if opts.blank?
 
         opts.collect do |property_name, property_value| 
-          [property_name, property_value.kind_of?(Array) ? property_value : [property_value]]
+          [property_name, [property_value].flatten]
         end.all? do |property_name, property_value| 
           property_value.include?(options[property_name])
         end
       end
 
-      def save_to_constraint constraint_name
-        self.constraints ||= []
-        self.constraints << constraint_name.to_s unless self.constraints.include?(constraint_name.to_s)
-      end
-
-      def remove_from_constraint constraint_name
-        self.constraints.delete(constraint_name.to_s) if self.constraints
+      def delayed_destroy 
+        @@validators_to_remove << self unless @@validators_to_remove.include?(self)
       end
 
-      def in_constraint? constraint_name
-        self.constraints && self.constraints.include?(constraint_name.to_s)
+      def delayed_save
+        DbValidator.on_table(table_name)
+                   .on_column(column_name)
+                   .with_name(validator_name)
+                   .delayed_destroy
+                   
+        @@validators_to_add << self unless @@validators_to_add.include?(self)
       end
 
       private
-        def prepare_options
-          options = options.inject({}) do |res, (key, value)|
-            res[key.to_s] = value
-            res
-          end unless options.blank?
-
-          true
-        end
-
-      class << self 
-
-        def add_column_validator table_name, column_name, validator_name, opts
-          remove_validators(:table_name => table_name.to_s,
-                            :column_name => column_name.to_s,
-                            :validator_name => validator_name.to_s)
-
-          add_new_validator(:table_name => table_name.to_s,
-                            :column_name => column_name.to_s,
-                            :validator_name => validator_name.to_s, 
-                            :options => opts)
-        end
-
-        def remove_column_validator table_name, column_name, validator_name
-          remove_validators :table_name => table_name.to_s, :column_name => column_name.to_s, :validator_name => validator_name.to_s
-        end
-
-        def remove_column_validators table_name, column_name
-          remove_validators :table_name => table_name.to_s, :column_name => column_name.to_s
-        end
-
-        def table_validators table_name, opts = {}
-          with_options opts do
-            DbValidator.find(:all, :conditions => { :table_name => table_name.to_s })
-          end
-        end
 
-        def constraint_validators constraint
-          (DbValidator.find(:all, :conditions => ["constraints LIKE ?", "%#{constraint}%"]) + validators_to_add - validators_to_remove).select{|validator| validator.in_constraint?(constraint)}
-        end
-
-        def remove_table_validators table_name 
-          remove_validators :table_name => table_name.to_s
-        end
-        
-        def column_validators table_name, column_name, opts = {}
-          with_options opts do
-            DbValidator.find :all, :conditions => { :table_name => table_name.to_s, :column_name => column_name.to_s }
-          end
-        end
-
-        def rename_column table_name, old_column_name, new_column_name
-          DbValidator.update_all({:column_name => new_column_name.to_s}, :column_name => old_column_name.to_s)
-        end
-
-        def rename_table old_table_name, new_table_name
-          DbValidator.update_all({:table_name => new_table_name.to_s}, :table_name => old_table_name.to_s)
-        end
-
-        def commit adapter = nil
-          adapter.remove_validators(validators_to_remove.select{|validator| ::ActiveRecord::Base.connection.table_exists?(validator.table_name)}) if adapter
-          validators_to_remove.each(&:destroy) 
-          validators_to_remove.clear
-
-          adapter.create_validators(validators_to_add) if adapter
-          validators_to_add.each(&:save!)
-          validators_to_add.clear
-        end
-
-        def rollback
-          validators_to_remove.clear
-          validators_to_add.clear
-        end
+      def prepare_options
+        options = options.inject({}) do |res, (key, value)|
+          res[key.to_s] = value
+          res
+        end unless options.blank?
 
+        true
+      end
 
-        def clear_all
-          rollback
-          DbValidator.delete_all
-        end
+      class << self 
 
-        def validators_to_remove
-          @validators_to_remove ||= []
-        end
+      def satisfies opts
+        all.select{|validator| validator.satisfies(opts) }
+      end
 
-        def validators_to_add
-          @validators_to_add ||= []
-        end
+      def delayed_destroy
+        all.each(&:delayed_destroy)
+      end
 
-        private 
+      def constraint_validators constraint
+        (DbValidator.where("constraints LIKE ?", "%#{constraint}%").all + @@validators_to_add - @@validators_to_remove).select{|validator| validator.constraints.include?(constraint)}
+      end
 
-        def validators_to_remove
-          @validators_to_remove ||= []
-        end
+      def rename_column table_name, old_column_name, new_column_name
+        all.on_table(table_name).on_column(old_column_name).update_all(column_name: new_column_name)
+      end
 
-        def validators_to_add
-          @validators_to_add ||= []
-        end
+      def rename_table old_table_name, new_table_name
+        all.on_table(old_table_name).update_all(table_name: new_table_name)
+      end
 
-        def with_options opts, &block
-          block.call.select {|validator| validator.satisfies(opts) } 
-        end
+      def commit adapter = nil
+        adapter.remove_validators(@@validators_to_remove.select{|validator| ::ActiveRecord::Base.connection.table_exists?(validator.table_name)}) if adapter
+        @@validators_to_remove.each(&:destroy) 
+        @@validators_to_remove.clear
 
-        def add_new_validator opts
-          validators_to_add << new(opts)
-        end
+        adapter.create_validators(@@validators_to_add) if adapter
+        @@validators_to_add.each(&:save!)
+        @@validators_to_add.clear
+      end
 
-        def remove_validators opts
-          DbValidator.find(:all, :conditions => opts).each { |validator| validators_to_remove << validator }
-        end
+      def rollback
+        @@validators_to_remove.clear
+        @@validators_to_add.clear
+      end
 
+      def clear_all
+        rollback
+        DbValidator.delete_all
+      end
 
       end
     end