knjappserver 0.0.15 → 0.0.16

data/Gemfile

@@ -3,9 +3,10 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "knjrbfw", ">= 0.0.7"
+gem "knjrbfw", ">= 0.0.8"
 gem "erubis"
 gem "knjdbrevision", ">= 0.0.2"
+gem "mail"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -14,5 +15,6 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.3"
   gem "rcov", ">= 0"
-  gem "sqlite3"
+  gem "sqlite3" if RUBY_ENGINE != "jruby"
+  gem "json"
 end

data/Gemfile.lock

@@ -1,19 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
-    jeweler (1.6.3)
+    i18n (0.6.0)
+    jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    knjdbrevision (0.0.2)
-      knjrbfw
-    knjrbfw (0.0.7)
-    rake (0.9.2)
-    rcov (0.9.9)
-    rcov (0.9.9-java)
+    json (1.6.1)
+    json (1.6.1-java)
+    knjdbrevision (0.0.3)
+      knjrbfw (>= 0.0.3)
+    knjrbfw (0.0.8)
+    mail (2.3.0)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.17.2)
+    polyglot (0.3.2)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    rcov (0.9.11-java)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -22,7 +31,10 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
 
 PLATFORMS
   java
@@ -32,8 +44,10 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   erubis
   jeweler (~> 1.6.3)
+  json
   knjdbrevision (>= 0.0.2)
-  knjrbfw (>= 0.0.7)
+  knjrbfw (>= 0.0.8)
+  mail
   rcov
   rspec (~> 2.3.0)
   sqlite3

data/README.rdoc

@@ -1,6 +1,9 @@
 = knjappserver
 
-Description goes here.
+This is a multithreadded webserver that runs under Ruby 1.9.2 or JRuby. It runs under one single process and is able to handle multiple simultanious HTTP requests with thread-safety.
+
+It uses ERubis to parse .rhtml files and caches the bytecode for Ruby-files.
+
 
 == Contributing to knjappserver
  
@@ -17,3 +20,297 @@ Description goes here.
 Copyright (c) 2011 Kasper Johansen. See LICENSE.txt for
 further details.
 
+== Installing
+
+  gem install knjappserver
+
+
+== Usage
+
+=== Basic example
+
+Create a file called "start.rb":
+
+  require "rubygems"
+  require "knjappserver"
+  
+  require "knjrbfw"
+  require "knj/knjdb/libknjdb.rb"
+  require "sqlite3"
+  
+  appsrv = Knjappserver.new(
+    :port => 10080,
+    :doc_root => "#{File.dirname(__FILE__)}/doc_root",
+    :db => Knj::Db.new(
+      :type => "sqlite3",
+      :path => "#{File.dirname(__FILE__)}/test.sqlite3"
+    )
+  )
+  appsrv.update_db #creates missing tables, columns, indexes or other stuff it needs.
+  appsrv.start
+  appsrv.join
+
+
+Place a file called "index.rhtml" with the start-script and write something like:
+
+  <%
+    print "Hello world."
+  %>
+
+
+Then go to your browser and type "localhost:10080".
+
+
+=== How to send a header
+
+  <%
+    _kas.header("SomeHeader", "SomeValue")
+  %>
+
+If you have trouble, because the server already began to send the content while the page was not fully generated, then you can increase the size for when it should begin sending content like this:
+
+  appsrv = Knjappserver.new(
+    ...
+    :send_size => 4096
+    ...
+  )
+
+Or you can do it for just one page dynamically (this should be done VERY early - like before the first lines gets printed out):
+
+  <%
+    _kas.headers_send_size = 4096
+  %>
+
+You can also test if the headers are sent for your HTTP-session or not like this:
+
+  <%
+    if _kas.headers_sent?
+      print "The headers are sent!"
+    else
+      print "The headers are not sent yet - we can still add headers!"
+    end
+  %>
+
+=== How to send set a cookie
+
+  <%
+    _kas.cookie(
+      "name" => "MyCookie",
+      "value" => "SomeValue",
+      "expires" => Time.new + 3600,
+      "path" => "/"
+    )
+  %>
+
+=== How to do threadded content
+
+  <%
+    _kas.threadded_content do
+      sleep 4
+      print "Test 1<br />"
+    end
+    
+    _kas.threadded_content do
+      sleep 1
+      print "Test 2<br />"
+    end
+    
+    _kas.threadded_content do
+      sleep 3
+      print "Test 3<br />"
+    end
+  %>
+
+It should print in the right order, even though "Test 1" will finish as the last thread:
+  Test 1
+  Test 2
+  Test 3
+
+
+=== How to access request data
+  <%
+    puts _get
+    puts _post
+    puts _meta
+    puts _cookie
+    puts _session
+    puts _session_hash
+  %>
+
+
+=== How to set session variables:
+  _session[:logged_in] = true
+
+
+=== How to set other objects that cant be marshalled on sessions (variables will die after restart):
+  _session_hash[:mythread] = Thread.new do
+    do_some_stuff
+  end
+
+
+=== How to access the database
+  <%
+    _db.q("SELECT * FROM Session") do |data|
+      puts data
+    end
+  %>
+
+
+=== How to create a thread with database access that runs in background via the threadpool
+  <%
+    _kas.thread do
+      sleep 2
+      print "Trala!\n"  #will be outputted to the command line, since the thread is being executed in the background and the http-request wont depend on it!
+    end
+  %>
+
+
+=== How to do execute something every 10 seconds.
+  <%
+    _kas.timeout(:time => 10) do
+      print "This will be printed to the command line every 10 secs.\n"
+    end
+  %>
+
+
+=== How to send a mail
+
+1. Be sure to start the appserver with SMTP arguments:
+  appsrv = Knjappserver.new(
+    ...
+    :smtp_paras => {
+      "smtp_host" => "hostname",
+      "smtp_port" => 465,
+      "smtp_user" => "username,
+      "smtp_passwd" => "password",
+      "ssl" => true
+    }
+    ...
+  )
+
+2. Do something like this:
+  <%
+    _kas.mail(
+      :to => "friends@email.com",
+      :subject => "The subject",
+      :html => "The HTML content.",
+      :from => "your@email.com"
+    )
+  %>
+
+You can also make the appserver send you an email every time an error occurrs:
+  <%
+    appsrv = Knjappserver.new(
+      ...
+      :error_report_emails => ["your@email.com", "another@email.com"],
+      :error_report_from => "robot@domain.com"
+      ...
+    )
+  %>
+
+
+=== How to use Gettext / Locales
+
+1. Make folders and po-files so you have something like: "locales/en_GB/LC_MESSAGES/default.po".
+
+2. Start the appserver with the following arguments:
+  appsrv = Knjappserver.new(
+    ...
+    :locales_root => "#{File.dirname(__FILE__)}/../locales",
+    :locales_gettext_funcs => true,
+    :locale_default => "da_DK",
+    ...
+  )
+
+3. Use gettext like your normally would:
+  <%
+    print _("Hello world.")
+  %>
+
+4. Dont do "require 'gettext'" or anything like this - the appserver does it all for you!
+
+
+=== How to use multithreadded MySQL without mutex'ing around it.
+
+1. Install the 'mysql2' gem.
+  gem install mysql2
+
+2. Start the appserver with the following arguments:
+  appsrv = Knjappserver.new(
+    ...
+    :db => {
+      :type => "mysql",
+      :subtype => "mysql2",
+      :host => "localhost",
+      :user => "username",
+      :pass => "password",
+      :db => "database",
+      :return_keys => "symbols",
+      :threadsafe => true,
+      :encoding => "utf8",
+      :query_args => {:cast => false}
+    }
+    ...
+  )
+
+
+=== How to make a cron-script that checks if my app is running through the appserver.
+
+1. Be sure to start the appserver with a title:
+  appsrv = Knjappserver.new(
+    ...
+    :title => "MyApp"
+    ...
+  )
+
+2. Add this command to your cron-config:
+  /bin/bash -l -c "ruby ~/.rvm/gems/ruby-1.9.2-head/gems/knjappserver-0.0.9/bin/check_running.rb --title=MyApp --forking=1 --command=\"ruby /path/to/app/start_script.rb\""
+
+
+=== How to restart the appserver from Ruby or restart it based on memory usage.
+
+1. Be sure to start the appserver with a restart-command:
+  appsrv = Knjappserver.new(
+    ...
+    :restart_cmd => "/usr/bin/ruby1.9.1 /path/to/app/start.rb"
+    ...
+  )
+
+2. You can also make it restart itself based on memory usage:
+  appsrv = Knjappserver.new(
+    ...
+    :restart_when_used_memory => 384
+    ...
+  )
+
+3. You can restart it dynamically (or test that it is able to restart itself with your given arguments) by doing something like this:
+  <%
+    _kas.should_restart = true
+  %>
+
+When it restarts it will wait for a window with no running HTTP requests before restarting.
+
+
+=== How to use helper methods.
+
+1. This will show a message by using javascript in execute history.back(-1) afterwards.
+  _kas.alert("You can only view this page if you are logged in.").back if !logged_in
+
+2. This will show the error message and execute history.back(-1) afterwards.
+  _kas.on_error_go_back do
+    raise "test"
+  end
+
+3. This will redirect the user and not execute anything after it:
+  _kas.redirect("?show=frontpage")
+
+4. We also add the method "html" to the String-class so escaping it is painless:
+  print "<b>Will this be bold?</b>".html
+
+5. This is how you can escape SQL-stuff:
+  data = _db.query("SELECT * FROM Session WHERE id ='#{_db.esc(some_var)}'").fetch
+
+6. Print strings using short-tag:
+  <div>
+    My name is <%=name_var%>.
+  </div>

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/bin/check_running.rb

@@ -58,8 +58,8 @@ tmppath = "#{tmpdir}/run_#{options[:title]}"
 count = 0
 
 if File.exists?(tmppath)
-  pid = File.read(tmppath)
-  count = Knj::Unix_proc.list("pids" => [pid]).length
+  pid = File.read(tmppath).to_s.strip
+  count = Knj::Unix_proc.list("pids" => [pid]).length if pid.to_s.length > 0
 end
 
 exit if count > 0

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2011-08-03}
+  s.date = %q{2011-11-15}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -39,15 +39,20 @@ Gem::Specification.new do |s|
     "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",
@@ -59,9 +64,16 @@ Gem::Specification.new do |s|
     "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"
   ]
@@ -75,33 +87,39 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<knjrbfw>, [">= 0.0.7"])
+      s.add_runtime_dependency(%q<knjrbfw>, [">= 0.0.8"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<knjdbrevision>, [">= 0.0.2"])
+      s.add_runtime_dependency(%q<mail>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<knjrbfw>, [">= 0.0.7"])
+      s.add_dependency(%q<knjrbfw>, [">= 0.0.8"])
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<knjdbrevision>, [">= 0.0.2"])
+      s.add_dependency(%q<mail>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<knjrbfw>, [">= 0.0.7"])
+    s.add_dependency(%q<knjrbfw>, [">= 0.0.8"])
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<knjdbrevision>, [">= 0.0.2"])
+    s.add_dependency(%q<mail>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end