jsonapi_expectations 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92b5555e5bab6d04f1d2486e77f846c2e95e85e4
-  data.tar.gz: a33d3230ab71f091242495eb432664835bcddead
+  metadata.gz: 21c2096f2fc743d92f1a54390a688d52086e9788
+  data.tar.gz: 95cf32b87db3ef08d7321d7f6efad2c023ea633e
 SHA512:
-  metadata.gz: f858de7a6b34ba397a632a3292ec4aeaf4748827328f197e4a51d97b7ab79ace9588aec1d111523009461341f32c8fa178d72e66bfb91b023557f237c62406c0
-  data.tar.gz: 7e6332856db23ec73c237d7ee458d5175cf0f175568788dd8d01258e8b54b88b210b5a4bfd8e61de8b9d9ffe17f418c0884a9f8a4ff65fee83a4763d2b2eebfd
+  metadata.gz: 80cf32bab52f34beb07fe627ffd0abcce9f76830814076756e0b31afb0ccd3ab3c7e50c99185971843fb991e89979f6b47880d0d04090fbc686d7966cbea9a3f
+  data.tar.gz: 9ab15ccbe87fd48208c946984f606e2d8cb03b7a4f52c3fbdcd53abbf80f858069cd9a9c71323a6099e4d37524dbcb685f724553d5c9b44247be88e51056ff1d

data/lib/jsonapi_expectations.rb

@@ -3,18 +3,35 @@ require 'active_support/inflector'
 
 module JsonapiExpectations
   def expect_attributes attrs
-    expect(json_body[:data]).to_not be_empty
-    expect_json 'data.attributes', dasherize_keys(attrs)
+    expect_valid_data
+    if is_array_response?
+      location = 'data.?.attributes'
+    else
+      location = 'data.attributes'
+    end
+    expect_json location, dasherize_keys(attrs)
   end
-
-  def expect_attributes_in_list attrs
-    expect(json_body[:data]).to_not be_empty
-    expect_json 'data.?.attributes', dasherize_keys(attrs)
+  alias_method :expect_attributes_in_list, :expect_attributes
+
+  def expect_attributes_absent *keys
+    expect_valid_data
+    if is_array_response?
+      json_body[:data].each do |data|
+        dasherize_array(keys).each do |key|
+          expect(data[key].present?).to be_falsey
+        end
+      end
+    else
+      dasherize_array(keys).each do |key|
+        expect(json_body[:data][:attributes][key].present?).to be_falsey
+      end
+    end
   end
+  alias_method :expect_attributes_absent_in_list, :expect_attributes_absent
 
   def expect_relationship opts
-    # If looking for item in a list, need to change location string
-    location = if opts[:in_list]
+    expect_valid_data
+    location = if is_array_response?
                  "data.?.relationships.#{opts[:key]}"
                else
                  "data.relationships.#{opts[:key]}"
@@ -41,48 +58,69 @@ module JsonapiExpectations
       end
     end
   end
-
-  def expect_relationship_in_list opts
-    opts[:in_list] = true
-    expect_relationship opts
-  end
+  alias_method :expect_relationship_in_list, :expect_relationship
 
   def expect_item_count number
+    expect_valid_data
     expect_json_sizes data: number
   end
 
-  def expect_item_in_list find_me, opts = {}
+  def expect_record find_me, opts = {}
     opts[:type] ||= jsonapi_type find_me
-    expect(json_body[:data]).to_not be_empty
-    found = json_body[:data].detect do |item|
+    if opts[:included]
+      location = json_body[:included]
+    else
+      location = json_body[:data]
+    end
+    expect_valid_data location
+    found = location.detect do |item|
       jsonapi_match? find_me, item, opts[:type]
     end
     expect(found).to be_truthy
   end
+  alias_method :expect_item_in_list, :expect_record
 
-  def expect_item_not_in_list dont_find_me, opts = {}
+  def expect_record_absent dont_find_me, opts = {}
     opts[:type] ||= jsonapi_type dont_find_me
-    expect(json_body[:data]).to_not be_empty
-    json_body[:data].each do |item|
+    if opts[:included]
+      location = json_body[:included]
+    else
+      location = json_body[:data]
+    end
+    expect_valid_data location
+    location.each do |item|
       expect(jsonapi_match?(dont_find_me, item, opts[:type])).to be_falsey
     end
   end
-  alias_method :expect_item_not_to_be_in_list,
-               :expect_item_not_in_list
-  alias_method :expect_item_to_not_be_in_list,
-               :expect_item_not_in_list
+  alias_method :expect_item_not_in_list, :expect_record_absent
+  alias_method :expect_item_not_to_be_in_list, :expect_record_absent
+  alias_method :expect_item_to_not_be_in_list, :expect_record_absent
 
-  ## Finder helpers
-
-  def find_record_in_response record, opts = {}
+  def find_record record, opts = {}
     opts[:type] ||= jsonapi_type(record)
-    json_body[:data].select do |item|
-      item[:id] == record.id && item[:type] == opts[:type]
+    if opts[:included]
+      location = json_body[:included]
+    else
+      location = json_body[:data]
+    end
+    expect_valid_data location
+    location.select do |item|
+      jsonapi_match? record, item, opts[:type]
     end.first
   end
 
+  def expect_valid_data location = nil
+    location ||= json_body[:data]
+    expect(location).to_not be_nil
+    expect(location).to_not be_empty
+  end
+
   private
 
+  def is_array_response?
+    json_body[:data].is_a? Array
+  end
+
   def expect_linkage_data location, relationship_data, included
     begin
       expect_json location, relationship_data
@@ -93,8 +131,16 @@ module JsonapiExpectations
     expect_json "included.?", relationship_data if included
   end
 
+  def dasherize_array array
+    array.map { |item| dasherize item }
+  end
+
   def dasherize_keys hash
-    hash.deep_transform_keys { |key| key.to_s.tr('_', '-').to_sym }
+    hash.deep_transform_keys { |key| dasherize key }
+  end
+
+  def dasherize thing
+    thing.to_s.tr('_', '-').to_sym
   end
 
   def jsonapi_match? model, data, type

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_expectations
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
 platform: ruby
 authors:
 - Ross-Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airborne