wsdsl 0.3.2 → 0.3.3

data/README.md

@@ -44,7 +44,7 @@ Or a more complex example:
       end
       
       # service.param :delta, :optional => true, :type => 'float'
-      # if the optional flag isn't passed, the param is considered required. 
+      # All params are optional by default.
       # service.param :epsilon, :type => 'string'
       
       service.params.namespace :user do |user|

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/params_verification.rb

@@ -51,7 +51,7 @@ module ParamsVerification
     end
     
     # dupe the params so we don't modify the passed value
-    updated_params = params.dup      
+    updated_params = params.dup
     # Required param verification
     service_params.list_required.each do |rule|
       updated_params = validate_required_rule(rule, updated_params)
@@ -119,7 +119,8 @@ module ParamsVerification
     # checks type
     elsif rule.options[:type]
       verify_cast(param_name, param_value, rule.options[:type])
-    elsif rule.options[:options] || rule.options[:in]
+    end
+    if rule.options[:options] || rule.options[:in]
       choices = rule.options[:options] || rule.options[:in]
       if rule.options[:type]
         # Force the cast so we can compare properly

data/spec/params_verification_spec.rb

@@ -82,6 +82,15 @@ describe ParamsVerification do
     service.should_not be_nil
     lambda{ ParamsVerification.validate!(params, service.defined_params) }.should raise_exception(ParamsVerification::InvalidParamValue)
   end
+
+  it "should raise an exception when a required param is present but doesn't match the limited set of options" do
+    service = describe_service "search" do |service|
+      service.params { |p| p.string :by, :options => ['name', 'code', 'last_four'], :required => true }
+    end
+    params = {'by' => 'foo'}
+    lambda{ ParamsVerification.validate!(params, service.defined_params) }.should raise_exception(ParamsVerification::InvalidParamValue)
+  end
+
   
   it "should validate that no params are passed when accept_no_params! is set on a service" do
     service = WSList.all.find{|s| s.url == "services/test_no_params.xml"}

data/wsdsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{wsdsl}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Matt Aimonetti}]
-  s.date = %q{2011-09-10}
+  s.date = %q{2011-09-12}
   s.description = %q{A Ruby DSL describing Web Services without implementation details.}
   s.email = %q{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.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-10 00:00:00.000000000Z
+date: 2011-09-12 00:00:00.000000000Z
 dependencies: []
 description: A Ruby DSL describing Web Services without implementation details.
 email: mattaimonetti@gmail.com