date_validator 0.6.0 → 0.6.1

data/.gitignore

@@ -4,3 +4,5 @@ coverage
 rdoc
 pkg
 *.rbc
+doc/*
+.yardoc/*

data/.rvmrc

@@ -1 +1 @@
-rvm --create use ruby-1.9.2@date_validator > /dev/null
+rvm --create use ruby-1.9.2@date_validator

data/Gemfile

@@ -1,12 +1,3 @@
-# A sample Gemfile
-source :gemcutter
+source "http://rubygems.org"
 
-group :development do
-  gem "rspec", "~> 2.5.0"
-  gem "simplecov"
-  gem "jeweler"
-  gem "activesupport", "~> 3.0.0"
-  gem "tzinfo"
-end
-
-gem "activemodel", "~> 3.0.0"
+gemspec

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    date_validator (0.6.1)
+      activemodel (~> 3.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -6,16 +12,10 @@ GEM
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
     activesupport (3.0.0)
+    bluecloth (2.0.11)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    gemcutter (0.6.1)
-    git (1.2.5)
-    i18n (0.4.1)
-    jeweler (1.4.0)
-      gemcutter (>= 0.1.0)
-      git (>= 1.2.5)
-      rubyforge (>= 2.0.0)
-    json_pure (1.4.6)
+    i18n (0.4.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -24,21 +24,21 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    rubyforge (2.0.4)
-      json_pure (>= 1.1.7)
     simplecov (0.3.6)
       simplecov-html (>= 0.3.7)
     simplecov-html (0.3.8)
     tzinfo (0.3.23)
+    yard (0.6.4)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.0)
   activesupport (~> 3.0.0)
-  jeweler
+  bluecloth
+  date_validator!
   rspec (~> 2.5.0)
   simplecov
-  tzinfo
+  tzinfo (~> 0.3.0)
+  yard

data/Rakefile

@@ -1,60 +1,43 @@
-# coding: utf-8
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "date_validator"
-    gem.summary = "A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel."
-    gem.description = "A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options."
-    gem.email = "info@codegram.com"
-    gem.homepage = "http://github.com/codegram/date_validator"
-    gem.authors = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
-
-    gem.add_dependency 'activemodel', '>= 3.0.0'
-
-    gem.add_development_dependency "rspec", '>= 2.0.0.beta.20'
-    gem.add_development_dependency "activesupport", '>= 3.0.0'
-    gem.add_development_dependency "bundler", '>= 1.0.0'
-    gem.add_development_dependency "tzinfo"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-
-# Rake RSpec2 task stuff
-gem 'rspec', '>= 2.0.0.beta.20'
-gem 'rspec-expectations'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
+desc "Run superrtext specs"
+RSpec::Core::RakeTask.new
 
-desc "Run the specs under spec"
-RSpec::Core::RakeTask.new do |t|
-
+require 'yard'
+YARD::Rake::YardocTask.new(:docs) do |t|
+  t.files   = ['lib/**/*.rb']
+  t.options = ['-m', 'markdown', '--no-private', '-r', 'Readme.md', '--title', 'Date Validator documentation']
 end
 
-task :default => :spec
-
-desc 'Run the test suite against 1.8.7-p249, 1.9.2-p0 and jruby-1.5.1'
-task :multitest do
-  system('rvm 1.8.7-p249@date_validator, 1.9.2-p0@date_validator, jruby-1.5.1@date_validator rake')
+site = 'doc'
+source_branch = 'master'
+deploy_branch = 'gh-pages'
+
+desc "generate and deploy documentation website to github pages"
+multitask :pages do
+  puts ">>> Deploying #{deploy_branch} branch to Github Pages <<<"
+  require 'git'
+  repo = Git.open('.')
+  puts "\n>>> Checking out #{deploy_branch} branch <<<\n"
+  repo.branch("#{deploy_branch}").checkout
+  (Dir["*"] - [site]).each { |f| rm_rf(f) }
+  Dir["#{site}/*"].each {|f| mv(f, "./")}
+  rm_rf(site)
+  puts "\n>>> Moving generated site files <<<\n"
+  Dir["**/*"].each {|f| repo.add(f) }
+  repo.status.deleted.each {|f, s| repo.remove(f)}
+  puts "\n>>> Commiting: Site updated at #{Time.now.utc} <<<\n"
+  message = ENV["MESSAGE"] || "Site updated at #{Time.now.utc}"
+  repo.commit(message)
+  puts "\n>>> Pushing generated site to #{deploy_branch} branch <<<\n"
+  repo.push
+  puts "\n>>> Github Pages deploy complete <<<\n"
+  repo.branch("#{source_branch}").checkout
 end
 
+task :doc => [:docs]
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "date_validator #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :spec
+task :test => [:spec]

data/Readme.md

@@ -0,0 +1,32 @@
+# date_validator
+
+A simple date validator for Rails 3. Compatible with Ruby 1.8.7, 1.9.2 and
+Rubinius 1.2.2.
+
+    $ gem sources -a http://gemcutter.org/
+    $ gem install date_validator
+
+And I mean simple. In your model:
+
+    validates :expiration_date,
+              :date => {:after => Proc.new { Time.now },
+                        :before => Proc.new { Time.now + 1.year } }
+    # Using Proc.new prevents production cache issues
+
+For now the available options you can use are `:after`, `:before`,
+`:after_or_equal_to` and `:before_or_equal_to`.
+
+Pretty much self-explanatory! :) 
+
+## Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send us a pull request. Bonus points for topic branches.
+
+## Copyright
+
+Copyright (c) 2011 Codegram. See LICENSE for details.

data/date_validator.gemspec

@@ -1,74 +1,31 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "date_validator/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{date_validator}
-  s.version = "0.6.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
-  s.date = %q{2011-02-10}
+  s.name        = "date_validator"
+  s.version     = DateValidator::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Oriol Gual", "Josep M. Bach", "Josep Jaume Rey"]
+  s.email       = ["info@codegram.com"]
+  s.homepage    = "http://github.com/codegram/date_validator"
+  s.summary     = %q{A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel.}
   s.description = %q{A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options.}
-  s.email = %q{info@codegram.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".bundle/config",
-     ".document",
-     ".gitignore",
-     ".rspec",
-     ".rvmrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "date_validator.gemspec",
-     "lib/date_validator.rb",
-     "locales/ca.yml",
-     "locales/en.yml",
-     "locales/es.yml",
-     "spec/date_validator_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/codegram/date_validator}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel.}
-  s.test_files = [
-    "spec/date_validator_spec.rb",
-     "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "date_validator"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
-      s.add_development_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<tzinfo>, [">= 0"])
-    else
-      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<tzinfo>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.20"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<tzinfo>, [">= 0"])
-  end
-end
+  s.add_runtime_dependency 'activemodel', '~>3.0.0'
+
+  s.add_development_dependency 'rspec', '~> 2.5.0'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'activesupport', '~> 3.0.0'
+  s.add_development_dependency 'tzinfo', '~> 0.3.0'
 
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'bluecloth'
+
+  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.require_paths = ["lib"]
+end

data/lib/active_model/validations/date_validator.rb

@@ -0,0 +1,77 @@
+require 'active_model/validations'
+
+# ActiveModel Rails module.
+module ActiveModel
+
+  # ActiveModel::Validations Rails module. Contains all the default validators.
+  module Validations
+
+    # Date Validator. Inherits from ActiveModel::EachValidator.
+    #
+    # Responds to the regular validator API methods `#check_validity` and
+    # `#validate_each`.
+    class DateValidator < ActiveModel::EachValidator
+
+      # Implemented checks and their associated operators.
+      CHECKS = { :after => :>, :after_or_equal_to => :>=,
+                :before => :<, :before_or_equal_to => :<=}.freeze
+
+      # Call `#initialize` on the superclass, adding a default
+      # `:allow_nil => false` option.
+      def initialize(options)
+        super(options.reverse_merge(:allow_nil => false))
+      end
+
+      # Validates the arguments passed to the validator.
+      #
+      # They must be either any kind of <Time>, a <Proc>, or a <Symbol>.
+      def check_validity!
+        keys = CHECKS.keys
+        options.slice(*keys).each do |option, value|
+          next if is_time?(value) || value.is_a?(Proc) || value.is_a?(Symbol) || (defined?(ActiveSupport::TimeWithZone) and value.is_a? ActiveSupport::TimeWithZone)
+          raise ArgumentError, ":#{option} must be a time, a date, a time_with_zone, a symbol or a proc"
+        end
+      end
+
+      # The actual validator method. It is called when ActiveRecord iterates
+      # over all the validators.
+      def validate_each(record, attr_name, value)
+        return if options[:allow_nil] && value.nil?
+
+        unless value
+          record.errors.add(attr_name, :not_a_date, options)
+          return
+        end
+  
+        options.slice(*CHECKS.keys).each do |option, option_value|
+          option_value = option_value.call(record) if option_value.is_a?(Proc)
+          option_value = record.send(option_value) if option_value.is_a?(Symbol)
+       
+          original_value = value
+          original_option_value = option_value
+
+          # To enable to_i conversion, these types must be converted to Datetimes
+          if defined?(ActiveSupport::TimeWithZone)
+            option_value = option_value.to_datetime if option_value.is_a?(ActiveSupport::TimeWithZone) 
+            value = value.to_datetime if value.is_a?(ActiveSupport::TimeWithZone)  
+          end
+
+          if defined?(Date)
+            option_value = option_value.to_datetime if option_value.is_a?(Date) 
+            value = value.to_datetime if value.is_a?(Date)  
+          end
+         
+          unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
+            record.errors.add(attr_name, option, options.merge(:value => original_value, :date => original_option_value))
+          end
+        end
+      end
+
+      private
+
+      def is_time?(object)
+        object.is_a?(Time) || (defined?(Date) and object.is_a?(Date)) || (defined?(ActiveSupport::TimeWithZone) and object.is_a?(ActiveSupport::TimeWithZone))
+      end
+    end
+  end
+end

data/lib/date_validator.rb

@@ -1,63 +1,15 @@
-require 'active_model'
-
-module ActiveModel
-  module Validations
-    class DateValidator < ActiveModel::EachValidator
-      CHECKS = { :after => :>, :after_or_equal_to => :>=,
-                :before => :<, :before_or_equal_to => :<=}.freeze
-
-      def initialize(options)
-        super(options.reverse_merge(:allow_nil => false))
-      end
-
-      def check_validity!
-        keys = CHECKS.keys
-        options.slice(*keys).each do |option, value|
-          next if is_time?(value) || value.is_a?(Proc) || value.is_a?(Symbol) || (defined?(ActiveSupport::TimeWithZone) and value.is_a? ActiveSupport::TimeWithZone)
-          raise ArgumentError, ":#{option} must be a time, a date, a time_with_zone, a symbol or a proc"
-        end
-      end
-
-      def validate_each(record, attr_name, value)
-
-        return if options[:allow_nil] && value.nil?
-
-        unless value
-          record.errors.add(attr_name, :not_a_date, options)
-          return
-        end
-  
-        options.slice(*CHECKS.keys).each do |option, option_value|
-          option_value = option_value.call(record) if option_value.is_a?(Proc)
-          option_value = record.send(option_value) if option_value.is_a?(Symbol)
-       
-          original_value = value
-          original_option_value = option_value
-
-          # To enable to_i conversion, these types must be converted to Datetimes
-          if defined?(ActiveSupport::TimeWithZone)
-            option_value = option_value.to_datetime if option_value.is_a?(ActiveSupport::TimeWithZone) 
-            value = value.to_datetime if value.is_a?(ActiveSupport::TimeWithZone)  
-          end
-
-          if defined?(Date)
-            option_value = option_value.to_datetime if option_value.is_a?(Date) 
-            value = value.to_datetime if value.is_a?(Date)  
-          end
-         
-          unless is_time?(option_value) && value.to_i.send(CHECKS[option], option_value.to_i)
-            record.errors.add(attr_name, option, options.merge(:value => original_value, :date => original_option_value))
-          end
-        end
-      end
-
-      def is_time?(object)
-        object.is_a?(Time) || (defined?(Date) and object.is_a?(Date)) || (defined?(ActiveSupport::TimeWithZone) and object.is_a?(ActiveSupport::TimeWithZone))
-      end
+require 'active_model/validations/date_validator'
+require 'active_support/i18n'
 
-    end
-  end
+# A simple date validator for Rails 3.
+#
+# @example
+#    validates :expiration_date,
+#              :date => {:after => Proc.new { Time.now },
+#                        :before => Proc.new { Time.now + 1.year } }
+#    # Using Proc.new prevents production cache issues
+#
+module DateValidator
 end
 
-require 'active_support/i18n'
 I18n.load_path += Dir[File.expand_path(File.join(File.dirname(__FILE__), '../locales', '*.yml')).to_s]

data/lib/date_validator/version.rb

@@ -0,0 +1,4 @@
+module DateValidator
+  # The version number.
+  VERSION = "0.6.1"
+end

data/spec/date_validator_spec.rb

@@ -1,125 +1,138 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
-require 'active_support/time' # For testing Date and TimeWithZone objects
+module ActiveModel
+  module Validations
 
-describe "DateValidator" do
+    describe DateValidator do
 
-  before(:each) do
-    TestRecord.reset_callbacks(:validate)
-  end
-
-  it "checks validity of the arguments" do
-    [3, "foo", 1..6].each do |wrong_argument|
-      expect {
-        TestRecord.validates :expiration_date, :date => {:before => wrong_argument}
-      }.to raise_error(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
-    end
-  end
-
-  it "complains if provided with no options" do
-    TestRecord.validates :expiration_date, :date => {:before => Time.now}
-    model = TestRecord.new(nil)
-    model.should_not be_valid
-    model.errors[:expiration_date].should == ["is not a date"]
-  end
-
-  [:valid,:invalid].each do |should_be|
-
-    _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
-
-    context _context do
+      before do
+        TestRecord.reset_callbacks(:validate)
+      end
 
-      [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+      it "checks validity of the arguments" do
+        [3, "foo", 1..6].each do |wrong_argument|
+          expect {
+            TestRecord.validates :expiration_date, 
+                                 :date => {:before => wrong_argument}
+          }.to raise_error(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
+        end
+      end
 
-          now = Time.now.to_datetime
+      it "complains when no options are provided" do
+        TestRecord.validates :expiration_date,
+                             :date => {:before => Time.now}
 
-          model_date = case check
-            when :after then should_be == :valid ? now + 21000 : now - 1
-            when :before then should_be == :valid ? now - 21000 : now + 1
-            when :after_or_equal_to then should_be == :valid ? now : now - 21000
-            when :before_or_equal_to then should_be == :valid ? now : now + 21000
-          end
+        model = TestRecord.new(nil)
+        model.should_not be_valid
+        model.errors[:expiration_date].should eq(["is not a date"])
+      end
 
-          it "ensures that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
-            TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
-            model = TestRecord.new(model_date)
-            should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check") : model.should_not(be_valid, "an attribute should be invalidwhen offending the #{check} check")
+      [:valid,:invalid].each do |should_be|
+        _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
+
+        context _context do
+          [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
+              now = Time.now.to_datetime
+
+              model_date = case check
+                when :after then should_be == :valid ? now + 21000 : now - 1
+                when :before then should_be == :valid ? now - 21000 : now + 1
+                when :after_or_equal_to then should_be == :valid ? now : now - 21000
+                when :before_or_equal_to then should_be == :valid ? now : now + 21000
+              end
+
+              it "ensures that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
+                TestRecord.validates :expiration_date,
+                                     :date => {:"#{check}" => Time.now}
+
+                model = TestRecord.new(model_date)
+                should_be == :valid ? model.should(be_valid, "an attribute should be valid when respecting the #{check} check")\
+                                    : model.should_not(be_valid, "an attribute should be invalidwhen offending the #{check} check")
+              end
+
+              if _context == 'when value does not match validation requirements'
+                it "yields a default error message indicating that value must be #{check} validation requirements" do
+                  TestRecord.validates :expiration_date,
+                                       :date => {:"#{check}" => Time.now}
+
+                  model = TestRecord.new(model_date)
+                  model.should_not be_valid
+                  model.errors[:expiration_date].should eq(["must be " + check.to_s.gsub('_',' ') + " #{Time.now}"])
+                end
+              end
           end
 
           if _context == 'when value does not match validation requirements'
+            it "allows for a custom validation message" do
+              TestRecord.validates :expiration_date,
+                                   :date => {:before_or_equal_to => Time.now,
+                                             :message => 'must be after Christmas'}
 
-            it "yields a default error message indicating that value must be #{check} validation requirements" do
-              TestRecord.validates :expiration_date, :date => {:"#{check}" => Time.now}
-              model = TestRecord.new(model_date)
+              model = TestRecord.new(Time.now + 21000)
               model.should_not be_valid
-              model.errors[:expiration_date].should == ["must be " + check.to_s.gsub('_',' ') + " #{Time.now}"]
+              model.errors[:expiration_date].should eq(["must be after Christmas"])
             end
-            
-          end
 
-      end
+            it "allows custom validation message to be handled by I18n" do
+              custom_message = 'Custom Date Message'
+              I18n.backend.store_translations('en', {:errors => {:messages => {:not_a_date => custom_message}}})
 
-      if _context == 'when value does not match validation requirements'
+              TestRecord.validates :expiration_date, :date => true
 
-        it "allows for a custom validation message" do
-          TestRecord.validates :expiration_date, :date => {:before_or_equal_to => Time.now, :message => 'must be after Christmas'}
-          model = TestRecord.new(Time.now + 21000)
-          model.should_not be_valid
-          model.errors[:expiration_date].should == ["must be after Christmas"]
-        end
+              model = TestRecord.new(nil)
+              model.should_not be_valid
+              model.errors[:expiration_date].should eq([custom_message])
+            end
+          end
 
-        it "allows custom validation message to be handled by I18n" do
-          custom_message = 'Custom Date Message'
-          I18n.backend.store_translations('en', {:errors => {:messages => {:not_a_date => custom_message}}})
-          TestRecord.validates :expiration_date, :date => true
-          model = TestRecord.new(nil)
-          model.should_not be_valid
-          model.errors[:expiration_date].should == [custom_message]
         end
+      end
 
+      extra_types = [:proc, :symbol]
+      extra_types.push(:date) if defined?(Date) and defined?(DateTime)
+      extra_types.push(:time_with_zone) if defined?(ActiveSupport::TimeWithZone)
+
+      extra_types.each do |type|
+        it "accepts a #{type} as an argument to a check" do
+          case type
+            when :proc then
+              expect {
+                TestRecord.validates :expiration_date,
+                                     :date => {:after => Proc.new{Time.now + 21000}}
+              }.to_not raise_error
+            when :symbol then
+              expect {
+                TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
+                TestRecord.validates :expiration_date, :date => {:after => :min_date}
+              }.to_not raise_error
+            when :date then
+              expect {
+                TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
+              }.to_not raise_error
+            when :time_with_zone then
+              expect {
+                Time.zone = "Hawaii"
+                TestRecord.validates :expiration_date, :date => {:before => Time.zone.parse((Time.now + 21000).to_s)}
+              }.to_not raise_error
+          end
+        end
       end
 
-    end
+      it "gracefully handles an unexpected result from a proc argument evaluation" do
+        TestRecord.validates :expiration_date,
+                             :date => {:after => Proc.new{ nil }}
 
-  end
+        TestRecord.new(Time.now).should_not be_valid
+      end
 
-  extra_types = [:proc, :symbol]
-  extra_types.push(:date) if defined?(Date) and defined?(DateTime)
-  extra_types.push(:time_with_zone) if defined?(ActiveSupport::TimeWithZone)
+      it "gracefully handles an unexpected result from a symbol argument evaluation" do
+        TestRecord.send(:define_method, :min_date, lambda { nil })
+        TestRecord.validates :expiration_date,
+                             :date => {:after => :min_date}
 
-  extra_types.each do |type|
-    it "accepts a #{type} as an argument to a check" do
-      case type
-        when :proc then
-          expect {
-            TestRecord.validates :expiration_date, :date => {:after => Proc.new{Time.now + 21000}}
-          }.to_not raise_error
-        when :symbol then
-          expect {
-            TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
-            TestRecord.validates :expiration_date, :date => {:after => :min_date}
-          }.to_not raise_error
-        when :date then
-          expect {
-            TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
-          }.to_not raise_error
-        when :time_with_zone then
-          expect {
-            Time.zone = "Hawaii"
-            TestRecord.validates :expiration_date, :date => {:before => Time.zone.parse((Time.now + 21000).to_s)}
-          }.to_not raise_error
+        TestRecord.new(Time.now).should_not be_valid
       end
     end
-  end
-
-  it "gracefully handles an unexpected result from a proc argument evaluation" do
-    TestRecord.validates :expiration_date, :date => {:after => Proc.new{ nil }}
-    TestRecord.new(Time.now).should_not be_valid
-  end
 
-  it "gracefully handles an unexpected result from a symbol argument evaluation" do
-    TestRecord.send(:define_method, :min_date, lambda { nil })
-    TestRecord.validates :expiration_date, :date => {:after => :min_date}
-    TestRecord.new(Time.now).should_not be_valid
   end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,14 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'simplecov'
 SimpleCov.start do
   add_group "Lib", "lib"
 end
 
-require 'rubygems'
-require 'active_model'
+require 'rspec'
+
+require 'active_support/time' # For testing Date and TimeWithZone objects
 
+require 'active_model'
 require 'date_validator'
-require 'rspec'
 
 class TestRecord
   include ActiveModel::Validations

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: date_validator
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.6.1
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 +01:00
+date: 2011-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,12 +21,8 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -40,69 +32,75 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - 20
-        version: 2.0.0.beta.20
+        version: 2.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: simplecov
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 3.0.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: tzinfo
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options.
-email: info@codegram.com
+email: 
+- info@codegram.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - .bundle/config
 - .document
@@ -111,12 +109,12 @@ files:
 - .rvmrc
 - Gemfile
 - Gemfile.lock
-- LICENSE
-- README.rdoc
 - Rakefile
-- VERSION
+- Readme.md
 - date_validator.gemspec
+- lib/active_model/validations/date_validator.rb
 - lib/date_validator.rb
+- lib/date_validator/version.rb
 - locales/ca.yml
 - locales/en.yml
 - locales/es.yml
@@ -127,8 +125,8 @@ homepage: http://github.com/codegram/date_validator
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -136,21 +134,17 @@ 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
+rubyforge_project: date_validator
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel.

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Josep Mª Bach
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -1,34 +0,0 @@
-= date_validator
-
-A simple date validator for Rails 3. Compatible with Ruby 1.8, 1.9, JRuby 1.5.3
-and Rubinius 1.1.
-
-  gem sources -a http://gemcutter.org/
-  gem install date_validator
-
-And I mean simple. In your model:
-
-  validates :expiration_date, :date => {:after => Proc.new { Time.now } :before => Proc.new { Time.now + 1.year } }
-  # Using Proc.new prevents production cache issues
-
-For now these are the available options you can use:
-
-  :after
-  :before
-  :after_or_equal_to
-  :before_or_equal_to
-
-Pretty much self-explanatory! :) 
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Codegram. See LICENSE for details.

data/VERSION

@@ -1 +0,0 @@
-0.6.0