knjappserver 0.0.12 → 0.0.13

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "knjrbfw", ">= 0.0.3"
+gem "knjrbfw", ">= 0.0.7"
 gem "erubis"
 gem "knjdbrevision", ">= 0.0.2"
 

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
       rake
     knjdbrevision (0.0.2)
       knjrbfw
-    knjrbfw (0.0.3)
+    knjrbfw (0.0.7)
     rake (0.9.2)
     rcov (0.9.9)
     rcov (0.9.9-java)
@@ -33,7 +33,7 @@ DEPENDENCIES
   erubis
   jeweler (~> 1.6.3)
   knjdbrevision (>= 0.0.2)
-  knjrbfw (>= 0.0.3)
+  knjrbfw (>= 0.0.7)
   rcov
   rspec (~> 2.3.0)
   sqlite3

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/knjappserver.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -75,7 +75,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<knjrbfw>, [">= 0.0.3"])
+      s.add_runtime_dependency(%q<knjrbfw>, [">= 0.0.7"])
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
       s.add_runtime_dependency(%q<knjdbrevision>, [">= 0.0.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -84,7 +84,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
-      s.add_dependency(%q<knjrbfw>, [">= 0.0.3"])
+      s.add_dependency(%q<knjrbfw>, [">= 0.0.7"])
       s.add_dependency(%q<erubis>, [">= 0"])
       s.add_dependency(%q<knjdbrevision>, [">= 0.0.2"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
-    s.add_dependency(%q<knjrbfw>, [">= 0.0.3"])
+    s.add_dependency(%q<knjrbfw>, [">= 0.0.7"])
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<knjdbrevision>, [">= 0.0.2"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])

data/lib/include/class_knjappserver.rb

@@ -7,6 +7,8 @@ require "#{File.dirname(__FILE__)}/class_knjappserver_cleaner"
 
 require "timeout"
 require "digest"
+require "erubis"
+require "base64"
 
 class Knjappserver
   attr_reader :config, :httpserv, :db, :db_handler, :ob, :translations, :paused, :should_restart, :events, :mod_event, :paused, :db_handler, :gettext, :sessions, :logs_access_pending, :threadpool, :vars, :magic_vars, :types, :eruby_cache
@@ -94,12 +96,19 @@ class Knjappserver
     files = [
       "#{@path_knjrbfw}knjrbfw.rb",
       "#{@path_knjrbfw}knj/arrayext.rb",
+      "#{@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",
       "#{@path_knjappserver}/class_httpresp.rb",
       "#{@path_knjappserver}/class_httpserver.rb",
@@ -111,12 +120,7 @@ class Knjappserver
     ]
     files.each do |file|
       STDOUT.print "Loading: '#{file}'.\n" if @config[:debug]
-      
-      if @config[:autorestart]
-        self.loadfile(file)
-      else
-        require file
-      end
+      self.loadfile(file)
     end
     
     

data/spec/knjappserver_spec.rb

@@ -5,12 +5,13 @@ describe "Knjappserver" do
     require "rubygems"
     require "knjappserver"
     require "knjrbfw"
-    require "knj/autoload"
     require "tmpdir"
     
     db_path = "#{Dir.tmpdir}/knjappserver_rspec.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
     
+    require "knj/knjdb/libknjdb.rb"
+    require "sqlite3"
     db = Knj::Db.new(
       :type => "sqlite3",
       :path => db_path,
@@ -70,6 +71,7 @@ describe "Knjappserver" do
   end
   
   it "should be able to handle a GET-request." do
+    require "knj/http"
     $http = Knj::Http.new("host" => "localhost", "port" => 1515)
     data = $http.get("/spec.rhtml")
     raise "Unexpected HTML: '#{data["data"]}'." if data["data"].to_s.strip != "Test"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjappserver
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -14,18 +14,18 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knjrbfw
-  requirement: &16746480 !ruby/object:Gem::Requirement
+  requirement: &23495040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *16746480
+  version_requirements: *23495040
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &16745860 !ruby/object:Gem::Requirement
+  requirement: &23494220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16745860
+  version_requirements: *23494220
 - !ruby/object:Gem::Dependency
   name: knjdbrevision
-  requirement: &16745320 !ruby/object:Gem::Requirement
+  requirement: &23493440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *16745320
+  version_requirements: *23493440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16744760 !ruby/object:Gem::Requirement
+  requirement: &23492660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *16744760
+  version_requirements: *23492660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &16744100 !ruby/object:Gem::Requirement
+  requirement: &23491860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *16744100
+  version_requirements: *23491860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16743520 !ruby/object:Gem::Requirement
+  requirement: &23491120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *16743520
+  version_requirements: *23491120
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &16742820 !ruby/object:Gem::Requirement
+  requirement: &23490400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16742820
+  version_requirements: *23490400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &16742200 !ruby/object:Gem::Requirement
+  requirement: &23489660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16742200
+  version_requirements: *23489660
 description: Which supports a lot of undocumented stuff.
 email: k@spernj.org
 executables:
@@ -172,7 +172,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3057620126648771349
+      hash: 1428082859670065281
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: