date_validator 0.4.3 → 0.5.0

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format documentation

data/Rakefile

@@ -11,30 +11,27 @@ begin
     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.beta3'
+    gem.add_dependency 'activemodel', '>= 3.0.0.beta4'
 
-    gem.add_development_dependency "rspec"
-
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_development_dependency "rspec", '>= 2.0.0.beta.12'
+    gem.add_development_dependency "activesupport", '>= 3.0.0.beta4'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+# Rake RSpec2 task stuff
+gem 'rspec', '>= 2.0.0.beta.12'
+gem 'rspec-expectations'
 
-task :spec => :check_dependencies
+require 'rspec/core/rake_task'
+
+desc "Run the specs under spec"
+RSpec::Core::RakeTask.new do |t|
+
+end
 
 task :default => :spec
 

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/date_validator.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{date_validator}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oriol Gual", "Josep M\302\252 Bach", "Josep Jaume Rey"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-06-16}
   s.description = %q{A simple date validator for Rails 3. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options. Remarkable-friendly :)}
   s.email = %q{info@codegram.com}
   s.extra_rdoc_files = [
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
      ".gitignore",
+     ".rspec",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -27,13 +28,12 @@ Gem::Specification.new do |s|
      "lib/date_validator.rb",
      "locales/en.yml",
      "spec/date_validator_spec.rb",
-     "spec/spec.opts",
      "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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple date validator for Rails 3.}
   s.test_files = [
     "spec/date_validator_spec.rb",
@@ -44,16 +44,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activemodel>, [">= 3.0.0.beta4"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+      s.add_development_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
     else
-      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
-      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0.beta4"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
     end
   else
-    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta3"])
-    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0.beta4"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
   end
 end
 

data/lib/date_validator.rb

@@ -11,8 +11,8 @@ module ActiveModel
       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)
-          raise ArgumentError, ":#{option} must be a time, a date, a symbol or a proc"
+          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
 

data/spec/date_validator_spec.rb

@@ -1,5 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+require 'active_support/time' # For testing Date and TimeWithZone objects
+
 describe "DateValidator" do
 
   before(:each) do
@@ -8,23 +10,22 @@ describe "DateValidator" do
 
   it "should check validity of the arguments" do
     [3, "foo", 1..6].each do |wrong_argument|
-      begin
+      expect {
         TestRecord.validates :expiration_date, :date => {:before => wrong_argument}
-        fail "should not accept a #{wrong_argument.class} as an option (only Time, Date, Symbol or Proc)"
-      rescue=>e
-        fail e unless e.is_a?(ArgumentError)
-      end
+      }.to raise_error(ArgumentError, ":before must be a time, a date, a time_with_zone, a symbol or a proc")
     end
   end
 
   [:after, :before, :after_or_equal_to, :before_or_equal_to].each do |check|
     [:valid,:invalid].each do |should_be|
 
+      now = Time.now.to_datetime
+
       model_date = case check
-        when :after then should_be == :valid ? Time.now + 21000 : Time.now - 1
-        when :before then should_be == :valid ? Time.now - 21000 : Time.now + 1
-        when :after_or_equal_to then should_be == :valid ? Time.now + 21000 : Time.now - 21000
-        when :before_or_equal_to then should_be == :valid ? Time.now - 21000 : Time.now + 21000
+        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 "should ensure that an attribute is #{should_be} when #{should_be == :valid ? 'respecting' : 'offending' } the #{check} check" do
@@ -37,34 +38,42 @@ describe "DateValidator" do
   end
 
   extra_types = [:proc, :symbol]
-  # extra_types.push(:date) if defined?(Date) and defined?(DateTime)
+  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 "should accept a #{type} as an argument to a check" do
       case type
         when :proc then
-          TestRecord.validates :expiration_date, :date => {:after => Proc.new{Time.now + 21000}}
+          expect {
+            TestRecord.validates :expiration_date, :date => {:after => Proc.new{Time.now + 21000}}
+          }.to_not raise_error
         when :symbol then
-          begin
+          expect {
             TestRecord.send(:define_method, :min_date, lambda { Time.now + 21000 })
             TestRecord.validates :expiration_date, :date => {:after => :min_date}
-          rescue=>e
-            fail "is not accepting a #{type} as an argument to a check"
-          end
-        # when :date then
-        #   TestRecord.validates :expiration_date, :date => {:after => Time.now.to_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
 
   it "should gracefully handle an unexpected result from a proc argument evaluation" do
     TestRecord.validates :expiration_date, :date => {:after => Proc.new{ nil }}
-    TestRecord.new(Time.now).valid?.should be_false
+    TestRecord.new(Time.now).should_not be_valid
   end
 
   it "should gracefully handle 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).valid?.should be_false
+    TestRecord.new(Time.now).should_not be_valid
   end
 end

data/spec/spec_helper.rb

@@ -5,9 +5,8 @@ require 'rubygems'
 require 'active_model'
 
 require 'lib/date_validator'
-require 'spec'
-require 'spec/autorun'
-
+require 'rspec'
+require 'rspec/autorun'
 
 class TestRecord
   include ActiveModel::Validations
@@ -17,7 +16,3 @@ class TestRecord
     @expiration_date = expiration_date
   end
 end
-
-Spec::Runner.configure do |config|
-  
-end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: date_validator
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Oriol Gual
@@ -16,36 +17,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +02:00
+date: 2010-06-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 299253624
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196475
         segments: 
+        - 2
+        - 0
         - 0
-        version: "0"
+        - beta
+        - 12
+        version: 2.0.0.beta.12
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 299253624
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
+  type: :development
+  version_requirements: *id003
 description: A simple date validator for Rails 3. Currently supporting :after, :before, :after_or_equal_to and :before_or_equal_to options. Remarkable-friendly :)
 email: info@codegram.com
 executables: []
@@ -58,6 +84,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -66,7 +93,6 @@ files:
 - lib/date_validator.rb
 - locales/en.yml
 - spec/date_validator_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/codegram/date_validator
@@ -78,23 +104,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple date validator for Rails 3.

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---format progress