rspec-hal 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1350f30e17586dd2a1519b0ccf17b97061c7e6de
-  data.tar.gz: 273bc7a271b118ee026ddad7653c7b504f4558ea
+  metadata.gz: 57f77e5c64aaf620770e38be7a6c15809223e242
+  data.tar.gz: d82d52eeb01c80639bf02516ec46d87536d72ab5
 SHA512:
-  metadata.gz: cbb1e494d0e157695a5bda7154e5c3cd5819a3b9207ff61b2eb265291510846a317cb7b05d212bd415e91fa2b96bb8ebc4774c73a775ca5ead8cda5518b1aaf0
-  data.tar.gz: 7c25b64edee190f075d92703d488d8421b4fe51dd47e67b32ec5139a37407ce1b650a7e864ccd6da6488bdbc65d18c44e2d982c7bce345e43bf8f1204a990da3
+  metadata.gz: 823a5a65289cfc48eb605bbdebf15ce3278bd8caa1b49916c9539d9b600d6ba159db33f68afac5dece8c01c9fe453c853b0a38590b1418210f669c6258a58e91
+  data.tar.gz: 1db6344915aecafd2c11ee20a1bf32c8ad94f1e29647ab975293cd33a01c1bc4466916908f0bd8e751ae9c78d0e8cdd82d677821049bed8e25c6cc1abcb391e4

data/lib/rspec/hal/matchers/hal_matcher_helpers.rb

@@ -3,15 +3,23 @@ module RSpec
     module Matchers
       module HalMatcherHelpers
         NullMatcher = Class.new do
-          def matches(*args)
+          def matches?(*args)
             true
           end
-          def ===(*args)
-            true
+
+          def failure_message
+            ""
           end
+          alias_method :failure_message_for_should, :failure_message
+
           def description
             ""
           end
+
+          def ===(*args)
+            true
+          end
+
         end.new
 
         def repr=(jsonish)

data/lib/rspec/hal/matchers/have_property_matcher.rb

@@ -12,36 +12,23 @@ module RSpec
 
         def initialize(property_name, expected=NullMatcher)
           @prop_name = property_name
-          @expected = expected
+          @expected = matcherize expected
         end
 
         def matches?(jsonish)
-          repr = parse(jsonish)
+          self.repr = jsonish
 
           repr.property?(prop_name) &&
             expected === repr.property(prop_name){ nil }
         end
 
         def failure_message
-          but_clause = if outcome == :no_templates
-                         "found only non-templated links"
-                       else
-                         "found none"
-                       end
-          expected_clause = if expected != NullMatcher && expected.respond_to?(:description)
-                              expected.description
-                            elsif expected != NullMatcher
-                              "matching #{expected}"
-                            else
-                              "to exist"
-                            end
-
-          "Expected templated `#{link_rel}` link #{expected_clause} but #{but_clause}"
+          sentencize "Expected property `#{prop_name}`", expected.description
         end
         alias_method :failure_message_for_should, :failure_message
 
         def failure_message_when_negated
-          "Expected `#{link_rel}` link to be absent or not templated"
+          sentencize "Expected property `#{prop_name}`", expected.description, "to be absent"
         end
         alias_method :failure_message_for_should_not, :failure_message_when_negated
 

data/lib/rspec/hal/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Hal
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

data/spec/rspec/hal/matchers/have_property_matcher_spec.rb

@@ -78,9 +78,15 @@ describe RSpec::Hal::Matchers::HavePropertyMatcher do
     specify { expect(matcher.matches?(json_str_w_nonmatching_property)).to be_falsey}
   end
 
-
   specify { expect(matcher.description).to match "have property `#{a_prop_name}`" }
 
+  context "failed matcher" do
+    subject(:matcher) { described_class.new a_prop_name, eq("hector") }
+    before do matcher.matches?(json_str_w_nonmatching_property) end
+
+    specify { expect(matcher.failure_message).to match(/property `#{a_prop_name}`/) }
+    specify { expect(matcher.failure_message).to match(/eq "hector"/) }
+  end
 
 
   # Background
@@ -122,5 +128,4 @@ describe RSpec::Hal::Matchers::HavePropertyMatcher do
 
   let(:any_matcher) { matching_prop_value_matcher }
   let(:matching_prop_value_matcher) { match "Alice" }
-  # let(:nonmatching_template_str_matcher) { match "hello" }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-hal
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Peter Williams