rspec-hal 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4f45bc788fb6dedb83b95f4e3c590675656f00f
-  data.tar.gz: 32d538a5f870c291400fa3bd9a009b6b874d185c
+  metadata.gz: 459ebbc13de469d36a68fc9eecd02a9cdcc2db92
+  data.tar.gz: 0301e48952230c8ff6cda1058d7f23abf3293380
 SHA512:
-  metadata.gz: 5d7d17141a06542082de424a0e5d435137fab68c4bff5a6dcabc568aa1c72aef7d4086a86539bf96a8a953865135c0a529982b4703c60f26780969b9da1e3b9a
-  data.tar.gz: a07578234ce02b41184b1e049a00f7d83307f978d040101bb9eb21b3951288e0668f63b5a19318f8ace245425042d3f602fe9217b1d8a36451d6cb039ada178b
+  metadata.gz: 3be160a4321735d850b19a38a808d1a108f34481696e47f8846b35aee065ac936b84ad5bd189cb4417a638ae1a07224e988d47c81893def2dabb5f3eb951ce92
+  data.tar.gz: e4313939011a4248ac5b92aeec8ec8bf0f0ddc1d380621df6ad497dcb863814731b0ca98ca8401ea2064a65b657c2eba4b35b4267fd2e4557f536c30675b5d2f

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

@@ -61,11 +61,7 @@ module RSpec
         end
 
         def with_variables(*vars)
-          raise "This method is unsupported with RSpec version 2.x" unless
-            defined? RSpec::Matchers::BuiltIn::Compound::And
-
-          RSpec::Matchers::BuiltIn::Compound::And.
-            new(self, UriTemplateHasVariablesMatcher.new(self, vars))
+          self.class.new(link_rel, UriTemplateHasVariablesMatcher.new(vars))
         end
         alias_method :with_variable, :with_variables
 

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

@@ -5,39 +5,47 @@ module RSpec
   module Hal
     module Matchers
       class UriTemplateHasVariablesMatcher
-        def initialize(a_tmpl_relation_matcher, vars)
-          @tmpl_matcher = a_tmpl_relation_matcher
+        def initialize(vars)
           @expected_vars = Set.new(vars)
         end
 
         def matches?(actual)
+          self.actual_tmpl = actual
+
           expected_vars.subset? actual_vars
         end
 
         def description
-          "have variables #{expected_vars.join(", ")}"
+          "have variables #{as_human_list(expected_vars)}"
         end
 
         def failure_message
-          "Expected #{actual_tmpl.to_s} to have #{expected_vars.join(", ")}"
+          "Expected #{actual_tmpl.pattern} to have #{as_human_list(expected_vars)}"
         end
 
         def failure_message_when_negated
-          "Expected #{actual_tmpl.to_s} not to have #{expected_vars.join(", ")}"
+          "Expected #{actual_tmpl.pattern} not to have #{as_human_list(expected_vars)}"
         end
 
         protected
 
-        attr_reader :tmpl_matcher, :expected_vars
+        attr_reader :tmpl_matcher, :expected_vars, :actual_tmpl
 
-        def actual_tmpl
-          Addressable::Template.new(tmpl_matcher.uri_template)
+        def actual_tmpl=(a_template)
+          @actual_tmpl = if a_template.respond_to? :pattern
+                           actual_tmpl
+                         else
+                           Addressable::Template.new(a_template)
+                         end
         end
 
         def actual_vars
           Set.new(actual_tmpl.variables)
         end
 
+        def as_human_list(enum)
+          enum.to_a.join(", ")
+        end
       end
     end
   end

data/lib/rspec/hal/matchers.rb

@@ -8,6 +8,7 @@ module RSpec
       require "rspec/hal/matchers/relation_matcher"
       require "rspec/hal/matchers/templated_relation_matcher"
       require "rspec/hal/matchers/have_property_matcher"
+      require "rspec/hal/matchers/uri_template_has_variables_matcher"
 
       # Examples
       #
@@ -47,6 +48,20 @@ module RSpec
         HavePropertyMatcher.new(*args)
       end
 
+      # Signature
+      #
+      #  expect(a_uri_template_str).to have_variables "q", "limit"
+      def have_variables(*args)
+        UriTemplateHasVariablesMatcher.new(*args)
+      end
+
+      # Signature
+      #
+      #  expect(a_uri_template_str).to has_variable "q"
+      def has_variable(*args)
+        UriTemplateHasVariablesMatcher.new(*args)
+      end
+
       module Document
         extend RSpec::Matchers::DSL
 

data/lib/rspec/hal/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Hal
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

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

@@ -23,20 +23,8 @@ describe RSpec::Hal::Matchers::TemplatedRelationMatcher do
 
   specify { expect(matcher.description).to match "have templated #{a_link_rel} link" }
 
-  context "in RSpec 3.x" do
-    before { skip("unsupported version") if /2\./ === RSpec::Version::STRING }
-
-    specify { expect(matcher.with_variables("since", "before")).to be_a_matcher }
-    specify { expect(matcher.with_variable("since")).to be_a_matcher }
-  end
-
-  context "in RSpec 3.x" do
-    before { skip("unsupported version") unless /2\./ === RSpec::Version::STRING }
-
-    specify { expect { matcher.with_variables("since", "before") }.to raise_exception(/version/) }
-
-    specify { expect { matcher.with_variable("since") }.to raise_exception(/version/) }
-  end
+  specify { expect(matcher.with_variables("since", "before")).to be_a_matcher }
+  specify { expect(matcher.with_variable("since")).to be_a_matcher }
 
   context "failed due to missing relation matcher" do
     before do

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

@@ -3,22 +3,26 @@ require "rspec/version"
 
 describe RSpec::Hal::Matchers::UriTemplateHasVariablesMatcher do
   describe "creation" do
-    specify { expect{ described_class.new(a_templated_relation_matcher, ["foo"]) }.
+    specify { expect{ described_class.new(["foo"]) }.
       not_to raise_error }
   end
 
-  subject(:matcher) { described_class.new(a_templated_relation_matcher, ["foo", "bar"]) }
+  subject(:matcher) { described_class.new(["foo", "bar"]) }
 
-  context "template with required variables" do
-    let(:template) { "http://example.com{?foo,bar}" }
+  specify { expect(matcher.matches?("http://example.com{?foo,bar}")).to be_truthy }
+  specify { expect(matcher.matches?("http://example.com{?foo}")).to be_falsy }
+  specify { expect(matcher.description).to match /foo, bar/ }
 
-    specify { expect(matcher.matches?(json_doc_that_is_ignored)).to be_truthy }
+  describe "failed matcher" do
+    before do matcher.matches?("http://example.com{?foo}") end
+
+    specify { expect(matcher.failure_message).to match /foo, bar/ }
   end
 
-  context "template missing one required variabl" do
-    let(:template) { "http://example.com{?foo}" }
+  describe "passed matcher" do
+    before do matcher.matches?("http://example.com{?foo,bar}") end
 
-    specify { expect(matcher.matches?(json_doc_that_is_ignored)).to be_falsy }
+    specify { expect(matcher.failure_message_when_negated).to match /foo, bar/ }
   end
 
   # Background

metadata

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