mv-sqlite 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c1aae3ae3a6a0fc2eaa5a0a6f326598ce9cdb9
-  data.tar.gz: bc5045b83e88945ace55aab03791cd1997924765
+  metadata.gz: 4c1d336c78c19529b6d63bfcf9e171317a5bcd3f
+  data.tar.gz: ee3c8e102bfb81520190fa0f122f24623fe45752
 SHA512:
-  metadata.gz: e645c998d46403e34b278267fa9eb65e72a572e5a9549e223a4594c53ceb125fc3b083eb2a048376817e7a7f058c3abf73ce5dab7cc5329243985f601a2b68bc
-  data.tar.gz: 22d240df3c8ac60d22ca2ba57851af9792b2a33e341e1dd07d1c5bcf3ecd601cd3d3f53d9999587466bd90489b35064f98979af6a584bfd368ee44757ebdf00b
+  metadata.gz: cdb0c7946a01247e8218ce9b68fcf4f1fb31ec924e20cbd73a82b4c9832d42b631d9c3d125b85b7ac9117c3b4f246b3d7828cee938c12087b965bca6dd3510c9
+  data.tar.gz: f14e20bcb40b4241121a06ba7e5c6bfda7bb8c1b0d2ab1189c6b72d6a30cf717c594fb3edd0d72c7a9f5f9c999cc697c2812aeae8700ba6c30ff0aaf78bcfd36

data/README.md

@@ -14,6 +14,7 @@ Define validations directly in DB as SQLite constraints and integrate them into
   * [exclusion](#exclusion)
   * [presence](#presence)
   * [absence](#absence)
+  * [format](#format)
   * [custom](#custom)
 * [Version History](#version history)
 * [Contributing](#contributing)
@@ -538,6 +539,100 @@ Define validations directly in DB as SQLite constraints and integrate them into
   * `allow_blank` - ignore validation for blank values. Default value: `true`
   * `as` - defines the way how constraint will be implemented. Possible values: `[:trigger]` Default value: `:trigger`
 
+### format 
+
+  **WARNING** ```SQLite``` does NOT have default ```REGEXP``` implementation. ```mv-sqlite``` contains own implementation that is available with active record connection only. In other words everything should be ok if you access database from withing rails console or rails application or other application that uses ```activerecord``` internally. But not defined function error will be thrown when you access database direclty. You can build ```SQLite``` ```ICU``` extension to enable native ```SQLite``` ```REGEXP```. See details here: http://www.sqlite.org/src/artifact?ci=trunk&filename=ext/icu/README.txt.
+
+  Examples: 
+
+  allows only values that contains 'word' inside: 
+
+  ```ruby
+  def up
+    validates :table_name, :column_name, format: { with: /word/ }
+  end
+
+  def down
+    validates :table_name, :column_name, format: false
+  end
+  ```
+
+  with failure message: 
+
+  ```ruby
+  def up
+  validates :table_name, :column_name, 
+    format: { with: /word/, 
+              message: 'Column_name value should contain start word' }
+  end
+
+  def down
+    validates :table_name, :column_name, format: false
+  end
+  ```
+
+  implemented as trigger:
+
+  ```ruby
+  def up
+    validates :table_name, :column_name, 
+      format: { with: /word/, 
+                message: 'Column_name value should contain start word', 
+                as: :trigger }
+  end
+
+  def down
+    validates :table_name, :column_name, format: false
+  end
+  ```
+
+  all above are available in a create and change table blocks: 
+
+  ```ruby
+  def change
+    create_table :table_name do |t|
+      t.string :column_name, validates { format: { with: /word/ } }
+    end
+  end
+  ```
+
+  ```ruby
+  def up
+    change :table_name do |t|
+      t.change :column_name, :string, validates: { format: { with: /word/ } }
+    end
+  end
+
+  def down
+    change :table_name do |t|
+      t.change :column_name, :string, validates: { format: false }
+    end
+  end
+  ```
+
+  simplifications (version >= 2.1 is required):
+
+  ```ruby
+  def change
+    create_table :table_name do |t|
+      t.string :contains_word, format: /word/ 
+      t.string :contains_word_in_trigger, format: { with: /word/, 
+                                                    as: :trigger }
+    end
+  end
+  ```
+
+  Options:
+
+  * `with` - regular expression that column value should be matched to
+  * `message` - message that should be shown if validation failed
+  * `on` -  validation event. Possible values `[:save, :update, :create]`. Ignored unless `:as == :trigger`. Default value: `:save`
+  * `create_tigger_name` - Name of the 'before insert' trigger that will be created if `:as == :trigger` && `:on` in `[:save, :create]`
+  * `update_tigger_name` - Name of the 'before update' trigger that will be created if `:as == :trigger` && `:on` in `[:save, :update]`
+  * `allow_nil` - ignore validation for `nil` values. Default value: `false`
+  * `allow_blank` - ignore validation for blank values. Default value: `false`
+  * `as` - defines the way how constraint will be implemented. Possible values: `[:trigger]` Default value: `:trigger`
+
 ### custom 
 
   (version >= 2.1 is required)

data/lib/mv/sqlite/active_record/connection_adapters/sqlite3_adapter_decorator.rb

@@ -1,3 +1,5 @@
+require 'mv/sqlite/services/create_regexp_function'
+
 module Mv
   module Sqlite
     module ActiveRecord
@@ -5,6 +7,12 @@ module Mv
         module Sqlite3AdapterDecorator
           include Mv::Core::ActiveRecord::ConnectionAdapters::AbstractAdapterDecorator
 
+          def initialize(connection, *args)
+            super
+
+            Mv::Sqlite::Services::CreateRegexpFunction.new(connection).execute
+          end
+
           protected
 
           def alter_table(table_name, options = {})
@@ -16,4 +24,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/sqlite/loader.rb

@@ -1,13 +1,18 @@
 require 'mv/sqlite/constraint/builder/trigger'
 
+require 'mv/sqlite/validation/format'
+
 require 'mv/sqlite/validation/builder/trigger/exclusion'
 require 'mv/sqlite/validation/builder/trigger/inclusion'
 require 'mv/sqlite/validation/builder/trigger/length'
 require 'mv/sqlite/validation/builder/trigger/presence'
 require 'mv/sqlite/validation/builder/trigger/absence'
 require 'mv/sqlite/validation/builder/trigger/uniqueness'
+require 'mv/sqlite/validation/builder/trigger/format'
 require 'mv/sqlite/validation/builder/trigger/custom'
 
+require 'mv/sqlite/validation/active_model_presenter/format'
+
 require 'mv/sqlite/active_record/connection_adapters/sqlite3_adapter_decorator'
 
 #constraint builders
@@ -15,6 +20,11 @@ Mv::Core::Constraint::Builder::Factory.register_builders(
   Mv::Core::Constraint::Trigger => Mv::Sqlite::Constraint::Builder::Trigger,
 )
 
+#validations
+Mv::Core::Validation::Factory.register_validations(
+  format: Mv::Sqlite::Validation::Format
+)
+
 #validation builders in trigger
 Mv::Sqlite::Constraint::Builder::Trigger.validation_builders_factory.register_builders(
   Mv::Core::Validation::Exclusion   => Mv::Sqlite::Validation::Builder::Trigger::Exclusion,
@@ -23,9 +33,15 @@ Mv::Sqlite::Constraint::Builder::Trigger.validation_builders_factory.register_bu
   Mv::Core::Validation::Presence    => Mv::Sqlite::Validation::Builder::Trigger::Presence,
   Mv::Core::Validation::Absence     => Mv::Sqlite::Validation::Builder::Trigger::Absence,
   Mv::Core::Validation::Uniqueness  => Mv::Sqlite::Validation::Builder::Trigger::Uniqueness,
+  Mv::Sqlite::Validation::Format  => Mv::Sqlite::Validation::Builder::Trigger::Format,
   Mv::Core::Validation::Custom      => Mv::Sqlite::Validation::Builder::Trigger::Custom
 )
 
+#validation active model presenters
+Mv::Core::Validation::ActiveModelPresenter::Factory.register_presenters(
+  Mv::Sqlite::Validation::Format      => Mv::Sqlite::Validation::ActiveModelPresenter::Format
+)
+
 ::ActiveRecord::ConnectionAdapters::SQLite3Adapter.send(
   :prepend,
   Mv::Sqlite::ActiveRecord::ConnectionAdapters::Sqlite3AdapterDecorator

data/lib/mv/sqlite/services/create_regexp_function.rb

@@ -0,0 +1,19 @@
+module Mv
+  module Sqlite
+    module Services
+      class CreateRegexpFunction
+        attr_reader :connection
+
+        def initialize(connection)
+          @connection = connection
+        end
+
+        def execute
+          connection.create_function( 'REGEXP', 2 ) do |func, pattern, expression|
+            func.result = expression =~ Regexp.new(pattern.to_s, Regexp::IGNORECASE) ? 1 : 0
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mv/sqlite/validation/active_model_presenter/format.rb

@@ -0,0 +1,17 @@
+module Mv
+  module Sqlite
+    module Validation
+      module ActiveModelPresenter
+        class Format < Mv::Core::Validation::ActiveModelPresenter::Base
+          def option_names
+            super + [:with]
+          end
+
+          def validation_name
+            :format
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mv/sqlite/validation/builder/format.rb

@@ -0,0 +1,34 @@
+module Mv
+  module Sqlite
+    module Validation
+      module Builder
+        class Format < Mv::Core::Validation::Builder::Base
+          delegate :with, to: :validation
+
+          def conditions
+            [{
+              statement: apply_allow_nil_and_blank(apply_with(column_reference)),
+              message: message
+            }]
+          end
+
+          protected
+
+          def db_value value
+            return "'#{value.source}'" if value.is_a?(Regexp)
+            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 },
+                                      error: "#{value.class} is not supported as :with value")
+          end
+
+          def apply_with stmt
+            "#{stmt} REGEXP #{db_value(with)}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mv/sqlite/validation/builder/trigger/absence.rb

@@ -6,10 +6,10 @@ module Mv
       module Builder
         module Trigger
           class Absence < Mv::Core::Validation::Builder::Absence
-            include TriggerColumn 
+            include TriggerColumn
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/custom.rb

@@ -6,10 +6,10 @@ module Mv
       module Builder
         module Trigger
           class Custom < Mv::Core::Validation::Builder::Custom
-            include TriggerColumn 
+            include TriggerColumn
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/exclusion.rb

@@ -1,4 +1,4 @@
-require 'mv/sqlite/validation/builder/trigger/mysql_datetime_values'
+require 'mv/sqlite/validation/builder/trigger/sqlite_datetime_values'
 require 'mv/sqlite/validation/builder/trigger/trigger_column'
 
 module Mv
@@ -7,11 +7,11 @@ module Mv
       module Builder
         module Trigger
           class Exclusion < Mv::Core::Validation::Builder::Exclusion
-            include MysqlDatetimeValues
+            include SqliteDatetimeValues
             include TriggerColumn
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/format.rb

@@ -0,0 +1,16 @@
+require 'mv/sqlite/validation/builder/format'
+require 'mv/sqlite/validation/builder/trigger/trigger_column'
+
+module Mv
+  module Sqlite
+    module Validation
+      module Builder
+        module Trigger
+          class Format < Mv::Sqlite::Validation::Builder::Format
+            include TriggerColumn
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mv/sqlite/validation/builder/trigger/inclusion.rb

@@ -1,4 +1,4 @@
-require 'mv/sqlite/validation/builder/trigger/mysql_datetime_values'
+require 'mv/sqlite/validation/builder/trigger/sqlite_datetime_values'
 require 'mv/sqlite/validation/builder/trigger/trigger_column'
 
 module Mv
@@ -7,11 +7,11 @@ module Mv
       module Builder
         module Trigger
           class Inclusion < Mv::Core::Validation::Builder::Inclusion
-            include MysqlDatetimeValues
+            include SqliteDatetimeValues
             include TriggerColumn
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/presence.rb

@@ -6,10 +6,10 @@ module Mv
       module Builder
         module Trigger
           class Presence < Mv::Core::Validation::Builder::Presence
-            include TriggerColumn 
+            include TriggerColumn
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/{mysql_datetime_values.rb → sqlite_datetime_values.rb}

@@ -3,9 +3,9 @@ module Mv
     module Validation
       module Builder
         module Trigger
-          module MysqlDatetimeValues
+          module SqliteDatetimeValues
             protected
-            
+
             def db_value value
               return "datetime('#{value.strftime('%Y-%m-%d %H:%M:%S')}')" if value.is_a?(DateTime)
               return "datetime('#{value.strftime('%Y-%m-%d %H:%M:%S')}')" if value.is_a?(Time)
@@ -17,4 +17,4 @@ module Mv
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/trigger_column.rb

@@ -5,13 +5,13 @@ module Mv
         module Trigger
          module TriggerColumn
             protected
-            
+
             def column_reference
               "NEW.#{super}"
-            end 
+            end
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/builder/trigger/uniqueness.rb

@@ -6,10 +6,10 @@ module Mv
       module Builder
         module Trigger
           class Uniqueness < Mv::Core::Validation::Builder::Uniqueness
-            include TriggerColumn 
+            include TriggerColumn
           end
         end
       end
     end
   end
-end
+end

data/lib/mv/sqlite/validation/format.rb

@@ -0,0 +1,23 @@
+module Mv
+  module Sqlite
+    module Validation
+      class Format < Mv::Core::Validation::Base
+        attr_reader :with
+
+        validates :with, presence: true
+
+        def initialize(table_name, column_name, opts)
+          opts = { with: opts } unless opts.is_a?(Hash)
+
+          super(table_name, column_name, opts)
+
+          @with = opts.with_indifferent_access[:with]
+        end
+
+        def to_a
+          super + [with.to_s]
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mv-sqlite
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Valeriy Prokopchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -123,15 +123,20 @@ files:
 - lib/mv/sqlite/constraint/builder/trigger.rb
 - lib/mv/sqlite/loader.rb
 - lib/mv/sqlite/railtie.rb
+- lib/mv/sqlite/services/create_regexp_function.rb
+- lib/mv/sqlite/validation/active_model_presenter/format.rb
+- lib/mv/sqlite/validation/builder/format.rb
 - lib/mv/sqlite/validation/builder/trigger/absence.rb
 - lib/mv/sqlite/validation/builder/trigger/custom.rb
 - lib/mv/sqlite/validation/builder/trigger/exclusion.rb
+- lib/mv/sqlite/validation/builder/trigger/format.rb
 - lib/mv/sqlite/validation/builder/trigger/inclusion.rb
 - lib/mv/sqlite/validation/builder/trigger/length.rb
-- lib/mv/sqlite/validation/builder/trigger/mysql_datetime_values.rb
 - lib/mv/sqlite/validation/builder/trigger/presence.rb
+- lib/mv/sqlite/validation/builder/trigger/sqlite_datetime_values.rb
 - lib/mv/sqlite/validation/builder/trigger/trigger_column.rb
 - lib/mv/sqlite/validation/builder/trigger/uniqueness.rb
+- lib/mv/sqlite/validation/format.rb
 homepage: http://github.com/vprokopchuk256/mv-sqlite
 licenses:
 - MIT