validators 0.1.1 → 0.1.2

data/.rspec

@@ -0,0 +1 @@
+--color --format documentation

data/Gemfile

@@ -1,4 +1,2 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in validators.gemspec
+source :rubygems
 gemspec

data/Gemfile.lock

@@ -1,40 +1,39 @@
 PATH
   remote: .
   specs:
-    validators (0.1.0)
-      activerecord (>= 3.0.0)
+    validators (0.1.2)
+      activerecord (~> 3.0.5)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.1)
-      activesupport (= 3.0.1)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
-      i18n (~> 0.4.1)
-    activerecord (3.0.1)
-      activemodel (= 3.0.1)
-      activesupport (= 3.0.1)
-      arel (~> 1.0.0)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activesupport (3.0.1)
+    activesupport (3.0.5)
     archive-tar-minitar (0.5.2)
-    arel (1.0.1)
-      activesupport (~> 3.0.0)
+    arel (2.0.9)
     builder (2.1.2)
     columnize (0.3.2)
     diff-lcs (1.1.2)
-    i18n (0.4.2)
-    linecache19 (0.5.11)
+    i18n (0.5.0)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
-    ruby-debug-base19 (0.11.24)
+    rspec-mocks (2.5.0)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -42,17 +41,18 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    sqlite3-ruby (1.3.2)
-    tzinfo (0.3.23)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.26)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (>= 3.0.0)
-  rspec (>= 2.0.0)
+  rspec (~> 2.5.0)
   ruby-debug19
   sqlite3-ruby
   validators!

data/README.rdoc

@@ -59,6 +59,17 @@ Then add it to your Gemfile:
     validates_ip_address :address, :only => :v6
   end
 
+=== validates_datetime
+
+  class Server < ActiveRecord::Base
+    validates_datetime :starts_at
+    validates_datetime :ends_at, :after => :starts_at, :if => :starts_at?
+    validates_datetime :ends_at, :after => :now
+    validates_datetime :ends_at, :before => :today
+
+    validates :starts_at, :datetime => true
+  end
+
 == Maintainer
 
 * Nando Vieira - http://simplesideias.com.br

data/lib/validators/validates_datetime.rb

@@ -0,0 +1,91 @@
+module ActiveModel
+  module Validations
+    class DatetimeValidator < EachValidator
+      def date?(value)
+        value.kind_of?(Date) || value.kind_of?(Time)
+      end
+
+      def validate_each(record, attribute, value)
+        unless date?(value)
+          record.errors.add(attribute, :invalid_date,
+            :message => options[:message], :value => value
+          )
+        end
+
+        if date?(value)
+          validate_after_option(record, attribute, value)
+          validate_before_option(record, attribute, value)
+        end
+      end
+
+      private
+      def date_for(record, value, option)
+        date = case option
+        when :today
+          Date.today
+        when :now
+          Time.now
+        when Time, Date, DateTime, ActiveSupport::TimeWithZone
+          option
+        when Proc
+          option.call(record)
+        else
+          record.__send__(option) if record.respond_to?(option)
+        end
+
+        if date.kind_of?(Time)
+          value = value.to_time
+        elsif date.kind_of?(Date)
+          value = value.to_date
+        end
+
+        [date, value]
+      end
+
+      def validate_after_option(record, attribute, value)
+        return unless options[:after]
+
+        date, value = date_for(record, value, options[:after])
+
+        record.errors.add(attribute, :invalid_date_after, {
+          :message => options[:after_message],
+          :value   => value,
+          :date    => (date?(date) ? I18n.l(date) : date.inspect)
+        }) unless value.present? && date.present? && (value && date && value > date)
+      end
+
+      def validate_before_option(record, attribute, value)
+        return unless options[:before]
+
+        date, value = date_for(record, value, options[:before])
+
+        record.errors.add(attribute, :invalid_date_before, {
+          :message => options[:before_message],
+          :value   => value,
+          :date    => I18n.l(date)
+        }) unless value.present? && date.present? && (value && date && value < date)
+      end
+    end
+
+    module ClassMethods
+      # Validates weather or not the specified e-mail address is valid.
+      #
+      #   class User < ActiveRecord::Base
+      #     validates_datetime :birth
+      #   end
+      #
+      # Other usages:
+      #
+      #   validates_datetime :starts_at, :after => 2.years.ago
+      #   validates_datetime :starts_at, :before => 2.years.ago
+      #   validates_datetime :starts_at, :before => :today
+      #   validates_datetime :starts_at, :before => :now
+      #   validates_datetime :starts_at, :before => :ends_at
+      #   validates_datetime :ends_at, :after => :starts_at
+      #
+      def validates_datetime(*attr_names)
+        validates_with DatetimeValidator, _merge_attributes(attr_names)
+      end
+    end
+  end
+end

data/lib/validators/version.rb

@@ -2,7 +2,7 @@ module Validators
   module Version
     MAJOR = 0
     MINOR = 1
-    PATCH = 1
+    PATCH = 2
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/lib/validators.rb

@@ -1,5 +1,6 @@
 require "active_record"
 require "validators/constants"
+require "validators/validates_datetime"
 require "validators/validates_ip_address"
 require "validators/validates_email_format_of"
 require "validators/validates_url_format_of"

data/spec/schema.rb

@@ -1,6 +1,8 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table :users do |t|
     t.string :email, :corporate_email, :url
+    t.datetime :registered_at, :starts_at, :ends_at
+    t.date :birthday
   end
 
   create_table :categories do |t|

data/spec/spec_helper.rb

@@ -1,4 +1,7 @@
 require "validators"
+require "active_support/all"
+
+Time.zone = "America/Sao_Paulo"
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
@@ -10,6 +13,7 @@ I18n.load_path << File.dirname(__FILE__) + "/support/translations.yml"
 RSpec.configure do |config|
   config.before do
     I18n.locale = :en
+    Time.zone = "America/Sao_Paulo"
 
     ActiveRecord::Base.descendants.each do |model|
       model.delete_all

data/spec/support/dates.rb

@@ -0,0 +1,19 @@
+VALID_DATES = [
+  "2010-04-26",
+  "2010-04-26 23:59:00",
+  "26/04/2010",
+  "2000-08-01 00:00:00 +0900",
+  "Aug 21 2000",
+  "Thu Nov 29 14:33:20 GMT 2001",
+  Time.now,
+  Date.today,
+  DateTime.now,
+  Time.zone.now
+]
+
+INVALID_DATES = [
+  "invalid",
+  nil,
+  "",
+  "4/26"
+]

data/spec/support/translations.yml

@@ -3,6 +3,9 @@ en:
     errors:
       messages:
         record_invalid: "Errors: %{errors}"
+        invalid_date: "is not a valid date"
+        invalid_date_before: "needs to be before %{date}"
+        invalid_date_after: "needs to be after %{date}"
         invalid_email: "is not a valid address"
         invalid_url: "is not a valid address"
         invalid_ipv4_address: "is not a valid IPv4 address"

data/spec/validators/validates_datetime_spec.rb

@@ -0,0 +1,124 @@
+require "spec_helper"
+
+describe ".validates_datetime" do
+  subject { User.new }
+
+  context "default options" do
+    before do
+      User.validates_datetime :registered_at
+      User.validates :birthday, :datetime => true
+    end
+
+    VALID_DATES.each do |date|
+      it "accepts #{date.inspect} as valid date" do
+        subject.registered_at = date
+        subject.birthday = date
+
+        subject.should be_valid
+      end
+    end
+
+    INVALID_DATES.each do |date|
+      it "rejects #{date.inspect} as valid date" do
+        subject.registered_at = date
+        subject.birthday = date
+        subject.should_not be_valid
+
+        subject.errors[:registered_at].should_not be_empty
+        subject.errors[:birthday].should_not be_empty
+      end
+    end
+
+    it "includes default error message" do
+      subject.registered_at = nil
+      subject.should_not be_valid
+
+      subject.errors[:registered_at].should == ["is not a valid date"]
+    end
+  end
+
+  context "after option" do
+    it "rejects when date is set to before :after option" do
+      User.validates_datetime :registered_at, :after => 1.week.from_now
+      subject.registered_at = Time.now
+
+      subject.should_not be_valid
+      subject.errors[:registered_at].should == ["needs to be after #{I18n.l(1.week.from_now)}"]
+    end
+
+    it "accepts when date is set accordingly to the :after option" do
+      User.validates_datetime :registered_at, :after => 1.week.from_now
+      subject.registered_at = 2.weeks.from_now
+
+      subject.should be_valid
+    end
+
+    it "validates using today as date" do
+      User.validates_datetime :registered_at, :after => :today
+
+      subject.registered_at = Time.now
+      subject.should_not be_valid
+
+      subject.registered_at = Date.today
+      subject.should_not be_valid
+
+      subject.registered_at = Date.tomorrow
+      subject.should be_valid
+
+      subject.registered_at = 1.day.from_now
+      subject.should be_valid
+    end
+
+    it "validates using now as date" do
+      User.validates_datetime :registered_at, :after => :now
+
+      subject.registered_at = Time.now
+      subject.should_not be_valid
+
+      subject.registered_at = Date.today
+      subject.should_not be_valid
+
+      subject.registered_at = Date.tomorrow
+      subject.should be_valid
+
+      subject.registered_at = 1.day.from_now
+      subject.should be_valid
+    end
+
+    it "validates using method as date" do
+      User.validates_datetime :starts_at
+      User.validates_datetime :ends_at, :after => :starts_at, :if => :starts_at?
+
+      subject.starts_at = nil
+      subject.ends_at = Time.now
+      subject.should_not be_valid
+      subject.errors[:ends_at].should be_empty
+
+      subject.starts_at = Time.parse("Apr 26 2010")
+      subject.ends_at = Time.parse("Apr 25 2010")
+      subject.should_not be_valid
+      subject.errors[:ends_at].should == ["needs to be after #{I18n.l(Time.parse("Apr 26 2010"))}"]
+
+      subject.starts_at = Time.now
+      subject.ends_at = 1.hour.from_now
+      subject.should be_valid
+    end
+  end
+
+  context "before option" do
+    it "rejects when date is set to after :before option" do
+      User.validates_datetime :registered_at, :before => 1.week.ago
+      subject.registered_at = Time.now
+
+      subject.should_not be_valid
+      subject.errors[:registered_at].should == ["needs to be before #{I18n.l(1.week.ago)}"]
+    end
+
+    it "accepts when date is set accordingly to the :before option" do
+      User.validates_datetime :registered_at, :before => 1.week.ago
+      subject.registered_at = 2.weeks.ago
+
+      subject.should be_valid
+    end
+  end
+end

data/validators.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", ">= 3.0.0"
-  s.add_development_dependency "rspec", ">= 2.0.0"
+  s.add_dependency "activerecord", "~> 3.0.5"
+  s.add_development_dependency "rspec", "~> 2.5.0"
   s.add_development_dependency "sqlite3-ruby"
-  s.add_development_dependency "ruby-debug19"
+  s.add_development_dependency "ruby-debug19" if RUBY_VERSION >= "1.9"
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: validators
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nando Vieira
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -02:00
+date: 2011-04-05 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,13 +19,9 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: 3.0.5
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -38,13 +30,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        version: 2.0.0
+        version: 2.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,8 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -68,8 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -84,6 +68,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Gemfile.lock
 - README.rdoc
@@ -91,6 +76,7 @@ files:
 - lib/validators.rb
 - lib/validators/constants.rb
 - lib/validators/ip.rb
+- lib/validators/validates_datetime.rb
 - lib/validators/validates_email_format_of.rb
 - lib/validators/validates_ip_address.rb
 - lib/validators/validates_ownership_of.rb
@@ -98,12 +84,14 @@ files:
 - lib/validators/version.rb
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/dates.rb
 - spec/support/emails.rb
 - spec/support/ips.rb
 - spec/support/models.rb
 - spec/support/translations.yml
 - spec/support/urls.rb
 - spec/validators/ip_spec.rb
+- spec/validators/validates_datetime_spec.rb
 - spec/validators/validates_email_format_of_spec.rb
 - spec/validators/validates_ip_address_spec.rb
 - spec/validators/validates_ownership_of_spec.rb
@@ -123,33 +111,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Add some nice Rails 3 ActiveRecord validators.
 test_files: 
 - spec/schema.rb
 - spec/spec_helper.rb
+- spec/support/dates.rb
 - spec/support/emails.rb
 - spec/support/ips.rb
 - spec/support/models.rb
 - spec/support/translations.yml
 - spec/support/urls.rb
 - spec/validators/ip_spec.rb
+- spec/validators/validates_datetime_spec.rb
 - spec/validators/validates_email_format_of_spec.rb
 - spec/validators/validates_ip_address_spec.rb
 - spec/validators/validates_ownership_of_spec.rb