knjappserver 0.0.20 → 0.0.21

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-03-16}
+  s.date = %q{2012-04-26}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
     "lib/include/class_httpsession_contentgroup.rb",
     "lib/include/class_httpsession_http_request.rb",
     "lib/include/class_httpsession_http_response.rb",
+    "lib/include/class_httpsession_page_environment.rb",
     "lib/include/class_httpsession_post_multipart.rb",
     "lib/include/class_knjappserver.rb",
     "lib/include/class_knjappserver_cleaner.rb",

data/lib/include/class_httpsession.rb

@@ -1,12 +1,13 @@
 class Knjappserver::Httpsession
   attr_accessor :data, :alert_sent
-  attr_reader :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :cgroup, :meta, :httpsession_var, :handler, :working
+  attr_reader :get, :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
   
   dir = File.dirname(__FILE__)
   
   autoload :Contentgroup, "#{dir}/class_httpsession_contentgroup.rb"
   autoload :Http_request, "#{dir}/class_httpsession_http_request.rb"
   autoload :Http_response, "#{dir}/class_httpsession_http_response.rb"
+  autoload :Page_environment, "#{dir}/class_httpsession_page_environment.rb"
   autoload :Post_multipart, "#{dir}/class_httpsession_post_multipart.rb"
   
   def initialize(httpserver, socket)
@@ -17,11 +18,15 @@ class Knjappserver::Httpsession
     @types = @kas.types
     @config = @kas.config
     @active = true
-    @eruby = Knj::Eruby.new(:cache_hash => @kas.eruby_cache)
     @debug = @kas.debug
     @handlers_cache = @config[:handlers_cache]
     @httpsession_var = {}
     
+    @eruby = Knj::Eruby.new(
+      :cache_hash => @kas.eruby_cache,
+      :binding_callback => self.method("create_binding")
+    )
+    
     #Set socket stuff.
     if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
       if @kas.config[:peeraddr_static]
@@ -135,6 +140,12 @@ class Knjappserver::Httpsession
     end
   end
   
+  #Creates a new Knjappserver::Binding-object and returns the binding for that object.
+  def create_binding
+    binding_obj = Knjappserver::Httpsession::Page_environment.new(:httpsession => self, :kas => @kas)
+    return binding_obj.get_binding
+  end
+  
   #Is called when content is added and begings to write the output if it goes above the limit.
   def add_size(size)
     @written_size += size
@@ -204,7 +215,7 @@ class Knjappserver::Httpsession
   
   def serve
     STDOUT.print "Generating meta, cookie, get, post and headers.\n" if @debug
-    @meta = @handler.meta.merge!(@socket_meta)
+    @meta = @handler.meta.merge(@socket_meta)
     @cookie = @handler.cookie
     @get = @handler.get
     @post = @handler.post
@@ -292,49 +303,56 @@ class Knjappserver::Httpsession
       :httpsession => self
     }) if @kas.events
     
-    if @handlers_cache.key?(@ext)
-      STDOUT.print "Calling handler.\n" if @debug
-      @handlers_cache[@ext].call(self)
-    else
-      #check if we should use a handler for this request.
-      @config[:handlers].each do |handler_info|
-        if handler_info.key?(:file_ext) and handler_info[:file_ext] == @ext
-          return handler_info[:callback].call(self)
-        elsif handler_info.key?(:path) and handler_info[:mount] and @meta["SCRIPT_NAME"].slice(0, handler_info[:path].length) == handler_info[:path]
-          @page_path = "#{handler_info[:mount]}#{@meta["SCRIPT_NAME"].slice(handler_info[:path].length, @meta["SCRIPT_NAME"].length)}"
-          break
-        end
-      end
-      
-      if !File.exists?(@page_path)
-        @resp.status = 404
-        @resp.header("Content-Type", "text/html")
-        @cgroup.write("File you are looking for was not found: '#{@meta["REQUEST_URI"]}'.")
-      else
-        if @headers["cache-control"] and @headers["cache-control"][0]
-          cache_control = {}
-          @headers["cache-control"][0].scan(/(.+)=(.+)/) do |match|
-            cache_control[match[1]] = match[2]
+    begin
+      Timeout.timeout(@kas.config[:timeout]) do
+        if @handlers_cache.key?(@ext)
+          STDOUT.print "Calling handler.\n" if @debug
+          @handlers_cache[@ext].call(self)
+        else
+          #check if we should use a handler for this request.
+          @config[:handlers].each do |handler_info|
+            if handler_info.key?(:file_ext) and handler_info[:file_ext] == @ext
+              return handler_info[:callback].call(self)
+            elsif handler_info.key?(:path) and handler_info[:mount] and @meta["SCRIPT_NAME"].slice(0, handler_info[:path].length) == handler_info[:path]
+              @page_path = "#{handler_info[:mount]}#{@meta["SCRIPT_NAME"].slice(handler_info[:path].length, @meta["SCRIPT_NAME"].length)}"
+              break
+            end
           end
-        end
-        
-        cache_dont = true if cache_control and cache_control.key?("max-age") and cache_control["max-age"].to_i <= 0
-        lastmod = File.mtime(@page_path)
-        
-        @resp.header("Last-Modified", lastmod.httpdate)
-        @resp.header("Expires", (Time.now + 86400).httpdate) #next day.
-        
-        if !cache_dont and @headers["if-modified-since"] and @headers["if-modified-since"][0]
-          request_mod = Knj::Datet.parse(@headers["if-modified-since"][0]).time
           
-          if request_mod == lastmod
-            @resp.status = 304
-            return nil
+          if !File.exists?(@page_path)
+            @resp.status = 404
+            @resp.header("Content-Type", "text/html")
+            @cgroup.write("File you are looking for was not found: '#{@meta["REQUEST_URI"]}'.")
+          else
+            if @headers["cache-control"] and @headers["cache-control"][0]
+              cache_control = {}
+              @headers["cache-control"][0].scan(/(.+)=(.+)/) do |match|
+                cache_control[match[1]] = match[2]
+              end
+            end
+            
+            cache_dont = true if cache_control and cache_control.key?("max-age") and cache_control["max-age"].to_i <= 0
+            lastmod = File.mtime(@page_path)
+            
+            @resp.header("Last-Modified", lastmod.httpdate)
+            @resp.header("Expires", (Time.now + 86400).httpdate) #next day.
+            
+            if !cache_dont and @headers["if-modified-since"] and @headers["if-modified-since"][0]
+              request_mod = Knj::Datet.parse(@headers["if-modified-since"].first).time
+              
+              if request_mod == lastmod
+                @resp.status = 304
+                return nil
+              end
+            end
+            
+            @cgroup.new_io(:type => :file, :path => @page_path)
           end
         end
-        
-        @cgroup.new_io(File.new(@page_path))
       end
+    rescue Timeout::Error
+      @resp.status = 500
+      print "The request timed out."
     end
     
     @cgroup.mark_done

data/lib/include/class_httpsession_contentgroup.rb

@@ -121,24 +121,22 @@ class Knjappserver::Httpsession::Contentgroup
       if data.is_a?(Knjappserver::Httpsession::Contentgroup)
         data.write_to_socket
       elsif data.key?(:str)
-        if data[:str].is_a?(File)
-          file = data[:str]
-          
-          loop do
-            begin
-              buf = file.sysread(16384)
-            rescue EOFError
-              break
-            end
-            
-            if @chunked
-              @socket.write("#{buf.length.to_s(16)}#{NL}#{buf}#{NL}")
-            else
-              @socket.write(buf)
+        if data[:str].is_a?(Hash) and data[:str][:type] == :file
+          File.open(data[:str][:path], "r") do |file|
+            loop do
+              begin
+                buf = file.sysread(16384)
+              rescue EOFError
+                break
+              end
+              
+              if @chunked
+                @socket.write("#{buf.length.to_s(16)}#{NL}#{buf}#{NL}")
+              else
+                @socket.write(buf)
+              end
             end
           end
-          
-          file.close
         else
           loop do
             break if data[:done] and data[:str].size <= 0 

data/lib/include/class_httpsession_http_request.rb

@@ -1,4 +1,3 @@
-require "uri"
 require "knj/web"
 
 #If we are running on JRuby or Rubinius this will seriously speed things up if we are behind a proxy.
@@ -18,40 +17,56 @@ class Knjappserver::Httpsession::Http_request
 	end
 	
 	#Reads content from the socket until the end of headers. Also does various error-checks.
-	def read_socket
+	def read_socket(socket, cont)
 		loop do
-			raise Errno::ECONNRESET, "Socket closed." if @socket.closed?
-			read = @socket.gets
+			raise Errno::ECONNRESET, "Socket closed." if socket.closed?
+			read = socket.gets
 			raise Errno::ECONNRESET, "Socket returned non-string: '#{read.class.name}'." if !read.is_a?(String)
-			@cont << read
-			break if @cont[-4..-1] == "\r\n\r\n" or @cont[-2..-1] == "\n\n"
+			cont << read
+			break if cont[-4..-1] == "\r\n\r\n" or cont[-2..-1] == "\n\n"
 		end
 	end
 	
+	def reset
+    @modified_since = nil
+    @get = nil
+    @post = nil
+    @cookie = nil
+    @meta = nil
+    @page_path = nil
+    @headers = nil
+    @http_version = nil
+    @read = nil
+    @clength = nil
+    @speec = nil
+    @percent = nil
+    @secs_left = nil
+	end
+	
 	#Generates data on object from the given socket.
 	def socket_parse(socket)
-    @modified_since = nil
-		@cont = ""
-		@socket = socket
-		self.read_socket
+    self.reset
+		cont = ""
+		self.read_socket(socket, cont)
 		
 		#Parse URI (page_path and get).
-		match = @cont.match(/^(GET|POST|HEAD)\s+(.+)\s+HTTP\/1\.(\d+)\s*/)
-		raise "Could not parse request: '#{@cont.split("\n").first}'." if !match
+		match = cont.match(/^(GET|POST|HEAD)\s+(.+)\s+HTTP\/1\.(\d+)\s*/)
+		raise "Could not parse request: '#{cont.split("\n").first}'." if !match
     
 		@http_version = "1.#{match[3]}"
 		
 		method = match[1]
-		@cont = @cont.gsub(match[0], "")
-		uri = URI.parse(match[2])
+		cont = cont.gsub(match[0], "")
+		
+		uri = Knj::Web.parse_uri(match[2])
 		
-		page_filepath = Knj::Web.urldec(uri.path)
+		page_filepath = Knj::Web.urldec(uri[:path])
 		if page_filepath.length <= 0 or page_filepath == "/" or File.directory?("#{@kas.config[:doc_root]}/#{page_filepath}")
 			page_filepath = "#{page_filepath}/#{@kas.config[:default_page]}"
 		end
 		
 		@page_path = "#{@kas.config[:doc_root]}/#{page_filepath}"
-		@get = Knj::Web.parse_urlquery(uri.query.to_s, {:urldecode => true, :force_utf8 => true})
+		@get = Knj::Web.parse_urlquery(uri[:query], {:urldecode => true, :force_utf8 => true})
 		
     if @get["_kas_httpsession_id"]
       @kas.httpsessions_ids[@get["_kas_httpsession_id"]] = @args[:httpsession]
@@ -63,12 +78,12 @@ class Knjappserver::Httpsession::Http_request
       @cookie = {}
       @meta = {
         "REQUEST_METHOD" => method,
-        "QUERY_STRING" => uri.query,
+        "QUERY_STRING" => uri[:query],
         "REQUEST_URI" => match[2],
-        "SCRIPT_NAME" => uri.path
+        "SCRIPT_NAME" => uri[:path]
       }
       
-      @cont.scan(/^(\S+):\s*(.+)\r\n/) do |header_match|
+      cont.scan(/^(\S+):\s*(.+)\r\n/) do |header_match|
         key = header_match[0].downcase
         val = header_match[1]
         
@@ -141,8 +156,8 @@ class Knjappserver::Httpsession::Http_request
           read_size = @clength - @read
           read_size = 4096 if read_size > 4096
           
-          raise Errno::ECONNRESET, "Socket closed." if @socket.closed?
-          read = @socket.read(read_size)
+          raise Errno::ECONNRESET, "Socket closed." if socket.closed?
+          read = socket.read(read_size)
           raise Errno::ECONNRESET, "Socket returned non-string: '#{read.class.name}'." if !read.is_a?(String)
           post_data << read
           @read += read.length

data/lib/include/class_httpsession_http_response.rb

@@ -59,6 +59,9 @@ class Knjappserver::Httpsession::Http_response
   end
   
   def header(key, val)
+    lines = val.to_s.count("\n") + 1
+    raise "Value contains more lines than 1 (#{lines})." if lines > 1
+    
     if !@headers_sent
       @headers[key.to_s.downcase] = [key, val]
     else

data/lib/include/class_httpsession_page_environment.rb

@@ -0,0 +1,66 @@
+#This class handels all the magic-methods in a different way - by defining them as methods on the binding for the .rhtml-pages.
+class Knjappserver::Httpsession::Page_environment
+  def initialize(args = {})
+    @args = args
+  end
+  
+  def get_binding
+    return binding
+  end
+  
+  def _buf
+    return $stdout
+  end
+  
+  def _cookie
+    return @args[:httpsession].cookie
+  end
+  
+  def _db
+    return @args[:kas].db_handler
+  end
+  
+  def _get
+    return @args[:httpsession].get
+  end
+  
+  def _kas
+    return @args[:kas]
+  end
+  
+  alias _requestdata _kas
+  
+  def _kas_vars
+    return @args[:kas].vars
+  end
+  
+  def _httpsession
+    return @args[:httpsession]
+  end
+  
+  def _httpsession_var
+    return @args[:httpsession].httpsession_var
+  end
+  
+  def _post
+    return @args[:httpsession].post
+  end
+  
+  def _meta
+    return @args[:httpsession].meta
+  end
+  
+  alias _server _meta
+  
+  def _session
+    return @args[:httpsession].session.sess_data
+  end
+  
+  def _session_hash
+    return @args[:httpsession].session_hash
+  end
+  
+  def _session_obj
+    return @args[:httpsession].session
+  end
+end

data/lib/include/class_knjappserver.rb

@@ -5,6 +5,7 @@ class Knjappserver
   appsrv_dir = File.dirname(__FILE__)
   autoload :ERBHandler, "#{appsrv_dir}/class_erbhandler"
   autoload :Log, "#{appsrv_dir}/class_log.rb"
+  autoload :Log_link, "#{appsrv_dir}/class_log_link.rb"
   
   def initialize(config)
     raise "No arguments given." if !config.is_a?(Hash)
@@ -67,8 +68,6 @@ class Knjappserver
     @path_knjappserver = File.dirname(__FILE__)
     if @config[:knjrbfw_path]
       @path_knjrbfw = @config[:knjrbfw_path]
-    elsif $knjappserver_config and $knjappserver_config["knjrbfw"]
-      @path_knjrbfw = $knjappserver_config["knjrbfw"]
     else
       @path_knjrbfw = ""
     end
@@ -232,8 +231,7 @@ class Knjappserver
     
     #Save the PID to the run-file.
     print "Setting run-file.\n" if @debug
-    require "tmpdir"
-    tmpdir = "#{Dir.tmpdir}/knjappserver"
+    tmpdir = "#{Knj::Os.tmpdir}/knjappserver"
     tmppath = "#{tmpdir}/run_#{@config[:title]}"
     
     if !File.exists?(tmpdir)
@@ -372,8 +370,8 @@ class Knjappserver
       STDOUT.print "Threadpool startet.\n" if @debug
       @httpserv.start
       STDOUT.print "Appserver startet.\n" if @debug
-    rescue Interrupt
-      STDOUT.print "Got interrupt - stopping appserver.\n" if @debug
+    rescue Interrupt => e
+      STDOUT.print "Got interrupt - trying to stop appserver.\n" if @debug
       self.stop
     end
   end
@@ -392,12 +390,10 @@ class Knjappserver
       self.sessions_flush
     }
     
-    #If we cant get a paused-execution in 10 secs - we just force the stop.
+    #If we cant get a paused-execution in 5 secs - we just force the stop.
     begin
-      Timeout.timeout(10) do
-        self.paused_exec do
-          proc_stop.call
-        end
+      Timeout.timeout(5) do
+        self.paused_exec(&proc_stop)
       end
     rescue Timeout::Error, SystemExit, Interrupt
       STDOUT.print "Forcing stop-appserver - couldnt get timing window.\n" if @debug
@@ -423,12 +419,15 @@ class Knjappserver
   
   #Will stop handeling any more HTTP-requests, run the proc given and return handeling HTTP-requests.
   def paused_exec
+    raise "No block given." if !block_given?
     self.pause
     
     begin
       sleep 0.2 while @httpserv and @httpserv.working_count and @httpserv.working_count > 0
       @paused_mutex.synchronize do
-        yield
+        Timeout.timeout(15) do
+          yield
+        end
       end
     ensure
       self.unpause

data/lib/include/class_knjappserver_cleaner.rb

@@ -8,7 +8,7 @@ class Knjappserver
     
     #This should not be runned via _kas.timeout because timeout wont run when @should_restart is true! - knj
     Thread.new do
-        begin
+      begin
         loop do
           sleep time
           
@@ -91,51 +91,43 @@ class Knjappserver
     end
     
     #This flushes (writes) all session-data to the server and deletes old unused sessions from the database.
-    self.timeout(:time => @config[:cleaner_timeout]) do
-      self.clean
-    end
+    self.timeout(:time => @config[:cleaner_timeout], &self.method("clean"))
 	end
 	
 	#This method can be used to clean the appserver. Dont call this from a HTTP-request.
 	def clean
-    self.paused_exec do
-      STDOUT.print "Cleaning sessions on appserver.\n" if @config[:debug]
-      
-      #Clean up various inactive sessions.
-      session_not_ids = []
-      time_check = Time.now.to_i - 300
-      newsessions = {}
-      @sessions.each do |session_hash, session_data|
-        session_data[:dbobj].flush
-        
-        if session_data[:time_lastused].to_i > time_check
-          newsessions[session_hash] = session_data
-          session_not_ids << session_data[:dbobj].id
-        end
-      end
-      
-      @sessions = newsessions
+    STDOUT.print "Cleaning sessions on appserver.\n" if @config[:debug]
+    
+    #Clean up various inactive sessions.
+    session_not_ids = []
+    time_check = Time.now.to_i - 300
+    newsessions = {}
+    @sessions.each do |session_hash, session_data|
+      session_data[:dbobj].flush
       
-      STDOUT.print "Delete sessions...\n" if @config[:debug]
-      @ob.list(:Session, {"id_not" => session_not_ids, "date_lastused_below" => (Time.now - 5356800)}) do |session|
-        idhash = session[:idhash]
-        STDOUT.print "Deleting session: '#{session.id}'.\n" if @config[:debug]
-        @ob.delete(session)
-        @sessions.delete(idhash)
+      if session_data[:time_lastused].to_i > time_check
+        newsessions[session_hash] = session_data
+        session_not_ids << session_data[:dbobj].id
       end
-      
-      
-      #Clean database weak references from the tables-module.
-      @db.clean
-      
-      #Clean the object-handler.
-      @ob.clean_all
-      
-      #Run garbage-collector.
-      GC.start
-      
-      #Call various user-connected methods.
-      @events.call(:on_clean) if @events
     end
+    
+    @sessions = newsessions
+    
+    STDOUT.print "Delete sessions...\n" if @config[:debug]
+    @ob.list(:Session, {"id_not" => session_not_ids, "date_lastused_below" => (Time.now - 5356800)}) do |session|
+      idhash = session[:idhash]
+      STDOUT.print "Deleting session: '#{session.id}'.\n" if @config[:debug]
+      @ob.delete(session)
+      @sessions.delete(idhash)
+    end
+    
+    #Clean database weak references from the tables-module.
+    @db.clean
+    
+    #Clean the object-handler.
+    @ob.clean_all
+    
+    #Call various user-connected methods.
+    @events.call(:on_clean) if @events
 	end
 end

data/lib/include/class_knjappserver_errors.rb

@@ -93,10 +93,10 @@ class Knjappserver
         end
         
         html = "An error occurred.<br /><br />"
-        html << "<b>#{e.class.name.html}: #{e.message.html}</b><br /><br />"
+        html << "<b>#{Knj::Web.html(e.class.name)}: #{Knj::Web.html(e.message)}</b><br /><br />"
         
         e.backtrace.each do |line|
-          html << line.html + "<br />"
+          html << "#{Knj::Web.html(line)}<br />"
         end
         
         html << "<br /><b>Post:</b><br /><pre>#{Knj::Php.print_r(_post, true)}</pre>" if _post

data/lib/include/class_knjappserver_logging.rb

@@ -112,7 +112,27 @@ class Knjappserver
 		end
 	end
 	
+	#Converts fileuploads into strings so logging wont be crazy big.
+	def log_hash_safe(hash)
+    hash_obj = {}
+    hash.each do |key, val|
+      if val.is_a?(Knjappserver::Httpsession::Post_multipart::File_upload)
+        hash_obj[key] = "<Fileupload>"
+      elsif val.is_a?(Hash)
+        hash_obj[key] = self.log_hash_safe(val)
+      else
+        hash_obj[key] = val
+      end
+    end
+    
+    return hash_obj
+	end
+	
+	#Handles the hashes that should be logged.
 	def log_hash_ins(hash_obj)
+    #Sort out fileuploads - it would simply bee too big to log this.
+    hash_obj = self.log_hash_safe(hash_obj)
+    
 		inserts_links = []
 		ret = {}
 		[:keys, :values].each do |type|
@@ -269,6 +289,18 @@ class Knjappserver
 		end
 	end
 	
+	#Deletes all logs for an object.
+	def logs_delete(obj)
+    @ob.list(:Log_link, {"object_class" => obj.class.name, "object_id" => obj.id}) do |log_link|
+      log = log_link.log
+      @ob.delete(log_link)
+      
+      if log
+        @ob.delete(log) if log.links("count" => true) <= 0
+      end
+    end
+	end
+	
 	#Returns the HTML for a table with logs from a given object.
 	def logs_table(obj, args = {})
 		links = @ob.list(:Log_link, {"object_class" => obj.class.name, "object_id" => obj.id, "limit" => 500, "orderby" => [["id", "desc"]]})

data/lib/include/class_knjappserver_mailing.rb

@@ -48,7 +48,7 @@ class Knjappserver
       begin
         #Use subprocessing to avoid the mail-framework (activesupport and so on, also possible memory leaks in those large frameworks).
         require "knj/process_meta"
-        subproc = Knj::Process_meta.new("debug" => @debug, "debug_err" => true)
+        subproc = Knj::Process_meta.new("debug" => @debug, "debug_err" => true, "id" => "knjappserver_mailing")
         subproc.static("Object", "require", "rubygems")
         subproc.static("Object", "require", "mail")
         subproc.static("Object", "require", "#{@config[:knjrbfw_path]}knjrbfw")

data/lib/include/class_knjappserver_threadding_timeout.rb

@@ -49,7 +49,14 @@ class Knjappserver::Threadding_timeout
               
               begin
                 @running = true
-                @args[:block].call(*@args[:args])
+                
+                if @args.key?(:timeout)
+                  Timeout.timeout(@args[:timeout]) do
+                    @args[:block].call(*@args[:args])
+                  end
+                else
+                  @args[:block].call(*@args[:args])
+                end
               ensure
                 @running = false
                 @kas.ob.db.free_thread if @kas.ob.db.opts[:threadsafe]

data/lib/include/class_knjappserver_translations.rb

@@ -1,13 +1,6 @@
 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
-    
+    args[:locale] = self.trans_locale if !args[:locale]
     trans_val = @translations.get(obj, key, args).to_s
     
     if trans_val.length <= 0
@@ -17,12 +10,24 @@ class Knjappserver
     return trans_val
   end
   
-  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]
+  def trans_locale(args = {})
+    if args.is_a?(Hash) and args[:locale]
+      return args[:locale]
+    elsif _session and _session[:locale]
+      return _session[:locale]
+    elsif _httpsession and _httpsession.data[:locale]
+      return _httpsession.data[:locale]
+    elsif Thread.current[:locale]
+      return Thread.current[:locale]
+    elsif @config[:locale_default]
+      return @config[:locale_default]
     end
     
+    raise "Could not figure out locale."
+  end
+  
+  def trans_set(obj, values, args = {})
+    args[:locale] = self.trans_locale if !args[:locale]
     @translations.set(obj, values, args)
   end
   

data/lib/include/class_log.rb

@@ -25,6 +25,13 @@ class Knjappserver::Log < Knj::Datarow
 			case key
 				when "object_lookup"
           sql << " AND Log_link.id IS NOT NULL"
+        when "tag"
+          data_val = d.ob.get_by(:Log_data_value, {"value" => val})
+          if !data_val
+            sql << " AND false"
+          else
+            sql << " AND Log.tag_data_id = '#{d.db.esc(data_val.id)}'"
+          end
 				else
 					raise "Invalid key: #{key}."
 				end

data/lib/include/class_log_link.rb

@@ -4,9 +4,15 @@ class Knjappserver::Log_link < Knj::Datarow
   ]
   
 	def self.list(d, &block)
-		sql = "SELECT * FROM #{table} WHERE 1=1"
+    if d.args["count"]
+      sql = "SELECT COUNT(id) AS count FROM #{table} WHERE 1=1"
+      count = true
+      d.args.delete("count")
+    else
+      sql = "SELECT * FROM #{table} WHERE 1=1"
+    end
 		
-		ret = list_helper(d)
+		ret = self.list_helper(d)
 		d.args.each do |key, val|
       case key
         when "object_class"
@@ -19,6 +25,9 @@ class Knjappserver::Log_link < Knj::Datarow
 		end
 		
 		sql << ret[:sql_where]
+		
+		return d.db.query(sql).fetch[:count].to_i if count
+		
 		sql << ret[:sql_order]
 		sql << ret[:sql_limit]
 		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 +01:00
+date: 2012-04-26 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &12366780 !ruby/object:Gem::Requirement
+  requirement: &10828140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12366780
+  version_requirements: *10828140
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &12365600 !ruby/object:Gem::Requirement
+  requirement: &10827060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12365600
+  version_requirements: *10827060
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &12365060 !ruby/object:Gem::Requirement
+  requirement: &10826360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12365060
+  version_requirements: *10826360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &12364340 !ruby/object:Gem::Requirement
+  requirement: &10825400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *12364340
+  version_requirements: *10825400
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12363160 !ruby/object:Gem::Requirement
+  requirement: &10824260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12363160
+  version_requirements: *10824260
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12362140 !ruby/object:Gem::Requirement
+  requirement: &10822320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *12362140
+  version_requirements: *10822320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &12352800 !ruby/object:Gem::Requirement
+  requirement: &10821260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12352800
+  version_requirements: *10821260
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &12352260 !ruby/object:Gem::Requirement
+  requirement: &10820300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12352260
+  version_requirements: *10820300
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &12351520 !ruby/object:Gem::Requirement
+  requirement: &10819440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +110,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12351520
+  version_requirements: *10819440
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -145,6 +145,7 @@ files:
 - lib/include/class_httpsession_contentgroup.rb
 - lib/include/class_httpsession_http_request.rb
 - lib/include/class_httpsession_http_response.rb
+- lib/include/class_httpsession_page_environment.rb
 - lib/include/class_httpsession_post_multipart.rb
 - lib/include/class_knjappserver.rb
 - lib/include/class_knjappserver_cleaner.rb
@@ -207,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 894779464839235539
+      hash: -1162266061337157012
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: