validates_formatting_of 0.7.1 → 0.7.2

data/.travis.yml

@@ -2,6 +2,6 @@ script: bundle exec rspec spec
 rvm:
   - 1.9.2
   - 1.9.3
-  - rbx
-  - jruby
-  - ruby-head
+  - 2.0.0
+  - rbx-19mode
+  - jruby-19mode

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v0.7.2
+
+* Bugfix: Changed \Z to \z anchor and added some test assertions. Not valid with newline in some formats
+
+## v0.7.1
+
+* Removed :ip_address ArgumentError. Already fails since it is missing
+
 ## v0.7.0
 
 * Removed :ip_address validation method

data/README.markdown

@@ -189,12 +189,12 @@ end
 
 # Development and Contribution
 
-To add a simple regex validation, all that is necessary is to add a single line to the `Method` module in the `lib/method.rb` file (with a line or two of documentation explaining it's use).
+To add a simple regex validation, all that is necessary is to add a single line to the `ValidatesFormattingOf::Method` module in the `lib/method.rb` file (with a line or two of documentation explaining it's use).
 
 For example:
 
 ```ruby
-module Method
+module ValidatesFormattingOf::Method
   # This :validation_name method is for example purposes only.
   # You can use this in production, but it would require a value of 'example regex' to pass.
   add :validation_name, %r{example regex}iux, "is a message for validation method :validation_name"

data/lib/validates_formatting_of/method.rb

@@ -7,16 +7,16 @@ module ValidatesFormattingOf
     extend ValidationAddition
 
     # This method is very close to allowing what is specified in RFC 5322 and RFC 5321
-    add :email, %r{\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\Z}i, "is not a valid email"
+    add :email, %r{\A([^@\s]+)@((?:(?!-)[-a-z0-9]+(?<!-)\.)+[a-z]{2,})\z}i, "is not a valid email"
 
     # Thie version of the email exists to support common validation libraries (such
     # as client_side_validations) that require access to Rails' validation. Look-behinds
     # are not supported in javascript.
-    add :simple_email, %r{\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z}i, "is not a valid email"
+    add :simple_email, %r{\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z}i, "is not a valid email"
 
     # Taken from Ryan Bates' screencast on extracting gems. Works extremely well. Thanks Ryan!
     # (slightly revised to work on MRI 1.8.7 and ree)
-    add :url, %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\Z}i, "is not a valid URL"
+    add :url, %r{\Ahttps?:\/\/([^\s:@]+:[^\s:@]*@)?[A-Za-z\d\-]+(\.[A-Za-z\d\-]+)+\.?(:\d{1,5})?([\/?]\S*)?\z}i, "is not a valid URL"
 
     # No numbers of symbols. allows "-"
     add :alpha, %r{\A([^\d\W]|[-])*\Z}, "must be only letters or dashes"
@@ -25,10 +25,10 @@ module ValidatesFormattingOf
     add :alphanum, %r{\A[A-Z0-9\s]+\Z}i, "must be letters, numbers"
 
     # Visa, Mastercard, Discver, and American Express
-    add :credit_card, %r{\A((4\d{3})|(5[1-5]\d{2})|(6011))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13}\Z}, "is not a valid credit card number"
+    add :credit_card, %r{\A(((4\d{3})|(5[1-5]\d{2})|(6011))-?\d{4}-?\d{4}-?\d{4}|3[4,7]\d{13})\z}, "is not a valid credit card number"
 
     # US Zip code. ##### or #####-####
-    add :us_zip, %r{\A\d{5}(-\d{4})?\Z}, "is not a valid zipcode"
+    add :us_zip, %r{\A\d{5}(-\d{4})?\z}, "is not a valid zipcode"
 
     # US Phone numbers.
     # Examples of valid formats:
@@ -38,19 +38,19 @@ module ValidatesFormattingOf
     # * (###)###-####
     # * #########
     # * ### ###-####
-    add :us_phone, %r{\A(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})\Z}, "is not a valid phone number"
+    add :us_phone, %r{\A(\((\d{3})\)|\d{3})[ |\.|\-]?(\d{3})[ |\.|\-]?(\d{4})\z}, "is not a valid phone number"
 
     # IP Address validation
-    add :ip_address_v4, %r{\A(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\Z}, "is not a valid IPv4 address"
+    add :ip_address_v4, %r{\A(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\z}, "is not a valid IPv4 address"
 
     # Social Security Number pattern
-    add :ssn, %r{\A\d{3}([-.]){1}\d{2}([-.]){1}\d{4}\Z}, "is not a valid social security number"
+    add :ssn, %r{\A\d{3}([-.]){1}\d{2}([-.]){1}\d{4}\z}, "is not a valid social security number"
 
     # Matches CSS colors either in three or six digit formats
-    add :hex_color, %r{\A([A-F0-9]{6}|[A-F0-9]{3})\Z}i, "is not a valid hex color"
+    add :hex_color, %r{\A([A-F0-9]{6}|[A-F0-9]{3})\z}i, "is not a valid hex color"
 
     # Ensures that what value is passed is a dollar amount of some kind
-    add :dollars, %r{\A\$?(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?\Z}, "is not a valid dollar amount"
+    add :dollars, %r{\A\$?(\d{1,3}(\,\d{3})*|(\d+))(\.\d{2})?\z}, "is not a valid dollar amount"
 
   end
 end

data/lib/validates_formatting_of/version.rb

@@ -1,3 +1,3 @@
 module ValidatesFormattingOf
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/spec/validates_formatting_of/model_additions_spec.rb

@@ -18,6 +18,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       Email.new(:email => "info@-samoa.travel").should_not be_valid
       Email.new(:email => "info@samoa-.travel").should_not be_valid
       Email.new(:email => "info@123-samoa.travel").should be_valid
+      Email.new(:email => "info@123-samoa.travel\n").should_not be_valid
     end
   end
 
@@ -27,16 +28,17 @@ describe ValidatesFormattingOf::ModelAdditions do
       validates_formatting_of :email, :using => :simple_email
     end
     it "validates that the email provided is valid" do
-      Email.new(:email => "example@example.com").should be_valid
-      Email.new(:email => "badexample.com").should_not be_valid
-      Email.new(:email => "mbridges.91@gmail.com").should be_valid
-      Email.new(:email => "some-random%%%strangely-formatted-email@lots.of.subdomains.com").should be_valid
-      Email.new(:email => "this__???{}|__should@be-valid.com").should be_valid
-      Email.new(:email => "visitorservices@vmfa.museum").should be_valid
-      Email.new(:email => "info@samoa.travel").should be_valid
-      Email.new(:email => "info@-samoa.travel").should_not be_valid
-      Email.new(:email => "info@samoa-.travel").should_not be_valid
-      Email.new(:email => "info@123-samoa.travel").should be_valid
+      SimpleEmail.new(:email => "example@example.com").should be_valid
+      SimpleEmail.new(:email => "badexample.com").should_not be_valid
+      SimpleEmail.new(:email => "mbridges.91@gmail.com").should be_valid
+      SimpleEmail.new(:email => "some-random%%%strangely-formatted-email@lots.of.subdomains.com").should be_valid
+      SimpleEmail.new(:email => "this__???{}|__should@be-valid.com").should be_valid
+      SimpleEmail.new(:email => "visitorservices@vmfa.museum").should be_valid
+      SimpleEmail.new(:email => "info@samoa.travel").should be_valid
+      SimpleEmail.new(:email => "info@-samoa.travel").should be_valid
+      SimpleEmail.new(:email => "info@samoa-.travel").should be_valid
+      SimpleEmail.new(:email => "info@123-samoa.travel").should be_valid
+      SimpleEmail.new(:email => "info@123-samoa.travel\n").should_not be_valid
     end
   end
   describe "url" do
@@ -49,6 +51,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       Webpage.new(:url => 'http://something-else.com').should be_valid
       Webpage.new(:url => 'http://sub.domains.something-else.com').should be_valid
       Webpage.new(:url => 'http://username:password@something-else.com').should be_valid
+      Webpage.new(:url => "http://username:password@something-else.com\n").should_not be_valid
       Webpage.new(:url => "something else").should_not be_valid
     end
   end
@@ -61,6 +64,7 @@ describe ValidatesFormattingOf::ModelAdditions do
     it "validates that the zipcode provided is valid" do
       USZip.new(:zipcode => '92348').should be_valid
       USZip.new(:zipcode => '23434-2348').should be_valid
+      USZip.new(:zipcode => "23434-2348\n").should_not be_valid
       USZip.new(:zipcode => '234').should_not be_valid
       USZip.new(:zipcode => '23408234').should_not be_valid
       USZip.new(:zipcode => 'invalid').should_not be_valid
@@ -104,6 +108,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       USPhone.new(:phone_number => '1231233456').should be_valid
       USPhone.new(:phone_number => '123.123.3456').should be_valid
       USPhone.new(:phone_number => '(223)123-2347').should be_valid
+      USPhone.new(:phone_number => "(223)123-2347\n").should_not be_valid
       USPhone.new(:phone_number => '(223 123-2347').should_not be_valid
       USPhone.new(:phone_number => '12349870238').should_not be_valid
     end
@@ -121,6 +126,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       IPAddress.new(:ipv4 => '22.2222.22.2').should_not be_valid
       IPAddress.new(:ipv4 => '127.0.0.1').should be_valid
       IPAddress.new(:ipv4 => '132.254.111.10').should be_valid
+      IPAddress.new(:ipv4 => "132.254.111.10\n").should_not be_valid
     end
   end
 
@@ -135,6 +141,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       Client.new(:cc => '4264-2879-1230-0000').should be_valid # Visa style
       Client.new(:cc => '6011-1111-0000-2391').should be_valid # Discover style
       Client.new(:cc => '5422434400828888').should be_valid # Mastercard style
+      Client.new(:cc => "5422434400828889\n").should_not be_valid # Mastercard style
       Client.new(:cc => '1233444444444444').should_not be_valid # fake
     end
   end
@@ -148,6 +155,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       AnotherPerson.new(:ssn => "145.47.0191").should be_valid
       AnotherPerson.new(:ssn => "223-43-2343").should be_valid
       AnotherPerson.new(:ssn => "999.55.8888").should be_valid
+      AnotherPerson.new(:ssn => "999.55.8888\n").should_not be_valid
       AnotherPerson.new(:ssn => "28934").should_not be_valid
       AnotherPerson.new(:ssn => "228934828934934").should_not be_valid
       AnotherPerson.new(:ssn => "23498.7234").should_not be_valid
@@ -165,6 +173,7 @@ describe ValidatesFormattingOf::ModelAdditions do
       Color.new(:color => "000011").should be_valid
       Color.new(:color => "132").should be_valid
       Color.new(:color => "eef").should be_valid
+      Color.new(:color => "eef\n").should_not be_valid
       Color.new(:color => "efefe").should_not be_valid
       Color.new(:color => "zsdfsd").should_not be_valid
       Color.new(:color => "p98hul;").should_not be_valid

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_formatting_of
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2013-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -132,4 +132,3 @@ test_files:
 - spec/validates_formatting_of/model_additions_spec.rb
 - spec/validates_formatting_of/validation_addition_spec.rb
 - spec/validates_formatting_of/validation_spec.rb
-has_rdoc: