knjappserver 0.0.15 → 0.0.16

data/lib/files/database_schema.rb

@@ -1,111 +1,124 @@
-$tables = {
-	"tables" => {
-		"Session" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "idhash", "type" => "varchar"},
-				{"name" => "sess_data", "type" => "text"},
-				{"name" => "date_added", "type" => "datetime"},
-				{"name" => "ip", "type" => "varchar", "maxlength" => 15}
-			],
-			"indexes" => [
-				{"name" => "date_added", "columns" => ["date_added"]},
-				{"name" => "idhash", "columns" => ["idhash"]}
-			],
-			"renames" => ["sessions"]
-		},
-		"Translation" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "object_class", "type" => "varchar", "maxlength" => 50},
-				{"name" => "object_id", "type" => "bigint"},
-				{"name" => "key", "type" => "varchar", "maxlength" => 50},
-				{"name" => "locale", "type" => "varchar", "maxlength" => 5},
-				{"name" => "value", "type" => "text"}
-			],
-			"indexes" => [
-				{"name" => "lookup", "columns" => ["object_class", "object_id", "key", "locale"]}
-			],
-			"indexes_remove" => {
-				"object_class" => true
-			},
-			"renames" => ["translations"]
-		},
-		"Log" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "text_value_id", "type" => "bigint"},
-				{"name" => "date_saved", "type" => "datetime"},
-				{"name" => "get_keys_data_id", "type" => "bigint"},
-				{"name" => "get_values_data_id", "type" => "bigint"},
-				{"name" => "post_keys_data_id", "type" => "bigint"},
-				{"name" => "post_values_data_id", "type" => "bigint"}
-			],
-			"indexes" => [
-				{"name" => "text_value_id", "columns" => ["text_value_id"]}
-			]
-		},
-		"Log_access" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "session_id", "type" => "bigint"},
-				{"name" => "date_request", "type" => "datetime"},
-				{"name" => "ip_data_id", "type" => "bigint"},
-				{"name" => "get_keys_data_id", "type" => "bigint"},
-				{"name" => "get_values_data_id", "type" => "bigint"},
-				{"name" => "post_keys_data_id", "type" => "bigint"},
-				{"name" => "post_values_data_id", "type" => "bigint"},
-				{"name" => "cookie_keys_data_id", "type" => "bigint"},
-				{"name" => "cookie_values_data_id", "type" => "bigint"},
-				{"name" => "meta_keys_data_id", "type" => "bigint"},
-				{"name" => "meta_values_data_id", "type" => "bigint"}
-			],
-			"indexes" =>  [
-				{"name" => "session_id", "columns" => ["session_id"]},
-				{"name" => "date_request", "columns" => ["date_request"]}
-			]
-		},
-		"Log_data" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "id_hash", "type" => "varchar"}
-			],
-			"indexes" => [
-				{"name" => "id_hash", "columns" => ["id_hash"]}
-			]
-		},
-		"Log_data_link" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "no", "type" => "int"},
-				{"name" => "data_id", "type" => "bigint"},
-				{"name" => "value_id", "type" => "bigint"}
-			],
-			"indexes" => [
-				{"name" => "data_id", "columns" => ["data_id"]},
-				{"name" => "value_id", "columns" => ["value_id"]}
-			]
-		},
-		"Log_data_value" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "value", "type" => "text"}
-			]
-		},
-		"Log_link" => {
-			"columns" => [
-				{"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
-				{"name" => "log_id", "type" => "bigint"},
-				{"name" => "object_class_value_id", "type" => "bigint"},
-				{"name" => "object_id", "type" => "bigint"}
-			],
-			"indexes" => [
-				{"name" => "log_id", "columns" => ["log_id"]},
-				{"name" => "object_id", "columns" => ["object_id"]},
-				{"name" => "object_class_value_id", "columns" => ["object_class_value_id"]},
-				{"name" => "object_lookup", "columns" => ["object_class_value_id", "object_id"]},
-				{"name" => "log_lookup", "columns" => ["object_class_value_id", "object_id", "log_id"]}
-			]
-		}
-	}
-}
+class Knjappserver
+  DATABASE_SCHEMA = {
+    "tables" => {
+      "Log" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "text_value_id", "type" => "bigint"},
+          {"name" => "date_saved", "type" => "datetime"},
+          {"name" => "get_keys_data_id", "type" => "bigint"},
+          {"name" => "get_values_data_id", "type" => "bigint"},
+          {"name" => "post_keys_data_id", "type" => "bigint"},
+          {"name" => "post_values_data_id", "type" => "bigint"},
+          {"name" => "cookie_keys_data_id", "type" => "bigint"},
+          {"name" => "cookie_values_data_id", "type" => "bigint"},
+          {"name" => "meta_keys_data_id", "type" => "bigint"},
+          {"name" => "meta_values_data_id", "type" => "bigint"},
+          {"name" => "tag_data_id", "type" => "bigint"},
+          {"name" => "comment_data_id", "type" => "bigint"}
+        ],
+        "indexes" => [
+          {"name" => "text_value_id", "columns" => ["text_value_id"]},
+          {"name" => "tag_data_id", "columns" => ["tag_data_id"]},
+          {"name" => "comment_data_id", "columns" => ["comment_data_id"]}
+        ]
+      },
+      "Log_access" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "session_id", "type" => "bigint"},
+          {"name" => "date_request", "type" => "datetime"},
+          {"name" => "ip_data_id", "type" => "bigint"},
+          {"name" => "get_keys_data_id", "type" => "bigint"},
+          {"name" => "get_values_data_id", "type" => "bigint"},
+          {"name" => "post_keys_data_id", "type" => "bigint"},
+          {"name" => "post_values_data_id", "type" => "bigint"},
+          {"name" => "cookie_keys_data_id", "type" => "bigint"},
+          {"name" => "cookie_values_data_id", "type" => "bigint"},
+          {"name" => "meta_keys_data_id", "type" => "bigint"},
+          {"name" => "meta_values_data_id", "type" => "bigint"}
+        ],
+        "indexes" =>  [
+          {"name" => "session_id", "columns" => ["session_id"]},
+          {"name" => "date_request", "columns" => ["date_request"]}
+        ]
+      },
+      "Log_data" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "id_hash", "type" => "varchar"}
+        ],
+        "indexes" => [
+          {"name" => "id_hash", "columns" => ["id_hash"]}
+        ]
+      },
+      "Log_data_link" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "no", "type" => "int"},
+          {"name" => "data_id", "type" => "bigint"},
+          {"name" => "value_id", "type" => "bigint"}
+        ],
+        "indexes" => [
+          {"name" => "data_id", "columns" => ["data_id"]},
+          {"name" => "value_id", "columns" => ["value_id"]}
+        ]
+      },
+      "Log_data_value" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "value", "type" => "text"}
+        ]
+      },
+      "Log_link" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "log_id", "type" => "bigint"},
+          {"name" => "object_class_value_id", "type" => "bigint"},
+          {"name" => "object_id", "type" => "bigint"}
+        ],
+        "indexes" => [
+          {"name" => "log_id", "columns" => ["log_id"]},
+          {"name" => "object_id", "columns" => ["object_id"]},
+          {"name" => "object_class_value_id", "columns" => ["object_class_value_id"]},
+          {"name" => "object_lookup", "columns" => ["object_class_value_id", "object_id"]},
+          {"name" => "log_lookup", "columns" => ["object_class_value_id", "object_id", "log_id"]}
+        ]
+      },
+      "Session" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "idhash", "type" => "varchar"},
+          {"name" => "sess_data", "type" => "text"},
+          {"name" => "date_added", "type" => "datetime"},
+          {"name" => "date_lastused", "type" => "datetime", "on_created" => proc{|d| d["db"].query("UPDATE Session SET date_lastused = '#{Knj::Datet.new.dbstr}")}},
+          {"name" => "ip", "type" => "varchar", "maxlength" => 15},
+          {"name" => "user_agent", "type" => "text"},
+          {"name" => "remember", "type" => "enum", "maxlength" => "'0','1'", "default" => 0, "comment" => "If the session should be remembered or not."}
+        ],
+        "indexes" => [
+          {"name" => "date_added", "columns" => ["date_added"]},
+          {"name" => "idhash", "columns" => ["idhash"]}
+        ],
+        "renames" => ["sessions"]
+      },
+      "Translation" => {
+        "columns" => [
+          {"name" => "id", "type" => "bigint", "autoincr" => true, "primarykey" => true},
+          {"name" => "object_class", "type" => "varchar", "maxlength" => 50},
+          {"name" => "object_id", "type" => "bigint"},
+          {"name" => "key", "type" => "varchar", "maxlength" => 50},
+          {"name" => "locale", "type" => "varchar", "maxlength" => 5},
+          {"name" => "value", "type" => "text"}
+        ],
+        "indexes" => [
+          {"name" => "lookup", "columns" => ["object_class", "object_id", "key", "locale"]}
+        ],
+        "indexes_remove" => {
+          "object_class" => true
+        },
+        "renames" => ["translations"]
+      }
+    }
+  }
+end

data/lib/include/class_customio.rb

@@ -1,13 +1,23 @@
 class Knjappserver::CustomIO < StringIO
 	def print(str)
 		thread = Thread.current
+		str = str.to_s
 		
-    if thread and thread[:knjappserver] and thread[:knjappserver][:stringio] and !thread[:knjappserver][:stringio].closed?
-      return thread[:knjappserver][:stringio].print(str)
-		elsif thread and thread[:knjappserver] and thread[:knjappserver][:httpsession] and thread[:knjappserver][:httpsession].out and !thread[:knjappserver][:httpsession].out.closed?
-			return thread[:knjappserver][:httpsession].out.print(str)
+    if thread and thread[:knjappserver] and thread[:knjappserver][:contentgroup]
+      httpsession = thread[:knjappserver][:httpsession]
+      
+      if httpsession
+        wsize = httpsession.written_size
+        wsize += str.size
+        
+        if wsize >= httpsession.size_send
+          httpsession.cgroup.write_output
+        end
+      end
+      
+      thread[:knjappserver][:contentgroup].write(str)
 		else
-			return STDOUT.print(str) if !STDOUT.closed?
+			STDOUT.print(str) if !STDOUT.closed?
 		end
 	end
 	
@@ -18,4 +28,8 @@ class Knjappserver::CustomIO < StringIO
 	def write(str)
 		self.print(str)
 	end
+	
+	def p(str)
+    self.print(str)
+	end
 end

data/lib/include/class_erbhandler.rb

@@ -3,12 +3,10 @@ class Knjappserver::ERBHandler
 		@connected = {}
 	end
 	
-	def erb_handler(data)
-		#Hack the Knj::Thread to accept data - this is how get, post and etc. are set.
-		Thread.current[:knjappserver] = data
-		eruby = data[:httpsession].eruby
-		
-		if !@connected[eruby.__id__]
+	def erb_handler(httpsess)
+    eruby = httpsess.eruby
+    
+		if !@connected.key?(eruby.__id__)
 			eruby.connect("error") do |e|
 				_kas.handle_error(e)
 			end
@@ -16,21 +14,6 @@ class Knjappserver::ERBHandler
 			@connected[eruby.__id__] = true
 		end
 		
-		cont = eruby.load_return(data[:filepath], {
-			:with_headers => false,
-			:custom_io => true
-		})
-		headers = eruby.headers
-		eruby.reset_headers
-		
-		headers_ret = {}
-		headers.each do |header|
-			headers_ret[header[0]] = [header[1]]
-		end
-		
-		Thread.current[:knjappserver].clear
-    Thread.current[:knjappserver] = nil
-		
-    return {:headers => headers}
+		eruby.import(httpsess.page_path)
 	end
 end

data/lib/include/class_httpresp.rb

@@ -1,7 +1,7 @@
 require "time"
 
 class Knjappserver::Httpresp
-  attr_accessor :body, :nl, :status
+  attr_accessor :nl, :status, :http_version, :headers, :headers_trailing, :headers_sent
   
   STATUS_CODES = {
     100 => "Continue",
@@ -24,20 +24,41 @@ class Knjappserver::Httpresp
   }
   NL = "\r\n"
   
-  def initialize
+  def initialize(args)
+    @cgroup = args[:cgroup]
+  end
+  
+  def reset(args)
     @status = 200
+    @http_version = args[:http_version]
+    @close = args[:close]
+    @fileobj = nil
+    @close = true if @http_version == "1.0"
+    @trailers = []
+    
+    @headers_sent = false
+    @headers_trailing = {}
+    
     @headers = {
-      "Content-Type" => "text/html",
-      "Date" => Time.now.httpdate,
+      "date" => ["Date", Time.now.httpdate]
+    }
+    
+    @headers_11 = {
       "Connection" => "Keep-Alive",
       "Transfer-Encoding" => "chunked",
-      "Keep-Alive" => "timeout=30, max=100"
+      "Keep-Alive" => "timeout=15, max=30"
     }
+    
     @cookies = []
   end
   
   def header(key, val)
-    @headers[key] = val
+    if !@headers_sent
+      @headers[key.to_s.downcase] = [key, val]
+    else
+      raise "Headers already sent and given header was not in trailing headers: '#{key}'." if @trailers.index(key) == nil
+      @headers_trailing[key.to_s.downcase] = [key, val]
+    end
   end
   
   def cookie(cookie)
@@ -45,18 +66,32 @@ class Knjappserver::Httpresp
   end
   
   def header_str
-    res = "HTTP/1.1 #{@status}"
+    if @http_version == "1.0"
+      res = "HTTP/1.0 #{@status}"
+    else
+      res = "HTTP/1.1 #{@status}"
+    end
+    
     code = STATUS_CODES[@status]
     res += " #{code}" if code
     res += NL
-    #res += "Content-Length: #{@body.length}#{NL}"
     
     @headers.each do |key, val|
-      res += "#{key}: #{val}#{NL}"
+      res += "#{val[0]}: #{val[1]}#{NL}"
+    end
+    
+    if @http_version == "1.1"
+      @headers_11.each do |key, val|
+        res += "#{key}: #{val}#{NL}"
+      end
+      
+      @trailers.each do |trailer|
+        res += "Trailer: #{trailer}#{NL}"
+      end
     end
     
     @cookies.each do |cookie|
-      res += "Set-Cookie: #{cookie}#{NL}"
+      res += "Set-Cookie: #{Knj::Web.cookie_str(cookie)}#{NL}"
     end
     
     res += NL
@@ -64,28 +99,31 @@ class Knjappserver::Httpresp
     return res
   end
   
-  def write_chunked(socket)
+  def write(socket)
+    @headers_sent = true
     socket.write(self.header_str)
     
-    @body.each do |part|
-      while buf = part.read(1024)
-        next if buf.empty?
-        socket.write("#{format("%x", buf.bytesize)}#{NL}#{buf}#{NL}")
+    if @status == 304
+      #do nothing.
+    else
+      case @http_version
+        when "1.0"
+          @cgroup.write_to_socket
+          socket.write("#{NL}#{NL}")
+        when "1.1"
+          @cgroup.write_to_socket
+          socket.write("0#{NL}")
+          
+          @headers_trailing.each do |header_id_str, header|
+            socket.write("#{header[0]}: #{header[1]}#{NL}")
+          end
+          
+          socket.write(NL)
+        else
+          raise "Could not figure out of HTTP version: '#{@http_version}'."
       end
     end
     
-    socket.write("0#{NL}#{NL}")
-  end
-  
-  def content
-    str = self.header_str + @body.string + "\n\n"
-  end
-  
-  def destroy
-    @status = nil
-    @status_codes = nil
-    @body = nil
-    @cookies = nil
-    @headers = nil
+    socket.close if @close
   end
 end