mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-24 06:46:44 +00:00
Compare commits
No commits in common. "master" and "3.0.0" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,6 +1,3 @@
|
||||
pkg/
|
||||
.bundle/
|
||||
.rvmrc
|
||||
Gemfile.lock
|
||||
gemfiles/*.lock
|
||||
.byebug_history
|
||||
|
||||
4
.rspec
4
.rspec
@ -1,4 +1,2 @@
|
||||
--format documentation
|
||||
--format nested
|
||||
--color
|
||||
--require spec_helper
|
||||
--require byebug
|
||||
|
||||
20
.travis.yml
20
.travis.yml
@ -1,20 +0,0 @@
|
||||
language: ruby
|
||||
before_install: gem install bundler
|
||||
cache: bundler
|
||||
|
||||
gemfile:
|
||||
- gemfiles/rails_5_0.gemfile
|
||||
- gemfiles/rails_5_1.gemfile
|
||||
- gemfiles/rails_5_2.gemfile
|
||||
|
||||
rvm:
|
||||
- "2.5.3"
|
||||
|
||||
script: 'bundle exec rspec'
|
||||
|
||||
notifications:
|
||||
email:
|
||||
recipients:
|
||||
- adam.meehan@gmail.com
|
||||
on_failure: change
|
||||
on_success: never
|
||||
11
Appraisals
11
Appraisals
@ -1,11 +0,0 @@
|
||||
appraise "rails_5_0" do
|
||||
gem "rails", "~> 5.0.0"
|
||||
end
|
||||
|
||||
appraise "rails_5_1" do
|
||||
gem "rails", "~> 5.1.0"
|
||||
end
|
||||
|
||||
appraise "rails_5_2" do
|
||||
gem "rails", "~> 5.2.0"
|
||||
end
|
||||
@ -1,93 +1,3 @@
|
||||
= [UNRELEASED]
|
||||
* Fix DateTimeSelect extension support (AquisTech)
|
||||
* Relaxed Timeliness dependency version which allows for >= 0.4.0 with
|
||||
threadsafety fix for use_us_formats and use_euro_formats for hot switching
|
||||
in a request.
|
||||
* Add initializer to ensure Timeliness v0.4+ ambiguous date config is set
|
||||
correctly when using `use_euro_formats` or `remove_use_formats'.
|
||||
|
||||
Breaking Changes
|
||||
* Update Multiparameter extension to use ActiveRecord type classes with multiparameter handling
|
||||
which stores a hash of multiparamter values as the value before type cast, no longer a mushed datetime string
|
||||
* Removed all custom plugin attribute methods and method overrides in favour using ActiveModel type system
|
||||
|
||||
= 4.1.0 [2019-06-11]
|
||||
* Relaxed Timeliness dependency version to >= 0.3.10 and < 1, which allows
|
||||
version 0.4 with threadsafety fix for use_us_formats and use_euro_formats
|
||||
hot switching in a request.
|
||||
|
||||
= 4.0.2 [2016-01-07]
|
||||
* Fix undefine_generated_methods ivar guard setting to false
|
||||
|
||||
= 4.0.1 [2016-01-06]
|
||||
* Fix undefine_generated_methods thread locking bug
|
||||
* Created an ActiveModel ORM, for manual require if using without any full blown ORM
|
||||
|
||||
= 4.0.0 [2015-12-29]
|
||||
* Extracted mongoid support into https://github.com/adzap/validates_timeliness-mongoid which is broken (not supported anymore).
|
||||
* Fixed Rails 4.0, 4.1 and 4.2 compatability issues
|
||||
* Upgrade specs to RSpec 3
|
||||
* Added travis config
|
||||
* Huge thanks to @johncarney for keeping it alive with his fork (https://github.com/johncarney/validates_timeliness)
|
||||
|
||||
= 3.0.15 [2015-12-29]
|
||||
* Fixes mongoid 3 support and removes mongoid 2 support(johnnyshields)
|
||||
* Some documentation/comments tidying
|
||||
* Some general tidying up
|
||||
|
||||
= 3.0.14 [2012-08-23]
|
||||
* Fix for using validates :timeliness => {} form to correctly add attributes to timeliness validated attributes.
|
||||
|
||||
= 3.0.13 [2012-08-21]
|
||||
* Fix ActiveRecord issues with using plugin parser by using old way of caching values.
|
||||
* Allow any ActiveRecord non-column attribute to be validated
|
||||
|
||||
= 3.0.12 [2012-06-23]
|
||||
* Fix load order issue when relying on Railtie to load ActiveRecord extension
|
||||
|
||||
= 3.0.11 [2012-04-01]
|
||||
* Change dependency on Timeliness version due to a broken release
|
||||
|
||||
= 3.0.10 [2012-03-26]
|
||||
* Fix for ActiveRecord shim and validation with :allow_blank => true in AR 3.1+. Fixes issue#52.
|
||||
|
||||
= 3.0.9 [2012-03-26]
|
||||
* ActiveRecord 3.1+ suport
|
||||
* Fixes for multiparameter extension with empty date values (thanks @mogox, @Sharagoz)
|
||||
|
||||
= 3.0.8 [2011-12-24]
|
||||
* Remove deprecated InstanceMethods module when using AS::Concern (carlosantoniodasilva)
|
||||
* Update Mongoid shim for v2.3 compatability.
|
||||
|
||||
= 3.0.7 [2011-09-21]
|
||||
* Fix ActiveRecord before_type_cast extension for non-dirty attributes.
|
||||
* Don't override AR before_type_cast for >= 3.1.0 which now has it's own implementation for date/time attributes.
|
||||
* Fix DateTimeSelect extension to convert params to integers (#45)
|
||||
* Add #change method to DateTimeSelect extension (@trusche, #45)
|
||||
* Cleanup Mongoid shim.
|
||||
|
||||
= 3.0.6 [2011-05-09]
|
||||
* Fix for AR type conversion for date columns when using plugin parser.
|
||||
* Add timeliness_type_cast_code for ORM specific type casting after parsing.
|
||||
|
||||
= 3.0.5 [2011-01-29]
|
||||
* Fix for Conversion#parse when given nil value (closes issue #34)
|
||||
|
||||
= 3.0.4 [2011-01-22]
|
||||
* Fix :between option which was being ignored (ebeigarts)
|
||||
* Use class_attribute to remove deprecated class_inheritable_accessor
|
||||
* Namespace copied validator class to ActiveModel::Validations::Timeliness for :timeliness option
|
||||
|
||||
= 3.0.3 [2010-12-11]
|
||||
* Fix validation of values which don't respond to to_date or to_time (renatoelias)
|
||||
|
||||
= 3.0.2 [2010-12-04]
|
||||
* Fix AR multiparameter extension for Date columns
|
||||
* Update to Timeliness 0.3.2 for zone abbreviation and offset support
|
||||
|
||||
= 3.0.1 [2010-11-02]
|
||||
* Generate timeliness write methods in an included module to allow overriding in model class (josevalim)
|
||||
|
||||
= 3.0.0 [2010-10-18]
|
||||
* Rails 3 and ActiveModel compatibility
|
||||
* Uses ActiveModel::EachValidator as validator base class.
|
||||
|
||||
22
Gemfile
22
Gemfile
@ -1,12 +1,16 @@
|
||||
source 'http://rubygems.org'
|
||||
|
||||
gemspec
|
||||
gem 'timeliness', '~> 0.1.1'
|
||||
|
||||
gem 'rails', '~> 5.2.4'
|
||||
gem 'rspec'
|
||||
gem 'rspec-rails', '~> 3.7'
|
||||
gem 'timecop'
|
||||
gem 'byebug'
|
||||
gem 'appraisal'
|
||||
gem 'sqlite3', '~> 1.3.6'
|
||||
gem 'nokogiri', '~> 1.8'
|
||||
group :test do
|
||||
gem 'ZenTest'
|
||||
gem 'rails', '3.0.0'
|
||||
gem 'sqlite3-ruby', :require => 'sqlite3'
|
||||
gem 'mongoid', '2.0.0.beta.17'
|
||||
gem 'bson_ext', '1.0.4'
|
||||
gem 'rspec', '>= 2.0.0.beta.17'
|
||||
gem 'rspec-rails', '>= 2.0.0.beta.17'
|
||||
gem 'timecop'
|
||||
gem 'rspec_tag_matchers'
|
||||
gem 'ruby-debug'
|
||||
end
|
||||
|
||||
120
Gemfile.lock
Normal file
120
Gemfile.lock
Normal file
@ -0,0 +1,120 @@
|
||||
GEM
|
||||
remote: http://rubygems.org/
|
||||
specs:
|
||||
ZenTest (4.4.0)
|
||||
abstract (1.0.0)
|
||||
actionmailer (3.0.0)
|
||||
actionpack (= 3.0.0)
|
||||
mail (~> 2.2.5)
|
||||
actionpack (3.0.0)
|
||||
activemodel (= 3.0.0)
|
||||
activesupport (= 3.0.0)
|
||||
builder (~> 2.1.2)
|
||||
erubis (~> 2.6.6)
|
||||
i18n (~> 0.4.1)
|
||||
rack (~> 1.2.1)
|
||||
rack-mount (~> 0.6.12)
|
||||
rack-test (~> 0.5.4)
|
||||
tzinfo (~> 0.3.23)
|
||||
activemodel (3.0.0)
|
||||
activesupport (= 3.0.0)
|
||||
builder (~> 2.1.2)
|
||||
i18n (~> 0.4.1)
|
||||
activerecord (3.0.0)
|
||||
activemodel (= 3.0.0)
|
||||
activesupport (= 3.0.0)
|
||||
arel (~> 1.0.0)
|
||||
tzinfo (~> 0.3.23)
|
||||
activeresource (3.0.0)
|
||||
activemodel (= 3.0.0)
|
||||
activesupport (= 3.0.0)
|
||||
activesupport (3.0.0)
|
||||
arel (1.0.1)
|
||||
activesupport (~> 3.0.0)
|
||||
bson (1.0.4)
|
||||
bson_ext (1.0.4)
|
||||
builder (2.1.2)
|
||||
columnize (0.3.1)
|
||||
diff-lcs (1.1.2)
|
||||
erubis (2.6.6)
|
||||
abstract (>= 1.0.0)
|
||||
i18n (0.4.1)
|
||||
linecache (0.43)
|
||||
mail (2.2.6.1)
|
||||
activesupport (>= 2.3.6)
|
||||
mime-types
|
||||
treetop (>= 1.4.5)
|
||||
mime-types (1.16)
|
||||
mongo (1.0.7)
|
||||
bson (>= 1.0.4)
|
||||
mongoid (2.0.0.beta.17)
|
||||
activemodel (~> 3.0.0)
|
||||
bson (= 1.0.4)
|
||||
mongo (= 1.0.7)
|
||||
tzinfo (~> 0.3.22)
|
||||
will_paginate (~> 3.0.pre)
|
||||
nokogiri (1.4.3.1)
|
||||
polyglot (0.3.1)
|
||||
rack (1.2.1)
|
||||
rack-mount (0.6.13)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (0.5.4)
|
||||
rack (>= 1.0)
|
||||
rails (3.0.0)
|
||||
actionmailer (= 3.0.0)
|
||||
actionpack (= 3.0.0)
|
||||
activerecord (= 3.0.0)
|
||||
activeresource (= 3.0.0)
|
||||
activesupport (= 3.0.0)
|
||||
bundler (~> 1.0.0)
|
||||
railties (= 3.0.0)
|
||||
railties (3.0.0)
|
||||
actionpack (= 3.0.0)
|
||||
activesupport (= 3.0.0)
|
||||
rake (>= 0.8.4)
|
||||
thor (~> 0.14.0)
|
||||
rake (0.8.7)
|
||||
rspec (2.0.0.beta.22)
|
||||
rspec-core (= 2.0.0.beta.22)
|
||||
rspec-expectations (= 2.0.0.beta.22)
|
||||
rspec-mocks (= 2.0.0.beta.22)
|
||||
rspec-core (2.0.0.beta.22)
|
||||
rspec-expectations (2.0.0.beta.22)
|
||||
diff-lcs (>= 1.1.2)
|
||||
rspec-mocks (2.0.0.beta.22)
|
||||
rspec-core (= 2.0.0.beta.22)
|
||||
rspec-expectations (= 2.0.0.beta.22)
|
||||
rspec-rails (2.0.0.beta.22)
|
||||
rspec (= 2.0.0.beta.22)
|
||||
rspec_tag_matchers (1.0.0)
|
||||
nokogiri (>= 1.4.0)
|
||||
rspec-rails (>= 1.2.6)
|
||||
ruby-debug (0.10.3)
|
||||
columnize (>= 0.1)
|
||||
ruby-debug-base (~> 0.10.3.0)
|
||||
ruby-debug-base (0.10.3)
|
||||
linecache (>= 0.3)
|
||||
sqlite3-ruby (1.3.1)
|
||||
thor (0.14.1)
|
||||
timecop (0.3.5)
|
||||
timeliness (0.1.1)
|
||||
treetop (1.4.8)
|
||||
polyglot (>= 0.3.1)
|
||||
tzinfo (0.3.23)
|
||||
will_paginate (3.0.pre2)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
ZenTest
|
||||
bson_ext (= 1.0.4)
|
||||
mongoid (= 2.0.0.beta.17)
|
||||
rails (= 3.0.0)
|
||||
rspec (>= 2.0.0.beta.17)
|
||||
rspec-rails (>= 2.0.0.beta.17)
|
||||
rspec_tag_matchers
|
||||
ruby-debug
|
||||
sqlite3-ruby
|
||||
timecop
|
||||
timeliness (~> 0.1.1)
|
||||
112
README.rdoc
112
README.rdoc
@ -1,13 +1,13 @@
|
||||
= ValidatesTimeliness {<img src="https://travis-ci.org/adzap/validates_timeliness.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/adzap/validates_timeliness]
|
||||
= ValidatesTimeliness
|
||||
|
||||
* Source: http://github.com/adzap/validates_timeliness
|
||||
* Issues: http://github.com/adzap/validates_timeliness/issues
|
||||
* Bugs: http://github.com/adzap/validates_timeliness/issues
|
||||
|
||||
== Description
|
||||
|
||||
Complete validation of dates, times and datetimes for Rails 5.x and ActiveModel.
|
||||
Complete validation of dates, times and datetimes for Rails 3.x and ActiveModel.
|
||||
|
||||
If you a looking for the old version for Rails 4.x go here [https://github.com/adzap/validates_timeliness/tree/4-0-stable].
|
||||
If you a looking for the old version for Rails 2.x go here[http://github.com/adzap/validates_timeliness/tree/v2.3].
|
||||
|
||||
|
||||
== Features
|
||||
@ -18,19 +18,23 @@ If you a looking for the old version for Rails 4.x go here [https://github.com/a
|
||||
|
||||
* Only Rails date/time validation plugin offering complete validation (See ORM/ODM support)
|
||||
|
||||
* Uses extensible date/time parser (Using {timeliness gem}[http://github.com/adzap/timeliness]. See Plugin Parser)
|
||||
* Adds extensions to fix Rails date/time select issues
|
||||
|
||||
* Adds extensions to fix Rails date/time select issues (See Extensions)
|
||||
* Uses extensible date/time parser ({timeliness gem}[http://github.com/adzap/timeliness])
|
||||
|
||||
* Supports I18n for the error messages. For multi-language support try {timeliness-i18n gem}[https://github.com/pedrofurtado/timeliness-i18n].
|
||||
|
||||
* Supports all the Rubies (that any sane person would be using in production).
|
||||
* Supports I18n for the error messages
|
||||
|
||||
|
||||
== Installation
|
||||
|
||||
As plugin (from master)
|
||||
|
||||
rails plugin install git://github.com/adzap/validates_timeliness.git
|
||||
|
||||
As gem (in beta)
|
||||
|
||||
# in Gemfile
|
||||
gem 'validates_timeliness', '~> 5.0.0.beta1'
|
||||
gem 'validates_timeliness', '~> 3.0.0'
|
||||
|
||||
# Run bundler
|
||||
$ bundle install
|
||||
@ -39,31 +43,26 @@ Then run
|
||||
|
||||
$ rails generate validates_timeliness:install
|
||||
|
||||
This creates configuration initializer and locale files. In the initializer, there are a number of config
|
||||
This creates configuration initializer and locale files. In the initializer, you there are a number of config
|
||||
options to customize the plugin.
|
||||
|
||||
NOTE: You may wish to enable the plugin parser and the extensions to start. Please read those sections first.
|
||||
|
||||
|
||||
== Examples
|
||||
|
||||
validates_datetime :occurred_at
|
||||
|
||||
validates_date :date_of_birth, before: lambda { 18.years.ago },
|
||||
before_message: "must be at least 18 years old"
|
||||
validates_date :date_of_birth :before => lambda { 18.years.ago },
|
||||
:before_message => "must be at least 18 years old"
|
||||
|
||||
validates_datetime :finish_time, after: :start_time # Method symbol
|
||||
validates_datetime :finish_time, :after => :start_time # Method symbol
|
||||
|
||||
validates_date :booked_at, on: :create, on_or_after: :today # See Restriction Shorthand.
|
||||
validates_date :booked_at, :on => :create, :on_or_after => :today # See Restriction Shorthand.
|
||||
validates_time :booked_at, :between => ['9.00am', '5:00pm']
|
||||
|
||||
validates_time :booked_at, between: ['9:00am', '5:00pm'] # On or after 9:00AM and on or before 5:00PM
|
||||
validates_time :booked_at, between: '9:00am'..'5:00pm' # The same as previous example
|
||||
validates_time :booked_at, between: '9:00am'...'5:00pm' # On or after 9:00AM and strictly before 5:00PM
|
||||
|
||||
validates_time :breakfast_time, on_or_after: '6:00am',
|
||||
on_or_after_message: 'must be after opening time',
|
||||
before: :lunchtime,
|
||||
before_message: 'must be before lunch time'
|
||||
validates_time :breakfast_time, :on_or_after => '6:00am',
|
||||
:on_or_after_message => 'must be after opening time',
|
||||
:before => :lunchtime,
|
||||
:before_message => 'must be before lunch time'
|
||||
|
||||
|
||||
== Usage
|
||||
@ -72,14 +71,14 @@ To validate a model with a date, time or datetime attribute you just use the
|
||||
validation method
|
||||
|
||||
class Person < ActiveRecord::Base
|
||||
validates_date :date_of_birth, on_or_before: lambda { Date.current }
|
||||
validates_date :date_of_birth, :on_or_before => lambda { Date.current }
|
||||
# or
|
||||
validates :date_of_birth, timeliness: {on_or_before: lambda { Date.current }, type: :date}
|
||||
validates :date_of_birth, :timeliness => {:on_or_before => lambda { Date.current }, :type => :date}
|
||||
end
|
||||
|
||||
or even on a specific record, per ActiveModel API.
|
||||
# or even on a specific record, per ActiveModel API.
|
||||
|
||||
@person.validates_date :date_of_birth, on_or_before: lambda { Date.current }
|
||||
@person.validates_date :date_of_birth, :on_or_before => lambda { Date.current }
|
||||
|
||||
|
||||
The list of validation methods available are as follows:
|
||||
@ -137,8 +136,8 @@ like so
|
||||
|
||||
ValidatesTimeliness.setup do |config|
|
||||
|
||||
# Extend ORM/ODMs for full support (:active_record).
|
||||
config.extend_orms = [ :active_record ]
|
||||
# Extend ORM/ODMs for full support (:active_record, :mongoid).
|
||||
config.extend_orms = [ :mongoid ]
|
||||
|
||||
end
|
||||
|
||||
@ -176,8 +175,7 @@ You can also use validation options for custom error messages. The following opt
|
||||
:after_message
|
||||
:on_or_after_message
|
||||
|
||||
Note: There is no :between_message option. The between error message should be defined using the :on_or_after and :on_or_before
|
||||
(:before in case when :between argument is a Range with excluded high value, see Examples) messages.
|
||||
Note: There is no :between_message option. The between error message should be defined using the :on_or_before and :on_or_after messages.
|
||||
|
||||
It is highly recommended you use the I18n system for error messages.
|
||||
|
||||
@ -206,14 +204,14 @@ plugin allows you to use shorthand symbols for often used relative times or date
|
||||
|
||||
Just provide the symbol as the option value like so:
|
||||
|
||||
validates_date :birth_date, on_or_before: :today
|
||||
validates_date :birth_date, :on_or_before => :today
|
||||
|
||||
The :today symbol is evaluated as <tt>lambda { Date.today }</tt>. The :now and :today
|
||||
symbols are pre-configured. Configure your own like so:
|
||||
|
||||
# in the setup block
|
||||
config.restriction_shorthand_symbols.update(
|
||||
yesterday: lambda { 1.day.ago }
|
||||
:yesterday => lambda { 1.day.ago }
|
||||
)
|
||||
|
||||
|
||||
@ -256,44 +254,38 @@ To turn them on/off:
|
||||
config.ignore_restriction_errors = true
|
||||
|
||||
|
||||
== Extensions
|
||||
|
||||
=== Strict Parsing for Select Helpers
|
||||
|
||||
When using date/time select helpers, the component values are handled by ActiveRecord using
|
||||
the Time class to instantiate them into a time value. This means that some invalid dates,
|
||||
such as 31st June, are shifted forward and treated as valid. To handle these cases in a strict
|
||||
way, you can enable the plugin extension to treat them as invalid dates.
|
||||
|
||||
To activate it, uncomment this line in the initializer:
|
||||
|
||||
# in the setup block
|
||||
config.enable_multiparameter_extension!
|
||||
|
||||
|
||||
=== Display Invalid Values in Select Helpers
|
||||
|
||||
The plugin offers an extension for ActionView to allowing invalid date and time values to be
|
||||
redisplayed to the user as feedback, instead of a blank field which happens by default in
|
||||
Rails. Though the date helpers make this a pretty rare occurrence, given the select dropdowns
|
||||
for each date/time component, but it may be something of interest.
|
||||
The plugin offers an extension for ActionView to allowing invalid
|
||||
date and time values to be redisplayed to the user as feedback, instead of
|
||||
a blank field which happens by default in Rails. Though the date helpers make this a
|
||||
pretty rare occurrence, given the select dropdowns for each date/time component, but
|
||||
it may be something of interest.
|
||||
|
||||
To activate it, uncomment this line in the initializer:
|
||||
To activate it, put this in an initializer:
|
||||
|
||||
# in the setup block
|
||||
config.enable_date_time_select_extension!
|
||||
|
||||
|
||||
== Contributors
|
||||
=== Strict Parsing for Select Helpers
|
||||
|
||||
To see the generous people who have contributed code, take a look at the {contributors list}[http://github.com/adzap/validates_timeliness/contributors].
|
||||
When using date/time select helpers, the component values are handled by ActiveRecord using
|
||||
the Time class to instantiate them into a time value. But this mean that some invalid dates,
|
||||
such as 31st June, are shifted forward and treated as valid. To handle these cases in a strict
|
||||
way you can enable the plugin handler to treat them as invalid dates.
|
||||
|
||||
To activate it, put this in an initializer:
|
||||
|
||||
# in the setup block
|
||||
config.enable_multiparameter_extension!
|
||||
|
||||
|
||||
== Maintainers
|
||||
== Credits
|
||||
|
||||
* {Adam Meehan}[http://github.com/adzap]
|
||||
* Adam Meehan (adam.meehan@gmail.com, http://github.com/adzap)
|
||||
|
||||
|
||||
== License
|
||||
|
||||
Copyright (c) 2008 Adam Meehan, released under the MIT license
|
||||
Copyright (c) 2008-2010 Adam Meehan, released under the MIT license
|
||||
|
||||
57
Rakefile
57
Rakefile
@ -1,15 +1,37 @@
|
||||
require 'bundler'
|
||||
require 'bundler/setup'
|
||||
|
||||
require 'appraisal'
|
||||
|
||||
Bundler::GemHelper.install_tasks
|
||||
|
||||
require 'rdoc/task'
|
||||
require 'rubygems'
|
||||
require 'rake/rdoctask'
|
||||
require 'rake/gempackagetask'
|
||||
require 'rubygems/specification'
|
||||
require 'rspec/core/rake_task'
|
||||
require 'lib/validates_timeliness/version'
|
||||
|
||||
GEM_NAME = "validates_timeliness"
|
||||
GEM_VERSION = ValidatesTimeliness::VERSION
|
||||
|
||||
spec = Gem::Specification.new do |s|
|
||||
s.name = GEM_NAME
|
||||
s.version = GEM_VERSION
|
||||
s.platform = Gem::Platform::RUBY
|
||||
s.rubyforge_project = "validates_timeliness"
|
||||
s.has_rdoc = true
|
||||
s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "LICENSE"]
|
||||
s.summary = %q{Date and time validation plugin for Rails which allows custom formats}
|
||||
s.description = s.summary
|
||||
s.author = "Adam Meehan"
|
||||
s.email = "adam.meehan@gmail.com"
|
||||
s.homepage = "http://github.com/adzap/validates_timeliness"
|
||||
s.require_path = 'lib'
|
||||
s.files = %w(validates_timeliness.gemspec LICENSE CHANGELOG.rdoc README.rdoc Rakefile) + Dir.glob("{lib,spec}/**/*")
|
||||
s.add_runtime_dependency 'timeliness', '~> 0.1.0'
|
||||
end
|
||||
|
||||
desc 'Default: run specs.'
|
||||
task :default => :spec
|
||||
|
||||
desc "Run specs"
|
||||
RSpec::Core::RakeTask.new(:spec)
|
||||
RSpec::Core::RakeTask.new do |t|
|
||||
t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
|
||||
end
|
||||
|
||||
desc "Generate code coverage"
|
||||
RSpec::Core::RakeTask.new(:coverage) do |t|
|
||||
@ -26,5 +48,18 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
|
||||
rdoc.rdoc_files.include('lib/**/*.rb')
|
||||
end
|
||||
|
||||
desc 'Default: run specs.'
|
||||
task :default => :spec
|
||||
Rake::GemPackageTask.new(spec) do |pkg|
|
||||
pkg.gem_spec = spec
|
||||
end
|
||||
|
||||
desc "Install the gem locally"
|
||||
task :install => [:package] do
|
||||
sh %{gem install pkg/#{GEM_NAME}-#{GEM_VERSION}}
|
||||
end
|
||||
|
||||
desc "Create a gemspec file"
|
||||
task :make_spec do
|
||||
File.open("#{GEM_NAME}.gemspec", "w") do |file|
|
||||
file.puts spec.to_ruby
|
||||
end
|
||||
end
|
||||
|
||||
1
autotest/discover.rb
Normal file
1
autotest/discover.rb
Normal file
@ -0,0 +1 @@
|
||||
Autotest.add_discovery { "rspec2" }
|
||||
@ -1,14 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 5.0.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
@ -1,14 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 5.1.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
@ -1,14 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 5.2.0"
|
||||
gem "rspec"
|
||||
gem "rspec-rails", "~> 3.7"
|
||||
gem "timecop"
|
||||
gem "byebug"
|
||||
gem "appraisal"
|
||||
gem "sqlite3", "~> 1.3.6"
|
||||
gem "nokogiri", "~> 1.8"
|
||||
|
||||
gemspec path: "../"
|
||||
@ -3,6 +3,7 @@ module ValidatesTimeliness
|
||||
class InstallGenerator < Rails::Generators::Base
|
||||
desc "Copy ValidatesTimeliness default files"
|
||||
source_root File.expand_path('../templates', __FILE__)
|
||||
class_option :template_engine
|
||||
|
||||
def copy_initializers
|
||||
copy_file 'validates_timeliness.rb', 'config/initializers/validates_timeliness.rb'
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
ValidatesTimeliness.setup do |config|
|
||||
# Extend ORM/ODMs for full support (:active_record included).
|
||||
config.extend_orms = [ :active_record ]
|
||||
# Extend ORM/ODMs for full support (:active_record, :mongoid).
|
||||
# config.extend_orms = [ :active_record ]
|
||||
#
|
||||
# Default timezone
|
||||
# config.default_timezone = :utc
|
||||
@ -32,7 +32,7 @@ ValidatesTimeliness.setup do |config|
|
||||
# Remove one or more formats making them invalid. e.g. remove_formats(:date, 'dd/mm/yyy')
|
||||
# config.parser.remove_formats()
|
||||
#
|
||||
# Change the ambiguous year threshold when parsing a 2 digit year
|
||||
# Change the amiguous year threshold when parsing a 2 digit year
|
||||
# config.parser.ambiguous_year_threshold = 30
|
||||
#
|
||||
# Treat ambiguous dates, such as 01/02/1950, as a Non-US date.
|
||||
|
||||
@ -24,24 +24,26 @@ module ValidatesTimeliness
|
||||
|
||||
class << self
|
||||
delegate :default_timezone, :default_timezone=, :dummy_date_for_time_type, :dummy_date_for_time_type=, :to => Timeliness
|
||||
|
||||
attr_accessor :extend_orms, :ignore_restriction_errors, :restriction_shorthand_symbols, :use_plugin_parser
|
||||
end
|
||||
|
||||
# Extend ORM/ODMs for full support (:active_record).
|
||||
self.extend_orms = []
|
||||
# Extend ORM/ODMs for full support (:active_record, :mongoid).
|
||||
mattr_accessor :extend_orms
|
||||
@@extend_orms = []
|
||||
|
||||
# Ignore errors when restriction options are evaluated
|
||||
self.ignore_restriction_errors = false
|
||||
mattr_accessor :ignore_restriction_errors
|
||||
@@ignore_restriction_errors = false
|
||||
|
||||
# Shorthand time and date symbols for restrictions
|
||||
self.restriction_shorthand_symbols = {
|
||||
now: proc { Time.current },
|
||||
today: proc { Date.current }
|
||||
mattr_accessor :restriction_shorthand_symbols
|
||||
@@restriction_shorthand_symbols = {
|
||||
:now => lambda { Time.current },
|
||||
:today => lambda { Date.current }
|
||||
}
|
||||
|
||||
# Use the plugin date/time parser which is stricter and extensible
|
||||
self.use_plugin_parser = false
|
||||
mattr_accessor :use_plugin_parser
|
||||
@@use_plugin_parser = false
|
||||
|
||||
# Default timezone
|
||||
self.default_timezone = :utc
|
||||
@ -49,20 +51,18 @@ module ValidatesTimeliness
|
||||
# Set the dummy date part for a time type values.
|
||||
self.dummy_date_for_time_type = [ 2000, 1, 1 ]
|
||||
|
||||
def self.parser
|
||||
Timeliness
|
||||
end
|
||||
|
||||
# Setup method for plugin configuration
|
||||
def self.setup
|
||||
yield self
|
||||
load_orms
|
||||
end
|
||||
|
||||
def self.load_orms
|
||||
extend_orms.each {|orm| require "validates_timeliness/orm/#{orm}" }
|
||||
end
|
||||
|
||||
def self.parser; Timeliness end
|
||||
end
|
||||
|
||||
require 'validates_timeliness/converter'
|
||||
require 'validates_timeliness/conversion'
|
||||
require 'validates_timeliness/validator'
|
||||
require 'validates_timeliness/helper_methods'
|
||||
require 'validates_timeliness/attribute_methods'
|
||||
|
||||
@ -3,47 +3,67 @@ module ValidatesTimeliness
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
included do
|
||||
class_attribute :timeliness_validated_attributes
|
||||
class_inheritable_accessor :timeliness_validated_attributes
|
||||
self.timeliness_validated_attributes = []
|
||||
end
|
||||
|
||||
module ClassMethods
|
||||
|
||||
public
|
||||
# Override in ORM shim
|
||||
def timeliness_attribute_timezone_aware?(attr_name)
|
||||
false
|
||||
end
|
||||
|
||||
# Override in ORM shim
|
||||
def timeliness_attribute_type(attr_name)
|
||||
:datetime
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def define_timeliness_methods(before_type_cast=false)
|
||||
return if timeliness_validated_attributes.blank?
|
||||
timeliness_validated_attributes.each do |attr_name|
|
||||
define_timeliness_write_method(attr_name)
|
||||
define_timeliness_before_type_cast_method(attr_name) if before_type_cast
|
||||
end
|
||||
end
|
||||
|
||||
def define_timeliness_write_method(attr_name)
|
||||
type = timeliness_attribute_type(attr_name)
|
||||
timezone_aware = timeliness_attribute_timezone_aware?(attr_name)
|
||||
|
||||
method_body, line = <<-EOV, __LINE__ + 1
|
||||
def #{attr_name}=(value)
|
||||
@timeliness_cache ||= {}
|
||||
@timeliness_cache["#{attr_name}"] = value
|
||||
#{ "value = Timeliness::Parser.parse(value, :#{type}, :zone => (:current if #{timezone_aware})) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
|
||||
super
|
||||
end
|
||||
EOV
|
||||
class_eval(method_body, __FILE__, line)
|
||||
end
|
||||
|
||||
def define_timeliness_before_type_cast_method(attr_name)
|
||||
method_body, line = <<-EOV, __LINE__ + 1
|
||||
def #{attr_name}_before_type_cast
|
||||
_timeliness_raw_value_for('#{attr_name}')
|
||||
end
|
||||
EOV
|
||||
class_eval(method_body, __FILE__, line)
|
||||
end
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
def _timeliness_raw_value_for(attr_name)
|
||||
@timeliness_cache && @timeliness_cache[attr_name.to_s]
|
||||
end
|
||||
|
||||
def _clear_timeliness_cache
|
||||
@timeliness_cache = {}
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
ActiveModel::Type::Date.prepend Module.new {
|
||||
def cast_value(value)
|
||||
return super unless ValidatesTimeliness.use_plugin_parser
|
||||
|
||||
if value.is_a?(::String)
|
||||
return if value.empty?
|
||||
value = Timeliness::Parser.parse(value, :date)
|
||||
value.to_date if value
|
||||
elsif value.respond_to?(:to_date)
|
||||
value.to_date
|
||||
else
|
||||
value
|
||||
end
|
||||
end
|
||||
}
|
||||
|
||||
ActiveModel::Type::Time.prepend Module.new {
|
||||
def user_input_in_time_zone(value)
|
||||
return super unless ValidatesTimeliness.use_plugin_parser
|
||||
|
||||
if value.is_a?(String)
|
||||
dummy_time_value = value.sub(/\A(\d\d\d\d-\d\d-\d\d |)/, Date.current.to_s + ' ')
|
||||
Timeliness::Parser.parse(dummy_time_value, :datetime, zone: :current)
|
||||
else
|
||||
value.in_time_zone
|
||||
end
|
||||
end
|
||||
}
|
||||
|
||||
ActiveModel::Type::DateTime.prepend Module.new {
|
||||
def user_input_in_time_zone(value)
|
||||
if value.is_a?(String) && ValidatesTimeliness.use_plugin_parser
|
||||
Timeliness::Parser.parse(value, :datetime, zone: :current)
|
||||
else
|
||||
value.in_time_zone
|
||||
end
|
||||
end
|
||||
}
|
||||
69
lib/validates_timeliness/conversion.rb
Normal file
69
lib/validates_timeliness/conversion.rb
Normal file
@ -0,0 +1,69 @@
|
||||
module ValidatesTimeliness
|
||||
module Conversion
|
||||
|
||||
def type_cast_value(value, type)
|
||||
return nil if value.nil?
|
||||
|
||||
value = value.in_time_zone if value.acts_like?(:time) && @timezone_aware
|
||||
value = case type
|
||||
when :time
|
||||
dummy_time(value)
|
||||
when :date
|
||||
value.to_date
|
||||
when :datetime
|
||||
value.is_a?(Time) ? value : value.to_time
|
||||
end
|
||||
if options[:ignore_usec] && value.is_a?(Time)
|
||||
Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if @timezone_aware))
|
||||
else
|
||||
value
|
||||
end
|
||||
end
|
||||
|
||||
def dummy_time(value)
|
||||
time = if value.acts_like?(:time)
|
||||
value = value.in_time_zone if @timezone_aware
|
||||
[value.hour, value.min, value.sec]
|
||||
else
|
||||
[0,0,0]
|
||||
end
|
||||
values = ValidatesTimeliness.dummy_date_for_time_type + time
|
||||
Timeliness::Parser.make_time(values, (:current if @timezone_aware))
|
||||
end
|
||||
|
||||
def evaluate_option_value(value, record)
|
||||
case value
|
||||
when Time, Date
|
||||
value
|
||||
when String
|
||||
parse(value)
|
||||
when Symbol
|
||||
if !record.respond_to?(value) && restriction_shorthand?(value)
|
||||
ValidatesTimeliness.restriction_shorthand_symbols[value].call
|
||||
else
|
||||
evaluate_option_value(record.send(value), record)
|
||||
end
|
||||
when Proc
|
||||
result = value.arity > 0 ? value.call(record) : value.call
|
||||
evaluate_option_value(result, record)
|
||||
else
|
||||
value
|
||||
end
|
||||
end
|
||||
|
||||
def restriction_shorthand?(symbol)
|
||||
ValidatesTimeliness.restriction_shorthand_symbols.keys.include?(symbol)
|
||||
end
|
||||
|
||||
def parse(value)
|
||||
if ValidatesTimeliness.use_plugin_parser
|
||||
Timeliness::Parser.parse(value, @type, :zone => (:current if @timezone_aware), :format => options[:format], :strict => false)
|
||||
else
|
||||
@timezone_aware ? Time.zone.parse(value) : value.to_time(ValidatesTimeliness.default_timezone)
|
||||
end
|
||||
rescue ArgumentError, TypeError
|
||||
nil
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
@ -1,84 +0,0 @@
|
||||
module ValidatesTimeliness
|
||||
class Converter
|
||||
attr_reader :type, :format, :ignore_usec
|
||||
|
||||
def initialize(type:, format: nil, ignore_usec: false, time_zone_aware: false)
|
||||
@type = type
|
||||
@format = format
|
||||
@ignore_usec = ignore_usec
|
||||
@time_zone_aware = time_zone_aware
|
||||
end
|
||||
|
||||
def type_cast_value(value)
|
||||
return nil if value.nil? || !value.respond_to?(:to_time)
|
||||
|
||||
value = value.in_time_zone if value.acts_like?(:time) && time_zone_aware?
|
||||
value = case type
|
||||
when :time
|
||||
dummy_time(value)
|
||||
when :date
|
||||
value.to_date
|
||||
when :datetime
|
||||
value.is_a?(Time) ? value : value.to_time
|
||||
else
|
||||
value
|
||||
end
|
||||
if ignore_usec && value.is_a?(Time)
|
||||
Timeliness::Parser.make_time(Array(value).reverse[4..9], (:current if time_zone_aware?))
|
||||
else
|
||||
value
|
||||
end
|
||||
end
|
||||
|
||||
def dummy_time(value)
|
||||
time = if value.acts_like?(:time)
|
||||
value = value.in_time_zone if time_zone_aware?
|
||||
[value.hour, value.min, value.sec]
|
||||
else
|
||||
[0,0,0]
|
||||
end
|
||||
values = ValidatesTimeliness.dummy_date_for_time_type + time
|
||||
Timeliness::Parser.make_time(values, (:current if time_zone_aware?))
|
||||
end
|
||||
|
||||
def evaluate(value, scope=nil)
|
||||
case value
|
||||
when Time, Date
|
||||
value
|
||||
when String
|
||||
parse(value)
|
||||
when Symbol
|
||||
if !scope.respond_to?(value) && restriction_shorthand?(value)
|
||||
ValidatesTimeliness.restriction_shorthand_symbols[value].call
|
||||
else
|
||||
evaluate(scope.send(value))
|
||||
end
|
||||
when Proc
|
||||
result = value.arity > 0 ? value.call(scope) : value.call
|
||||
evaluate(result, scope)
|
||||
else
|
||||
value
|
||||
end
|
||||
end
|
||||
|
||||
def restriction_shorthand?(symbol)
|
||||
ValidatesTimeliness.restriction_shorthand_symbols.keys.include?(symbol)
|
||||
end
|
||||
|
||||
def parse(value)
|
||||
return nil if value.nil?
|
||||
|
||||
if ValidatesTimeliness.use_plugin_parser
|
||||
Timeliness::Parser.parse(value, type, zone: (:current if time_zone_aware?), format: format, strict: false)
|
||||
else
|
||||
time_zone_aware? ? Time.zone.parse(value) : value.to_time(ValidatesTimeliness.default_timezone)
|
||||
end
|
||||
rescue ArgumentError, TypeError
|
||||
nil
|
||||
end
|
||||
|
||||
def time_zone_aware?
|
||||
@time_zone_aware
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,13 +1,14 @@
|
||||
module ValidatesTimeliness
|
||||
module Extensions
|
||||
autoload :TimelinessDateTimeSelect, 'validates_timeliness/extensions/date_time_select'
|
||||
autoload :DateTimeSelect, 'validates_timeliness/extensions/date_time_select'
|
||||
autoload :MultiparameterHandler, 'validates_timeliness/extensions/multiparameter_handler'
|
||||
end
|
||||
|
||||
def self.enable_date_time_select_extension!
|
||||
::ActionView::Helpers::Tags::DateSelect.send(:prepend, ValidatesTimeliness::Extensions::TimelinessDateTimeSelect)
|
||||
::ActionView::Helpers::InstanceTag.send(:include, ValidatesTimeliness::Extensions::DateTimeSelect)
|
||||
end
|
||||
|
||||
def self.enable_multiparameter_extension!
|
||||
require 'validates_timeliness/extensions/multiparameter_handler'
|
||||
::ActiveRecord::Base.send(:include, ValidatesTimeliness::Extensions::MultiparameterHandler)
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,50 +1,45 @@
|
||||
module ValidatesTimeliness
|
||||
module Extensions
|
||||
module TimelinessDateTimeSelect
|
||||
module DateTimeSelect
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
# Intercepts the date and time select helpers to reuse the values from
|
||||
# the params rather than the parsed value. This allows invalid date/time
|
||||
# values to be redisplayed instead of blanks to aid correction by the user.
|
||||
# It's a minor usability improvement which is rarely an issue for the user.
|
||||
attr_accessor :object_name, :method_name, :template_object, :options, :html_options
|
||||
|
||||
POSITION = {
|
||||
:year => 1, :month => 2, :day => 3, :hour => 4, :min => 5, :sec => 6
|
||||
}.freeze
|
||||
included do
|
||||
alias_method_chain :datetime_selector, :timeliness
|
||||
alias_method_chain :value, :timeliness
|
||||
end
|
||||
|
||||
class DateTimeValue
|
||||
attr_accessor :year, :month, :day, :hour, :min, :sec
|
||||
module InstanceMethods
|
||||
|
||||
def initialize(year:, month:, day: nil, hour: nil, min: nil, sec: nil)
|
||||
@year, @month, @day, @hour, @min, @sec = year, month, day, hour, min, sec
|
||||
TimelinessDateTime = Struct.new(:year, :month, :day, :hour, :min, :sec)
|
||||
|
||||
def datetime_selector_with_timeliness(*args)
|
||||
@timeliness_date_or_time_tag = true
|
||||
datetime_selector_without_timeliness(*args)
|
||||
end
|
||||
|
||||
def change(options)
|
||||
self.class.new(
|
||||
year: options.fetch(:year, year),
|
||||
month: options.fetch(:month, month),
|
||||
day: options.fetch(:day, day),
|
||||
hour: options.fetch(:hour, hour),
|
||||
min: options.fetch(:min) { options[:hour] ? 0 : min },
|
||||
sec: options.fetch(:sec) { options[:hour] || options[:min] ? 0 : sec }
|
||||
)
|
||||
def value_with_timeliness(object)
|
||||
unless @timeliness_date_or_time_tag && @template_object.params[@object_name]
|
||||
return value_without_timeliness(object)
|
||||
end
|
||||
|
||||
pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
|
||||
return value_without_timeliness(object) if pairs.empty?
|
||||
|
||||
values = [nil] * 6
|
||||
pairs.map do |(param, value)|
|
||||
position = param.scan(/\(([0-9]*).*\)/).first.first
|
||||
values[position.to_i-1] = value
|
||||
end
|
||||
|
||||
TimelinessDateTime.new(*values)
|
||||
end
|
||||
end
|
||||
|
||||
# Splat args to support Rails 5.0 which expects object, and 5.2 which doesn't
|
||||
def value(*object)
|
||||
return super unless @template_object.params[@object_name]
|
||||
|
||||
pairs = @template_object.params[@object_name].select {|k,v| k =~ /^#{@method_name}\(/ }
|
||||
return super if pairs.empty?
|
||||
|
||||
values = {}
|
||||
pairs.each_pair do |key, value|
|
||||
position = key[/\((\d+)\w+\)/, 1]
|
||||
values[POSITION.key(position.to_i)] = value.to_i
|
||||
end
|
||||
|
||||
DateTimeValue.new(values)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,55 +1,31 @@
|
||||
module ValidatesTimeliness
|
||||
module Extensions
|
||||
class AcceptsMultiparameterTime < Module
|
||||
module MultiparameterHandler
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def initialize(defaults: {})
|
||||
included do
|
||||
alias_method_chain :instantiate_time_object, :timeliness
|
||||
end
|
||||
|
||||
define_method(:cast) do |value|
|
||||
if value.is_a?(Hash)
|
||||
value_from_multiparameter_assignment(value)
|
||||
else
|
||||
super(value)
|
||||
end
|
||||
private
|
||||
|
||||
# Stricter handling of date and time values from multiparameter
|
||||
# assignment from the date/time select view helpers
|
||||
#
|
||||
def instantiate_time_object_with_timeliness(name, values)
|
||||
unless Date.valid_civil?(*values[0..2])
|
||||
value = [values[0], *values[1..2].map {|s| s.to_s.rjust(2,"0")} ].join("-")
|
||||
value += ' ' + values[3..5].map {|s| s.to_s.rjust(2, "0") }.join(":") unless values[3..5].empty?
|
||||
return value
|
||||
end
|
||||
|
||||
define_method(:assert_valid_value) do |value|
|
||||
if value.is_a?(Hash)
|
||||
value_from_multiparameter_assignment(value)
|
||||
else
|
||||
super(value)
|
||||
end
|
||||
if self.class.send(:create_time_zone_conversion_attribute?, name, column_for_attribute(name))
|
||||
Time.zone.local(*values)
|
||||
else
|
||||
Time.time_with_datetime_fallback(self.class.default_timezone, *values)
|
||||
end
|
||||
|
||||
define_method(:value_from_multiparameter_assignment) do |values_hash|
|
||||
defaults.each do |k, v|
|
||||
values_hash[k] ||= v
|
||||
end
|
||||
return unless values_hash.values_at(1,2,3).all?{ |v| v.present? } &&
|
||||
Date.valid_civil?(*values_hash.values_at(1,2,3))
|
||||
|
||||
values = values_hash.sort.map(&:last)
|
||||
::Time.send(default_timezone, *values)
|
||||
end
|
||||
private :value_from_multiparameter_assignment
|
||||
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
ActiveModel::Type::Date.class_eval do
|
||||
include ValidatesTimeliness::Extensions::AcceptsMultiparameterTime.new
|
||||
end
|
||||
|
||||
ActiveModel::Type::Time.class_eval do
|
||||
include ValidatesTimeliness::Extensions::AcceptsMultiparameterTime.new(
|
||||
defaults: { 1 => 1970, 2 => 1, 3 => 1, 4 => 0, 5 => 0 }
|
||||
)
|
||||
end
|
||||
|
||||
ActiveModel::Type::DateTime.class_eval do
|
||||
include ValidatesTimeliness::Extensions::AcceptsMultiparameterTime.new(
|
||||
defaults: { 4 => 0, 5 => 0 }
|
||||
)
|
||||
end
|
||||
@ -14,14 +14,13 @@ module ActiveModel
|
||||
timeliness_validation_for attr_names, :datetime
|
||||
end
|
||||
|
||||
def validates_timeliness_of(*attr_names)
|
||||
timeliness_validation_for attr_names
|
||||
end
|
||||
|
||||
def timeliness_validation_for(attr_names, type=nil)
|
||||
options = _merge_attributes(attr_names)
|
||||
options.update(:type => type) if type
|
||||
validates_with TimelinessValidator, options
|
||||
def timeliness_validation_for(attr_names, type)
|
||||
options = _merge_attributes(attr_names).merge(:type => type)
|
||||
if respond_to?(:timeliness_validated_attributes)
|
||||
self.timeliness_validated_attributes ||= []
|
||||
self.timeliness_validated_attributes += (attr_names - self.timeliness_validated_attributes)
|
||||
end
|
||||
validates_with ValidatesTimeliness::Validator, options
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
module ValidatesTimeliness
|
||||
module ORM
|
||||
module ActiveModel
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
module ClassMethods
|
||||
public
|
||||
|
||||
def define_attribute_methods(*attr_names)
|
||||
super.tap { define_timeliness_methods }
|
||||
end
|
||||
|
||||
def undefine_attribute_methods
|
||||
super.tap { undefine_timeliness_attribute_methods }
|
||||
end
|
||||
|
||||
def define_timeliness_methods(before_type_cast=false)
|
||||
return if timeliness_validated_attributes.blank?
|
||||
timeliness_validated_attributes.each do |attr_name|
|
||||
define_attribute_timeliness_methods(attr_name, before_type_cast)
|
||||
end
|
||||
end
|
||||
|
||||
def generated_timeliness_methods
|
||||
@generated_timeliness_methods ||= Module.new { |m|
|
||||
extend Mutex_m
|
||||
}.tap { |mod| include mod }
|
||||
end
|
||||
|
||||
def undefine_timeliness_attribute_methods
|
||||
generated_timeliness_methods.module_eval do
|
||||
instance_methods.each { |m| undef_method(m) }
|
||||
end
|
||||
end
|
||||
|
||||
def define_attribute_timeliness_methods(attr_name, before_type_cast=false)
|
||||
define_timeliness_write_method(attr_name)
|
||||
define_timeliness_before_type_cast_method(attr_name) if before_type_cast
|
||||
end
|
||||
|
||||
def define_timeliness_write_method(attr_name)
|
||||
generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
|
||||
def #{attr_name}=(value)
|
||||
@timeliness_cache ||= {}
|
||||
@timeliness_cache['#{attr_name}'] = value
|
||||
|
||||
@attributes['#{attr_name}'] = super
|
||||
end
|
||||
STR
|
||||
end
|
||||
|
||||
def define_timeliness_before_type_cast_method(attr_name)
|
||||
generated_timeliness_methods.module_eval <<-STR, __FILE__, __LINE__ + 1
|
||||
def #{attr_name}_before_type_cast
|
||||
read_timeliness_attribute_before_type_cast('#{attr_name}')
|
||||
end
|
||||
STR
|
||||
end
|
||||
end
|
||||
|
||||
def read_timeliness_attribute_before_type_cast(attr_name)
|
||||
@timeliness_cache && @timeliness_cache[attr_name] || @attributes[attr_name]
|
||||
end
|
||||
|
||||
def _clear_timeliness_cache
|
||||
@timeliness_cache = {}
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -3,15 +3,35 @@ module ValidatesTimeliness
|
||||
module ActiveRecord
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
def read_timeliness_attribute_before_type_cast(attr_name)
|
||||
read_attribute_before_type_cast(attr_name)
|
||||
module ClassMethods
|
||||
def define_attribute_methods
|
||||
super
|
||||
# Define write method and before_type_cast method
|
||||
define_timeliness_methods(true)
|
||||
end
|
||||
|
||||
def timeliness_attribute_timezone_aware?(attr_name)
|
||||
attr_name = attr_name.to_s
|
||||
create_time_zone_conversion_attribute?(attr_name, columns_hash[attr_name])
|
||||
end
|
||||
|
||||
def timeliness_attribute_type(attr_name)
|
||||
columns_hash[attr_name.to_s].type
|
||||
end
|
||||
end
|
||||
|
||||
module InstanceMethods
|
||||
def reload(*args)
|
||||
_clear_timeliness_cache
|
||||
super
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
ActiveSupport.on_load(:active_record) do
|
||||
class ActiveRecord::Base
|
||||
include ValidatesTimeliness::AttributeMethods
|
||||
include ValidatesTimeliness::ORM::ActiveRecord
|
||||
end
|
||||
|
||||
64
lib/validates_timeliness/orm/mongoid.rb
Normal file
64
lib/validates_timeliness/orm/mongoid.rb
Normal file
@ -0,0 +1,64 @@
|
||||
module ValidatesTimeliness
|
||||
module ORM
|
||||
module Mongoid
|
||||
extend ActiveSupport::Concern
|
||||
# You need define the fields before you define the validations.
|
||||
# It is best to use the plugin parser to avoid errors on a bad
|
||||
# field value in Mongoid. Parser will return nil rather than error.
|
||||
|
||||
module ClassMethods
|
||||
# Mongoid has no bulk attribute method definition hook. It defines
|
||||
# them with each field definition. So we likewise define them after
|
||||
# each validation is defined.
|
||||
#
|
||||
def timeliness_validation_for(attr_names, type)
|
||||
super
|
||||
attr_names.each { |attr_name| define_timeliness_write_method(attr_name) }
|
||||
end
|
||||
|
||||
def define_timeliness_write_method(attr_name)
|
||||
type = timeliness_attribute_type(attr_name)
|
||||
method_body, line = <<-EOV, __LINE__ + 1
|
||||
def #{attr_name}=(value)
|
||||
@timeliness_cache ||= {}
|
||||
@timeliness_cache["#{attr_name}"] = value
|
||||
#{ "value = Timeliness::Parser.parse(value, :#{type}) if value.is_a?(String)" if ValidatesTimeliness.use_plugin_parser }
|
||||
write_attribute(:#{attr_name}, value)
|
||||
end
|
||||
EOV
|
||||
class_eval(method_body, __FILE__, line)
|
||||
end
|
||||
|
||||
def timeliness_attribute_type(attr_name)
|
||||
{
|
||||
Date => :date,
|
||||
Time => :datetime,
|
||||
DateTime => :datetime
|
||||
}[fields[attr_name.to_s].type] || :datetime
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
module Mongoid::Document
|
||||
# Due to how Mongoid misuses ActiveSupport::Concern,
|
||||
# the only way to override a core component method is
|
||||
# using an append_features hook.
|
||||
#
|
||||
module TimelinessConcern
|
||||
def append_features(base)
|
||||
super
|
||||
base.send :include, ValidatesTimeliness::AttributeMethods
|
||||
base.send :include, ValidatesTimeliness::ORM::Mongoid
|
||||
end
|
||||
end
|
||||
extend TimelinessConcern
|
||||
|
||||
def reload_with_timeliness
|
||||
_clear_timeliness_cache
|
||||
reload_without_timeliness
|
||||
end
|
||||
alias_method_chain :reload, :timeliness
|
||||
end
|
||||
@ -3,21 +3,12 @@ module ValidatesTimeliness
|
||||
initializer "validates_timeliness.initialize_active_record", :after => 'active_record.initialize_timezone' do
|
||||
ActiveSupport.on_load(:active_record) do
|
||||
ValidatesTimeliness.default_timezone = ActiveRecord::Base.default_timezone
|
||||
ValidatesTimeliness.extend_orms << :active_record
|
||||
ValidatesTimeliness.load_orms
|
||||
ValidatesTimeliness.extend_orms = [ :active_record ]
|
||||
end
|
||||
end
|
||||
|
||||
initializer "validates_timeliness.initialize_restriction_errors" do
|
||||
ValidatesTimeliness.ignore_restriction_errors = !Rails.env.test?
|
||||
end
|
||||
|
||||
initializer "validates_timeliness.initialize_timeliness_ambiguous_date_format", :after => :load_config_initializers do
|
||||
if Timeliness.respond_to?(:ambiguous_date_format) # i.e. v0.4+
|
||||
# Set default for each new thread if you have changed the default using
|
||||
# the format switching methods.
|
||||
Timeliness.configuration.ambiguous_date_format = Timeliness::Definitions.current_date_format
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
require 'active_model'
|
||||
require 'active_model/validator'
|
||||
|
||||
module ValidatesTimeliness
|
||||
class Validator < ActiveModel::EachValidator
|
||||
attr_reader :type, :attributes, :converter
|
||||
include Conversion
|
||||
|
||||
attr_reader :type
|
||||
|
||||
RESTRICTIONS = {
|
||||
:is_at => :==,
|
||||
@ -19,8 +20,6 @@ module ValidatesTimeliness
|
||||
:datetime => '%Y-%m-%d %H:%M:%S'
|
||||
}.freeze
|
||||
|
||||
RESTRICTION_ERROR_MESSAGE = "Error occurred validating %s for %s restriction:\n%s"
|
||||
|
||||
def self.kind
|
||||
:timeliness
|
||||
end
|
||||
@ -28,56 +27,34 @@ module ValidatesTimeliness
|
||||
def initialize(options)
|
||||
@type = options.delete(:type) || :datetime
|
||||
@allow_nil, @allow_blank = options.delete(:allow_nil), options.delete(:allow_blank)
|
||||
@restrictions_to_check = RESTRICTIONS.keys & options.keys
|
||||
|
||||
if range = options.delete(:between)
|
||||
raise ArgumentError, ":between must be a Range or an Array" unless range.is_a?(Range) || range.is_a?(Array)
|
||||
options[:on_or_after] = range.first
|
||||
if range.is_a?(Range) && range.exclude_end?
|
||||
options[:before] = range.last
|
||||
else
|
||||
options[:on_or_before] = range.last
|
||||
end
|
||||
options[:on_or_after], options[:on_or_before] = range.first, range.last
|
||||
end
|
||||
|
||||
@restrictions_to_check = RESTRICTIONS.keys & options.keys
|
||||
|
||||
super
|
||||
|
||||
setup_timeliness_validated_attributes(options[:class]) if options[:class]
|
||||
end
|
||||
|
||||
def setup_timeliness_validated_attributes(model)
|
||||
if model.respond_to?(:timeliness_validated_attributes)
|
||||
model.timeliness_validated_attributes ||= []
|
||||
model.timeliness_validated_attributes |= attributes
|
||||
end
|
||||
end
|
||||
|
||||
def validate_each(record, attr_name, value)
|
||||
raw_value = attribute_raw_value(record, attr_name) || value
|
||||
return if (@allow_nil && raw_value.nil?) || (@allow_blank && raw_value.blank?)
|
||||
|
||||
@converter = initialize_converter(record, attr_name)
|
||||
@timezone_aware = timezone_aware?(record, attr_name)
|
||||
value = parse(raw_value) if value.is_a?(String) || options[:format]
|
||||
value = type_cast_value(value, @type)
|
||||
|
||||
value = @converter.parse(raw_value) if value.is_a?(String) || options[:format]
|
||||
value = @converter.type_cast_value(value)
|
||||
return add_error(record, attr_name, :"invalid_#{@type}") if value.blank?
|
||||
|
||||
add_error(record, attr_name, :"invalid_#{@type}") and return if value.blank?
|
||||
|
||||
validate_restrictions(record, attr_name, value)
|
||||
end
|
||||
|
||||
def validate_restrictions(record, attr_name, value)
|
||||
@restrictions_to_check.each do |restriction|
|
||||
begin
|
||||
restriction_value = @converter.type_cast_value(@converter.evaluate(options[restriction], record))
|
||||
restriction_value = type_cast_value(evaluate_option_value(options[restriction], record), @type)
|
||||
unless value.send(RESTRICTIONS[restriction], restriction_value)
|
||||
add_error(record, attr_name, restriction, restriction_value) and break
|
||||
return add_error(record, attr_name, restriction, restriction_value)
|
||||
end
|
||||
rescue => e
|
||||
unless ValidatesTimeliness.ignore_restriction_errors
|
||||
message = RESTRICTION_ERROR_MESSAGE % [ attr_name, restriction.inspect, e.message ]
|
||||
add_error(record, attr_name, message) and break
|
||||
add_error(record, attr_name, "Error occurred validating #{attr_name} for #{restriction.inspect} restriction:\n#{e.message}")
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -85,7 +62,7 @@ module ValidatesTimeliness
|
||||
|
||||
def add_error(record, attr_name, message, value=nil)
|
||||
value = format_error_value(value) if value
|
||||
message_options = { :message => options.fetch(:"#{message}_message", options[:message]), :restriction => value }
|
||||
message_options = { :message => options[:"#{message}_message"], :restriction => value }
|
||||
record.errors.add(attr_name, message, message_options)
|
||||
end
|
||||
|
||||
@ -95,26 +72,18 @@ module ValidatesTimeliness
|
||||
end
|
||||
|
||||
def attribute_raw_value(record, attr_name)
|
||||
record.respond_to?(:read_timeliness_attribute_before_type_cast) &&
|
||||
record.read_timeliness_attribute_before_type_cast(attr_name.to_s)
|
||||
if record.respond_to?(:_timeliness_raw_value_for)
|
||||
record._timeliness_raw_value_for(attr_name)
|
||||
end
|
||||
end
|
||||
|
||||
def time_zone_aware?(record, attr_name)
|
||||
record.class.respond_to?(:skip_time_zone_conversion_for_attributes) &&
|
||||
!record.class.skip_time_zone_conversion_for_attributes.include?(attr_name.to_sym)
|
||||
end
|
||||
|
||||
def initialize_converter(record, attr_name)
|
||||
ValidatesTimeliness::Converter.new(
|
||||
type: @type,
|
||||
time_zone_aware: time_zone_aware?(record, attr_name),
|
||||
format: options[:format],
|
||||
ignore_usec: options[:ignore_usec]
|
||||
)
|
||||
def timezone_aware?(record, attr_name)
|
||||
record.class.respond_to?(:timeliness_attribute_timezone_aware?) &&
|
||||
record.class.timeliness_attribute_timezone_aware?(attr_name)
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
|
||||
# Compatibility with ActiveModel validates method which matches option keys to their validator class
|
||||
ActiveModel::Validations::TimelinessValidator = ValidatesTimeliness::Validator
|
||||
TimelinessValidator = ValidatesTimeliness::Validator
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
module ValidatesTimeliness
|
||||
VERSION = '5.0.0.beta2'
|
||||
VERSION = '3.0.0'
|
||||
end
|
||||
|
||||
@ -3,21 +3,22 @@ module ModelHelpers
|
||||
# Some test helpers from Rails source
|
||||
def invalid!(attr_name, values, error = nil)
|
||||
with_each_person_value(attr_name, values) do |record, value|
|
||||
expect(record).to be_invalid
|
||||
expect(record.errors[attr_name].size).to be >= 1
|
||||
expect(record.errors[attr_name].first).to eq(error) if error
|
||||
record.should be_invalid
|
||||
record.errors[attr_name].size.should >= 1
|
||||
record.errors[attr_name].first.should == error if error
|
||||
end
|
||||
end
|
||||
|
||||
def valid!(attr_name, values)
|
||||
with_each_person_value(attr_name, values) do |record, value|
|
||||
expect(record).to be_valid
|
||||
record.should be_valid
|
||||
end
|
||||
end
|
||||
|
||||
def with_each_person_value(attr_name, values)
|
||||
record = Person.new
|
||||
Array.wrap(values).each do |value|
|
||||
values = [values] unless values.is_a?(Array)
|
||||
values.each do |value|
|
||||
record.send("#{attr_name}=", value)
|
||||
yield record, value
|
||||
end
|
||||
@ -1,21 +1,15 @@
|
||||
require 'rspec'
|
||||
|
||||
require 'byebug'
|
||||
require 'active_model'
|
||||
require 'active_model/validations'
|
||||
require 'active_record'
|
||||
require 'action_view'
|
||||
require 'timecop'
|
||||
require 'rspec_tag_matchers'
|
||||
require 'model_helpers'
|
||||
|
||||
require 'validates_timeliness'
|
||||
require 'validates_timeliness/orm/active_model'
|
||||
|
||||
require 'rails/railtie'
|
||||
|
||||
require 'support/test_model'
|
||||
require 'support/model_helpers'
|
||||
require 'support/config_helper'
|
||||
require 'support/tag_matcher'
|
||||
require 'test_model'
|
||||
|
||||
ValidatesTimeliness.setup do |c|
|
||||
c.extend_orms = [ :active_record ]
|
||||
@ -28,15 +22,19 @@ Time.zone = 'Australia/Melbourne'
|
||||
|
||||
LOCALE_PATH = File.expand_path(File.dirname(__FILE__) + '/../lib/generators/validates_timeliness/templates/en.yml')
|
||||
I18n.load_path.unshift(LOCALE_PATH)
|
||||
I18n.available_locales = ['en', 'es']
|
||||
|
||||
# Extend TestModel as you would another ORM/ODM module
|
||||
module TestModelShim
|
||||
extend ActiveSupport::Concern
|
||||
include ValidatesTimeliness::AttributeMethods
|
||||
include ValidatesTimeliness::ORM::ActiveModel
|
||||
|
||||
module ClassMethods
|
||||
# Hook method for attribute method generation
|
||||
def define_attribute_methods(attr_names)
|
||||
super
|
||||
define_timeliness_methods
|
||||
end
|
||||
|
||||
# Hook into native time zone handling check, if any
|
||||
def timeliness_attribute_timezone_aware?(attr_name)
|
||||
false
|
||||
@ -49,7 +47,9 @@ class Person
|
||||
attribute :birth_date, :date
|
||||
attribute :birth_time, :time
|
||||
attribute :birth_datetime, :datetime
|
||||
|
||||
validates_date :birth_date
|
||||
validates_time :birth_time
|
||||
validates_datetime :birth_datetime
|
||||
define_attribute_methods model_attributes.keys
|
||||
end
|
||||
|
||||
@ -57,10 +57,8 @@ class PersonWithShim < Person
|
||||
include TestModelShim
|
||||
end
|
||||
|
||||
ActiveRecord::Base.default_timezone = :utc
|
||||
ActiveRecord::Base.time_zone_aware_attributes = true
|
||||
ActiveRecord::Base.establish_connection({:adapter => 'sqlite3', :database => ':memory:'})
|
||||
ActiveRecord::Base.time_zone_aware_types = [:datetime, :time]
|
||||
ActiveRecord::Migration.verbose = false
|
||||
ActiveRecord::Schema.define(:version => 1) do
|
||||
create_table :employees, :force => true do |t|
|
||||
@ -73,28 +71,21 @@ ActiveRecord::Schema.define(:version => 1) do
|
||||
end
|
||||
|
||||
class Employee < ActiveRecord::Base
|
||||
attr_accessor :redefined_birth_date_called
|
||||
validates_date :birth_date, :allow_nil => true
|
||||
validates_time :birth_time, :allow_nil => true
|
||||
validates_datetime :birth_datetime, :allow_nil => true
|
||||
|
||||
def birth_date=(value)
|
||||
self.redefined_birth_date_called = true
|
||||
super
|
||||
end
|
||||
validates_date :birth_date
|
||||
validates_time :birth_time
|
||||
validates_datetime :birth_datetime
|
||||
define_attribute_methods
|
||||
end
|
||||
|
||||
RSpec.configure do |c|
|
||||
Rspec.configure do |c|
|
||||
c.mock_with :rspec
|
||||
c.include(TagMatcher)
|
||||
c.include(ModelHelpers)
|
||||
c.include(ConfigHelper)
|
||||
c.include(RspecTagMatchers)
|
||||
c.before do
|
||||
reset_validation_setup_for(Person)
|
||||
reset_validation_setup_for(PersonWithShim)
|
||||
Person.reset_callbacks(:validate)
|
||||
PersonWithShim.timeliness_validated_attributes = []
|
||||
Person._validators.clear
|
||||
Employee.reset_callbacks(:validate)
|
||||
Employee.timeliness_validated_attributes = []
|
||||
Employee._validators.clear
|
||||
end
|
||||
|
||||
c.filter_run_excluding :active_record => lambda {|version|
|
||||
!(::ActiveRecord::VERSION::STRING.to_s =~ /^#{version.to_s}/)
|
||||
}
|
||||
end
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
module ConfigHelper
|
||||
extend ActiveSupport::Concern
|
||||
|
||||
# Justin French tip
|
||||
def with_config(preference_name, temporary_value)
|
||||
old_value = ValidatesTimeliness.send(preference_name)
|
||||
ValidatesTimeliness.send(:"#{preference_name}=", temporary_value)
|
||||
yield
|
||||
ensure
|
||||
ValidatesTimeliness.send(:"#{preference_name}=", old_value)
|
||||
end
|
||||
|
||||
def reset_validation_setup_for(model_class)
|
||||
model_class.reset_callbacks(:validate)
|
||||
model_class._validators.clear
|
||||
model_class.timeliness_validated_attributes = [] if model_class.respond_to?(:timeliness_validated_attributes)
|
||||
model_class.undefine_attribute_methods
|
||||
# This is a hack to avoid a disabled super method error message after an undef
|
||||
model_class.instance_variable_set(:@generated_attribute_methods, nil)
|
||||
model_class.instance_variable_set(:@generated_timeliness_methods, nil)
|
||||
end
|
||||
|
||||
module ClassMethods
|
||||
def with_config(preference_name, temporary_value)
|
||||
original_config_value = ValidatesTimeliness.send(preference_name)
|
||||
|
||||
before(:all) do
|
||||
ValidatesTimeliness.send(:"#{preference_name}=", temporary_value)
|
||||
end
|
||||
|
||||
after(:all) do
|
||||
ValidatesTimeliness.send(:"#{preference_name}=", original_config_value)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,35 +0,0 @@
|
||||
require 'nokogiri'
|
||||
|
||||
module TagMatcher
|
||||
extend RSpec::Matchers::DSL
|
||||
|
||||
matcher :have_tag do |selector|
|
||||
match do |subject|
|
||||
matches = doc(subject).search(selector)
|
||||
|
||||
if @inner_text
|
||||
matches = matches.select { |element| element.inner_text == @inner_text }
|
||||
end
|
||||
|
||||
matches.any?
|
||||
end
|
||||
|
||||
chain :with_inner_text do |inner_text|
|
||||
@inner_text = inner_text
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def body(subject)
|
||||
if subject.respond_to?(:body)
|
||||
subject.body
|
||||
else
|
||||
subject.to_s
|
||||
end
|
||||
end
|
||||
|
||||
def doc(subject)
|
||||
@doc ||= Nokogiri::HTML(body(subject))
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -5,6 +5,7 @@ module TestModel
|
||||
include ActiveModel::AttributeMethods
|
||||
|
||||
included do
|
||||
attribute_method_suffix ""
|
||||
attribute_method_suffix "="
|
||||
cattr_accessor :model_attributes
|
||||
end
|
||||
@ -25,14 +26,12 @@ module TestModel
|
||||
|
||||
def type_cast(attr_name, value)
|
||||
return value unless value.is_a?(String)
|
||||
type_name = model_attributes[attr_name.to_sym]
|
||||
type = ActiveModel::Type.lookup(type_name)
|
||||
type.cast(value)
|
||||
value.send("to_#{model_attributes[attr_name.to_sym]}") rescue nil
|
||||
end
|
||||
end
|
||||
|
||||
def initialize(attributes = nil)
|
||||
@attributes = self.class.model_attributes.keys.inject({}) do |hash, column|
|
||||
@attributes = self.class.model_attributes.inject({}) do |hash, column|
|
||||
hash[column.to_s] = nil
|
||||
hash
|
||||
end
|
||||
@ -40,7 +39,7 @@ module TestModel
|
||||
end
|
||||
|
||||
def attributes
|
||||
@attributes
|
||||
@attributes.keys
|
||||
end
|
||||
|
||||
def attributes=(new_attributes={})
|
||||
@ -50,12 +49,14 @@ module TestModel
|
||||
end
|
||||
|
||||
def method_missing(method_id, *args, &block)
|
||||
if !matched_attribute_method(method_id.to_s).nil?
|
||||
self.class.define_attribute_methods self.class.model_attributes.keys
|
||||
if !self.class.attribute_methods_generated?
|
||||
self.class.define_attribute_methods self.class.model_attributes.keys.map(&:to_s)
|
||||
method_name = method_id.to_s
|
||||
send(method_id, *args, &block)
|
||||
else
|
||||
super
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
RSpec.describe ValidatesTimeliness::AttributeMethods do
|
||||
it 'should define read_timeliness_attribute_before_type_cast instance method' do
|
||||
expect(PersonWithShim.new).to respond_to(:read_timeliness_attribute_before_type_cast)
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::AttributeMethods do
|
||||
it 'should define _timeliness_raw_value_for instance method' do
|
||||
PersonWithShim.new.should respond_to(:_timeliness_raw_value_for)
|
||||
end
|
||||
|
||||
describe ".timeliness_validated_attributes" do
|
||||
@ -10,7 +12,7 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
|
||||
PersonWithShim.validates_time :birth_time
|
||||
PersonWithShim.validates_datetime :birth_datetime
|
||||
|
||||
expect(PersonWithShim.timeliness_validated_attributes).to eq([ :birth_date, :birth_time, :birth_datetime ])
|
||||
PersonWithShim.timeliness_validated_attributes.should == [ :birth_date, :birth_time, :birth_datetime ]
|
||||
end
|
||||
end
|
||||
|
||||
@ -29,18 +31,10 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
|
||||
it 'should cache attribute raw value' do
|
||||
r = PersonWithCache.new
|
||||
r.birth_datetime = date_string = '2010-01-01'
|
||||
expect(r.read_timeliness_attribute_before_type_cast('birth_datetime')).to eq(date_string)
|
||||
end
|
||||
|
||||
it 'should not overwrite user defined methods' do
|
||||
e = Employee.new
|
||||
e.birth_date = '2010-01-01'
|
||||
expect(e.redefined_birth_date_called).to be_truthy
|
||||
r._timeliness_raw_value_for(:birth_datetime).should == date_string
|
||||
end
|
||||
|
||||
context "with plugin parser" do
|
||||
with_config(:use_plugin_parser, true)
|
||||
|
||||
class PersonWithParser
|
||||
include TestModel
|
||||
include TestModelShim
|
||||
@ -52,18 +46,31 @@ RSpec.describe ValidatesTimeliness::AttributeMethods do
|
||||
validates_datetime :birth_datetime
|
||||
end
|
||||
|
||||
before :all do
|
||||
ValidatesTimeliness.use_plugin_parser = true
|
||||
end
|
||||
|
||||
it 'should parse a string value' do
|
||||
expect(Timeliness::Parser).to receive(:parse)
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
r = PersonWithParser.new
|
||||
r.birth_date = '2010-01-01'
|
||||
end
|
||||
|
||||
it 'should parse string as current timezone' do
|
||||
r = PersonWithParser.new
|
||||
r.birth_datetime = '2010-01-01 12:00'
|
||||
r.birth_datetime.zone == Time.zone.name
|
||||
end
|
||||
|
||||
after :all do
|
||||
ValidatesTimeliness.use_plugin_parser = false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "before_type_cast method" do
|
||||
it 'should not be defined if ORM does not support it' do
|
||||
expect(PersonWithShim.new).not_to respond_to(:birth_datetime_before_type_cast)
|
||||
PersonWithShim.new.should_not respond_to(:birth_datetime_before_type_cast)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
197
spec/validates_timeliness/conversion_spec.rb
Normal file
197
spec/validates_timeliness/conversion_spec.rb
Normal file
@ -0,0 +1,197 @@
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::Conversion do
|
||||
include ValidatesTimeliness::Conversion
|
||||
|
||||
before do
|
||||
Timecop.freeze(Time.mktime(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
describe "#type_cast_value" do
|
||||
let(:options) { Hash.new }
|
||||
|
||||
describe "for date type" do
|
||||
it "should return same value for date value" do
|
||||
type_cast_value(Date.new(2010, 1, 1), :date).should == Date.new(2010, 1, 1)
|
||||
end
|
||||
|
||||
it "should return date part of time value" do
|
||||
type_cast_value(Time.mktime(2010, 1, 1, 0, 0, 0), :date).should == Date.new(2010, 1, 1)
|
||||
end
|
||||
|
||||
it "should return date part of datetime value" do
|
||||
type_cast_value(DateTime.new(2010, 1, 1, 0, 0, 0), :date).should == Date.new(2010, 1, 1)
|
||||
end
|
||||
end
|
||||
|
||||
describe "for time type" do
|
||||
it "should return same value for time value matching dummy date part" do
|
||||
type_cast_value(Time.utc(2000, 1, 1, 0, 0, 0), :time).should == Time.utc(2000, 1, 1, 0, 0, 0)
|
||||
end
|
||||
|
||||
it "should return dummy time value with same time part for time value with different date" do
|
||||
type_cast_value(Time.utc(2010, 1, 1, 0, 0, 0), :time).should == Time.utc(2000, 1, 1, 0, 0, 0)
|
||||
end
|
||||
|
||||
it "should return dummy time only for date value" do
|
||||
type_cast_value(Date.new(2010, 1, 1), :time).should == Time.utc(2000, 1, 1, 0, 0, 0)
|
||||
end
|
||||
|
||||
it "should return dummy date with time part for datetime value" do
|
||||
type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :time).should == Time.utc(2000, 1, 1, 12, 34, 56)
|
||||
end
|
||||
end
|
||||
|
||||
describe "for datetime type" do
|
||||
it "should return Date as Time value" do
|
||||
type_cast_value(Date.new(2010, 1, 1), :datetime).should == Time.local_time(2010, 1, 1, 0, 0, 0)
|
||||
end
|
||||
|
||||
it "should return same Time value" do
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56), :datetime).should == value
|
||||
end
|
||||
|
||||
it "should return as Time with same component values" do
|
||||
type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56), :datetime).should == Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
end
|
||||
|
||||
it "should return same Time in correct zone if timezone aware" do
|
||||
@timezone_aware = true
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
result = type_cast_value(value, :datetime)
|
||||
result.should == Time.zone.local(2010, 1, 1, 23, 34, 56)
|
||||
result.zone.should == 'EST'
|
||||
end
|
||||
end
|
||||
|
||||
describe "ignore_usec option" do
|
||||
let(:options) { {:ignore_usec => true} }
|
||||
|
||||
it "should ignore usec on time values when evaluated" do
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56, 10000)
|
||||
type_cast_value(value, :datetime).should == Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
end
|
||||
|
||||
it "should ignore usec and return time in correct zone if timezone aware" do
|
||||
@timezone_aware = true
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56, 10000)
|
||||
result = type_cast_value(value, :datetime)
|
||||
result.should == Time.zone.local(2010, 1, 1, 23, 34, 56)
|
||||
result.zone.should == 'EST'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#dummy_time" do
|
||||
it 'should return Time with dummy date values but same time components' do
|
||||
dummy_time(Time.utc(2010, 11, 22, 12, 34, 56)).should == Time.utc(2000, 1, 1, 12, 34, 56)
|
||||
end
|
||||
|
||||
it 'should return same value for Time which already has dummy date values' do
|
||||
dummy_time(Time.utc(2000, 1, 1, 12, 34, 56)).should == Time.utc(2000, 1, 1, 12, 34, 56)
|
||||
end
|
||||
|
||||
it 'should return time component values shifted to current zone if timezone aware' do
|
||||
@timezone_aware = true
|
||||
dummy_time(Time.utc(2000, 1, 1, 12, 34, 56)).should == Time.zone.local(2000, 1, 1, 23, 34, 56)
|
||||
end
|
||||
|
||||
it 'should return base dummy time value for Date value' do
|
||||
dummy_time(Date.new(2010, 11, 22)).should == Time.utc(2000, 1, 1, 0, 0, 0)
|
||||
end
|
||||
|
||||
describe "with custom dummy date" do
|
||||
before do
|
||||
@original_dummy_date = ValidatesTimeliness.dummy_date_for_time_type
|
||||
ValidatesTimeliness.dummy_date_for_time_type = [2010, 1, 1]
|
||||
end
|
||||
|
||||
it 'should return dummy time with custom dummy date' do
|
||||
dummy_time(Time.utc(1999, 11, 22, 12, 34, 56)).should == Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
end
|
||||
|
||||
after do
|
||||
ValidatesTimeliness.dummy_date_for_time_type = @original_dummy_date
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#evaluate_option_value" do
|
||||
let(:person) { Person.new }
|
||||
|
||||
it 'should return Date object as is' do
|
||||
value = Date.new(2010,1,1)
|
||||
evaluate_option_value(value, person).should == value
|
||||
end
|
||||
|
||||
it 'should return Time object as is' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
evaluate_option_value(value, person).should == value
|
||||
end
|
||||
|
||||
it 'should return DateTime object as is' do
|
||||
value = DateTime.new(2010,1,1,0,0,0)
|
||||
evaluate_option_value(value, person).should == value
|
||||
end
|
||||
|
||||
it 'should return Time value returned from proc with 0 arity' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
evaluate_option_value(lambda { value }, person).should == value
|
||||
end
|
||||
|
||||
it 'should return Time value returned by record attribute call in proc arity of 1' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
person.birth_time = value
|
||||
evaluate_option_value(lambda {|r| r.birth_time }, person).should == value
|
||||
end
|
||||
|
||||
it 'should return Time value for attribute method symbol which returns Time' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
person.birth_time = value
|
||||
evaluate_option_value(:birth_time, person).should == value
|
||||
end
|
||||
|
||||
it 'should return Time value is default zone from string time value' do
|
||||
value = '2010-01-01 12:00:00'
|
||||
evaluate_option_value(value, person).should == Time.utc(2010,1,1,12,0,0)
|
||||
end
|
||||
|
||||
it 'should return Time value is current zone from string time value if timezone aware' do
|
||||
@timezone_aware = true
|
||||
value = '2010-01-01 12:00:00'
|
||||
evaluate_option_value(value, person).should == Time.zone.local(2010,1,1,12,0,0)
|
||||
end
|
||||
|
||||
it 'should return Time value in default zone from proc which returns string time' do
|
||||
value = '2010-01-01 12:00:00'
|
||||
evaluate_option_value(lambda { value }, person).should == Time.utc(2010,1,1,12,0,0)
|
||||
end
|
||||
|
||||
it 'should return Time value for attribute method symbol which returns string time value' do
|
||||
value = '2010-01-01 12:00:00'
|
||||
person.birth_time = value
|
||||
evaluate_option_value(:birth_time, person).should == Time.utc(2010,1,1,12,0,0)
|
||||
end
|
||||
|
||||
context "restriction shorthand" do
|
||||
before do
|
||||
Timecop.freeze(Time.mktime(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
it 'should evaluate :now as current time' do
|
||||
evaluate_option_value(:now, person).should == Time.now
|
||||
end
|
||||
|
||||
it 'should evaluate :today as current time' do
|
||||
evaluate_option_value(:today, person).should == Date.today
|
||||
end
|
||||
|
||||
it 'should not use shorthand if symbol if is record method' do
|
||||
time = 1.day.from_now
|
||||
person.stub!(:now).and_return(time)
|
||||
evaluate_option_value(:now, person).should == time
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,247 +0,0 @@
|
||||
RSpec.describe ValidatesTimeliness::Converter do
|
||||
subject(:converter) { described_class.new(type: type, time_zone_aware: time_zone_aware, ignore_usec: ignore_usec) }
|
||||
|
||||
let(:options) { Hash.new }
|
||||
let(:type) { :date }
|
||||
let(:time_zone_aware) { false }
|
||||
let(:ignore_usec) { false }
|
||||
|
||||
before do
|
||||
Timecop.freeze(Time.mktime(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
delegate :type_cast_value, :evaluate, :parse, :dummy_time, to: :converter
|
||||
|
||||
describe "#type_cast_value" do
|
||||
describe "for date type" do
|
||||
let(:type) { :date }
|
||||
|
||||
it "should return same value for date value" do
|
||||
expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Date.new(2010, 1, 1))
|
||||
end
|
||||
|
||||
it "should return date part of time value" do
|
||||
expect(type_cast_value(Time.mktime(2010, 1, 1, 0, 0, 0))).to eq(Date.new(2010, 1, 1))
|
||||
end
|
||||
|
||||
it "should return date part of datetime value" do
|
||||
expect(type_cast_value(DateTime.new(2010, 1, 1, 0, 0, 0))).to eq(Date.new(2010, 1, 1))
|
||||
end
|
||||
|
||||
it 'should return nil for invalid value types' do
|
||||
expect(type_cast_value(12)).to eq(nil)
|
||||
end
|
||||
end
|
||||
|
||||
describe "for time type" do
|
||||
let(:type) { :time }
|
||||
|
||||
it "should return same value for time value matching dummy date part" do
|
||||
expect(type_cast_value(Time.utc(2000, 1, 1, 0, 0, 0))).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
it "should return dummy time value with same time part for time value with different date" do
|
||||
expect(type_cast_value(Time.utc(2010, 1, 1, 0, 0, 0))).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
it "should return dummy time only for date value" do
|
||||
expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
it "should return dummy date with time part for datetime value" do
|
||||
expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2000, 1, 1, 12, 34, 56))
|
||||
end
|
||||
|
||||
it 'should return nil for invalid value types' do
|
||||
expect(type_cast_value(12)).to eq(nil)
|
||||
end
|
||||
end
|
||||
|
||||
describe "for datetime type" do
|
||||
let(:type) { :datetime }
|
||||
let(:time_zone_aware) { true }
|
||||
|
||||
it "should return Date as Time value" do
|
||||
expect(type_cast_value(Date.new(2010, 1, 1))).to eq(Time.local(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
it "should return same Time value" do
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
expect(type_cast_value(Time.utc(2010, 1, 1, 12, 34, 56))).to eq(value)
|
||||
end
|
||||
|
||||
it "should return as Time with same component values" do
|
||||
expect(type_cast_value(DateTime.civil_from_format(:utc, 2010, 1, 1, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
|
||||
end
|
||||
|
||||
it "should return same Time in correct zone if timezone aware" do
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56)
|
||||
result = type_cast_value(value)
|
||||
expect(result).to eq(Time.zone.local(2010, 1, 1, 23, 34, 56))
|
||||
expect(result.zone).to eq('AEDT')
|
||||
end
|
||||
|
||||
it 'should return nil for invalid value types' do
|
||||
expect(type_cast_value(12)).to eq(nil)
|
||||
end
|
||||
end
|
||||
|
||||
describe "ignore_usec option" do
|
||||
let(:type) { :datetime }
|
||||
let(:ignore_usec) { true }
|
||||
|
||||
it "should ignore usec on time values when evaluated" do
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56, 10000)
|
||||
expect(type_cast_value(value)).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
|
||||
end
|
||||
|
||||
context do
|
||||
let(:time_zone_aware) { true }
|
||||
|
||||
it "should ignore usec and return time in correct zone if timezone aware" do
|
||||
value = Time.utc(2010, 1, 1, 12, 34, 56, 10000)
|
||||
result = type_cast_value(value)
|
||||
expect(result).to eq(Time.zone.local(2010, 1, 1, 23, 34, 56))
|
||||
expect(result.zone).to eq('AEDT')
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#dummy_time" do
|
||||
it 'should return Time with dummy date values but same time components' do
|
||||
expect(dummy_time(Time.utc(2010, 11, 22, 12, 34, 56))).to eq(Time.utc(2000, 1, 1, 12, 34, 56))
|
||||
end
|
||||
|
||||
it 'should return same value for Time which already has dummy date values' do
|
||||
expect(dummy_time(Time.utc(2000, 1, 1, 12, 34, 56))).to eq(Time.utc(2000, 1, 1, 12, 34, 56))
|
||||
end
|
||||
|
||||
it 'should return time component values shifted to current zone if timezone aware' do
|
||||
expect(dummy_time(Time.utc(2000, 1, 1, 12, 34, 56))).to eq(Time.zone.local(2000, 1, 1, 23, 34, 56))
|
||||
end
|
||||
|
||||
it 'should return base dummy time value for Date value' do
|
||||
expect(dummy_time(Date.new(2010, 11, 22))).to eq(Time.utc(2000, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
describe "with custom dummy date" do
|
||||
it 'should return dummy time with custom dummy date' do
|
||||
with_config(:dummy_date_for_time_type, [2010, 1, 1] ) do
|
||||
expect(dummy_time(Time.utc(1999, 11, 22, 12, 34, 56))).to eq(Time.utc(2010, 1, 1, 12, 34, 56))
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#evaluate" do
|
||||
let(:person) { Person.new }
|
||||
|
||||
it 'should return Date object as is' do
|
||||
value = Date.new(2010,1,1)
|
||||
expect(evaluate(value, person)).to eq(value)
|
||||
end
|
||||
|
||||
it 'should return Time object as is' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
expect(evaluate(value, person)).to eq(value)
|
||||
end
|
||||
|
||||
it 'should return DateTime object as is' do
|
||||
value = DateTime.new(2010,1,1,0,0,0)
|
||||
expect(evaluate(value, person)).to eq(value)
|
||||
end
|
||||
|
||||
it 'should return Time value returned from proc with 0 arity' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
expect(evaluate(lambda { value }, person)).to eq(value)
|
||||
end
|
||||
|
||||
it 'should return Time value returned by record attribute call in proc arity of 1' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
person.birth_time = value
|
||||
expect(evaluate(lambda {|r| r.birth_time }, person)).to eq(value)
|
||||
end
|
||||
|
||||
it 'should return Time value for attribute method symbol which returns Time' do
|
||||
value = Time.mktime(2010,1,1)
|
||||
person.birth_datetime = value
|
||||
expect(evaluate(:birth_datetime, person)).to eq(value)
|
||||
end
|
||||
|
||||
it 'should return Time value is default zone from string time value' do
|
||||
value = '2010-01-01 12:00:00'
|
||||
expect(evaluate(value, person)).to eq(Time.utc(2010,1,1,12,0,0))
|
||||
end
|
||||
|
||||
context do
|
||||
let(:converter) { described_class.new(type: :date, time_zone_aware: true) }
|
||||
|
||||
it 'should return Time value is current zone from string time value if timezone aware' do
|
||||
value = '2010-01-01 12:00:00'
|
||||
expect(evaluate(value, person)).to eq(Time.zone.local(2010,1,1,12,0,0))
|
||||
end
|
||||
end
|
||||
|
||||
it 'should return Time value in default zone from proc which returns string time' do
|
||||
value = '2010-11-12 13:00:00'
|
||||
expect(evaluate(lambda { value }, person)).to eq(Time.utc(2010,11,12,13,0,0))
|
||||
end
|
||||
|
||||
it 'should return Time value for attribute method symbol which returns string time value' do
|
||||
value = '13:00:00'
|
||||
person.birth_time = value
|
||||
expect(evaluate(:birth_time, person)).to eq(Time.utc(2000,1,1,13,0,0))
|
||||
end
|
||||
|
||||
context "restriction shorthand" do
|
||||
before do
|
||||
Timecop.freeze(Time.mktime(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
it 'should evaluate :now as current time' do
|
||||
expect(evaluate(:now, person)).to eq(Time.now)
|
||||
end
|
||||
|
||||
it 'should evaluate :today as current time' do
|
||||
expect(evaluate(:today, person)).to eq(Date.today)
|
||||
end
|
||||
|
||||
it 'should not use shorthand if symbol if is record method' do
|
||||
time = 1.day.from_now
|
||||
allow(person).to receive(:now).and_return(time)
|
||||
expect(evaluate(:now, person)).to eq(time)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe "#parse" do
|
||||
context "use_plugin_parser setting is true" do
|
||||
with_config(:use_plugin_parser, true)
|
||||
|
||||
it 'should use timeliness' do
|
||||
expect(Timeliness::Parser).to receive(:parse)
|
||||
parse('2000-01-01')
|
||||
end
|
||||
end
|
||||
|
||||
context "use_plugin_parser setting is false" do
|
||||
with_config(:use_plugin_parser, false)
|
||||
|
||||
it 'should use Time.zone.parse attribute is timezone aware' do
|
||||
expect(Timeliness::Parser).to_not receive(:parse)
|
||||
parse('2000-01-01')
|
||||
end
|
||||
|
||||
it 'should use value#to_time if use_plugin_parser setting is false and attribute is not timezone aware' do
|
||||
value = '2000-01-01'
|
||||
expect(value).to receive(:to_time)
|
||||
parse(value)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should return nil if value is nil' do
|
||||
expect(parse(nil)).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,8 +1,12 @@
|
||||
RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::Extensions::DateTimeSelect do
|
||||
include ActionView::Helpers::DateHelper
|
||||
attr_reader :person, :params
|
||||
|
||||
with_config(:use_plugin_parser, true)
|
||||
before :all do
|
||||
ValidatesTimeliness.use_plugin_parser = true
|
||||
end
|
||||
|
||||
before do
|
||||
@person = Person.new
|
||||
@ -11,105 +15,128 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
|
||||
|
||||
describe "datetime_select" do
|
||||
it "should use param values when attribute is nil" do
|
||||
@params["person"] = {
|
||||
"birth_datetime(1i)" => '2009',
|
||||
"birth_datetime(2i)" => '2',
|
||||
"birth_datetime(3i)" => '29',
|
||||
"birth_datetime(4i)" => '12',
|
||||
"birth_datetime(5i)" => '13',
|
||||
"birth_datetime(6i)" => '14',
|
||||
params["person"] = {
|
||||
"birth_datetime(1i)" => 2009,
|
||||
"birth_datetime(2i)" => 2,
|
||||
"birth_datetime(3i)" => 29,
|
||||
"birth_datetime(4i)" => 12,
|
||||
"birth_datetime(5i)" => 13,
|
||||
"birth_datetime(6i)" => 14,
|
||||
}
|
||||
person.birth_datetime = nil
|
||||
@output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
|
||||
should_have_datetime_selected(:birth_datetime, year: 2009, month: 'February', day: 29, hour: 12, min: 13, sec: 14)
|
||||
output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'February')
|
||||
output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '29')
|
||||
output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
|
||||
output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
|
||||
output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
|
||||
end
|
||||
|
||||
it "should override object values and use params if present" do
|
||||
@params["person"] = {
|
||||
"birth_datetime(1i)" => '2009',
|
||||
"birth_datetime(2i)" => '2',
|
||||
"birth_datetime(3i)" => '29',
|
||||
"birth_datetime(4i)" => '12',
|
||||
"birth_datetime(5i)" => '13',
|
||||
"birth_datetime(6i)" => '14',
|
||||
params["person"] = {
|
||||
"birth_datetime(1i)" => 2009,
|
||||
"birth_datetime(2i)" => 2,
|
||||
"birth_datetime(3i)" => 29,
|
||||
"birth_datetime(4i)" => 12,
|
||||
"birth_datetime(5i)" => 13,
|
||||
"birth_datetime(6i)" => 14,
|
||||
}
|
||||
person.birth_datetime = "2010-01-01 15:16:17"
|
||||
@output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
|
||||
should_have_datetime_selected(:birth_datetime, year: 2009, month: 'February', day: 29, hour: 12, min: 13, sec: 14)
|
||||
output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'February')
|
||||
output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '29')
|
||||
output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
|
||||
output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
|
||||
output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
|
||||
end
|
||||
|
||||
it "should use attribute values from object if no params" do
|
||||
person.birth_datetime = "2009-01-02 12:13:14"
|
||||
@output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
|
||||
should_have_datetime_selected(:birth_datetime, year: 2009, month: 'January', day: 2, hour: 12, min: 13, sec: 14)
|
||||
output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'January')
|
||||
output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '2')
|
||||
output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
|
||||
output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
|
||||
output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
|
||||
end
|
||||
|
||||
it "should use attribute values if params does not contain attribute params" do
|
||||
person.birth_datetime = "2009-01-02 12:13:14"
|
||||
@params["person"] = { }
|
||||
@output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
|
||||
should_have_datetime_selected(:birth_datetime, year: 2009, month: 'January', day: 2, hour: 12, min: 13, sec: 14)
|
||||
params["person"] = { }
|
||||
output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_datetime_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_datetime_2i] option[selected=selected]', 'January')
|
||||
output.should have_tag('select[id=person_birth_datetime_3i] option[selected=selected]', '2')
|
||||
output.should have_tag('select[id=person_birth_datetime_4i] option[selected=selected]', '12')
|
||||
output.should have_tag('select[id=person_birth_datetime_5i] option[selected=selected]', '13')
|
||||
output.should have_tag('select[id=person_birth_datetime_6i] option[selected=selected]', '14')
|
||||
end
|
||||
|
||||
it "should not select values when attribute value is nil and has no param values" do
|
||||
person.birth_datetime = nil
|
||||
@output = datetime_select(:person, :birth_datetime, include_blank: true, include_seconds: true)
|
||||
should_not_have_datetime_selected(:birth_datetime, :year, :month, :day, :hour, :min, :sec)
|
||||
output = datetime_select(:person, :birth_datetime, :include_blank => true, :include_seconds => true)
|
||||
output.should_not have_tag('select[id=person_birth_datetime_1i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_datetime_2i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_datetime_3i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_datetime_4i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_datetime_5i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_datetime_6i] option[selected=selected]')
|
||||
end
|
||||
end
|
||||
|
||||
describe "date_select" do
|
||||
it "should use param values when attribute is nil" do
|
||||
@params["person"] = {
|
||||
"birth_date(1i)" => '2009',
|
||||
"birth_date(2i)" => '2',
|
||||
"birth_date(3i)" => '29',
|
||||
params["person"] = {
|
||||
"birth_date(1i)" => 2009,
|
||||
"birth_date(2i)" => 2,
|
||||
"birth_date(3i)" => 29,
|
||||
}
|
||||
person.birth_date = nil
|
||||
@output = date_select(:person, :birth_date, include_blank: true)
|
||||
should_have_datetime_selected(:birth_date, year: 2009, month: 'February', day: 29)
|
||||
output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'February')
|
||||
output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '29')
|
||||
end
|
||||
|
||||
it "should override object values and use params if present" do
|
||||
@params["person"] = {
|
||||
"birth_date(1i)" => '2009',
|
||||
"birth_date(2i)" => '2',
|
||||
"birth_date(3i)" => '29',
|
||||
params["person"] = {
|
||||
"birth_date(1i)" => 2009,
|
||||
"birth_date(2i)" => 2,
|
||||
"birth_date(3i)" => 29,
|
||||
}
|
||||
person.birth_date = "2009-03-01"
|
||||
@output = date_select(:person, :birth_date, include_blank: true)
|
||||
should_have_datetime_selected(:birth_date, year: 2009, month: 'February', day: 29)
|
||||
output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'February')
|
||||
output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '29')
|
||||
end
|
||||
|
||||
it "should select attribute values from object if no params" do
|
||||
person.birth_date = "2009-01-02"
|
||||
@output = date_select(:person, :birth_date, include_blank: true)
|
||||
should_have_datetime_selected(:birth_date, year: 2009, month: 'January', day: 2)
|
||||
output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'January')
|
||||
output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '2')
|
||||
end
|
||||
|
||||
it "should select attribute values if params does not contain attribute params" do
|
||||
person.birth_date = "2009-01-02"
|
||||
@params["person"] = { }
|
||||
@output = date_select(:person, :birth_date, include_blank: true)
|
||||
should_have_datetime_selected(:birth_date, year: 2009, month: 'January', day: 2)
|
||||
params["person"] = { }
|
||||
output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_date_1i] option[selected=selected]', '2009')
|
||||
output.should have_tag('select[id=person_birth_date_2i] option[selected=selected]', 'January')
|
||||
output.should have_tag('select[id=person_birth_date_3i] option[selected=selected]', '2')
|
||||
end
|
||||
|
||||
it "should not select values when attribute value is nil and has no param values" do
|
||||
person.birth_date = nil
|
||||
@output = date_select(:person, :birth_date, include_blank: true)
|
||||
should_not_have_datetime_selected(:birth_time, :year, :month, :day)
|
||||
end
|
||||
|
||||
it "should allow the day part to be discarded" do
|
||||
@params["person"] = {
|
||||
"birth_date(1i)" => '2009',
|
||||
"birth_date(2i)" => '2',
|
||||
}
|
||||
|
||||
@output = date_select(:person, :birth_date, include_blank: true, discard_day: true)
|
||||
should_have_datetime_selected(:birth_date, year: 2009, month: 'February')
|
||||
should_not_have_datetime_selected(:birth_time, :day)
|
||||
expect(@output).to have_tag("input[id=person_birth_date_3i][type=hidden][value='1']")
|
||||
output = date_select(:person, :birth_date, :include_blank => true, :include_seconds => true)
|
||||
output.should_not have_tag('select[id=person_birth_date_1i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_date_2i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_date_3i] option[selected=selected]')
|
||||
end
|
||||
end
|
||||
|
||||
@ -119,44 +146,39 @@ RSpec.describe 'ValidatesTimeliness::Extensions::DateTimeSelect' do
|
||||
end
|
||||
|
||||
it "should use param values when attribute is nil" do
|
||||
@params["person"] = {
|
||||
"birth_time(1i)" => '2000',
|
||||
"birth_time(2i)" => '1',
|
||||
"birth_time(3i)" => '1',
|
||||
"birth_time(4i)" => '12',
|
||||
"birth_time(5i)" => '13',
|
||||
"birth_time(6i)" => '14',
|
||||
params["person"] = {
|
||||
"birth_time(1i)" => 2000,
|
||||
"birth_time(2i)" => 1,
|
||||
"birth_time(3i)" => 1,
|
||||
"birth_time(4i)" => 12,
|
||||
"birth_time(5i)" => 13,
|
||||
"birth_time(6i)" => 14,
|
||||
}
|
||||
person.birth_time = nil
|
||||
@output = time_select(:person, :birth_time, include_blank: true, include_seconds: true)
|
||||
should_have_datetime_selected(:birth_time, hour: 12, min: 13, sec: 14)
|
||||
output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_time_4i] option[selected=selected]', '12')
|
||||
output.should have_tag('select[id=person_birth_time_5i] option[selected=selected]', '13')
|
||||
output.should have_tag('select[id=person_birth_time_6i] option[selected=selected]', '14')
|
||||
end
|
||||
|
||||
it "should select attribute values from object if no params" do
|
||||
person.birth_time = "2000-01-01 12:13:14"
|
||||
@output = time_select(:person, :birth_time, include_blank: true, include_seconds: true)
|
||||
should_have_datetime_selected(:birth_time, hour: 12, min: 13, sec: 14)
|
||||
output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
|
||||
output.should have_tag('select[id=person_birth_time_4i] option[selected=selected]', '12')
|
||||
output.should have_tag('select[id=person_birth_time_5i] option[selected=selected]', '13')
|
||||
output.should have_tag('select[id=person_birth_time_6i] option[selected=selected]', '14')
|
||||
end
|
||||
|
||||
it "should not select values when attribute value is nil and has no param values" do
|
||||
person.birth_time = nil
|
||||
@output = time_select(:person, :birth_time, include_blank: true, include_seconds: true)
|
||||
should_not_have_datetime_selected(:birth_time, :hour, :min, :sec)
|
||||
output = time_select(:person, :birth_time, :include_blank => true, :include_seconds => true)
|
||||
output.should_not have_tag('select[id=person_birth_time_4i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_time_5i] option[selected=selected]')
|
||||
output.should_not have_tag('select[id=person_birth_time_6i] option[selected=selected]')
|
||||
end
|
||||
end
|
||||
|
||||
def should_have_datetime_selected(field, datetime_hash)
|
||||
datetime_hash.each do |key, value|
|
||||
index = {year: 1, month: 2, day: 3, hour: 4, min: 5, sec: 6}[key]
|
||||
expect(@output).to have_tag("select[id=person_#{field}_#{index}i] option[selected=selected]", value.to_s)
|
||||
end
|
||||
after :all do
|
||||
ValidatesTimeliness.use_plugin_parser = false
|
||||
end
|
||||
|
||||
def should_not_have_datetime_selected(field, *attributes)
|
||||
attributes.each do |attribute|
|
||||
index = {year: 1, month: 2, day: 3, hour: 4, min: 5, sec: 6}[attribute]
|
||||
expect(@output).not_to have_tag("select[id=person_#{attribute}_#{index}i] option[selected=selected]")
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@ -1,43 +1,21 @@
|
||||
RSpec.describe 'ValidatesTimeliness::Extensions::MultiparameterHandler' do
|
||||
require 'spec_helper'
|
||||
|
||||
context "time column" do
|
||||
it 'should be nil invalid date portion' do
|
||||
employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 31, 12, 0, 0])
|
||||
expect(employee.birth_datetime).to be_nil
|
||||
end
|
||||
|
||||
it 'should assign a Time value for valid datetimes' do
|
||||
employee = record_with_multiparameter_attribute(:birth_datetime, [2000, 2, 28, 12, 0, 0])
|
||||
expect(employee.birth_datetime).to eq Time.zone.local(2000, 2, 28, 12, 0, 0)
|
||||
end
|
||||
describe ValidatesTimeliness::Extensions::MultiparameterHandler do
|
||||
let(:employee) { Employee.new }
|
||||
|
||||
it 'should be nil for incomplete date portion' do
|
||||
employee = record_with_multiparameter_attribute(:birth_datetime, [2000, nil, nil])
|
||||
expect(employee.birth_datetime).to be_nil
|
||||
end
|
||||
it 'should return string value for invalid dates' do
|
||||
instantiate_time_object('birth_date', [2000, 2, 31]).should == '2000-02-31'
|
||||
end
|
||||
|
||||
context "date column" do
|
||||
it 'should assign nil for invalid date' do
|
||||
employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 31])
|
||||
expect(employee.birth_date).to be_nil
|
||||
end
|
||||
|
||||
it 'should assign a Date value for valid date' do
|
||||
employee = record_with_multiparameter_attribute(:birth_date, [2000, 2, 28])
|
||||
expect(employee.birth_date).to eq Date.new(2000, 2, 28)
|
||||
end
|
||||
|
||||
it 'should assign hash values for incomplete date' do
|
||||
employee = record_with_multiparameter_attribute(:birth_date, [2000, nil, nil])
|
||||
expect(employee.birth_date).to be_nil
|
||||
end
|
||||
it 'should return string value for invalid datetimes' do
|
||||
instantiate_time_object('birth_datetime', [2000, 2, 31, 12, 0, 0]).should == '2000-02-31 12:00:00'
|
||||
end
|
||||
|
||||
it 'should return Time value for valid datetimes' do
|
||||
instantiate_time_object('birth_datetime', [2000, 2, 28, 12, 0, 0]).should be_kind_of(Time)
|
||||
end
|
||||
|
||||
def record_with_multiparameter_attribute(name, values)
|
||||
hash = {}
|
||||
values.each_with_index {|value, index| hash["#{name}(#{index+1}i)"] = value.to_s }
|
||||
Employee.new(hash)
|
||||
def instantiate_time_object(name, values)
|
||||
employee.send(:instantiate_time_object, name, values)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
@ -1,28 +1,21 @@
|
||||
RSpec.describe ValidatesTimeliness, 'HelperMethods' do
|
||||
let(:record) { Person.new }
|
||||
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness, 'HelperMethods' do
|
||||
it 'should define class validation methods' do
|
||||
expect(Person).to respond_to(:validates_date)
|
||||
expect(Person).to respond_to(:validates_time)
|
||||
expect(Person).to respond_to(:validates_datetime)
|
||||
Person.should respond_to(:validates_date)
|
||||
Person.should respond_to(:validates_time)
|
||||
Person.should respond_to(:validates_datetime)
|
||||
end
|
||||
|
||||
it 'should define instance validation methods' do
|
||||
expect(record).to respond_to(:validates_date)
|
||||
expect(record).to respond_to(:validates_time)
|
||||
expect(record).to respond_to(:validates_datetime)
|
||||
Person.new.should respond_to(:validates_date)
|
||||
Person.new.should respond_to(:validates_time)
|
||||
Person.new.should respond_to(:validates_datetime)
|
||||
end
|
||||
|
||||
it 'should validate instance using class validation defined' do
|
||||
Person.validates_date :birth_date
|
||||
record.valid?
|
||||
|
||||
expect(record.errors[:birth_date]).not_to be_empty
|
||||
end
|
||||
|
||||
it 'should validate instance using instance valiation method' do
|
||||
record.validates_date :birth_date
|
||||
|
||||
expect(record.errors[:birth_date]).not_to be_empty
|
||||
it 'should validate instance when validation method called' do
|
||||
r = Person.new
|
||||
r.validates_date :birth_date
|
||||
r.errors[:birth_date].should_not be_empty
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,190 +1,85 @@
|
||||
RSpec.describe ValidatesTimeliness, 'ActiveRecord' do
|
||||
context "validation methods" do
|
||||
let(:record) { Employee.new }
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness, 'ActiveRecord' do
|
||||
|
||||
context "validation methods" do
|
||||
it 'should be defined for the class' do
|
||||
expect(ActiveRecord::Base).to respond_to(:validates_date)
|
||||
expect(ActiveRecord::Base).to respond_to(:validates_time)
|
||||
expect(ActiveRecord::Base).to respond_to(:validates_datetime)
|
||||
ActiveRecord::Base.should respond_to(:validates_date)
|
||||
ActiveRecord::Base.should respond_to(:validates_time)
|
||||
ActiveRecord::Base.should respond_to(:validates_datetime)
|
||||
end
|
||||
|
||||
it 'should defines for the instance' do
|
||||
expect(record).to respond_to(:validates_date)
|
||||
expect(record).to respond_to(:validates_time)
|
||||
expect(record).to respond_to(:validates_datetime)
|
||||
end
|
||||
|
||||
it "should validate a valid value string" do
|
||||
record.birth_date = '2012-01-01'
|
||||
|
||||
record.valid?
|
||||
expect(record.errors[:birth_date]).to be_empty
|
||||
end
|
||||
|
||||
it "should validate a invalid value string" do
|
||||
record.birth_date = 'not a date'
|
||||
|
||||
record.valid?
|
||||
expect(record.birth_date_before_type_cast).to eq 'not a date'
|
||||
expect(record.errors[:birth_date]).not_to be_empty
|
||||
end
|
||||
|
||||
it "should validate a nil value" do
|
||||
record.birth_date = nil
|
||||
|
||||
record.valid?
|
||||
expect(record.errors[:birth_date]).to be_empty
|
||||
Employee.new.should respond_to(:validates_date)
|
||||
Employee.new.should respond_to(:validates_time)
|
||||
Employee.new.should respond_to(:validates_datetime)
|
||||
end
|
||||
end
|
||||
|
||||
context 'attribute timezone awareness' do
|
||||
let(:klass) {
|
||||
Class.new(ActiveRecord::Base) do
|
||||
self.table_name = 'employees'
|
||||
attr_accessor :some_date
|
||||
attr_accessor :some_time
|
||||
attr_accessor :some_datetime
|
||||
validates_date :some_date
|
||||
validates_time :some_time
|
||||
validates_datetime :some_datetime
|
||||
end
|
||||
}
|
||||
it 'should determine type for attribute' do
|
||||
Employee.timeliness_attribute_type(:birth_date).should == :date
|
||||
end
|
||||
|
||||
context "attribute write method" do
|
||||
class EmployeeWithCache < ActiveRecord::Base
|
||||
self.table_name = 'employees'
|
||||
validates_date :birth_date, :allow_blank => true
|
||||
validates_time :birth_time, :allow_blank => true
|
||||
validates_datetime :birth_datetime, :allow_blank => true
|
||||
set_table_name 'employees'
|
||||
validates_datetime :birth_datetime
|
||||
end
|
||||
|
||||
it 'should cache attribute raw value' do
|
||||
r = EmployeeWithCache.new
|
||||
r.birth_datetime = date_string = '2010-01-01'
|
||||
r._timeliness_raw_value_for(:birth_datetime).should == date_string
|
||||
end
|
||||
|
||||
context "with plugin parser" do
|
||||
with_config(:use_plugin_parser, true)
|
||||
let(:record) { EmployeeWithParser.new }
|
||||
|
||||
class EmployeeWithParser < ActiveRecord::Base
|
||||
self.table_name = 'employees'
|
||||
validates_date :birth_date, :allow_blank => true
|
||||
validates_time :birth_time, :allow_blank => true
|
||||
validates_datetime :birth_datetime, :allow_blank => true
|
||||
set_table_name 'employees'
|
||||
validates_date :birth_date
|
||||
validates_datetime :birth_datetime
|
||||
end
|
||||
|
||||
before do
|
||||
allow(Timeliness::Parser).to receive(:parse).and_call_original
|
||||
before :all do
|
||||
ValidatesTimeliness.use_plugin_parser = true
|
||||
end
|
||||
|
||||
context "for a date column" do
|
||||
it 'should parse a string value' do
|
||||
record.birth_date = '2010-01-01'
|
||||
expect(record.birth_date).to eq(Date.new(2010, 1, 1))
|
||||
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
record.birth_date = 'not valid'
|
||||
expect(record.birth_date).to be_nil
|
||||
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should store a Date value after parsing string' do
|
||||
record.birth_date = '2010-01-01'
|
||||
|
||||
expect(record.birth_date).to be_kind_of(Date)
|
||||
expect(record.birth_date).to eq Date.new(2010, 1, 1)
|
||||
end
|
||||
it 'should parse a string value' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
r = EmployeeWithParser.new
|
||||
r.birth_date = '2010-01-01'
|
||||
end
|
||||
|
||||
context "for a time column" do
|
||||
around do |example|
|
||||
time_zone_aware_types = ActiveRecord::Base.time_zone_aware_types.dup
|
||||
example.call
|
||||
ActiveRecord::Base.time_zone_aware_types = time_zone_aware_types
|
||||
end
|
||||
|
||||
context 'timezone aware' do
|
||||
with_config(:default_timezone, 'Australia/Melbourne')
|
||||
|
||||
before do
|
||||
unless ActiveRecord::Base.time_zone_aware_types.include?(:time)
|
||||
ActiveRecord::Base.time_zone_aware_types.push(:time)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should parse a string value' do
|
||||
record.birth_time = '12:30'
|
||||
|
||||
expect(record.birth_time).to eq('12:30'.in_time_zone)
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
record.birth_time = 'not valid'
|
||||
|
||||
expect(record.birth_time).to be_nil
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should store a Time value after parsing string' do
|
||||
record.birth_time = '12:30'
|
||||
|
||||
expect(record.birth_time).to eq('12:30'.in_time_zone)
|
||||
expect(record.birth_time.utc_offset).to eq '12:30'.in_time_zone.utc_offset
|
||||
end
|
||||
end
|
||||
|
||||
skip 'not timezone aware' do
|
||||
before do
|
||||
ActiveRecord::Base.time_zone_aware_types.delete(:time)
|
||||
end
|
||||
|
||||
it 'should parse a string value' do
|
||||
record.birth_time = '12:30'
|
||||
|
||||
expect(record.birth_time).to eq(Time.utc(2000,1,1,12,30))
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
record.birth_time = 'not valid'
|
||||
|
||||
expect(record.birth_time).to be_nil
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should store a Time value in utc' do
|
||||
record.birth_time = '12:30'
|
||||
|
||||
expect(record.birth_time.utc_offset).to eq Time.now.utc.utc_offset
|
||||
end
|
||||
end
|
||||
it 'should parse string as current timezone' do
|
||||
r = EmployeeWithParser.new
|
||||
r.birth_datetime = '2010-06-01 12:00'
|
||||
r.birth_datetime.utc_offset.should == 10.hours
|
||||
end
|
||||
|
||||
context "for a datetime column" do
|
||||
with_config(:default_timezone, 'Australia/Melbourne')
|
||||
|
||||
it 'should parse a string value into Time value' do
|
||||
record.birth_datetime = '2010-01-01 12:00'
|
||||
|
||||
expect(record.birth_datetime).to eq Time.zone.local(2010,1,1,12,00)
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
record.birth_datetime = 'not valid'
|
||||
|
||||
expect(record.birth_datetime).to be_nil
|
||||
expect(Timeliness::Parser).to have_received(:parse)
|
||||
end
|
||||
|
||||
it 'should parse string as current timezone' do
|
||||
record.birth_datetime = '2010-06-01 12:00'
|
||||
|
||||
expect(record.birth_datetime.utc_offset).to eq Time.zone.utc_offset
|
||||
end
|
||||
after :all do
|
||||
Time.zone = 'Australia/Melbourne'
|
||||
ValidatesTimeliness.use_plugin_parser = false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "cached value" do
|
||||
it 'should be cleared on reload' do
|
||||
r = Employee.create!
|
||||
r.birth_date = '2010-01-01'
|
||||
r.reload
|
||||
r._timeliness_raw_value_for(:birth_date).should be_nil
|
||||
end
|
||||
end
|
||||
|
||||
context "before_type_cast method" do
|
||||
it 'should be defined on class if ORM supports it' do
|
||||
Employee.new.should respond_to(:birth_datetime_before_type_cast)
|
||||
end
|
||||
|
||||
it 'should return original value' do
|
||||
r = Employee.new
|
||||
r.birth_datetime = date_string = '2010-01-01'
|
||||
r.birth_datetime_before_type_cast.should == date_string
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
97
spec/validates_timeliness/orm/mongoid_spec.rb
Normal file
97
spec/validates_timeliness/orm/mongoid_spec.rb
Normal file
@ -0,0 +1,97 @@
|
||||
require 'spec_helper'
|
||||
|
||||
# Try loading mongoid and connecting. Otherwise, abort and skip spec.
|
||||
begin
|
||||
|
||||
require 'mongoid'
|
||||
require 'validates_timeliness/orm/mongoid'
|
||||
Mongoid.configure do |config|
|
||||
name = "validates_timeliness_test"
|
||||
host = "localhost"
|
||||
config.master = Mongo::Connection.new.db(name)
|
||||
config.persist_in_safe_mode = false
|
||||
end
|
||||
|
||||
class Article
|
||||
::ValidatesTimeliness.use_plugin_parser = true
|
||||
include Mongoid::Document
|
||||
field :publish_date, :type => Date
|
||||
field :publish_time, :type => Time
|
||||
field :publish_datetime, :type => DateTime
|
||||
validates_date :publish_date, :allow_nil => true
|
||||
validates_time :publish_time, :allow_nil => true
|
||||
validates_datetime :publish_datetime, :allow_nil => true
|
||||
::ValidatesTimeliness.use_plugin_parser = false
|
||||
end
|
||||
|
||||
describe ValidatesTimeliness, 'Mongoid' do
|
||||
|
||||
context "validation methods" do
|
||||
it 'should be defined on the class' do
|
||||
Article.should respond_to(:validates_date)
|
||||
Article.should respond_to(:validates_time)
|
||||
Article.should respond_to(:validates_datetime)
|
||||
end
|
||||
|
||||
it 'should be defined on the instance' do
|
||||
Article.new.should respond_to(:validates_date)
|
||||
Article.new.should respond_to(:validates_time)
|
||||
Article.new.should respond_to(:validates_datetime)
|
||||
end
|
||||
end
|
||||
|
||||
it 'should determine type for attribute' do
|
||||
Article.timeliness_attribute_type(:publish_date).should == :date
|
||||
end
|
||||
|
||||
context "attribute write method" do
|
||||
it 'should cache attribute raw value' do
|
||||
r = Article.new
|
||||
r.publish_datetime = date_string = '2010-01-01'
|
||||
r._timeliness_raw_value_for(:publish_datetime).should == date_string
|
||||
end
|
||||
|
||||
context "with plugin parser" do
|
||||
before :all do
|
||||
ValidatesTimeliness.use_plugin_parser = true
|
||||
end
|
||||
|
||||
it 'should parse a string value' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
r = Article.new
|
||||
r.publish_date = '2010-01-01'
|
||||
end
|
||||
|
||||
it 'should parse string into Time value' do
|
||||
r = Article.new
|
||||
r.publish_datetime = '2010-01-01 12:00'
|
||||
r.publish_datetime.should == Time.utc(2010,1,1,12,0)
|
||||
end
|
||||
|
||||
after :all do
|
||||
ValidatesTimeliness.use_plugin_parser = false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "cached value" do
|
||||
it 'should be cleared on reload' do
|
||||
r = Article.create!
|
||||
r.publish_date = '2010-01-01'
|
||||
r.reload
|
||||
r._timeliness_raw_value_for(:publish_date).should be_nil
|
||||
end
|
||||
end
|
||||
|
||||
context "before_type_cast method" do
|
||||
it 'should not be defined if ORM does not support it' do
|
||||
Article.new.should_not respond_to(:birth_datetime_before_type_cast)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
rescue LoadError
|
||||
puts "Mongoid specs skipped. Mongoid not installed"
|
||||
rescue StandardError
|
||||
puts "Mongoid specs skipped. MongoDB connection failed."
|
||||
end
|
||||
@ -1,22 +0,0 @@
|
||||
require 'validates_timeliness/railtie'
|
||||
|
||||
RSpec.describe ValidatesTimeliness::Railtie do
|
||||
context "intializers" do
|
||||
context "validates_timeliness.initialize_timeliness_ambiguous_date_format" do
|
||||
it 'should set the timeliness default ambiguous date format from the current format' do
|
||||
expect(Timeliness.configuration.ambiguous_date_format).to eq :us
|
||||
ValidatesTimeliness.parser.use_euro_formats
|
||||
|
||||
initializer("validates_timeliness.initialize_timeliness_ambiguous_date_format").run
|
||||
|
||||
expect(Timeliness.configuration.ambiguous_date_format).to eq :euro
|
||||
end
|
||||
end if Timeliness.respond_to?(:ambiguous_date_format)
|
||||
|
||||
def initializer(name)
|
||||
ValidatesTimeliness::Railtie.initializers.find { |i|
|
||||
i.name == name
|
||||
} || raise("Initializer #{name} not found")
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -1,4 +1,8 @@
|
||||
RSpec.describe ValidatesTimeliness::Validator, ":after option" do
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::Validator, ":after option" do
|
||||
include ModelHelpers
|
||||
|
||||
describe "for date type" do
|
||||
before do
|
||||
Person.validates_date :birth_date, :after => Date.new(2010, 1, 1)
|
||||
@ -23,15 +27,15 @@ RSpec.describe ValidatesTimeliness::Validator, ":after option" do
|
||||
end
|
||||
|
||||
it "should not be valid for same time as restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0), 'must be after 12:00:00')
|
||||
invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0), 'must be after 12:00:00')
|
||||
end
|
||||
|
||||
it "should not be valid for time before restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be after 12:00:00')
|
||||
invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be after 12:00:00')
|
||||
end
|
||||
|
||||
it "should be valid for time after restriction" do
|
||||
valid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01))
|
||||
valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
RSpec.describe ValidatesTimeliness::Validator, ":before option" do
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::Validator, ":before option" do
|
||||
include ModelHelpers
|
||||
|
||||
describe "for date type" do
|
||||
before do
|
||||
Person.validates_date :birth_date, :before => Date.new(2010, 1, 1)
|
||||
@ -23,15 +27,15 @@ RSpec.describe ValidatesTimeliness::Validator, ":before option" do
|
||||
end
|
||||
|
||||
it "should not be valid for time after restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be before 12:00:00')
|
||||
invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be before 12:00:00')
|
||||
end
|
||||
|
||||
it "should not be valid for same time as restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0), 'must be before 12:00:00')
|
||||
invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0), 'must be before 12:00:00')
|
||||
end
|
||||
|
||||
it "should be valid for time before restriction" do
|
||||
valid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59))
|
||||
valid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
RSpec.describe ValidatesTimeliness::Validator, ":is_at option" do
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::Validator, ":is_at option" do
|
||||
include ModelHelpers
|
||||
|
||||
before do
|
||||
Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
|
||||
Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
describe "for date type" do
|
||||
@ -27,15 +31,15 @@ RSpec.describe ValidatesTimeliness::Validator, ":is_at option" do
|
||||
end
|
||||
|
||||
it "should not be valid for time before restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be at 12:00:00')
|
||||
invalid!(:birth_time, Time.local_time(2000, 1, 1, 11, 59, 59), 'must be at 12:00:00')
|
||||
end
|
||||
|
||||
it "should not be valid for time after restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be at 12:00:00')
|
||||
invalid!(:birth_time, Time.local_time(2000, 1, 1, 12, 00, 01), 'must be at 12:00:00')
|
||||
end
|
||||
|
||||
it "should be valid for same time as restriction" do
|
||||
valid!(:birth_time, Time.local(2000, 1, 1, 12, 0, 0))
|
||||
valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
RSpec.describe ValidatesTimeliness::Validator, ":on_or_after option" do
|
||||
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)
|
||||
@ -23,15 +27,15 @@ RSpec.describe ValidatesTimeliness::Validator, ":on_or_after option" do
|
||||
end
|
||||
|
||||
it "should not be valid for time before restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 11, 59, 59), 'must be on or after 12:00:00')
|
||||
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(2000, 1, 1, 12, 00, 01))
|
||||
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(2000, 1, 1, 12, 0, 0))
|
||||
valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,4 +1,8 @@
|
||||
RSpec.describe ValidatesTimeliness::Validator, ":on_or_before option" do
|
||||
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)
|
||||
@ -23,15 +27,15 @@ RSpec.describe ValidatesTimeliness::Validator, ":on_or_before option" do
|
||||
end
|
||||
|
||||
it "should not be valid for time after restriction" do
|
||||
invalid!(:birth_time, Time.local(2000, 1, 1, 12, 00, 01), 'must be on or before 12:00:00')
|
||||
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(2000, 1, 1, 11, 59, 59))
|
||||
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(2000, 1, 1, 12, 0, 0))
|
||||
valid!(:birth_time, Time.local_time(2000, 1, 1, 12, 0, 0))
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@ -1,27 +1,28 @@
|
||||
RSpec.describe ValidatesTimeliness::Validator do
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness::Validator do
|
||||
include ModelHelpers
|
||||
NIL = [nil]
|
||||
|
||||
before do
|
||||
Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
|
||||
Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
|
||||
end
|
||||
|
||||
describe "Model.validates with :timeliness option" do
|
||||
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}
|
||||
expect(Person.validators.select { |v| v.is_a?(ActiveModel::Validations::TimelinessValidator) }.size).to eq(1)
|
||||
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)}
|
||||
expect(Person.validators.first.type).to eq(:datetime)
|
||||
end
|
||||
|
||||
it 'should add attribute to timeliness attributes set' do
|
||||
expect(PersonWithShim.timeliness_validated_attributes).not_to include(:birth_time)
|
||||
|
||||
PersonWithShim.validates :birth_time, :timeliness => {:is_at => "12:30"}
|
||||
|
||||
expect(PersonWithShim.timeliness_validated_attributes).to include(:birth_time)
|
||||
Person.validators.first.type.should == :datetime
|
||||
end
|
||||
end
|
||||
|
||||
@ -33,33 +34,22 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
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
|
||||
allow(record).to receive(:birth_date).and_return(nil)
|
||||
allow(record).to receive(:read_timeliness_attribute_before_type_cast).and_return("Not a date")
|
||||
expect(record).not_to be_valid
|
||||
expect(record.errors[:birth_date].first).to eq('is not a valid date')
|
||||
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')
|
||||
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
|
||||
|
||||
context "with raw value cache" do
|
||||
it "should not be valid with an invalid format" do
|
||||
PersonWithShim.validates_date :birth_date, :allow_nil => true
|
||||
|
||||
p = PersonWithShim.new
|
||||
p.birth_date = 'bogus'
|
||||
|
||||
expect(p).not_to be_valid
|
||||
end
|
||||
valid!(:birth_date, NIL)
|
||||
end
|
||||
end
|
||||
|
||||
@ -74,70 +64,24 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
Person.validates_date :birth_date, :allow_blank => true
|
||||
valid!(:birth_date, '')
|
||||
end
|
||||
|
||||
context "with raw value cache" do
|
||||
it "should not be valid with an invalid format" do
|
||||
PersonWithShim.validates_date :birth_date, :allow_blank => true
|
||||
|
||||
p = PersonWithShim.new
|
||||
p.birth_date = 'bogus'
|
||||
|
||||
expect(p).not_to be_valid
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
describe ':message options' do
|
||||
it 'should allow message option too' do
|
||||
Person.validates_date :birth_date, on_or_after: :today, message: 'cannot be in past'
|
||||
invalid!(:birth_date, Date.today - 5.days, 'cannot be in past')
|
||||
valid!(:birth_date, Date.today)
|
||||
end
|
||||
|
||||
it 'should first allow the defined message' do
|
||||
Person.validates_date :birth_date, on_or_after: :today, on_or_after_message: 'cannot be in past', message: 'dummy message'
|
||||
invalid!(:birth_date, Date.today - 5.days, 'cannot be in past')
|
||||
valid!(:birth_date, Date.today)
|
||||
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_date :birth_date, :between => [on_or_after, on_or_before]
|
||||
expect(Person.validators.first.options[:on_or_after]).to eq(on_or_after)
|
||||
expect(Person.validators.first.options[:on_or_before]).to eq(on_or_before)
|
||||
invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
|
||||
invalid!(:birth_date, on_or_before + 1, "must be on or before 2010-01-02")
|
||||
valid!(:birth_date, on_or_after)
|
||||
valid!(:birth_date, on_or_before)
|
||||
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_date :birth_date, :between => on_or_after..on_or_before
|
||||
expect(Person.validators.first.options[:on_or_after]).to eq(on_or_after)
|
||||
expect(Person.validators.first.options[:on_or_before]).to eq(on_or_before)
|
||||
invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
|
||||
invalid!(:birth_date, on_or_before + 1, "must be on or before 2010-01-02")
|
||||
valid!(:birth_date, on_or_after)
|
||||
valid!(:birth_date, on_or_before)
|
||||
end
|
||||
end
|
||||
|
||||
describe "range with excluded end value" do
|
||||
it 'should be split option into :on_or_after and :before values' do
|
||||
on_or_after, before = Date.new(2010,1,1), Date.new(2010,1,3)
|
||||
Person.validates_date :birth_date, :between => on_or_after...before
|
||||
expect(Person.validators.first.options[:on_or_after]).to eq(on_or_after)
|
||||
expect(Person.validators.first.options[:before]).to eq(before)
|
||||
invalid!(:birth_date, on_or_after - 1, "must be on or after 2010-01-01")
|
||||
invalid!(:birth_date, before, "must be before 2010-01-03")
|
||||
valid!(:birth_date, on_or_after)
|
||||
valid!(:birth_date, before - 1)
|
||||
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
|
||||
@ -166,18 +110,24 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
|
||||
let(:person) { PersonWithFormatOption.new }
|
||||
|
||||
with_config(:use_plugin_parser, true)
|
||||
before(:all) do
|
||||
ValidatesTimeliness.use_plugin_parser = true
|
||||
end
|
||||
|
||||
it "should be valid when value matches format" do
|
||||
person.birth_date = '11-12-1913'
|
||||
person.valid?
|
||||
expect(person.errors[:birth_date]).to be_empty
|
||||
person.errors[:birth_date].should be_empty
|
||||
end
|
||||
|
||||
it "should not be valid when value does not match format" do
|
||||
person.birth_date = '1913-12-11'
|
||||
person.valid?
|
||||
expect(person.errors[:birth_date]).to include('is not a valid date')
|
||||
person.errors[:birth_date].should include('is not a valid date')
|
||||
end
|
||||
|
||||
after(:all) do
|
||||
ValidatesTimeliness.use_plugin_parser = false
|
||||
end
|
||||
end
|
||||
|
||||
@ -185,28 +135,23 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
let(:person) { Person.new(:birth_date => Date.today) }
|
||||
|
||||
before do
|
||||
Person.validates_time :birth_date, :is_at => lambda { raise }, :before => lambda { raise }
|
||||
Person.validates_time :birth_date, :is_at => lambda { raise }
|
||||
end
|
||||
|
||||
it "should be added when ignore_restriction_errors is false" do
|
||||
with_config(:ignore_restriction_errors, false) do
|
||||
person.valid?
|
||||
expect(person.errors[:birth_date].first).to match("Error occurred validating birth_date")
|
||||
end
|
||||
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
|
||||
with_config(:ignore_restriction_errors, true) do
|
||||
person.valid?
|
||||
expect(person.errors[:birth_date]).to be_empty
|
||||
end
|
||||
ValidatesTimeliness.ignore_restriction_errors = true
|
||||
person.valid?
|
||||
person.errors[:birth_date].should be_empty
|
||||
end
|
||||
|
||||
it 'should exit on first error' do
|
||||
with_config(:ignore_restriction_errors, false) do
|
||||
person.valid?
|
||||
expect(person.errors[:birth_date].size).to eq(1)
|
||||
end
|
||||
after :all do
|
||||
ValidatesTimeliness.ignore_restriction_errors = false
|
||||
end
|
||||
end
|
||||
|
||||
@ -214,17 +159,17 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
describe "default" do
|
||||
it 'should format date error value as yyyy-mm-dd' do
|
||||
validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_date], :type => :date)
|
||||
expect(validator.format_error_value(Date.new(2010,1,1))).to eq('2010-01-01')
|
||||
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)
|
||||
expect(validator.format_error_value(Time.mktime(2010,1,1,12,34,56))).to eq('12:34:56')
|
||||
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)
|
||||
expect(validator.format_error_value(Time.mktime(2010,1,1,12,34,56))).to eq('2010-01-01 12:34:56')
|
||||
validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '2010-01-01 12:34:56'
|
||||
end
|
||||
end
|
||||
|
||||
@ -235,7 +180,7 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
|
||||
it 'should use the default format for the type' do
|
||||
validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_date], :type => :date)
|
||||
expect(validator.format_error_value(Date.new(2010,1,1))).to eq('2010-01-01')
|
||||
validator.format_error_value(Date.new(2010,1,1)).should == '2010-01-01'
|
||||
end
|
||||
|
||||
after :all do
|
||||
@ -249,7 +194,7 @@ RSpec.describe ValidatesTimeliness::Validator do
|
||||
Person.validates_date :birth_date, :invalid_date_message => 'custom invalid message'
|
||||
invalid!(:birth_date, 'asdf', 'custom invalid message')
|
||||
end
|
||||
|
||||
|
||||
it 'should be used for invalid restriction' do
|
||||
Person.validates_date :birth_date, :before => Time.now, :before_message => 'custom before message'
|
||||
invalid!(:birth_date, Time.now, 'custom before message')
|
||||
|
||||
@ -1,39 +1,41 @@
|
||||
RSpec.describe ValidatesTimeliness do
|
||||
require 'spec_helper'
|
||||
|
||||
describe ValidatesTimeliness do
|
||||
|
||||
it 'should alias use_euro_formats to remove_us_formats on Timeliness gem' do
|
||||
expect(Timeliness).to respond_to(:remove_us_formats)
|
||||
Timeliness.should respond_to(:remove_us_formats)
|
||||
end
|
||||
|
||||
it 'should alias to date_for_time_type to dummy_date_for_time_type on Timeliness gem' do
|
||||
expect(Timeliness).to respond_to(:dummy_date_for_time_type)
|
||||
Timeliness.should respond_to(:dummy_date_for_time_type)
|
||||
end
|
||||
|
||||
describe "config" do
|
||||
it 'should delegate default_timezone to Timeliness gem' do
|
||||
expect(Timeliness).to receive(:default_timezone=)
|
||||
Timeliness.should_receive(:default_timezone=)
|
||||
ValidatesTimeliness.default_timezone = :utc
|
||||
end
|
||||
|
||||
it 'should delegate dummy_date_for_time_type to Timeliness gem' do
|
||||
expect(Timeliness).to receive(:dummy_date_for_time_type)
|
||||
expect(Timeliness).to receive(:dummy_date_for_time_type=)
|
||||
Timeliness.should_receive(:dummy_date_for_time_type)
|
||||
Timeliness.should_receive(:dummy_date_for_time_type=)
|
||||
array = ValidatesTimeliness.dummy_date_for_time_type
|
||||
ValidatesTimeliness.dummy_date_for_time_type = array
|
||||
end
|
||||
|
||||
context "parser" do
|
||||
it 'should delegate add_formats to Timeliness gem' do
|
||||
expect(Timeliness).to receive(:add_formats)
|
||||
Timeliness.should_receive(:add_formats)
|
||||
ValidatesTimeliness.parser.add_formats
|
||||
end
|
||||
|
||||
it 'should delegate remove_formats to Timeliness gem' do
|
||||
expect(Timeliness).to receive(:remove_formats)
|
||||
Timeliness.should_receive(:remove_formats)
|
||||
ValidatesTimeliness.parser.remove_formats
|
||||
end
|
||||
|
||||
it 'should delegate remove_us_formats to Timeliness gem' do
|
||||
expect(Timeliness).to receive(:remove_us_formats)
|
||||
Timeliness.should_receive(:remove_us_formats)
|
||||
ValidatesTimeliness.parser.remove_us_formats
|
||||
end
|
||||
end
|
||||
|
||||
@ -1,21 +1,32 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
$:.push File.expand_path("../lib", __FILE__)
|
||||
require "validates_timeliness/version"
|
||||
|
||||
Gem::Specification.new do |s|
|
||||
s.name = "validates_timeliness"
|
||||
s.version = ValidatesTimeliness::VERSION
|
||||
s.authors = ["Adam Meehan"]
|
||||
s.summary = %q{Date and time validation plugin for Rails which allows custom formats}
|
||||
s.description = %q{Adds validation methods to ActiveModel for validating dates and times. Works with multiple ORMS.}
|
||||
s.email = %q{adam.meehan@gmail.com}
|
||||
s.homepage = %q{http://github.com/adzap/validates_timeliness}
|
||||
s.license = "MIT"
|
||||
s.name = %q{validates_timeliness}
|
||||
s.version = "3.0.0"
|
||||
|
||||
s.require_paths = ["lib"]
|
||||
s.files = `git ls-files`.split("\n") - %w{ .gitignore .rspec Gemfile Gemfile.lock autotest/discover.rb Appraisals Travis.yml } - Dir['gemsfiles/*']
|
||||
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
|
||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||
s.authors = ["Adam Meehan"]
|
||||
s.date = %q{2010-10-18}
|
||||
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", "CHANGELOG.rdoc", "LICENSE"]
|
||||
s.files = ["validates_timeliness.gemspec", "LICENSE", "CHANGELOG.rdoc", "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/orm", "lib/validates_timeliness/orm/active_record.rb", "lib/validates_timeliness/orm/mongoid.rb", "lib/validates_timeliness/railtie.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/orm", "spec/validates_timeliness/orm/active_record_spec.rb", "spec/validates_timeliness/orm/mongoid_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", "spec/validates_timeliness_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}
|
||||
|
||||
s.add_runtime_dependency(%q<timeliness>, [">= 0.3.10", "< 1"])
|
||||
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
|
||||
s.add_runtime_dependency(%q<timeliness>, ["~> 0.1.0"])
|
||||
else
|
||||
s.add_dependency(%q<timeliness>, ["~> 0.1.0"])
|
||||
end
|
||||
else
|
||||
s.add_dependency(%q<timeliness>, ["~> 0.1.0"])
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user