lib/nilify_blanks/matchers.rb in nilify_blanks-1.1.0 vs lib/nilify_blanks/matchers.rb in nilify_blanks-1.2.0

@@ -1,22 +1,38 @@
 rspec_module = defined?(RSpec::Core) ? 'RSpec' : 'Spec'  # for RSpec 1 compatability
 
+def failure_message_method
+  rspec_major_version >= 3 ? :failure_message : :failure_message_for_should
+rescue
+  :failure_message_for_should
+end
+
+def negated_failure_message_method
+  rspec_major_version >= 3 ? :failure_message_when_negated : :failure_message_for_should_not
+rescue
+  :failure_message_for_should_not
+end
+
+def rspec_major_version
+  RSpec::Core::Version::STRING.split('.').first.to_i
+end
+
 Kernel.const_get(rspec_module)::Matchers.define :nilify_blanks_for do |column_name, options = {}|
   match do |model_instance|
     model_class = model_instance.class
     model_class.define_attribute_methods
     model_class.included_modules.include?(NilifyBlanks::InstanceMethods) &&
     model_class.respond_to?(:nilify_blanks_columns) &&
     model_class.nilify_blanks_columns.include?(column_name.to_s) &&
     options.all? {|k, v| model_class.instance_variable_get(:@_nilify_blanks_options)[k] == v }
   end
 
-  failure_message_for_should do |ability|
+  send(failure_message_method) do |_|
     "expected to nilify blanks for #{column_name} #{options.inspect unless options.empty?}"
   end
 
-  failure_message_for_should_not do |ability|
+  send(negated_failure_message_method) do |_|
     "expected to not nilify blanks for #{column_name} #{options.inspect unless options.empty?}"
   end
 end
 
 Kernel.const_get(rspec_module)::Matchers.define :nilify_blanks do |options = {}|
@@ -27,14 +43,13 @@
     model_class.respond_to?(:nilify_blanks_columns) &&
     model_class.nilify_blanks_columns == model_class.content_columns.select(&:null).map(&:name).map(&:to_s) &&
     options.all? {|k, v| model_class.instance_variable_get(:@_nilify_blanks_options)[k] == v }
   end
 
-  failure_message_for_should do |ability|
+  send(failure_message_method) do |_|
     "expected to nilify blanks #{options.inspect unless options.empty?}"
   end
 
-  failure_message_for_should_not do |ability|
+  send(negated_failure_message_method) do |_|
     "expected to not nilify blanks #{options.inspect unless options.empty?}"
   end
 end
-