mask_validator 0.2.1 → 0.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4ec0a58857f3b750976639d4ccda2754bcf206b4
+  data.tar.gz: 846416f9ca4910ec2711f25453b484b8a4325e2e
+SHA512:
+  metadata.gz: 19e048a911fef5c795cc095cf5d2671b765fcd2dec7a68042b68951b7b952405d2987ca7cf47d31c9eeddedad88bfacd57ab7679a389e98e364a5d00fc8011a4
+  data.tar.gz: 7dc0f0d78e199420c5e75bf5833d0697be55f22ff7666c9827392e85e6cb33b15e64ad6568f4601e4f1a8ba36e73cdb37384487f8f10666fc52e52185e4eb011

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
 .bundle
-Gemfile.lock
 pkg/*
 .rvmrc

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.9
+  - 2.0
+  - 2.1

data/Gemfile

@@ -4,5 +4,6 @@ gemspec
 
 group :test do
   gem "rspec"
+  gem "rake"
   gem "sqlite3"
 end

data/Gemfile.lock

@@ -0,0 +1,55 @@
+PATH
+  remote: .
+  specs:
+    mask_validator (0.2.1)
+      activemodel (>= 3.0)
+      activerecord (>= 3.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (4.2.0)
+      activesupport (= 4.2.0)
+      builder (~> 3.1)
+    activerecord (4.2.0)
+      activemodel (= 4.2.0)
+      activesupport (= 4.2.0)
+      arel (~> 6.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    arel (6.0.0)
+    builder (3.2.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    json (1.8.1)
+    minitest (5.5.0)
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    sqlite3 (1.3.10)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  mask_validator!
+  rake
+  rspec
+  sqlite3

data/README.markdown

@@ -1,33 +1,45 @@
-# MaskValidator
+# Mask Validator
 
-This gem was inspired in the Sobrinho's gems to validate simple things inside of ActiveModel.
+[![Gem Version](https://badge.fury.io/rb/mask_validator.png)](http://badge.fury.io/rb/mask_validator)
 
-Use mask in inputs and validate in the models.
+This gem was inspired in the Sobrinho's gems to validate simple things inside of ActiveModel.
 
-The gem works getting the value before type cast and comparing with a regexp from the mask pattern.
+The gem works getting the value before type cast and comparing with a regular expression from the parse of mask pattern.
 
 ## Installation
 
-Use the github version until a really stable version be released.
+Put `gem "mask_validator", "0.2.1"` in the Gemfile
 
-`gem "mask_validator", :git => "git://github.com/MarceloCajueiro/mask_validator.git"`
+## Usage
 
-## Usage:
+```ruby
+validates :phone, :mask => "(99) 9999-9999"
 
-`validates :phone, mask: "(99) 9999-9999"`
+validates :acronym, :mask => "***"
 
-`validates :acronym, mask: "***"`
+validates :acronym, :mask => :custom_method
 
-`validates :acronym, mask: :custom_method`
+validates :acronym, :mask => Proc.new { |o| o.custom_method }
+```
 
-`validates :acronym, mask: Proc.new{|o| o.custom_method}`
-
-* a - Represents an alpha character (A-Z,a-z)
+* a - Represents an alpha character (A-Z, a-z)
 * 9 - Represents a numeric character (0-9)
-* * - Represents an alphanumeric character (A-Z,a-z,0-9)
+* * - Represents an alphanumeric character (A-Z, a-z, 0-9)
 
 For more information about masks in the form inputs check the jquery plugin [Masked input](http://digitalbush.com/projects/masked-input-plugin/)
 
+## Application example
+
+Use a little trick to call the masked input (jquery plugin) only defining the validation in the model.
+
+In other words, defining:
+
+```ruby
+validates :phone, :mask => "(99) 9999-9999"
+```
+
+It is the only necessary thing to apply the masked input.
+
 ## License
 
 Copyright © 2011 Marcelo Cajueiro, released under the MIT license

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler"
 Bundler::GemHelper.install_tasks
+
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+  task :default => :spec
+rescue LoadError
+end

data/changelog.md

@@ -0,0 +1,7 @@
+# Changelog
+
+## 0.2.2
+
+* Sets the default validation message as :invalid. (#6)
+* Update RSpec
+* Add Travis CI

data/lib/mask_validator.rb

@@ -20,7 +20,7 @@ class MaskValidator < ActiveModel::EachValidator
   end
 
   def validate_each(record, attribute, value)
-    value = record.send("#{attribute.to_s}_before_type_cast")
+    value = normalize_value(record, attribute, value)
 
     return if (@allow_nil && value.nil?) || (@allow_blank && value.blank?)
 
@@ -65,6 +65,16 @@ class MaskValidator < ActiveModel::EachValidator
   private
 
   def message
-    options[:message]
+    options[:message] || :invalid
+  end
+
+  def normalize_value(record, attribute, value)
+    attribute_before_type_cast = "#{attribute.to_s}_before_type_cast"
+
+    if record.respond_to?(attribute_before_type_cast)
+      value = record.send(attribute_before_type_cast)
+    end
+
+    value
   end
 end

data/mask_validator.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "mask_validator"
-  s.version     = "0.2.1"
+  s.version     = "0.2.2"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Marcelo Cajueiro"]
   s.email       = ["marcelocajueiro@gmail.com"]

data/spec/mask_validator_spec.rb

@@ -1,187 +1,200 @@
 require 'spec_helper'
 
 describe MaskValidator do
-  subject do
-    Person.new
-  end
+  context 'When class is not an ActiveRecord model' do
+    subject do
+      NoActiveRecordPerson.new
+    end
 
-  # validates :phone, :mask => "(99) 9999-9999", :allow_blank => true
-  context "mask validation to phone" do
     it "should be valid with a phone in according of the mask" do
       subject.phone = '(48) 9874-4569'
-      subject.should have_valid_value_to(:phone)
-    end
-
-    it "should not be valid with a phone with a wrong pattern" do
-      subject.phone = '4852458787'
-      subject.should_not have_valid_value_to(:phone)
-
-      subject.phone = '48 9865 4879'
-      subject.should_not have_valid_value_to(:phone)
-
-      subject.phone = '(48) 9874-45169'
-      subject.should_not have_valid_value_to(:phone)
-
-      subject.phone = '(48)98956698'
-      subject.should_not have_valid_value_to(:phone)
-    end
-  end
-
-  # validates :acronym, :mask => "***", :allow_nil => true
-  context "mask validation to acronym" do
-    it "should be valid with a acronym in according of the mask" do
-      subject.acronym = '1gd'
-      subject.should have_valid_value_to(:acronym)
-
-      subject.acronym = '666'
-      subject.should have_valid_value_to(:acronym)
-
-      subject.acronym = 'zzz'
-      subject.should have_valid_value_to(:acronym)
-    end
-
-    it "should not be valid with a acronym with a wrong pattern" do
-      subject.acronym = '1qw1'
-      subject.should_not have_valid_value_to(:acronym)
+      expect(subject).to have_valid_value_to(:phone)
     end
   end
 
-  # validates :alphanumeric, :mask => "aaa999"
-  context "mask validation to alphanumeric" do
-    it "should be valid with a alphanumeric in according of the mask" do
-      subject.alphanumeric = 'awe987'
-      subject.should have_valid_value_to(:alphanumeric)
+  context 'When class is an ActiveRecord model' do
+    subject do
+      Person.new
     end
 
-    it "should not be valid with a alphanumeric with a wrong pattern" do
-      subject.alphanumeric = '999999'
-      subject.should_not have_valid_value_to(:alphanumeric)
+    # validates :phone, :mask => "(99) 9999-9999", :allow_blank => true
+    context "mask validation to phone" do
+      it "should be valid with a phone in according of the mask" do
+        subject.phone = '(48) 9874-4569'
+        expect(subject).to have_valid_value_to(:phone)
+      end
 
-      subject.alphanumeric = 'QQQQQQ'
-      subject.should_not have_valid_value_to(:alphanumeric)
+      it "should not be valid with a phone with a wrong pattern" do
+        subject.phone = '4852458787'
+        expect(subject).to_not have_valid_value_to(:phone)
 
-      subject.alphanumeric = '666aaaa'
-      subject.should_not have_valid_value_to(:alphanumeric)
+        subject.phone = '48 9865 4879'
+        expect(subject).to_not have_valid_value_to(:phone)
 
-      subject.alphanumeric = '666AAA'
-      subject.should_not have_valid_value_to(:alphanumeric)
-    end
-  end
+        subject.phone = '(48) 9874-45169'
+        expect(subject).to_not have_valid_value_to(:phone)
 
-  context "when the attributes type is not a string" do
-    it "should not be valid with a wrong date format" do
-      subject.birth_date = "15-12-2009"
-      subject.should_not have_valid_value_to(:birth_date)
+        subject.phone = '(48)98956698'
+        expect(subject).to_not have_valid_value_to(:phone)
+      end
     end
 
-    it "should not be valid with a wrong birth year" do
-      subject.birth_year = 20110
-      subject.should_not have_valid_value_to(:birth_year)
-    end
+    # validates :acronym, :mask => "***", :allow_nil => true
+    context "mask validation to acronym" do
+      it "should be valid with a acronym in according of the mask" do
+        subject.acronym = '1gd'
+        expect(subject).to have_valid_value_to(:acronym)
 
-    it "should not be valid with a wrong birth time" do
-      subject.birth_time = "333:20"
-      subject.should_not have_valid_value_to(:birth_time)
-    end
+        subject.acronym = '666'
+        expect(subject).to have_valid_value_to(:acronym)
 
-    it "should not be valid with a wrong body fat" do
-      subject.body_fat = 333.00
-      subject.should_not have_valid_value_to(:body_fat)
-    end
-  end
+        subject.acronym = 'zzz'
+        expect(subject).to have_valid_value_to(:acronym)
+      end
 
-  # validates :custom, :mask => :custom_mask, :allow_blank => false
-  context "mask validation to custom field using custom_mask method" do
-    it "should be valid with an correct custom value" do
-      subject.stub!(:custom_mask => "99999-999")
-      subject.custom = '32632-567'
-      subject.should have_valid_value_to(:custom)
+      it "should not be valid with a acronym with a wrong pattern" do
+        subject.acronym = '1qw1'
+        expect(subject).to_not have_valid_value_to(:acronym)
+      end
     end
 
-    it "should not be valid with an empty custom value" do
-      subject.stub!(:custom_mask => "9.9.9")
-      subject.custom = ''
-      subject.should_not have_valid_value_to(:custom)
-    end
-  end
+    # validates :alphanumeric, :mask => "aaa999"
+    context "mask validation to alphanumeric" do
+      it "should be valid with a alphanumeric in according of the mask" do
+        subject.alphanumeric = 'awe987'
+        expect(subject).to have_valid_value_to(:alphanumeric)
+      end
 
-  # validates :identification, :mask => Proc.new{|o| o.proc_mask}, :allow_blank => false
-  context "mask validation to proc field using a Proc" do
-    it "should be valid with an correct value" do
-      subject.stub!(:proc_mask => "999.9.99")
-      subject.identification = '326.3.67'
-      subject.should have_valid_value_to(:identification)
-    end
+      it "should not be valid with a alphanumeric with a wrong pattern" do
+        subject.alphanumeric = '999999'
+        expect(subject).to_not have_valid_value_to(:alphanumeric)
+
+        subject.alphanumeric = 'QQQQQQ'
+        expect(subject).to_not have_valid_value_to(:alphanumeric)
 
-    it "should not be valid with an empty value" do
-      subject.stub!(:prock_mask => "9.9.9")
-      subject.identification = ''
-      subject.should_not have_valid_value_to(:identification)
-    end
-  end
-
-  # validates :phone, :mask => "99999-999", :allow_blank => true
-  context "mask validation to phone with explicit ':allow_blank => true'" do
-    it "should not be valid with an nil phone" do
-      subject.phone = nil
-      subject.should have_valid_value_to(:phone)
-    end
-
-    it "should be valid with an empty phone" do
-      subject.phone = ''
-      subject.should have_valid_value_to(:phone)
-    end
-  end
-
-  # validates :acronym, :mask => "***", :allow_nil => true
-  context "mask validation to acronym with explicit ':allow_nil => true'" do
-    it "should be valid with an nil acronym" do
-      subject.acronym = nil
-      subject.should have_valid_value_to(:acronym)
-    end
-
-    it "should be valid with an empty acronym" do
-      subject.acronym = ''
-      subject.should_not have_valid_value_to(:acronym)
-    end
-  end
-
-  # validates :fax, :mask => "(99) 9999-9999", :allow_nil => false
-  context "mask validation to fax with explicit ':allow_nil => false'" do
-    it "should not be valid with an nil fax" do
-      subject.fax = nil
-      subject.should_not have_valid_value_to(:fax)
-    end
-
-    it "should be valid with an empty fax" do
-      subject.fax = ''
-      subject.should_not have_valid_value_to(:fax)
-    end
-  end
-
-  # validates :zip_code, :mask => "99999-999", :allow_blank => false
-  context "mask validation to zip_code with explicit ':allow_blank => false'" do
-    it "should not be valid with an nil zip_code" do
-      subject.zip_code = nil
-      subject.should_not have_valid_value_to(:zip_code)
-    end
-
-    it "should be valid with an empty zip_code" do
-      subject.zip_code = ''
-      subject.should_not have_valid_value_to(:zip_code)
-    end
-  end
-
-  # validates :birth_date, :mask => '99/99/9999'
-  context "mask validation to birth_date with implicit ':allow_blank => false'" do
-    it "should not be valid with an nil birth_date" do
-      subject.birth_date = nil
-      subject.should_not have_valid_value_to(:birth_date)
-    end
+        subject.alphanumeric = '666aaaa'
+        expect(subject).to_not have_valid_value_to(:alphanumeric)
+
+        subject.alphanumeric = '666AAA'
+        expect(subject).to_not have_valid_value_to(:alphanumeric)
+      end
+    end
+
+    context "when the attributes type is not a string" do
+      it "should not be valid with a wrong date format" do
+        subject.birth_date = "15-12-2009"
+        expect(subject).to_not have_valid_value_to(:birth_date)
+      end
 
-    it "should be valid with an empty birth_date" do
-      subject.birth_date = ''
-      subject.should_not have_valid_value_to(:birth_date)
+      it "should not be valid with a wrong birth year" do
+        subject.birth_year = 20110
+        expect(subject).to_not have_valid_value_to(:birth_year)
+      end
+
+      it "should not be valid with a wrong birth time" do
+        subject.birth_time = "333:20"
+        expect(subject).to_not have_valid_value_to(:birth_time)
+      end
+
+      it "should not be valid with a wrong body fat" do
+        subject.body_fat = 333.00
+        expect(subject).to_not have_valid_value_to(:body_fat)
+      end
+    end
+
+    # validates :custom, :mask => :custom_mask, :allow_blank => false
+    context "mask validation to custom field using custom_mask method" do
+      it "should be valid with an correct custom value" do
+        allow(subject).to receive(:custom_mask).and_return("99999-999")
+        subject.custom = '32632-567'
+        expect(subject).to have_valid_value_to(:custom)
+      end
+
+      it "should not be valid with an empty custom value" do
+        allow(subject).to receive(:custom_mask).and_return("9.9.9")
+        subject.custom = ''
+        expect(subject).to_not have_valid_value_to(:custom)
+      end
+    end
+
+    # validates :identification, :mask => Proc.new{|o| o.proc_mask}, :allow_blank => false
+    context "mask validation to proc field using a Proc" do
+      it "should be valid with an correct value" do
+        allow(subject).to receive(:proc_mask).and_return("999.9.99")
+        subject.identification = '326.3.67'
+        expect(subject).to have_valid_value_to(:identification)
+      end
+
+      it "should not be valid with an empty value" do
+        allow(subject).to receive(:proc_mask).and_return("9.9.9")
+        subject.identification = ''
+        expect(subject).to_not have_valid_value_to(:identification)
+      end
+    end
+
+    # validates :phone, :mask => "99999-999", :allow_blank => true
+    context "mask validation to phone with explicit ':allow_blank => true'" do
+      it "should not be valid with an nil phone" do
+        subject.phone = nil
+        expect(subject).to have_valid_value_to(:phone)
+      end
+
+      it "should be valid with an empty phone" do
+        subject.phone = ''
+        expect(subject).to have_valid_value_to(:phone)
+      end
+    end
+
+    # validates :acronym, :mask => "***", :allow_nil => true
+    context "mask validation to acronym with explicit ':allow_nil => true'" do
+      it "should be valid with an nil acronym" do
+        subject.acronym = nil
+        expect(subject).to have_valid_value_to(:acronym)
+      end
+
+      it "should be valid with an empty acronym" do
+        subject.acronym = ''
+        expect(subject).to_not have_valid_value_to(:acronym)
+      end
+    end
+
+    # validates :fax, :mask => "(99) 9999-9999", :allow_nil => false
+    context "mask validation to fax with explicit ':allow_nil => false'" do
+      it "should not be valid with an nil fax" do
+        subject.fax = nil
+        expect(subject).to_not have_valid_value_to(:fax)
+      end
+
+      it "should be valid with an empty fax" do
+        subject.fax = ''
+        expect(subject).to_not have_valid_value_to(:fax)
+      end
+    end
+
+    # validates :zip_code, :mask => "99999-999", :allow_blank => false
+    context "mask validation to zip_code with explicit ':allow_blank => false'" do
+      it "should not be valid with an nil zip_code" do
+        subject.zip_code = nil
+        expect(subject).to_not have_valid_value_to(:zip_code)
+      end
+
+      it "should be valid with an empty zip_code" do
+        subject.zip_code = ''
+        expect(subject).to_not have_valid_value_to(:zip_code)
+      end
+    end
+
+    # validates :birth_date, :mask => '99/99/9999'
+    context "mask validation to birth_date with implicit ':allow_blank => false'" do
+      it "should not be valid with an nil birth_date" do
+        subject.birth_date = nil
+        expect(subject).to_not have_valid_value_to(:birth_date)
+      end
+
+      it "should be valid with an empty birth_date" do
+        subject.birth_date = ''
+        expect(subject).to_not have_valid_value_to(:birth_date)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'mask_validator'
 
 require "support/db/schema"
 require "support/models/person"
+require "support/models/no_active_record_person"
 
 RSpec::Matchers.define :have_valid_value_to do |attribute|
   match do |actual|
@@ -13,11 +14,11 @@ RSpec::Matchers.define :have_valid_value_to do |attribute|
     !actual.errors[attribute].include?("is invalid")
   end
 
-  failure_message_for_should do |actual|
+  failure_message do |actual|
     "expected that the #{attribute} attribute would be valid"
   end
 
-  failure_message_for_should_not do |actual|
+  failure_message_when_negated do |actual|
     "expected that the #{attribute} attribute would be invalid"
   end
 end

data/spec/support/models/no_active_record_person.rb

@@ -0,0 +1,7 @@
+class NoActiveRecordPerson
+  include ActiveModel::Validations
+
+  attr_accessor :phone
+
+  validates :phone, :mask => "(99) 9999-9999", :allow_blank => true
+end

metadata

@@ -1,49 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: mask_validator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 0.2.2
 platform: ruby
 authors:
 - Marcelo Cajueiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70113695766940 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113695766940
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70113695766380 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113695766380
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70113695765640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70113695765640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: 
 email:
 - marcelocajueiro@gmail.com
@@ -51,47 +59,50 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
+- changelog.md
 - lib/mask_validator.rb
 - mask_validator.gemspec
 - spec/mask_validator_spec.rb
 - spec/models/person.rb
 - spec/spec_helper.rb
 - spec/support/db/schema.rb
+- spec/support/models/no_active_record_person.rb
 - spec/support/models/person.rb
 homepage: https://github.com/marcelocajueiro/mask_validator
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: mask_validator
-rubygems_version: 1.8.17
+rubygems_version: 2.4.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Input Mask validation for ActiveModel
 test_files:
 - spec/mask_validator_spec.rb
 - spec/models/person.rb
 - spec/spec_helper.rb
 - spec/support/db/schema.rb
+- spec/support/models/no_active_record_person.rb
 - spec/support/models/person.rb
-has_rdoc: