wsdsl 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/json_response_verification.rb

@@ -56,7 +56,7 @@ module JSONResponseVerification
       end
     else
       node.properties.each do |prop|
-        if !array_item && !subhash.has_key?(prop.name.to_s)
+        if !array_item && !subhash.has_key?(prop.name.to_s) && (prop.opts && prop.respond_to?(:opts) && !prop.opts[:null])
           errors << json_response_error(prop, subhash)
         end
         errors << json_response_error(prop, subhash, true) unless valid_hash_type?(subhash, prop)

data/lib/response.rb

@@ -360,7 +360,7 @@ class WSDSL
         end
         output << "<ul>"
         properties.each do |prop|
-          output << "<li><span class='label notice'>#{prop.name}</span> of type <span class='label success'>#{prop.type}</span> "
+          output << "<li><span class='label notice'>#{prop.name}</span> of type <span class='label success'>#{prop.type}</span> #{'(Can be blank or missing) ' if prop.opts && prop.opts.respond_to?(:[]) && prop.opts[:null]} "
           output <<  prop.doc unless prop.doc.blank?
           output << "</li>"
         end

data/spec/json_response_verification_spec.rb

@@ -63,9 +63,19 @@ describe "JSON response verification" do
       end
     end
 
+    @optional_prop_service = describe_service "opt_prop_service" do |service|
+      service.response do |response|
+        response.object do |obj|
+          obj.string  :email,     :null => true
+          obj.integer :city_id,   :null => true
+          obj.string  :full_name, :null => true
+        end
+      end
+    end
 
   end
 
+
   def valid_response(namespaced=true)
     response = { 
       "id" => 1, 
@@ -148,23 +158,22 @@ describe "JSON response verification" do
 
   it "should detect that a string attribute value is nil [bug]" do
     response = valid_response
-     response["user"]["name"] = nil
-     # puts response.inspect
-     valid, errors = @service.validate_hash_response(response)
-     valid.should be_false
-     errors.should_not be_empty
-     errors.first.should match(/name/)
-     errors.first.should match(/wrong type/)
+    response["user"]["name"] = nil
+    valid, errors = @service.validate_hash_response(response)
+    valid.should be_false
+    errors.should_not be_empty
+    errors.first.should match(/name/)
+    errors.first.should match(/wrong type/)
   end
 
 
   it "should detect that a nested object is missing" do
-     response = valid_response
-     response["user"].delete("creds")
-     valid, errors = @service.validate_hash_response(response)
-     valid.should be_false
-     errors.first.should match(/creds/)
-     errors.first.should match(/missing/)
+    response = valid_response
+    response["user"].delete("creds")
+    valid, errors = @service.validate_hash_response(response)
+    valid.should be_false
+    errors.first.should match(/creds/)
+    errors.first.should match(/missing/)
   end
 
   it "should validate non namespaced responses" do
@@ -207,4 +216,10 @@ describe "JSON response verification" do
   end
 
 
+  it "should respect optional properties" do
+    valid, errors = @optional_prop_service.validate_hash_response({})
+    valid.should be_true
+  end
+
+
 end

data/wsdsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wsdsl"
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Aimonetti"]
-  s.date = "2012-01-12"
+  s.date = "2012-02-25"
   s.description = "A Ruby DSL describing Web Services without implementation details."
   s.email = "mattaimonetti@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000 Z
+date: 2012-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70320885201320 !ruby/object:Gem::Requirement
+  requirement: &70096349076000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320885201320
+  version_requirements: *70096349076000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70320885200840 !ruby/object:Gem::Requirement
+  requirement: &70096349075520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320885200840
+  version_requirements: *70096349075520
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70320885200360 !ruby/object:Gem::Requirement
+  requirement: &70096349075040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320885200360
+  version_requirements: *70096349075040
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70320885199880 !ruby/object:Gem::Requirement
+  requirement: &70096349074560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70320885199880
+  version_requirements: *70096349074560
 description: A Ruby DSL describing Web Services without implementation details.
 email: mattaimonetti@gmail.com
 executables: []