committee 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b11943ee5136c0c5701b28fe02db42ed4a0c60bd
-  data.tar.gz: 117ecc80d07762514d0ae9537fd42b7d6dde1794
+  metadata.gz: fa85c91924d305a304a54ad64c055d237fa1d497
+  data.tar.gz: eeaf629c7d4a3ba4c4f5928722771c2d41bbf3c3
 SHA512:
-  metadata.gz: 709a6d22546cf1e46887748af1b8b3bbf0a8dfde8fdf7600bc446b9b60fb9d1612cd2b01c72f5326fda3917c1fb4c8852cfda2dad736a5883b30b83e7d60b8fe
-  data.tar.gz: c527fdee143d2eae065df1523e5127d504d2b744ecb22bbf6087867e9b23bb26448e116ae00ec642cbbdc31b253bbbaed19eba37f2012510a5c2b219aadedde6
+  metadata.gz: 69cf9b11c8e820f30e7fbf6c17d409aee52650cda21e39237dea0d97e1efeaafbf82083f3bdc321e69edb9af307db509d33fb512d782ab028277fff4cae4515d
+  data.tar.gz: 716618189cb9a7accbc45b485a63837600311c99c793ba435ef2bf0a720ec8f0abe5d5267173ee1d7e71c827206245636a97df205fdafa93cf348c2405d97998

data/lib/committee/middleware/base.rb

@@ -5,14 +5,19 @@ module Committee::Middleware
 
       @error_class = options.fetch(:error_class, Committee::ValidationError)
       @params_key = options[:params_key] || "committee.params"
-      data = options[:schema] || raise("need option `schema`")
-      if data.is_a?(String)
+      @raise = options[:raise]
+
+      schema = options[:schema] || raise("need option `schema`")
+      if schema.is_a?(String)
         warn_string_deprecated
-        data = JSON.parse(data)
+        schema = JSON.parse(schema)
       end
-      @raise = options[:raise]
-      @schema = JsonSchema.parse!(data)
-      @schema.expand_references!
+      if schema.is_a?(Hash)
+        schema = JsonSchema.parse!(schema)
+        schema.expand_references!
+      end
+      @schema = schema
+
       @router = Committee::Router.new(@schema, options)
     end
 

data/test/middleware/base_test.rb

@@ -0,0 +1,41 @@
+require_relative "../test_helper"
+
+describe Committee::Middleware::Base do
+  include Rack::Test::Methods
+
+  def app
+    @app
+  end
+
+  it "accepts schema hash" do
+    @app = new_rack_app(schema: JSON.parse(File.read("./test/data/schema.json")))
+    params = {
+      "name" => "cloudnasium"
+    }
+    header "Content-Type", "application/json"
+    post "/apps", JSON.generate(params)
+    assert_equal 200, last_response.status
+  end
+
+  it "accepts schema object" do
+    schema = JsonSchema.parse!(JSON.parse(File.read("./test/data/schema.json")))
+    @app = new_rack_app(schema: schema)
+    params = {
+      "name" => "cloudnasium"
+    }
+    header "Content-Type", "application/json"
+    post "/apps", JSON.generate(params)
+    assert_equal 200, last_response.status
+  end
+
+  private
+
+  def new_rack_app(options = {})
+    Rack::Builder.new {
+      use Committee::Middleware::RequestValidation, options
+      run lambda { |_|
+        [200, {}, []]
+      }
+    }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - Brandur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -124,6 +124,7 @@ files:
 - lib/committee/router.rb
 - lib/committee/test/methods.rb
 - lib/committee/validation_error.rb
+- test/middleware/base_test.rb
 - test/middleware/request_validation_test.rb
 - test/middleware/response_validation_test.rb
 - test/middleware/stub_test.rb
@@ -155,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A collection of Rack middleware to support JSON Schema.