validates_timeliness 2.3.2 → 3.0.0.beta

data/spec/validates_timeliness/validator/on_or_after_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe ValidatesTimeliness::Validator, ":on_or_after option" do
+  include ModelHelpers 
+
+  describe "for date type" do
+    before do
+      Person.validates_date :birth_date, :on_or_after => Date.new(2010, 1, 1)
+    end
+
+    it "should not be valid for date before restriction" do
+      invalid!(:birth_date, Date.new(2009, 12, 31), 'must be on or after 2010-01-01')
+    end
+
+    it "should be valid for same date value" do
+      valid!(:birth_date, Date.new(2010, 1, 1))
+    end
+
+    it "should be valid for date after restriction" do
+      valid!(:birth_date, Date.new(2010, 1, 2))
+    end
+  end
+
+  describe "for time type" do
+    before do
+      Person.validates_time :birth_time, :on_or_after => Time.mktime(2000, 1, 1, 12, 0, 0)
+    end
+
+    it "should not be valid for time before restriction" do
+      invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be on or after 12:00:00')
+    end
+
+    it "should be valid for time after restriction" do
+      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01))
+    end
+
+    it "should be valid for same time as restriction" do
+      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+    end
+  end
+
+  describe "for datetime type" do
+    before do
+      Person.validates_datetime :birth_datetime, :on_or_after => DateTime.civil_from_format(:local, 2010, 1, 1, 12, 0, 0)
+    end
+
+    it "should not be valid for datetime before restriction" do
+      invalid!(:birth_datetime, DateTime.civil_from_format(:local, 2010, 1, 1, 11, 59, 59), 'must be on or after 2010-01-01 12:00:00')
+    end
+
+    it "should be valid for same datetime as restriction" do
+      valid!(:birth_datetime, DateTime.civil_from_format(:local, 2010, 1, 1, 12, 0, 0))
+    end
+
+    it "should be valid for datetime after restriction" do
+      valid!(:birth_datetime, DateTime.civil_from_format(:local, 2010, 1, 1, 12, 0, 1))
+    end
+  end
+end

data/spec/validates_timeliness/validator/on_or_before_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe ValidatesTimeliness::Validator, ":on_or_before option" do
+  include ModelHelpers 
+
+  describe "for date type" do
+    before do
+      Person.validates_date :birth_date, :on_or_before => Date.new(2010, 1, 1)
+    end
+
+    it "should not be valid for date after restriction" do
+      invalid!(:birth_date, Date.new(2010, 1, 2), 'must be on or before 2010-01-01')
+    end
+
+    it "should be valid for date before restriction" do
+      valid!(:birth_date, Date.new(2009, 12, 31))
+    end
+
+    it "should be valid for same date value" do
+      valid!(:birth_date, Date.new(2010, 1, 1))
+    end
+  end
+
+  describe "for time type" do
+    before do
+      Person.validates_time :birth_time, :on_or_before => Time.mktime(2000, 1, 1, 12, 0, 0)
+    end
+
+    it "should not be valid for time after restriction" do
+      invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be on or before 12:00:00')
+    end
+
+    it "should be valid for time before restriction" do
+      valid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59))
+    end
+
+    it "should be valid for same time as restriction" do
+      valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
+    end
+  end
+
+  describe "for datetime type" do
+    before do
+      Person.validates_datetime :birth_datetime, :on_or_before => DateTime.civil_from_format(:local, 2010, 1, 1, 12, 0, 0)
+    end
+
+    it "should not be valid for datetime after restriction" do
+      invalid!(:birth_datetime, DateTime.civil_from_format(:local, 2010, 1, 1, 12, 0, 1), 'must be on or before 2010-01-01 12:00:00')
+    end
+
+    it "should be valid for same datetime as restriction" do
+      valid!(:birth_datetime, DateTime.civil_from_format(:local, 2010, 1, 1, 12, 0, 0))
+    end
+
+    it "should not be valid for datetime before restriction" do
+      valid!(:birth_datetime, DateTime.civil_from_format(:local, 2010, 1, 1, 11, 59, 59))
+    end
+  end
+end

data/spec/validates_timeliness/validator_spec.rb

@@ -0,0 +1,172 @@
+require 'spec_helper'
+
+describe ValidatesTimeliness::Validator do
+  include ModelHelpers
+  NIL = [nil]
+
+  before do
+    Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
+  end
+
+  it 'should return validator kind as :timeliness' do
+    ValidatesTimeliness::Validator.kind.should == :timeliness 
+  end
+
+  describe "Model.validates :timeliness option" do
+    it 'should use plugin validator class' do
+      Person.validates :birth_date, :timeliness => {:is_at => Date.new(2010,1,1), :type => :date}
+      Person.validators.should have(1).kind_of(TimelinessValidator)
+      invalid!(:birth_date, Date.new(2010,1,2))
+      valid!(:birth_date, Date.new(2010,1,1))
+    end
+
+    it 'should use default to :datetime type' do
+      Person.validates :birth_datetime, :timeliness => {:is_at => Time.mktime(2010,1,1)}
+      Person.validators.first.type.should == :datetime
+    end
+  end
+
+  it 'should not be valid for value which not valid date or time value' do
+    Person.validates_date :birth_date
+    invalid!(:birth_date, "Not a date", 'is not a valid date')
+  end
+
+  it 'should not be valid attribute is type cast to nil but raw value is non-nil invalid value' do
+    Person.validates_date :birth_date, :allow_nil => true
+    record = Person.new
+    record.stub!(:birth_date).and_return(nil)
+    record.stub!(:_timeliness_raw_value_for).and_return("Not a date")
+    record.should_not be_valid
+    record.errors[:birth_date].first.should == 'is not a valid date'
+  end
+
+  describe ":allow_nil option" do
+    it 'should not allow nil by default' do
+      Person.validates_date :birth_date
+      invalid!(:birth_date, NIL, 'is not a valid date')
+      valid!(:birth_date, Date.today)
+    end
+
+    it 'should allow nil when true' do
+      Person.validates_date :birth_date, :allow_nil => true
+      valid!(:birth_date, NIL)
+    end
+  end
+
+  describe ":allow_blank option" do
+    it 'should not allow blank by default' do
+      Person.validates_date :birth_date
+      invalid!(:birth_date, '', 'is not a valid date')
+      valid!(:birth_date, Date.today)
+    end
+
+    it 'should allow blank when true' do
+      Person.validates_date :birth_date, :allow_blank => true
+      valid!(:birth_date, '')
+    end
+  end
+
+  describe ":between option" do
+    describe "array value" do
+      it 'should be split option into :on_or_after and :on_or_before values' do
+        on_or_after, on_or_before = Date.new(2010,1,1), Date.new(2010,1,2)
+        Person.validates_time :birth_date, :between => [on_or_after, on_or_before]
+        Person.validators.first.options[:on_or_after].should == on_or_after
+        Person.validators.first.options[:on_or_before].should == on_or_before
+      end
+    end
+
+    describe "range value" do
+      it 'should be split option into :on_or_after and :on_or_before values' do
+        on_or_after, on_or_before = Date.new(2010,1,1), Date.new(2010,1,2)
+        Person.validates_time :birth_date, :between => on_or_after..on_or_before
+        Person.validators.first.options[:on_or_after].should == on_or_after
+        Person.validators.first.options[:on_or_before].should == on_or_before
+      end
+    end
+  end
+
+  describe ":ignore_usec option" do
+    it "should not be valid when usec values don't match and option is false" do
+      Person.validates_datetime :birth_datetime, :on_or_before => Time.utc(2010,1,2,3,4,5), :ignore_usec => false
+      invalid!(:birth_datetime, Time.utc(2010,1,2,3,4,5,10000))
+    end
+
+    it "should be valid when usec values dont't match and option is true" do
+      Person.validates_datetime :birth_datetime, :on_or_before => Time.utc(2010,1,2,3,4,5), :ignore_usec => true
+      valid!(:birth_datetime, Time.utc(2010,1,2,3,4,5,10000))
+    end
+  end
+
+  describe ":format option" do
+    before(:all) do
+      ValidatesTimeliness.use_plugin_parser = true
+    end
+
+    it "should be valid when value matches format" do
+      Person.validates_date :birth_date, :format => 'dd-mm-yyyy'
+      valid!(:birth_date, '11-12-1913')
+    end
+
+    it "should not be valid when value does not match format" do
+      Person.validates_date :birth_date, :format => 'dd/mm/yyyy'
+      invalid!(:birth_date, '1913-12-11', 'is not a valid date')
+    end
+
+    after(:all) do
+      ValidatesTimeliness.use_plugin_parser = false
+    end
+  end
+
+  describe "restriction value errors" do
+    let(:person) { Person.new(:birth_date => Date.today) }
+
+    before do
+      Person.validates_time :birth_date, :is_at => lambda { raise }
+    end
+
+    it "should be added when ignore_restriction_errors is false" do
+      ValidatesTimeliness.ignore_restriction_errors = false
+      person.valid?
+      person.errors[:birth_date].first.should match("Error occurred validating birth_date for :is_at restriction")
+    end
+
+    it "should not be added when ignore_restriction_errors is true" do
+      ValidatesTimeliness.ignore_restriction_errors = true
+      person.valid?
+      person.errors[:birth_date].should be_empty
+    end
+
+    after :all do
+      ValidatesTimeliness.ignore_restriction_errors = false
+    end
+  end
+
+  describe "#format_error_value" do
+    describe "default" do
+      it 'should format date error value as yyyy-mm-dd' do
+        validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_date], :type => :date)
+        validator.format_error_value(Date.new(2010,1,1)).should == '2010-01-01'
+      end
+
+      it 'should format time error value as hh:nn:ss' do
+        validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_time], :type => :time)
+        validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '12:34:56'
+      end
+
+      it 'should format datetime error value as yyyy-mm-dd hh:nn:ss' do
+        validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_datetime], :type => :datetime)
+        validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '2010-01-01 12:34:56'
+      end
+    end
+  end
+
+  context "custom error message" do
+  
+    it 'should be used for failing restriction' do
+      Person.validates_date :birth_date, :before => Time.now, :before_message => 'custom before message'
+      invalid!(:birth_date, Time.now, 'custom before message')
+    end
+
+  end
+end

data/validates_timeliness.gemspec

@@ -0,0 +1,30 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{validates_timeliness}
+  s.version = "3.0.0.beta"
+
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Adam Meehan"]
+  s.autorequire = %q{validates_timeliness}
+  s.date = %q{2010-09-17}
+  s.description = %q{Date and time validation plugin for Rails which allows custom formats}
+  s.email = %q{adam.meehan@gmail.com}
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "CHANGELOG"]
+  s.files = ["validates_timeliness.gemspec", "LICENSE", "CHANGELOG", "README.rdoc", "Rakefile", "lib/generators", "lib/generators/validates_timeliness", "lib/generators/validates_timeliness/install_generator.rb", "lib/generators/validates_timeliness/templates", "lib/generators/validates_timeliness/templates/en.yml", "lib/generators/validates_timeliness/templates/validates_timeliness.rb", "lib/validates_timeliness", "lib/validates_timeliness/attribute_methods.rb", "lib/validates_timeliness/conversion.rb", "lib/validates_timeliness/extensions", "lib/validates_timeliness/extensions/date_time_select.rb", "lib/validates_timeliness/extensions/multiparameter_handler.rb", "lib/validates_timeliness/extensions.rb", "lib/validates_timeliness/helper_methods.rb", "lib/validates_timeliness/orms", "lib/validates_timeliness/orms/active_record.rb", "lib/validates_timeliness/parser.rb", "lib/validates_timeliness/validator.rb", "lib/validates_timeliness/version.rb", "lib/validates_timeliness.rb", "spec/model_helpers.rb", "spec/spec_helper.rb", "spec/test_model.rb", "spec/validates_timeliness", "spec/validates_timeliness/attribute_methods_spec.rb", "spec/validates_timeliness/conversion_spec.rb", "spec/validates_timeliness/extensions", "spec/validates_timeliness/extensions/date_time_select_spec.rb", "spec/validates_timeliness/extensions/multiparameter_handler_spec.rb", "spec/validates_timeliness/helper_methods_spec.rb", "spec/validates_timeliness/parser_spec.rb", "spec/validates_timeliness/validator", "spec/validates_timeliness/validator/after_spec.rb", "spec/validates_timeliness/validator/before_spec.rb", "spec/validates_timeliness/validator/is_at_spec.rb", "spec/validates_timeliness/validator/on_or_after_spec.rb", "spec/validates_timeliness/validator/on_or_before_spec.rb", "spec/validates_timeliness/validator_spec.rb"]
+  s.homepage = %q{http://github.com/adzap/validates_timeliness}
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{validates_timeliness}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Date and time validation plugin for Rails which allows custom formats}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    else
+    end
+  else
+  end
+end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: validates_timeliness
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 31098225
+  prerelease: true
   segments: 
-  - 2
   - 3
-  - 2
-  version: 2.3.2
+  - 0
+  - 0
+  - beta
+  version: 3.0.0.beta
 platform: ruby
 authors: 
 - Adam Meehan
@@ -15,11 +16,11 @@ autorequire: validates_timeliness
 bindir: bin
 cert_chain: []
 
-date: 2010-11-07 00:00:00 +11:00
+date: 2010-09-17 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
-description: Date and time validation plugin for Rails 2.x which allows custom formats
+description: Date and time validation plugin for Rails which allows custom formats
 email: adam.meehan@gmail.com
 executables: []
 
@@ -28,43 +29,42 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
-- TODO
 - CHANGELOG
 files: 
+- validates_timeliness.gemspec
 - LICENSE
+- CHANGELOG
 - README.rdoc
 - Rakefile
-- TODO
-- CHANGELOG
-- lib/validates_timeliness/action_view/instance_tag.rb
-- lib/validates_timeliness/active_record/attribute_methods.rb
-- lib/validates_timeliness/active_record/multiparameter_attributes.rb
-- lib/validates_timeliness/formats.rb
-- lib/validates_timeliness/locale/en.new.yml
-- lib/validates_timeliness/locale/en.old.yml
-- lib/validates_timeliness/matcher.rb
+- lib/generators/validates_timeliness/install_generator.rb
+- lib/generators/validates_timeliness/templates/en.yml
+- lib/generators/validates_timeliness/templates/validates_timeliness.rb
+- lib/validates_timeliness/attribute_methods.rb
+- lib/validates_timeliness/conversion.rb
+- lib/validates_timeliness/extensions/date_time_select.rb
+- lib/validates_timeliness/extensions/multiparameter_handler.rb
+- lib/validates_timeliness/extensions.rb
+- lib/validates_timeliness/helper_methods.rb
+- lib/validates_timeliness/orms/active_record.rb
 - lib/validates_timeliness/parser.rb
-- lib/validates_timeliness/spec/rails/matchers/validate_timeliness.rb
-- lib/validates_timeliness/validation_methods.rb
 - lib/validates_timeliness/validator.rb
 - lib/validates_timeliness/version.rb
 - lib/validates_timeliness.rb
-- spec/action_view/instance_tag_spec.rb
-- spec/active_record/attribute_methods_spec.rb
-- spec/active_record/multiparameter_attributes_spec.rb
-- spec/formats_spec.rb
-- spec/ginger_scenarios.rb
-- spec/parser_spec.rb
-- spec/resources/application.rb
-- spec/resources/person.rb
-- spec/resources/schema.rb
-- spec/resources/sqlite_patch.rb
-- spec/spec/rails/matchers/validate_timeliness_spec.rb
+- spec/model_helpers.rb
 - spec/spec_helper.rb
-- spec/time_travel/MIT-LICENSE
-- spec/time_travel/time_extensions.rb
-- spec/time_travel/time_travel.rb
-- spec/validator_spec.rb
+- spec/test_model.rb
+- spec/validates_timeliness/attribute_methods_spec.rb
+- spec/validates_timeliness/conversion_spec.rb
+- spec/validates_timeliness/extensions/date_time_select_spec.rb
+- spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
+- spec/validates_timeliness/helper_methods_spec.rb
+- spec/validates_timeliness/parser_spec.rb
+- spec/validates_timeliness/validator/after_spec.rb
+- spec/validates_timeliness/validator/before_spec.rb
+- spec/validates_timeliness/validator/is_at_spec.rb
+- spec/validates_timeliness/validator/on_or_after_spec.rb
+- spec/validates_timeliness/validator/on_or_before_spec.rb
+- spec/validates_timeliness/validator_spec.rb
 has_rdoc: true
 homepage: http://github.com/adzap/validates_timeliness
 licenses: []
@@ -86,18 +86,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
-rubyforge_project: validatestime
+rubyforge_project: validates_timeliness
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Date and time validation plugin for Rails 2.x which allows custom formats
+summary: Date and time validation plugin for Rails which allows custom formats
 test_files: []