jsonapi_spec_helpers 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c612599d47e809e0d0af99c60fb425d87a7f04c
-  data.tar.gz: 1482e1339767f47a9a10e8f3f12b7bd3a9bdad44
+  metadata.gz: c95f70b24431c804dc7e611071e2bfb15f702aff
+  data.tar.gz: daffe460ccef792159feb8379277e12d1af39fbe
 SHA512:
-  metadata.gz: ca6adc718e8a9a28801b088f70499dd9885cd8f370559fd13ecf932e39ac69f373540c129eda6238f3e714bf30e294cb40e11c1ad9315446e584ba1cc5c891c8
-  data.tar.gz: 42311907667ca7fc828e9be586460a0a89c652014094816963957bb5a50b5c33371967a8cc9176384f2c1d0ecd2ceb71b4a3214c173a04dff8c41b4b907d0ea5
+  metadata.gz: 1d6a4b7cad9ec9b7ccf07d9e187821f4e3cb31aa4c210b9350e86e4b8a98c712e858f8c4b399ddea37f47b9c10b68ea4ff2bb911a3c7792c0cc824856afc0d79
+  data.tar.gz: 22aeefed1fecb2bfe9eb69437154e66c0d7a54396edaaa336f710e79f04564293cf3f7ce39e27cc537a20459ebacbcecd933b3e58c950517263cdd7644793d4e

data/lib/jsonapi_spec_helpers/payload.rb

@@ -30,16 +30,17 @@ module JsonapiSpecHelpers
       @no_keys << name
     end
 
-    def key(name, &blk)
+    def key(name, options = {}, &blk)
+      options[:allow_nil] ||= false
       @no_keys.reject! { |k| k == name }
       prc = blk
       prc = ->(record) { record.send(name) } if prc.nil?
-      @keys[name] = prc
+      @keys[name] = options.merge(proc: prc)
     end
 
     def timestamps!
-      @keys[:created_at] = ->(record) { record.created_at }
-      @keys[:updated_at] = ->(record) { record.updated_at }
+      @keys[:created_at] = key(:created_at)
+      @keys[:updated_at] = key(:updated_at)
     end
   end
 end

data/lib/jsonapi_spec_helpers/version.rb

@@ -1,3 +1,3 @@
 module JsonapiSpecHelpers
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/jsonapi_spec_helpers.rb

@@ -1,6 +1,3 @@
-require 'pry'
-require 'pry-byebug'
-
 require 'json'
 require 'jsonapi_spec_helpers/version'
 require 'jsonapi_spec_helpers/payload'
@@ -16,13 +13,21 @@ RSpec::Matchers.define :match_payload do |attribute, expected|
   end
 end
 
-RSpec::Matchers.define :have_payload_key do |expected|
+RSpec::Matchers.define :have_payload_key do |expected, allow_nil|
   match do |json|
-    json.has_key?(expected.to_s)
+    @has_key = json.has_key?(expected.to_s)
+    @has_value = !json[expected.to_s].nil?
+
+    if allow_nil
+      @has_key
+    else
+      @has_key && @has_value
+    end
   end
 
   failure_message do |actual|
-    "Expected JSON payload to have key '#{expected}' but was not present"
+    msg = !allow_nil && @has_key ? "nil. Use 'key(:foo, allow_nil: true)' to allow nils" : "not present"
+    "Expected JSON payload to have key '#{expected}' but was #{msg}"
   end
 
   failure_message_when_negated do |actual|
@@ -113,14 +118,17 @@ module JsonapiSpecHelpers
     end
 
     aggregate_failures "payload has correct key/values" do
-      payload.keys.each_pair do |attribute, prc|
-        if (expect(json).to have_payload_key(attribute)) == true
-          expect(json[attribute.to_s]).to match_payload(attribute, prc.call(record))
+      payload.keys.each_pair do |attribute, options|
+        prc = options[:proc]
+        if (expect(json).to have_payload_key(attribute, options[:allow_nil])) == true
+          unless options[:allow_nil]
+            expect(json[attribute.to_s]).to match_payload(attribute, prc.call(record))
+          end
         end
       end
 
       payload.no_keys.each do |no_key|
-        expect(json).to_not have_payload_key(no_key)
+        expect(json).to_not have_payload_key(no_key, {})
       end
 
       unexpected_keys = json.keys - payload.keys.keys.map(&:to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_spec_helpers
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -135,9 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Spec helpers for jsonapi
 test_files: []
-has_rdoc: