playerconnect-wsdsl 0.3.6 → 0.3.7

data/.rvmrc_example

@@ -1,9 +1,4 @@
 gemset_name=wsdsl
 ruby_version=1.9.2-p290
-rubygems_version=1.8.10
-bundler_version=1.0.21
 
 rvm use $ruby_version@$gemset_name --create --install
-[ $(gem -v) = $rubygems_version ] || rvm rubygems $rubygems_version
-gem list bundler -v${bundler_version} -i >/dev/null
-[ $? -eq 0 ] || gem install bundler -v${bundler_version} --no-ri --no-rdoc

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/params_verification.rb

@@ -135,10 +135,8 @@ module ParamsVerification
       raise MissingParam, "'#{rule.name}' is missing - passed params: #{params.inspect}."
     end
 
-    # checks null
-    if param_value.nil? && !rule.options[:null]
-      raise  InvalidParamValue, "Value for parameter '#{param_name}' is missing - passed params: #{params.inspect}."
-    end
+    # check for nulls in params that don't allow them
+    check_for_null(param_name, param_value, rule, params, namespace)
 
     # run the common set of rules used for any non nil value
     params = self.run_when_not_nil(rule, params, namespace)
@@ -260,6 +258,10 @@ module ParamsVerification
       end
     end
 
+    # If the value is still null after possibly being given a default,
+    # reject it if "null" is explicitly set to false.
+    check_for_null(param_name, param_value, rule, params, namespace)
+
     # run the common set of rules used for any non nil value
     params = self.run_when_not_nil(rule, params, namespace) if param_value
 
@@ -344,4 +346,22 @@ module ParamsVerification
     end
   end
 
+  # if ":null => false" is explicitly set, null values will be rejected (even
+  # for optional params)
+  def self.check_for_null(param_name, param_value, rule, params, namespace)
+    # don't check for null against params that weren't even submitted
+    # return unless params && params.size > 0
+    if namespace
+      return unless params.has_key?(namespace)
+      params = params[namespace]
+    end
+    return unless params && params.has_key?(param_name)
+
+    # if 'null' is found in the ruleset and set to 'false' (default is 'true' to allow null),
+    # then confirm that the submitted value isn't nil or empty
+    if rule.options.has_key?(:null) && rule.options[:null] == false &&
+       (param_value.nil? || param_value == '' || (param_value.respond_to?(:size) && param_value.size == 0))
+      raise InvalidParamValue, "Value for parameter '#{param_name}' cannot be null - passed params: #{params.inspect}."
+    end
+  end
 end

data/playerconnect-wsdsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "playerconnect-wsdsl"
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Team SDOD"]
-  s.date = "2011-11-04"
+  s.date = "2012-07-06"
   s.description = "A Ruby DSL describing Web Services without implementation details."
   s.email = "sdod"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playerconnect-wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2012-07-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165968040 !ruby/object:Gem::Requirement
+  requirement: &2157239240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2165968040
+  version_requirements: *2157239240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165967560 !ruby/object:Gem::Requirement
+  requirement: &2157238640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2165967560
+  version_requirements: *2157238640
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2165967080 !ruby/object:Gem::Requirement
+  requirement: &2157238060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2165967080
+  version_requirements: *2157238060
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2165966600 !ruby/object:Gem::Requirement
+  requirement: &2157237460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 0.5.7
   type: :development
   prerelease: false
-  version_requirements: *2165966600
+  version_requirements: *2157237460
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2165966100 !ruby/object:Gem::Requirement
+  requirement: &2157236860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,7 +65,7 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *2165966100
+  version_requirements: *2157236860
 description: A Ruby DSL describing Web Services without implementation details.
 email: sdod
 executables: []