validates_timeliness 3.0.15 → 4.0.0

data/spec/validates_timeliness/validator_spec.rb

@@ -2,28 +2,28 @@ require 'spec_helper'
 
 describe ValidatesTimeliness::Validator do
   before do
-    Timecop.freeze(Time.local_time(2010, 1, 1, 0, 0, 0))
+    Timecop.freeze(Time.local(2010, 1, 1, 0, 0, 0))
   end
 
   describe "Model.validates with :timeliness option" do
     it 'should use plugin validator class' do
       Person.validates :birth_date, :timeliness => {:is_at => Date.new(2010,1,1), :type => :date}
-      Person.validators.should have(1).kind_of(ActiveModel::Validations::TimelinessValidator)
+      expect(Person.validators.select { |v| v.is_a?(ActiveModel::Validations::TimelinessValidator) }.size).to eq(1)
       invalid!(:birth_date, Date.new(2010,1,2))
       valid!(:birth_date, Date.new(2010,1,1))
     end
 
     it 'should use default to :datetime type' do
       Person.validates :birth_datetime, :timeliness => {:is_at => Time.mktime(2010,1,1)}
-      Person.validators.first.type.should == :datetime
+      expect(Person.validators.first.type).to eq(:datetime)
     end
 
     it 'should add attribute to timeliness attributes set' do
-      PersonWithShim.timeliness_validated_attributes.should_not include(:birth_time)
+      expect(PersonWithShim.timeliness_validated_attributes).not_to include(:birth_time)
 
       PersonWithShim.validates :birth_time, :timeliness => {:is_at => "12:30"}
 
-      PersonWithShim.timeliness_validated_attributes.should include(:birth_time)
+      expect(PersonWithShim.timeliness_validated_attributes).to include(:birth_time)
     end
   end
 
@@ -35,10 +35,10 @@ 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
-    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'
+    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')
   end
 
   describe ":allow_nil option" do
@@ -60,7 +60,7 @@ describe ValidatesTimeliness::Validator do
         p = PersonWithShim.new
         p.birth_date = 'bogus'
 
-        p.should_not be_valid
+        expect(p).not_to be_valid
       end
     end
   end
@@ -84,7 +84,7 @@ describe ValidatesTimeliness::Validator do
         p = PersonWithShim.new
         p.birth_date = 'bogus'
 
-        p.should_not be_valid
+        expect(p).not_to be_valid
       end
     end
   end
@@ -94,8 +94,8 @@ describe ValidatesTimeliness::Validator 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]
-        Person.validators.first.options[:on_or_after].should == on_or_after
-        Person.validators.first.options[:on_or_before].should == 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)
@@ -107,8 +107,8 @@ describe ValidatesTimeliness::Validator 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
-        Person.validators.first.options[:on_or_after].should == on_or_after
-        Person.validators.first.options[:on_or_before].should == 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)
@@ -120,8 +120,8 @@ describe ValidatesTimeliness::Validator 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
-        Person.validators.first.options[:on_or_after].should == on_or_after
-        Person.validators.first.options[:before].should == 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)
@@ -159,13 +159,13 @@ describe ValidatesTimeliness::Validator do
     it "should be valid when value matches format" do
       person.birth_date = '11-12-1913'
       person.valid?
-      person.errors[:birth_date].should be_empty
+      expect(person.errors[:birth_date]).to be_empty
     end
 
     it "should not be valid when value does not match format" do
       person.birth_date = '1913-12-11'
       person.valid?
-      person.errors[:birth_date].should include('is not a valid date')
+      expect(person.errors[:birth_date]).to include('is not a valid date')
     end
   end
 
@@ -179,21 +179,21 @@ describe ValidatesTimeliness::Validator do
     it "should be added when ignore_restriction_errors is false" do
       with_config(:ignore_restriction_errors, false) do
         person.valid?
-        person.errors[:birth_date].first.should match("Error occurred validating birth_date")
+        expect(person.errors[:birth_date].first).to match("Error occurred validating birth_date")
       end
     end
 
     it "should not be added when ignore_restriction_errors is true" do
       with_config(:ignore_restriction_errors, true) do
         person.valid?
-        person.errors[:birth_date].should be_empty
+        expect(person.errors[:birth_date]).to be_empty
       end
     end
 
     it 'should exit on first error' do
       with_config(:ignore_restriction_errors, false) do
         person.valid?
-        person.errors[:birth_date].should have(1).items
+        expect(person.errors[:birth_date].size).to eq(1)
       end
     end
   end
@@ -202,17 +202,17 @@ 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)
-        validator.format_error_value(Date.new(2010,1,1)).should == '2010-01-01'
+        expect(validator.format_error_value(Date.new(2010,1,1))).to eq('2010-01-01')
       end
 
       it 'should format time error value as hh:nn:ss' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_time], :type => :time)
-        validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '12:34:56'
+        expect(validator.format_error_value(Time.mktime(2010,1,1,12,34,56))).to eq('12:34:56')
       end
 
       it 'should format datetime error value as yyyy-mm-dd hh:nn:ss' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_datetime], :type => :datetime)
-        validator.format_error_value(Time.mktime(2010,1,1,12,34,56)).should == '2010-01-01 12:34:56'
+        expect(validator.format_error_value(Time.mktime(2010,1,1,12,34,56))).to eq('2010-01-01 12:34:56')
       end
     end
 
@@ -223,7 +223,7 @@ describe ValidatesTimeliness::Validator do
 
       it 'should use the default format for the type' do
         validator = ValidatesTimeliness::Validator.new(:attributes => [:birth_date], :type => :date)
-        validator.format_error_value(Date.new(2010,1,1)).should == '2010-01-01'
+        expect(validator.format_error_value(Date.new(2010,1,1))).to eq('2010-01-01')
       end
 
       after :all do

data/spec/validates_timeliness_spec.rb

@@ -3,39 +3,39 @@ require 'spec_helper'
 describe ValidatesTimeliness do
 
   it 'should alias use_euro_formats to remove_us_formats on Timeliness gem' do
-    Timeliness.should respond_to(:remove_us_formats) 
+    expect(Timeliness).to respond_to(:remove_us_formats) 
   end
 
   it 'should alias to date_for_time_type to dummy_date_for_time_type on Timeliness gem' do
-    Timeliness.should respond_to(:dummy_date_for_time_type) 
+    expect(Timeliness).to respond_to(:dummy_date_for_time_type) 
   end
 
   describe "config" do
     it 'should delegate default_timezone to Timeliness gem' do
-      Timeliness.should_receive(:default_timezone=)
+      expect(Timeliness).to receive(:default_timezone=)
       ValidatesTimeliness.default_timezone = :utc
     end
 
     it 'should delegate dummy_date_for_time_type to Timeliness gem' do
-      Timeliness.should_receive(:dummy_date_for_time_type) 
-      Timeliness.should_receive(:dummy_date_for_time_type=) 
+      expect(Timeliness).to receive(:dummy_date_for_time_type) 
+      expect(Timeliness).to 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
-        Timeliness.should_receive(:add_formats)
+        expect(Timeliness).to receive(:add_formats)
         ValidatesTimeliness.parser.add_formats
       end
 
       it 'should delegate remove_formats to Timeliness gem' do
-        Timeliness.should_receive(:remove_formats)
+        expect(Timeliness).to receive(:remove_formats)
         ValidatesTimeliness.parser.remove_formats
       end
 
       it 'should delegate remove_us_formats to Timeliness gem' do
-        Timeliness.should_receive(:remove_us_formats)
+        expect(Timeliness).to receive(:remove_us_formats)
         ValidatesTimeliness.parser.remove_us_formats
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validates_timeliness
 version: !ruby/object:Gem::Version
-  version: 3.0.15
+  version: 4.0.0
 platform: ruby
 authors:
 - Adam Meehan
@@ -34,17 +34,14 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - LICENSE
 files:
+- ".travis.yml"
 - CHANGELOG.rdoc
 - LICENSE
 - README.rdoc
 - Rakefile
-- gemfiles/mongoid_2_1.gemfile
-- gemfiles/mongoid_2_2.gemfile
-- gemfiles/mongoid_2_3.gemfile
-- gemfiles/mongoid_2_4.gemfile
-- gemfiles/rails_3_0.gemfile
-- gemfiles/rails_3_1.gemfile
-- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - init.rb
 - lib/generators/validates_timeliness/install_generator.rb
 - lib/generators/validates_timeliness/templates/en.yml
@@ -57,13 +54,13 @@ files:
 - lib/validates_timeliness/extensions/multiparameter_handler.rb
 - lib/validates_timeliness/helper_methods.rb
 - 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
 - spec/spec_helper.rb
 - spec/support/config_helper.rb
 - spec/support/model_helpers.rb
+- spec/support/tag_matcher.rb
 - spec/support/test_model.rb
 - spec/validates_timeliness/attribute_methods_spec.rb
 - spec/validates_timeliness/conversion_spec.rb
@@ -71,7 +68,6 @@ files:
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
 - spec/validates_timeliness/orm/active_record_spec.rb
-- spec/validates_timeliness/orm/mongoid_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb
 - spec/validates_timeliness/validator/is_at_spec.rb
@@ -107,6 +103,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/config_helper.rb
 - spec/support/model_helpers.rb
+- spec/support/tag_matcher.rb
 - spec/support/test_model.rb
 - spec/validates_timeliness/attribute_methods_spec.rb
 - spec/validates_timeliness/conversion_spec.rb
@@ -114,7 +111,6 @@ test_files:
 - spec/validates_timeliness/extensions/multiparameter_handler_spec.rb
 - spec/validates_timeliness/helper_methods_spec.rb
 - spec/validates_timeliness/orm/active_record_spec.rb
-- spec/validates_timeliness/orm/mongoid_spec.rb
 - spec/validates_timeliness/validator/after_spec.rb
 - spec/validates_timeliness/validator/before_spec.rb
 - spec/validates_timeliness/validator/is_at_spec.rb

data/gemfiles/mongoid_2_1.gemfile

@@ -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=>"../"

data/gemfiles/mongoid_2_2.gemfile

@@ -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=>"../"

data/gemfiles/mongoid_2_3.gemfile

@@ -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=>"../"

data/gemfiles/mongoid_2_4.gemfile

@@ -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=>"../"

data/gemfiles/rails_3_0.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-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 "rails", "~> 3.0.0"
-
-gemspec :path=>"../"

data/gemfiles/rails_3_1.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-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 "rails", "~> 3.1.0"
-
-gemspec :path=>"../"

data/gemfiles/rails_3_2.gemfile

@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-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 "rails", "~> 3.2.0"
-
-gemspec :path=>"../"

data/lib/validates_timeliness/orm/mongoid.rb

@@ -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