rspec-hal 1.2.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 185977ddedcf97a48cf29d25a4318265b25eca10
-  data.tar.gz: 70f92063554495e242b6f875a69a1730a8b7e0ff
+  metadata.gz: e4f45bc788fb6dedb83b95f4e3c590675656f00f
+  data.tar.gz: 32d538a5f870c291400fa3bd9a009b6b874d185c
 SHA512:
-  metadata.gz: 716f0875b0f39b16e705b8c42c03c88693e6a3e5dd14393593cadf48fa4fc1ee716c54e481c04ce18c62d8204a56ea3e985b2d1e1b56ddffae7bf87e8d0fc2ed
-  data.tar.gz: b1923ce334d1fb91b33f8b601c1112ad54761faa3ef1f9199b97b4922e2a8ff90688a977053ec6626161652ae8e3e9aaa933f5b73551a79cac2d7a59b4f536ca
+  metadata.gz: 5d7d17141a06542082de424a0e5d435137fab68c4bff5a6dcabc568aa1c72aef7d4086a86539bf96a8a953865135c0a529982b4703c60f26780969b9da1e3b9a
+  data.tar.gz: a07578234ce02b41184b1e049a00f7d83307f978d040101bb9eb21b3951288e0668f63b5a19318f8ace245425042d3f602fe9217b1d8a36451d6cb039ada178b

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 #gem "rspec", "~>2.14"
-gem "rspec", "~>3.0.0.beta"
+#gem "rspec", "~>3.0.0.beta"
+gem "rspec", "~>3.0"
 
 # Specify your gem's dependencies in rspec-hal.gemspec
 gemspec

data/README.md

@@ -1,5 +1,5 @@
-[![Build Status](https://travis-ci.org/pezra/hal-interpretation.png?branch=master)](https://travis-ci.org/pezra/hal-interpretation)
-[![Code Climate](https://codeclimate.com/github/pezra/hal-interpretation.png)](https://codeclimate.com/github/pezra/hal-interpretation)
+[![Build Status](https://travis-ci.org/pezra/rspec-hal.png?branch=master)](https://travis-ci.org/pezra/rspec-hal)
+[![Code Climate](https://codeclimate.com/github/pezra/rspec-hal.png)](https://codeclimate.com/github/pezra/rspec-hal)
 
 # Rspec Hal
 
@@ -36,7 +36,7 @@ Once you have the matchers included you can use it like this
 
     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}"))
+    expect(a_user_doc).to have_templated_relation("search").with_variables("q", "limit")
 ```
 
 ## Installation

data/gemfiles/rspec3_0.gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem "rspec", "~>3.0.0.beta"
+gem "rspec", "~>3.0"
 
 # Specify your gem's dependencies in rspec-hal.gemspec
 gemspec path: ".."

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

@@ -1,3 +1,6 @@
+require 'rspec/expectations'
+require 'rspec/hal/matchers/uri_template_has_variables_matcher'
+
 module RSpec
   module Hal
     module Matchers
@@ -57,6 +60,19 @@ module RSpec
           "have templated #{link_rel} link"
         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))
+        end
+        alias_method :with_variable, :with_variables
+
+        def uri_template
+          repr.raw_related_hrefs(link_rel){[]}.first
+        end
+
         protected
 
         attr_reader :link_rel, :outcome, :expected

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

@@ -0,0 +1,44 @@
+require 'set'
+require 'addressable/template'
+
+module RSpec
+  module Hal
+    module Matchers
+      class UriTemplateHasVariablesMatcher
+        def initialize(a_tmpl_relation_matcher, vars)
+          @tmpl_matcher = a_tmpl_relation_matcher
+          @expected_vars = Set.new(vars)
+        end
+
+        def matches?(actual)
+          expected_vars.subset? actual_vars
+        end
+
+        def description
+          "have variables #{expected_vars.join(", ")}"
+        end
+
+        def failure_message
+          "Expected #{actual_tmpl.to_s} to have #{expected_vars.join(", ")}"
+        end
+
+        def failure_message_when_negated
+          "Expected #{actual_tmpl.to_s} not to have #{expected_vars.join(", ")}"
+        end
+
+        protected
+
+        attr_reader :tmpl_matcher, :expected_vars
+
+        def actual_tmpl
+          Addressable::Template.new(tmpl_matcher.uri_template)
+        end
+
+        def actual_vars
+          Set.new(actual_tmpl.variables)
+        end
+
+      end
+    end
+  end
+end

data/lib/rspec/hal/version.rb

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

data/rspec-hal.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake", "~> 10.1"
 
-  spec.add_runtime_dependency "rspec", ">= 2.0", "< 4.0.0.pre"
+  spec.add_runtime_dependency "rspec", ">= 2.0", "< 4.0.0.a"
+  spec.add_runtime_dependency "rspec-expectations", ">= 2.0", "< 4.0.0.a"
   spec.add_runtime_dependency "hal-client", "> 2.4"
 end

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

@@ -1,4 +1,5 @@
 require_relative "../../../spec_helper"
+require 'rspec/version'
 
 describe RSpec::Hal::Matchers::TemplatedRelationMatcher do
   describe "creation" do
@@ -22,6 +23,21 @@ 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
+
   context "failed due to missing relation matcher" do
     before do
       matcher.matches? json_str_wo_link
@@ -105,4 +121,15 @@ describe RSpec::Hal::Matchers::TemplatedRelationMatcher do
   let(:any_template_str_matcher) { matching_template_str_matcher }
   let(:matching_template_str_matcher) { match "example.com" }
   let(:nonmatching_template_str_matcher) { match "hello" }
+
+  matcher :be_a_matcher do
+    match do |actual|
+      %w"matches?
+         description
+         failure_message
+         failure_message_when_negated".all? { |meth_name|
+        actual.respond_to? meth_name
+      }
+    end
+  end
 end

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

@@ -0,0 +1,31 @@
+require_relative "../../../spec_helper"
+require "rspec/version"
+
+describe RSpec::Hal::Matchers::UriTemplateHasVariablesMatcher do
+  describe "creation" do
+    specify { expect{ described_class.new(a_templated_relation_matcher, ["foo"]) }.
+      not_to raise_error }
+  end
+
+  subject(:matcher) { described_class.new(a_templated_relation_matcher, ["foo", "bar"]) }
+
+  context "template with required variables" do
+    let(:template) { "http://example.com{?foo,bar}" }
+
+    specify { expect(matcher.matches?(json_doc_that_is_ignored)).to be_truthy }
+  end
+
+  context "template missing one required variabl" do
+    let(:template) { "http://example.com{?foo}" }
+
+    specify { expect(matcher.matches?(json_doc_that_is_ignored)).to be_falsy }
+  end
+
+  # Background
+  # ---
+
+  let(:template) { "http://example.com" }
+  let(:a_templated_relation_matcher) {
+    double(:a_templated_relation_matcher, uri_template: template) }
+  let(:json_doc_that_is_ignored) { "" }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-hal
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Peter Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,7 +47,7 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre
+        version: 4.0.0.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,27 @@ dependencies:
         version: '2.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre
+        version: 4.0.0.a
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0.a
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0.a
 - !ruby/object:Gem::Dependency
   name: hal-client
   requirement: !ruby/object:Gem::Requirement
@@ -94,11 +114,13 @@ files:
 - 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/matchers/uri_template_has_variables_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/uri_template_has_variables_matcher_spec.rb
 - spec/rspec/hal/matchers_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/pezra/rspec-hal
@@ -129,5 +151,6 @@ 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/uri_template_has_variables_matcher_spec.rb
 - spec/rspec/hal/matchers_spec.rb
 - spec/spec_helper.rb