knjappserver 0.0.28 → 0.0.29

data/Gemfile.lock

@@ -1,19 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    datet (0.0.0)
+    datet (0.0.10)
     diff-lcs (1.1.3)
     erubis (2.7.0)
     git (1.2.5)
-    http2 (0.0.0)
-      knjrbfw
+    http2 (0.0.4)
     i18n (0.6.0)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
     json (1.7.3)
-    knjrbfw (0.0.53)
+    knjrbfw (0.0.66)
+      datet
+      http2
       tsafe
       wref
     mail (2.4.4)

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-07-14}
+  s.date = %q{2012-07-20}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]

data/lib/include/class_httpsession.rb

@@ -1,7 +1,7 @@
 #This class handels the HTTP-sessions.
 class Knjappserver::Httpsession
   attr_accessor :data, :alert_sent
-  attr_reader :cookie, :get, :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
+  attr_reader :cookie, :get, :headers, :session, :session_id, :session_hash, :kas, :active, :out, :eruby, :browser, :debug, :resp, :page_path, :post, :cgroup, :meta, :httpsession_var, :handler, :working
   
   #Autoloader for subclasses.
   def self.const_missing(name)

data/lib/include/class_knjappserver.rb

@@ -1,3 +1,11 @@
+require "timeout"
+require "digest"
+require "erubis"
+require "base64"
+require "stringio"
+require "socket"
+require "tsafe" if !Kernel.const_defined?(:Tsafe)
+
 #The class that stands for the whole appserver / webserver.
 #===Examples
 # appsrv = Knjappserver.new(
@@ -35,6 +43,14 @@ class Knjappserver
     raise "No ':doc_root' was given in arguments." if !@config.has_key?(:doc_root)
     
     
+    #Require gems.
+    gems = %w[datet]
+    gems.each do |gem|
+      puts "Loading gem: '#{gem}'." if @debug
+      require gem
+    end
+    
+    
     #Setup default handlers if none are given.
     if !@config.has_key?(:handlers)
       @erbhandler = Knjappserver::ERBHandler.new
@@ -121,8 +137,6 @@ class Knjappserver
     #Load various required files from knjrbfw and stuff in the knjappserver-framework.
     files = [
       "#{@path_knjrbfw}knjrbfw.rb",
-      "#{@path_knjappserver}/class_httpserver.rb",
-      "#{@path_knjappserver}/class_httpsession.rb",
       "#{@path_knjappserver}/class_knjappserver_errors.rb",
       "#{@path_knjappserver}/class_knjappserver_logging.rb",
       "#{@path_knjappserver}/class_knjappserver_mailing.rb",
@@ -131,35 +145,6 @@ class Knjappserver
       "#{@path_knjappserver}/class_knjappserver_web.rb"
     ]
     
-    if @config[:preload]
-      require "timeout"
-      require "digest"
-      require "erubis"
-      require "base64"
-      require "stringio"
-      require "socket"
-      require "tsafe" if !Kernel.const_defined?(:Tsafe)
-      
-      files += [
-        "#{@path_knjrbfw}knj/event_handler.rb",
-        "#{@path_knjrbfw}knj/errors.rb",
-        "#{@path_knjrbfw}knj/eruby.rb",
-        "#{@path_knjrbfw}knj/hash_methods.rb",
-        "#{@path_knjrbfw}knj/objects.rb",
-        "#{@path_knjrbfw}knj/web.rb",
-        "#{@path_knjrbfw}knj/datarow.rb",
-        "#{@path_knjrbfw}knj/datet.rb",
-        "#{@path_knjrbfw}knj/php.rb",
-        "#{@path_knjrbfw}knj/thread.rb",
-        "#{@path_knjrbfw}knj/threadhandler.rb",
-        "#{@path_knjrbfw}knj/threadpool.rb",
-        "#{@path_knjrbfw}knj/translations.rb",
-        "#{@path_knjrbfw}knj/knjdb/libknjdb.rb",
-      ]
-    else
-      files << "#{@path_knjrbfw}knj/autoload.rb"
-    end
-    
     files << "#{@path_knjrbfw}knj/gettext_threadded.rb" if @config[:locales_root]
     files.each do |file|
       STDOUT.print "Loading: '#{file}'.\n" if @debug

data/lib/include/class_knjappserver_sessions.rb

@@ -1,6 +1,5 @@
 class Knjappserver
   def initialize_sessions
-    require "tsafe" if !Kernel.const_defined?(:Tsafe)
     @sessions = Tsafe::MonHash.new
   end
   

data/lib/include/class_knjappserver_web.rb

@@ -1,5 +1,7 @@
 class Knjappserver
   #Imports a .rhtml-file and executes it.
+  #===Examples
+  # _kas.import("/some/path/page.rhtml")
   def import(filepath)
     if filepath.to_s.index("../proc/self") != nil
       raise Errno::EACCES, "Possible attempt to hack the appserver."
@@ -9,6 +11,9 @@ class Knjappserver
   end
   
   #Redirects to another URL.
+  #===Examples
+  # _kas.redirect("someotherpage.rhtml")
+  # _kas.redirect("newpage.rhtml", :perm => true)
   def redirect(url, args = {})
     #Header way
     if !_httpsession.alert_sent and !self.headers_sent?
@@ -26,6 +31,8 @@ class Knjappserver
   end
   
   #Sends a javascript-alert to the HTML.
+  #===Examples
+  # _kas.alert("Hello world!")
   def alert(msg)
     _httpsession.alert_sent = true
     Knj::Web.alert(msg)
@@ -33,6 +40,8 @@ class Knjappserver
   end
   
   #Define a cookies in the clients browser.
+  #===Examples
+  # _kas.cookie(:name => "MyCookie", :value => "Trala")
   def cookie(cookie)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
@@ -41,6 +50,8 @@ class Knjappserver
   end
   
   #Sends a header to the clients browser.
+  #===Examples
+  # _kas.header("Content-Type", "text/javascript")
   def header(key, val)
     raise "No HTTP-session attached to this thread." if !_httpsession
     raise "HTTP-session not active." if !_httpsession.resp
@@ -54,17 +65,56 @@ class Knjappserver
     Knj::Php.header(str)
   end
   
+  #Returns true if the headers are already sent.
+  #===Examples
+  # _kas.headers_sent? #=> true
   def headers_sent?
     return true if _httpsession.resp.headers_sent
     return false
   end
   
+  #Define the size for when to automatically send headers. If you want to send hundres of kilobytes and then a header, you can use this method to do so.
+  #===Examples
+  #Set the size to 200 kb.
+  # _kas.headers_send_size = (1024 * 200)
   def headers_send_size=(newsize)
-    if self.headers_sent?
-      raise "The headers are already sent and you cannot modify the send-size any more."
+    raise "The headers are already sent and you cannot modify the send-size any more." if self.headers_sent?
+    _httpsession.size_send = newsize.to_i
+  end
+  
+  #Serves the given filepath and enables caching for it. No other content should be written to the page when using this method.
+  #===Examples
+  # _kas.header("Content-Type", "text/javascript")
+  # _kas.serve_file("somefile.js")
+  def serve_file(filepath)
+    raise "File doesnt exist: '#{filepath}'." if !File.exists?(filepath)
+    httpsess = _httpsession
+    headers = httpsess.headers
+    resp = httpsess.resp
+    
+    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
     
-    _httpsession.size_send = newsize.to_i
+    cache_dont = true if cache_control and cache_control.key?("max-age") and cache_control["max-age"].to_i <= 0
+    lastmod = File.mtime(filepath)
+    
+    self.header("Last-Modified", lastmod.httpdate)
+    self.header("Expires", (Time.now + 86400).httpdate) #next day.
+    
+    if !cache_dont and headers["if-modified-since"] and headers["if-modified-since"][0]
+      request_mod = Datet.in(headers["if-modified-since"].first).time
+      
+      if request_mod == lastmod
+        resp.status = 304
+        return nil
+      end
+    end
+    
+    httpsess.force_content(:type => :file, :path => filepath)
   end
   
   #Sends a javascript back to the browser and exits.
@@ -78,6 +128,8 @@ class Knjappserver
   end
   
   #Urlencodes a string.
+  #===Examples
+  # _kas.redirect("mypage.rhtml?arg=#{_kas.urlenc(value_variable)}")
   def urlenc(str)
     return Knj::Web.urlenc(str)
   end

data/lib/scripts/knjappserver_cgi.rb

@@ -43,9 +43,18 @@ class Knjappserver
   end
 end
 
+require "knjrbfw"
+
 begin
-  require "knj/autoload"
-  require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../knjappserver.rb"
+  require "http2"
+  require "tsafe"
+  
+  #Read real path.
+  file = __FILE__
+  file = File.readlink(file) if File.symlink?(file)
+  file = File.realpath(file)
+  
+  require "#{File.dirname(file)}/../knjappserver.rb"
   
   raise "No HTTP_KNJAPPSERVER_CGI_CONFIG-header was given." if !ENV["HTTP_KNJAPPSERVER_CGI_CONFIG"]
   require ENV["HTTP_KNJAPPSERVER_CGI_CONFIG"]
@@ -80,7 +89,7 @@ begin
   headers = {}
   cgi.env_table.each do |key, val|
     if key[0, 5] == "HTTP_" and key != "HTTP_KNJAPPSERVER_CGI_CONFIG"
-      key = Knj::Php.ucwords(key[5, key.length].gsub("_", " ")).gsub(" ", "-")
+      key = key[5, key.length].gsub("_", " ").gsub(" ", "-")
       headers[key] = val
     end
   end
@@ -109,7 +118,7 @@ begin
         cgi.print(line) if count > 0
         count += 1
       }
-    })
+    )
   elsif cgi.request_method == "POST"
     count = 0
     http.post(:url => url, :post => Knjappserver.convert_fcgi_post(cgi.params),
@@ -119,17 +128,18 @@ begin
         cgi.print(line) if count > 0
         count += 1
       }
-    })
+    )
   else
     count = 0
-    http.get(url, {
+    http.get(
+      :url => url,
       :default_headers => headers,
       :cookies => false,
       :on_content => proc{|line|
         cgi.print(line) if count > 0
         count += 1
       }
-    })
+    )
   end
 rescue Exception => e
   print "Content-Type: text/html\r\n"
@@ -139,6 +149,6 @@ rescue Exception => e
   begin
     knjappserver.stop if knjappserver
   rescue => e
-    print "<br />\n<br />\n" + Knj::Errors.error_str(e, {:html => true})
+    print "<br />\n<br />\n#{Knj::Errors.error_str(e, {:html => true})}"
   end
 end

data/lib/scripts/knjappserver_fcgi.rb

@@ -8,9 +8,11 @@
 #Its a bit slower because it needs to flush writes to the database at end of every request and re-read them on spawn, because multiple instances might be present.
 
 require "rubygems"
+require "knjrbfw"
+require "http2"
+require "tsafe"
 require "fcgi"
 
-require "knj/autoload"
 require "#{File.dirname(Knj::Os.realpath(__FILE__))}/../knjappserver.rb"
 
 class Knjappserver
@@ -101,7 +103,7 @@ FCGI.each_cgi do |cgi|
           cgi.print(line) if count > 0
           count += 1
         }
-      })
+      )
     elsif cgi.request_method == "POST"
       count = 0
       http.post(:url => url, :post => Knjappserver.convert_fcgi_post(cgi.params),
@@ -111,7 +113,7 @@ FCGI.each_cgi do |cgi|
           cgi.print(line) if count > 0
           count += 1
         }
-      })
+      )
     else
       count = 0
       http.get(:url => url,
@@ -121,7 +123,7 @@ FCGI.each_cgi do |cgi|
           cgi.print(line) if count > 0
           count += 1
         }
-      })
+      )
     end
     
     thread_spawn = Thread.new do

metadata

@@ -2,7 +2,7 @@
 name: knjappserver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.28
+  version: 0.0.29
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-14 00:00:00 +02:00
+date: 2012-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3350207244681983238
+      hash: 4291663965426138445
       segments: 
       - 0
       version: "0"