knjappserver 0.0.22 → 0.0.23

data/Gemfile

@@ -6,14 +6,14 @@ source "http://rubygems.org"
 gem "knjrbfw"
 gem "erubis"
 gem "mail"
+gem "tsafe"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.3"
   gem "rcov", ">= 0"
   gem "sqlite3" if RUBY_ENGINE != "jruby"
-  gem "json"
 end

data/Gemfile.lock

@@ -9,8 +9,6 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
-    json (1.6.1-java)
     knjrbfw (0.0.8)
     mail (2.3.0)
       i18n (>= 0.4.0)
@@ -33,18 +31,19 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
+    tsafe (0.0.1)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
   erubis
   jeweler (~> 1.6.3)
-  json
   knjrbfw
   mail
   rcov
   rspec (~> 2.3.0)
   sqlite3
+  tsafe

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-03}
+  s.date = %q{2012-05-22}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -103,33 +103,33 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<mail>, [">= 0"])
+      s.add_runtime_dependency(%q<tsafe>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
     else
       s.add_dependency(%q<knjrbfw>, [">= 0"])
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<mail>, [">= 0"])
+      s.add_dependency(%q<tsafe>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
     end
   else
     s.add_dependency(%q<knjrbfw>, [">= 0"])
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<mail>, [">= 0"])
+    s.add_dependency(%q<tsafe>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.3"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

data/lib/include/class_knjappserver.rb

@@ -128,6 +128,7 @@ class Knjappserver
       require "base64"
       require "stringio"
       require "socket"
+      require "tsafe"
       
       files += [
         "#{@path_knjrbfw}knj/event_handler.rb",

data/lib/include/class_knjappserver_mailing.rb

@@ -3,10 +3,11 @@ class Knjappserver
   
 	def initialize_mailing
     require "knj/autoload/ping"
+    require "monitor"
     
 		@mails_waiting = []
-		@mails_mutex = Mutex.new
-		@mails_queue_mutex = Mutex.new
+		@mails_mutex = Monitor.new
+		@mails_queue_mutex = Monitor.new
 		@mails_timeout = self.timeout(:time => 10) do
 			self.mail_flush
 		end
@@ -29,7 +30,8 @@ class Knjappserver
 			
 			mailobj = Knjappserver::Mail.new({:kas => self, :errors => {}, :status => :waiting}.merge(mail_args))
 			STDOUT.print "Added mail '#{mailobj.__id__}' to the mail-send-queue.\n" if debug
-			@mails_waiting << mailobj
+			@mails_waiting << mailobj if mail_args[:now]
+			self.mail_flush
 			return mailobj
 		end
 	end

data/lib/include/class_knjappserver_sessions.rb

@@ -1,6 +1,7 @@
 class Knjappserver
   def initialize_sessions
-    @sessions = {}
+    require "tsafe"
+    @sessions = Tsafe::MonHash.new
   end
   
   #Returns or adds session based on idhash and meta-data.

data/lib/include/class_session.rb

@@ -2,9 +2,9 @@ class Knjappserver::Session < Knj::Datarow
 	attr_reader :edata
 	attr_accessor :sess_data
 	
-	def initialize(d)
+	def initialize(*args, &block)
 		@edata = {}
-		super(d)
+		super(*args, &block)
 		
 		if self[:sess_data].to_s.length > 0
 			begin

data/lib/scripts/knjappserver_cgi.rb

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby1.9.1
 
-time_begin = Time.now
-
 #This scripts start an appserver, executes a HTTP-request and terminates.
 #Good for programming appserver-supported projects without running an appserver all the time,
 #but really slow because of startup for every request.
@@ -65,21 +63,19 @@ begin
     :cleaner => false,
     :dbrev => false,
     :mail_require => false,
+    :debug => false,
     :port => 0 #Ruby picks random port and we get the actual port after starting the appserver.
   }.merge(Knjappserver::CGI_CONF["knjappserver"])
   knjappserver = Knjappserver.new(knjappserver_conf)
   knjappserver.start
   port = knjappserver.port
   
-  
   #Make request.
   http = Knj::Http2.new(:host => "localhost", :port => port)
   
-  
   #Spawn CGI-variable to emulate FCGI part.
   cgi = Cgi_is_retarded.new
   
-  
   #The rest is copied from the FCGI-part.
   headers = {}
   cgi.env_table.each do |key, val|
@@ -136,9 +132,13 @@ begin
     })
   end
 rescue Exception => e
-  knjappserver.stop
-  
   print "Content-Type: text/html\r\n"
   print "\n\n"
   print Knj::Errors.error_str(e, {:html => true})
+  
+  begin
+    knjappserver.stop if knjappserver
+  rescue => e
+    print "<br />\n<br />\n" + Knj::Errors.error_str(e, {:html => true})
+  end
 end

metadata

@@ -1,126 +1,128 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: knjappserver
-version: !ruby/object:Gem::Version
-  version: 0.0.22
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.23
 platform: ruby
-authors:
+authors: 
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 +02:00
+
+date: 2012-05-22 00:00:00 +02:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: knjrbfw
-  requirement: &16549300 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *16549300
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: erubis
-  requirement: &16547440 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *16547440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: mail
-  requirement: &16546360 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *16546360
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: tsafe
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &16542740 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *16542740
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &16525460 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16525460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &16523980 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *16523980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rcov
-  requirement: &16522600 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *16522600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &16521620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *16521620
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &16520740 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *16520740
+  version_requirements: *id009
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
-executables:
+executables: 
 - check_running.rb
 - knjappserver_start.rb
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - .rspec
 - Gemfile
@@ -194,31 +196,34 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/kaspernj/knjappserver
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -4394912517920739657
+      segments: 
       - 0
-      hash: 2394284405486771539
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A multi-threadded app-web-server.
 test_files: []
+