@@ -1,3 +1,8 @@ +=== Version 1.2.7 (in git) + +* bug fixes + * allow rspec-rails to work without ActiveRecord. Closes #810. + === Version 1.2.6 / 2009-04-30 * bug fixes History.rdoc @@ -13,7 +13,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p| p.description = "Behaviour Driven Development for Ruby on Rails." p.rubyforge_name = 'rspec' p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org') - p.extra_deps = [["rspec","1.2.6"],["rack",">=0.4.0"]] + p.extra_deps = [["rspec","1.2.7"],["rack",">=0.4.0"]] p.extra_dev_deps = [["cucumber",">= 0.2.2"]] p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}" p.history_file = 'History.rdoc' Rakefile @@ -1 +1,18 @@ * delegate params_from to assert_recognizes +* wiki + * need a matrix of which rspec-rails versions support which rails versions +* CI + * need a robust CI setup that runs + * Multiple rubies + * MRI: 1.8.6 + * MRI: 1.8.9 + * MRI: 1.9.1 + * JRuby + * IronRuby??? (perhaps using mono) + * Multiple rails-es + * 2.0.5 + * 2.1.2 + * 2.2.2 + * 2.3.2 + * 3.0 (once available) + * With and without ActiveRecord TODO.txt @@ -1,44 +1,46 @@ -module Spec - module Rails - module Matchers +if defined?(ActiveRecord::Base) + module Spec + module Rails + module Matchers - class ArBeValid #:nodoc: + class ArBeValid #:nodoc: - def initialize - @matcher = Spec::Matchers::Be.new :be_valid - @matcher.__send__ :handling_predicate! - end + def initialize + @matcher = Spec::Matchers::Be.new :be_valid + @matcher.__send__ :handling_predicate! + end - def matches?(actual) - @actual = actual - @matcher.matches? @actual - end + def matches?(actual) + @actual = actual + @matcher.matches? @actual + end - def failure_message_for_should - if @actual.respond_to?(:errors) && - ActiveRecord::Errors === @actual.errors - "Expected #{@actual.inspect} to be valid, but it was not\nErrors: " + @actual.errors.full_messages.join(", ") - else - @matcher.failure_message_for_should + def failure_message_for_should + if @actual.respond_to?(:errors) && + ActiveRecord::Errors === @actual.errors + "Expected #{@actual.inspect} to be valid, but it was not\nErrors: " + @actual.errors.full_messages.join(", ") + else + @matcher.failure_message_for_should + end end - end - def failure_message_for_should_not - @matcher.failure_message_for_should_not - end + def failure_message_for_should_not + @matcher.failure_message_for_should_not + end - def description - "be valid" + def description + "be valid" + end end - end - # :call-seq: - # response.should be_valid - # response.should_not be_valid - def be_valid - ArBeValid.new - end + # :call-seq: + # response.should be_valid + # response.should_not be_valid + def be_valid + ArBeValid.new + end + end end end end lib/spec/rails/matchers/ar_be_valid.rb @@ -1,11 +1,13 @@ -module Spec - module Matchers - class Change - def evaluate_value_proc_with_ensured_evaluation_of_proxy - value = evaluate_value_proc_without_ensured_evaluation_of_proxy - ActiveRecord::Associations::AssociationProxy === value ? value.dup : value +if defined?(ActiveRecord::Base) + module Spec + module Matchers + class Change + def evaluate_value_proc_with_ensured_evaluation_of_proxy + value = evaluate_value_proc_without_ensured_evaluation_of_proxy + ActiveRecord::Associations::AssociationProxy === value ? value.dup : value + end + alias_method_chain :evaluate_value_proc, :ensured_evaluation_of_proxy end - alias_method_chain :evaluate_value_proc, :ensured_evaluation_of_proxy end end end lib/spec/rails/matchers/change.rb @@ -4,7 +4,7 @@ module Spec # :nodoc: unless defined? MAJOR MAJOR = 1 MINOR = 2 - TINY = 6 + TINY = 7 STRING = [MAJOR, MINOR, TINY].compact.join('.') lib/spec/rails/version.rb 996e989e3d75dc4964c3a051a7342bd353109ee3 David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec-rails/commit/2d63de47722702b9fe6f6ef1ec6eacbf11c76938 2d63de47722702b9fe6f6ef1ec6eacbf11c76938 2009-05-02T04:30:04-07:00 2009-05-02T04:29:12-07:00 Support rails without AR by ensuring that we check for the presence [#810 state:resolved milestone:'Next Release'] 710d08287f1c3189105f73cc4eddeddd4e4ef034 David Chelimsky dchelimsky@gmail.com