hayabusa 0.0.11 → 0.0.12

metadata

@@ -2,7 +2,7 @@
 name: hayabusa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-12 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: knjrbfw
@@ -169,6 +169,7 @@ files:
 - lib/hayabusa.rb
 - lib/hayabusa_cgi_session.rb
 - lib/hayabusa_cgi_tools.rb
+- lib/hayabusa_client_session.rb
 - lib/hayabusa_custom_io.rb
 - lib/hayabusa_database.rb
 - lib/hayabusa_erb_handler.rb
@@ -204,6 +205,8 @@ files:
 - pages/benchmark_print.rhtml
 - pages/benchmark_simple.rhtml
 - pages/benchmark_threadded_content.rhtml
+- pages/config_cgi.rb
+- pages/config_fcgi.rb
 - pages/debug_database_connections.rhtml
 - pages/debug_http_sessions.rhtml
 - pages/debug_memory_usage.rhtml
@@ -211,30 +214,19 @@ files:
 - pages/logs_latest.rhtml
 - pages/logs_show.rhtml
 - pages/spec.rhtml
-- pages/spec_post.rhtml
+- pages/spec_multiple_threads.rhtml
+- pages/spec_sleeper.rhtml
 - pages/spec_test_multiple_clients.rhtml
 - pages/spec_thread_joins.rhtml
 - pages/spec_threadded_content.rhtml
+- pages/spec_vars_get.rhtml
+- pages/spec_vars_header.rhtml
+- pages/spec_vars_post.rhtml
 - pages/tests.rhtml
-- spec/cgi_spec.rb
-- spec/custom_urls_spec.rb
+- pages/threadded_content_test.rhtml
 - spec/fcgi_multiple_processes_spec.rb
-- spec/fcgi_spec.rb
 - spec/hayabusa_spec.rb
 - spec/spec_helper.rb
-- tests/cgi_test/config_cgi.rb
-- tests/cgi_test/threadded_content_test.rhtml
-- tests/cgi_test/vars_get_test.rhtml
-- tests/cgi_test/vars_header_test.rhtml
-- tests/cgi_test/vars_post_test.rhtml
-- tests/fcgi_test/config_fcgi.rb
-- tests/fcgi_test/index.rhtml
-- tests/fcgi_test/multiple_threads.rhtml
-- tests/fcgi_test/sleeper.rhtml
-- tests/fcgi_test/threadded_content_test.rhtml
-- tests/fcgi_test/vars_get_test.rhtml
-- tests/fcgi_test/vars_header_test.rhtml
-- tests/fcgi_test/vars_post_test.rhtml
 homepage: http://github.com/kaspernj/hayabusa
 licenses: 
 - MIT
@@ -248,7 +240,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3761533879787819263
+      hash: -1021482697357542024
       segments: 
       - 0
       version: "0"

data/pages/spec_post.rhtml

@@ -1,3 +0,0 @@
-<%
-  print _post["test"]
-%>

data/spec/cgi_spec.rb

@@ -1,49 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Hayabusa" do
-  it "should be able to start a sample-server" do
-    require "rubygems"
-    require "http2"
-    require "json"
-    
-    Http2.new(:host => "localhost") do |http|
-      res = http.post(:url => "hayabusa_cgi_test/vars_post_test.rhtml", :post => {
-        "test_special_chars" => "1%23+-456",
-        "var" => {
-          0 => 1,
-          1 => 2,
-          3 => {
-            "kasper" => 5,
-            "arr" => ["a", "b", "c"]
-          }
-        }
-      })
-      
-      begin
-        data = JSON.parse(res.body)
-      rescue JSON::GeneratorError
-        raise "Could not parse JSON from result: '#{res.body}'."
-      end
-      
-      begin
-        raise "Expected hash to be a certain way: '#{data}'." if data["var"]["0"] != "1" or data["var"]["1"] != "2" or data["var"]["3"]["kasper"] != "5" or data["var"]["3"]["arr"]["0"] != "a" or data["var"]["3"]["arr"]["1"] != "b"
-      rescue => e
-        raise "Error when parsing result: '#{data}'."
-      end
-      
-      raise "Expected 'test_special_chars' to be '1%23+-456' but it wasnt: '#{data["test_special_chars"]}'." if data["test_special_chars"] != "1%23+-456"
-      
-      res = http.get("hayabusa_cgi_test/threadded_content_test.rhtml")
-      raise "Expected body to be '123456' but it was: '#{res.body}'." if res.body != "123456"
-      
-      res = http.get("hayabusa_cgi_test/vars_get_test.rhtml?var[]=1&var[]=2&var[]=3&var[3][kasper]=5")
-      data = JSON.parse(res.body)
-      raise "Expected hash to be a certain way: '#{data}'." if data["var"]["0"] != "1" or data["var"]["1"] != "2" or data["var"]["3"]["kasper"] != "5"
-      
-      
-      
-      res = http.get("hayabusa_cgi_test/vars_header_test.rhtml")
-      raise "Expected header 'testheader' to be 'TestValue' but it wasnt: '#{res.header("testheader")}'." if res.header("testheader") != "TestValue"
-    end
-  end
-end

data/spec/custom_urls_spec.rb

@@ -1,35 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Hayabusa" do
-  it "should be able to start a sample-server" do
-    require "rubygems"
-    require "hayabusa"
-    require "knjrbfw"
-    require "sqlite3" if RUBY_ENGINE != "jruby"
-    
-    db_path = "#{Knj::Os.tmpdir}/hayabusa_rspec.sqlite3"
-    File.unlink(db_path) if File.exists?(db_path)
-    
-    db = Knj::Db.new(
-      :type => "sqlite3",
-      :path => db_path,
-      :return_keys => "symbols"
-    )
-    
-    $appserver = Hayabusa.new(
-      :debug => false,
-      :title => "SpecTestCustomUrls",
-      :port => 1515,
-      :doc_root => "#{File.dirname(__FILE__)}/../lib/pages",
-      :locales_gettext_funcs => true,
-      :locale_default => "da_DK",
-      :db => db
-    )
-    
-    $appserver.start
-  end
-  
-  it "should be able to stop." do
-    $appserver.stop
-  end
-end

data/spec/fcgi_spec.rb

@@ -1,71 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Hayabusa" do
-  it "should be able to start a sample-server" do
-    require "rubygems"
-    require "http2"
-    require "json"
-    
-    ts = []
-    es = []
-    
-    #Execute multiple threads to test FCGI-proxy and thread-safety.
-    1.upto(5) do
-      ts << Thread.new do
-        begin
-          Http2.new(:host => "localhost") do |http|
-            res = http.post(:url => "hayabusa_fcgi_test/vars_post_test.rhtml", :post => {
-              "test_special_chars" => "1%23+-456",
-              "var" => {
-                0 => 1,
-                1 => 2,
-                3 => {
-                  "kasper" => 5,
-                  "arr" => ["a", "b", "c"]
-                }
-              }
-            })
-            
-            begin
-              data = JSON.parse(res.body)
-            rescue JSON::GeneratorError
-              raise "Could not parse JSON from result: '#{res.body}'."
-            end
-            
-            begin
-              raise "Expected hash to be a certain way: '#{data}'." if data["var"]["0"] != "1" or data["var"]["1"] != "2" or data["var"]["3"]["kasper"] != "5" or data["var"]["3"]["arr"]["0"] != "a" or data["var"]["3"]["arr"]["1"] != "b"
-            rescue => e
-              raise "Error when parsing result: '#{data}'."
-            end
-            
-            raise "Expected 'test_special_chars' to be '1%23+-456' but it wasnt: '#{data["test_special_chars"]}'." if data["test_special_chars"] != "1%23+-456"
-            
-            res = http.get("hayabusa_fcgi_test/threadded_content_test.rhtml")
-            raise "Expected body to be '123456' but it was: '#{res.body}'." if res.body != "123456"
-            
-            res = http.get("hayabusa_fcgi_test/vars_get_test.rhtml?var[]=1&var[]=2&var[]=3&var[3][kasper]=5")
-            data = JSON.parse(res.body)
-            raise "Expected hash to be a certain way: '#{data}'." if data["var"]["0"] != "1" or data["var"]["1"] != "2" or data["var"]["3"]["kasper"] != "5"
-            
-            
-            
-            res = http.get("hayabusa_fcgi_test/vars_header_test.rhtml")
-            raise "Expected header 'testheader' to be 'TestValue' but it wasnt: '#{res.header("testheader")}'." if res.header("testheader") != "TestValue"
-          end
-        rescue => e
-          es << e
-          puts e.inspect
-          puts e.backtrace
-        end
-      end
-    end
-    
-    ts.each do |t|
-      t.join
-    end
-    
-    es.each do |e|
-      raise e
-    end
-  end
-end

data/tests/cgi_test/config_cgi.rb

@@ -1,6 +0,0 @@
-Hayabusa::CGI_CONF = {
-  :hayabusa => {
-    :title => "Cgi_test",
-    :doc_root => File.realpath(File.dirname(__FILE__))
-  }
-}

data/tests/fcgi_test/config_fcgi.rb

@@ -1,6 +0,0 @@
-Hayabusa::FCGI_CONF = {
-  :hayabusa => {
-    :title => "Fcgi_test",
-    :doc_root => File.realpath(File.dirname(__FILE__))
-  }
-}

data/tests/fcgi_test/index.rhtml

@@ -1,3 +0,0 @@
-<%
-  print "Dette er en test #{Time.now}."
-%>

data/tests/fcgi_test/threadded_content_test.rhtml

@@ -1,23 +0,0 @@
-<%
-  print "1"
-  
-  _hb.threadded_content do
-    print "2"
-    sleep 0.5
-  end
-  
-  print "3"
-  
-  _hb.threadded_content do
-    print "4"
-    
-    _hb.threadded_content do
-      print "5"
-      sleep 0.2
-    end
-    
-    sleep 0.3
-  end
-  
-  print "6"
-%>

data/tests/fcgi_test/vars_get_test.rhtml

@@ -1,4 +0,0 @@
-<%
-  require "json"
-  print JSON.generate(_get)
-%>

data/tests/fcgi_test/vars_header_test.rhtml

@@ -1,3 +0,0 @@
-<%
-  _hb.header("TestHeader", "TestValue")
-%>

data/tests/fcgi_test/vars_post_test.rhtml

@@ -1,4 +0,0 @@
-<%
-  require "json"
-  print JSON.generate(_post)
-%>