wsdsl 0.4.0 → 0.4.1

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/json_response_verification.rb

@@ -8,6 +8,7 @@ module JSONResponseVerification
   # @return [Array<TrueClass, FalseClass, Array<String>>] True/false and an array of errors.
   def validate_hash_response(hash)
     errors = []
+    # nodes without the arrays
     response.nodes.each do |node|
       if node.name
         # Verify that the named node exists in the hash
@@ -27,13 +28,13 @@ module JSONResponseVerification
   # Recursively validates a hash representing a json response.
   #
   # @param [Hash>] hash the hash to verify.
-  # @param [WDSL::Response::Element>] node the reference element defined in the response description.
-  # @param [<TrueClass, FalseClass>] nested if the node/hash to verify is nested or not. If nested, the method expects to get the subhash 
+  # @param [WDSL::Response::Element] node the reference element defined in the response description.
+  # @param [TrueClass, FalseClass] nested if the node/hash to verify is nested or not. If nested, the method expects to get the subhash 
   #   & won't verify that the name exists since it was done a level higher.
   # @param [Arrays<String>] errors the list of errors encountered while verifying.
-  #
-  # @return [<TrueClass, FalseClass>]
-  def validate_hash_against_template_node(hash, node, nested=false, errors=[])
+  # @param []
+  # @return [TrueClass, FalseClass]
+  def validate_hash_against_template_node(hash, node, nested=false, errors=[], array_item=false)
     if hash.nil?
       errors << json_response_error(node, hash)
       return errors
@@ -43,20 +44,29 @@ module JSONResponseVerification
       if hash.has_key?(node.name.to_s)
         subhash = hash[node.name.to_s]
       else
-        errors << json_response_error(node, hash) unless hash.has_key?(node.name.to_s)
+        errors << json_response_error(node, hash)
       end
     end
 
-    node.properties.each do |prop|
-      subhash ||= hash
-      errors << json_response_error(prop, subhash) unless subhash.has_key?(prop.name.to_s)
-      errors << json_response_error(prop, subhash, true) unless valid_hash_type?(subhash, prop)
-    end
+    subhash ||= hash
+    if node.is_a?(WSDSL::Response::Vector) && !array_item
+      errors << json_response_error(node, subhash, true) unless subhash.is_a?(Array)
+      subhash.each do |obj|
+        validate_hash_against_template_node(obj, node, true, errors, true)
+      end
+    else
+      node.properties.each do |prop|
+        if !array_item && !subhash.has_key?(prop.name.to_s)
+          errors << json_response_error(prop, subhash)
+        end
+        errors << json_response_error(prop, subhash, true) unless valid_hash_type?(subhash, prop)
+      end
 
-    node.objects.each do |obj|
-      # recursive call
-      validate_hash_against_template_node(subhash[obj.name.to_s], obj, true, errors)
-    end if node.objects
+      node.objects.each do |obj|
+        # recursive call
+        validate_hash_against_template_node(subhash[obj.name.to_s], obj, true, errors)
+      end if node.objects
+    end
 
     errors
   end

data/spec/json_response_verification_spec.rb

@@ -36,6 +36,34 @@ describe "JSON response verification" do
       end
     end
 
+    @third_service = describe_service "with_array" do |service|
+      service.response do |response|
+        response.array :users do |node|
+          node.integer :id
+          node.string  :name
+          node.boolean :admin, :doc => "true if the user is an admin"
+          node.string  :state, :doc => "test"
+          node.datetime :last_login_at
+        end
+      end
+    end
+
+    @forth_service = describe_service "with_nested_array" do |service|
+      service.response do |response|
+        response.array :users do |node|
+          node.integer :id
+          node.string  :name
+          node.boolean :admin, :doc => "true if the user is an admin"
+          node.string  :state, :doc => "test"
+          node.array :pets do |pet|
+            pet.integer :id
+            pet.string :name
+          end
+        end
+      end
+    end
+
+
   end
 
   def valid_response(namespaced=true)
@@ -48,6 +76,37 @@ describe "JSON response verification" do
     namespaced ? {"user" => response} : response
   end
 
+  def valid_array_response
+    {"users" => [
+      {"id" => 1,
+        "admin" => true,
+        "state" => "retired",
+        "last_login_at" => "2011-09-22T22:46:35-07:00"
+      },
+      {"id" => 2,
+        "admin" => false,
+        "state" => "playing",
+        "last_login_at" => "2011-09-22T22:46:35-07:00"
+      }]
+    }
+  end
+
+  def valid_nested_array_response
+    {"users" => [
+      {"id" => 1,
+        "admin" => true,
+        "state" => "retired",
+        "pets" => []
+      },
+      {"id" => 2,
+        "admin" => false,
+        "state" => "playing",
+        "pets" => [{"id" => 23, "name" => "medor"}, {"id" => 34, "name" => "rex"}]
+      }]
+    }
+  end
+
+
   it "should validate the response" do
     valid, errors = @service.validate_hash_response(valid_response)
     valid.should be_true
@@ -77,16 +136,43 @@ describe "JSON response verification" do
      response["user"].delete("creds")
      valid, errors = @service.validate_hash_response(response)
      valid.should be_false
-     errors.should_not be_empty
      errors.first.should match(/creds/)
      errors.first.should match(/missing/)
   end
 
-  it "should validate non namespaced responses" do
-    valid, errors = @second_service.validate_hash_response(valid_response(false))
+  it "should validate nil attributes if marked as nullable" do
+    response = valid_response(false)
+    response["name"] = nil
+    valid, errors = @second_service.validate_hash_response(response)
+    valid.should be_true
+  end
+
+
+  it "should validate array items" do
+    valid, errors = @third_service.validate_hash_response(valid_array_response)
     valid.should be_true
     errors.should be_empty
   end
 
+  it "should validate an empty array" do
+    response = valid_array_response
+    response["users"] = []
+    valid, errors = @third_service.validate_hash_response(response)
+    valid.should be_true
+  end
+
+  it "should catch error in an array item" do
+    response = valid_array_response
+    response["users"][1]["id"] = 'test'
+    valid, errors = @third_service.validate_hash_response(response)
+    valid.should be_false
+    errors.should_not be_empty
+  end
+
+  it "should validate nested arrays" do
+    valid, errors = @forth_service.validate_hash_response(valid_nested_array_response)
+    valid.should be_true
+  end
+
 
 end

data/wsdsl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wsdsl}
-  s.version = "0.4.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Matt Aimonetti}]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors: