hayabusa 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/hayabusa_fcgi.fcgi

@@ -1,12 +1,11 @@
 #!/usr/bin/ruby
 
-#This scripts start an appserver, executes a HTTP-request for every FCGI-request and terminates when FCGI terminates.
+#This scripts start an appserver, executes a CGI-request for every FCGI-request and terminates when FCGI terminates.
 #Good for programming appserver-supported projects that doesnt need threadding without running an appserver all the time.
 
-#It doesnt support shared threadding or objects because multiple instances in form of processes will be executed.
-
-#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.
+debug = false
 
+$stderr.puts "[hayabusa] Starting up!" if debug
 error_log_file = "/tmp/hayabusa_fcgi.log"
 
 begin
@@ -16,6 +15,7 @@ rescue Errno::ENOENT
 end
 
 begin
+  $stderr.puts "[hayabusa] Loading libs." if debug
   require "rubygems"
   require "knjrbfw"
   require "fcgi"
@@ -27,24 +27,27 @@ begin
   
   #We cant define the Hayabusa-server untuil we receive the first headers, so wait for the first request.
   hayabusa = nil
+  hayabusa_fcgi_conf_path = nil
   fcgi_proxy = nil
   
+  $stderr.puts "[hayabusa] Starting FCGI." if debug
   FCGI.each_cgi do |cgi|
     begin
       #cgi.print "Content-Type: text/html\r\n"
       #cgi.print "\r\n"
       
+      #Set 'cgi'-variable for CGI-tools.
       cgi_tools.cgi = cgi
       
+      #Ensure the same FCGI-process isnt active for more than one website.
+      raise "Expected 'HTTP_HAYABUSA_FCGI_CONFIG' to be '#{hayabusa_fcgi_conf_path}' but it wasnt: '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if hayabusa_fcgi_conf_path and hayabusa_fcgi_conf_path != cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
+      
       if !hayabusa
         raise "No HTTP_HAYABUSA_FCGI_CONFIG-header was given." if !cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        require cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        
-        begin
-          conf = Hayabusa::FCGI_CONF
-        rescue NameError
-          raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'."
-        end
+        hayabusa_fcgi_conf_path = cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
+        require hayabusa_fcgi_conf_path
+        raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if !Hayabusa.const_defined?(:FCGI_CONF)
+        conf = Hayabusa::FCGI_CONF
         
         hayabusa_conf = Hayabusa::FCGI_CONF[:hayabusa]
         hayabusa_conf.merge!(
@@ -100,9 +103,11 @@ begin
       
       if fcgi_proxy
         #Proxy request to the host-FCGI-process.
+        $stderr.puts "[hayabusa] Proxying request." if debug
         cgi_tools.proxy_request_to(:cgi => cgi, :http => fcgi_proxy[:http])
       else
         #Host the FCGI-process.
+        $stderr.puts "[hayabusa] Running request as CGI." if debug
         
         #Enforce $stdout variable.
         $stdout = hayabusa.cio

data/bin/hayabusa_fcgi.rb

@@ -1,12 +1,11 @@
 #!/usr/bin/ruby
 
-#This scripts start an appserver, executes a HTTP-request for every FCGI-request and terminates when FCGI terminates.
+#This scripts start an appserver, executes a CGI-request for every FCGI-request and terminates when FCGI terminates.
 #Good for programming appserver-supported projects that doesnt need threadding without running an appserver all the time.
 
-#It doesnt support shared threadding or objects because multiple instances in form of processes will be executed.
-
-#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.
+debug = false
 
+$stderr.puts "[hayabusa] Starting up!" if debug
 error_log_file = "/tmp/hayabusa_fcgi.log"
 
 begin
@@ -16,6 +15,7 @@ rescue Errno::ENOENT
 end
 
 begin
+  $stderr.puts "[hayabusa] Loading libs." if debug
   require "rubygems"
   require "knjrbfw"
   require "fcgi"
@@ -27,24 +27,27 @@ begin
   
   #We cant define the Hayabusa-server untuil we receive the first headers, so wait for the first request.
   hayabusa = nil
+  hayabusa_fcgi_conf_path = nil
   fcgi_proxy = nil
   
+  $stderr.puts "[hayabusa] Starting FCGI." if debug
   FCGI.each_cgi do |cgi|
     begin
       #cgi.print "Content-Type: text/html\r\n"
       #cgi.print "\r\n"
       
+      #Set 'cgi'-variable for CGI-tools.
       cgi_tools.cgi = cgi
       
+      #Ensure the same FCGI-process isnt active for more than one website.
+      raise "Expected 'HTTP_HAYABUSA_FCGI_CONFIG' to be '#{hayabusa_fcgi_conf_path}' but it wasnt: '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if hayabusa_fcgi_conf_path and hayabusa_fcgi_conf_path != cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
+      
       if !hayabusa
         raise "No HTTP_HAYABUSA_FCGI_CONFIG-header was given." if !cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        require cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
-        
-        begin
-          conf = Hayabusa::FCGI_CONF
-        rescue NameError
-          raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'."
-        end
+        hayabusa_fcgi_conf_path = cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]
+        require hayabusa_fcgi_conf_path
+        raise "No 'Hayabusa::FCGI_CONF'-constant was spawned by '#{cgi.env_table["HTTP_HAYABUSA_FCGI_CONFIG"]}'." if !Hayabusa.const_defined?(:FCGI_CONF)
+        conf = Hayabusa::FCGI_CONF
         
         hayabusa_conf = Hayabusa::FCGI_CONF[:hayabusa]
         hayabusa_conf.merge!(
@@ -100,9 +103,11 @@ begin
       
       if fcgi_proxy
         #Proxy request to the host-FCGI-process.
+        $stderr.puts "[hayabusa] Proxying request." if debug
         cgi_tools.proxy_request_to(:cgi => cgi, :http => fcgi_proxy[:http])
       else
         #Host the FCGI-process.
+        $stderr.puts "[hayabusa] Running request as CGI." if debug
         
         #Enforce $stdout variable.
         $stdout = hayabusa.cio

data/conf/apache2_hayabusa_conf.conf

@@ -0,0 +1,15 @@
+<IfModule mod_fcgid.c>
+  SocketPath /tmp/fcgi_socket
+  FcgidIdleTimeout 30
+  FcgidMinProcessesPerClass 0
+  FcgidIdleScanInterval 15
+</IfModule>
+
+<Directory "/path/to/hayabusa/bin">
+  Options +FollowSymLinks +ExecCGI
+  Order allow,deny
+  Allow from all
+  AllowOverride none
+</Directory>
+
+Alias /hayabusa_fcgi_bin "/path/to/hayabusa/bin"

data/hayabusa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hayabusa}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-08-16}
+  s.date = %q{2012-08-17}
   s.description = %q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "hayabusa_benchmark.rb", "hayabusa_cgi.rb", "hayabusa_fcgi.fcgi", "hayabusa_fcgi.rb", "knjappserver_start.rb"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "bin/knjappserver_start.rb",
     "conf/apache2_cgi_rhtml_conf.conf",
     "conf/apache2_fcgi_rhtml_conf.conf",
+    "conf/apache2_hayabusa_conf.conf",
     "hayabusa.gemspec",
     "lib/hayabusa.rb",
     "lib/hayabusa_cgi_session.rb",

data/lib/hayabusa.rb

@@ -159,7 +159,7 @@ class Hayabusa
       @db = @config[:db]
     elsif @config[:db].is_a?(Hash)
       @db = Knj::Db.new(@config[:db])
-    elsif !@config[:db] and @config[:db_args]
+    elsif @config[:db_args]
       @db = Knj::Db.new(@config[:db_args])
     else
       if @config[:title]

data/lib/hayabusa_cgi_session.rb

@@ -10,7 +10,23 @@ class Hayabusa::Cgi_session
     @handlers_cache = @config[:handlers_cache]
     cgi_conf = @config[:cgi]
     @get, @post, @meta, @headers = cgi_conf[:get], cgi_conf[:post], cgi_conf[:meta], cgi_conf[:headers]
+    @browser = Knj::Web.browser(@meta)
     
+    #Parse cookies and other headers.
+    @cookie = {}
+    @headers.each do |key, val|
+      #$stderr.puts "Header-Key: '#{key}'."
+      
+      case key
+        when "COOKIE"
+          Knj::Web.parse_cookies(val).each do |key, val|
+            @cookie[key] = val
+          end
+      end
+    end
+    
+    
+    #Set up the 'out', 'written_size' and 'size_send' variables which is used to write output.
     if cgi_conf[:cgi]
       @out = cgi_conf[:cgi]
     else
@@ -36,16 +52,52 @@ class Hayabusa::Cgi_session
     
     Dir.chdir(@config[:doc_root])
     @page_path = @meta["PATH_TRANSLATED"]
+    @page_path = "index.rhtml" if @page_path == "/"
+    
     @ext = File.extname(@page_path).downcase[1..-1].to_s
     
     @resp = Hayabusa::Http_session::Response.new(:socket => self)
     @resp.reset(:http_version => http_version, :mode => :cgi)
-    @resp.header("Content-Type", "text/html")
     
     @cgroup = Hayabusa::Http_session::Contentgroup.new(:socket => self, :hb => @hb, :resp => @resp, :httpsession => self)
     @cgroup.reset
     
     @resp.cgroup = @cgroup
+    @resp.header("Content-Type", "text/html")
+    
+    
+    #Set up session-variables.
+    if @cookie["HayabusaSession"].to_s.length > 0
+      @session_id = @cookie["HayabusaSession"]
+    elsif @browser["browser"] == "bot"
+      @session_id = "bot"
+    else
+      @session_id = @hb.session_generate_id(@meta)
+      send_cookie = true
+    end
+    
+    begin
+      @session, @session_hash = @hb.session_fromid(@ip, @session_id, @meta)
+    rescue ArgumentError => e
+      #User should not have the session he asked for because of invalid user-agent or invalid IP.
+      @session_id = @hb.session_generate_id(@meta)
+      @session, @session_hash = @hb.session_fromid(@ip, @session_id, @meta)
+      send_cookie = true
+    end
+    
+    if send_cookie
+      @resp.cookie(
+        "name" => "HayabusaSession",
+        "value" => @session_id,
+        "path" => "/",
+        "expires" => Time.now + 32140800 #add around 12 months
+      )
+    end
+    
+    raise "'session'-variable could not be spawned." if !@session
+    raise "'session_hash'-variable could not be spawned." if !@session_hash
+    Thread.current[:hayabusa][:session] = @session
+    
     
     begin
       @hb.events.call(:request_begin, :httpsession => self) if @hb.events
@@ -55,7 +107,7 @@ class Hayabusa::Cgi_session
           STDOUT.print "Calling handler.\n" if @debug
           @handlers_cache[@ext].call(self)
         else
-          raise "CGI-mode shouldnt serve static files."
+          raise "CGI-mode shouldnt serve static files: '#{@page_path}'."
         end
       end
       
@@ -118,7 +170,6 @@ class Hayabusa::Cgi_session
     Thread.current[:hayabusa] = {
       :hb => @hb,
       :httpsession => self,
-      :session => @session,
       :get => @get,
       :post => @post,
       :meta => @meta,

data/lib/hayabusa_database.rb

@@ -101,8 +101,7 @@ class Hayabusa::Database
         "indexes" => [
           {"name" => "date_added", "columns" => ["date_added"]},
           {"name" => "idhash", "columns" => ["idhash"]}
-        ],
-        "renames" => ["sessions"]
+        ]
       },
       "Translation" => {
         "columns" => [
@@ -115,10 +114,7 @@ class Hayabusa::Database
         ],
         "indexes" => [
           {"name" => "lookup", "columns" => ["object_class", "object_id", "key", "locale"]}
-        ],
-        "indexes_remove" => {
-          "object_class" => true
-        }
+        ]
       }
     }
   }

data/lib/hayabusa_ext/sessions.rb

@@ -43,6 +43,7 @@ class Hayabusa
   #Will make the session rememberable for a year. IP wont be checked any more.
   def session_remember
     session = _httpsession.session
+    raise "Could not get session-variable from HTTP-session." if !session
     session[:remember] = 1
     
     self.cookie(

data/lib/kernel_ext/magic_methods.rb

@@ -20,6 +20,7 @@ end
 
 def _session
   return Thread.current[:hayabusa][:session].sess_data if Thread.current[:hayabusa] and Thread.current[:hayabusa][:session]
+  raise "Session was not registered on thread."
 end
 
 def _session_hash

data/lib/models/session.rb

@@ -9,6 +9,7 @@ class Hayabusa::Models::Session < Knj::Datarow
     if self[:sess_data].to_s.length > 0
       begin
         @sess_data = Marshal.load(Base64.decode64(self[:sess_data]))
+        raise "The session-data could not be loaded." if !@sess_data
       rescue ArgumentError
         @sess_data = {}
       end

metadata

@@ -2,7 +2,7 @@
 name: hayabusa
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-16 00:00:00 +02:00
+date: 2012-08-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +154,7 @@ files:
 - bin/knjappserver_start.rb
 - conf/apache2_cgi_rhtml_conf.conf
 - conf/apache2_fcgi_rhtml_conf.conf
+- conf/apache2_hayabusa_conf.conf
 - hayabusa.gemspec
 - lib/hayabusa.rb
 - lib/hayabusa_cgi_session.rb
@@ -236,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3557679821494000327
+      hash: 2980723636993966335
       segments: 
       - 0
       version: "0"