knjappserver 0.0.16 → 0.0.17

data/lib/pages/spec.rhtml

@@ -19,7 +19,7 @@
   end
   
   if _get["choice"] == "get_cookies"
-    print Knj::Php.json_encode(_cookie)
+    print JSON.generate(_cookie)
     exit
   end
   

data/lib/pages/spec_post.rhtml

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

data/lib/pages/spec_thread_joins.rhtml

@@ -0,0 +1,21 @@
+<%
+  print "1"
+  
+  cont = "2"
+  t1 = _kas.thread do
+    sleep 0.5
+    cont << "4"
+  end
+  
+  t2 = _kas.thread do
+    sleep 0.1
+    cont << "3"
+  end
+  
+  t1.join
+  t2.join_error
+  
+  cont << "5"
+  
+  print cont
+%>

data/lib/pages/spec_threadded_content.rhtml

@@ -30,7 +30,9 @@
     print "8"
   end
   
+  #This will first finish after the printing has starter - it should still be printed correct.
   _kas.threadded_content do
+    sleep 1
     print "9"
   end
   

data/lib/pages/tests.rhtml

@@ -0,0 +1,14 @@
+<%
+  print "Test 1: #{_testvar1}<br />\n"
+  print "Test 2: #{_testvar2}<br />\n"
+%>
+
+<table style="width: 1000px;">
+  <%
+    print Knj::Web.inputs([{
+      :title => "FCKEditor test",
+      :type => :fckeditor,
+      :name => :textest
+    }])
+  %>
+</table>

data/lib/scripts/benchmark.rb

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby1.9.1
 
 Dir.chdir(File.dirname(__FILE__))
-require "rubygems"
-require "../knjappserver.rb"
-require "knjrbfw"
-require "erubis"
+
+require "optparse"
 require "sqlite3" if RUBY_ENGINE != "jruby"
-require "knj/autoload"
 
 begin
   args = {
@@ -19,12 +16,16 @@ begin
     opts.on("-f FILENAME", "--file FILENAME", "The filename that should be requested from the server.") do |t|
       args[:filename] = t
     end
+    
+    opts.on("-k PATH", "--knjrbfw PATH", "The path of knjrbfw if it should not be loaded from gems.") do |path|
+      args[:knjrbfw_path] = path
+    end
   end.parse!
 end
 
 db_path = "#{File.dirname(__FILE__)}/benchmark_db.sqlite3"
 
-appsrv = Knjappserver.new(
+appserver_args = {
   :debug => false,
   :port => 15081,
   :doc_root => "#{File.dirname(__FILE__)}/../pages",
@@ -33,11 +34,26 @@ appsrv = Knjappserver.new(
     :path => db_path,
     :return_keys => "symbols"
   }
-)
+}
+
+require "rubygems"
+require "erubis"
+require "#{args[:knjrbfw_path]}/knjrbfw.rb"
+require "../knjappserver.rb"
+
+if args[:knjrbfw_path]
+  appserver_args[:knjrbfw_path] = args[:knjrbfw_path]
+else
+  require "knjrbfw"
+end
+
+require "knj/autoload"
+
+appsrv = Knjappserver.new(appserver_args)
 appsrv.start
 
 count_requests = 0
-1.upto(100) do |count_thread|
+1.upto(50) do |count_thread|
   Knj::Thread.new(count_thread) do |count_thread|
     print "Thread #{count_thread} started.\n"
     
@@ -51,6 +67,7 @@ count_requests = 0
     loop do
       resp = http.get(args[:filename])
       count_requests += 1
+      raise "Invalid code: #{resp.code}\n" if resp.code.to_i != 200
     end
   end
 end

data/lib/scripts/knjappserver_cgi.rb

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby1.9.1
+
+time_begin = Time.now
+
+#This scripts start an appserver, executes a HTTP-request and terminates.
+#Good for programming appserver-supported projects without running an appserver all the time,
+#but really slow because of startup for every request.
+
+begin
+  require "knj/autoload"
+  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../knjappserver.rb"
+  
+  raise "No HTTP_KNJAPPSERVER_CGI_CONFIG-header was given." if !ENV["HTTP_KNJAPPSERVER_CGI_CONFIG"]
+  require ENV["HTTP_KNJAPPSERVER_CGI_CONFIG"]
+  
+  begin
+    conf = Knjappserver::CGI_CONF
+  rescue NameError
+    raise "No 'Knjappserver::CGI_CONF'-constant was spawned by '#{ENV["HTTP_KNJAPPSERVER_CGI_CONFIG"]}'."
+  end
+  
+  
+  headers = {}
+  ENV.each do |key, val|
+    if key[0, 5] == "HTTP_" and key != "HTTP_KNJAPPSERVER_CGI_CONFIG"
+      key = Knj::Php.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
+      headers[key] = val
+    end
+  end
+  
+  knjappserver_conf = Knjappserver::CGI_CONF["knjappserver"].merge(
+    :cmdline => false,
+    :events => false,
+    :cleaner => false,
+    :dbrev => false,
+    :mail_require => false,
+    :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
+  )
+  knjappserver = Knjappserver.new(knjappserver_conf)
+  knjappserver.start
+  port = knjappserver.port
+  
+  
+  #Make request.
+  http = Knj::Http2.new(:host => "localhost", :port => port)
+  
+  count = 0
+  http.get(ENV["PATH_INFO"][1, ENV["PATH_INFO"].length], {
+    :default_headers => headers,
+    :cookies => false,
+    :on_content => proc{|line|
+      print line if count > 0
+      count += 1
+    }
+  })
+rescue Exception => e
+  print "Content-Type: text/html\r\n"
+  print "\n\n"
+  print Knj::Errors.error_str(e, {:html => true})
+end

data/lib/scripts/knjappserver_fcgi.rb

@@ -0,0 +1,135 @@
+#!/usr/bin/env ruby1.9.1
+
+#This scripts start an appserver, executes a HTTP-request for every FCGI-request and terminates when FCGI terminates.
+#Good for programming appserver-supported projects that doesnt need threadding without running an appserver all the time.
+
+#It doesnt support shared threadding or objects because multiple instances in form of processes will be executed.
+
+#Its a bit slower because it needs to flush writes to the database at end of every request and re-read them on spawn, because multiple instances might be present.
+
+require "rubygems"
+require "fcgi"
+
+require "knj/autoload"
+require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../knjappserver.rb"
+
+class Knjappserver
+  def self.fcgi_start(cgi)
+    raise "No HTTP_KNJAPPSERVER_CGI_CONFIG-header was given." if !cgi.env_table["HTTP_KNJAPPSERVER_CGI_CONFIG"]
+    require cgi.env_table["HTTP_KNJAPPSERVER_CGI_CONFIG"]
+    
+    begin
+      conf = Knjappserver::CGI_CONF
+    rescue NameError
+      raise "No 'Knjappserver::CGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_KNJAPPSERVER_CGI_CONFIG"]}'."
+    end
+    
+    knjappserver_conf = Knjappserver::CGI_CONF["knjappserver"]
+    knjappserver_conf.merge!(
+      :cmdline => false,
+      :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
+    )
+    
+    knjappserver = Knjappserver.new(knjappserver_conf)
+    knjappserver.start
+    
+    port = knjappserver.port
+    http = Knj::Http2.new(:host => "localhost", :port => port)
+    
+    return [knjappserver, http]
+  end
+  
+  def self.convert_fcgi_post(params)
+    post_hash = {}
+    
+    params.each do |key, val|
+      post_hash[key] = val.first
+    end
+    
+    return post_hash
+  end
+end
+
+knjappserver = nil
+port = nil
+http = nil
+thread_spawn = nil
+loadfp = "#{File.basename(__FILE__).slice(0..-6)}.rhtml"
+
+FCGI.each_cgi do |cgi|
+  begin
+    $cgi = cgi
+    
+    if !knjappserver
+      knjappserver, http = Knjappserver.fcgi_start(cgi)
+    end
+    
+    thread_spawn.join if thread_spawn
+    
+    #FCGI will keep resetting the stdout. Force it to appserver instead.
+    $stdout = knjappserver.cio
+    
+    headers = {}
+    cgi.env_table.each do |key, val|
+      if key[0, 5] == "HTTP_" and key != "HTTP_KNJAPPSERVER_CGI_CONFIG"
+        key = Knj::Php.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
+        headers[key] = val
+      end
+    end
+    
+    #Make request.
+    if cgi.env_table["PATH_INFO"].length > 0 and cgi.env_table["PATH_INFO"] != "/"
+      url = cgi.env_table["PATH_INFO"][1, cgi.env_table["PATH_INFO"].length]
+    else
+      url = "index.rhtml"
+    end
+    
+    if cgi.env_table["QUERY_STRING"].to_s.length > 0
+      url << "?#{cgi.env_table["QUERY_STRING"]}"
+    end
+    
+    #cgi.print "Content-Type: text/html\r\n"
+    #cgi.print "\r\n"
+    #cgi.print Knj::Php.print_r(cgi.params, true)
+    
+    if cgi.request_method == "POST" and cgi.content_type.to_s.downcase.index("multipart/form-data") != nil
+      count = 0
+      http.post_multipart(url, Knjappserver.convert_fcgi_post(cgi.params), {
+        :default_headers => headers,
+        :cookies => false,
+        :on_content => proc{|line|
+          cgi.print(line) if count > 0
+          count += 1
+        }
+      })
+    elsif cgi.request_method == "POST"
+      count = 0
+      http.post(url, Knjappserver.convert_fcgi_post(cgi.params), {
+        :default_headers => headers,
+        :cookies => false,
+        :on_content => proc{|line|
+          cgi.print(line) if count > 0
+          count += 1
+        }
+      })
+    else
+      count = 0
+      http.get(url, {
+        :default_headers => headers,
+        :cookies => false,
+        :on_content => proc{|line|
+          cgi.print(line) if count > 0
+          count += 1
+        }
+      })
+    end
+    
+    thread_spawn = Thread.new do
+      knjappserver.sessions_reset
+    end
+  rescue Exception => e
+    cgi.print "Content-Type: text/html\r\n"
+    cgi.print "\r\n"
+    cgi.print Knj::Errors.error_str(e, {:html => true})
+  end
+end

data/lib/scripts/leakproxy.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby1.9.1
+
+data = Marshal.load($stdin.gets)
+
+require "#{data[:knjrbfw_path]}knjrbfw"
+require "#{File.dirname(__FILE__)}/../knjappserver.rb"
+require "#{File.dirname(__FILE__)}/../include/class_knjappserver_leakproxy_client.rb"
+
+require "#{$knjpath}/process"
+
+process = Knj::Process.new(
+  :in => $stdin,
+  :out => $stdout,
+  :listen => true,
+  :on_rec => proc{|d|
+    d.answer("unknown command")
+  }
+)
+
+
+
+process.send(
+  "type" => "print",
+  "msg" => "Test?\n"
+)
+
+process.join

data/spec/knjappserver_spec.rb

@@ -6,12 +6,13 @@ describe "Knjappserver" do
     require "knjappserver"
     require "knjrbfw"
     require "tmpdir"
+    require "knj/autoload"
     
     db_path = "#{Dir.tmpdir}/knjappserver_rspec.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
     
     require "knj/knjdb/libknjdb.rb"
-    require "sqlite3" if RUBY_ENGINE != "jruby"
+    #require "sqlite3" if RUBY_ENGINE != "jruby"
     
     begin
       db = Knj::Db.new(
@@ -60,7 +61,7 @@ describe "Knjappserver" do
     raise "Unexpected HTML: '#{data["data"]}'." if data["data"].to_s != "Test"
     
     #Check that URL-decoding are being done.
-    data = $http.get("/spec.rhtml?choice=check_get_parse&value=#{Knj::Php.urlencode("gfx/nopic.png")}")
+    data = $http.get("/spec.rhtml?choice=check_get_parse&value=#{Knj::Web.urlenc("gfx/nopic.png")}")
     raise "Unexpected HTML: '#{data["data"]}'." if data["data"].to_s != "gfx/nopic.png"
   end
   
@@ -94,13 +95,11 @@ describe "Knjappserver" do
   end
   
   it "should be able to set and get multiple cookies at the same time." do
-    require "json"
-    
     data = $http.get("/spec.rhtml?choice=test_cookie")
     raise data["data"] if data["data"].to_s.length > 0
     
     data = $http.get("/spec.rhtml?choice=get_cookies")
-    parsed = Knj::Php.json_decode(data["data"])
+    parsed = JSON.parse(data["data"])
     
     raise "Unexpected value for 'TestCookie': '#{parsed["TestCookie"]}'." if parsed["TestCookie"] != "TestValue"
     raise "Unexpected value for 'TestCookie2': '#{parsed["TestCookie2"]}'." if parsed["TestCookie2"] != "TestValue2"
@@ -150,6 +149,18 @@ describe "Knjappserver" do
     end
   end
   
+  it "should be able to join threads tarted from _kas.thread." do
+    data = $http.get("/spec_thread_joins.rhtml")
+    raise data["data"] if data["data"].to_s != "12345"
+  end
+  
+  it "should be able to properly parse special characters in post-requests." do
+    data = $http.post("/spec_post.rhtml", {
+      "test" => "123+456%789%20"
+    })
+    raise data["data"] if data["data"] != "123+456%789%20"
+  end
+  
   it "should be able to stop." do
     $appserver.stop
   end

data/spec/leakproxy_spec.rb

@@ -0,0 +1,56 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Knjappserver" do
+  it "should be able to start a sample-server" do
+    require "rubygems"
+    require "knjappserver"
+    require "knjrbfw"
+    require "tmpdir"
+    require "knj/autoload"
+    
+    db_path = "#{Dir.tmpdir}/knjappserver_rspec.sqlite3"
+    File.unlink(db_path) if File.exists?(db_path)
+    
+    require "knj/knjdb/libknjdb.rb"
+    #require "sqlite3" if RUBY_ENGINE != "jruby"
+    
+    begin
+      db = Knj::Db.new(
+        :type => "sqlite3",
+        :path => db_path,
+        :return_keys => "symbols"
+      )
+    rescue => e
+      STDOUT.puts e.inspect
+      STDOUT.puts e.backtrace
+      
+      raise e
+    end
+    
+    if RUBY_ENGINE == "jruby"
+      mail_require = false
+    else
+      mail_require = true
+    end
+    
+    $appserver = Knjappserver.new(
+      :debug => false,
+      :autorestart => false,
+      :title => "SpecTest",
+      :port => 1515,
+      :doc_root => "#{File.dirname(__FILE__)}/../lib/pages",
+      :locales_gettext_funcs => true,
+      :locale_default => "da_DK",
+      :db => db,
+      :mail_require => mail_require,
+      :leakproxy => true
+    )
+    
+    $appserver.start
+    $appserver.join
+  end
+  
+  it "should be able to stop." do
+    $appserver.stop
+  end
+end