rspec-hal 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56ffc8c99f84bb144a2dc97705eb0499a2bb1cd7
-  data.tar.gz: 8983c9abffc8c5980330c950d268914b3a01eebe
+  metadata.gz: 5db7232aae0766a25700b98a53d8c343c0eb8f91
+  data.tar.gz: 560a463c6967e2c0f060aec76c688d007cf08756
 SHA512:
-  metadata.gz: 345a34323d5c89748d3355cba81016e3bc1c2657828073ea51a9133bb89ccd51d34062efb817f8114328f49aaf3208f80659b1fa9cfddf0fa585ad56e1bd6e15
-  data.tar.gz: d71388e4b12afda7a66e7a5311579a6b8c47611a1a979a5bb9655423583a37806e0e6eef5f914eda53d970e40b0e119932494237aacf69c72552662bd5262dc7
+  metadata.gz: dfe7e6f2a41a4dce154256da82f2789d40db8509e5be62f7658a9db46ec97a3bdfdaa25e88669300158008dddb4aa1b320b0bae52aac65975646c02e11841231
+  data.tar.gz: f48fead8ad5405d19646fe6c01b5d07518978f475f6683089d8ce0a65e09b46ba41d4246cb4244a9aa2bcdd1a2e2d0aa6953990a64ae18a7aae61c94b78868f0

data/README.md

@@ -35,6 +35,8 @@ Once you have the matchers included you can use it like this
       .including(a_hash_including('type' => 'sport'))
 
     expect(a_user_doc).to have_relation('tag')
+    expect(a_user_doc).to have_templated_relation("search")
+    expect(a_user_doc).to have_templated_relation("search", matching("{?q}"))
 ```
 
 ## Installation
@@ -60,4 +62,4 @@ Or install it yourself as:
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create new Pull Request
 
-[semver]: http://semver.org
+[semver]: http://semver.org

data/lib/rspec/hal/matchers.rb

@@ -4,7 +4,10 @@ require 'hal-client'
 module RSpec
   module Hal
     module Matchers
+      autoload :HalMatcherHelpers, "rspec/hal/matchers/hal_matcher_helpers"
+      require "rspec/hal/matchers/relation_matcher"
       require "rspec/hal/matchers/templated_relation_matcher"
+      require "rspec/hal/matchers/have_property_matcher"
 
       # Examples
       #
@@ -15,6 +18,35 @@ module RSpec
         TemplatedRelationMatcher.new(*args)
       end
 
+      # Signature
+      #
+      #     expect(doc).to have_relation(link_rel)
+      #     expect(doc).to have_relation(link_rel, href_matcher)
+      #     expect(doc).to have_relation(link_rel, template_variables)
+      #     expect(doc).to have_relation(link_rel, template_variables, href_matcher)
+      #
+      # Examples
+      #
+      #     expect(authors_doc).to have_relation("search",
+      #                                          {q: "Alice"},
+      #                                          match(%r|users/42|))
+      def have_relation(*args)
+        RelationMatcher.new(*args)
+      end
+
+      # Signature
+      #
+      #     expect(a_doc).to have_property "name"
+      #     expect(a_doc).to have_property "name, matching(/alice/i)
+      #
+      #     expect(a_doc).to have_property("name").matching(/alice/i)
+      #     expect(a_doc).to have_property("hobbies").including(matching("golf"))
+      #     expect(a_doc).to have_property("name").that_is("Bob")
+      #     expect(a_doc).to have_property("age").that_is kind_of Numeric
+      def have_property(*args)
+        HavePropertyMatcher.new(*args)
+      end
+
       module Document
         extend RSpec::Matchers::DSL
 
@@ -74,91 +106,7 @@ module RSpec
             "Expected `$._embedded.item` to exist in:\n" + a_doc
           end
         end
-
-        # Check that the document has the specified property.
-        #
-        # Signature
-        #
-        #     expect(a_user_doc).to have_property "name"
-        #     expect(a_user_doc).to have_property("name").that_is("Bob")
-        #     expect(a_user_doc).to have_property("age").that_is kind_of Numeric
-        #     expect(a_user_doc).to have_property("name").matching(/bob/i)
-        #     expect(a_user_doc).to have_property("hobbies").including(matching("golf"))
-        matcher :have_property do |prop_name|
-          match do |a_doc|
-            a_doc = JSON.load(a_doc) rescue a_doc
-
-
-            next false unless a_doc.key? prop_name
-
-            __value_matcher === a_doc.fetch(prop_name)
-          end
-
-          chain :that_is do |expected_val|
-            @value_matcher = expected_val
-          end
-
-          chain :matching do |val_pat|
-            @value_matcher = if Regexp === val_pat
-                               RSpec::Matchers::BuiltIn::Match.new val_pat
-                             else
-                               val_pat
-                             end
-          end
-
-          chain :including do |val_pat|
-            @value_matcher = RSpec::Matchers::BuiltIn::Include.new val_pat
-          end
-
-          failure_message do
-            msg = super()
-            if @value_matcher
-              msg + " " + @value_matcher.description.gsub(/^match /, "matching ")
-            end
-          end
-
-          define_method(:__value_matcher) do
-            @value_matcher || ->(*_){ true }
-          end
-        end
-
-        # Check that the document has the specified relation (in
-        # either the _links or _embedded sections.
-        #
-        # Signature
-        #
-        #     expect(a_user_doc).to have_relation "tag"
-        matcher :have_relation do |link_rel|
-          match do |a_doc|
-            a_doc = JSON.load(a_doc) rescue a_doc
-            repr = HalClient::Representation.new(parsed_json: a_doc)
-
-            begin
-              repr.related_hrefs(link_rel) .any?{|an_href|
-                next true if !defined? @href_matcher
-                @href_matcher === an_href
-              }
-            rescue KeyError
-              false
-            end
-          end
-
-          chain :with_href do |expected_href|
-            (fail ArgumentError, "#{expected_href.inspect} must be a matcher") unless expected_href.respond_to? :matches?
-
-            @href_matcher = expected_href
-          end
-
-          failure_message do
-            msg = super()
-            if @href_matcher
-              msg + " with href " + @href_matcher.description.gsub(/^match /, "matching ")
-            end
-          end
-
-        end
       end
-
       include Document
     end
   end

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

@@ -0,0 +1,65 @@
+module RSpec
+  module Hal
+    module Matchers
+      module HalMatcherHelpers
+        NullMatcher = Class.new do
+          def matches(*args)
+            true
+          end
+          def ===(*args)
+            true
+          end
+          def description
+            ""
+          end
+        end.new
+
+        # Returns string composed of the specified clauses with proper
+        # spacing between them. Empty and nil clauses are ignored.
+        def sentencize(*clauses)
+          clauses
+            .flatten
+            .compact
+            .reject(&:empty?)
+            .map(&:strip)
+            .join(" ")
+        end
+
+        # Returns HalClient::Representation of the provided jsonish
+        # thing.
+        #
+        # jsonish - A HAL document (as a string or pre-parsed hash) or
+        #   an object that can be converted into one via its `#to_hal`
+        #   or `#to_json` methods.
+        def parse(jsonish)
+          json = if jsonish.kind_of? String
+                   jsonish
+
+                 elsif jsonish.respond_to? :to_hal
+                   jsonish.to_hal
+
+                 else jsonish.respond_to? :to_json
+                   jsonish.to_json
+                 end
+
+          HalClient::Representation.new(parsed_json: MultiJson.load(json))
+        end
+
+        def matcherize(expected)
+          if matcher? expected
+            expected
+          elsif expected.kind_of? Regexp
+            RSpec::Matchers::BuiltIn::Match.new(expected)
+          else
+            RSpec::Matchers::BuiltIn::Eq.new(expected)
+          end
+        end
+
+        def matcher?(obj)
+          obj.respond_to?(:matches?) and (obj.respond_to?(:failure_message) or
+                                          obj.respond_to?(:failure_message_for_should))
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module RSpec
+  module Hal
+    module Matchers
+
+      # Example
+      #
+      #     expect(doc).to have_property("name")
+      #     expect(doc).to have_property("search", matching("Alice"))
+      #
+      class HavePropertyMatcher
+        include HalMatcherHelpers
+
+        def initialize(property_name, expected=NullMatcher)
+          @prop_name = property_name
+          @expected = expected
+        end
+
+        def matches?(jsonish)
+          repr = parse(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}"
+        end
+        alias_method :failure_message_for_should, :failure_message
+
+        def failure_message_when_negated
+          "Expected `#{link_rel}` link to be absent or not templated"
+        end
+        alias_method :failure_message_for_should_not, :failure_message_when_negated
+
+        def description
+          "have property `#{prop_name}` #{@expected.description}"
+        end
+
+
+        def matching(expected)
+          self.class.new(prop_name, matcherize(expected))
+        end
+        alias_method :that_is, :matching
+
+        def including(expected)
+          self.class.new(prop_name, RSpec::Matchers::BuiltIn::Include.new(expected))
+        end
+
+        protected
+
+        attr_reader :prop_name, :outcome, :expected
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module RSpec
+  module Hal
+    module Matchers
+
+      # Example
+      #
+      #     expect(doc).to have_relation("search")
+      #     expect(doc).to have_relation("search", matching("{?q}"))
+      #
+      class RelationMatcher
+        include HalMatcherHelpers
+
+        # Signature
+        #
+        #     expect(doc).to have_relation link_rel
+        #     expect(doc).to have_relation link_rel, href_matcher
+        #     expect(doc).to have_relation link_rel, template_variables
+        #     expect(doc).to have_relation link_rel, template_variables, href_matcher
+        def initialize(link_rel, *args)
+          @link_rel = link_rel
+
+          @tmpl_vars, @expected = *if args.empty?
+                                     [{},NullMatcher]
+                                   elsif args.size > 1
+                                     args
+                                   elsif hashish? args.first
+                                     [args.first, NullMatcher]
+                                   else
+                                     [{}, args.first]
+                                   end
+        end
+
+        def matches?(jsonish)
+          repr = parse(jsonish)
+
+          repr.related_hrefs(link_rel, tmpl_vars){[]}
+            .select{|it| expected === it }
+            .any?
+        end
+
+        def failure_message
+          sentencize "Expected `#{link_rel}` link or embedded", expected.description, "but found none"
+        end
+        alias_method :failure_message_for_should, :failure_message
+
+        def failure_message_when_negated
+          "Expected `#{link_rel}` link to be absent"
+        end
+        alias_method :failure_message_for_should_not, :failure_message_when_negated
+
+        def description
+          "have #{link_rel} link or embedded"
+        end
+
+        def with_href(expected)
+          self.class.new(link_rel, tmpl_vars, matcherize(expected))
+        end
+
+        protected
+
+        attr_reader :link_rel, :expected, :tmpl_vars
+
+        def hashish?(obj)
+          obj.respond_to?(:key?) && obj.respond_to?(:[])
+        end
+      end
+    end
+  end
+end

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

@@ -8,7 +8,9 @@ module RSpec
       #     expect(doc).to have_templated_relation("search", matching("{?q}"))
       #
       class TemplatedRelationMatcher
-        def initialize(link_rel, expected=nil)
+        include HalMatcherHelpers
+
+        def initialize(link_rel, expected=NullMatcher)
           @link_rel = link_rel
           @expected = expected
         end
@@ -37,15 +39,8 @@ module RSpec
                        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 templated `#{link_rel}` link", expected.description, "but #{but_clause}"
         end
         alias_method :failure_message_for_should, :failure_message
 
@@ -60,27 +55,7 @@ module RSpec
 
         protected
 
-        attr_reader :link_rel, :outcome
-
-        NullMatcher = ->(_url_template){ true }
-
-        def expected
-          @expected ||= NullMatcher
-        end
-
-        def parse(jsonish)
-          json = if jsonish.kind_of? String
-                   jsonish
-
-                 elsif jsonish.respond_to? :to_hal
-                   jsonish.to_hal
-
-                 else jsonish.respond_to? :to_json
-                   jsonish.to_json
-                 end
-
-          HalClient::Representation.new(parsed_json: MultiJson.load(json))
-        end
+        attr_reader :link_rel, :outcome, :expected
       end
     end
   end

data/lib/rspec/hal/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Hal
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

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

@@ -0,0 +1,126 @@
+require_relative "../../../spec_helper"
+require "rspec/version"
+
+describe RSpec::Hal::Matchers::HavePropertyMatcher do
+  describe "creation" do
+    specify { expect{ described_class.new(a_prop_name) }.not_to raise_error }
+    specify { expect{ described_class.new(a_prop_name, any_matcher) }.not_to raise_error }
+  end
+
+  subject(:matcher) { described_class.new(a_prop_name) }
+
+  specify { expect(matcher.matches?(json_str_w_property)).to be_truthy}
+  specify { expect(matcher.matches?(json_str_wo_property)).to be_falsey}
+
+  specify { expect(matcher.matches?(parsed_json_w_property)).to be_truthy}
+  specify { expect(matcher.matches?(parsed_json_wo_property)).to be_falsey}
+
+  specify { expect(matcher.matches?(to_halable_w_property)).to be_truthy}
+  specify { expect(matcher.matches?(to_halable_wo_property)).to be_falsey}
+
+
+  describe "value expectation set via #matching(regexp)" do
+    subject(:matcher) {  described_class.new(a_prop_name).matching(/ice$/) }
+
+    specify { expect(matcher.description).to match /have property `name`/ }
+    specify { expect(matcher.description).to match /match.*ice/ }
+
+    specify { expect(matcher.matches?(json_str_w_property)).to be_truthy}
+    specify { expect(matcher.matches?(json_str_wo_property)).to be_falsey}
+    specify { expect(matcher.matches?(json_str_w_nonmatching_property)).to be_falsey}
+  end
+
+  describe "value expectation set via #matching(another_matcher)" do
+    subject(:matcher) { described_class.new(a_prop_name)
+        .matching(RSpec::Matchers::BuiltIn::EndWith.new("ice")) }
+
+    specify { expect(matcher.description).to match /have property `name`/ }
+    specify { expect(matcher.description).to match /end with.*/ }
+
+    specify { expect(matcher.matches?(json_str_w_property)).to be_truthy}
+    specify { expect(matcher.matches?(json_str_wo_property)).to be_falsey}
+    specify { expect(matcher.matches?(json_str_w_nonmatching_property)).to be_falsey}
+  end
+
+  describe "value expectation set via #including(another_matcher)" do
+    subject(:matcher) {  described_class.new('hobbies')
+        .including(RSpec::Matchers::BuiltIn::Include.new('type' => 'sport')) }
+
+    specify { expect(matcher.description).to match /have property `hobbies`/ }
+    specify { expect(matcher.description).to match /include.*sport/ }
+
+    specify { expect(matcher.matches?(json_str_w_property)).to be_truthy}
+    specify { expect(matcher.matches?(json_str_wo_property)).to be_falsey}
+    specify { expect(matcher.matches?(json_str_w_nonmatching_property)).to be_falsey}
+  end
+
+  describe "value expectation set via #that_is(another_matcher)" do
+    subject(:matcher) { described_class.new(a_prop_name)
+        .that_is(RSpec::Matchers::BuiltIn::EndWith.new("ice")) }
+
+    specify { expect(matcher.description).to match /have property `name`/ }
+    specify { expect(matcher.description).to match /end with.*/ }
+
+    specify { expect(matcher.matches?(json_str_w_property)).to be_truthy}
+    specify { expect(matcher.matches?(json_str_wo_property)).to be_falsey}
+    specify { expect(matcher.matches?(json_str_w_nonmatching_property)).to be_falsey}
+  end
+
+  describe "value expectation set via #that_is(exact_value)" do
+    subject(:matcher) { described_class.new(a_prop_name)
+        .that_is("Alice") }
+
+    specify { expect(matcher.description).to match /have property `name`/ }
+    specify { expect(matcher.description).to match /Alice/ }
+
+    specify { expect(matcher.matches?(json_str_w_property)).to be_truthy}
+    specify { expect(matcher.matches?(json_str_wo_property)).to be_falsey}
+    specify { expect(matcher.matches?(json_str_w_nonmatching_property)).to be_falsey}
+  end
+
+
+  specify { expect(matcher.description).to match "have property `#{a_prop_name}`" }
+
+
+
+  # Background
+  # ---
+
+  let(:json_str_w_property) { <<-HAL }
+    { "name": "Alice"
+      ,"hobbies": [{"name": "soccer", "type": "sport"}]
+    }
+  HAL
+
+  let(:json_str_wo_property) { <<-HAL }
+    { }
+  HAL
+
+  let(:json_str_w_nonmatching_property) { <<-HAL }
+    { "name": "Bob"
+      ,"hobbies": [{"name": "trumpet", "type": "music"}] }
+  HAL
+
+
+  let(:parsed_json_w_property) { MultiJson.load json_str_w_property }
+  let(:parsed_json_wo_property) { MultiJson.load json_str_wo_property }
+
+  let(:to_halable_w_property) { halable.new json_str_w_property}
+  let(:to_halable_wo_property) { halable.new json_str_wo_property }
+
+  let(:halable) { Class.new do
+      def initialize(json)
+        @json = json
+      end
+
+      def to_hal
+        return @json
+      end
+    end }
+
+  let(:a_prop_name) { "name" }
+
+  let(:any_matcher) { matching_prop_value_matcher }
+  let(:matching_prop_value_matcher) { match "Alice" }
+  # let(:nonmatching_template_str_matcher) { match "hello" }
+end

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

@@ -0,0 +1,173 @@
+require_relative "../../../spec_helper"
+
+describe RSpec::Hal::Matchers::RelationMatcher do
+  describe "creation" do
+    specify { expect{ described_class.new(a_link_rel) }.not_to raise_error }
+    specify { expect{ described_class.new(a_link_rel, any_href_matcher) }.not_to raise_error }
+    specify { expect{ described_class.new(a_link_rel, template_variables, any_href_matcher) }
+        .not_to raise_error }
+  end
+
+  subject(:matcher) { described_class.new(a_link_rel) }
+
+  specify{ expect(matcher.matches?(json_str_w_link)).to be_truthy }
+  specify{ expect(matcher.matches?(json_str_wo_link)).to be_falsey }
+
+  context "curries" do
+    let(:a_link_rel) { "http://example.com/rels/foo" }
+    specify{ expect(matcher.matches?(json_str_w_curied_link)).to be_truthy }
+
+    context "trying to match unexpanded rel" do
+      let(:a_link_rel) { "ex:foo" }
+      specify{ expect(matcher.matches? json_str_w_curied_link).to be_falsey }
+    end
+  end
+
+  context "templated links" do
+    subject(:matcher) { described_class.new(a_link_rel, which: "mother") }
+
+    specify{ expect(matcher.matches? json_str_w_templated_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_w_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_wo_link).to be_falsey }
+  end
+
+  context "templated links with href matcher" do
+    subject(:matcher) { described_class.new(a_link_rel, {which: "mother"}, match(/parent/)) }
+
+    specify{ expect(matcher.matches? json_str_w_templated_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_w_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_wo_link).to be_falsey }
+  end
+
+  specify{ expect(matcher.matches?(parsed_json_w_link)).to be_truthy }
+  specify{ expect(matcher.matches?(parsed_json_wo_link)).to be_falsey }
+
+  specify{ expect(matcher.matches?(to_halable_w_link)).to be_truthy }
+  specify{ expect(matcher.matches?(to_halable_wo_link)).to be_falsey }
+
+  specify { expect(matcher.description).to match "have #{a_link_rel} link" }
+
+  context "exact expected href specified via #with_href" do
+    subject(:matcher) { described_class.new(a_link_rel)
+        .with_href("http://example.com/parent") }
+
+    specify{ expect(matcher.matches? json_str_w_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_wo_link).to be_falsey }
+  end
+
+  context "regexp expected href specified via #with_href" do
+    subject(:matcher) { described_class.new(a_link_rel)
+        .with_href(%r(/parent)) }
+
+    specify{ expect(matcher.matches? json_str_w_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_wo_link).to be_falsey }
+  end
+
+  context "matcher for expected href specified via #with_href" do
+    subject(:matcher) { described_class.new(a_link_rel)
+        .with_href(end_with("parent")) }
+
+    specify{ expect(matcher.matches? json_str_w_link).to be_truthy }
+    specify{ expect(matcher.matches? json_str_wo_link).to be_falsey }
+  end
+
+  context "non-matching expected href specified via #with_href" do
+    subject(:matcher) { described_class.new(a_link_rel)
+        .with_href("Malory") }
+
+    specify{ expect(matcher.matches? json_str_w_link).to be_falsy }
+  end
+
+
+  context "failed due to missing relation matcher" do
+    before do
+      matcher.matches? json_str_wo_link
+    end
+
+    specify { expect(matcher.failure_message)
+        .to match "Expected `#{a_link_rel}` link or embedded but found none" }
+    specify { expect(matcher.failure_message_for_should)
+        .to match matcher.failure_message }
+  end
+
+  context "failed due to unexpected existing relation" do
+    before do
+      matcher.matches? json_str_w_link
+    end
+
+    specify { expect(matcher.failure_message_when_negated)
+        .to match "Expected `#{a_link_rel}` link to be absent" }
+    specify { expect(matcher.failure_message_for_should_not)
+        .to match matcher.failure_message_when_negated }
+  end
+
+  context "failed due to sub-matcher failure matcher" do
+    subject(:matcher) { described_class.new(a_link_rel, match("absent")) }
+    before do
+      matcher.matches? json_str_wo_link
+    end
+
+    specify { expect(matcher.failure_message)
+        .to match %r(Expected `#{a_link_rel}` link or embedded match(?:ing)? "absent" but found none) }
+  end
+
+
+  # Background
+  # ---
+
+  let(:json_str_w_link) { <<-HAL }
+    { "_links": {
+      "up": {"href": "http://example.com/parent"}
+    }}
+  HAL
+
+  let(:json_str_wo_link) { <<-HAL }
+    { "_links": {
+    }}
+  HAL
+
+  let(:json_str_w_curied_link) { <<-HAL }
+    { "_links": {
+      "ex:foo": {"href": "http://example.com/parent"},
+      "curies": [
+        {"name": "ex", "href": "http://example.com/rels/{rel}", "templated": true }
+      ]
+    }}
+  HAL
+
+  let(:json_str_w_templated_link) { <<-HAL }
+    { "_links": {
+      "up": {"href": "http://example.com/parent{?which}", "templated": true}
+    }}
+  HAL
+
+
+  # let(:json_str_w_nontemplate_link) { <<-HAL }
+  #   { "_links": {
+  #     "up": {"href": "http://example.com/parent"}
+  #   }}
+  # HAL
+
+
+  let(:parsed_json_w_link) { MultiJson.load json_str_w_link }
+  let(:parsed_json_wo_link) { MultiJson.load json_str_wo_link }
+
+  let(:to_halable_w_link) { halable.new json_str_w_link}
+  let(:to_halable_wo_link) { halable.new json_str_wo_link }
+
+  let(:halable) { Class.new do
+      def initialize(json)
+        @json = json
+      end
+
+      def to_hal
+        return @json
+      end
+    end }
+
+  let(:a_link_rel) { "up" }
+  let(:any_href_matcher) { matching_href_matcher }
+  let(:matching_href_matcher) { match /example.com/ }
+  let(:nonmatching_href_matcher) { match "hello" }
+  let(:template_variables) { {q: "search terms"} }
+end

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

@@ -28,7 +28,7 @@ describe RSpec::Hal::Matchers::TemplatedRelationMatcher do
     end
 
     specify { expect(matcher.failure_message)
-        .to match "Expected templated `#{a_link_rel}` link to exist but found none" }
+        .to match "Expected templated `#{a_link_rel}` link but found none" }
     specify { expect(matcher.failure_message_for_should)
         .to match matcher.failure_message }
   end
@@ -50,17 +50,17 @@ describe RSpec::Hal::Matchers::TemplatedRelationMatcher do
     end
 
     specify { expect(matcher.failure_message)
-        .to match "Expected templated `#{a_link_rel}` link to exist but found only non-templated links" }
+        .to match "Expected templated `#{a_link_rel}` link but found only non-templated links" }
   end
 
   context "failed due to sub-matcher failure matcher" do
-    subject(:matcher) { described_class.new(a_link_rel, matching("absent")) }
+    subject(:matcher) { described_class.new(a_link_rel, match("absent")) }
     before do
       matcher.matches? json_str_wo_link
     end
 
     specify { expect(matcher.failure_message)
-        .to match %(Expected templated `#{a_link_rel}` link matching "absent" but found none) }
+        .to match %r(Expected templated `#{a_link_rel}` link match(?:ing)? "absent" but found none) }
   end
 
 

data/spec/rspec/hal/matchers_spec.rb

@@ -17,7 +17,7 @@ describe RSpec::Hal::Matchers do
 
   matcher :be_a_matcher do
     match do |actual|
-      respond_to?(:matches?) && respond_to?(:failure_message)
+      actual.respond_to?(:matches?) && actual.respond_to?(:failure_message)
     end
   end
 end
@@ -38,50 +38,6 @@ describe RSpec::Hal::Matchers::Document do
     specify { expect(matcher.matches?(hal_doc)).to be_falsey }
   end
 
-  describe "have_property('name')" do
-    subject(:matcher) { have_property('name') }
-
-    specify { expect(matcher.matches?(hal_doc)).to be_truthy}
-    specify { expect(matcher.matches?("{}")).to be_falsey}
-  end
-
-  describe "have_property('name').matching(/ice$/)" do
-    subject(:matcher) { have_property('name').matching(/ice$/) }
-
-    specify { expect(matcher.matches?(hal_doc)).to be_truthy}
-    specify { expect(matcher.matches?("{}")).to be_falsey}
-    specify { expect(matcher.matches?(bob)).to be_falsey}
-  end
-
-  describe "have_property('name').matching(end_with('ice'))" do
-    before do skip("RSpec 3 feature") unless /3\./ === RSpec::Version::STRING end
-    subject(:matcher) { have_property('name')
-        .matching(RSpec::Matchers::BuiltIn::EndWith.new("ice")) }
-
-    specify { expect(matcher.matches?(hal_doc)).to be_truthy}
-    specify { expect(matcher.matches?("{}")).to be_falsey}
-    specify { expect(matcher.matches?(bob)).to be_falsey}
-  end
-
-  describe "have_property('hobbies').including(a_hash_including('type' => 'sport'))" do
-    subject(:matcher) { have_property('hobbies')
-        .including(RSpec::Matchers::BuiltIn::Include.new('type' => 'sport')) }
-    before do extend described_class end
-
-    specify { expect(matcher.matches?(hal_doc)).to be_truthy}
-    specify { expect(matcher.matches?("{}")).to be_falsey}
-    specify { expect(matcher.matches?(bob)).to be_falsey}
-  end
-
-  describe "have_relation('tag')" do
-    subject(:matcher) { have_relation('tag') }
-
-    specify { expect(matcher.matches?(hal_doc)).to be_truthy}
-    specify { expect(matcher.matches?("{}")).to be_falsey}
-    specify { expect(matcher.matches?(bob)).to be_falsey}
-  end
-
-
   before do
     extend RSpec::Hal::Matchers::Document
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-hal
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Peter Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,9 +88,14 @@ files:
 - lib/rspec-hal.rb
 - lib/rspec/hal.rb
 - lib/rspec/hal/matchers.rb
+- lib/rspec/hal/matchers/hal_matcher_helpers.rb
+- lib/rspec/hal/matchers/have_property_matcher.rb
+- lib/rspec/hal/matchers/relation_matcher.rb
 - lib/rspec/hal/matchers/templated_relation_matcher.rb
 - lib/rspec/hal/version.rb
 - rspec-hal.gemspec
+- spec/rspec/hal/matchers/have_property_matcher_spec.rb
+- spec/rspec/hal/matchers/relation_matcher_spec.rb
 - spec/rspec/hal/matchers/templated_relation_matcher_spec.rb
 - spec/rspec/hal/matchers_spec.rb
 - spec/spec_helper.rb
@@ -119,6 +124,8 @@ signing_key:
 specification_version: 4
 summary: Matchers and helpers for specing HAL documents.
 test_files:
+- spec/rspec/hal/matchers/have_property_matcher_spec.rb
+- spec/rspec/hal/matchers/relation_matcher_spec.rb
 - spec/rspec/hal/matchers/templated_relation_matcher_spec.rb
 - spec/rspec/hal/matchers_spec.rb
 - spec/spec_helper.rb