Incorporate as_indifferent_hash into all matchers

Start each matcher with a call to as_indifferent_hash to return a string keyed (or indifferent access) version of the source document.

Author: sa73917

lib/jsonapi/rspec/attributes.rb

@@ -3,6 +3,7 @@ module RSpec
     module Attributes
       ::RSpec::Matchers.define :have_attribute do |attr|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           (actual['attributes'] || {}).key?(attr.to_s) &&
             (!@val_set || actual['attributes'][attr.to_s] == @val)
         end
@@ -15,6 +16,7 @@ module Attributes
 
       ::RSpec::Matchers.define :have_jsonapi_attributes do |*attrs|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           return false unless actual.key?('attributes')
 
           counted = (attrs.size == actual['attributes'].size) if @exactly

lib/jsonapi/rspec/id.rb

@@ -2,7 +2,9 @@ module JSONAPI
   module RSpec
     module Id
       ::RSpec::Matchers.define :have_id do |expected|
-        match { |actual| actual['id'] == expected }
+        match do |actual|
+          JSONAPI::RSpec.as_indifferent_hash(actual)['id'] == expected
+        end
       end
     end
   end

lib/jsonapi/rspec/jsonapi_object.rb

@@ -3,6 +3,7 @@ module RSpec
     module JsonapiObject
       ::RSpec::Matchers.define :have_jsonapi_object do |val|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           actual.key?('jsonapi') &&
             (!val || actual['jsonapi'] == val)
         end

lib/jsonapi/rspec/links.rb

@@ -3,6 +3,7 @@ module RSpec
     module Links
       ::RSpec::Matchers.define :have_link do |link|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           actual.key?('links') && actual['links'].key?(link.to_s) &&
             (!@val_set || actual['links'][link.to_s] == @val)
         end
@@ -15,6 +16,7 @@ module Links
 
       ::RSpec::Matchers.define :have_links do |*links|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           return false unless actual.key?('links')
 
           links.all? { |link| actual['links'].key?(link.to_s) }

lib/jsonapi/rspec/meta.rb

@@ -3,6 +3,7 @@ module RSpec
     module Meta
       ::RSpec::Matchers.define :have_meta do |val|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           actual.key?('meta') &&
             (!val || actual['meta'] == val)
         end

lib/jsonapi/rspec/relationships.rb

@@ -3,6 +3,7 @@ module RSpec
     module Relationships
       ::RSpec::Matchers.define :have_relationship do |rel|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           return false unless (actual['relationships'] || {}).key?(rel.to_s)
 
           !@data_set || actual['relationships'][rel.to_s]['data'] == @data_val
@@ -25,6 +26,7 @@ module Relationships
 
       ::RSpec::Matchers.define :have_relationships do |*rels|
         match do |actual|
+          actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           return false unless actual.key?('relationships')
 
           rels.all? { |rel| actual['relationships'].key?(rel) }

lib/jsonapi/rspec/type.rb

@@ -2,7 +2,9 @@ module JSONAPI
   module RSpec
     module Type
       ::RSpec::Matchers.define :have_type do |expected|
-        match { |actual| actual['type'] == expected }
+        match do |actual|
+          JSONAPI::RSpec.as_indifferent_hash(actual)['type'] == expected
+        end
       end
     end
   end