hayabusa 0.0.28 → 0.0.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bd7ec4c88a34a72469fb9c68fa761f3c19d29167
-  data.tar.gz: 6a995b84d0c480348b0075fc175484d94f4ebbac
+SHA256:
+  metadata.gz: 60e88035481dc2afdc4ee23c24f2c44a1b504890c62b1e228b2e813f9d3b15a7
+  data.tar.gz: ff6b3e9c203f94ce49c7e1cc431b3c89a09410ee8a0f2c45a7eb2ac41964fe4c
 SHA512:
-  metadata.gz: 6691e6935969b440bfa9dbe66b65e0c0bb908b45d69d1907ec3621ec834fd2b9d9631afb956539bcd1a8991f0a7e5c1cb258b5cc406b2c067801e842b34fca47
-  data.tar.gz: 00a35f4552f381effb0329dcd857f49cfd19bc1a80662a5c3117fcc053bd5c3b170f6f23f916b3fe8d84049a77180d0b0e256c2eec7d048a86ed0dad2db33780
+  metadata.gz: e5205de4cf85d3a269e393d972a18e430afeb6c201e441ccd4e95589d5eeb2eac12e8b1cdeeed5f298657eb9aaf9314e13d0244a3aca5de0e8ac941e771513aa
+  data.tar.gz: 83addfb1405a664473579b8f9abbea6b7e4e3d4bc101bda50acc35a193298be340cd8a324964f8f2d4a59dff1a39148f1a81f9fb74b7c22e11fb837a06c39a73

data/README.md

@@ -6,7 +6,7 @@ It uses ERubis to parse .rhtml files and caches the bytecode for Ruby-files.
 
 
 ## Contributing to hayabusa
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project
@@ -40,7 +40,7 @@ require "sqlite3"
 appsrv = Hayabusa.new(
   port: 10080,
   doc_root: "#{File.dirname(__FILE__)}/doc_root",
-  db: Knj::Db.new(
+  db: Baza::Db.new(
     type: "sqlite3",
     path: "#{File.dirname(__FILE__)}/test.sqlite3"
   )
@@ -114,12 +114,12 @@ You can also test if the headers are sent for your HTTP-session or not like this
     sleep 4
     print "Test 1<br />"
   end
-  
+
   _hb.threadded_content do
     sleep 1
     print "Test 2<br />"
   end
-  
+
   _hb.threadded_content do
     sleep 3
     print "Test 3<br />"

data/Rakefile

@@ -11,20 +11,6 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "hayabusa"
-  gem.homepage = "http://github.com/kaspernj/hayabusa"
-  gem.license = "MIT"
-  gem.summary = %Q{A threadded web/app-server that supports stand-alone, CGI and FCGI-modes.}
-  gem.description = %Q{A threadded web/app-server that focuses on threadding, shared ressources, speed and more.}
-  gem.email = "k@spernj.org"
-  gem.authors = ["Kasper Johansen"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/bin/hayabusa_fcgi.fcgi

@@ -0,0 +1 @@
+hayabusa_fcgi.rb

data/lib/hayabusa.rb

@@ -1,4 +1,5 @@
 require "base64"
+require "baza"
 require "digest"
 require "stringio"
 require "timeout"
@@ -14,19 +15,19 @@ require "timeout"
 # appsrv.join
 class Hayabusa
   @@path = File.dirname(__FILE__)
-  
+
   attr_reader :cio, :config, :httpserv, :debug, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_procs, :magic_vars, :types, :eruby_cache, :httpsessions_ids
   attr_accessor :served, :should_restart, :should_restart_done
-  
+
   #Autoloader for subclasses.
   def self.const_missing(name)
     require "#{File.dirname(__FILE__)}/hayabusa_#{name.to_s.downcase}.rb"
     return Hayabusa.const_get(name)
   end
-  
+
   def initialize(config)
     raise "No arguments given." if !config.is_a?(Hash)
-    
+
     @config = {
       :host => "0.0.0.0",
       :timeout => 30,
@@ -37,12 +38,12 @@ class Hayabusa
       :cleaner_timeout => 60,
       :mailing_time => 30
     }.merge(config)
-    
+
     @config[:smtp_args] = {"smtp_host" => "localhost", "smtp_port" => 25} if !@config[:smtp_args]
     @config[:timeout] = 30 if !@config.has_key?(:timeout)
     raise "No ':doc_root' was given in arguments." if !@config.has_key?(:doc_root)
-    
-    
+
+
     #Require gems.
     require "rubygems"
     gems = [
@@ -51,15 +52,15 @@ class Hayabusa
       [:Tsafe, "tsafe"],
       [:Tpool, "tpool"]
     ]
-    
+
     gems.each do |gem_i|
       if Kernel.const_defined?(gem_i[0])
         puts "Gem already loaded: '#{gem_i[1]}'." if @debug
         next
       end
-      
+
       fpath = "#{@@path}/../../#{gem_i[1]}/lib/#{gem_i[1]}.rb"
-      
+
       if File.exists?(fpath)
         puts "Loading custom gem-path: '#{fpath}'." if @debug
         require fpath
@@ -68,8 +69,8 @@ class Hayabusa
         require gem_i[1]
       end
     end
-    
-    
+
+
     #Setup default handlers if none are given.
     if !@config.has_key?(:handlers)
       @erb_handler = Hayabusa::Erb_handler.new
@@ -83,41 +84,41 @@ class Hayabusa
         }
       ]
     end
-    
+
     if @config[:handlers_extra]
       @config[:handlers] += @config[:handlers_extra]
     end
-    
-    
+
+
     #Add extra handlers if given.
     @config[:handlers] += @config[:handlers_extra] if @config[:handlers_extra]
-    
-    
+
+
     #Setup cache to make .rhtml-calls faster.
     @config[:handlers_cache] = {}
     @config[:handlers].each do |handler_info|
       next if !handler_info[:file_ext] or !handler_info[:callback]
       @config[:handlers_cache][handler_info[:file_ext]] = handler_info[:callback]
     end
-    
-    
+
+
     @debug = @config[:debug]
     if !@config.key?(:debug_log) or @config[:debug_log]
       @debug_log = true
     else
       @debug_log = false
     end
-    
+
     if @config[:debug_print]
       @debug_print = true
     else
       @debug_print = false
     end
-    
+
     if !@config.key?(:debug_print_err) or @config[:debug_print_err]
       @debug_print_err = true
     end
-    
+
     @paused = 0
     @paused_mutex = Mutex.new
     @should_restart = false
@@ -127,26 +128,26 @@ class Hayabusa
     @sessions = {}
     @eruby_cache = {}
     @httpsessions_ids = {}
-    
+
     if @debug_log
       @log_fp = File.open("/tmp/hayabusa_#{@config[:title]}.log", "w")
       @log_fp.sync = true
     end
-    
+
     @path_hayabusa = File.dirname(__FILE__)
-    
-    
+
+
     #If auto-restarting is enabled - start the modified events-module.
     if @config[:autorestart]
       paths = [
         "#{@path_hayabusa}/class_customio.rb"
       ]
-      
+
       self.log_puts "Auto restarting." if @debug
       @mod_event = Knj::Event_filemod.new(:wait => 2, :paths => paths, &self.method(:on_event_filemod))
     end
-    
-    
+
+
     #Set up default file-types and merge given filetypes into it.
     @types = {
       :ico => "image/x-icon",
@@ -162,9 +163,9 @@ class Hayabusa
       :js => "text/javascript"
     }
     @types.merge!(@config[:filetypes]) if @config.key?(:filetypes)
-    
-    
-    
+
+
+
     #Load various required files in the hayabusa-framework.
     files = [
       "#{@path_hayabusa}/hayabusa_ext/errors.rb",
@@ -174,51 +175,52 @@ class Hayabusa
       "#{@path_hayabusa}/hayabusa_ext/translations.rb",
       "#{@path_hayabusa}/hayabusa_ext/web.rb"
     ]
-    
+
     files.each do |file|
       self.log_puts "Loading: '#{file}'." if @debug
       self.loadfile(file)
     end
-    
-    
+
+
     self.log_puts "Setting up database." if @debug
-    if @config[:db].is_a?(Knj::Db)
+    if @config[:db].is_a?(Baza::Db)
       @db = @config[:db]
     elsif @config[:db].is_a?(Hash)
-      @db = Knj::Db.new(@config[:db])
+      @db = Baza::Db.new(@config[:db])
     elsif @config[:db_args]
-      @db = Knj::Db.new(@config[:db_args])
+      @db = Baza::Db.new(@config[:db_args])
     else
       if @config[:title]
         db_title = @config[:title]
       else
         db_title = Time.now.to_f.to_s.hash
       end
-      
+
       db_path = "#{Knj::Os.tmpdir}/hayabusa_fallback_db_#{db_title}.sqlite3"
       @config[:dbrev] = true
-      
+
       require "sqlite3" if RUBY_ENGINE != "jruby"
-      @db = Knj::Db.new(
+      @db = Baza::Db.new(
         :type => "sqlite3",
         :path => db_path,
         :return_keys => "symbols",
         :index_append_table_name => true
       )
     end
-    
-    
+
+
     if !@config.key?(:dbrev) or @config[:dbrev]
       self.log_puts "Updating database." if @debug
       dbrev_args = {"schema" => Hayabusa::Database::SCHEMA, "db" => @db}
       dbrev_args.merge!(@config[:dbrev_args]) if @config.key?(:dbrev_args)
-      Knj::Db::Revision.new.init_db(dbrev_args)
+
+      Hayabusa::Revision.new.init_db(dbrev_args)
       dbrev_args = nil
     end
-    
-    
+
+
     self.log_puts "Spawning objects." if @debug
-    @ob = Knj::Objects.new(
+    @ob = Hayabusa::Objects.new(
       :db => db,
       :class_path => @path_hayabusa,
       :module => Hayabusa::Models,
@@ -227,52 +229,52 @@ class Hayabusa
       :require => false
     )
     @ob.events.connect(:no_date, &self.method(:no_date))
-    
-    
+
+
     if @config[:httpsession_db_args]
-      @db_handler = Knj::Db.new(@config[:httpsession_db_args])
+      @db_handler = Baza::Db.new(@config[:httpsession_db_args])
     else
       @db_handler = @db
     end
-    
-    
+
+
     if @config[:locales_root]
       @gettext = Knj::Gettext_threadded.new("dir" => config[:locales_root])
     end
-    
+
     require "#{@path_hayabusa}/kernel_ext/gettext_methods" if @config[:locales_gettext_funcs]
-    
+
     if @config[:magic_methods] or !@config.has_key?(:magic_methods)
       self.log_puts "Loading magic-methods." if @debug
       require "#{@path_hayabusa}/kernel_ext/magic_methods"
     end
-    
+
     if @config[:customio] or !@config.has_key?(:customio)
       self.log_puts "Loading custom-io." if @debug
-      
+
       if $stdout.class.name != "Hayabusa::Custom_io"
         @cio = Hayabusa::Custom_io.new
         $stdout = @cio
       end
     end
-    
-    
+
+
     #Save the PID to the run-file.
     self.log_puts "Setting run-file." if @debug
     tmpdir = "#{Knj::Os.tmpdir}/hayabusa"
     tmppath = "#{tmpdir}/run_#{@config[:title]}"
-    
+
     if !File.exists?(tmpdir)
       Dir.mkdir(tmpdir)
       File.chmod(0777, tmpdir)
     end
-    
+
     File.open(tmppath, "w") do |fp|
       fp.write(Process.pid)
     end
     File.chmod(0777, tmppath)
-    
-    
+
+
     #Set up various events for the appserver.
     if !@config.key?(:events) or @config[:events]
       self.log_puts "Loading events." if @debug
@@ -298,171 +300,171 @@ class Hayabusa
         :connections_max => 1
       )
       @events.add_event(:name => :http_session_destruct)
-      
+
       #This event is used if the user himself wants stuff to be cleaned up when the appserver is cleaning up stuff.
       @events.add_event(:name => :on_clean)
     end
-    
+
     #Set up the 'vars'-variable that can be used to set custom global variables for web-requests.
     @vars = Knj::Hash_methods.new
     @magic_vars = {}
     @magic_procs = {}
-    
-    
+
+
     #Initialize the various feature-modules.
     self.log_puts "Init sessions." if @debug
     self.initialize_sessions
-    
+
     if !@config.key?(:threadding) or @config[:threadding]
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/threadding.rb")
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/threadding_timeout.rb")
       self.log_puts "Init threadding." if @debug
       self.initialize_threadding
     end
-    
+
     self.log_puts "Init mailing." if @debug
     self.initialize_mailing
-    
+
     self.log_puts "Init errors." if @debug
     self.initialize_errors
-    
+
     self.log_puts "Init logging." if @debug
     self.initialize_logging
-    
+
     if !@config.key?(:cleaner) or @config[:cleaner]
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/cleaner.rb")
       self.log_puts "Init cleaner." if @debug
       self.initialize_cleaner
     end
-    
+
     if !@config.key?(:cmdline) or @config[:cmdline]
       self.loadfile("#{@path_hayabusa}/hayabusa_ext/cmdline.rb")
       self.log_puts "Init cmdline." if @debug
       self.initialize_cmdline
     end
-    
-    
+
+
     #Clear memory, flush emails, flush sessions and more at exit.
     Kernel.at_exit(&self.method(:stop))
-    
-    
+
+
     self.log_puts "Appserver spawned." if @debug
   end
-  
+
   #Outputs to stderr and logs it.
   def log_puts(str)
     if @debug_log
       @log_fp.sync = true
       @log_fp.puts str
     end
-    
+
     if @debug_print
       STDOUT.sync = true
       STDOUT.puts str
     end
-    
+
     if @debug_print_err
       STDERR.sync = true
       STDERR.puts str
     end
   end
-  
+
   def no_date(event, classname)
     return "[no date]"
   end
-  
+
   def on_event_filemod(event, path)
     self.log_puts "File changed - restart server: #{path}"
     @should_restart = true
     @mod_event.destroy if @mod_event
   end
-  
+
   #If you want to use auto-restart, every file reloaded through loadfile will be watched for changes. When changed the server will do a restart to reflect that.
   def loadfile(fpath)
     if !@config[:autorestart]
       require fpath
       return nil
     end
-    
+
     rpath = File.realpath(fpath)
     raise "No such filepath: #{fpath}" if !rpath or !File.exists?(rpath)
-    
+
     return true if @mod_files[rpath]
-    
+
     @mod_event.args[:paths] << rpath
     @mod_files = rpath
-    
+
     require rpath
     return false
   end
-  
+
   #Start a new CGI-request.
   def start_cgi_request
     @cgi_http_session = Hayabusa::Cgi_session.new(:hb => self)
   end
-  
+
   #Starts the HTTP-server and threadpool.
   def start
     #Start the appserver.
     self.log_puts "Spawning appserver." if @debug
     @httpserv = Hayabusa::Http_server.new(self)
     @httpserv.start
-    
-    
+
+
     self.log_puts "Starting appserver." if @debug
     Thread.current[:hayabusa] = {:hb => self} if !Thread.current[:hayabusa]
-    
+
     if @config[:autoload]
       self.log_puts "Autoloading #{@config[:autoload]}" if @debug
       require @config[:autoload]
     end
-    
+
     self.log_puts "Appserver startet." if @debug
   end
-  
+
   #Stops the entire app and releases join.
   def stop
     return nil if @stop_called
     @stop_called = true
-    
+
     self.log_puts "Stopping appserver." if @debug
     @httpserv.stop if @httpserv and @httpserv.respond_to?(:stop)
-    
+
     self.log_puts "Stopping threadpool." if @debug
     @threadpool.stop if @threadpool
-    
+
     #This should be done first to be sure it finishes (else we have a serious bug).
     self.log_puts "Flush out loaded sessions." if @debug
-    
+
     #Flush sessions and mails (only if the modules are loaded).
     self.flush_error_emails(:ignore_time => true) if self.respond_to?(:flush_error_emails)
     self.sessions_flush if self.respond_to?(:sessions_flush)
     self.mail_flush if self.respond_to?(:mail_flush)
-    
+
     self.log_puts "Stopping done..." if @debug
   end
-  
+
   #Stop running any more HTTP-requests - make them wait.
   def pause
     @paused += 1
   end
-  
+
   #Unpause - start handeling HTTP-requests again.
   def unpause
     @paused -= 1
   end
-  
+
   #Returns true if paued - otherwise false.
   def paused?
     return true if @paused > 0
     return false
   end
-  
+
   #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
@@ -474,22 +476,22 @@ class Hayabusa
       self.unpause
     end
   end
-  
+
   #Returns true if a HTTP-request is working. Otherwise false.
   def working?
     return true if @httpserv and @httpserv.working_count > 0
     return false
   end
-  
+
   def self.data
     raise "Could not register current thread." if !Thread.current[:hayabusa]
     return Thread.current[:hayabusa]
   end
-  
+
   #Sleeps until the server is stopped.
   def join
     raise "No http-server or http-server not running." if !@httpserv or !@httpserv.thread_accept
-    
+
     begin
       @httpserv.thread_accept.join
       @httpserv.thread_restart.join if @httpserv and @httpserv.thread_restart
@@ -497,23 +499,23 @@ class Hayabusa
       self.log_puts "Trying to stop because of interrupt - please wait while various data is beging flushed." if @debug
       self.stop
     end
-    
+
     if @should_restart
       loop do
         if @should_restart_done
           self.log_puts "Ending join because the restart is done." if @debug
           break
         end
-        
+
         sleep 1
       end
     end
   end
-  
+
   #Defines a variable as a method bound to the threads spawned by this instance of Hayabusa.
   def define_magic_var(method_name, var)
     @magic_vars[method_name] = var
-    
+
     if !Object.respond_to?(method_name)
       Object.send(:define_method, method_name) do
         return Thread.current[:hayabusa][:hb].magic_vars[method_name] if Thread.current[:hayabusa] and Thread.current[:hayabusa][:hb]
@@ -521,11 +523,11 @@ class Hayabusa
       end
     end
   end
-  
+
   def define_magic_proc(method_name, &block)
     raise "No block given." if !block_given?
     @magic_procs[method_name] = block
-    
+
     if !Object.respond_to?(method_name)
       Object.send(:define_method, method_name) do
         return Thread.current[:hayabusa][:hb].magic_procs[method_name].call(:hb => self) if Thread.current[:hayabusa] and Thread.current[:hayabusa][:hb]
@@ -533,19 +535,19 @@ class Hayabusa
       end
     end
   end
-  
+
   def translations
     if !@translations
       #Start the Knj::Gettext_threadded- and Knj::Translations modules for translations.
       self.log_puts "Spawning Knj::Translations-object." if @debug
       @translations = Knj::Translations.new(:db => @db)
-      
+
       self.log_puts "Requires the translation-model." if @debug
       @ob.requireclass(:Translation, :require => false, :class => Knj::Translations::Translation)
     end
-    
+
     self.log_puts "Returning the translations-object." if @debug
-    
+
     return @translations
   end
 end