jsonapi-rspec 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7320e501ff0cc08655a6e935589d300bedef20bc70add21f64d91d2e053a36
-  data.tar.gz: 1d31cafea53bb133cc8c62c274403bad9aaaa7dfcf4834679bd4cf2dbd246a8c
+  metadata.gz: 5cb345693bd692513446e88fa4d1713b7927afa9b3a3033270ac26daefe3c07f
+  data.tar.gz: 8bc079f20dc7cd85e29b2a51f2d44e511d09153809507dbc4f361b55d79caf8e
 SHA512:
-  metadata.gz: 727c5d55cfa976e4961dfe9798d1767bde29b364d7e4ff33dd52541a12c719c45f67bc021fd179432bd37ae60d26bc8477dce288eadb4b6365d0575570d3c6f0
-  data.tar.gz: bc74dd39b5b8186f7f6d945277f4fd8a091a20f9c33febf4ed52a788ac54778c6d176e20861261d5e7ef60a061cefdaf1fbefb4eaf63ff5163e661ee378ffde0
+  metadata.gz: 15c13b39490b4a72ef66e1aeed229665aacf8b98a0b3f2dfc8063d4b9dfa18190edb2c9a783cf921f23c0f5553d408065626669f4c39b7fa4cbdfb991e2e559e
+  data.tar.gz: e82b0d326630160bf704058b38068de72521670715280fbdf1539d17b725cb1e721167ff5e2ed830f73baa45bf100ed1f999589ef7392a0b19254bbb500b87f3

data/README.md

@@ -37,6 +37,7 @@ Available matchers:
 * `expect(document['data']).to have_jsonapi_attributes(:name, :email, :country).exactly`
 * `expect(document['data']).to have_attribute(:name).with_value('Lucas')`
 * `expect(document['data']).to have_relationships(:posts, :comments)`
+* `expect(document['data']).to have_relationships(:posts, :comments, :likes).exactly`
 * `expect(document['data']).to have_relationship(:posts).with_data([{ 'id' => '1', 'type' => 'posts' }])`
 * `expect(document['data']['relationships']['posts']).to have_links(:self, :related)`
 * `expect(document['data']).to have_link(:self).with_value('http://api.example.com/users/12')`

data/lib/jsonapi/rspec/attributes.rb

@@ -4,14 +4,48 @@ module JSONAPI
       ::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)
+          @attributes_node = actual['attributes']
+
+          return false unless @attributes_node
+
+          @has_attribute = @attributes_node.key?(attr.to_s)
+          if @has_attribute && @should_match_value
+            @actual_value = @attributes_node[attr.to_s]
+
+            # Work nicely with diffable
+            @actual = @actual_value
+            @expected = @expected_value
+
+            return @actual == @expected
+          end
+          @has_attribute
         end
 
-        chain :with_value do |val|
-          @val_set = true
-          @val = val
+        chain :with_value do |expected_value|
+          @should_match_value = true
+          @expected_value = expected_value
         end
+
+        description do
+          result = "have attribute #{attr.inspect}"
+          if @should_match_value
+            result << " with value #{@expected_value.inspect}"
+          end
+          result
+        end
+
+        failure_message do |_actual|
+          if @has_attribute
+            "expected `#{attr}` attribute " \
+              "to have value `#{@expected}` but was `#{@actual}`"
+          else
+            "expected attributes to include `#{attr}`. " \
+              "Actual attributes were #{@attributes_node.keys}"
+          end
+        end
+
+        diffable
+        attr_reader :actual, :expected
       end
 
       ::RSpec::Matchers.define :have_jsonapi_attributes do |*attrs|

data/lib/jsonapi/rspec/relationships.rb

@@ -29,7 +29,14 @@ module JSONAPI
           actual = JSONAPI::RSpec.as_indifferent_hash(actual)
           return false unless actual.key?('relationships')
 
-          rels.map(&:to_s).all? { |rel| actual['relationships'].key?(rel) }
+          counted = (rels.size == actual['relationships'].keys.size) if @exactly
+
+          rels.map(&:to_s).all? { |rel| actual['relationships'].key?(rel) } \
+            && (counted == @exactly)
+        end
+
+        chain :exactly do
+          @exactly = true
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-rspec
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Lucas Hosseini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-12 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core