Upgrade to RSpec 3.

.rspec

@@ -1,2 +1,2 @@
---format nested
+--format documentation
 --color

Gemfile

@@ -3,14 +3,15 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'rails', '~> 3.2.6'
-gem 'rspec', '~> 2.8'
-gem 'rspec-rails', '~> 2.8'
+gem 'rspec', '~> 3.0'
+gem 'rspec-rails', '~> 3.0'
+gem 'rspec-collection_matchers'
 gem 'timecop'
-gem 'rspec_tag_matchers'
 gem 'ruby-debug', :platforms => [:ruby_18, :jruby]
 gem 'debugger', :platforms => [:ruby_19]
 gem 'appraisal'
 gem 'sqlite3'
+gem 'nokogiri'
 
 group :mongoid do
   gem 'mongoid', '~> 2.3.0'

spec/spec_helper.rb

@@ -1,17 +1,18 @@
 require 'rspec'
+require 'rspec/collection_matchers'
 
 require 'active_model'
 require 'active_model/validations'
 require 'active_record'
 require 'action_view'
 require 'timecop'
-require 'rspec_tag_matchers'
 
 require 'validates_timeliness'
 
 require 'support/test_model'
 require 'support/model_helpers'
 require 'support/config_helper'
+require 'support/tag_matcher'
 
 ValidatesTimeliness.setup do |c|
   c.extend_orms = [ :active_record ]
@@ -85,9 +86,9 @@ def birth_date=(value)
 
 RSpec.configure do |c|
   c.mock_with :rspec
-  c.include(RspecTagMatchers)
   c.include(ModelHelpers)
   c.include(ConfigHelper)
+  c.include(TagMatcher)
   c.before do
     reset_validation_setup_for(Person)
     reset_validation_setup_for(PersonWithShim)

spec/support/model_helpers.rb

@@ -3,15 +3,15 @@ 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|
-      record.should be_invalid
-      record.errors[attr_name].size.should >= 1
-      record.errors[attr_name].first.should == error if error
+      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
     end
   end
 
   def valid!(attr_name, values)
     with_each_person_value(attr_name, values) do |record, value|
-      record.should be_valid
+      expect(record).to be_valid
     end
   end
 

spec/support/tag_matcher.rb

@@ -0,0 +1,35 @@
+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

spec/validates_timeliness/attribute_methods_spec.rb

@@ -2,7 +2,7 @@
 
 describe ValidatesTimeliness::AttributeMethods do
   it 'should define _timeliness_raw_value_for instance method' do
-    PersonWithShim.new.should respond_to(:_timeliness_raw_value_for)
+    expect(PersonWithShim.new).to respond_to(:_timeliness_raw_value_for)
   end
 
   describe ".timeliness_validated_attributes" do
@@ -12,10 +12,10 @@
       PersonWithShim.validates_time :birth_time
       PersonWithShim.validates_datetime :birth_datetime
 
-      PersonWithShim.timeliness_validated_attributes.should == [ :birth_date, :birth_time, :birth_datetime ]
+      expect(PersonWithShim.timeliness_validated_attributes).to eq([ :birth_date, :birth_time, :birth_datetime ])
     end
   end
-  
+
   context "attribute write method" do
     class PersonWithCache
       include TestModel
@@ -31,13 +31,13 @@ class PersonWithCache
     it 'should cache attribute raw value' do
       r = PersonWithCache.new
       r.birth_datetime = date_string = '2010-01-01'
-      r._timeliness_raw_value_for('birth_datetime').should == date_string
+      expect(r._timeliness_raw_value_for('birth_datetime')).to eq(date_string)
     end
 
     it 'should not overwrite user defined methods' do
       e = Employee.new
       e.birth_date = '2010-01-01'
-      e.redefined_birth_date_called.should be_true
+      expect(e.redefined_birth_date_called).to be_truthy
     end
 
     it 'should be undefined if model class has dynamic attribute methods reset' do
@@ -48,11 +48,11 @@ class PersonWithCache
 
       write_method = RUBY_VERSION < '1.9' ? 'birth_date=' : :birth_date=
 
-      PersonWithShim.send(:generated_timeliness_methods).instance_methods.should include(write_method)
+      expect(PersonWithShim.send(:generated_timeliness_methods).instance_methods).to include(write_method)
 
-      PersonWithShim.undefine_attribute_methods 
+      PersonWithShim.undefine_attribute_methods
 
-      PersonWithShim.send(:generated_timeliness_methods).instance_methods.should_not include(write_method)
+      expect(PersonWithShim.send(:generated_timeliness_methods).instance_methods).not_to include(write_method)
     end
 
     context "with plugin parser" do
@@ -70,7 +70,7 @@ class PersonWithParser
       end
 
       it 'should parse a string value' do
-        Timeliness::Parser.should_receive(:parse)
+        expect(Timeliness::Parser).to receive(:parse)
         r = PersonWithParser.new
         r.birth_date = '2010-01-01'
       end
@@ -80,7 +80,7 @@ class PersonWithParser
 
   context "before_type_cast method" do
     it 'should not be defined if ORM does not support it' do
-      PersonWithShim.new.should_not respond_to(:birth_datetime_before_type_cast)
+      expect(PersonWithShim.new).not_to respond_to(:birth_datetime_before_type_cast)
     end
   end
 end