hayabusa 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/hayabusa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hayabusa}
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-10-05}
+  s.date = %q{2012-10-10}
   s.description = %q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "hayabusa_benchmark.rb", "hayabusa_cgi.rb", "hayabusa_fcgi.fcgi", "hayabusa_fcgi.rb", "hayabusa_fcgi_server.rb", "hayabusa_spec_restart.rb", "knjappserver_start.rb"]
@@ -100,7 +100,8 @@ Gem::Specification.new do |s|
     "pages/threadded_content_test.rhtml",
     "spec/fcgi_multiple_processes_spec.rb",
     "spec/hayabusa_spec.rb",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/test_upload.xlsx"
   ]
   s.homepage = %q{http://github.com/kaspernj/hayabusa}
   s.licenses = ["MIT"]

data/lib/hayabusa_cgi_tools.rb

@@ -1,15 +1,23 @@
+require "tempfile"
+
 class Hayabusa::Cgi_tools
   attr_accessor :cgi
   
   #Converts CGI-like-post hashes to the normal Hayabusa-type hash.
-  def convert_fcgi_post(params)
+  def convert_fcgi_post(params, args = nil)
     post_hash = {}
     
     params.each do |key, realval|
       val = realval.first
+      classn = val.class.name
       
       #Sometimes uploaded files are given as StringIO's.
-      val = val.string if val.is_a?(StringIO)
+      if classn == "StringIO" or classn == "Tempfile"
+        val = Hayabusa::Http_session::Post_multipart::File_upload.new(
+          :fname => val.original_filename,
+          :data => val
+        )
+      end
       
       post_hash[key] = val
     end
@@ -22,6 +30,22 @@ class Hayabusa::Cgi_tools
     return post_ret
   end
   
+  #Converts the post-hash to valid hash for Http2 regarding file uploads (when proxied to host-process via Http2-framework).
+  def convert_fcgi_post_fileuploads_to_http2(hash)
+    hash.each do |key, val|
+      if val.is_a?(Hayabusa::Http_session::Post_multipart::File_upload)
+        hash[key] = {
+          :filename => val.filename,
+          :content => val.to_s
+        }
+      elsif val.is_a?(Hash) or val.is_a?(Array)
+        hash[key] = self.convert_fcgi_post_fileuploads_to_http2(val)
+      end
+    end
+    
+    return hash
+  end
+  
   def env_table
     return ENV
   end
@@ -91,7 +115,7 @@ class Hayabusa::Cgi_tools
         count = 0
         http.post_multipart(
           :url => url,
-          :post => self.convert_fcgi_post(cgi.params),
+          :post => self.convert_fcgi_post_fileuploads_to_http2(self.convert_fcgi_post(cgi.params, :http2_compatible => true)),
           :default_headers => headers,
           :cookies => false,
           :on_content => proc{|line|
@@ -103,7 +127,7 @@ class Hayabusa::Cgi_tools
         count = 0
         http.post(
           :url => url,
-          :post => self.convert_fcgi_post(cgi.params),
+          :post => self.convert_fcgi_post(cgi.params, :http2_compatible => true),
           :default_headers => headers,
           :cookies => false,
           :on_content => proc{|line|

data/lib/hayabusa_ext/logging.rb

@@ -308,8 +308,6 @@ class Hayabusa
       html = $stdout
     end
     
-    html = ""
-    
     html << "<table class=\"list hayabusa_log_table\">"
     html << "<thead>"
     html << "<tr>"

data/lib/hayabusa_ext/mailing.rb

@@ -46,7 +46,7 @@ class Hayabusa
     @mails_mutex.synchronize do
       self.log_puts("Flushing mails.") if @debug
       
-      if @mails_waiting.length <= 0
+      if @mails_waiting.empty?
         self.log_puts("No mails to flush - skipping.") if @debug
         return false
       end

data/lib/hayabusa_fcgi.rb

@@ -57,7 +57,7 @@ class Hayabusa::Fcgi
             Knj.gem_require(:Http2)
             
             begin
-              @fcgi_proxy[:http] = Http2.new(:host => "localhost", :port => @fcgi_proxy[:port].to_i)
+              @fcgi_proxy[:http] = Http2.new(:host => "localhost", :port => @fcgi_proxy[:port].to_i, :raise_errors => false)
             rescue Errno::ECONNREFUSED
               #The host-process has properly closed - evaluate mode again.
               raise Errno::EAGAIN
@@ -84,11 +84,23 @@ class Hayabusa::Fcgi
         cmd << " --title=#{Knj::Strings.unixsafe(hayabusa_conf[:title])}" if hayabusa_conf[:title]
         
         $stderr.puts("Executing command to start FCGI-server: #{cmd}")
-        io_out, io_in, io_err = Open3.popen3(cmd)
+        
+        if RUBY_ENGINE == "jruby"
+          pid, io_out, io_in, io_err = IO.popen4(cmd)
+        else
+          io_out, io_in, io_err, wait_thr = Open3.popen3(cmd)
+          pid = wait_thr.pid
+        end
         
         #Get data that should contain PID and port.
         read = io_in.gets
-        raise "Host-process didnt return required data." if !read
+        
+        if !read and !Knj::Unix_proc.pid_running?(pid)
+          err_str = io_err.read
+          raise "An error occurred while trying to start host-process: #{err_str}" if !err_str.to_s.strip.empty?
+          raise "Host-process died unexpectedly with no read, PID '#{pid}' and using cmd '#{cmd}'." 
+          raise "Host-process didnt return required data."
+        end
         
         #Parse data from the host-process (port and PID).
         begin

data/lib/hayabusa_http_session_post_multipart.rb

@@ -167,13 +167,35 @@ class Hayabusa::Http_session::Post_multipart::File_upload
   
   #Returns the content of the file-upload as a string.
   def to_s
-    return File.read(@args[:data].path)
+    if @args[:data].is_a?(StringIO)
+      return @args[:data].string
+    else
+      return File.read(@args[:data].path)
+    end
+  end
+  
+  #Returns an IO to read from the upload wherever it is a temporary file or a string.
+  def io(&blk)
+    if @args[:data].is_a?(StringIO)
+      return @args[:data]
+    else
+      return File.open(@args[:data].path, "r", &blk)
+    end
   end
   
   #Saves the content of the fileupload to a given path.
   def save_to(filepath)
     File.open(filepath, "w") do |fp|
-      fp.write(self.to_s)
+      if @args[:data].is_a?(StringIO)
+        fp.write(@args[:data].string)
+      else
+        #Stream output to avoid using too much memory.
+        self.io do |fp_read|
+          fp_read.lines do |line|
+            fp.write(line)
+          end
+        end
+      end
     end
   end
   

data/pages/spec_vars_post_fileupload.rhtml

@@ -1,9 +1,19 @@
 <%
   pdata = {}
   _post.each do |key, val|
-    pdata[key] = val.to_s
+    data = {
+      "class" => val.class.name
+    }
+    
+    if val.is_a?(Hayabusa::Http_session::Post_multipart::File_upload)
+      data["val"] = val.to_s
+    else
+      data["val"] = val
+    end
+    
+    pdata[key] = data
   end
   
   require "json"
-  print JSON.generate(pdata)
+  print Marshal.dump(pdata)
 %>

data/spec/hayabusa_spec.rb

@@ -89,28 +89,41 @@ describe "Hayabusa" do
   
   it "should be able to upload files" do
     $testmodes.each do |tdata|
-      fpath = "#{File.realpath(File.dirname(__FILE__))}/../pages/spec_thread_joins.rhtml"
+      fpaths = {
+        "fpath1" => "#{File.realpath(File.dirname(__FILE__))}/../pages/spec_thread_joins.rhtml",
+        "fpath2" => "#{File.realpath(File.dirname(__FILE__))}/test_upload.xlsx"
+      }
       
       res = tdata[:http].post_multipart(:url => "#{tdata[:path_pre]}spec_vars_post_fileupload.rhtml", :post => {
-        "testfile" => {
+        "testfile1" => {
           :filename => "spec_thread_joins.rhtml",
-          :fpath => fpath
+          :fpath => fpaths["fpath1"]
+        },
+        "testfile2" => {
+          :filename => "test_upload.xlsx",
+          :fpath => fpaths["fpath2"]
         }
       })
       
-      data = JSON.parse(res.body)
-      
-      if data["testfile"] != File.read(fpath)
-        File.open("/tmp/hayabusa_spec_testfile1", "w") do |fp|
-          fp.puts("Class: #{data["testfile"].class.name}")
-          fp.write(data["testfile"])
-        end
+      1.upto(2) do |count|
+        data = Marshal.load(res.body)
         
-        File.open("/tmp/hayabusa_spec_testfile2", "w") do |fp|
-          fp.write(File.read(fpath))
+        if count != 2
+          if data["testfile#{count}"]["val"] != File.read(fpaths["fpath#{count}"])
+            File.open("/tmp/hayabusa_spec_testfile#{count}_1", "w") do |fp|
+              fp.puts("Class: #{data["testfile#{count}"].class.name}")
+              fp.write(data["testfile#{count}"])
+            end
+            
+            File.open("/tmp/hayabusa_spec_testfile#{count}_2", "w") do |fp|
+              fp.write(File.read(fpaths["fpath#{count}"]))
+            end
+            
+            raise "Expected uploaded data for mode '#{tdata[:name]}' to be the same but it wasnt:\n\"#{data["testfile#{count}"]}\"\n\n\"#{File.read(fpaths["fpath#{count}"])}\""
+          end
         end
         
-        raise "Expected uploaded data for mode '#{tdata[:name]}' to be the same but it wasnt:\n\"#{data["testfile"]}\"\n\n\"#{File.read(fpath)}\""
+        raise "Expected 'testfile' class to be 'Hayabusa::Http_session::Post_multipart::File_upload' in mode '#{tdata[:name]}' but it wasnt: '#{data["testfile#{count}"]["class"]}'." if data["testfile#{count}"]["class"] != "Hayabusa::Http_session::Post_multipart::File_upload"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hayabusa
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 +02:00
+date: 2012-10-10 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &20656500 !ruby/object:Gem::Requirement
+  requirement: &11988240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20656500
+  version_requirements: *11988240
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &20655480 !ruby/object:Gem::Requirement
+  requirement: &11987480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20655480
+  version_requirements: *11987480
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &20653320 !ruby/object:Gem::Requirement
+  requirement: &11986740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20653320
+  version_requirements: *11986740
 - !ruby/object:Gem::Dependency
   name: datet
-  requirement: &20634900 !ruby/object:Gem::Requirement
+  requirement: &11985940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20634900
+  version_requirements: *11985940
 - !ruby/object:Gem::Dependency
   name: http2
-  requirement: &20634080 !ruby/object:Gem::Requirement
+  requirement: &11985200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20634080
+  version_requirements: *11985200
 - !ruby/object:Gem::Dependency
   name: tpool
-  requirement: &20633360 !ruby/object:Gem::Requirement
+  requirement: &11984320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20633360
+  version_requirements: *11984320
 - !ruby/object:Gem::Dependency
   name: fcgi
-  requirement: &20632600 !ruby/object:Gem::Requirement
+  requirement: &11983260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20632600
+  version_requirements: *11983260
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &20631660 !ruby/object:Gem::Requirement
+  requirement: &11981880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20631660
+  version_requirements: *11981880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &20630700 !ruby/object:Gem::Requirement
+  requirement: &11980560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *20630700
+  version_requirements: *11980560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &20629600 !ruby/object:Gem::Requirement
+  requirement: &11978460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *20629600
+  version_requirements: *11978460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &20628260 !ruby/object:Gem::Requirement
+  requirement: &11977700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *20628260
+  version_requirements: *11977700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &20627220 !ruby/object:Gem::Requirement
+  requirement: &11977060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *20627220
+  version_requirements: *11977060
 description: A threadded web/app-server that focuses on threadding, shared ressources,
   speed and more.
 email: k@spernj.org
@@ -244,6 +244,7 @@ files:
 - spec/fcgi_multiple_processes_spec.rb
 - spec/hayabusa_spec.rb
 - spec/spec_helper.rb
+- spec/test_upload.xlsx
 has_rdoc: true
 homepage: http://github.com/kaspernj/hayabusa
 licenses:
@@ -260,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1944218330295904971
+      hash: -1407369577175640998
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: