json_matchers 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68b1658e2e48715aa95963b7dc9f5553ae49e6e4
-  data.tar.gz: d3536a05e44aaf06757f027d3883e9e9f4af0198
+  metadata.gz: aa337859deb80396749bed9a9c4d32d7079a81ab
+  data.tar.gz: 3a8dc313f1854e2c1e41cd0bafa66855319bb06e
 SHA512:
-  metadata.gz: 1b9eaabfe5e88f41f459762081a3812896080bceda80d96cec2ade4cbfc0242cf3af9819f207116d784c9bc8869d79ed8fd8bcffad276f4317715c3af1b7170d
-  data.tar.gz: 939c61f64cd34c0f94a0846cf17b18dc61bed92bed78b1adf0f743e74ee6257f8685c1ad31686743f1e531849126dea6ec3a9fa4db985260282c18ae6230ce5f
+  metadata.gz: c22878991190e76a633c836dbdc45eb95cc5ce26664c13acf19579940653b4939ea67f212f81c12f2760198716b4347c71803e9135de943e952066cc1f75392f
+  data.tar.gz: 706d1bfd640fd52d8743a90cddc3bd2727736167c6dc4deed8137b95b5651bdc880134c43a27a089e367daa76de342aa508ed3ed19c72b4f28949043ab330e57

data/NEWS.md

@@ -1,6 +1,13 @@
 master
 ======
 
+0.6.3
+=====
+
+* Fix error message for string responses. [#49]
+
+[#49]: https://github.com/thoughtbot/json_matchers/pull/49
+
 0.6.2
 =====
 

data/README.md

@@ -81,7 +81,7 @@ describe "GET /posts" do
     get posts_path, format: :json
 
     expect(response.status).to eq 200
-    expect(response.body).to match_json_schema("posts")
+    expect(response.body).to match_response_schema("posts")
   end
 end
 ```

data/lib/json_matchers/matcher.rb

@@ -1,4 +1,5 @@
 require "json-schema"
+require "json_matchers/payload"
 
 module JsonMatchers
   class Matcher
@@ -10,7 +11,7 @@ module JsonMatchers
     def matches?(response)
       JSON::Validator.validate!(
         schema_path.to_s,
-        json_from(response).to_s,
+        Payload.new(response).to_s,
         options,
       )
     rescue JSON::Schema::ValidationError => ex
@@ -28,14 +29,6 @@ module JsonMatchers
 
     attr_reader :schema_path, :options
 
-    def json_from(response)
-      if response.respond_to?(:body)
-        response.body
-      else
-        response
-      end
-    end
-
     def default_options
       JsonMatchers.configuration.options || {}
     end

data/lib/json_matchers/payload.rb

@@ -0,0 +1,23 @@
+module JsonMatchers
+  class Payload
+    def initialize(payload)
+      @payload = extract_json_string(payload)
+    end
+
+    def to_s
+      payload
+    end
+
+    private
+
+    attr_reader :payload
+
+    def extract_json_string(payload)
+      if payload.respond_to?(:body)
+        payload.body
+      else
+        payload
+      end
+    end
+  end
+end

data/lib/json_matchers/rspec.rb

@@ -1,4 +1,5 @@
 require "json_matchers"
+require "json_matchers/payload"
 
 module JsonMatchers
   class RSpec < SimpleDelegator
@@ -18,7 +19,7 @@ module JsonMatchers
 
 expected
 
-#{pretty_json(response.body)}
+#{pretty_json(response)}
 
 to match schema "#{schema_name}":
 
@@ -35,7 +36,7 @@ to match schema "#{schema_name}":
 
 expected
 
-#{pretty_json(response.body)}
+#{pretty_json(response)}
 
 not to match schema "#{schema_name}":
 
@@ -46,8 +47,10 @@ not to match schema "#{schema_name}":
 
     private
 
-    def pretty_json(json_string)
-      JSON.pretty_generate(JSON.parse(json_string.to_s))
+    def pretty_json(response)
+      payload = Payload.new(response).to_s
+
+      JSON.pretty_generate(JSON.parse(payload))
     end
 
     def schema_path

data/lib/json_matchers/version.rb

@@ -1,3 +1,3 @@
 module JsonMatchers
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/json_matchers/match_response_schema_spec.rb

@@ -22,20 +22,30 @@ describe JsonMatchers, "#match_response_schema" do
     expect(response_for({})).not_to match_response_schema("foo_schema")
   end
 
-  it "validates a JSON string" do
-    create_schema("foo_schema", {
-      "type" => "object",
-      "required" => [
-        "id",
-      ],
-      "properties" => {
-        "id" => { "type" => "number" },
-      },
-      "additionalProperties" => false,
-    })
+  context "when JSON is a string" do
+    before(:each) do
+      create_schema("foo_schema", {
+        "type" => "object",
+        "required" => [
+          "id",
+        ],
+        "properties" => {
+          "id" => { "type" => "number" },
+        },
+        "additionalProperties" => false,
+      })
+    end
 
-    expect(response_for({ "id" => 1 }).body).
-      to match_response_schema("foo_schema")
+    it "validates when the schema matches" do
+      expect({ "id" => 1 }.to_json).
+        to match_response_schema("foo_schema")
+    end
+
+    it "fails with message when negated" do
+      expect {
+        expect({ "id" => "1" }.to_json).to match_response_schema("foo_schema")
+      }.to raise_formatted_error(%{{ "type": "number" }})
+    end
   end
 
   it "fails when the body contains a property with the wrong type" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_matchers
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Sean Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -102,6 +102,7 @@ files:
 - lib/json_matchers/configuration.rb
 - lib/json_matchers/errors.rb
 - lib/json_matchers/matcher.rb
+- lib/json_matchers/payload.rb
 - lib/json_matchers/rspec.rb
 - lib/json_matchers/version.rb
 - spec/json_matchers/match_response_schema_spec.rb