jsonapi_expectations 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2601f5db12cdcdd320710f13892bb3b0f2737bb0
-  data.tar.gz: b2c4050e0a5496d0c0c5d7f2fcf069dc060ec43c
+  metadata.gz: 9f0c4c0c422747b4796bbe5438a70f967a05e2f8
+  data.tar.gz: 4ab37b714cb057cad02088e8a352c1e342c2ea11
 SHA512:
-  metadata.gz: 71a8dff71c02084597c964cf4f2db4fae13cef3781e01baf4eecf78529d670ed5a976c5b26bd9510f2518d9da9fba90b6e652cb3fecc914767617b0f9e21c41b
-  data.tar.gz: 6a3ccc5f53ccb07267ef3000116b0cbf2ae3aa00003a2ce16c457109cd224672bef356de39aa748e830d14725198c4931cce2ecb0d0361437285c9ab50d62610
+  metadata.gz: 2325d776f3713ce042da27536b7e4101507830456d179184567d77f84079ca274a1d27739b49b415f2ccce57e82599a2d928ec48fbd9d9d4ee6cb28fc4fefcdd
+  data.tar.gz: b76b63d83bccaa24d2c32d987b5ef08f0eb3ab584ec8edcb6f769b44691e9b80192bff654539213877d6018c47b3b68829194afec4de5a01f66ba264a8f79841

data/lib/jsonapi_expectations.rb

@@ -75,20 +75,11 @@ module JsonapiExpectations
     expect_json_sizes data: number
   end
 
-  def expect_record find_me, opts = {}
-    opts[:type] ||= jsonapi_type find_me
-    location = if opts[:included]
-                 json_body[:included]
-               else
-                 json_body[:data]
-               end
-    expect_valid_data location
-    found = location.detect do |item|
-      jsonapi_match? find_me, item, opts[:type]
-    end
+  def expect_record record, opts = {}
+    found = find_record record, opts
     expect(found).to be_truthy
   rescue RSpec::Expectations::ExpectationNotMetError
-    msg = "Expected #{find_me} to be present in json response"
+    msg = "Expected #{record} to be present in json response"
     raise Exceptions::ExpectationError, msg
   end
 
@@ -108,19 +99,28 @@ module JsonapiExpectations
     raise Exceptions::ExpectationError, msg
   end
 
-  def expect_records_sorted_by attr, direction = :asc
+  def expect_records_sorted_by attr, opts = {}
+    direction = opts.fetch :direction, :asc
+    allow_nils = opts.fetch :allow_nils, false
+
     json_body[:data].each_with_index do |item, index|
-      return if json_body[:data].last == item
+      return if item == json_body[:data].last
 
       this_one = item[:attributes][attr]
       next_one = json_body[:data][index + 1][:attributes][attr]
 
+      unless this_one && next_one
+        return if allow_nils
+        msg = "Expected response to be sorted by #{attr} #{direction}, but some attribues were nil"
+        raise Exceptions::ExpectationError, msg
+      end
+
       if direction == :asc
         expect(this_one).to be <= next_one
       elsif direction == :desc
         expect(next_one).to be <= this_one
       else
-        raise "2nd argument needs to be :asc or :desc"
+        raise "Direction option needs to be :asc or :desc"
       end
     end
   rescue RSpec::Expectations::ExpectationNotMetError
@@ -129,19 +129,18 @@ module JsonapiExpectations
   end
 
   def find_record record, opts = {}
-    opts[:type] ||= jsonapi_type(record)
+    opts[:type] ||= jsonapi_type record
     location = if opts[:included]
                  json_body[:included]
                else
                  json_body[:data]
                end
     expect_valid_data location
-    location.select do |item|
+    location.detect do |item|
       jsonapi_match? record, item, opts[:type]
-    end.first
+    end
   end
 
-  # This will go away in the 0.1.0 release
   # TODO: deprecate these
   alias expect_attributes_in_list expect_attributes
   alias expect_attributes_absent_in_list expect_attributes_absent

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_expectations
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ross-Hunter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-29 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airborne
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Semantic expectation helpers for JSON API testing using Airborne and RSpec.