rspec-hal 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d42425270b70e6c59a6d6f3d86404e4fabb0ead3
-  data.tar.gz: 89c326dffacabb1cd92a41989ae7b696041b1ee9
+  metadata.gz: 9463991d7f7b862e2979e8f110458daa8a005f8f
+  data.tar.gz: a28bf60caeb1602ea86ee49bf70cfbb87e6a14bf
 SHA512:
-  metadata.gz: b2dacceb11c4904321a1f9157200c2f9c13394e573361feafb0559c8e4cc7fbf5df164823da0a473eeab0c2078044fbb08b465b07232ec95d362c4e0bbe0a370
-  data.tar.gz: c69e18dfcfc05bc446d4aa958ca8cb82a81ad86aa891cdded1145fc015e7f01de8c08c314861898fce91db0144255948187e98a5faea08a6b48660a5e693010c
+  metadata.gz: 459b268f52a050327e80253dbffd0d9172f2c7ecf81b2687eb2953fcc0f7281dd4eea58efbf74e4d32ccd14731e18a099abf4231bb76e9713a5fae00e3dc0ae0
+  data.tar.gz: e48f6a959f34e8db673a2db0995b3c2cd5cde16f2e9b73c9bde3f76a42f119ca57d628df284dabd21ec3ffadfe6ba1548a9c4b99b78d7793a304ea411a1994f3

data/lib/rspec/hal/matchers.rb

@@ -69,6 +69,8 @@ module RSpec
         # 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|
@@ -81,16 +83,31 @@ module RSpec
             __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 = 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 }
+            @value_matcher || ->(*_){ true }
           end
         end
 
@@ -106,11 +123,28 @@ module RSpec
             repr = HalClient::Representation.new(parsed_json: a_doc)
 
             begin
-              repr.related_hrefs(link_rel).any?
+              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
     end

data/lib/rspec/hal/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Hal
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

data/spec/rspec/hal/matchers_spec.rb

@@ -1,43 +1,45 @@
 require_relative "../../spec_helper"
+require "rspec/version"
 
 describe RSpec::Hal::Matchers::Document do
   describe "be_hal" do
     subject(:matcher) { be_hal }
 
-    specify { expect(matcher.matches?(hal_doc)).to be true }
-    specify { expect(matcher.matches?("What's HAL?")).to be false }
+    specify { expect(matcher.matches?(hal_doc)).to be_truthy }
+    specify { expect(matcher.matches?("What's HAL?")).to be_falsey }
   end
 
   describe "be_hal_collection" do
     subject(:matcher) { be_hal_collection }
 
-    specify { expect(matcher.matches?(hal_collection)).to be true }
-    specify { expect(matcher.matches?("What's HAL?")).to be false }
-    specify { expect(matcher.matches?(hal_doc)).to be false }
+    specify { expect(matcher.matches?(hal_collection)).to be_truthy }
+    specify { expect(matcher.matches?("What's HAL?")).to be_falsey }
+    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 true}
-    specify { expect(matcher.matches?("{}")).to be false}
+    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 true}
-    specify { expect(matcher.matches?("{}")).to be false}
-    specify { expect(matcher.matches?(bob)).to be false}
+    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 true}
-    specify { expect(matcher.matches?("{}")).to be false}
-    specify { expect(matcher.matches?(bob)).to be false}
+    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
@@ -45,17 +47,17 @@ describe RSpec::Hal::Matchers::Document do
         .including(RSpec::Matchers::BuiltIn::Include.new('type' => 'sport')) }
     before do extend described_class end
 
-    specify { expect(matcher.matches?(hal_doc)).to be true}
-    specify { expect(matcher.matches?("{}")).to be false}
-    specify { expect(matcher.matches?(bob)).to be false}
+    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 true}
-    specify { expect(matcher.matches?("{}")).to be false}
-    specify { expect(matcher.matches?(bob)).to be false}
+    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
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-hal
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler