shoulda-matchers 1.0.0.beta2 → 1.0.0.beta3

data/Appraisals

@@ -0,0 +1,12 @@
+appraise "3.0.3" do
+  gem "rails", "3.0.3"
+  gem "rake", "~> 0.8.7"
+end
+
+appraise "3.1.0.rc1" do
+  gem "rails", "3.1.0.rc1"
+  gem 'sass'
+  gem 'coffee-script'
+  gem 'uglifier'
+  gem 'jquery-rails'
+end

data/Gemfile

@@ -1,4 +1,5 @@
 source 'http://rubygems.org'
 
 gemspec
+gem 'rake', '~> 0.8.7'
 

data/README.rdoc

@@ -10,12 +10,22 @@ about using shoulda with Test::Unit.
 
 === ActiveRecord Matchers
 
-Matchers to test associations and validations:
+Matchers to test associations:
 
   describe Post do
     it { should belong_to(:user) }
     it { should have_many(:tags).through(:taggings) }
+  end
+
+  describe User do
+    it { should have_many(:posts) }
+  end
+
+=== ActiveModel Matchers
 
+Matchers to test validations and mass assignments:
+
+  describe Post do
     it { should validate_uniqueness_of(:title) }
     it { should validate_presence_of(:body).with_message(/wtf/) }
     it { should validate_presence_of(:title) }
@@ -23,8 +33,6 @@ Matchers to test associations and validations:
   end
 
   describe User do
-    it { should have_many(:posts) }
-
     it { should_not allow_value("blah").for(:email) }
     it { should allow_value("a@b.com").for(:email) }
     it { should ensure_inclusion_of(:age).in_range(1..100) }
@@ -53,8 +61,8 @@ Matchers to test common patterns:
 In Rails 3 and Bundler, add the following to your Gemfile:
 
   group :test do
-    gem "shoulda-matchers"
     gem "rspec-rails"
+    gem "shoulda-matchers"
   end
 
 Shoulda will automatically include matchers into the appropriate example groups.

data/Rakefile

@@ -5,6 +5,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
+require 'appraisal'
 
 $LOAD_PATH.unshift("lib")
 require 'shoulda/matchers/version'
@@ -41,10 +42,14 @@ desc "Clean files generated by rake tasks"
 task :clobber => [:clobber_rdoc, :clobber_package]
 
 Cucumber::Rake::Task.new do |t|
-  t.fork = true
+  t.fork = false
   t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
 end
 
 desc 'Default: run specs and cucumber features'
-task :default => [:spec, :cucumber]
+task :default => [:all]
 
+desc 'Test the plugin under all supported Rails versions.'
+task :all => ["appraisal:cleanup", "appraisal:install"] do |t|
+  exec('rake appraisal spec cucumber')
+end

data/lib/shoulda/matchers/action_controller/assign_to_matcher.rb

@@ -82,8 +82,8 @@ module Shoulda # :nodoc:
           else
             @failure_message =
               "Expected action to assign a kind of #{@expected_class} " <<
-              "for #{@variable}, but got #{@variable.inspect} " <<
-              "(#{@variable.class.name})"
+              "for #{@variable}, but got #{assigned_value.inspect} " <<
+              "(#{assigned_value.class.name})"
             false
           end
         end

data/lib/shoulda/matchers/action_controller/set_the_flash_matcher.rb

@@ -57,12 +57,12 @@ module Shoulda # :nodoc:
 
         def string_value_matches?
           return true unless String === @value
-          flash.values.any? {|value| value == @value }
+          flash.to_hash.values.any? {|value| value == @value }
         end
 
         def regexp_value_matches?
           return true unless Regexp === @value
-          flash.values.any? {|value| value =~ @value }
+          flash.to_hash.values.any? {|value| value =~ @value }
         end
 
         def flash

data/lib/shoulda/matchers/action_mailer/have_sent_email.rb

@@ -8,45 +8,103 @@ module Shoulda # :nodoc:
       #   it { should have_sent_email.from('do-not-reply@example.com') }
       #   it { should have_sent_email.with_body(/is spam\./) }
       #   it { should have_sent_email.to('myself@me.com') }
+      #   it { should have_sent_email.with_part('text/html', /HTML spam/) }
       #   it { should have_sent_email.with_subject(/spam/).
       #                               from('do-not-reply@example.com').
       #                               with_body(/spam/).
       #                               to('myself@me.com') }
+      #
+      # Use values of instance variables
+      #   it {should have_sent_email.to {@user.email} }
       def have_sent_email
-        HaveSentEmailMatcher.new
+        HaveSentEmailMatcher.new(self)
       end
 
       class HaveSentEmailMatcher # :nodoc:
 
-        def initialize
+        def initialize(context)
+          @context = context
         end
 
-        def with_subject(email_subject)
+        def in_context(context)
+          @context = context
+          self
+        end
+
+        def with_subject(email_subject = nil, &block)
           @email_subject = email_subject
+          @email_subject_block = block
           self
         end
 
-        def from(sender)
+        def from(sender = nil, &block)
           @sender = sender
+          @sender_block = block
           self
         end
 
-        def with_body(body)
+        def with_body(body = nil, &block)
           @body = body
+          @body_block = block
+          self
+        end
+
+        def with_part(content_type, body = nil, &block)
+          @parts ||= []
+          @parts << [/#{Regexp.escape(content_type)}/, body, content_type]
+          @parts_blocks ||= []
+          @parts_blocks << block
           self
         end
 
-        def to(recipient)
+        def to(recipient = nil, &block)
           @recipient = recipient
+          @recipient_block = block
+          self
+        end
+
+        def cc(recipient = nil, &block)
+          @cc = recipient
+          @cc_block = block
+          self
+        end
+
+        def with_cc(recipients = nil, &block)
+          @cc_recipients = recipients
+          @cc_recipients_block = block
+          self
+        end
+
+        def bcc(recipient = nil, &block)
+          @bcc = recipient
+          @bcc_block = block
+          self
+        end
+
+        def with_bcc(recipients = nil, &block)
+          @bcc_recipients = recipients
+          @bcc_recipients_block = block
+          self
+        end
+
+        def multipart(flag = true)
+          @multipart = !!flag
           self
         end
 
         def matches?(subject)
+          normalize_blocks
           ::ActionMailer::Base.deliveries.each do |mail|
             @subject_failed = !regexp_or_string_match(mail.subject, @email_subject) if @email_subject
-            @body_failed = !regexp_or_string_match(mail.body, @body) if @body
+            @parts_failed = !parts_match(mail, @parts) if @parts
+            @body_failed = !body_match(mail, @body) if @body
             @sender_failed = !regexp_or_string_match_in_array(mail.from, @sender) if @sender
             @recipient_failed = !regexp_or_string_match_in_array(mail.to, @recipient) if @recipient
+            @cc_failed = !regexp_or_string_match_in_array(mail.cc, @cc) if @cc
+            @cc_recipients_failed = !match_array_in_array(mail.cc, @cc_recipients) if @cc_recipients
+            @bcc_failed = !regexp_or_string_match_in_array(mail.bcc, @bcc) if @bcc
+            @bcc_recipients_failed = !match_array_in_array(mail.bcc, @bcc_recipients) if @bcc_recipients
+            @multipart_failed = (mail.multipart? != @multipart) if defined?(@multipart)
             return true unless anything_failed?
           end
 
@@ -65,8 +123,15 @@ module Shoulda # :nodoc:
           description  = "send an email"
           description << " with a subject of #{@email_subject.inspect}" if @email_subject
           description << " containing #{@body.inspect}" if @body
+          @parts.each do |_, body, content_type|
+            description << " having a #{content_type} part containing #{body.inspect}"
+          end if @parts
           description << " from #{@sender.inspect}" if @sender
           description << " to #{@recipient.inspect}" if @recipient
+          description << " cc #{@cc.inspect}" if @cc
+          description << " with cc #{@cc_recipients.inspect}" if @cc_recipients
+          description << " bcc #{@bcc.inspect}" if @bcc
+          description << " with bcc #{@bcc_recipients.inspect}" if @bcc_recipients
           description
         end
 
@@ -76,8 +141,16 @@ module Shoulda # :nodoc:
           expectation = "sent email"
           expectation << " with subject #{@email_subject.inspect}" if @subject_failed
           expectation << " with body #{@body.inspect}" if @body_failed
+          @parts.each do |_, body, content_type|
+            expectation << " with a #{content_type} part containing #{body}"
+          end if @parts && @parts_failed
           expectation << " from #{@sender.inspect}" if @sender_failed
           expectation << " to #{@recipient.inspect}" if @recipient_failed
+          expectation << " cc #{@cc.inspect}" if @cc_failed
+          expectation << " with cc #{@cc_recipients.inspect}" if @cc_recipients_failed
+          expectation << " bcc #{@bcc.inspect}" if @bcc_failed
+          expectation << " with bcc #{@bcc_recipients.inspect}" if @bcc_recipients_failed
+          expectation << " #{'not ' if !@multipart}being multipart" if @multipart_failed
           expectation << "\nDeliveries:\n#{inspect_deliveries}"
         end
 
@@ -88,7 +161,26 @@ module Shoulda # :nodoc:
         end
 
         def anything_failed?
-          @subject_failed || @body_failed || @sender_failed || @recipient_failed
+          @subject_failed || @body_failed || @sender_failed || @recipient_failed ||
+            @cc_failed || @cc_recipients_failed || @bcc_failed || @bcc_recipients_failed ||
+            @parts_failed || @multipart_failed
+        end
+
+        def normalize_blocks
+          @email_subject = @context.instance_eval(&@email_subject_block) if @email_subject_block
+          @sender = @context.instance_eval(&@sender_block) if @sender_block
+          @body = @context.instance_eval(&@body_block) if @body_block
+          @recipient = @context.instance_eval(&@recipient_block) if @recipient_block
+          @cc = @context.instance_eval(&@cc_block) if @cc_block
+          @cc_recipients = @context.instance_eval(&@cc_recipients_block) if @cc_recipients_block
+          @bcc = @context.instance_eval(&@bcc_block) if @bcc_block
+          @bcc_recipients = @context.instance_eval(&@bcc_recipients_block) if @bcc_recipients_block
+
+          if @parts
+            @parts.each_with_index do |part, i|
+              part[1] = @context.instance_eval(&@parts_blocks[i]) if @parts_blocks[i]
+            end
+          end
         end
 
         def regexp_or_string_match(a_string, a_regexp_or_string)
@@ -108,8 +200,42 @@ module Shoulda # :nodoc:
             an_array.include?(a_regexp_or_string)
           end
         end
+
+        def match_array_in_array(target_array, match_array)
+          target_array.sort!
+          match_array.sort!
+
+          target_array.each_cons(match_array.size).include? match_array
+        end
+
+        def body_match(mail, a_regexp_or_string)
+          # Mail objects instantiated by ActionMailer3 return a blank
+          # body if the e-mail is multipart. TMail concatenates the
+          # String representation of each part instead.
+          if mail.body.blank? && mail.multipart?
+            part_match(mail, /^text\//, a_regexp_or_string)
+          else
+            regexp_or_string_match(mail.body, a_regexp_or_string)
+          end
+        end
+
+        def parts_match(mail, parts)
+          return false if mail.parts.empty?
+
+          parts.all? do |content_type, match, _|
+            part_match(mail, content_type, match)
+          end
+        end
+
+        def part_match(mail, content_type, a_regexp_or_string)
+          matching = mail.parts.select {|p| p.content_type =~ content_type}
+          return false if matching.empty?
+
+          matching.all? do |part|
+            regexp_or_string_match(part.body, a_regexp_or_string)
+          end
+        end
       end
     end
   end
-
 end

data/lib/shoulda/matchers/active_model.rb

@@ -0,0 +1,33 @@
+require 'shoulda/matchers/active_model/helpers'
+require 'shoulda/matchers/active_model/validation_matcher'
+require 'shoulda/matchers/active_model/allow_value_matcher'
+require 'shoulda/matchers/active_model/ensure_length_of_matcher'
+require 'shoulda/matchers/active_model/ensure_inclusion_of_matcher'
+require 'shoulda/matchers/active_model/validate_presence_of_matcher'
+require 'shoulda/matchers/active_model/validate_format_of_matcher'
+require 'shoulda/matchers/active_model/validate_uniqueness_of_matcher'
+require 'shoulda/matchers/active_model/validate_acceptance_of_matcher'
+require 'shoulda/matchers/active_model/validate_numericality_of_matcher'
+require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
+
+
+module Shoulda
+  module Matchers
+    # = Matchers for your active record models
+    #
+    # These matchers will test most of the validations of ActiveModel::Validations.
+    #
+    #   describe User do
+    #     it { should validate_presence_of(:name) }
+    #     it { should validate_presence_of(:phone_number) }
+    #     %w(abcd 1234).each do |value|
+    #       it { should_not allow_value(value).for(:phone_number) }
+    #     end
+    #     it { should allow_value("(123) 456-7890").for(:phone_number) }
+    #     it { should_not allow_mass_assignment_of(:password) }
+    #   end
+    #
+    module ActiveModel
+    end
+  end
+end

data/lib/shoulda/matchers/{active_record → active_model}/allow_mass_assignment_of_matcher.rb

@@ -1,12 +1,16 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the attribute can be set on mass update.
       #
       #   it { should_not allow_mass_assignment_of(:password) }
       #   it { should allow_mass_assignment_of(:first_name) }
       #
+      # In Rails 3.1 you can check role as well:
+      #
+      #   it { should allow_mass_assigment_of(:first_name).as(:admin) }
+      #
       def allow_mass_assignment_of(value)
         AllowMassAssignmentOfMatcher.new(value)
       end
@@ -17,8 +21,15 @@ module Shoulda # :nodoc:
           @attribute = attribute.to_s
         end
 
+        def as(role)
+          raise "You can specify role only in Rails 3.1 or greater" unless rails_3_1?
+          @role = role
+          self
+        end
+
         def matches?(subject)
           @subject = subject
+          @role ||= :default
           if attr_mass_assignable?
             if whitelisting?
               @negative_failure_message = "#{@attribute} was made accessible"
@@ -61,14 +72,18 @@ module Shoulda # :nodoc:
         end
 
         def whitelisting?
-          !accessible_attributes.empty?
+          authorizer.kind_of?(::ActiveModel::MassAssignmentSecurity::WhiteList)
         end
 
         def attr_mass_assignable?
-          if whitelisting?
-            accessible_attributes.include?(@attribute)
+          !authorizer.deny?(@attribute)
+        end
+
+        def authorizer
+          if rails_3_1?
+            @subject.class.active_authorizer[@role]
           else
-            !protected_attributes.include?(@attribute)
+            @subject.class.active_authorizer
           end
         end
 
@@ -76,8 +91,10 @@ module Shoulda # :nodoc:
           @subject.class.name
         end
 
+        def rails_3_1?
+          ::ActiveModel::VERSION::MAJOR == 3 && ::ActiveModel::VERSION::MINOR >= 1
+        end
       end
-
     end
   end
 end

data/lib/shoulda/matchers/{active_record → active_model}/allow_value_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the attribute can be set to the given value.
       #

data/lib/shoulda/matchers/{active_record → active_model}/ensure_inclusion_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensure that the attribute's value is in the range specified
       #

data/lib/shoulda/matchers/{active_record → active_model}/ensure_length_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the length of the attribute is validated.
       #

data/lib/shoulda/matchers/{active_record → active_model}/helpers.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
       module Helpers
         def pretty_error_messages(obj) # :nodoc:
           obj.errors.map do |a, m|

data/lib/shoulda/matchers/{active_record → active_model}/validate_acceptance_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the model cannot be saved the given attribute is not
       # accepted.

data/lib/shoulda/matchers/{active_record → active_model}/validate_format_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the model is not valid if the given attribute is not
       # formatted correctly.

data/lib/shoulda/matchers/{active_record → active_model}/validate_numericality_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensure that the attribute is numeric
       #

data/lib/shoulda/matchers/{active_record → active_model}/validate_presence_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the model is not valid if the given attribute is not
       # present.

data/lib/shoulda/matchers/{active_record → active_model}/validate_uniqueness_of_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       # Ensures that the model is invalid if the given attribute is not unique.
       #

data/lib/shoulda/matchers/{active_record → active_model}/validation_matcher.rb

@@ -1,6 +1,6 @@
 module Shoulda # :nodoc:
   module Matchers
-    module ActiveRecord # :nodoc:
+    module ActiveModel # :nodoc:
 
       class ValidationMatcher # :nodoc:
 

data/lib/shoulda/matchers/active_record.rb

@@ -1,35 +1,17 @@
-require 'shoulda/matchers/active_record/helpers'
-require 'shoulda/matchers/active_record/validation_matcher'
-require 'shoulda/matchers/active_record/allow_value_matcher'
-require 'shoulda/matchers/active_record/ensure_length_of_matcher'
-require 'shoulda/matchers/active_record/ensure_inclusion_of_matcher'
-require 'shoulda/matchers/active_record/validate_presence_of_matcher'
-require 'shoulda/matchers/active_record/validate_format_of_matcher'
-require 'shoulda/matchers/active_record/validate_uniqueness_of_matcher'
-require 'shoulda/matchers/active_record/validate_acceptance_of_matcher'
-require 'shoulda/matchers/active_record/validate_numericality_of_matcher'
 require 'shoulda/matchers/active_record/association_matcher'
 require 'shoulda/matchers/active_record/have_db_column_matcher'
 require 'shoulda/matchers/active_record/have_db_index_matcher'
 require 'shoulda/matchers/active_record/have_readonly_attribute_matcher'
-require 'shoulda/matchers/active_record/allow_mass_assignment_of_matcher'
 
 
 module Shoulda
   module Matchers
     # = Matchers for your active record models
     #
-    # These matchers will test most of the validations and associations for your
+    # These matchers will test the associations for your
     # ActiveRecord models.
     #
     #   describe User do
-    #     it { should validate_presence_of(:name) }
-    #     it { should validate_presence_of(:phone_number) }
-    #     %w(abcd 1234).each do |value|
-    #       it { should_not allow_value(value).for(:phone_number) }
-    #     end
-    #     it { should allow_value("(123) 456-7890").for(:phone_number) }
-    #     it { should_not allow_mass_assignment_of(:password) }
     #     it { should have_one(:profile) }
     #     it { should have_many(:dogs) }
     #     it { should have_many(:messes).through(:dogs) }

data/lib/shoulda/matchers/active_record/association_matcher.rb

@@ -68,6 +68,11 @@ module Shoulda # :nodoc:
           self
         end
 
+        def order(order)
+          @order = order
+          self
+        end        
+
         def matches?(subject)
           @subject = subject
           association_exists? &&
@@ -75,6 +80,7 @@ module Shoulda # :nodoc:
             foreign_key_exists? &&
             through_association_valid? &&
             dependent_correct? &&
+            order_correct? &&
             join_table_exists?
         end
 
@@ -90,6 +96,7 @@ module Shoulda # :nodoc:
           description = "#{macro_description} #{@name}"
           description += " through #{@through}" if @through
           description += " dependent => #{@dependent}" if @dependent
+          description += " order => #{@order}" if @order
           description
         end
 
@@ -159,6 +166,15 @@ module Shoulda # :nodoc:
           end
         end
 
+        def order_correct?
+          if @order.nil? || @order.to_s == reflection.options[:order].to_s
+            true
+          else
+            @missing = "#{@name} should be ordered by #{@order}"
+            false
+          end
+        end        
+
         def join_table_exists?
           if @macro != :has_and_belongs_to_many ||
               ::ActiveRecord::Base.connection.tables.include?(join_table.to_s)
@@ -191,7 +207,7 @@ module Shoulda # :nodoc:
         end
 
         def foreign_key
-          reflection.primary_key_name
+          reflection.respond_to?(:foreign_key) ? reflection.foreign_key : reflection.primary_key_name
         end
 
         def through?

data/lib/shoulda/matchers/integrations/rspec.rb

@@ -2,8 +2,15 @@
 
 if defined?(::ActiveRecord)
   require 'shoulda/matchers/active_record'
+  require 'shoulda/matchers/active_model'
   module RSpec::Matchers
     include Shoulda::Matchers::ActiveRecord
+    include Shoulda::Matchers::ActiveModel
+  end
+elsif defined?(::ActiveModel)
+  require 'shoulda/matchers/active_model'
+  module RSpec::Matchers
+    include Shoulda::Matchers::ActiveModel
   end
 end
 

data/lib/shoulda/matchers/integrations/test_unit.rb

@@ -28,14 +28,27 @@ end
 
 if defined?(ActiveRecord)
   require 'shoulda/matchers/active_record'
+  require 'shoulda/matchers/active_model'
 
   module Test
     module Unit
       class TestCase
         include Shoulda::Matchers::ActiveRecord
         extend Shoulda::Matchers::ActiveRecord
+        include Shoulda::Matchers::ActiveModel
+        extend Shoulda::Matchers::ActiveModel
       end
     end
   end
-end
+elsif defined?(ActiveModel)
+  require 'shoulda/matchers/active_model'
 
+  module Test
+    module Unit
+      class TestCase
+        include Shoulda::Matchers::ActiveModel
+        extend Shoulda::Matchers::ActiveModel
+      end
+    end
+  end
+end

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = "1.0.0.beta2".dup
+    VERSION = "1.0.0.beta3".dup
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: shoulda-matchers
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -10,90 +10,80 @@ authors:
 - Ryan McGeary
 - Dan Croak
 - Matt Jankowski
+- Stafford Brunk
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -04:00
+date: 2011-07-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: sqlite3-ruby
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.3
+        version: 1.3.2
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: mocha
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.2
+        version: 0.9.10
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec-rails
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.10
+        version: 2.6.1.beta1
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: cucumber
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 0.10.0
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: appraisal
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.3.4
   type: :development
-  prerelease: false
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: aruba
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.2.7
-  type: :development
-  prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.11.6
   type: :development
-  prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 description: Making tests easy on the fingers and eyes
 email: support@thoughtbot.com
 executables: []
@@ -104,9 +94,9 @@ extra_rdoc_files:
 - README.rdoc
 - CONTRIBUTION_GUIDELINES.rdoc
 files: 
+- Appraisals
 - CONTRIBUTION_GUIDELINES.rdoc
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -123,21 +113,22 @@ files:
 - lib/shoulda/matchers/action_controller.rb
 - lib/shoulda/matchers/action_mailer/have_sent_email.rb
 - lib/shoulda/matchers/action_mailer.rb
-- lib/shoulda/matchers/active_record/allow_mass_assignment_of_matcher.rb
-- lib/shoulda/matchers/active_record/allow_value_matcher.rb
+- lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
+- lib/shoulda/matchers/active_model/allow_value_matcher.rb
+- lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb
+- lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb
+- lib/shoulda/matchers/active_model/helpers.rb
+- lib/shoulda/matchers/active_model/validate_acceptance_of_matcher.rb
+- lib/shoulda/matchers/active_model/validate_format_of_matcher.rb
+- lib/shoulda/matchers/active_model/validate_numericality_of_matcher.rb
+- lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb
+- lib/shoulda/matchers/active_model/validate_uniqueness_of_matcher.rb
+- lib/shoulda/matchers/active_model/validation_matcher.rb
+- lib/shoulda/matchers/active_model.rb
 - lib/shoulda/matchers/active_record/association_matcher.rb
-- lib/shoulda/matchers/active_record/ensure_inclusion_of_matcher.rb
-- lib/shoulda/matchers/active_record/ensure_length_of_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_column_matcher.rb
 - lib/shoulda/matchers/active_record/have_db_index_matcher.rb
 - lib/shoulda/matchers/active_record/have_readonly_attribute_matcher.rb
-- lib/shoulda/matchers/active_record/helpers.rb
-- lib/shoulda/matchers/active_record/validate_acceptance_of_matcher.rb
-- lib/shoulda/matchers/active_record/validate_format_of_matcher.rb
-- lib/shoulda/matchers/active_record/validate_numericality_of_matcher.rb
-- lib/shoulda/matchers/active_record/validate_presence_of_matcher.rb
-- lib/shoulda/matchers/active_record/validate_uniqueness_of_matcher.rb
-- lib/shoulda/matchers/active_record/validation_matcher.rb
 - lib/shoulda/matchers/active_record.rb
 - lib/shoulda/matchers/assertion_error.rb
 - lib/shoulda/matchers/integrations/rspec.rb
@@ -161,9 +152,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3667913558593923355
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -174,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Making tests easy on the fingers and eyes

data/Gemfile.lock

@@ -1,134 +0,0 @@
-PATH
-  remote: .
-  specs:
-    shoulda-matchers (1.0.0.beta2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    archive-tar-minitar (0.5.2)
-    arel (2.0.8)
-    aruba (0.2.8)
-      childprocess (~> 0.1.6)
-      cucumber (~> 0.10.0)
-      rspec (~> 2.3.0)
-    builder (2.1.2)
-    childprocess (0.1.6)
-      ffi (~> 0.6.3)
-    columnize (0.3.2)
-    cucumber (0.10.0)
-      builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
-    i18n (0.5.0)
-    json (1.4.6)
-    linecache19 (0.5.11)
-      ruby_core_source (>= 0.1.4)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    mocha (0.9.10)
-      rake
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
-      bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.3.0)
-    ruby-debug-base19 (0.11.24)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
-      archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.5)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba (~> 0.2.7)
-  cucumber (~> 0.10.0)
-  mocha (~> 0.9.10)
-  rails (= 3.0.3)
-  rspec-rails (~> 2.3.0)
-  ruby-debug19 (~> 0.11.6)
-  shoulda-matchers!
-  sqlite3-ruby (~> 1.3.2)