egalite 1.5.6 → 1.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db514bb6d9faeb6cfabbca789a9a763836dc3632
-  data.tar.gz: 38c947f91c01a9af375e5483c82ef85692b08c13
+  metadata.gz: ff679c4cc86d040ffff1b99eece4345dbcb7e14b
+  data.tar.gz: eb38d4be75ca4ef7286475c463545730eb7aca23
 SHA512:
-  metadata.gz: 2f17b9cbf57d51b09832e288b388a1344cc0a51ed48fa6c614922da74142df8baf03b9dd431049553021bbb0552b8de30d8375a3143830849cdffd753cb581da
-  data.tar.gz: 8b7099b961b735179af768fe91a6612fa3fdbb0960c3638f1cdd7e19810c66373c0b2e20cdaafd6722cd52e1229a9c18f2f6950e8b7d723bbbf8d81992e040db
+  metadata.gz: 485370a3ba61cdefe26f916dcda1f1d256069bfd0731f63a48ff5292081cfeff4f0bf45195792ae28b869c6a3f71511bbeb2881d0d3b6de85366dc3fbec88220
+  data.tar.gz: e61a71a1f480f802f68353d016f7960de036312e70e68d0cd9feb477c23fa2523738fd9791af82c73a5348d0ef3fcc15fd423d1b0d37276ecb6f4cdfa0424451

data/lib/egalite/sendmail.rb

@@ -254,6 +254,7 @@ module Sendmail
   def send_with_uploaded_files(body, files, params, host = 'localhost')
     # files should be Rack uploaded files.
     sum_size = 0
+    files = [files].flatten
     parts = [mime_part(body)]
     parts += files.map { |f|
       binary = f[:tempfile].read

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.5.6"
+  VERSION = "1.5.7"
 end

data/lib/egalite.rb

@@ -16,15 +16,6 @@ require 'time'
 require 'monitor'
 require 'digest/md5'
 
-module Rack
-  module Utils
-    def normalize_params(params,name,v)
-      params[name] = v
-    end
-    module_function :normalize_params
-  end
-end
-
 class CriticalError < RuntimeError
 end
 
@@ -688,6 +679,20 @@ class Handler
     res
   end
 
+private
+  def stringify_hash(params)
+    sh = StringifyHash.new
+    params.each { |k,v|
+      if v.is_a?(Hash)
+        sh[k] = stringify_hash(v)
+      else
+        sh[k] = v
+      end
+    }
+    sh
+  end
+public
+
   def call(rack_env)
     # set up logging
     
@@ -703,19 +708,7 @@ class Handler
       )
 
       # parameter handling
-      params = StringifyHash.new
-      req.params.each { |k,v|
-#        raise 'egalite: no multiple query parameter allowed in same keyword.' if v.is_a?(Array)
-         next unless k
-         frags = k.split(/[\]\[]{1,2}/)
-         last = frags.pop
-         list = params
-         frags.each { |frag|
-           list[frag] ||= StringifyHash.new
-           list = list[frag]
-         }
-         list[last] = v
-      }
+      params = stringify_hash(req.params)
 
       puts "before-cookie: #{req.cookies.inspect}" if @opts[:cookie_debug]
       

data/test/test_handler.rb

@@ -14,6 +14,7 @@ require 'setup'
 class TestController < Egalite::Controller
   def parameters
     raise "param foo is not bar: #{params[:foo].inspect}" unless params[:foo] == 'bar'
+    raise "param array isnt okay: #{params["array"].inspect}" unless params["array"] == ["1","2"] or params["array"] == ["2","1"]
     raise "param hash isnt okay: #{params[:hash].inspect}" unless params[:hash][:a] == '1' and params[:hash][:b] == '2'
     "okay"
   end
@@ -78,7 +79,7 @@ class T_Handler < Test::Unit::TestCase
     assert_no_match /private!/, last_response.body
   end
   def test_parameters
-    post("/test/parameters", {'foo' => 'bar', 'hash[a]' => '1', 'hash[b]' => '2'})
+    post("/test/parameters", {'foo' => 'bar', 'hash[a]' => '1', 'hash[b]' => '2', 'array[]' => ['1','2']})
     assert last_response.ok?
     assert last_response.body =~ /okay/
     assert last_response.content_type =~ /text\/html/i

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egalite
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler