committee 0.1 → 0.2

data/lib/committee/response_validator.rb

@@ -48,8 +48,10 @@ module Committee
         else
           definition = @schema.find(value["$ref"])
           check_type!(definition["type"], data[key], path + [key])
-          check_format!(definition["format"], data[key], path + [key])
-          check_pattern!(definition["pattern"], data[key], path + [key])
+          unless definition["type"].include?("null") && data[key].nil?
+            check_format!(definition["format"], data[key], path + [key])
+            check_pattern!(definition["pattern"], data[key], path + [key])
+          end
         end
       end
     end
@@ -115,8 +117,13 @@ module Committee
     def build_schema_keys
       keys = []
       @type_schema["properties"].each do |key, info|
-        if info["properties"]
-          keys += info["properties"].keys.map { |k| "#{key}:#{k}" }
+        data = if info["properties"]
+          info
+        elsif info["$ref"]
+          @schema.find(info["$ref"])
+        end
+        if data["properties"]
+          keys += data["properties"].keys.map { |k| "#{key}:#{k}" }
         else
           keys << key
         end

data/lib/committee/router.rb

@@ -27,9 +27,9 @@ module Committee
         type_schema["links"].each do |link|
           routes[link["method"]] ||= []
           # /apps/{id} --> /apps/([^/]+)
-          pattern = link["href"].gsub(/\{(.*?)\}/, "[^/]+")
+          href = link["href"].gsub(/\{(.*?)\}/, "[^/]+")
           routes[link["method"]] <<
-            [Regexp.new(pattern), link, type_schema]
+            [%r{^#{href}$}, link, type_schema]
         end
       end
       routes

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
 - Brandur
+- geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -92,7 +93,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email: brandur@mutelight.org
+email:
+- brandur@mutelight.org
+- geemus+github@gmail.com
 executables:
 - committee-stub
 extensions: []
@@ -142,8 +145,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A collection of middleware to support JSON Schema.
 test_files: []
+has_rdoc: