committee 0.4.1 → 0.4.2

data/lib/committee/param_validator.rb

@@ -26,25 +26,23 @@ module Committee
         # don't try to check this unless it was actually specificed
         next unless @params.key?(key)
 
-        match = false
-        definitions = find_definitions(value["$ref"])
-
-        # try to match data against any possible definition
-        definitions.each do |definition|
-          if check_type(definition["type"], @params[key], key) &&
-            check_format(definition["format"], @params[key], key) &&
-            check_pattern(definition["pattern"], @params[key], key)
-            match = true
-            next
+        if value["type"] != ["array"]
+          definitions = find_definitions(value["$ref"])
+          try_match(key, @params[key], definitions)
+        else
+          # only assume one possible array definition for now
+          array_definition = find_definitions(value["items"]["$ref"])[0]
+          @params[key].each do |item|
+            array_definition["properties"].each do |array_key, array_value|
+              return unless item.key?(array_key)
+
+              # @todo: this should really be recursive; only one array level is
+              # supported for now
+              definitions = find_definitions(array_value["$ref"])
+              try_match(array_key, item[array_key], definitions)
+            end
           end
         end
-
-        # if nothing was matched, throw error according to first definition
-        if !match && definition = definitions.first
-          check_type!(definition["type"], @params[key], key)
-          check_format!(definition["format"], @params[key], key)
-          check_pattern!(definition["pattern"], @params[key], key)
-        end
       end
     end
 
@@ -89,6 +87,8 @@ module Committee
         ["integer", "number"]
       when Float
         ["number"]
+      when Hash
+        ["object"]
       when String
         ["string"]
       else
@@ -130,5 +130,26 @@ module Committee
     def required_keys
       (@link_schema["schema"] && @link_schema["schema"]["required"]) || []
     end
+
+    def try_match(key, value, definitions)
+      match = false
+
+      # try to match data against any possible definition
+      definitions.each do |definition|
+        if check_type(definition["type"], value, key) &&
+          check_format(definition["format"], value, key) &&
+          check_pattern(definition["pattern"], value, key)
+          match = true
+          next
+        end
+      end
+
+      # if nothing was matched, throw error according to first definition
+      if !match && definition = definitions.first
+        check_type!(definition["type"], value, key)
+        check_format!(definition["format"], value, key)
+        check_pattern!(definition["pattern"], value, key)
+      end
+    end
   end
 end

data/lib/committee/response_validator.rb

@@ -91,6 +91,8 @@ module Committee
         ["integer", "number"]
       when Float
         ["number"]
+      when Hash
+        ["object"]
       when String
         ["string"]
       else

data/test/param_validator_test.rb

@@ -71,4 +71,29 @@ describe Committee::ParamValidator do
     message = %{Invalid pattern for key "name": expected %@! to match "(?-mix:^[a-z][a-z0-9-]{3,30}$)".}
     assert_equal message, e.message
   end
+
+  it "passes an array parameter" do
+    params = {
+      "updates" => [
+        { "name" => "bamboo", "state" => "private" },
+        { "name" => "cedar", "state" => "public" },
+      ]
+    }
+    link_schema = @schema["stack"]["links"][2]
+    Committee::ParamValidator.new(params, @schema, link_schema).call
+  end
+
+  it "detects an array item with a parameter of the wrong type" do
+    params = {
+      "updates" => [
+        { "name" => "bamboo", "state" => 123 },
+      ]
+    }
+    link_schema = @schema["stack"]["links"][2]
+    e = assert_raises(Committee::InvalidParams) do
+      Committee::ParamValidator.new(params, @schema, link_schema).call
+    end
+    message = %{Invalid type for key "state": expected 123 to be ["string"].}
+    assert_equal message, e.message
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json