whyvalidationssuckin96 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/lib/whyvalidationssuckin96/macros/validates_email.rb

@@ -0,0 +1,28 @@
+require 'whyvalidationssuckin96/skippable_validation'
+require 'whyvalidationssuckin96/attribute_based_validation'
+require 'whyvalidationssuckin96/vendor/rfc822'
+
+module WhyValidationsSuckIn96
+  
+  # Checks whether a given attribute is a valid email address
+  #
+  # @example Default usage
+  #   setup_validations do
+  #     validates_as_email :email
+  #   end
+  #
+  class ValidatesEmail < Validation  
+    include WhyValidationsSuckIn96::SkippableValidation
+    include WhyValidationsSuckIn96::AttributeBasedValidation
+    
+    DefaultOptions = {:message => "is not a valid email address"}
+    
+    def validate
+      super
+      WhyValidationsSuckIn96::RFC822::EmailAddress.match(attribute_value) ? pass : fail
+    end
+
+  end # Validation
+
+  ValidationBuilder.register_macro :validates_as_email, WhyValidationsSuckIn96::ValidatesEmail
+end   # WhyValidationsSuckIn96

data/lib/whyvalidationssuckin96/macros.rb

@@ -7,4 +7,5 @@ require 'whyvalidationssuckin96/macros/validates_inclusion'
 require 'whyvalidationssuckin96/macros/validates_length'
 require 'whyvalidationssuckin96/macros/validates_numericality'
 require 'whyvalidationssuckin96/macros/validates_presence'
-require 'whyvalidationssuckin96/macros/validates_url'
+require 'whyvalidationssuckin96/macros/validates_url'
+require 'whyvalidationssuckin96/macros/validates_email'

data/lib/whyvalidationssuckin96/rails/macros/validates_uniqueness.rb

@@ -61,9 +61,14 @@ module WhyValidationsSuckIn96
     def scope_columns
       Array(options[:scope])
     end
-    
+
     def find_conditions
-      ["LOWER(#{scope_class.connection.quote_column_name(attribute.to_s)}) = LOWER(?)", attribute_value]
+      column = scope_class.columns.detect { |col| col.name == attribute.to_s }
+      if column.type == :text or column.type == :string
+        ["LOWER(#{scope_class.connection.quote_column_name(attribute.to_s)}) = LOWER(?)", attribute_value]
+      else
+        ["#{scope_class.connection.quote_column_name(attribute.to_s)} = ?", attribute_value]
+      end
     end
     
     def scope_conditions
@@ -84,4 +89,4 @@ module WhyValidationsSuckIn96
   end # Validation
 
   ValidationBuilder.register_macro :validates_uniqueness_of, WhyValidationsSuckIn96::ValidatesUniqueness
-end   # WhyValidationsSuckIn96
+end   # WhyValidationsSuckIn96

data/lib/whyvalidationssuckin96/vendor/rfc822.rb

@@ -0,0 +1,32 @@
+#
+# RFC822 Email Address Regex
+# --------------------------
+# 
+# Originally written by Cal Henderson
+# c.f. http://iamcal.com/publish/articles/php/parsing_email/
+#
+# Translated to Ruby by Tim Fletcher, with changes suggested by Dan Kubb.
+#
+# Licensed under a Creative Commons Attribution-ShareAlike 2.5 License
+# http://creativecommons.org/licenses/by-sa/2.5/
+# 
+module WhyValidationsSuckIn96
+  module RFC822
+    EmailAddress = begin
+      qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]'
+      dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]'
+      atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-' +
+        '\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+'
+      quoted_pair = '\\x5c[\\x00-\\x7f]'
+      domain_literal = "\\x5b(?:#{dtext}|#{quoted_pair})*\\x5d"
+      quoted_string = "\\x22(?:#{qtext}|#{quoted_pair})*\\x22"
+      domain_ref = atom
+      sub_domain = "(?:#{domain_ref}|#{domain_literal})"
+      word = "(?:#{atom}|#{quoted_string})"
+      domain = "#{sub_domain}(?:\\x2e#{sub_domain})*"
+      local_part = "#{word}(?:\\x2e#{word})*"
+      addr_spec = "#{local_part}\\x40#{domain}"
+      pattern = /\A#{addr_spec}\z/
+    end
+  end
+end # WhyValidationsSuckIn96

data/test/macros/validates_email_test.rb

@@ -0,0 +1,46 @@
+require 'teststrap'
+
+context "validates email" do
+  
+  should "add a validation macro" do
+    WhyValidationsSuckIn96::ValidationBuilder.instance_methods
+  end.includes('validates_as_email')
+  
+  context "with some default options" do
+    setup do
+      WhyValidationsSuckIn96::ValidatesEmail.new(Object.new, :attribute => :email)
+    end
+  
+    should "have a message accessor with a default message" do
+      topic.message
+    end.equals("is not a valid email address")
+  end # with some default options
+  
+  context "validating an object" do    
+    validatable = OpenStruct.new(:email => "")
+    
+    setup do
+      WhyValidationsSuckIn96::ValidatesEmail.new(validatable, :attribute => :email)
+    end
+    
+    should "allow a valid regular email address" do
+      validatable.email = "foo@example.com"
+      topic.validates?
+    end
+    
+    should "allow an email address with periods" do
+      validatable.email = "foo.bar@example.com"
+      topic.validates?
+    end
+    
+    should "allow an email address with a plus sign" do
+      validatable.email = "foo+bar@example.com"
+      topic.validates?
+    end
+    
+    should "disallow a whack email address" do
+      validatable.email = "foo"
+      topic.validates?
+    end.equals(false)
+  end     # validating an object
+end       # validates email

data/test/rails/active_record_test_helper.rb

@@ -25,6 +25,7 @@ ActiveRecord::Schema.define(:version => 1) do
   
   create_table :chapters do |t|
     t.string :name
+    t.integer :number
     t.belongs_to :book
   end
   
@@ -124,4 +125,4 @@ class Collage < VisualWork
   setup_validations do
     validates_uniqueness_of :name, :scope => :author
   end
-end
+end

data/test/rails/macros/validates_uniqueness_test.rb

@@ -68,6 +68,27 @@ context "validates uniqueness" do
         work.save
       end
     end # with default options
+
+    context "uniqueness of integers" do
+      setup do
+        Class.new(Chapter) do
+          setup_validations do
+            validates_uniqueness_of :number, :scope_to => :book_id
+          end
+        end
+      end
+
+      should "not allow two objects with the same number" do
+        chapter = topic.new(:name => "A Dark and Stormy Night",
+                            :number => 1, :book_id => 1)
+        chapter.save!
+        other_chapter = topic.new(:name => "Another Dark and Stormy Night",
+                          :number => 1, :book_id => 1)
+        !other_chapter.valid? && other_chapter.failed_validations.detect do |fv|
+          fv.kind_of?(WhyValidationsSuckIn96::ValidatesUniqueness) && fv.attribute == :number
+        end
+      end
+    end
     
     context "specifying case sensitivity" do
       setup do
@@ -150,4 +171,4 @@ context "validates uniqueness" do
       end
     end # when using with_scope
   end   # validating an object
-end     # validates uniqueness
+end     # validates uniqueness

data/whyvalidationssuckin96.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whyvalidationssuckin96}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["gabrielg", "douglasmeyer"]
-  s.date = %q{2010-01-15}
+  s.date = %q{2010-01-27}
   s.description = %q{A library for setting up model validations, such as in ActiveRecord.}
   s.email = %q{gabriel.gironda@gmail.com}
   s.extra_rdoc_files = [
@@ -76,6 +76,7 @@ Gem::Specification.new do |s|
      "lib/whyvalidationssuckin96/macros/validates_acceptance.rb",
      "lib/whyvalidationssuckin96/macros/validates_associated.rb",
      "lib/whyvalidationssuckin96/macros/validates_confirmation.rb",
+     "lib/whyvalidationssuckin96/macros/validates_email.rb",
      "lib/whyvalidationssuckin96/macros/validates_exclusion.rb",
      "lib/whyvalidationssuckin96/macros/validates_format.rb",
      "lib/whyvalidationssuckin96/macros/validates_inclusion.rb",
@@ -93,10 +94,12 @@ Gem::Specification.new do |s|
      "lib/whyvalidationssuckin96/validation_builder.rb",
      "lib/whyvalidationssuckin96/validation_collection.rb",
      "lib/whyvalidationssuckin96/validation_support.rb",
+     "lib/whyvalidationssuckin96/vendor/rfc822.rb",
      "test/attribute_based_validation_test.rb",
      "test/macros/validates_acceptance_test.rb",
      "test/macros/validates_associated_test.rb",
      "test/macros/validates_confirmation_test.rb",
+     "test/macros/validates_email_test.rb",
      "test/macros/validates_exclusion_test.rb",
      "test/macros/validates_format_test.rb",
      "test/macros/validates_inclusion_test.rb",
@@ -126,6 +129,7 @@ Gem::Specification.new do |s|
      "test/macros/validates_acceptance_test.rb",
      "test/macros/validates_associated_test.rb",
      "test/macros/validates_confirmation_test.rb",
+     "test/macros/validates_email_test.rb",
      "test/macros/validates_exclusion_test.rb",
      "test/macros/validates_format_test.rb",
      "test/macros/validates_inclusion_test.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: whyvalidationssuckin96
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - gabrielg
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 -06:00
+date: 2010-01-27 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - lib/whyvalidationssuckin96/macros/validates_acceptance.rb
 - lib/whyvalidationssuckin96/macros/validates_associated.rb
 - lib/whyvalidationssuckin96/macros/validates_confirmation.rb
+- lib/whyvalidationssuckin96/macros/validates_email.rb
 - lib/whyvalidationssuckin96/macros/validates_exclusion.rb
 - lib/whyvalidationssuckin96/macros/validates_format.rb
 - lib/whyvalidationssuckin96/macros/validates_inclusion.rb
@@ -129,10 +130,12 @@ files:
 - lib/whyvalidationssuckin96/validation_builder.rb
 - lib/whyvalidationssuckin96/validation_collection.rb
 - lib/whyvalidationssuckin96/validation_support.rb
+- lib/whyvalidationssuckin96/vendor/rfc822.rb
 - test/attribute_based_validation_test.rb
 - test/macros/validates_acceptance_test.rb
 - test/macros/validates_associated_test.rb
 - test/macros/validates_confirmation_test.rb
+- test/macros/validates_email_test.rb
 - test/macros/validates_exclusion_test.rb
 - test/macros/validates_format_test.rb
 - test/macros/validates_inclusion_test.rb
@@ -184,6 +187,7 @@ test_files:
 - test/macros/validates_acceptance_test.rb
 - test/macros/validates_associated_test.rb
 - test/macros/validates_confirmation_test.rb
+- test/macros/validates_email_test.rb
 - test/macros/validates_exclusion_test.rb
 - test/macros/validates_format_test.rb
 - test/macros/validates_inclusion_test.rb