knjappserver 0.0.15 → 0.0.16

data/lib/pages/benchmark_simple.rhtml

@@ -0,0 +1,3 @@
+<%
+  Knj::Php.print_r([_get, _post, _meta])
+%>

data/lib/pages/benchmark_threadded_content.rhtml

@@ -0,0 +1,21 @@
+<%
+  print "1"
+  
+  _kas.threadded_content do
+    sleep 0.1
+    print "2"
+  end
+  
+  _kas.threadded_content do
+    print "3"
+  end
+  
+  print "4"
+  
+  _kas.threadded_content do
+    sleep 0.1
+    print "5"
+  end
+  
+  print "6"
+%>

data/lib/pages/spec.rhtml

@@ -1,9 +1,35 @@
 <%
+  if _get["choice"] == "test_cookie"
+    _kas.cookie(
+      "name" => "TestCookie",
+      "value" => "TestValue",
+      "expires" => Time.new + 3600 #add an hour
+    )
+    _kas.cookie(
+      "name" => "TestCookie2",
+      "value" => "TestValue2",
+      "expires" => Time.new + 7200 #add an hour
+    )
+    _kas.cookie(
+      "name" => "TestCookie3",
+      "value" => "TestValue 3 ",
+      "expires" => Time.new + 1200
+    )
+    exit
+  end
+  
+  if _get["choice"] == "get_cookies"
+    print Knj::Php.json_encode(_cookie)
+    exit
+  end
+  
   _kas.header("TestHeader", "NormalHeader")
   _kas.header_raw("TestRaw: RawHeader")
   
   if _meta["REQUEST_METHOD"] == "POST"
     print _post["postdata"]
+  elsif _get["choice"] == "check_get_parse"
+    print _get["value"]
   else
     print "Test"
   end

data/lib/pages/spec_test_multiple_clients.rhtml

@@ -0,0 +1,3 @@
+<%
+  
+%>

data/lib/pages/spec_threadded_content.rhtml

@@ -0,0 +1,38 @@
+<%
+  _kas.threadded_content do
+    sleep 0.2
+    print "1"
+  end
+  
+  print "2"
+  
+  _kas.threadded_content do
+    sleep 0.1
+    
+    _kas.threadded_content do
+      sleep 0.1
+      print "3"
+      
+      sleep 0.1
+      
+      _kas.threadded_content do
+        print "4"
+        sleep 0.1
+        print "5"
+      end
+      
+      _kas.threadded_content do
+        print "6"
+        print "7"
+      end
+    end
+    
+    print "8"
+  end
+  
+  _kas.threadded_content do
+    print "9"
+  end
+  
+  print "10"
+%>

data/lib/scripts/benchmark.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby1.9.1
+
+Dir.chdir(File.dirname(__FILE__))
+require "rubygems"
+require "../knjappserver.rb"
+require "knjrbfw"
+require "erubis"
+require "sqlite3" if RUBY_ENGINE != "jruby"
+require "knj/autoload"
+
+begin
+  args = {
+    :filename => "benchmark.rhtml"
+  }
+  
+  OptionParser.new do |opts|
+    opts.banner = "Usage: benchmark.rb [options]"
+    
+    opts.on("-f FILENAME", "--file FILENAME", "The filename that should be requested from the server.") do |t|
+      args[:filename] = t
+    end
+  end.parse!
+end
+
+db_path = "#{File.dirname(__FILE__)}/benchmark_db.sqlite3"
+
+appsrv = Knjappserver.new(
+  :debug => false,
+  :port => 15081,
+  :doc_root => "#{File.dirname(__FILE__)}/../pages",
+  :db_args => {
+    :type => "sqlite3",
+    :path => db_path,
+    :return_keys => "symbols"
+  }
+)
+appsrv.start
+
+count_requests = 0
+1.upto(100) do |count_thread|
+  Knj::Thread.new(count_thread) do |count_thread|
+    print "Thread #{count_thread} started.\n"
+    
+    http = Knj::Http2.new(
+      :host => "localhost",
+      :port => 15081,
+      :user_agent => "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.1; debugid:#{count_thread}) Gecko/20060111 Firefox/3.6.0.1",
+      :debug => false
+    )
+    
+    loop do
+      resp = http.get(args[:filename])
+      count_requests += 1
+    end
+  end
+end
+
+loop do
+  last_count = count_requests
+  sleep 1
+  counts_betw = count_requests - last_count
+  print "#{counts_betw} /sec\n"
+end
+
+appsrv.join

data/spec/knjappserver_spec.rb

@@ -11,70 +11,57 @@ describe "Knjappserver" do
     File.unlink(db_path) if File.exists?(db_path)
     
     require "knj/knjdb/libknjdb.rb"
-    require "sqlite3"
-    db = Knj::Db.new(
-      :type => "sqlite3",
-      :path => db_path,
-      :return_keys => "symbols"
-    )
+    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
     
     erbhandler = Knjappserver::ERBHandler.new
     
+    if RUBY_ENGINE == "jruby"
+      mail_require = false
+    else
+      mail_require = true
+    end
+    
     $appserver = Knjappserver.new(
       :debug => false,
       :autorestart => false,
-      :autoload => false,
-      :verbose => false,
-      :title => "knjTasks",
+      :title => "SpecTest",
       :port => 1515,
-      :host => "0.0.0.0",
-      :default_page => "index.rhtml",
       :doc_root => "#{File.dirname(__FILE__)}/../lib/pages",
-      :hostname => false,
-      :default_filetype => "text/html",
-      :engine_knjengine => true,
       :locales_gettext_funcs => true,
       :locale_default => "da_DK",
-      :max_requests_working => 5,
-      :filetypes => {
-        :jpg => "image/jpeg",
-        :gif => "image/gif",
-        :png => "image/png",
-        :html => "text/html",
-        :htm => "text/html",
-        :rhtml => "text/html",
-        :css => "text/css",
-        :xml => "text/xml",
-        :js => "text/javascript"
-      },
-      :handlers => [
-        {
-          :file_ext => "rhtml",
-          :callback => erbhandler.method(:erb_handler)
-        },{
-          :path => "/fckeditor",
-          :mount => "/usr/share/fckeditor"
-        }
-      ],
-      :db => db
+      :db => db,
+      :mail_require => mail_require
     )
     
     $appserver.vars[:test] = "kasper"
     $appserver.define_magic_var(:_testvar1, "Kasper")
     $appserver.define_magic_var(:_testvar2, "Johansen")
-    $appserver.update_db
     $appserver.start
   end
   
-  it "should be able to mount FCKeditor dir to /usr/share/fckeditor" do
-    
-  end
-  
   it "should be able to handle a GET-request." do
+    #Check that we are able to perform a simple GET request and get the correct data back.
     require "knj/http"
     $http = Knj::Http.new("host" => "localhost", "port" => 1515)
     data = $http.get("/spec.rhtml")
-    raise "Unexpected HTML: '#{data["data"]}'." if data["data"].to_s.strip != "Test"
+    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")}")
+    raise "Unexpected HTML: '#{data["data"]}'." if data["data"].to_s != "gfx/nopic.png"
   end
   
   it "should be able to handle a HEAD-request." do
@@ -100,12 +87,69 @@ describe "Knjappserver" do
     end
   end
   
-  it "it should be able to use the header-methods." do
+  it "should be able to use the header-methods." do
     data = $http.get("/spec.rhtml")
     raise "Normal header data could not be detected." if data["response"].header["testheader"] != "NormalHeader"
     raise "Raw header data could not be detected." if data["response"].header["testraw"]!= "RawHeader"
   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"])
+    
+    raise "Unexpected value for 'TestCookie': '#{parsed["TestCookie"]}'." if parsed["TestCookie"] != "TestValue"
+    raise "Unexpected value for 'TestCookie2': '#{parsed["TestCookie2"]}'." if parsed["TestCookie2"] != "TestValue2"
+    raise "Unexpected value for 'TestCookie3': '#{parsed["TestCookie3"]}'." if parsed["TestCookie3"] != "TestValue 3 "
+  end
+  
+  it "should be able to run the rspec_threadded_content test correctly." do
+    data = $http.get("/spec_threadded_content.rhtml")
+    
+    if data["data"] != "12345678910"
+      raise data["data"].to_s
+    end
+  end
+  
+  it "should be able to add a timeout." do
+    $break_timeout = false
+    timeout = $appserver.timeout(:time => 1) do
+      $break_timeout = true
+    end
+    
+    Timeout.timeout(2) do
+      loop do
+        break if $break_timeout
+        sleep 0.1
+      end
+    end
+  end
+  
+  it "should be able to stop a timeout." do
+    $timeout_runned = false
+    timeout = $appserver.timeout(:time => 1) do
+      $timeout_runned = true
+    end
+    
+    sleep 0.5
+    timeout.stop
+    
+    begin
+      Timeout.timeout(1.5) do
+        loop do
+          raise "The timeout ran even though stop was called?" if $timeout_runned
+          sleep 0.1
+        end
+      end
+    rescue Timeout::Error
+      #the timeout didnt run - and it shouldnt so dont do anything.
+    end
+  end
+  
   it "should be able to stop." do
     $appserver.stop
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,23 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-03 00:00:00.000000000 +02:00
+date: 2011-11-15 00:00:00.000000000 +01:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &23669640 !ruby/object:Gem::Requirement
+  requirement: &19883700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.8
   type: :runtime
   prerelease: false
-  version_requirements: *23669640
+  version_requirements: *19883700
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &23669120 !ruby/object:Gem::Requirement
+  requirement: &19796260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23669120
+  version_requirements: *19796260
 - !ruby/object:Gem::Dependency
   name: knjdbrevision
-  requirement: &23668560 !ruby/object:Gem::Requirement
+  requirement: &19795540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,21 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *23668560
+  version_requirements: *19795540
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: &19794800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *19794800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &23668000 !ruby/object:Gem::Requirement
+  requirement: &19794080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +66,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *23668000
+  version_requirements: *19794080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &23667380 !ruby/object:Gem::Requirement
+  requirement: &19793340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +77,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *23667380
+  version_requirements: *19793340
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &23666700 !ruby/object:Gem::Requirement
+  requirement: &19792580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +88,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *23666700
+  version_requirements: *19792580
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &23666040 !ruby/object:Gem::Requirement
+  requirement: &19791860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +99,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23666040
+  version_requirements: *19791860
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &23663020 !ruby/object:Gem::Requirement
+  requirement: &19791040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *19791040
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &19790320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23663020
+  version_requirements: *19790320
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -131,15 +153,20 @@ files:
 - lib/include/class_httpresp.rb
 - lib/include/class_httpserver.rb
 - lib/include/class_httpsession.rb
+- lib/include/class_httpsession_contentgroup.rb
 - lib/include/class_httpsession_knjengine.rb
 - lib/include/class_httpsession_mongrel.rb
 - lib/include/class_httpsession_webrick.rb
 - lib/include/class_knjappserver.rb
 - lib/include/class_knjappserver_cleaner.rb
+- lib/include/class_knjappserver_cmdline.rb
 - lib/include/class_knjappserver_errors.rb
 - lib/include/class_knjappserver_logging.rb
 - lib/include/class_knjappserver_mailing.rb
+- lib/include/class_knjappserver_sessions.rb
 - lib/include/class_knjappserver_threadding.rb
+- lib/include/class_knjappserver_threadding_timeout.rb
+- lib/include/class_knjappserver_translations.rb
 - lib/include/class_knjappserver_web.rb
 - lib/include/class_log.rb
 - lib/include/class_log_access.rb
@@ -151,9 +178,16 @@ files:
 - lib/include/gettext_funcs.rb
 - lib/include/magic_methods.rb
 - lib/knjappserver.rb
+- lib/pages/benchmark.rhtml
+- lib/pages/benchmark_print.rhtml
+- lib/pages/benchmark_simple.rhtml
+- lib/pages/benchmark_threadded_content.rhtml
 - lib/pages/logs_latest.rhtml
 - lib/pages/logs_show.rhtml
 - lib/pages/spec.rhtml
+- lib/pages/spec_test_multiple_clients.rhtml
+- lib/pages/spec_threadded_content.rhtml
+- lib/scripts/benchmark.rb
 - spec/knjappserver_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -172,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3257264914756915764
+      hash: -4377496633346000305
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: