bootstrap_validator_rails 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b17862e74b5e1c1355c9aa5ebdae80fb381ae678
-  data.tar.gz: fc1b2bd5ace082b231d75165ee595e10e405ffc9
+  metadata.gz: 7ae22852750f242da2de0062599a44d2752b675b
+  data.tar.gz: 87639383c0e9a58bb2410fa0f7bcc8ed801e7de4
 SHA512:
-  metadata.gz: 56aaaf7418e3425c51f7d557339f61b4061de5535d98397ef2731c708b1773d10e334bedc734bc5122e4bbbba7a45386321e8477f504223b1368d3c96590b148
-  data.tar.gz: 46e5dc18dfac83026daad8cb52837ff76ac28089b0c0aded8636fbfcd8abc4f5b6f6572c4b8a8d865d310c640a573a1e87db473eff43c80f099ed29c719fd2ce
+  metadata.gz: 106154f8749865080587a64328cbd05d5f3b55fba277a3df42d76dc381796210606cd2ad3a6edb8c91df3a813834d41bcd42f85a75cec85e01fbf045aec18535
+  data.tar.gz: 9cc0a295cc85cbf939a7014dbcca71556007509d42a02dff4699e6a3fdbe0f09e8e43b72fb920666ac213f7f0cc26e8963b65fe23ca4ddb1f39845c80082d678

data/lib/bootstrap_validator_rails.rb

@@ -1,8 +1,10 @@
 require 'bootstrap_validator_rails/engine'
 require 'bootstrap_validator_rails/form_builder'
 require 'bootstrap_validator_rails/helper'
+require 'bootstrap_validator_rails/configuration'
 require 'bootstrap_validator_rails/validators/attributes'
 require 'bootstrap_validator_rails/validators/generator'
+require 'bootstrap_validator_rails/validators/validator'
 require 'bootstrap_validator_rails/validators/presence_validator'
 require 'bootstrap_validator_rails/validators/numericality_validator'
 require 'bootstrap_validator_rails/validators/length_validator'

data/lib/bootstrap_validator_rails/configuration.rb

@@ -0,0 +1,5 @@
+module BootstrapValidatorRails
+  CONFIGURATION = {
+    :unsupported_options => [:if, :unless]
+  }
+end

data/lib/bootstrap_validator_rails/validators/format_validator.rb

@@ -6,14 +6,13 @@ end
 
 module BootstrapValidatorRails
   module Validators
-    class Format
-      def initialize(record, method, validator)
-        @record, @method, @validator = record, method, validator
-      end
-
+    class Format < Validator
       def generate_data
         data = {}
-        options = @validator.options
+        return data if unsupported?
+        
+        options = validator_options
+
         regex = options[:with].to_javascript
         regex.sub!('/^', '^')
         regex.sub!('$/', '$')

data/lib/bootstrap_validator_rails/validators/length_validator.rb

@@ -1,14 +1,12 @@
 module BootstrapValidatorRails
   module Validators
-    class Length
-      def initialize(record, method, validator)
-        @record, @method, @validator = record, method, validator
-      end
-
+    class Length < Validator
       def generate_data
         data = {}
-        options = @validator.options
+        return data if unsupported?
         
+        options = validator_options
+
         data[:bv_stringlength] = 'true'
 
         if options[:minimum]

data/lib/bootstrap_validator_rails/validators/numericality_validator.rb

@@ -1,15 +1,14 @@
 module BootstrapValidatorRails
   module Validators
-    class Numericality 
-      def initialize(record, method, validator)
-        @record, @method, @validator = record, method, validator
-      end
-
+    class Numericality < Validator
       def generate_data
-        data = {
-          :bv_numeric => 'true',
-          :bv_numeric_separator => '.',
-        }
+        data = {}
+        return data if unsupported?
+        
+        options = validator_options
+
+        data[:bv_numeric] = 'true'
+        data[:bv_numeric_separator] = '.'
         
         data.merge(generate_options)
       end

data/lib/bootstrap_validator_rails/validators/presence_validator.rb

@@ -1,12 +1,10 @@
 module BootstrapValidatorRails
   module Validators
-    class Presence
-      def initialize(record, method, validator)
-        @record, @method, @validator = record, method, @validator
-      end
-
+    class Presence < Validator
       def generate_data
         data = {}
+        return data if unsupported?
+
         data[:bv_notempty] = 'true'
         data[:bv_notempty_message] = generate_message
         data

data/lib/bootstrap_validator_rails/validators/validator.rb

@@ -0,0 +1,24 @@
+module BootstrapValidatorRails
+  module Validators
+    class Validator
+      def initialize(record, method, validator)
+        @record, @method, @validator = record, method, validator
+      end
+
+      def validator_options
+        options = @validator.try(:options) 
+        options || {}
+      end
+
+      def unsupported?
+        options = validator_options
+        unsupported_options.any? { |opt| options.has_key? opt }
+      end
+
+      protected
+      def unsupported_options
+        BootstrapValidatorRails::CONFIGURATION[:unsupported_options]
+      end
+    end
+  end
+end

data/lib/bootstrap_validator_rails/version.rb

@@ -1,3 +1,3 @@
 module BootstrapValidatorRails
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/test/dummy/app/models/post.rb

@@ -1,4 +1,5 @@
 class Post < ActiveRecord::Base
   validates :title, presence: true, length: {within: 20..50}, numericality: {greater_than_or_equal_to: 20}
   validates :title, format: { with: /\A[a-zA-Z]+\z/, message: "only allows letters" }
+  validates :intro, presence: true, if: :published?
 end

data/test/dummy/db/migrate/20140723124112_create_posts.rb

@@ -2,6 +2,7 @@ class CreatePosts < ActiveRecord::Migration
   def change
     create_table :posts do |t|
       t.string :title
+      t.string :intro
     end
   end
 end

data/test/dummy/db/schema.rb

@@ -15,6 +15,7 @@ ActiveRecord::Schema.define(version: 20140723124112) do
 
   create_table "posts", force: true do |t|
     t.string "title"
+    t.string "intro"
   end
 
 end

data/test/dummy/log/test.log

@@ -2089,3 +2089,280 @@ BootstrapValidatorRailsTest: test_test_will_be_included_later
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.5ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+   (1.5ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.5ms)  select sqlite_version(*)
+   (1.5ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreatePosts (20140723124112)
+   (0.1ms)  begin transaction
+   (0.6ms)  CREATE TABLE "posts" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar(255), "intro" varchar(255)) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20140723124112"]]
+   (0.9ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (7.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+-------------------------------------------------------------
+BootstrapValidatorRailsTest: test_test_will_be_included_later
+-------------------------------------------------------------
+   (0.1ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (7.7ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_validator_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - huynhquancam
@@ -28,14 +28,14 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -91,6 +91,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - lib/bootstrap_validator_rails.rb
+- lib/bootstrap_validator_rails/configuration.rb
 - lib/bootstrap_validator_rails/engine.rb
 - lib/bootstrap_validator_rails/form_builder.rb
 - lib/bootstrap_validator_rails/helper.rb
@@ -100,6 +101,7 @@ files:
 - lib/bootstrap_validator_rails/validators/length_validator.rb
 - lib/bootstrap_validator_rails/validators/numericality_validator.rb
 - lib/bootstrap_validator_rails/validators/presence_validator.rb
+- lib/bootstrap_validator_rails/validators/validator.rb
 - lib/bootstrap_validator_rails/version.rb
 - lib/tasks/bootstrap_validator_rails_tasks.rake
 - test/bootstrap_validator_rails_test.rb