knjappserver 0.0.16 → 0.0.17

data/lib/include/class_knjappserver_threadding_timeout.rb

@@ -1,11 +1,12 @@
 class Knjappserver::Threadding_timeout
+  attr_reader :timeout
+  
   def initialize(args)
     @args = args
     @kas = @args[:kas]
-    raise "No time given." if !@args[:args].key?(:time)
-    @args[:time] = @args[:args][:time].to_s.to_i
-    @args[:args] = [] if !@args[:args]
+    raise "No time given." if !@args.key?(:time)
     @mutex = Mutex.new
+    @running = false
   end
   
   def time=(newtime)
@@ -42,13 +43,15 @@ class Knjappserver::Threadding_timeout
               @kas.db_handler.get_and_register_thread if @kas.db_handler.opts[:threadsafe]
               
               Thread.current[:knjappserver] = {
-                :kas => self,
+                :kas => @kas,
                 :db => @kas.db_handler
               }
               
               begin
+                @running = true
                 @args[:block].call(*@args[:args])
               ensure
+                @running = false
                 @kas.ob.db.free_thread if @kas.ob.db.opts[:threadsafe]
                 @kas.db_handler.free_thread if @kas.db_handler.opts[:threadsafe]
               end
@@ -59,6 +62,8 @@ class Knjappserver::Threadding_timeout
         end
       end
     end
+    
+    return self
   end
   
   #Stops the timeout.
@@ -75,4 +80,15 @@ class Knjappserver::Threadding_timeout
     return @timeout if key == :knjappserver_timeout
     raise "No such key: '#{key}'."
   end
+  
+  #Returns true if the thread is alive or not.
+  def alive?
+    return @thread.alive? if @thread
+    return false
+  end
+  
+  #Returns true if the timeout is running or not.
+  def running?
+    return @running
+  end
 end

data/lib/include/class_knjappserver_translations.rb

@@ -17,10 +17,12 @@ class Knjappserver
     return trans_val
   end
   
-  def trans_set(obj, values)
-    args = {}
-    args[:locale] = _session[:locale] if _session[:locale] and !args[:locale]
-    args[:locale] = _httpsession.data[:locale] if _httpsession.data[:locale] and !args[:locale]
+  def trans_set(obj, values, args = {})
+    if !args[:locale]
+      args[:locale] = _session[:locale] if _session[:locale]
+      args[:locale] = _httpsession.data[:locale] if _httpsession.data[:locale] and !args[:locale]
+    end
+    
     @translations.set(obj, values, args)
   end
   

data/lib/include/class_knjappserver_web.rb

@@ -5,7 +5,7 @@ class Knjappserver
   end
   
   #Redirects to another URL.
-	def redirect(url, args = {})
+  def redirect(url, args = {})
     #Header way
     if !_httpsession.alert_sent and !self.headers_sent?
       if args[:perm]
@@ -19,57 +19,109 @@ class Knjappserver
     
     print "<script type=\"text/javascript\">location.href=\"#{url}\";</script>"
     exit
-	end
-	
-	#Sends a javascript-alert to the HTML.
-	def alert(msg)
+  end
+  
+  #Sends a javascript-alert to the HTML.
+  def alert(msg)
     _httpsession.alert_sent = true
-		Knj::Web.alert(msg)
-		return self
-	end
-	
-	#Define a cookies in the clients browser.
-	def cookie(cookie)
+    Knj::Web.alert(msg)
+    return self
+  end
+  
+  #Define a cookies in the clients browser.
+  def cookie(cookie)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
     raise "Not a hash: '#{cookie.class.name}', '#{cookie}'." unless cookie.is_a?(Hash)
     _httpsession.resp.cookie(cookie)
-	end
-	
-	#Sends a header to the clients browser.
-	def header(key, val)
+  end
+  
+  #Sends a header to the clients browser.
+  def header(key, val)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
     _httpsession.resp.header(key, val)
-	end
-	
-	#Sends a raw header-line to the clients browser.
-	def header_raw(str)
+  end
+  
+  #Sends a raw header-line to the clients browser.
+  def header_raw(str)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
     Knj::Php.header(str)
-	end
-	
-	def headers_sent?
+  end
+  
+  def headers_sent?
     return true if _httpsession.resp.headers_sent
     return false
-	end
-	
-	def headers_send_size=(newsize)
+  end
+  
+  def headers_send_size=(newsize)
     if self.headers_sent?
       raise "The headers are already sent and you cannot modify the send-size any more."
     end
     
     _httpsession.size_send = newsize.to_i
-	end
-	
-	#Sends a javascript back to the browser and exits.
-	def back
-		Knj::Web.back
-	end
-	
-	#Draw a input in a table.
-	def inputs(*args)
+  end
+  
+  #Sends a javascript back to the browser and exits.
+  def back
+    Knj::Web.back
+  end
+  
+  #Draw a input in a table.
+  def inputs(*args)
     return Knj::Web.inputs(args)
-	end
+  end
+  
+  #Urlencodes a string.
+  def urlenc(str)
+    return Knj::Web.urlenc(str)
+  end
+  
+  #Urldecodes a string.
+  def urldec(str)
+    return Knj::Web.urldec(str)
+  end
+  
+  #Returns a number localized as a string.
+  def num(*args)
+    return Knj::Locales.number_out(*args)
+  end
+  
+  def get_parse_arrays(arg = nil, ob = nil)
+    arg = _get.clone if !arg
+    
+    #Parses key-numeric-hashes into arrays and converts special model-strings into actual models.
+    if arg.is_a?(Hash) and Knj::ArrayExt.hash_numeric_keys?(arg)
+      arr = []
+      
+      arg.each do |key, val|
+        arr << val
+      end
+      
+      return self.get_parse_arrays(arr, ob)
+    elsif arg.is_a?(Hash)
+      arg.each do |key, val|
+        arg[key] = self.get_parse_arrays(val, ob)
+      end
+      
+      return arg
+    elsif arg.is_a?(Array)
+      arg.each_index do |key|
+        arg[key] = self.get_parse_arrays(arg[key], ob)
+      end
+      
+      return arg
+    elsif arg.is_a?(String) and match = arg.match(/^#<Model::(.+?)::(\d+)>$/)
+      ob = @ob if !ob
+      return ob.get(match[1], match[2])
+    else
+      return arg
+    end
+  end
+  
+  #Returns the socket-port the appserver is currently running on.
+  def port
+    return @httpserv.server.addr[1]
+  end
 end

data/lib/include/class_log.rb

@@ -6,7 +6,7 @@ class Knjappserver::Log < Knj::Datarow
       data_val = d.ob.get_by(:Log_data_value, {"value" => d.args["object_lookup"].class.name})
       return [] if !data_val #if this data-value cannot be found, nothing has been logged for the object. So just return empty array here and skip the rest.
       
-			sql += "
+			sql << "
 				LEFT JOIN Log_link ON
 					Log_link.log_id = #{table}.id AND
 					Log_link.object_class_value_id = '#{d.db.esc(data_val.id)}' AND
@@ -14,21 +14,21 @@ class Knjappserver::Log < Knj::Datarow
 			"
 		end
 		
-		sql += " WHERE 1=1"
+		sql << " WHERE 1=1"
 		
 		ret = list_helper(d)
 		d.args.each do |key, val|
 			case key
 				when "object_lookup"
-          sql += " AND Log_link.id IS NOT NULL"
+          sql << " AND Log_link.id IS NOT NULL"
 				else
 					raise "Invalid key: #{key}."
 				end
 		end
 		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
+		sql << ret[:sql_where]
+		sql << ret[:sql_order]
+		sql << ret[:sql_limit]
 		
 		return d.ob.list_bysql(:Log, sql)
 	end
@@ -94,13 +94,13 @@ class Knjappserver::Log < Knj::Datarow
 		self.links.each do |link|
 			obj = link.object(ob_use)
 			
-			html += ", " if !first
+			html << ", " if !first
 			first = false if first
 			
 			if obj.respond_to?(:html)
-				html += obj.html
+				html << obj.html
 			else
-				html += "#{obj.class.name}{#{obj.id}}"
+				html << "#{obj.class.name}{#{obj.id}}"
 			end
 		end
 		

data/lib/include/class_log_link.rb

@@ -12,15 +12,15 @@ class Knjappserver::Log_link < Knj::Datarow
         when "object_class"
           data_val = d.db.single(:Log_data_value, {"value" => val})
           return [] if !data_val #if this data-value cannot be found, nothing has been logged for the object. So just return empty array here and skip the rest.
-          sql += " AND object_class_value_id = '#{d.db.esc(data_val[:id])}'"
+          sql << " AND object_class_value_id = '#{d.db.esc(data_val[:id])}'"
         else
           raise "Invalid key: #{key}."
       end
 		end
 		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
+		sql << ret[:sql_where]
+		sql << ret[:sql_order]
+		sql << ret[:sql_limit]
 		
 		return d.ob.list_bysql(:Log_link, sql)
 	end

data/lib/include/class_session.rb

@@ -23,9 +23,13 @@ class Knjappserver::Session < Knj::Datarow
 	end
 	
 	def flush
-    self.update(
-      :sess_data => Base64.encode64(Marshal.dump(@sess_data)),
-      :date_lastused => Time.now
-    )
+    flush_data = Base64.encode64(Marshal.dump(@sess_data))
+    
+    if self[:sess_data] != flush_data
+      self.update(
+        :sess_data => flush_data,
+        :date_lastused => Time.now
+      )
+    end
 	end
 end

data/lib/include/gettext_funcs.rb

@@ -1,10 +1,12 @@
-# coding: utf-8
+#coding: utf-8
 
 def _(str)
 	kas = _kas
-	return str if !kas or !_session
-	_session[:locale] = _kas.config[:locale_default] if !_session[:locale] and _kas.config[:locale_default]
-	raise "No locale set for session and ':locale_default' not set in config." if !_session[:locale]
-	str = kas.gettext.trans(_session[:locale], str)
-	return str
+	session = _session
+	
+	return str.to_s.encode("utf-8") if !kas or !session
+	session[:locale] = kas.config[:locale_default] if !session[:locale] and kas.config[:locale_default]
+	raise "No locale set for session and ':locale_default' not set in config." if !session[:locale]
+	str = kas.gettext.trans(session[:locale], str)
+	return str.to_s.encode("utf-8")
 end

data/lib/include/magic_methods.rb

@@ -34,6 +34,10 @@ def _httpsession
 	return Thread.current[:knjappserver][:httpsession] if Thread.current[:knjappserver]
 end
 
+def _httpsession_var
+  return Thread.current[:knjappserver][:httpsession].httpsession_var if Thread.current[:knjappserver]
+end
+
 def _requestdata
 	return Thread.current[:knjappserver] if Thread.current[:knjappserver]
 end

data/lib/pages/debug_database_connections.rhtml

@@ -0,0 +1,46 @@
+<h1>Database connections</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Key</th>
+      <th>Free</th>
+    </tr>
+  </thead>
+  <tbody>
+    <%
+      thread_handler = _kas.db_handler.conns
+      if !thread_handler.is_a?(Knj::Threadhandler)
+        print "A threadhandler has not been spawned for this instance."
+        exit
+      end
+      
+      objects = thread_handler.objects.clone
+      
+      objects.each_index do |key|
+        val = objects[key]
+        
+        %>
+          <tr>
+            <td>
+              <%=key%>
+            </td>
+            <td>
+              <%=Knj::Strings.yn_str(val[:free])%>
+            </td>
+          </tr>
+        <%
+      end
+      
+      if objects.empty?
+        %>
+          <tr>
+            <td colspan="2">
+              Thread handler was spawned but no active connections was spawned?
+            </td>
+          </tr>
+        <%
+      end
+    %>
+  </tbody>
+</table>

data/lib/pages/debug_http_sessions.rhtml

@@ -0,0 +1,40 @@
+<h1>HTTP sessions</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Key</th>
+      <th>Working</th>
+    </tr>
+  </thead>
+  <tbody>
+    <%
+      sessions = _kas.httpserv.http_sessions.clone
+      
+      sessions.each_index do |key|
+        http_session = sessions[key]
+        
+        %>
+          <tr>
+            <td>
+              <%=key%>
+            </td>
+            <td>
+              <%=Knj::Strings.yn_str(http_session.working)%>
+            </td>
+          </tr>
+        <%
+      end
+      
+      if sessions.empty?
+        %>
+          <tr>
+            <td colspan="2">
+              No HTTP-sessions has been spawned.
+            </td>
+          </tr>
+        <%
+      end
+    %>
+  </tbody>
+</table>

data/lib/pages/error_notfound.rhtml

@@ -0,0 +1,12 @@
+<%
+  _httpsession.resp.status = 404
+%>
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
+<html><head>
+<title>404 Not Found</title>
+</head><body>
+<h1>Not Found</h1>
+<p>The requested URL <%=_meta["REQUEST_URI"]%> was not found on this server.</p>
+<hr>
+<address>Knjappserver at <%=_meta["HTTP_HOST"]%></address>
+</body></html>