committee 0.4 → 0.4.1

data/lib/committee/param_validator.rb

@@ -79,20 +79,22 @@ module Committee
       end
     end
 
-    def check_type(types, value, key)
-      type = case value
+    def check_type(allowed_types, value, key)
+      types = case value
       when NilClass
-        "null"
+        ["null"]
       when TrueClass, FalseClass
-        "boolean"
-      when Bignum, Fixnum, Float
-        "number"
+        ["boolean"]
+      when Bignum, Fixnum
+        ["integer", "number"]
+      when Float
+        ["number"]
       when String
-        "string"
+        ["string"]
       else
-        "unknown"
+        ["unknown"]
       end
-      types.include?(type)
+      !(allowed_types & types).empty?
     end
 
     def check_type!(types, value, key)

data/lib/committee/response_validator.rb

@@ -81,26 +81,24 @@ module Committee
       end
     end
 
-    def check_type!(types, value, path)
-      type = case value
+    def check_type!(allowed_types, value, path)
+      types = case value
       when NilClass
-        "null"
+        ["null"]
       when TrueClass, FalseClass
-        "boolean"
-      when Bignum, Fixnum, Float
-        "number"
+        ["boolean"]
+      when Bignum, Fixnum
+        ["integer", "number"]
+      when Float
+        ["number"]
       when String
-        "string"
-      when Hash
-        "object"
-      when Array
-        "array"
+        ["string"]
       else
-        "unknown"
+        ["unknown"]
       end
-      unless types.include?(type)
+      if (allowed_types & types).empty?
         raise InvalidResponse,
-          %{Invalid type at "#{path.join(":")}": expected #{value} to be #{types} (was: #{type}).}
+          %{Invalid type at "#{path.join(":")}": expected #{value} to be #{allowed_types} (was: #{types}).}
       end
     end
 

data/test/response_validator_test.rb

@@ -44,7 +44,7 @@ describe Committee::ResponseValidator do
   it "detects mismatched types" do
     @data.merge!("maintenance" => "not-bool")
     e = assert_raises(Committee::InvalidResponse) { call }
-    message = %{Invalid type at "maintenance": expected not-bool to be ["boolean"] (was: string).}
+    message = %{Invalid type at "maintenance": expected not-bool to be ["boolean"] (was: ["string"]).}
     assert_equal message, e.message
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-15 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -124,7 +124,7 @@ files:
 - test/schema_test.rb
 - test/test_helper.rb
 - bin/committee-stub
-homepage: https://github.com/brandur/rack-committee
+homepage: https://github.com/heroku/rack-committee
 licenses:
 - MIT
 post_install_message: 
@@ -145,9 +145,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A collection of middleware to support JSON Schema.
 test_files: []
-has_rdoc: