date_validator 0.6.2 → 0.6.3

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 *.rbc
 doc/*
 .yardoc/*
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,8 @@
+# http://about.travis-ci.org/docs/user/build-configuration/
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - ruby-head
+  - rbx
+  - rbx-2.0

data/Rakefile

@@ -1,43 +1,48 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
-desc "Run superrtext specs"
-RSpec::Core::RakeTask.new
-
-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']
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = true
 end
 
-site = 'doc'
-source_branch = 'master'
-deploy_branch = 'gh-pages'
+begin
+  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
 
-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
+  site = 'doc'
+  source_branch = 'master'
+  deploy_branch = 'gh-pages'
 
-task :doc => [:docs]
+  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]
+rescue LoadError
+end
 
-task :default => :spec
-task :test => [:spec]
+task :default => :test

data/Readme.md

@@ -39,6 +39,12 @@ validates :start_date,
 
 Pretty much self-explanatory! :) 
 
+If you want to make sure an attribute is before/after another attribute, use:
+
+```ruby
+validates :start_date, :date => {:before => :end_date }
+```
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/date_validator.gemspec

@@ -14,16 +14,13 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "date_validator"
 
-  s.add_runtime_dependency 'activemodel', ['>= 3.0.0', '< 3.2.0']
+  s.add_runtime_dependency 'activemodel', ['~> 3.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 'minitest'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'activesupport', ['~> 3.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) }

data/lib/date_validator/version.rb

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

data/{spec/date_validator_spec.rb → test/date_validator_test.rb}

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'test_helper'
 
 module ActiveModel
   module Validations
@@ -11,50 +11,49 @@ module ActiveModel
 
       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")
+          proc {
+            TestRecord.validates(:expiration_date, :date => {:before => wrong_argument})
+          }.must_raise(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
         end
       end
 
       it "complains when no options are provided" do
+        I18n.backend.reload!
         TestRecord.validates :expiration_date,
                              :date => {:before => Time.now}
 
         model = TestRecord.new(nil)
-        model.should_not be_valid
-        model.errors[:expiration_date].should eq(["is not a date"])
+        model.valid?.must_equal false
+        model.errors[:expiration_date].must_equal(["is not a date"])
       end
 
       it "works with helper methods" do
         time = Time.now
         TestRecord.validates_date_of :expiration_date, :before => time
         model = TestRecord.new(time + 20000)
-        model.should_not be_valid
+        model.valid?.must_equal false
       end
 
-      [:valid,:invalid].each do |should_be|
-        _context = should_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
+      [:valid,:invalid].each do |must_be|
+        _context = must_be == :valid ? 'when value validates correctly' : 'when value does not match validation requirements'
 
-        context _context do
+        describe _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
+                when :after then must_be == :valid ? now + 21000 : now - 1
+                when :before then must_be == :valid ? now - 21000 : now + 1
+                when :after_or_equal_to then must_be == :valid ? now : now - 21000
+                when :before_or_equal_to then must_be == :valid ? now : now + 21000
               end
 
-              it "ensures that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
+              it "ensures that an attribute is #{must_be} when #{must_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
                 TestRecord.validates :expiration_date,
                                      :date => {:"#{check}" => 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")
+                must_be == :valid ? model.valid?.must_equal(true) : model.valid?.must_equal(false)
               end
 
               if _context == 'when value does not match validation requirements'
@@ -63,8 +62,8 @@ module ActiveModel
                                        :date => {:"#{check}" => now}
 
                   model = TestRecord.new(model_date)
-                  model.should_not be_valid
-                  model.errors[:expiration_date].should eq(["must be " + check.to_s.gsub('_',' ') + " #{I18n.localize(now)}"])
+                  model.valid?.must_equal false
+                  model.errors[:expiration_date].must_equal(["must be " + check.to_s.gsub('_',' ') + " #{I18n.localize(now)}"])
                 end
               end
           end
@@ -78,8 +77,8 @@ module ActiveModel
                                              :message => 'must be after Christmas'}
 
               model = TestRecord.new(now + 21000)
-              model.should_not be_valid
-              model.errors[:expiration_date].should eq(["must be after Christmas"])
+              model.valid?.must_equal false
+              model.errors[:expiration_date].must_equal(["must be after Christmas"])
             end
 
             it "allows custom validation message to be handled by I18n" do
@@ -89,8 +88,8 @@ module ActiveModel
               TestRecord.validates :expiration_date, :date => true
 
               model = TestRecord.new(nil)
-              model.should_not be_valid
-              model.errors[:expiration_date].should eq([custom_message])
+              model.valid?.must_equal false
+              model.errors[:expiration_date].must_equal([custom_message])
             end
           end
 
@@ -105,24 +104,15 @@ module ActiveModel
         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
+              TestRecord.validates(:expiration_date, :date => {:after => Proc.new{Time.now + 21000}}).must_be_kind_of Hash
             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
+              TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
+              TestRecord.validates(:expiration_date, :date => {:after => :min_date}).must_be_kind_of Hash
             when :date then
-              expect {
-                TestRecord.validates :expiration_date, :date => {:after => Time.now.to_date}
-              }.to_not raise_error
+              TestRecord.validates(:expiration_date, :date => {:after => Time.now.to_date}).must_be_kind_of Hash
             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
+              Time.zone = "Hawaii"
+              TestRecord.validates(:expiration_date, :date => {:before => Time.zone.parse((Time.now + 21000).to_s)}).must_be_kind_of Hash
           end
         end
       end
@@ -131,7 +121,7 @@ module ActiveModel
         TestRecord.validates :expiration_date,
                              :date => {:after => Proc.new{ nil }}
 
-        TestRecord.new(Time.now).should_not be_valid
+        TestRecord.new(Time.now).valid?.must_equal false
       end
 
       it "gracefully handles an unexpected result from a symbol argument evaluation" do
@@ -139,7 +129,7 @@ module ActiveModel
         TestRecord.validates :expiration_date,
                              :date => {:after => :min_date}
 
-        TestRecord.new(Time.now).should_not be_valid
+        TestRecord.new(Time.now).valid?.must_equal false
       end
     end
 

data/{spec/spec_helper.rb → test/test_helper.rb}

@@ -1,9 +1,15 @@
-require 'simplecov'
-SimpleCov.start do
-  add_group "Lib", "lib"
+begin
+  require 'simplecov'; 
+  SimpleCov.start do
+    add_group "Lib", 'lib'
+  end
+rescue LoadError
 end
 
-require 'rspec'
+begin; require 'turn'; rescue LoadError; end
+
+require 'minitest/spec'
+require 'minitest/autorun'
 
 require 'active_support/time' # For testing Date and TimeWithZone objects
 

metadata

@@ -1,116 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: date_validator
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.6.3
   prerelease: 
-  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Oriol Gual
 - Josep M. Bach
 - Josep Jaume Rey
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activemodel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70140810524120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
-    - - <
-      - !ruby/object:Gem::Version 
-        version: 3.2.0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70140810524120
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70140810523700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.5.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70140810523700
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70140810523240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70140810523240
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70140810522720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70140810522720
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &70140810522220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !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 
-        version: "0"
-  type: :development
-  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: 
+  version_requirements: *70140810522220
+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
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .bundle/config
+files:
 - .document
+- .gemtest
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - Rakefile
 - Readme.md
@@ -123,35 +96,33 @@ files:
 - locales/es.yml
 - locales/nl.yml
 - locales/ru.yml
-- spec/date_validator_spec.rb
-- spec/spec_helper.rb
+- test/date_validator_test.rb
+- test/test_helper.rb
 homepage: http://github.com/codegram/date_validator
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: date_validator
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based on ActiveModel.
-test_files: 
-- spec/date_validator_spec.rb
-- spec/spec_helper.rb
+summary: A simple, ORM agnostic, Ruby 1.9 compatible date validator for Rails 3, based
+  on ActiveModel.
+test_files:
+- test/date_validator_test.rb
+- test/test_helper.rb

data/.bundle/config

@@ -1,2 +0,0 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    date_validator (0.6.1)
-      activemodel (>= 3.0.0, < 3.2.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.0.0)
-      activesupport (= 3.0.0)
-      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)
-    i18n (0.4.2)
-    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.5.0)
-    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
-  activesupport (~> 3.0.0)
-  bluecloth
-  date_validator!
-  rspec (~> 2.5.0)
-  simplecov
-  tzinfo (~> 0.3.0)
-  yard