committee 1.0.2 → 1.0.3

data/lib/committee/middleware/base.rb

@@ -10,6 +10,7 @@ module Committee::Middleware
         data = MultiJson.decode(data)
       end
       @schema = JsonSchema.parse!(data)
+      @schema.expand_references!
       @router = Committee::Router.new(@schema)
     end
 

data/lib/committee/request_validator.rb

@@ -7,22 +7,10 @@ module Committee
       if link.schema
         valid, errors = link.schema.validate(params)
         if !valid
-          errors = error_messages(errors).join("\n")
+          errors = JsonSchema::SchemaError.aggregate(errors).join("\n")
           raise InvalidRequest, "Invalid request.\n\n#{errors}"
         end
       end
     end
-
-    private
-
-    def error_messages(errors)
-      errors.map do |error|
-        if error.schema
-          %{At "#{error.schema.uri}": #{error.message}}
-        else
-          error.message
-        end
-      end
-    end
   end
 end

data/lib/committee/response_generator.rb

@@ -1,7 +1,7 @@
 module Committee
   class ResponseGenerator
     def call(link)
-      data = generate_properties(link.parent)
+      data = generate_properties(link.target_schema || link.parent)
 
       # list is a special case; wrap data in an array
       data = [data] if link.rel == "instances"

data/lib/committee/response_validator.rb

@@ -2,7 +2,11 @@ module Committee
   class ResponseValidator
     def initialize(link)
       @link = link
-      @validator = JsonSchema::Validator.new(link.parent)
+
+      # we should eventually move off of validating against parent schema too
+      # ... this is a Herokuism and not in the specification
+      schema = link.target_schema || link.parent
+      @validator = JsonSchema::Validator.new(schema)
     end
 
     def call(headers, data)

data/lib/committee/test/methods.rb

@@ -6,7 +6,11 @@ module Committee::Test
         data = MultiJson.decode(data)
       end
 
-      @schema ||= JsonSchema.parse!(data)
+      @schema ||= begin
+        schema = JsonSchema.parse!(data)
+        schema.expand_references!
+        schema
+      end
       @router ||= Committee::Router.new(@schema)
 
       link =

data/test/request_validator_test.rb

@@ -4,6 +4,7 @@ describe Committee::RequestValidator do
   before do
     @schema =
       JsonSchema.parse!(MultiJson.decode(File.read("./test/data/schema.json")))
+    @schema.expand_references!
     # POST /apps/:id
     @link = @link = @schema.properties["app"].links[0]
   end
@@ -22,7 +23,7 @@ describe Committee::RequestValidator do
     e = assert_raises(Committee::InvalidRequest) do
       call(params)
     end
-    message = %{Invalid request.\n\nAt "/schema/app": Expected string to match pattern "/^[a-z][a-z0-9-]{3,30}$/", value was: %@!.}
+    message = %{Invalid request.\n\n#/name: failed schema #/definitions/app/links/0/schema/properties/name: Expected string to match pattern "/^[a-z][a-z0-9-]{3,30}$/", value was: %@!.}
     assert_equal message, e.message
   end
 

data/test/response_generator_test.rb

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

data/test/response_validator_test.rb

@@ -8,6 +8,7 @@ describe Committee::ResponseValidator do
     }
     @schema =
       JsonSchema.parse!(MultiJson.decode(File.read("./test/data/schema.json")))
+    @schema.expand_references!
     # GET /apps/:id
     @get_link = @link = @schema.properties["app"].links[2]
     # GET /apps
@@ -43,7 +44,7 @@ describe Committee::ResponseValidator do
   it "raises errors generated by json_schema" do
     @data.merge!("name" => "%@!")
     e = assert_raises(Committee::InvalidResponse) { call }
-    message = %{Invalid response.\n\n#/name: failed schema #/properties/app/properties/name: Expected string to match pattern "/^[a-z][a-z0-9-]{3,30}$/", value was: %@!.}
+    message = %{Invalid response.\n\n#/name: failed schema #/definitions/app/properties/name: Expected string to match pattern "/^[a-z][a-z0-9-]{3,30}$/", value was: %@!.}
     assert_equal message, e.message
   end
 

data/test/router_test.rb

@@ -4,6 +4,7 @@ describe Committee::Router do
   before do
     data = MultiJson.decode(File.read("./test/data/schema.json"))
     schema = JsonSchema.parse!(data)
+    schema.expand_references!
     @router = Committee::Router.new(schema)
   end
 

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require "minitest"
 require "minitest/spec"
 require "minitest/autorun"
+#require "pry-rescue/minitest"
 require "rack/test"
 require "rr"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_schema
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.20
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement