jsonapi-rspec 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b47e58f3f6448c75638d51bf9b1e71158cf0ba27e9ad2ef3de757eefef637cff
-  data.tar.gz: cb6760bd5fbcfd5302f8b53cca011588fedbc591674859a08c4272b820297ba4
+  metadata.gz: 3c6811a07f15a3e68d69b7ba45fc6df97c649d21e3b2a8df38fb493c6a20b615
+  data.tar.gz: da564714ee866647007b624ec7c871c2834949ec6a5d7987622f39df15e72458
 SHA512:
-  metadata.gz: bd3a469d0c1bdb3655f8d53b35a1dd4e65cb90d26ce7bd5dc8c3d9d8b391e352fa405fe76f9b49dc0943d263c6823abc6fa70904c3b7f4a420dc6ad53d62ea26
-  data.tar.gz: 8f2965c6f53ad2c2e92de9c550390eb964b07f3dfad58e3ded6e0527da5f61eb8aab126eeb758d34a53df36cf3e773a8b76ec40301c8022906950a2707bccfac
+  metadata.gz: 25715dae1b5adfcfc2e2e327d7042ee035efbd7123dd3bb36be939ff1e412a16bda3765f304ecc6304f446eab52a3584954cc0f0334fff4501143f06f450f81d
+  data.tar.gz: f95632ad22f0b9b74fd5315e39f2ea800c7c1062b53845357d7312f3d1d7831faae4e476c2981d59acef81c2bc510200ecbd33bbced0bdf21a9ccba18f1da8a7

data/README.md

@@ -25,10 +25,11 @@ Add to your `spec/spec_helpers.rb`:
 require 'jsonapi/rspec'
 
 RSpec.configure do |config|
-  # ...
   config.include JSONAPI::RSpec
+
+  # Support for documents with mixed string/symbol keys. Disabled by default.
+  config.jsonapi_indifferent_hash = true
 end
-```
 
 ## Usage and documentation
 

data/lib/jsonapi/rspec.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'rspec/matchers'
 require 'jsonapi/rspec/id'
 require 'jsonapi/rspec/type'
@@ -7,6 +8,10 @@ require 'jsonapi/rspec/links'
 require 'jsonapi/rspec/meta'
 require 'jsonapi/rspec/jsonapi_object'
 
+RSpec.configure do |c|
+  c.add_setting :jsonapi_indifferent_hash, default: false
+end
+
 module JSONAPI
   module RSpec
     include Id
@@ -16,5 +21,15 @@ module JSONAPI
     include Links
     include Meta
     include JsonapiObject
+
+    def self.as_indifferent_hash(doc)
+      return doc unless ::RSpec.configuration.jsonapi_indifferent_hash
+
+      if doc.respond_to?(:with_indifferent_access)
+        return doc.with_indifferent_access
+      end
+
+      JSON.parse(JSON.generate(doc))
+    end
   end
 end

data/lib/jsonapi/rspec/attributes.rb

@@ -3,6 +3,7 @@ module JSONAPI
     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 JSONAPI
 
       ::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

data/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

data/lib/jsonapi/rspec/jsonapi_object.rb

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

data/lib/jsonapi/rspec/links.rb

@@ -3,6 +3,7 @@ module JSONAPI
     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 JSONAPI
 
       ::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) }

data/lib/jsonapi/rspec/meta.rb

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

data/lib/jsonapi/rspec/relationships.rb

@@ -3,6 +3,7 @@ module JSONAPI
     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
@@ -10,7 +11,7 @@ module JSONAPI
 
         chain :with_data do |val|
           @data_set = true
-          @data_val = val
+          @data_val = JSONAPI::RSpec.as_indifferent_hash(val)
         end
 
         failure_message do |actual|
@@ -25,9 +26,10 @@ module JSONAPI
 
       ::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) }
+          rels.map(&:to_s).all? { |rel| actual['relationships'].key?(rel) }
         end
       end
     end

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Lucas Hosseini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-26 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RSpec matchers for JSON API.