rspec-hal 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5db7232aae0766a25700b98a53d8c343c0eb8f91
-  data.tar.gz: 560a463c6967e2c0f060aec76c688d007cf08756
+  metadata.gz: 1350f30e17586dd2a1519b0ccf17b97061c7e6de
+  data.tar.gz: 273bc7a271b118ee026ddad7653c7b504f4558ea
 SHA512:
-  metadata.gz: dfe7e6f2a41a4dce154256da82f2789d40db8509e5be62f7658a9db46ec97a3bdfdaa25e88669300158008dddb4aa1b320b0bae52aac65975646c02e11841231
-  data.tar.gz: f48fead8ad5405d19646fe6c01b5d07518978f475f6683089d8ce0a65e09b46ba41d4246cb4244a9aa2bcdd1a2e2d0aa6953990a64ae18a7aae61c94b78868f0
+  metadata.gz: cbb1e494d0e157695a5bda7154e5c3cd5819a3b9207ff61b2eb265291510846a317cb7b05d212bd415e91fa2b96bb8ebc4774c73a775ca5ead8cda5518b1aaf0
+  data.tar.gz: 7c25b64edee190f075d92703d488d8421b4fe51dd47e67b32ec5139a37407ce1b650a7e864ccd6da6488bdbc65d18c44e2d982c7bce345e43bf8f1204a990da3

data/.travis.yml

@@ -1,6 +1,19 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
-  - "2.1.1"
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
   - jruby-19mode # JRuby in 1.9 mode
+
+gemfile:
+  - gemfiles/rspec2_14.gemfile
+  - gemfiles/rspec3_0.gemfile
+
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rspec3_0.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rspec3_0.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/rspec3_0.gemfile

data/gemfiles/rspec2_14.gemfile

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

data/gemfiles/rspec3_0.gemfile

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

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

@@ -14,6 +14,11 @@ module RSpec
           end
         end.new
 
+        def repr=(jsonish)
+          @repr = parse jsonish
+        end
+        attr_reader :repr
+
         # Returns string composed of the specified clauses with proper
         # spacing between them. Empty and nil clauses are ignored.
         def sentencize(*clauses)

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

@@ -16,21 +16,25 @@ module RSpec
         end
 
         def matches?(jsonish)
-          repr = parse(jsonish)
+          self.repr = jsonish
 
           repr.raw_related_hrefs(link_rel){[]}
+            .tap{|it| if it.none?
+                        @outcome = :no_relations
+                        return false
+                      end }
             .select{|it| it.respond_to? :expand}
-            .select{|it| expected === it }
-            .any?
-            .tap do |outcome|
-              @outcome = if outcome
-                           :pass
-                         elsif repr.raw_related_hrefs(link_rel){[]}.any?
-                           :no_templates
-                         else
-                           :no_relations
-                         end
-            end
+            .tap{|it| if it.none?
+                        @outcome = :no_templates
+                        return false
+                      end }
+            .select{|it| expected === it.pattern }
+            .tap{|it| if it.none?
+                        @outcome = :none_matched
+                        return false
+                      end }
+
+          true
         end
 
         def failure_message

data/lib/rspec/hal/version.rb

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

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

@@ -54,13 +54,13 @@ describe RSpec::Hal::Matchers::TemplatedRelationMatcher do
   end
 
   context "failed due to sub-matcher failure matcher" do
-    subject(:matcher) { described_class.new(a_link_rel, match("absent")) }
+    subject(:matcher) { described_class.new(a_link_rel, match(/absent/)) }
     before do
-      matcher.matches? json_str_wo_link
+      matcher.matches? json_str_w_link
     end
 
     specify { expect(matcher.failure_message)
-        .to match %r(Expected templated `#{a_link_rel}` link match(?:ing)? "absent" but found none) }
+        .to match %r(Expected templated `#{a_link_rel}` link match(?:ing)? /absent/ but found none) }
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-hal
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Peter Williams
@@ -85,6 +85,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gemfiles/rspec2_14.gemfile
+- gemfiles/rspec3_0.gemfile
 - lib/rspec-hal.rb
 - lib/rspec/hal.rb
 - lib/rspec/hal/matchers.rb