mirror of
https://github.com/ditkrg/validates_timeliness.git
synced 2026-01-23 06:16:44 +00:00
Remove all mongoid stuff and put in validates_timeliness-mongoid
This commit is contained in:
Adam Meehan
parent
6560a09ad2
commit
1ddf0f1b0f
30
Appraisals
30
Appraisals
@ -1,27 +1,11 @@
|
||||
appraise "rails_3_0" do
|
||||
gem "rails", "~> 3.0.0"
|
||||
appraise "rails_4_0" do
|
||||
gem "rails", "~> 4.0.0"
|
||||
end
|
||||
|
||||
appraise "rails_3_1" do
|
||||
gem "rails", "~> 3.1.0"
|
||||
appraise "rails_4_1" do
|
||||
gem "rails", "~> 4.1.0"
|
||||
end
|
||||
|
||||
appraise "rails_3_2" do
|
||||
gem "rails", "~> 3.2.0"
|
||||
end
|
||||
|
||||
appraise "mongoid_2_1" do
|
||||
gem "mongoid", "~> 2.1.0"
|
||||
end
|
||||
|
||||
appraise "mongoid_2_2" do
|
||||
gem "mongoid", "~> 2.2.0"
|
||||
end
|
||||
|
||||
appraise "mongoid_2_3" do
|
||||
gem "mongoid", "~> 2.3.0"
|
||||
end
|
||||
|
||||
appraise "mongoid_2_4" do
|
||||
gem "mongoid", "~> 2.4.0"
|
||||
end
|
||||
appraise "rails_4_2" do
|
||||
gem "rails", "~> 4.2.0"
|
||||
end
|
||||
12
Gemfile
12
Gemfile
@ -2,23 +2,17 @@ source 'http://rubygems.org'
|
||||
|
||||
gemspec
|
||||
|
||||
gem 'rails', '~> 3.2.6'
|
||||
gem 'rails', '~> 4.0.0'
|
||||
gem 'rspec', '~> 2.8'
|
||||
gem 'rspec-rails', '~> 2.8'
|
||||
gem 'timecop'
|
||||
gem 'rspec_tag_matchers'
|
||||
gem 'ruby-debug', :platforms => [:ruby_18, :jruby]
|
||||
gem 'byebug', :platforms => [:ruby_19, :ruby_20, :ruby_21, :ruby_22]
|
||||
gem 'ruby-debug', :platforms => [:jruby]
|
||||
gem 'byebug', :platforms => [:ruby_20, :ruby_21, :ruby_22]
|
||||
gem 'appraisal'
|
||||
gem 'sqlite3'
|
||||
gem 'nokogiri', '1.6.6.2'
|
||||
|
||||
group :mongoid do
|
||||
gem 'mongoid', '>= 3.0'
|
||||
gem 'bson_ext'
|
||||
gem 'system_timer', :platforms => [:ruby_18]
|
||||
end
|
||||
|
||||
group :active_record do
|
||||
gem 'sqlite3-ruby', :require => 'sqlite3'
|
||||
end
|
||||
|
||||
@ -137,8 +137,8 @@ like so
|
||||
|
||||
ValidatesTimeliness.setup do |config|
|
||||
|
||||
# Extend ORM/ODMs for full support (:active_record, :mongoid).
|
||||
config.extend_orms = [ :mongoid ]
|
||||
# Extend ORM/ODMs for full support (:active_record).
|
||||
config.extend_orms = [ :active_record ]
|
||||
|
||||
end
|
||||
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 3.2.6"
|
||||
gem "rspec", "~> 2.8"
|
||||
gem "rspec-rails", "~> 2.8"
|
||||
gem "timecop"
|
||||
gem "rspec_tag_matchers"
|
||||
gem "ruby-debug", :platforms=>[:ruby_18, :jruby]
|
||||
gem "debugger", :platforms=>[:ruby_19]
|
||||
gem "appraisal"
|
||||
gem "sqlite3"
|
||||
gem "mongoid", "~> 2.1.0"
|
||||
|
||||
gemspec :path=>"../"
|
||||
@ -1,16 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 3.2.6"
|
||||
gem "rspec", "~> 2.8"
|
||||
gem "rspec-rails", "~> 2.8"
|
||||
gem "timecop"
|
||||
gem "rspec_tag_matchers"
|
||||
gem "ruby-debug", :platforms=>[:ruby_18, :jruby]
|
||||
gem "debugger", :platforms=>[:ruby_19]
|
||||
gem "appraisal"
|
||||
gem "sqlite3"
|
||||
gem "mongoid", "~> 2.2.0"
|
||||
|
||||
gemspec :path=>"../"
|
||||
@ -1,16 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 3.2.6"
|
||||
gem "rspec", "~> 2.8"
|
||||
gem "rspec-rails", "~> 2.8"
|
||||
gem "timecop"
|
||||
gem "rspec_tag_matchers"
|
||||
gem "ruby-debug", :platforms=>[:ruby_18, :jruby]
|
||||
gem "debugger", :platforms=>[:ruby_19]
|
||||
gem "appraisal"
|
||||
gem "sqlite3"
|
||||
gem "mongoid", "~> 2.3.0"
|
||||
|
||||
gemspec :path=>"../"
|
||||
@ -1,16 +0,0 @@
|
||||
# This file was generated by Appraisal
|
||||
|
||||
source "http://rubygems.org"
|
||||
|
||||
gem "rails", "~> 3.2.6"
|
||||
gem "rspec", "~> 2.8"
|
||||
gem "rspec-rails", "~> 2.8"
|
||||
gem "timecop"
|
||||
gem "rspec_tag_matchers"
|
||||
gem "ruby-debug", :platforms=>[:ruby_18, :jruby]
|
||||
gem "debugger", :platforms=>[:ruby_19]
|
||||
gem "appraisal"
|
||||
gem "sqlite3"
|
||||
gem "mongoid", "~> 2.4.0"
|
||||
|
||||
gemspec :path=>"../"
|
||||
@ -1,5 +1,5 @@
|
||||
ValidatesTimeliness.setup do |config|
|
||||
# Extend ORM/ODMs for full support (:active_record, :mongoid).
|
||||
# Extend ORM/ODMs for full support (:active_record).
|
||||
# config.extend_orms = [ :active_record ]
|
||||
#
|
||||
# Default timezone
|
||||
|
||||
@ -28,7 +28,7 @@ module ValidatesTimeliness
|
||||
attr_accessor :extend_orms, :ignore_restriction_errors, :restriction_shorthand_symbols, :use_plugin_parser
|
||||
end
|
||||
|
||||
# Extend ORM/ODMs for full support (:active_record, :mongoid).
|
||||
# Extend ORM/ODMs for full support (:active_record).
|
||||
self.extend_orms = []
|
||||
|
||||
# Ignore errors when restriction options are evaluated
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
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
|
||||
public
|
||||
|
||||
# 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 timeliness_attribute_type(attr_name)
|
||||
{
|
||||
Date => :date,
|
||||
Time => :time,
|
||||
DateTime => :datetime
|
||||
}[fields[database_field_name(attr_name)].type] || :datetime
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def timeliness_type_cast_code(attr_name, var_name)
|
||||
type = timeliness_attribute_type(attr_name)
|
||||
|
||||
"#{var_name} = Timeliness::Parser.parse(value, :#{type})"
|
||||
end
|
||||
end
|
||||
|
||||
def reload(*args)
|
||||
_clear_timeliness_cache
|
||||
super
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
module Mongoid::Document
|
||||
include ValidatesTimeliness::AttributeMethods
|
||||
include ValidatesTimeliness::ORM::Mongoid
|
||||
end
|
||||
@ -1,223 +0,0 @@
|
||||
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|
|
||||
config.connect_to('validates_timeliness_test')
|
||||
end
|
||||
|
||||
describe ValidatesTimeliness, 'Mongoid' do
|
||||
after(:each) do
|
||||
Mongoid.purge!
|
||||
end
|
||||
|
||||
class Article
|
||||
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
|
||||
end
|
||||
|
||||
context "validation methods" do
|
||||
let(:record) { Article.new }
|
||||
|
||||
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
|
||||
record.should respond_to(:validates_date)
|
||||
record.should respond_to(:validates_time)
|
||||
record.should respond_to(:validates_datetime)
|
||||
end
|
||||
|
||||
it "should validate a valid value string" do
|
||||
record.publish_date = '2012-01-01'
|
||||
|
||||
record.valid?
|
||||
record.errors[:publish_date].should be_empty
|
||||
end
|
||||
|
||||
it "should validate a nil value" do
|
||||
record.publish_date = nil
|
||||
|
||||
record.valid?
|
||||
record.errors[:publish_date].should be_empty
|
||||
end
|
||||
end
|
||||
|
||||
it 'should determine type for attribute' do
|
||||
Article.timeliness_attribute_type(:publish_date).should == :date
|
||||
Article.timeliness_attribute_type(:publish_time).should == :time
|
||||
Article.timeliness_attribute_type(:publish_datetime).should == :datetime
|
||||
end
|
||||
|
||||
context "attribute write method" do
|
||||
let(:record) { Article.new }
|
||||
|
||||
it 'should cache attribute raw value' do
|
||||
record.publish_datetime = date_string = '2010-01-01'
|
||||
|
||||
record._timeliness_raw_value_for('publish_datetime').should == date_string
|
||||
end
|
||||
|
||||
context "with plugin parser" do
|
||||
let(:record) { ArticleWithParser.new }
|
||||
|
||||
class ArticleWithParser
|
||||
include Mongoid::Document
|
||||
field :publish_date, :type => Date
|
||||
field :publish_time, :type => Time
|
||||
field :publish_datetime, :type => DateTime
|
||||
|
||||
ValidatesTimeliness.use_plugin_parser = true
|
||||
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
|
||||
|
||||
context "for a date column" do
|
||||
it 'should parse a string value' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
|
||||
record.publish_date = '2010-01-01'
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
|
||||
record.publish_date = 'not valid'
|
||||
end
|
||||
|
||||
it 'should store a Date value after parsing string' do
|
||||
record.publish_date = '2010-01-01'
|
||||
|
||||
record.publish_date.should be_kind_of(Date)
|
||||
record.publish_date.should eq Date.new(2010, 1, 1)
|
||||
end
|
||||
end
|
||||
|
||||
context "for a time column" do
|
||||
it 'should parse a string value' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
|
||||
record.publish_time = '12:30'
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
|
||||
record.publish_time = 'not valid'
|
||||
end
|
||||
|
||||
it 'should store a Time value after parsing string' do
|
||||
record.publish_time = '12:30'
|
||||
|
||||
record.publish_time.should be_kind_of(Time)
|
||||
record.publish_time.should eq Time.utc(2000, 1, 1, 12, 30)
|
||||
end
|
||||
end
|
||||
|
||||
context "for a datetime column" do
|
||||
with_config(:default_timezone, 'Australia/Melbourne')
|
||||
|
||||
it 'should parse a string value' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
|
||||
record.publish_datetime = '2010-01-01 12:00'
|
||||
end
|
||||
|
||||
it 'should parse a invalid string value as nil' do
|
||||
Timeliness::Parser.should_receive(:parse)
|
||||
|
||||
record.publish_datetime = 'not valid'
|
||||
end
|
||||
|
||||
it 'should parse string into DateTime value' do
|
||||
record.publish_datetime = '2010-01-01 12:00'
|
||||
|
||||
record.publish_datetime.should be_kind_of(DateTime)
|
||||
end
|
||||
|
||||
it 'should parse string as current timezone' do
|
||||
record.publish_datetime = '2010-06-01 12:00'
|
||||
|
||||
record.publish_datetime.utc_offset.should eq Time.zone.utc_offset
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "cached value" do
|
||||
it 'should be cleared on reload' do
|
||||
record = Article.create!
|
||||
record.publish_date = '2010-01-01'
|
||||
record.reload
|
||||
record._timeliness_raw_value_for('publish_date').should be_nil
|
||||
end
|
||||
end
|
||||
|
||||
context "before_type_cast method" do
|
||||
let(:record){ Article.new }
|
||||
|
||||
it 'should be defined on class if ORM supports it' do
|
||||
record.should respond_to(:publish_datetime_before_type_cast)
|
||||
end
|
||||
|
||||
it 'should return original value' do
|
||||
record.publish_datetime = date_string = '2010-01-01'
|
||||
|
||||
record.publish_datetime_before_type_cast.should eq date_string
|
||||
end
|
||||
|
||||
it 'should return attribute if no attribute assignment has been made' do
|
||||
time = Time.zone.local(2010,01,01)
|
||||
Article.create(:publish_datetime => time)
|
||||
record = Article.last
|
||||
record.publish_datetime_before_type_cast.should eq time.to_datetime
|
||||
end
|
||||
|
||||
context "with plugin parser" do
|
||||
with_config(:use_plugin_parser, true)
|
||||
|
||||
it 'should return original value' do
|
||||
record.publish_datetime = date_string = '2010-01-31'
|
||||
record.publish_datetime_before_type_cast.should eq date_string
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context "with aliased fields" do
|
||||
class ArticleWithAliasedFields
|
||||
include Mongoid::Document
|
||||
field :pd, as: :publish_date, :type => Date
|
||||
field :pt, as: :publish_time, :type => Time
|
||||
field :pdt, as: :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
|
||||
end
|
||||
|
||||
it 'should determine type for attribute' do
|
||||
ArticleWithAliasedFields.timeliness_attribute_type(:publish_date).should == :date
|
||||
ArticleWithAliasedFields.timeliness_attribute_type(:publish_time).should == :time
|
||||
ArticleWithAliasedFields.timeliness_attribute_type(:publish_datetime).should == :datetime
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
rescue LoadError
|
||||
puts "Mongoid specs skipped. Mongoid not installed"
|
||||
rescue StandardError => e
|
||||
puts "Mongoid specs skipped. MongoDB connection failed with error: #{e.message}"
|
||||
end
|
||||
Loading…
Reference in New Issue
Block a user