knjappserver 0.0.15 → 0.0.16

data/lib/include/class_knjappserver_threadding_timeout.rb

@@ -0,0 +1,78 @@
+class Knjappserver::Threadding_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]
+    @mutex = Mutex.new
+  end
+  
+  def time=(newtime)
+    @args[:time] = newtime.to_s.to_i
+  end
+  
+  def time
+    return @args[:time]
+  end
+  
+  #Starts the timeout.
+  def start
+    @run = true
+    @thread = Thread.new do
+      loop do
+        begin
+          if @args[:counting]
+            @timeout = @args[:time]
+            
+            while @timeout > 0
+              @timeout += -1
+              break if @kas.should_restart or !@run
+              sleep 1
+            end
+          else
+            sleep @args[:time]
+          end
+          
+          break if @kas.should_restart or !@run
+          
+          @mutex.synchronize do
+            @kas.threadpool.run do
+              @kas.ob.db.get_and_register_thread if @kas.ob.db.opts[:threadsafe]
+              @kas.db_handler.get_and_register_thread if @kas.db_handler.opts[:threadsafe]
+              
+              Thread.current[:knjappserver] = {
+                :kas => self,
+                :db => @kas.db_handler
+              }
+              
+              begin
+                @args[:block].call(*@args[:args])
+              ensure
+                @kas.ob.db.free_thread if @kas.ob.db.opts[:threadsafe]
+                @kas.db_handler.free_thread if @kas.db_handler.opts[:threadsafe]
+              end
+            end
+          end
+        rescue Exception => e
+          @kas.handle_error(e)
+        end
+      end
+    end
+  end
+  
+  #Stops the timeout.
+  def stop
+    @run = false
+    @mutex.synchronize do
+      @thread.kill if @thread.alive?
+      @thread = nil
+    end
+  end
+  
+  #Returns various data.
+  def [](key)
+    return @timeout if key == :knjappserver_timeout
+    raise "No such key: '#{key}'."
+  end
+end

data/lib/include/class_knjappserver_translations.rb

@@ -0,0 +1,30 @@
+class Knjappserver
+  def trans(obj, key, args = {})
+    if !args.key?(:locale)
+      if _session[:locale]
+        args[:locale] = _session[:locale]
+      elsif _httpsession.data[:locale]
+        args[:locale] = _httpsession.data[:locale]
+      end
+    end
+    
+    trans_val = @translations.get(obj, key, args).to_s
+    
+    if trans_val.length <= 0
+      trans_val = @events.call(:trans_no_str, {:obj => obj, :key => key, :args => args})
+    end
+    
+    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]
+    @translations.set(obj, values, args)
+  end
+  
+  def trans_del(obj)
+    @translations.delete(obj)
+  end
+end

data/lib/include/class_knjappserver_web.rb

@@ -1,23 +1,75 @@
 class Knjappserver
+  #Imports a .rhtml-file and executes it.
+  def import(filepath)
+    _httpsession.eruby.import(filepath)
+  end
+  
+  #Redirects to another URL.
 	def redirect(url, args = {})
-		return Knj::Web.redirect(url, args)
+    #Header way
+    if !_httpsession.alert_sent and !self.headers_sent?
+      if args[:perm]
+        _httpsession.resp.status = 301 if !self.headers_sent?
+      else
+        _httpsession.resp.status = 303 if !self.headers_sent?
+      end
+      
+      self.header("Location", url) if !self.headers_sent?
+    end
+    
+    print "<script type=\"text/javascript\">location.href=\"#{url}\";</script>"
+    exit
 	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)
+    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)
-    Knj::Php.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)
+    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?
+    return true if _httpsession.resp.headers_sent
+    return false
+	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
-		return self
+	end
+	
+	#Draw a input in a table.
+	def inputs(*args)
+    return Knj::Web.inputs(args)
 	end
 end

data/lib/include/class_log.rb

@@ -34,15 +34,27 @@ class Knjappserver::Log < Knj::Datarow
 	end
 	
 	def self.add(d)
-		if !d.data.has_key?(:date_saved)
-			d.data[:date_saved] = d.db.date_out(Knj::Datet.new)
-		end
+		d.data[:date_saved] = Time.now if !d.data.key?(:date_saved)
 	end
 	
 	def text
 		return ob.get(:Log_data_value, self[:text_value_id])[:value]
 	end
 	
+	def comment
+    return "" if self[:comment_data_id].to_i == 0
+    log_data = ob.get(:Log_data_value, self[:comment_data_id])
+    return "" if !log_data
+    return log_data[:value]
+	end
+	
+	def tag
+    return "" if self[:tag_data_id].to_i == 0
+    log_data = ob.get(:Log_data_value, self[:tag_data_id])
+    return "" if !log_data
+    return log_data[:value]
+	end
+	
 	def get
 		ob.args[:knjappserver].log_data_hash(self[:get_keys_data_id], self[:get_values_data_id])
 	end
@@ -51,6 +63,22 @@ class Knjappserver::Log < Knj::Datarow
 		ob.args[:knjappserver].log_data_hash(self[:post_keys_data_id], self[:post_values_data_id])
 	end
 	
+	def cookie
+    ob.args[:knjappserver].log_data_hash(self[:cookie_keys_data_id], self[:cookie_values_data_id])
+  end
+  
+  def meta
+    ob.args[:knjappserver].log_data_hash(self[:meta_keys_data_id], self[:meta_values_data_id])
+  end
+  
+  def ip
+    meta_d = self.meta
+    
+    return meta_d[:HTTP_X_FORWARDED_FOR] if meta_d.has_key?(:HTTP_X_FORWARDED_FOR)
+    return meta_d[:REMOTE_ADDR] if meta_d.has_key?(:REMOTE_ADDR)
+    return "[no ip logged]"
+  end
+	
 	def first_line
 		lines = self.text.to_s.split("\n").first.to_s
 	end

data/lib/include/class_log_access.rb

@@ -1,19 +1,4 @@
 class Knjappserver::Log_access < Knj::Datarow
-	def self.list(d)
-		sql = "SELECT * FROM #{table} WHERE 1=1"
-		
-		ret = list_helper(d)
-		d.args.each do |key, val|
-			raise "Invalid key: #{key}."
-		end
-		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
-		
-		return d.ob.list_bysql(:Log_access, sql)
-	end
-	
 	def get
 		return data_hash("get")
 	end

data/lib/include/class_log_data.rb

@@ -1,19 +1,4 @@
 class Knjappserver::Log_data < Knj::Datarow
-	def self.list(d)
-		sql = "SELECT * FROM #{table} WHERE 1=1"
-		
-		ret = list_helper(d)
-		d.args.each do |key, val|
-			raise "Invalid key: #{key}."
-		end
-		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
-		
-		return d.ob.list_bysql(:Log_data, sql)
-	end
-	
 	def self.force(d, id_hash)
 		data_obj = d.ob.get_by(:Log_data, {"id_hash" => id_hash})
 		

data/lib/include/class_log_data_link.rb

@@ -1,16 +1,3 @@
 class Knjappserver::Log_data_link < Knj::Datarow
-	def self.list(d)
-		sql = "SELECT * FROM #{table} WHERE 1=1"
-		
-		ret = list_helper(d)
-		d.args.each do |key, val|
-			raise "Invalid key: #{key}."
-		end
-		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
-		
-		return d.ob.list_bysql(:Log_data_link, sql)
-	end
+	
 end

data/lib/include/class_log_data_value.rb

@@ -1,19 +1,4 @@
 class Knjappserver::Log_data_value < Knj::Datarow
-	def self.list(d)
-		sql = "SELECT * FROM #{table} WHERE 1=1"
-		
-		ret = list_helper(d)
-		d.args.each do |key, val|
-			raise "Invalid key: #{key}."
-		end
-		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
-		
-		return d.ob.list_bysql(:Log_data_value, sql)
-	end
-	
 	def self.force(d, value)
 		value_obj = d.ob.get_by(:Log_data_value, {
 			"value" => value.to_s
@@ -27,8 +12,11 @@ class Knjappserver::Log_data_value < Knj::Datarow
 	end
 	
 	def self.force_id(d, value)
-    value_obj = d.db.query("SELECT * FROM Log_data_value WHERE value = '#{d.db.esc(value)}' LIMIT 1").fetch
-    return value_obj[:id].to_i if value_obj
+    q_val = d.db.select(:Log_data_value, {"value" => value})
+    while d_val = q_val.fetch
+      return d_val[:id].to_i if d_val[:value].to_s == value.to_s #MySQL doesnt take upper/lower-case into consideration because value is a text-column... lame! - knj
+    end
+    
     return d.db.insert(:Log_data_value, {:value => value}, {:return_id => true}).to_i
 	end
 end

data/lib/include/class_session.rb

@@ -17,27 +17,15 @@ class Knjappserver::Session < Knj::Datarow
 		end
 	end
 	
-	def self.list(d)
-		sql = "SELECT * FROM #{table} WHERE 1=1"
-		
-		ret = list_helper(d)
-		d.args.each do |key, val|
-			raise "Invalid key: #{key}."
-		end
-		
-		sql += ret[:sql_where]
-		sql += ret[:sql_order]
-		sql += ret[:sql_limit]
-		
-		return d.ob.list_bysql(:Session, sql)
-	end
-	
 	def self.add(d)
-		d.data[:date_added] = Knj::Datet.new.dbstr if !d.data[:date_added]
+		d.data[:date_added] = Time.now if !d.data[:date_added]
+		d.data[:date_lastused] = Time.now if !d.data[:date_lastused]
 	end
 	
 	def flush
-    m_newdata = Base64.encode64(Marshal.dump(@sess_data))
-    self[:sess_data] = m_newdata
+    self.update(
+      :sess_data => Base64.encode64(Marshal.dump(@sess_data)),
+      :date_lastused => Time.now
+    )
 	end
 end

data/lib/include/magic_methods.rb

@@ -10,20 +10,24 @@ def _post
 	return Thread.current[:knjappserver][:post] if Thread.current[:knjappserver]
 end
 
+def _meta
+  return Thread.current[:knjappserver][:meta] if Thread.current[:knjappserver]
+end
+
+def _server
+  return Thread.current[:knjappserver][:meta] if Thread.current[:knjappserver]
+end
+
 def _session
 	return Thread.current[:knjappserver][:session].sess_data if Thread.current[:knjappserver] and Thread.current[:knjappserver][:session]
 end
 
 def _session_hash
-	return Thread.current[:knjappserver][:session_hash] if Thread.current[:knjappserver]
+	return Thread.current[:knjappserver][:session].edata if Thread.current[:knjappserver] and Thread.current[:knjappserver][:session]
 end
 
 def _session_obj
-	return Thread.current[:knjappserver][:session] if Thread.current[:knjappserver]
-end
-
-def _server
-	return Thread.current[:knjappserver][:meta] if Thread.current[:knjappserver]
+	return Thread.current[:knjappserver][:session] if Thread.current[:knjappserver] and Thread.current[:knjappserver][:session]
 end
 
 def _httpsession
@@ -34,23 +38,17 @@ def _requestdata
 	return Thread.current[:knjappserver] if Thread.current[:knjappserver]
 end
 
-def _meta
-	return Thread.current[:knjappserver][:meta] if Thread.current[:knjappserver]
-end
-
 def _kas
 	return Thread.current[:knjappserver][:kas] if Thread.current[:knjappserver]
-	return $knjappserver[:knjappserver] if $knjappserver and $knjappserver[:knjappserver]
 end
 
 def _vars
   return Thread.current[:knjappserver][:kas].vars if Thread.current[:knjappserver]
-  return $knjappserver[:knjappserver].vars if $knjappserver and $knjappserver[:knjappserver]
 end
 
 def _db
-	return Thread.current[:knjappserver][:db] if Thread.current[:knjappserver]
-	return $db if $db #return the global database object, if we are not running in a thread with one.
+	return Thread.current[:knjappserver][:db] if Thread.current[:knjappserver] and Thread.current[:knjappserver][:db] #This is the default use from a .rhtml-file.
+	return Thread.current[:knjappserver][:kas].db_handler if Thread.current[:knjappserver] and Thread.current[:knjappserver][:kas] #This is useually used when using autoload-argument for the appserver.
 end
 
 #This function makes it possible to define methods in ERubis-parsed files (else _buf-variable wouldnt be globally available).

data/lib/pages/benchmark_print.rhtml

@@ -0,0 +1,14 @@
+<%
+  0.upto(100) do
+    print "Test 1<br />\n"
+    print "Test 2<br />\n"
+    print "Test 3<br />\n"
+    print "Test 4<br />\n"
+    print "Test 5<br />\n"
+    print "Test 6<br />\n"
+    print "Test 7<br />\n"
+    print "Test 8<br />\n"
+    print "Test 9<br />\n"
+    print "Test 10<br />\n"
+  end
+%>