json_matchers 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae47ba6e026a29f0f498146f78039dd5b65f75cb
-  data.tar.gz: e8d728527e3010c55cdd2019376bfb2c61aa2352
+  metadata.gz: 7837005397def477004c328fc25ebf08f3442338
+  data.tar.gz: 6eabcabe3f0317d35ed02980b67d615e609933cd
 SHA512:
-  metadata.gz: bbb54160e7035e4cfe4d2ae9741604fc157166f85ff431b62fdc92240cd850ae6a82b2da4fed61d9936b8a9ad65c241319f50b86f8e2f7f38ea8c0974198f559
-  data.tar.gz: 64c775526e26c009d99660e98ef7f3fbf38b0ef0cc2087d4104a48feef1edc215a8261fdf7d619ea07795da76bff5ff1071ae829ddfbb56e2f48f396652e12a2
+  metadata.gz: 463f19a601e24f35a43ca210636c9e68f80c6f33b5c3e402d4116a5e3bd9c60748a4df8755da1edbde4d570b48453a15bbcd76dccc42d3a643a8d26fe87f5820
+  data.tar.gz: fba3346e93283c75f917bfa3ee9fd49a1680f1767ef97a701a439eb9aed4596400b929c78b95c0effffc59547eede894a2d1ae67710297ee2e8eef49632f7640

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/.travis.yml

@@ -4,4 +4,4 @@ language: ruby
 notifications:
   email: false
 rvm:
-- 2.2.0
+- 2.3.0

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+ruby "2.3.0"
+
 # Specify your gem's dependencies in shoulda-matchers-json.gemspec
 gemspec

data/NEWS.md

@@ -1,6 +1,23 @@
 master
 ======
 
+0.6.0
+=====
+
+* Accept a JSON string along with a `response`.
+
+[#43]: https://github.com/thoughtbot/json_matchers/pull/43
+
+0.5.1
+=====
+
+* Update `json-schema` dependency to `~> 2.6.0`. [#37]
+
+[#37]: https://github.com/thoughtbot/json_matchers/pull/37
+
+0.5.0
+=====
+
 Breaking Changes
 ----------------
 

data/README.md

@@ -56,7 +56,7 @@ Define your [JSON Schema](http://json-schema.org/example1.html) in the schema di
 }
 ```
 
-Then, validate your response against your schema with `match_response_schema`
+Then, validate `response` against your schema with `match_response_schema`
 
 ```ruby
 # spec/requests/posts_spec.rb
@@ -71,6 +71,21 @@ describe "GET /posts" do
 end
 ```
 
+Alternatively, `match_response_schema` accepts a string:
+
+```ruby
+# spec/requests/posts_spec.rb
+
+describe "GET /posts" do
+  it "returns Posts" do
+    get posts_path, format: :json
+
+    expect(response.status).to eq 200
+    expect(response.body).to match_json_schema("posts")
+  end
+end
+```
+
 ### Passing options to the validator
 
 The matcher accepts options, which it passes to the validator:

data/json_matchers.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency("json-schema", "~> 2.2.5")
+  spec.add_dependency("json-schema", "~> 2.6.0")
   spec.add_dependency("activesupport", '>= 3.0.0')
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/lib/json_matchers/matcher.rb

@@ -8,17 +8,15 @@ module JsonMatchers
     end
 
     def matches?(response)
-      @response = response
-
       JSON::Validator.validate!(
         schema_path.to_s,
-        response.body,
+        json_from(response).to_s,
         options,
       )
     rescue JSON::Schema::ValidationError => ex
       @validation_failure_message = ex.message
       false
-    rescue JSON::ParserError
+    rescue JSON::Schema::JsonParseError
       raise InvalidSchemaError
     end
 
@@ -29,5 +27,13 @@ module JsonMatchers
     private
 
     attr_reader :schema_path, :options
+
+    def json_from(response)
+      if response.respond_to?(:body)
+        response.body
+      else
+        response
+      end
+    end
   end
 end

data/lib/json_matchers/version.rb

@@ -1,3 +1,3 @@
 module JsonMatchers
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/json_matchers/match_response_schema_spec.rb

@@ -39,6 +39,22 @@ describe JsonMatchers, "#match_response_schema" do
       to match_response_schema("foo_schema", strict: false)
   end
 
+  it "validates a JSON string" do
+    create_schema("foo_schema", {
+      "type" => "object",
+      "required" => [
+        "id",
+      ],
+      "properties" => {
+        "id" => { "type" => "number" },
+      },
+      "additionalProperties" => false,
+    })
+
+    expect(response_for({ "id" => 1 }).body).
+      to match_response_schema("foo_schema")
+  end
+
   it "fails when the body contains a property with the wrong type" do
     create_schema("foo_schema", {
       "type" => "object",

data/spec/support/file_helpers.rb

@@ -30,6 +30,8 @@ end
 RSpec.configure do |config|
   config.include FileHelpers
 
+  config.before(:each) { JSON::Validator.clear_cache }
+
   config.around do |example|
     JsonMatchers.schema_root = File.join(Dir.pwd, "spec", "fixtures", "schemas")
     FileUtils.mkdir_p(JsonMatchers.schema_root)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_matchers
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sean Doyle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.5
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md
 - Gemfile
@@ -139,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Validate your Rails JSON API's JSON