weasel_diesel 1.1.3 → 1.1.4

data/.travis.yml

@@ -10,3 +10,7 @@ rvm:
   - ruby-head
   - jruby-head
   - ree
+
+matrix:
+  allow_failures:
+    - ruby-head

data/Rakefile

@@ -1,5 +1,7 @@
+require 'rubygems'
 require "bundler/gem_tasks"
-
+require 'bundler'
+Bundler.setup
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/lib/params_verification.rb

@@ -106,14 +106,14 @@ module ParamsVerification
 
     # Checks presence
     if !(namespaced_params || params).keys.include?(param_name)
-      raise MissingParam, "'#{rule.name}' is missing - passed params: #{params.inspect}."
+      raise MissingParam, "'#{rule.name}' is missing - passed params: #{html_escape(params.inspect)}."
     end
 
     updated_param_value, updated_params = validate_and_cast_type(param_value, param_name, rule.options[:type], params, namespace)
 
     # check for nulls in params that don't allow them
     if !valid_null_param?(param_name, updated_param_value, rule)
-      raise InvalidParamValue, "Value for parameter '#{param_name}' cannot be null - passed params: #{updated_params.inspect}."
+      raise InvalidParamValue, "Value for parameter '#{param_name}' cannot be null - passed params: #{html_escape(updated_params.inspect)}."
     elsif updated_param_value
       value_errors = validate_ruled_param_value(param_name, updated_param_value, rule)
       raise InvalidParamValue, value_errors.join(', ') if value_errors
@@ -138,7 +138,7 @@ module ParamsVerification
     param_value, namespaced_params = extract_param_values(params, param_name, namespace)
 
     if param_value && !valid_null_param?(param_name, param_value, rule)
-      raise InvalidParamValue, "Value for parameter '#{param_name}' cannot be null if passed - passed params: #{params.inspect}."
+      raise InvalidParamValue, "Value for parameter '#{param_name}' cannot be null if passed - passed params: #{html_escape(params.inspect)}."
     end
 
     # Use a default value if one is available and the submitted param value is nil
@@ -199,7 +199,7 @@ module ParamsVerification
       choices = rule.options[:options] || rule.options[:in]
       unless param_value.is_a?(Array) ? (param_value & choices == param_value) : choices.include?(param_value)
         errors ||= []
-        errors << "Value for parameter '#{param_name}' (#{param_value}) is not in the allowed set of values."
+        errors << "Value for parameter '#{param_name}' (#{html_escape(param_value)}) is not in the allowed set of values."
       end
     end
 
@@ -208,7 +208,7 @@ module ParamsVerification
       min = rule.options[:min_value]
       if param_value.to_i < min
         errors ||= []
-        errors << "Value for parameter '#{param_name}' ('#{param_value}') is lower than the min accepted value (#{min})."
+        errors << "Value for parameter '#{param_name}' ('#{html_escape(param_value)}') is lower than the min accepted value (#{min})."
       end
     end
 
@@ -217,7 +217,7 @@ module ParamsVerification
       max = rule.options[:max_value]
       if param_value.to_i > max
         errors ||= []
-        errors << "Value for parameter '#{param_name}' ('#{param_value}') is higher than the max accepted value (#{max})."
+        errors << "Value for parameter '#{param_name}' ('#{html_escape(param_value)}') is higher than the max accepted value (#{max})."
       end
     end
 
@@ -226,7 +226,7 @@ module ParamsVerification
       min = rule.options[:min_length]
       if param_value.to_s.length < min
         errors ||= []
-        errors << "Length of parameter '#{param_name}' ('#{param_value}') is shorter than the min accepted value (#{min})."
+        errors << "Length of parameter '#{param_name}' ('#{html_escape(param_value)}') is shorter than the min accepted value (#{min})."
       end
     end
 
@@ -235,7 +235,7 @@ module ParamsVerification
       max = rule.options[:max_length]
       if param_value.to_s.length > max
         errors ||= []
-        errors << "Length of parameter '#{param_name}' ('#{param_value}') is longer than the max accepted value (#{max})."
+        errors << "Length of parameter '#{param_name}' ('#{html_escape(param_value)}') is longer than the max accepted value (#{max})."
       end
     end
 
@@ -324,7 +324,7 @@ module ParamsVerification
     return if value == nil
     validation = ParamsVerification.type_validations[expected_type.to_sym]
     unless validation.nil? || value.to_s =~ validation
-      raise InvalidParamType, "Value for parameter '#{name}' (#{value}) is of the wrong type (expected #{expected_type})"
+      raise InvalidParamType, "Value for parameter '#{name}' (#{html_escape(value)}) is of the wrong type (expected #{expected_type})"
     end
   end
 
@@ -347,5 +347,8 @@ module ParamsVerification
     true
   end
 
-  
+  def self.html_escape(msg)
+    ERB::Util.html_escape(msg)
+  end
+
 end

data/lib/weasel_diesel/version.rb

@@ -1,3 +1,3 @@
 class WeaselDiesel
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: weasel_diesel
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70239219616680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239219616680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70239219616240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239219616240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70239219615600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239219615600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70239219615120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239219615120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70239219614700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70239219614700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby DSL describing Web Services without implementation details.
 email:
 - mattaimonetti@gmail.com
@@ -117,15 +142,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1819885945889786585
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1819885945889786585
 requirements: []
 rubyforge_project: wsdsl
-rubygems_version: 1.8.16
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Web Service DSL