playerconnect-wsdsl 0.2.5 → 0.2.6

data/.rvmrc_example

@@ -1,5 +1,5 @@
 gemset_name=wsdsl
-ruby_version=1.9.2-p180
+ruby_version=1.9.2-p290
 rubygems_version=1.8.5
 # specify multiple gems with spaces ex: ('foo 1.2.3' 'bar 5.6.7')
 gems=('jeweler 1.6.4' 'rspec 2.6.0' 'yard 0.7.2' 'rack-test 0.5.7' 'sinatra 1.2.0')

data/Rakefile

@@ -11,7 +11,7 @@ Jeweler::Tasks.new do |gem|
   gem.description = %Q{A Ruby DSL describing Web Services without implementation details.}
   gem.email = "sdod"
   gem.authors = ["Team SDOD"]
-  gem.version = "0.2.5"
+  gem.version = "0.2.6"
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/lib/params_verification.rb

@@ -75,7 +75,10 @@ module ParamsVerification
     
     # verify nested params, only 1 level deep tho
     params.each_pair do |key, value|
-      if value.is_a?(Hash)
+      # We are now assuming a file param is a hash due to Rack::Mulitpart.parse_multipart 
+      # turns this data into a hash, but param verification/DSL dont expect this or define this behavior and it shouldn't.
+      # so special case it if its a file type and the value is a hash.
+      if value.is_a?(Hash) && type_for_param(service_params, key) != :file
         namespaced = service_params.namespaced_params.find{|np| np.space_name.to_s == key.to_s}
         raise UnexpectedParam, "Request included unexpected parameter: #{key}" if namespaced.nil?
         unexpected_params?(params[key], namespaced.param_names)
@@ -237,16 +240,38 @@ module ParamsVerification
       end
     # An array type is a comma delimited string, we need to cast the passed strings.
     when :array
-      # input "[1, 2, 3, 4, 5]" (String)  output [1, 2, 3, 4, 5] (Array)
-      # strip away [] characters and then split on commas with optional surrounding whitespace
-      value.respond_to?(:split) ? value.gsub(/(?:^\[|\]$)/, '').split(/\s*,\s*/) : value
+      if value.respond_to?(:split)
+        # For compatibility with testing frameworks that pass in arrays using
+        # Ruby notation, strip away unwanted square brackets ([]), double quotes ("),
+        # and whitespace from the notation.
+        #
+        # only after the non-escaped (backslash preceded) double quote (") characters
+        # have been removed, remove any backslash characters from the string that
+        # appear immediately before a double quote (") character (thereby un-escaping
+        # the double quote character).
+        #
+        # Pattern  = Description
+        # (?:)     = non-capturing regex group (used for ORing)
+        # ^\[      = opening square bracket ([) at the start of the string
+        # \]$      = closing square bracket (]) at the end of the string
+        # (?<!\\") = a non-escaped double-quote (escaped ones need to be preserved)
+        #
+        # \\"      = a single backslash followed by a double quotes character
+        if value.size > 1 && value[0] == '[' && value[-1] == ']'
+          value.gsub!(/(?:^\[|\]$|(?<!\\)")/, '').gsub!('\\"','"')
+        end
+        # the resulting string can now be split using an optionally whitespace padded
+        # comma (,) delimiter.
+        value = value.split(/\s*,\s*/)
+      end
+      value
     when :binary, :array, :file
       value
     else
       value
     end
   end
-  
+
   # Checks that the value's type matches the expected type for a given param
   #
   # @param [Symbol, String] Param name used if the verification fails and that an error is raised.
@@ -266,4 +291,12 @@ module ParamsVerification
     end
   end
   
+  def self.type_for_param(service_params, name)
+    (service_params.list_required + service_params.list_optional).each do |rule|
+      if rule.name.to_s == name.to_s
+        return rule.options[:type]
+      end
+    end
+  end
+  
 end

data/playerconnect-wsdsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{playerconnect-wsdsl}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Team SDOD}]
-  s.date = %q{2011-07-15}
+  s.date = %q{2011-07-19}
   s.description = %q{A Ruby DSL describing Web Services without implementation details.}
   s.email = %q{sdod}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: playerconnect-wsdsl
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-15 00:00:00.000000000Z
+date: 2011-07-19 00:00:00.000000000Z
 dependencies: []
 description: A Ruby DSL describing Web Services without implementation details.
 email: sdod