has_validated_attributes 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1e02e143cad7f92001777d15e1df4eeef861ba1
-  data.tar.gz: 0008c7ac7272a08a93f9aeb50ec50883ff72c3da
+  metadata.gz: b49c78f2edd9a65145f09d2d4aaa2fb2f1d4a850
+  data.tar.gz: 7d893b2aecb8cfd6fe2be83a74010697f257bd8f
 SHA512:
-  metadata.gz: 4995ad830393b1bdf470e0299b58649dcd01b5a606c7ce00c9c3c0869a2154358ab5e1fb67d2a77b6b840fedd3c731bd750d3b0a2e699fa48a430bf8fa023a7f
-  data.tar.gz: 717be739f18ecd4f1829fad88a8b37af08327db87179e0b0965915f2c22d39c165bcc87c96210b12fc6b1aa9f8469990a0d9c139042c8b1cddc52522c9290fb5
+  metadata.gz: 38105ddb79653ec64151a094c2dda3554934aaaae7a7c448b8d58a054eb03bc1c3abe1b8c7e4898ddd6e12dbda4480329cb5070b54e0464190e955cf2b46e15d
+  data.tar.gz: 144bd41f8cae47e27e7bac48d6cf6d536ce4a0e07efe8255310527ad22bd1392a80b24713e133c039654ecaf9d0642b64ab5921fad6b2e9f89f1efcf7fe39b26

data/.gitignore

@@ -12,3 +12,6 @@ bin/*
 .rbenv-version
 .rbenv-gemsets
 Gemfile.lock
+.ruby-gemset
+.ruby-version
+spec/db/test.sqlite3

data/has_validated_attributes.gemspec

@@ -1,26 +1,35 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "version"
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require "has_validated_attributes/version"
 
 Gem::Specification.new do |s|
   s.name = %q{has_validated_attributes}
   s.version = HasValidatedAttributes::VERSION
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kyle Ginavan"]
   s.date = %q{2010-05-18}
-  s.homepage = "https://github.com/kylejginavan/has_validated_attributes"
-  s.summary =  %q{Ruby on Rails gem for validate data prior to save}
   s.description = %q{has_validated_attributes is a Ruby on Rails gem that lets you validate your fields.}
   s.email = %q{kylejginavan@gmail.com}
-  s.rubyforge_project = "has_validated_attributes"
+  s.extra_rdoc_files = [
+    "README.rdoc"
+  ]
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.homepage = "https://github.com/kylejginavan/has_validated_attributes"
   s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.5.2}
+  s.summary =  %q{Ruby on Rails gem for validate data prior to save}
+  # s.rubyforge_project = "has_validated_attributes"
+
   s.add_development_dependency "rspec"
   s.add_development_dependency "shoulda-matchers"
   s.add_development_dependency "has_normalized_attributes",  "~> 0.0", ">= 0.0.8"
   s.add_development_dependency "activerecord",               ">= 3.1.0"
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3",                    ">= 1.3.10"
   s.add_development_dependency "database_cleaner"
+  s.add_development_dependency "byebug"
 end

data/lib/has_validated_attributes/rspec.rb

@@ -70,11 +70,11 @@ end
 RSpec.shared_examples_for "email attribute" do |attr|
   it { should validate_length_of(attr).is_at_most(HasValidatedAttributes.email_format[:length][:maximum]) }
 
-  ["abc@example.com", "Abc@example.com", "aBC@example.com", "abc.123@example.com", "mo’reilly@example.com", "ro'sullivan@example.com"].each do |value|
+  ["abc@example.com", "Abc@example.com", "aBC@example.com", "abc.123@example.com", "mo’reilly@example.com", "ro'sullivan@example.com", "abc@example.comar"].each do |value|
     it { should allow_value(value).for(attr) }
   end
 
-  ["Abc.example.com", "A@b@c@example.com", "()[]\;:,<>@example.com", "abc@example.comar"].each do |value|
+  ["Abc.example.com", "A@b@c@example.com", "()[]\;:,<>@example.com"].each do |value|
     it { should_not allow_value(value).for(attr).with_message(HasValidatedAttributes.email_format[:format][:message]) }
   end
 end

data/lib/{version.rb → has_validated_attributes/version.rb}

@@ -1,3 +1,3 @@
 module HasValidatedAttributes
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/has_validated_attributes.rb

@@ -32,23 +32,25 @@ module HasValidatedAttributes
   #loading all methods dynamically
   validations :name => { :format => { :with => NO_CONTROL_CHARS_REGEX, :message => NO_CONTROL_CHARS_ERROR_MSG }, :length => {:maximum => 63}, :has_if? => true},
               :safe_text => { :safe_text => true, :has_if? => true},
-              :username => {:length => {:within => 5..127}, :format => {:with => /\A\w[\w\.\-_@]+\z/, :message => "use only letters, numbers, and .-_@ please."}, :uniqueness => true},
+              :username => {:length => {:within => 5..127}, :format => {:with => /\A\w[\w\.\-_@]+\z/, :message => "use only letters, numbers, and .-_@ please."}, :uniqueness => true, :has_if? => true},
               :rails_name => {:format => {:with => /\A[a-zA-Z\_]*?\z/u, :message => "should only include underscores and letters."}},
-              :email => {:length => {:maximum => 63}, :format => {:with => /\A[\w\.%\+\-’']+@(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|pro|mobi|name|aero|jobs|museum|insure)\z/i, :message => "should look like an email address."}},
+              ## the regex for emails comes from
+              ##   http://haacked.com/archive/2007/08/21/i-knew-how-to-validate-an-email-address-until-i.aspx/
+              :email => {:length => {:maximum => 63}, :format => {:with => /\A(?!\.)("([^"\r\\]|\\["\r\\])*"|([-a-z0-9!#$%&'’*+\/=?^_`{|}~]|(?<!\.)\.)*)(?<!\.)@[a-z0-9][\w\.-]*[a-z0-9]\.[a-z][a-z\.]*[a-z]\z/i, :message => "should look like an email address."}, :has_if? => true},
               :phone_number => {:numericality => {:greater_than_or_equal_to => 1000000000, :less_than => 10000000000, :message => 'accepts only 10 numbers and (),.- characters and must not be all 0s'}, :has_if? => true},
               :phone_extension => {:numericality => {:greater_than_or_equal_to => 0, :less_than => 100000000, :message => 'accepts only numbers (0-9)'}, :has_if? => true},
-              :domain => {:length => {:maximum => 63}, :format => {:with => /\A(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|pro|mobi|name|aero|jobs|museum)\z/i, :message => "should look like a domain name."}},
+              :domain => {:length => {:maximum => 63}, :format => {:with => /\A(?:[A-Z0-9\-]+\.)+(?:[A-Z]{2}|com|org|net|edu|gov|mil|biz|info|pro|mobi|name|aero|jobs|museum)\z/i, :message => "should look like a domain name."}, :has_if? => true},
               :zipcode => {:format => {:with => /\A\d{5}(\d{4})?\z/, :message => "must contain 5 or 9 numbers"}, :has_if? => true},
               :middle_initial => {:format => {:with => /\A[a-zA-Z]{0,1}\z/u, :message => "accepts only one letter"}},
               :dollar => {:format => {:with => /\A-?[0-9]{0,12}(\.[0-9]{0,2})?\z/, :message => "accepts only numeric characters, period, and negative sign"}, :numericality => {:greater_than => -1000000000000, :less_than => 1000000000000}, :allow_nil => true},
               :positive_dollar => {:format => {:with => /\A[0-9]{0,12}(\.[0-9]{0,2})?\z/, :message => "accepts only numeric characters, period"}, :numericality => {:greater_than_or_equal_to => 0, :less_than => 1000000000000}, :allow_nil => true},
-              :percent => {:format => {:with => /\A-?[0-9]{0,3}(\.[0-9]{0,3})?\z/, :message => "accepts only numeric characters, period, negative sign, and must be equal/less/greater than +/- 100"}, :numericality => {:greater_than_or_equal_to => -100, :less_than_or_equal_to => 100} },
+              :percent => {:format => {:with => /\A-?[0-9]{0,3}(\.[0-9]{0,3})?\z/, :message => "accepts only numeric characters, period, negative sign, and must be equal/less/greater than +/- 100"}, :numericality => {:greater_than_or_equal_to => -100, :less_than_or_equal_to => 100}, :has_if? => true},
               :positive_percent => {:format => {:with => /\A[0-9]{0,3}(\.[0-9]{0,3})?\z/, :message => "accepts only numeric characters, period, and must be equal/less than 100"}, :numericality => {:greater_than_or_equal_to => 0, :less_than_or_equal_to => 100}, :allow_nil => true},
               :url => {:length => {:maximum => 255}, :format => {:with => /\A(http|https|ftp):\/\/[A-Z0-9]+([\.]{1}[a-z0-9-]{1,63})*\.[a-zA-Z]{2,5}(:[0-9]{1,5})?(\/.*)?\z/ix, :message => "web address isnt valid"}, :has_if? => true},
               :social_security_number => {:length => {:is => 9}, :numericality => {:greater_than_or_equal_to => 0, :less_than => 1000000000, :message => "must be in the format 111-11-1111"}, :has_if? => true},
               :taxid => {:length => {:is => 9}, :numericality => {:greater_than_or_equal_to => 9999999, :less_than => 1000000000, :message => "must be in the format 11-1111111"}, :has_if? => true},
-              :age => {:numericality => {:greater_than_or_equal_to => 0, :less_than_or_equal_to => 110, :message => 'must contain only 3 numbers and less than 110'}},
-              :number => {:numericality => {:message => "accepts only numbers (0-9)"}}
+              :age => {:numericality => {:greater_than_or_equal_to => 0, :less_than_or_equal_to => 110, :message => 'must contain only 3 numbers and less than 110'}, :has_if? => true},
+              :number => {:numericality => {:message => "accepts only numbers (0-9)"}, :has_if? => true}
 
   included do
     class_eval do
@@ -67,4 +69,4 @@ module HasValidatedAttributes
 end
 
 #include activerecord
-ActiveRecord::Base.send :include, HasValidatedAttributes
+ActiveRecord::Base.send :include, HasValidatedAttributes

data/spec/{has_validate_fields_spec.rb → has_validated_attributes_spec.rb}

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require "spec_helper"
+require "byebug"
 
 class Resource < ActiveRecord::Base
   has_validated_attributes :name_attr => {:format => :name, :maximum_length => 10},
@@ -67,6 +68,42 @@ describe "HasValidatedAttributes" do
       has_validated_ssn_attribute(:ssn_attr)
       has_validated_safe_text_attribute(:safe_text_attr)
       has_validated_domain_attribute(:domain_attr)
+
+      context "test validations" do
+        subject { Resource.new }
+        it { expect(subject).to be_valid }
+
+        context "email addresses" do
+          it { subject.email_attr = "name@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "gladyce@senger.io"; expect(subject).to be_valid }
+          it { subject.email_attr = "herp@derp"; expect(subject).to be_invalid }
+
+          ## all of the examples below come from
+          ##   http://haacked.com/archive/2007/08/21/i-knew-how-to-validate-an-email-address-until-i.aspx/
+          it { subject.email_attr = "NotAnEmail"; expect(subject).to be_invalid }
+          it { subject.email_attr = "@NotAnEmail"; expect(subject).to be_invalid }
+          # it { subject.email_attr = """test\\blah""@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = """test\blah""@example.com"; expect(subject).to be_invalid }
+          it { subject.email_attr = "\"test\\\rblah\"@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "\"test\rblah\"@example.com"; expect(subject).to be_invalid }
+          # it { subject.email_attr = """test\""blah""@example.com"; expect(subject).to be_valid }, true
+          # it { subject.email_attr = """test""blah""@example.com"; expect(subject).to be_invalid }
+          it { subject.email_attr = "customer/department@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "$A12345@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "!def!xyz%abc@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "_Yosemite.Sam@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "~@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = ".wooly@example.com"; expect(subject).to be_invalid }
+          it { subject.email_attr = "wo..oly@example.com"; expect(subject).to be_invalid }
+          it { subject.email_attr = "pootietang.@example.com"; expect(subject).to be_invalid }
+          it { subject.email_attr = ".@example.com"; expect(subject).to be_invalid }
+          # it { subject.email_attr = """Austin@Powers""@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "Ima.Fool@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = """Ima.Fool""@example.com"; expect(subject).to be_valid }
+          # it { subject.email_attr = """Ima Fool""@example.com"; expect(subject).to be_valid }
+          it { subject.email_attr = "Ima Fool@example.com"; expect(subject).to be_invalid }
+        end
+      end
     end
   end
 
@@ -80,4 +117,4 @@ describe "HasValidatedAttributes" do
       has_validated_ssn_attribute(:ssn_attr, normalized: true)
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_validated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Kyle Ginavan
@@ -74,6 +74,20 @@ dependencies:
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.10
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -87,7 +101,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -105,7 +119,8 @@ description: has_validated_attributes is a Ruby on Rails gem that lets you valid
 email: kylejginavan@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.rdoc
 files:
 - .gitignore
 - .rspec
@@ -116,12 +131,11 @@ files:
 - has_validated_attributes.gemspec
 - lib/has_validated_attributes.rb
 - lib/has_validated_attributes/rspec.rb
-- lib/version.rb
+- lib/has_validated_attributes/version.rb
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/db/test.rb
-- spec/db/test.sqlite3
-- spec/has_validate_fields_spec.rb
+- spec/has_validated_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/test.rb
 homepage: https://github.com/kylejginavan/has_validated_attributes
@@ -142,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: has_validated_attributes
+rubyforge_project: 
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
@@ -151,7 +165,6 @@ test_files:
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/db/test.rb
-- spec/db/test.sqlite3
-- spec/has_validate_fields_spec.rb
+- spec/has_validated_attributes_spec.rb
 - spec/spec_helper.rb
 - spec/test.rb