knjappserver 0.0.26 → 0.0.28

data/Gemfile

@@ -7,6 +7,8 @@ gem "knjrbfw"
 gem "erubis"
 gem "mail"
 gem "tsafe"
+gem "datet"
+gem "http2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,9 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    datet (0.0.0)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
+    http2 (0.0.0)
+      knjrbfw
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
@@ -40,7 +43,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  datet
   erubis
+  http2
   jeweler (~> 1.6.3)
   json
   knjrbfw

data/VERSION

@@ -1 +1 @@
-0.0.26
+0.0.28

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.26"
+  s.version = "0.0.28"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-04}
+  s.date = %q{2012-07-14}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -104,6 +104,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<mail>, [">= 0"])
       s.add_runtime_dependency(%q<tsafe>, [">= 0"])
+      s.add_runtime_dependency(%q<datet>, [">= 0"])
+      s.add_runtime_dependency(%q<http2>, [">= 0"])
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -114,6 +116,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<mail>, [">= 0"])
       s.add_dependency(%q<tsafe>, [">= 0"])
+      s.add_dependency(%q<datet>, [">= 0"])
+      s.add_dependency(%q<http2>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -125,6 +129,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<mail>, [">= 0"])
     s.add_dependency(%q<tsafe>, [">= 0"])
+    s.add_dependency(%q<datet>, [">= 0"])
+    s.add_dependency(%q<http2>, [">= 0"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])

data/lib/files/database_schema.rb

@@ -93,7 +93,7 @@ class Knjappserver
           {"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" => "date_lastused", "type" => "datetime", "on_created" => proc{|d| d["db"].query("UPDATE Session SET date_lastused = '#{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."}

data/lib/include/class_customio.rb

@@ -11,8 +11,13 @@ class Knjappserver::CustomIO < StringIO
 		end
 	end
 	
+	def puts(str)
+    res = self.print(str)
+    self.print "\n"
+    return res
+	end
+	
 	alias << print
 	alias write print
 	alias p print
-	alias puts print
 end

data/lib/include/class_httpsession.rb

@@ -261,7 +261,7 @@ class Knjappserver::Httpsession
     
     begin
       @session, @session_hash = @kas.session_fromid(@ip, @session_id, @meta)
-    rescue Knj::Errors::InvalidData => e
+    rescue ArgumentError => e
       #User should not have the session he asked for because of invalid user-agent or invalid IP.
       @session_id = @kas.session_generate_id(@meta)
       @session, @session_hash = @kas.session_fromid(@ip, @session_id, @meta)
@@ -334,7 +334,7 @@ class Knjappserver::Httpsession
             @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
+              request_mod = Datet.in(@headers["if-modified-since"].first).time
               
               if request_mod == lastmod
                 @resp.status = 304

data/lib/include/class_httpsession_http_request.rb

@@ -204,7 +204,7 @@ class Knjappserver::Httpsession::Http_request
     mod_match = @meta["HTTP_IF_MODIFIED_SINCE"].match(/^([A-z]+),\s+(\d+)\s+([A-z]+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s+(.+)$/)
     raise "Could not parse 'HTTP_IF_MODIFIED_SINCE'." if !mod_match
     
-    month_no = Knj::Datet.month_str_to_no(mod_match[3])
+    month_no = Datet.month_str_to_no(mod_match[3])
     @modified_since = Time.utc(mod_match[4].to_i, month_no, mod_match[2].to_i, mod_match[5].to_i, mod_match[6].to_i, mod_match[7].to_i)
     
     return @modified_since

data/lib/include/class_knjappserver.rb

@@ -138,7 +138,7 @@ class Knjappserver
       require "base64"
       require "stringio"
       require "socket"
-      require "tsafe"
+      require "tsafe" if !Kernel.const_defined?(:Tsafe)
       
       files += [
         "#{@path_knjrbfw}knj/event_handler.rb",

data/lib/include/class_knjappserver_errors.rb

@@ -34,8 +34,8 @@ class Knjappserver
           if error_email[:messages].length == 1
             html = error_email[:messages].first
           else
-            html = "<b>First time:</b> #{Knj::Datet.in(error_email[:first_time]).out}<br />"
-            html << "<b>Last time:</b> #{Knj::Datet.in(error_email[:last_time]).out}<br />"
+            html = "<b>First time:</b> #{Datet.in(error_email[:first_time]).out}<br />"
+            html << "<b>Last time:</b> #{Datet.in(error_email[:last_time]).out}<br />"
             html << "<b>Number of errors:</b> #{error_email[:messages].length}<br />"
             count = 0
             

data/lib/include/class_knjappserver_logging.rb

@@ -179,7 +179,7 @@ class Knjappserver
     begin
       keys_data_obj = @ob.get(:Log_data, keys_id)
       values_data_obj = @ob.get(:Log_data, values_id)
-    rescue Knj::Errors::NotFound
+    rescue Errno::ENOENT
       return {}
     end
 		
@@ -357,4 +357,42 @@ class Knjappserver
 		
 		return html
 	end
+	
+	#Removes all logs for objects that have been deleted.
+	#===Examples
+	#Remember to pass Knj::Objects-object handler to the method.
+	# appsrv.logs_delete_dead(:ob => ob, :debug => false)
+	def logs_delete_dead(args)
+    raise "No :ob-argument given." if !args[:ob]
+    
+    @db.q_buffer do |db_buffer|
+      STDOUT.puts "Starting to look for dead log-links." if @debug or args[:debug]
+      @ob.list(:Log_link, :cloned_ubuf => true) do |log_link|
+        classname = log_link.object_class.to_s.split("::").last
+        obj_exists = args[:ob].exists?(classname, log_link[:object_id])
+        next if obj_exists
+        
+        log = log_link.log
+        
+        STDOUT.puts "Deleting log-link #{log_link.id} for #{classname}(#{log_link[:object_id]})." if @debug or args[:debug]
+        @ob.delete(log_link, :db_buffer => db_buffer)
+        
+        links_count = log.links("count" => true)
+        
+        if links_count <= 0
+          STDOUT.puts "Deleting log #{log.id} because it has no more links." if @debug or args[:debug]
+          @ob.delete(log, :db_buffer => db_buffer)
+        end
+      end
+      
+      STDOUT.puts "Starting to look for logs with no links." if @debug or args[:debug]
+      @ob.list(:Log, {
+        [:Log_link, "id"] => {:type => :sqlval, :val => :null},
+        :cloned_ubuf => true
+      }) do |log|
+        STDOUT.puts "Deleting log #{log.id} because it has no links: '#{log.text}'." if @debug or args[:debug]
+        @ob.delete(log, :db_buffer => db_buffer)
+      end
+    end
+	end
 end

data/lib/include/class_knjappserver_sessions.rb

@@ -1,6 +1,6 @@
 class Knjappserver
   def initialize_sessions
-    require "tsafe"
+    require "tsafe" if !Kernel.const_defined?(:Tsafe)
     @sessions = Tsafe::MonHash.new
   end
   
@@ -29,7 +29,7 @@ class Knjappserver
     end
     
     if ip != "bot" and !session.remember? and ip.to_s != session[:ip].to_s
-      raise Knj::Errors::InvalidData, "Invalid IP."
+      raise ArgumentError, "Invalid IP."
     end
     
     @sessions[idhash][:time_lastused] = Time.now

data/lib/include/class_knjappserver_web.rb

@@ -2,7 +2,7 @@ class Knjappserver
   #Imports a .rhtml-file and executes it.
   def import(filepath)
     if filepath.to_s.index("../proc/self") != nil
-      raise Knj::Errors::NoAccess, "Possible attempt to hack the appserver."
+      raise Errno::EACCES, "Possible attempt to hack the appserver."
     end
     
     _httpsession.eruby.import(filepath)

data/lib/include/class_log.rb

@@ -18,10 +18,13 @@ class Knjappserver::Log < Knj::Datarow
 			"
 		end
 		
+		q_args = nil
 		return_sql = false
+		ret = self.list_helper(d)
+		
+		sql << ret[:sql_joins]
 		sql << " WHERE 1=1"
 		
-		ret = list_helper(d)
 		d.args.each do |key, val|
 			case key
 				when "object_lookup"
@@ -35,6 +38,8 @@ class Knjappserver::Log < Knj::Datarow
           else
             sql << " AND Log.tag_data_id = '#{d.db.esc(data_val.id)}'"
           end
+        when :cloned_ubuf
+          q_args = {:cloned_ubuf => true}
 				else
 					raise "Invalid key: #{key}."
 				end
@@ -46,7 +51,7 @@ class Knjappserver::Log < Knj::Datarow
 		
 		return sql if return_sql
 		
-		return d.ob.list_bysql(:Log, sql, &block)
+		return d.ob.list_bysql(:Log, sql, q_args, &block)
 	end
 	
 	def self.add(d)

data/lib/include/class_log_link.rb

@@ -11,14 +11,19 @@ class Knjappserver::Log_link < Knj::Datarow
     else
       sql = "SELECT * FROM #{table} WHERE 1=1"
     end
-		
+    
+    q_args = nil
 		ret = self.list_helper(d)
+		sql << ret[:sql_joins]
+		
 		d.args.each do |key, val|
       case key
         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])}'"
+        when :cloned_ubuf
+          q_args = {:cloned_ubuf => true}
         else
           raise "Invalid key: #{key}."
       end
@@ -31,7 +36,7 @@ class Knjappserver::Log_link < Knj::Datarow
 		sql << ret[:sql_order]
 		sql << ret[:sql_limit]
 		
-		return d.ob.list_bysql(:Log_link, sql, &block)
+		return d.ob.list_bysql(:Log_link, sql, q_args, &block)
 	end
 	
 	def self.add(d)
@@ -49,7 +54,7 @@ class Knjappserver::Log_link < Knj::Datarow
 		begin
 			class_name = ob.get(:Log_data_value, self[:object_class_value_id])[:value].split("::").last
 			return ob_use.get(class_name, self[:object_id])
-		rescue Knj::Errors::NotFound
+		rescue Errno::ENOENT
 			return false
 		end
 	end

data/lib/pages/logs_show.rhtml

@@ -14,7 +14,7 @@
 		print Knj::Web.inputs([{
 			:title => _("Date"),
 			:type => :info,
-			:value => Knj::Datet.in(log[:date_saved]).out
+			:value => Datet.in(log[:date_saved]).out
 		}])
 		
 		if ob

data/lib/scripts/benchmark.rb

@@ -57,7 +57,7 @@ count_requests = 0
   Knj::Thread.new(count_thread) do |count_thread|
     print "Thread #{count_thread} started.\n"
     
-    http = Knj::Http2.new(
+    http = Http2.new(
       :host => "localhost",
       :port => 15081,
       :user_agent => "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.1; debugid:#{count_thread}) Gecko/20060111 Firefox/3.6.0.1",
@@ -65,7 +65,7 @@ count_requests = 0
     )
     
     loop do
-      resp = http.get(args[:filename])
+      resp = http.get(:url => args[:filename])
       count_requests += 1
       raise "Invalid code: #{resp.code}\n" if resp.code.to_i != 200
     end

data/lib/scripts/knjappserver_cgi.rb

@@ -71,7 +71,7 @@ begin
   port = knjappserver.port
   
   #Make request.
-  http = Knj::Http2.new(:host => "localhost", :port => port)
+  http = Http2.new(:host => "localhost", :port => port)
   
   #Spawn CGI-variable to emulate FCGI part.
   cgi = Cgi_is_retarded.new
@@ -102,7 +102,7 @@ begin
   
   if cgi.request_method == "POST" and cgi.content_type.to_s.downcase.index("multipart/form-data") != nil
     count = 0
-    http.post_multipart(url, Knjappserver.convert_fcgi_post(cgi.params), {
+    http.post_multipart(:url => url, :post => Knjappserver.convert_fcgi_post(cgi.params),
       :default_headers => headers,
       :cookies => false,
       :on_content => proc{|line|
@@ -112,7 +112,7 @@ begin
     })
   elsif cgi.request_method == "POST"
     count = 0
-    http.post(url, Knjappserver.convert_fcgi_post(cgi.params), {
+    http.post(:url => url, :post => Knjappserver.convert_fcgi_post(cgi.params),
       :default_headers => headers,
       :cookies => false,
       :on_content => proc{|line|

data/lib/scripts/knjappserver_fcgi.rb

@@ -34,7 +34,7 @@ class Knjappserver
     knjappserver.start
     
     port = knjappserver.port
-    http = Knj::Http2.new(:host => "localhost", :port => port)
+    http = Http2.new(:host => "localhost", :port => port)
     
     return [knjappserver, http]
   end
@@ -94,7 +94,7 @@ FCGI.each_cgi do |cgi|
     
     if cgi.request_method == "POST" and cgi.content_type.to_s.downcase.index("multipart/form-data") != nil
       count = 0
-      http.post_multipart(url, Knjappserver.convert_fcgi_post(cgi.params), {
+      http.post_multipart(:url => url, :post => Knjappserver.convert_fcgi_post(cgi.params),
         :default_headers => headers,
         :cookies => false,
         :on_content => proc{|line|
@@ -104,7 +104,7 @@ FCGI.each_cgi do |cgi|
       })
     elsif cgi.request_method == "POST"
       count = 0
-      http.post(url, Knjappserver.convert_fcgi_post(cgi.params), {
+      http.post(:url => url, :post => Knjappserver.convert_fcgi_post(cgi.params),
         :default_headers => headers,
         :cookies => false,
         :on_content => proc{|line|
@@ -114,7 +114,7 @@ FCGI.each_cgi do |cgi|
       })
     else
       count = 0
-      http.get(url, {
+      http.get(:url => url,
         :default_headers => headers,
         :cookies => false,
         :on_content => proc{|line|

metadata

@@ -2,7 +2,7 @@
 name: knjappserver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.26
+  version: 0.0.28
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-04 00:00:00 +02:00
+date: 2012-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,19 +58,41 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: datet
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: http2
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: json
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,10 +100,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,10 +111,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -100,10 +122,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -111,7 +133,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id011
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables: 
@@ -208,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3766508252438613801
+      hash: -3350207244681983238
       segments: 
       - 0
       version: "0"