committee 0.4.6 → 0.4.7

data/lib/committee/response_validator.rb

@@ -52,6 +52,7 @@ module Committee
           definition = @schema.find(value["items"]["$ref"])
           data[key].each do |datum|
             check_type!(definition["type"], datum, path + [key])
+            check_data!(definition, datum, path + [key]) if definition["type"] == ["object"]
             unless definition["type"].include?("null") && datum.nil?
               check_format!(definition["format"], datum, path + [key])
               check_pattern!(definition["pattern"], datum, path + [key])
@@ -89,7 +90,12 @@ module Committee
         data = if info["properties"]
           info
         elsif info["type"] == ["array"]
-          @schema.find(info["items"]["$ref"])
+          array_schema = @schema.find(info["items"]["$ref"])
+          unless array_schema["type"] == ["object"]
+            array_schema
+          else
+            {} # satisfy data['properties'] check below
+          end
         elsif info["$ref"]
           @schema.find(info["$ref"])
         end

data/lib/committee/schema.rb

@@ -5,7 +5,7 @@ module Committee
     def initialize(data)
       @cache = {}
       @schema = MultiJson.decode(data)
-      manifest_regex
+      manifest_regex(@schema)
     end
 
     def [](type)
@@ -42,12 +42,13 @@ module Committee
       end
     end
 
-    def manifest_regex
-      @schema["definitions"].each do |_, type_schema|
-        type_schema["definitions"].each do |_, property_schema|
-          if pattern = property_schema["pattern"]
-            property_schema["pattern"] = Regexp.new(pattern)
-          end
+    def manifest_regex(schema_part)
+      schema_part["definitions"].each do |_, type_schema|
+        if type_schema.has_key?("definitions")
+          manifest_regex(type_schema)
+        end
+        if pattern = type_schema["pattern"]
+          type_schema["pattern"] = Regexp.new(pattern)
         end
       end
     end

data/lib/committee/validation.rb

@@ -54,6 +54,8 @@ module Committee
         ["object"]
       when String
         ["string"]
+      when Array
+        ["array"]
       else
         ["unknown"]
       end

data/test/response_validator_test.rb

@@ -100,6 +100,15 @@ describe Committee::ResponseValidator do
     call
   end
 
+  it "validates an array of objects" do
+    @data = ValidAccount.dup
+    @data["credit_cards"] = @data["credit_cards"].dup
+    @link_schema = @schema["account"]["links"][0]
+    @type_schema = @schema["account"]
+
+    call
+  end
+
   it "detects a simple array with an item of the wrong type" do
     @data = ValidAccount.dup
     @data["flags"] = @data["flags"].dup
@@ -112,6 +121,18 @@ describe Committee::ResponseValidator do
     assert_equal message, e.message
   end
 
+  it "rejects an invalid pattern match" do
+    @data = ValidAccount.dup
+    @data["credit_cards"] = @data["credit_cards"].dup
+    @data["credit_cards"] << {"account_number" => "1234-1234-1234-HUGZ", "name" => "Rodney Mullen", "security_code" => 123}
+    @link_schema = @schema["account"]["links"][0]
+    @type_schema = @schema["account"]
+
+    e = assert_raises(Committee::InvalidPattern) { call }
+    message = %{Invalid pattern at "credit_cards:account_number": expected 1234-1234-1234-HUGZ to match "(?-mix:[0-9]{4}\\-[0-9]{4}\\-[0-9]{4}\\-[0-9]{4}$)".}
+    assert_equal message, e.message
+  end
+
   private
 
   def call

data/test/test_helper.rb

@@ -43,5 +43,6 @@ ValidAccount = {
   "last_login"     => "2012-01-01T12:00:00Z",
   "updated_at"     => "2012-01-01T12:00:00Z",
   "verified"       => true,
-  "flags"          => ["foo", "bar"]
+  "flags"          => ["foo", "bar"],
+  "credit_cards"   => [{"account_number" => "1234-1234-1234-1234", "name" => "Rodney Mullen", "security_code" => 123}]
 }.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: committee
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json