knjappserver 0.0.25 → 0.0.26

data/Gemfile

@@ -11,9 +11,9 @@ gem "tsafe"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "json"
   gem "rspec", "~> 2.3.0"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.3"
-  gem "rcov", ">= 0"
   gem "sqlite3" if RUBY_ENGINE != "jruby"
 end

data/Gemfile.lock

@@ -9,16 +9,17 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    knjrbfw (0.0.8)
-    mail (2.3.0)
+    json (1.7.3)
+    knjrbfw (0.0.53)
+      tsafe
+      wref
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
-    polyglot (0.3.2)
+    mime-types (1.19)
+    polyglot (0.3.3)
     rake (0.9.2.2)
-    rcov (0.9.11)
-    rcov (0.9.11-java)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -27,23 +28,23 @@ GEM
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.3.0)
-    sqlite3 (1.3.4)
+    sqlite3 (1.3.6)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tsafe (0.0.1)
+    wref (0.0.4)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
   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.25
+0.0.26

data/knjappserver.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjappserver}
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-28}
+  s.date = %q{2012-07-04}
   s.description = %q{Which supports a lot of undocumented stuff.}
   s.email = %q{k@spernj.org}
   s.executables = ["check_running.rb", "knjappserver_start.rb"]
@@ -104,20 +104,20 @@ Gem::Specification.new do |s|
       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<json>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.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"])
     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<json>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.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"])
     end
   else
@@ -125,10 +125,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<erubis>, [">= 0"])
     s.add_dependency(%q<mail>, [">= 0"])
     s.add_dependency(%q<tsafe>, [">= 0"])
+    s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.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"])
   end
 end

data/lib/include/class_httpsession.rb

@@ -128,11 +128,10 @@ class Knjappserver::Httpsession
         STDOUT.print "#{__id__} - Closing httpsession because of timeout.\n" if @debug
       rescue Errno::ECONNRESET, Errno::ENOTCONN, Errno::EPIPE => e
         STDOUT.print "#{__id__} - Connection error (#{e.inspect})...\n" if @debug
-      rescue SystemExit, Interrupt => e
+      rescue Interrupt => e
         raise e
       rescue Exception => e
-        STDOUT.puts e.inspect
-        STDOUT.puts e.backtrace
+        STDOUT.puts Knj::Errors.error_str(e)
       ensure
         self.destruct
       end
@@ -298,11 +297,9 @@ class Knjappserver::Httpsession
     Thread.current[:knjappserver][:contentgroup] = @cgroup
     time_start = Time.now.to_f if @debug
     
-    @kas.events.call(:request_begin, {
-      :httpsession => self
-    }) if @kas.events
-    
     begin
+      @kas.events.call(:request_begin, :httpsession => self) if @kas.events
+      
       Timeout.timeout(@kas.config[:timeout]) do
         if @handlers_cache.key?(@ext)
           STDOUT.print "Calling handler.\n" if @debug
@@ -349,6 +346,8 @@ class Knjappserver::Httpsession
           end
         end
       end
+    rescue SystemExit
+      #do nothing - ignore.
     rescue Timeout::Error
       @resp.status = 500
       print "The request timed out."

data/lib/include/class_knjappserver_logging.rb

@@ -291,12 +291,13 @@ class Knjappserver
 	
 	#Deletes all logs for an object.
 	def logs_delete(obj)
-    @ob.list(:Log_link, {"object_class" => obj.class.name, "object_id" => obj.id}) do |log_link|
-      log = log_link.log
-      @ob.delete(log_link)
+    @db.q_buffer do |db_buffer|
+      buffer_hash = {:db_buffer => db_buffer}
       
-      if log
-        @ob.delete(log) if log.links("count" => true) <= 0
+      @ob.list(:Log_link, {"object_class" => obj.class.name, "object_id" => obj.id}) do |log_link|
+        log = log_link.log
+        @ob.delete(log_link, buffer_hash)
+        @ob.delete(log, buffer_hash) if log and log.links("count" => true) <= 0
       end
     end
 	end

data/spec/knjappserver_spec.rb

@@ -5,14 +5,11 @@ describe "Knjappserver" do
     require "rubygems"
     require "knjappserver"
     require "knjrbfw"
-    require "knj/autoload"
+    require "sqlite3" if RUBY_ENGINE != "jruby"
     
     db_path = "#{Knj::Os.tmpdir}/knjappserver_rspec.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
     
-    require "knj/knjdb/libknjdb.rb"
-    #require "sqlite3" if RUBY_ENGINE != "jruby"
-    
     begin
       db = Knj::Db.new(
         :type => "sqlite3",
@@ -160,6 +157,43 @@ describe "Knjappserver" do
     raise data["data"] if data["data"] != "123+456%789%20"
   end
   
+  it "should be able to do logging" do
+    class ::TestModels
+      class Person < Knj::Datarow
+        
+      end
+    end
+    
+    Knj::Db::Revision.new.init_db("db" => $appserver.db, "schema" => {
+      "tables" => {
+        "Person" => {
+          "columns" => [
+            {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+            {"name" => "name", "type" => "varchar"}
+          ]
+        }
+      }
+    })
+    
+    ob = Knj::Objects.new(
+      :db => $appserver.db,
+      :datarow => true,
+      :require => false,
+      :module => ::TestModels
+    )
+    
+    person = ob.add(:Person, :name => "Kasper")
+    
+    $appserver.log("This is a test", person)
+    logs = $appserver.ob.list(:Log, "object_lookup" => person).to_a
+    raise "Expected count to be 1 but got: #{logs.length}" if logs.length != 1
+    
+    $appserver.logs_delete(person)
+    
+    logs = $appserver.ob.list(:Log, "object_lookup" => person).to_a
+    raise "Expected count to be 0 but got: #{logs.length}" if logs.length != 0
+  end
+  
   it "should be able to stop." do
     $appserver.stop
   end

metadata

@@ -2,7 +2,7 @@
 name: knjappserver
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-28 00:00:00 +02:00
+date: 2012-07-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,46 +58,46 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: json
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: "0"
   type: :development
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.0
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.6.3
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: jeweler
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.6.3
   type: :development
   prerelease: false
   version_requirements: *id008
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1244618300287044198
+      hash: -3766508252438613801
       segments: 
       - 0
       version: "0"