format_validators 0.0.5 → 0.0.6

data/CHANGELOG

@@ -1,5 +1,10 @@
 == unreleased changes
 
+== 0.0.6
+
+* Added devise password validator
+* Updated the currency validator with strict option
+
 == 0.0.5
 
 * Added a zip code format validator and tests

data/README.rdoc

@@ -10,9 +10,13 @@ A consolidation of a few of the most common validations.
 * Social Security Number
 * ZIP code
 
+== Bundler
+
+  gem "format_validators"
+
 == Install
 
-    gem install format_validators
+  gem install format_validators    
 
 == Examples:
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/validators/currency_format_validator.rb

@@ -1,7 +1,12 @@
 class CurrencyFormatValidator < ActiveModel::EachValidator
   def validate_each record, attribute, value
-    format = /^\d+(\.\d{2})?$/
+    strict_mode = options[:strict] || false
+    
+    format = /^\d*+(\.\d{1,2})?$/
+    # Strict: requires leading number and exactly two decimals, 1.45
+    format = /^\d+(\.\d{2})?$/ if strict_mode
+    
     message = attribute.to_s.humanize + " must contain dollars and cents, seperated by a period"
-    record.errors[attribute] << (options[:message] || message) unless value =~ format
+    record.errors[attribute] << (options[:message] || message) unless value.to_s =~ format
   end
 end

data/app/validators/devise_password_validator.rb

@@ -0,0 +1,21 @@
+# Used on a device user model to remove password checks when updating the user model.
+# Passwords are not needed unless the user is a new record or the reset password token is present
+#
+# A model using this validation must include a password, password_confirmation, and rest_password_token fields.
+class DevisePasswordValidator < ActiveModel::EachValidator  
+
+  def validate_each record, attribute, value
+    if (record.password.blank? || record.password_confirmation.blank?) && (record.id.blank? || (!record.id.blank? && !record.reset_password_token.blank?))
+      record.errors[:password] << "is required"
+    elsif (!record.password.blank? || !record.password_confirmation.blank?) && record.password_confirmation != record.password
+      record.errors[:password] << "does not match Password Confirmation"
+      record.errors[:password_confirmation] = nil
+    elsif (!record.password.blank? || !record.password_confirmation.blank?) && record.password.length < 6
+      record.errors[:password] << "must be longer than 6 characters"
+    elsif record.password
+      if (record.password.include?(' ') || record.password_confirmation.include?(' '))
+        record.errors[:password] << 'cannot include spaces' 
+      end
+    end
+  end
+end

data/format_validators.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "format_validators"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremiah Hemphill"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "app/validators/currency_format_validator.rb",
     "app/validators/days_of_week_validator.rb",
+    "app/validators/devise_password_validator.rb",
     "app/validators/florida_counties_validator.rb",
     "app/validators/phone_format_validator.rb",
     "app/validators/ssn_format_validator.rb",
@@ -77,6 +78,7 @@ Gem::Specification.new do |s|
     "spec/support/basic_record.rb",
     "spec/validators/currency_format_validator_spec.rb",
     "spec/validators/days_of_week_validator_spec.rb",
+    "spec/validators/devise_password_validator_spec.rb",
     "spec/validators/florida_counties_integration_spec.rb",
     "spec/validators/florida_counties_spec.rb",
     "spec/validators/phone_format_validator_spec.rb",

data/spec/validators/currency_format_validator_spec.rb

@@ -1,51 +1,61 @@
 require 'spec_helper'
 
 describe CurrencyFormatValidator do
-  describe ".validate_each" do
-    before(:each) do
-      @options = {:attributes => {}}
-      @validator = CurrencyFormatValidator.new(@options)
-      @record = BasicRecord.new(:cost)
-    end
-
-    it "should validate the format for ###.##" do
-      @record.errors[:cost].should_not_receive("<<")
-      @validator.validate_each(@record, :cost, "123.45")
-    end
-
-    it "should validate the format for ##.##" do
-      @record.errors[:cost].should_not_receive("<<")
-      @validator.validate_each(@record, :cost, "23.45")
-    end
-
-    it "should validate the format for 0.##" do
-      @record.errors[:cost].should_not_receive("<<")
-      @validator.validate_each(@record, :cost, "0.45")
-    end
-
-    it "should validate the format for ##" do
-      @record.errors[:cost].should_not_receive("<<")
-      @validator.validate_each(@record, :cost, "45")
-    end
-
-    it "should not validate the format for #.#.#" do
-      @record.errors[:cost].should_receive("<<")
-      @validator.validate_each(@record, :cost, "4.5.6")
-    end
-
-    it "should not validate the format for string" do
-      @record.errors[:cost].should_receive("<<")
-      @validator.validate_each(@record, :cost, "word")
-    end
-
-    it "should not validate the format for #.#" do
-      @record.errors[:cost].should_receive("<<")
-      @validator.validate_each(@record, :cost, "1.2")
-    end
+  before :each do
+    @validator = CurrencyFormatValidator.new attributes: {}
+    @mock = mock
+    @mock.stub!(:errors).and_return([])
+    @mock.errors.stub!(:[]).and_return({})
+    @mock.errors[].stub!(:<<)
+  end
+  
+  subject { @validator }
+  
+  # Correct data yields no errors!
+  context 'with perfectly valid, correctly-formatted input should produce no errors' do
+    before { @mock.should_not_receive :errors }
+    it { subject.validate_each @mock, 'date', '123.45' }
+    it { subject.validate_each @mock, 'date', '23.45' }
+    it { subject.validate_each @mock, 'date', '0.45' }
+    it { subject.validate_each @mock, 'date', '.45' }
+    it { subject.validate_each @mock, 'date', '.4' }
+    it { subject.validate_each @mock, 'date', '4' }
+  end
 
-    it "should not validate the format for .##" do
-      @record.errors[:cost].should_receive("<<")
-      @validator.validate_each(@record, :cost, ".99")
+  # Incorrect data yields errors!
+  context 'with invalid input should produce a validation error' do
+    before { @mock.errors[].should_receive :<< }
+    it { subject.validate_each @mock, 'date', '23.456' }
+    it { subject.validate_each @mock, 'date', 'two' }
+    it { subject.validate_each @mock, 'date', '23..456' }
+    it { subject.validate_each @mock, 'date', '23.45.6' }
+    it { subject.validate_each @mock, 'date', '.234' }
+  end
+  
+  context 'in strict mode' do
+    before :each do
+      @validator = CurrencyFormatValidator.new attributes: {}, strict: true
+    end
+    subject { @validator }
+    context 'with perfectly valid, correctly-formatted input should produce no errors' do
+      before { @mock.should_not_receive :errors }
+      it { subject.validate_each @mock, 'date', '123.45' }
+      it { subject.validate_each @mock, 'date', '23.45' }
+      it { subject.validate_each @mock, 'date', '0.45' }
+      it { subject.validate_each @mock, 'date', '4' }
+    end
+
+    context 'with invalid input should produce a validation error' do
+      before { @mock.errors[].should_receive :<< }
+      it { subject.validate_each @mock, 'date', '.45' }
+      it { subject.validate_each @mock, 'date', '.4' }
+      it { subject.validate_each @mock, 'date', '0.4' }
+      it { subject.validate_each @mock, 'date', '23.456' }
+      it { subject.validate_each @mock, 'date', 'two' }
+      it { subject.validate_each @mock, 'date', '23..456' }
+      it { subject.validate_each @mock, 'date', '23.45.6' }
+      it { subject.validate_each @mock, 'date', '.234' }
     end
   end
+
 end

data/spec/validators/devise_password_validator_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe DevisePasswordValidator do
+  describe ".validate_each" do
+    before(:each) do
+      @options = {:attributes => {}}
+      @validator = DevisePasswordValidator.new(@options)
+      @record = BasicRecord.new(:password)
+      @record.stub!(:password)
+      @record.stub!(:password_confirmation)
+      @record.stub!(:id)
+      @record.stub!(:reset_password_token)
+    end
+
+    it "should validate a password of at least 6 characters, no spaces, and password is not being reset" do
+      @record.errors[:password].should_not_receive("<<")
+      @record.stub!(:password).and_return("goodpa")
+      @record.stub!(:password_confirmation).and_return("goodpa")
+      @validator.validate_each(@record, :password, "goodpa")
+    end
+
+    it "should not validate if password is not at least 6 characters" do
+      @record.errors[:password].should_receive("<<")
+      @record.stub!(:password).and_return("badpa")
+      @record.stub!(:password_confirmation).and_return "badpa"
+      @validator.validate_each(@record, :password, "badpa")
+    end
+    
+    it "should not validate if password has a space" do
+      @record.errors[:password].should_receive("<<")
+      @record.stub!(:password).and_return "bad pass"
+      @record.stub!(:password_confirmation).and_return "bad pass"
+      @validator.validate_each(@record, :password, "bad pass")
+    end
+    
+    it "should not validate if password does not match password confirmation" do
+      @record.errors[:password].should_receive("<<")
+      @record.stub!(:password).and_return "goodpa"
+      @record.stub!(:password_confirmation).and_return "goodpa2"
+      @validator.validate_each(@record, :password, "goodpa")
+    end
+    
+    it "should not validate if password is blank and the record has no id" do
+      @record.errors[:password].should_receive("<<")
+      @record.stub!(:password).and_return ""
+      @record.stub!(:password_confirmation).and_return ""
+      @validator.validate_each(@record, :password, "")
+    end
+    
+    it "should validate if password is blank and the record has an id and the reset token is blank" do
+      @record.errors[:password].should_not_receive("<<")
+      @record.stub!(:password).and_return ""
+      @record.stub!(:id).and_return "1"
+      @record.stub!(:password_confirmation).and_return ""
+      @validator.validate_each(@record, :password, "")
+    end
+    
+    it "should not validate if password is blank and the record has an id and the reset token is not blank" do
+      @record.errors[:password].should_receive("<<")
+      @record.stub!(:password).and_return ""
+      @record.stub!(:id).and_return "1"
+      @record.stub!(:reset_password_token).and_return "alhbasdhkhlb"
+      @record.stub!(:password_confirmation).and_return ""
+      @validator.validate_each(@record, :password, "")
+    end
+
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: format_validators
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Jeremiah Hemphill
@@ -165,6 +165,7 @@ files:
 - VERSION
 - app/validators/currency_format_validator.rb
 - app/validators/days_of_week_validator.rb
+- app/validators/devise_password_validator.rb
 - app/validators/florida_counties_validator.rb
 - app/validators/phone_format_validator.rb
 - app/validators/ssn_format_validator.rb
@@ -214,6 +215,7 @@ files:
 - spec/support/basic_record.rb
 - spec/validators/currency_format_validator_spec.rb
 - spec/validators/days_of_week_validator_spec.rb
+- spec/validators/devise_password_validator_spec.rb
 - spec/validators/florida_counties_integration_spec.rb
 - spec/validators/florida_counties_spec.rb
 - spec/validators/phone_format_validator_spec.rb
@@ -232,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2589333216613871779
+      hash: 26858958529201011
       segments: 
       - 0
       version: "0"