committee 1.10.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31054e2caff7ac27297eb960c4468de3c182f41e
-  data.tar.gz: d1ce477e98f2590d58b499bf320ac10d3907424c
+  metadata.gz: a4fc461157687d09fe003b166837aa9e8ad7b13d
+  data.tar.gz: aabe41cef72a73b9f23941dc2ee7e05f3a2af894
 SHA512:
-  metadata.gz: f5a05732e09b0c1c97e18cccdc3cabb587a6ed20507b49cc18ff5593721120b647ef56135ae0e9d450b16e7f65f733da3bbf3b135a7e8200d29b1652acc53ee9
-  data.tar.gz: 470050b4314be6de778b53b1a3f84f9f762c85b00010abc6612221daaddac123ffb94addc45ea4e07769976f4f5b6ef559018c7e5053e8085385f7605d42a66d
+  metadata.gz: ef692420a20da95986e77e558b15ff5d74d01f7710d7039e29d12a0abdf68b1e8a30d836d58a44095cf0af57e9510bb19c00ae740c6eb2df71e973ac83cff83b
+  data.tar.gz: 9df276033f41e4ac1c607c2c9d03b1364f25994abc4daeb5ecdff3b41c18a7dba88a72c1b2273f41d2aafc5e0ec73db2996108d436d85a44a76ed379104cc88d

data/bin/committee-stub

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "multi_json"
 require 'optparse'
+require 'yaml'
 
 require_relative "../lib/committee"
 
@@ -33,7 +33,7 @@ unless args.count == 1
   exit
 end
 
-schema = MultiJson.decode(File.read(args[0]))
+schema = ::YAML.load(File.read(args[0]))
 
 app = Rack::Builder.new {
   unless options[:tolerant]

data/lib/committee/middleware/base.rb

@@ -8,7 +8,7 @@ module Committee::Middleware
       data = options[:schema] || raise("need option `schema`")
       if data.is_a?(String)
         warn_string_deprecated
-        data = MultiJson.decode(data)
+        data = JSON.parse(data)
       end
       @raise = options[:raise]
       @schema = JsonSchema.parse!(data)

data/lib/committee/middleware/request_validation.rb

@@ -39,7 +39,7 @@ module Committee::Middleware
         :not_found,
         "That request method and path combination isn't defined."
       ).render
-    rescue MultiJson::LoadError
+    rescue JSON::ParserError
       raise Committee::InvalidRequest if @raise
       @error_class.new(400, :bad_request, "Request body wasn't valid JSON.").render
     end

data/lib/committee/middleware/response_validation.rb

@@ -13,7 +13,7 @@ module Committee::Middleware
         response.each do |chunk|
           full_body << chunk
         end
-        data = MultiJson.decode(full_body)
+        data = JSON.parse(full_body)
         Committee::ResponseValidator.new(link).call(status, headers, data)
       end
 
@@ -21,7 +21,7 @@ module Committee::Middleware
     rescue Committee::InvalidResponse
       raise if @raise
       @error_class.new(500, :invalid_response, $!.message).render
-    rescue MultiJson::LoadError
+    rescue JSON::ParserError
       raise Committee::InvalidResponse if @raise
       @error_class.new(500, :invalid_response, "Response wasn't valid JSON.").render
     end

data/lib/committee/middleware/stub.rb

@@ -26,7 +26,7 @@ module Committee::Middleware
           headers.merge!(call_headers)
         end
         status = link.rel == "create" ? 201 : 200
-        [status, headers, [MultiJson.encode(data, pretty: true)]]
+        [status, headers, [JSON.generate(data, pretty: true)]]
       else
         @app.call(request.env)
       end

data/lib/committee/request_unpacker.rb

@@ -16,7 +16,7 @@ module Committee
       elsif @optimistic_json
         begin
           parse_json
-        rescue MultiJson::LoadError
+        rescue JSON::ParserError
           nil
         end
       end
@@ -66,7 +66,7 @@ module Committee
     def parse_json
       if (body = @request.body.read).length != 0
         @request.body.rewind
-        hash = MultiJson.decode(body)
+        hash = JSON.parse(body)
         # We want a hash specifically. '42', 42, and [42] will all be
         # decoded properly, but we can't use them here.
         if !hash.is_a?(Hash)

data/lib/committee/test/methods.rb

@@ -3,7 +3,7 @@ module Committee::Test
     def assert_schema_conform
       if (data = schema_contents).is_a?(String)
         warn_string_deprecated
-        data = MultiJson.decode(data)
+        data = JSON.parse(data)
       end
 
       @schema ||= begin
@@ -19,7 +19,7 @@ module Committee::Test
       end
 
       if validate_response?(last_response.status)
-        data = MultiJson.decode(last_response.body)
+        data = JSON.parse(last_response.body)
         Committee::ResponseValidator.new(link).call(last_response.status, last_response.headers, data)
       end
     end
@@ -32,7 +32,7 @@ module Committee::Test
     # easier to access as a string
     # blob
     def schema_contents
-      MultiJson.decode(File.read(schema_path))
+      JSON.parse(File.read(schema_path))
     end
 
     def schema_path

data/lib/committee/validation_error.rb

@@ -16,7 +16,7 @@ module Committee
       [
         status,
         { "Content-Type" => "application/json" },
-        [MultiJson.encode(error_body)]
+        [JSON.generate(error_body)]
       ]
     end
   end

data/lib/committee.rb

@@ -1,5 +1,5 @@
+require "json"
 require "json_schema"
-require "multi_json"
 require "rack"
 
 require_relative "committee/errors"

data/test/middleware/request_validation_test.rb

@@ -13,7 +13,7 @@ describe Committee::Middleware::RequestValidation do
       "name" => "cloudnasium"
     }
     header "Content-Type", "application/json"
-    post "/apps", MultiJson.encode(params)
+    post "/apps", JSON.generate(params)
     assert_equal 200, last_response.status
   end
 
@@ -23,7 +23,7 @@ describe Committee::Middleware::RequestValidation do
     params = {
       "name" => 1
     }
-    post "/apps", MultiJson.encode(params)
+    post "/apps", JSON.generate(params)
     assert_equal 400, last_response.status
     assert_match /invalid request/i, last_response.body
   end
@@ -42,7 +42,7 @@ describe Committee::Middleware::RequestValidation do
       "name" => "cloudnasium"
     }
     header "Content-Type", "application/json"
-    post "/v1/apps", MultiJson.encode(params)
+    post "/v1/apps", JSON.generate(params)
     assert_equal 200, last_response.status
   end
 
@@ -60,7 +60,7 @@ describe Committee::Middleware::RequestValidation do
       "name" => "cloudnasium"
     }
     header "Content-Type", "application/json"
-    post "/apps", MultiJson.encode(params)
+    post "/apps", JSON.generate(params)
     assert_equal 200, last_response.status
   end
 
@@ -90,7 +90,7 @@ describe Committee::Middleware::RequestValidation do
       "name" => "cloudnasium"
     }
     header "Content-Type", "text/html"
-    post "/apps", MultiJson.encode(params)
+    post "/apps", JSON.generate(params)
     assert_equal 200, last_response.status
   end
 
@@ -98,7 +98,7 @@ describe Committee::Middleware::RequestValidation do
 
   def new_rack_app(options = {})
     options = {
-      schema: MultiJson.decode(File.read("./test/data/schema.json"))
+      schema: JSON.parse(File.read("./test/data/schema.json"))
     }.merge(options)
     Rack::Builder.new {
       use Committee::Middleware::RequestValidation, options

data/test/middleware/response_validation_test.rb

@@ -8,7 +8,7 @@ describe Committee::Middleware::ResponseValidation do
   end
 
   it "passes through a valid response" do
-    @app = new_rack_app(MultiJson.encode([ValidApp]))
+    @app = new_rack_app(JSON.generate([ValidApp]))
     get "/apps"
     assert_equal 200, last_response.status
   end
@@ -40,14 +40,14 @@ describe Committee::Middleware::ResponseValidation do
   end
 
   it "takes a prefix" do
-    @app = new_rack_app(MultiJson.encode([ValidApp]), {}, prefix: "/v1")
+    @app = new_rack_app(JSON.generate([ValidApp]), {}, prefix: "/v1")
     get "/v1/apps"
     assert_equal 200, last_response.status
   end
 
   it "warns when sending a deprecated string" do
     mock(Committee).warn_deprecated.with_any_args
-    @app = new_rack_app(MultiJson.encode([ValidApp]), {},
+    @app = new_rack_app(JSON.generate([ValidApp]), {},
       schema: File.read("./test/data/schema.json"))
     get "/apps"
     assert_equal 200, last_response.status
@@ -67,7 +67,7 @@ describe Committee::Middleware::ResponseValidation do
       "Content-Type" => "application/json"
     }.merge(headers)
     options = {
-      schema: MultiJson.decode(File.read("./test/data/schema.json"))
+      schema: JSON.parse(File.read("./test/data/schema.json"))
     }.merge(options)
     Rack::Builder.new {
       use Committee::Middleware::ResponseValidation, options

data/test/middleware/stub_test.rb

@@ -11,7 +11,7 @@ describe Committee::Middleware::Stub do
     @app = new_rack_app
     get "/apps/heroku-api"
     assert_equal 200, last_response.status
-    data = MultiJson.decode(last_response.body)
+    data = JSON.parse(last_response.body)
     assert_equal ValidApp.keys.sort, data.keys.sort
   end
 
@@ -26,7 +26,7 @@ describe Committee::Middleware::Stub do
     get "/apps/heroku-api"
     assert_equal 200, last_response.status
     assert_equal ValidApp,
-      MultiJson.decode(last_response.headers["Committee-Response"])
+      JSON.parse(last_response.headers["Committee-Response"])
   end
 
   it "optionally returns the application's response" do
@@ -34,7 +34,7 @@ describe Committee::Middleware::Stub do
     get "/apps/heroku-api"
     assert_equal 429, last_response.status
     assert_equal ValidApp,
-      MultiJson.decode(last_response.headers["Committee-Response"])
+      JSON.parse(last_response.headers["Committee-Response"])
       assert_equal "", last_response.body
   end
 
@@ -42,7 +42,7 @@ describe Committee::Middleware::Stub do
     @app = new_rack_app(prefix: "/v1")
     get "/v1/apps/heroku-api"
     assert_equal 200, last_response.status
-    data = MultiJson.decode(last_response.body)
+    data = JSON.parse(last_response.body)
     assert_equal ValidApp.keys.sort, data.keys.sort
   end
 
@@ -51,7 +51,7 @@ describe Committee::Middleware::Stub do
     @app = new_rack_app(schema: File.read("./test/data/schema.json"))
     get "/apps/heroku-api"
     assert_equal 200, last_response.status
-    data = MultiJson.decode(last_response.body)
+    data = JSON.parse(last_response.body)
     assert_equal ValidApp.keys.sort, data.keys.sort
   end
 
@@ -60,12 +60,12 @@ describe Committee::Middleware::Stub do
   def new_rack_app(options = {})
     suppress = options.delete(:suppress)
     options = {
-      schema: MultiJson.decode(File.read("./test/data/schema.json"))
+      schema: JSON.parse(File.read("./test/data/schema.json"))
     }.merge(options)
     Rack::Builder.new {
       use Committee::Middleware::Stub, options
       run lambda { |env|
-        headers = { "Committee-Response" => MultiJson.encode(env["committee.response"]) }
+        headers = { "Committee-Response" => JSON.generate(env["committee.response"]) }
         env["committee.suppress"] = suppress
         [429, headers, []]
       }

data/test/request_validator_test.rb

@@ -5,7 +5,7 @@ require "stringio"
 describe Committee::RequestValidator do
   before do
     @schema =
-      JsonSchema.parse!(MultiJson.decode(File.read("./test/data/schema.json")))
+      JsonSchema.parse!(JSON.parse(File.read("./test/data/schema.json")))
     @schema.expand_references!
     # POST /apps/:id
     @link = @link = @schema.properties["app"].links[0]

data/test/response_generator_test.rb

@@ -3,7 +3,7 @@ require_relative "test_helper"
 describe Committee::ResponseGenerator do
   before do
     @schema =
-      JsonSchema.parse!(MultiJson.decode(File.read("./test/data/schema.json")))
+      JsonSchema.parse!(JSON.parse(File.read("./test/data/schema.json")))
     @schema.expand_references!
     # GET /apps/:id
     @get_link = @link = @schema.properties["app"].links[2]

data/test/response_validator_test.rb

@@ -8,7 +8,7 @@ describe Committee::ResponseValidator do
     }
     @data = ValidApp.dup
     @schema =
-      JsonSchema.parse!(MultiJson.decode(File.read("./test/data/schema.json")))
+      JsonSchema.parse!(JSON.parse(File.read("./test/data/schema.json")))
     @schema.expand_references!
     # GET /apps/:id
     @get_link = @link = @schema.properties["app"].links[2]

data/test/router_test.rb

@@ -30,7 +30,7 @@ describe Committee::Router do
   end
 
   def router(options = {})
-    data = MultiJson.decode(File.read("./test/data/schema.json"))
+    data = JSON.parse(File.read("./test/data/schema.json"))
     schema = JsonSchema.parse!(data)
     schema.expand_references!
     Committee::Router.new(schema, options)

data/test/test/methods_test.rb

@@ -21,13 +21,13 @@ describe Committee::Middleware::Stub do
 
   describe "#assert_schema_conform" do
     it "passes through a valid response" do
-      @app = new_rack_app(MultiJson.encode([ValidApp]))
+      @app = new_rack_app(JSON.generate([ValidApp]))
       get "/apps"
       assert_schema_conform
     end
 
     it "detects an invalid response Content-Type" do
-      @app = new_rack_app(MultiJson.encode([ValidApp]), {})
+      @app = new_rack_app(JSON.generate([ValidApp]), {})
       get "/apps"
       e = assert_raises(Committee::InvalidResponse) do
         assert_schema_conform
@@ -38,7 +38,7 @@ describe Committee::Middleware::Stub do
     it "warns when sending a deprecated string" do
       stub(self).schema_contents { File.read(schema_path) }
       mock(Committee).warn_deprecated.with_any_args
-      @app = new_rack_app(MultiJson.encode([ValidApp]))
+      @app = new_rack_app(JSON.generate([ValidApp]))
       get "/apps"
       assert_schema_conform
     end

data/test/validation_error_test.rb

@@ -15,7 +15,7 @@ describe Committee::ValidationError do
     response = [
       400,
       { "Content-Type" => "application/json" },
-      [MultiJson.encode(body)]
+      [JSON.generate(body)]
     ]
 
     assert_equal @error.render, response

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Brandur
@@ -31,20 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.1
-- !ruby/object:Gem::Dependency
-  name: multi_json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -174,4 +160,3 @@ signing_key:
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.
 test_files: []
-has_rdoc: