Update matcher protocol for RSpec 3

"Update matcher protocol and custom matcher DSL to better align with the
newer expect syntax. If you want your matchers to maintain compatibility
with multiple versions of RSpec, you can alias the new names to the old.
(Myron Marston)
* failure_message_for_should => failure_message
* failure_message_for_should_not => failure_message_when_negated
* match_for_should => match
* match_for_should_not => match_when_negated"

http://myronmars.to/n/dev-blog/2014/02/rspec-2-99-and-3-0-beta-2-have-been-released

Author: skalee

lib/json_spec/matchers/be_json_eql.rb

@@ -42,13 +42,15 @@ def including(*keys)
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected equivalent JSON")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected inequivalent JSON")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path("equal JSON")

lib/json_spec/matchers/have_json_path.rb

@@ -14,13 +14,15 @@ def matches?(json)
         false
       end
 
-      def failure_message_for_should
+      def failure_message
         %(Expected JSON path "#{@path}")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         %(Expected no JSON path "#{@path}")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         %(have JSON path "#{@path}")

lib/json_spec/matchers/have_json_size.rb

@@ -19,13 +19,15 @@ def at_path(path)
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected JSON value size to be #{@expected}, got #{@actual}")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected JSON value size to not be #{@expected}, got #{@actual}")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path(%(have JSON size "#{@expected}"))

lib/json_spec/matchers/have_json_type.rb

@@ -18,13 +18,15 @@ def at_path(path)
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected JSON value type to be #{@classes.join(", ")}, got #{@ruby.class}")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected JSON value type to not be #{@classes.join(", ")}, got #{@ruby.class}")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path(%(have JSON type "#{@classes.join(", ")}"))

lib/json_spec/matchers/include_json.rb

@@ -42,13 +42,15 @@ def including(*keys)
         self
       end
 
-      def failure_message_for_should
+      def failure_message
         message_with_path("Expected included JSON")
       end
+      alias :failure_message_for_should :failure_message
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         message_with_path("Expected excluded JSON")
       end
+      alias :failure_message_for_should_not :failure_message_when_negated
 
       def description
         message_with_path("include JSON")

spec/json_spec/matchers/have_json_size_spec.rb

@@ -21,16 +21,18 @@
     %({"one":[1,2,3]}).should have_json_size(3).at_path("one")
   end
 
-  it "provides a failure message for should" do
+  it "provides a failure message" do
     matcher = have_json_size(3)
     matcher.matches?(%([1,2]))
-    matcher.failure_message_for_should.should == "Expected JSON value size to be 3, got 2"
+    matcher.failure_message.should            == "Expected JSON value size to be 3, got 2"
+    matcher.failure_message_for_should.should == "Expected JSON value size to be 3, got 2" # RSpec 2 interface
   end
 
-  it "provides a failure message for should not" do
+  it "provides a failure message for negation" do
     matcher = have_json_size(3)
     matcher.matches?(%([1,2,3]))
-    matcher.failure_message_for_should_not.should == "Expected JSON value size to not be 3, got 3"
+    matcher.failure_message_when_negated.should   == "Expected JSON value size to not be 3, got 3"
+    matcher.failure_message_for_should_not.should == "Expected JSON value size to not be 3, got 3" # RSpec 2 interface
   end
 
   it "provides a description message" do

spec/json_spec/matchers/have_json_type_spec.rb

@@ -46,16 +46,18 @@
     %(10.0).should have_json_type(Numeric)
   end
 
-  it "provides a failure message for should" do
+  it "provides a failure message" do
     matcher = have_json_type(Numeric)
     matcher.matches?(%("foo"))
-    matcher.failure_message_for_should.should == "Expected JSON value type to be Numeric, got String"
+    matcher.failure_message.should            == "Expected JSON value type to be Numeric, got String"
+    matcher.failure_message_for_should.should == "Expected JSON value type to be Numeric, got String" # RSpec 2 interface
   end
 
-  it "provides a failure message for should not" do
+  it "provides a failure message for negation" do
     matcher = have_json_type(Numeric)
     matcher.matches?(%(10))
-    matcher.failure_message_for_should_not.should == "Expected JSON value type to not be Numeric, got Fixnum"
+    matcher.failure_message_when_negated.should   == "Expected JSON value type to not be Numeric, got Fixnum"
+    matcher.failure_message_for_should_not.should == "Expected JSON value type to not be Numeric, got Fixnum" # RSpec 2 interface
   end
 
   it "provides a description message" do