knjrbfw 0.0.28 → 0.0.29

data/Gemfile

@@ -7,7 +7,7 @@ source "http://rubygems.org"
 # 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"

data/VERSION

@@ -1 +1 @@
-0.0.28
+0.0.29

data/knjrbfw.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{knjrbfw}
-  s.version = "0.0.28"
+  s.version = "0.0.29"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-04-27}
+  s.date = %q{2012-05-03}
   s.description = %q{Including stuff for HTTP, SSH and much more.}
   s.email = %q{k@spernj.org}
   s.extra_rdoc_files = [
@@ -156,6 +156,7 @@ Gem::Specification.new do |s|
     "lib/knj/jruby-gtk2/treeview.rb",
     "lib/knj/jruby-gtk2/vbox.rb",
     "lib/knj/jruby-gtk2/window.rb",
+    "lib/knj/jruby/sqlitejdbc-v056.jar",
     "lib/knj/jruby_compiler.rb",
     "lib/knj/knj.rb",
     "lib/knj/knj_controller.rb",
@@ -233,6 +234,7 @@ Gem::Specification.new do |s|
     "lib/knj/thread2.rb",
     "lib/knj/threadhandler.rb",
     "lib/knj/threadpool.rb",
+    "lib/knj/threadsafe.rb",
     "lib/knj/translations.rb",
     "lib/knj/unix_proc.rb",
     "lib/knj/web.rb",
@@ -270,14 +272,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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<rmagick>, [">= 0"])
     else
       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"])
@@ -285,7 +287,7 @@ Gem::Specification.new do |s|
     end
   else
     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"])

data/lib/knj/autoload/facebooker.rb

@@ -1,3 +1,3 @@
 require "rubygems"
-require File.dirname(__FILE__) + "/json_autoload"
+require "#{File.dirname(__FILE__)}/json_autoload"
 require "facebooker"

data/lib/knj/eruby.rb

@@ -18,7 +18,7 @@ class Knj::Eruby
     if RUBY_PLATFORM == "java" or RUBY_ENGINE == "rbx"
       @cache_mode = :code_eval
       #@cache_mode = :compile_knj
-    elsif RUBY_VERSION.slice(0..2) == "1.9" and RubyVM::InstructionSequence.respond_to?(:compile_file)
+    elsif RUBY_VERSION.slice(0..2) == "1.9" #and RubyVM::InstructionSequence.respond_to?(:compile_file)
       @cache_mode = :code_eval
       #@cache_mode = :inseq
       #@cache_mode = :compile_knj
@@ -37,21 +37,19 @@ class Knj::Eruby
     @error = false
     Dir.mkdir(@tmpdir) if !File.exists?(@tmpdir)
     filename = File.expand_path(filename)
-    raise "File does not exist: #{filename}" if !File.exists?(filename)
-    filetime = File.mtime(filename)
+    raise "File does not exist: #{filename}" unless File.exists?(filename)
     cachename = "#{@tmpdir}/#{filename.gsub("/", "_").gsub(".", "_")}.cache"
+    filetime = File.mtime(filename)
     cachetime = File.mtime(cachename) if File.exists?(cachename)
     
+    if !File.exists?(cachename) or filetime > cachetime
+      Knj::Eruby::Handler.load_file(filename, {:cachename => cachename})
+      File.chmod(0777, cachename)
+      cachetime = File.mtime(cachename)
+      reload_cache = true
+    end
+    
     begin
-      if !File.exists?(cachename) or filetime > cachetime
-        Knj::Eruby::Handler.load_file(filename, {:cachename => cachename})
-        File.chmod(0777, cachename)
-        cachetime = File.mtime(cachename)
-        reload_cache = true
-      elsif !@cache.key?(cachename)
-        reload_cache = true
-      end
-      
       case @cache_mode
         when :compile_knj
           @compiler.eval_file(:filepath => cachename, :fileident => filename)
@@ -63,9 +61,11 @@ class Knj::Eruby
             binding_use = eruby_binding.get_binding
           end
           
-          @cache[cachename] = File.read(cachename) if reload_cache
-          eval(@cache[cachename], binding_use, filename)
+          #No reason to cache contents of files - benchmarking showed little to no differene performance-wise, but caching took up a lot of memory, when a lot of files were cached - knj.
+          eval(File.read(cachename), binding_use, filename)
         when :inseq
+          reload_cache = true if !@cache.key?(cachename)
+          
           if reload_cache or @cache[cachename][:time] < cachetime
             @cache[cachename] = {
               :inseq => RubyVM::InstructionSequence.compile(File.read(cachename), filename, nil, 1),

data/lib/knj/gtk2.rb

@@ -1,8 +1,9 @@
 module Knj::Gtk2
-  autoload :Cb, "knj/gtk2_cb"
-  autoload :Menu, "knj/gtk2_menu"
-  autoload :StatusWindow, "knj/gtk2_statuswindow"
-  autoload :Tv, "knj/gtk2_tv"
+  #Autoloader.
+  def self.const_missing(name)
+    require "#{$knjpath}knj/gtk2_#{name.to_s.downcase}"
+    return Knj::Gtk2.const_get(name)
+  end
   
   def msgbox(p1, p2 = "warning", p3 = "Warning")
     return Knj::Gtk2.msgbox(p1, p2, p3)

data/lib/knj/http2.rb

@@ -1,7 +1,7 @@
 require "#{$knjpath}web"
 
 class Knj::Http2
-  attr_reader :cookies
+  attr_reader :cookies, :args
   
   def initialize(args = {})
     args = {:host => args} if args.is_a?(String)
@@ -362,7 +362,7 @@ class Knj::Http2
     @resp = nil
     @mode = nil
     
-    raise "No status-code was received from the server.\n\nHeaders:\n#{Knj::Php.print_r(resp.headers)}\n\nBody:\n#{resp.args[:body]}" if !resp.args[:code]
+    raise "No status-code was received from the server.\n\nHeaders:\n#{Knj::Php.print_r(resp.headers, true)}\n\nBody:\n#{resp.args[:body]}" if !resp.args[:code]
     
     if resp.args[:code].to_s == "302" and resp.header?("location") and (!@args.key?(:follow_redirects) or @args[:follow_redirects])
       uri = URI.parse(resp.header("location"))

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb

@@ -21,7 +21,7 @@ class KnjDB_sqlite3
       if @knjdb.opts[:sqlite_driver]
         require @knjdb.opts[:sqlite_driver]
       else
-        require "#{File.dirname(__FILE__)}/../../sqlitejdbc-v056.jar"
+        require "#{File.dirname(__FILE__)}/../../../jruby/sqlitejdbc-v056.jar"
       end
       
       require "java"
@@ -45,7 +45,7 @@ class KnjDB_sqlite3
         begin
           return KnjDB_sqlite3_result_java.new(self, @stat.executeQuery(string))
         rescue java.sql.SQLException => e
-          if e.message == "java.sql.SQLException: query does not return ResultSet"
+          if e.message.to_s.index("query does not return ResultSet") != nil
             return KnjDB_sqlite3_result_java.new(self, nil)
           else
             raise e

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb

@@ -45,7 +45,7 @@ class KnjDB_sqlite3::Tables
         if block_given?
           yield(obj)
         else
-          ret[d_tables[:Name]] = obj
+          ret[d_tables[:name]] = obj
         end
       end
     end

data/lib/knj/knjdb/libknjdb.rb

@@ -1,7 +1,8 @@
 class Knj::Db
-  unless Kernel.const_defined?("Rho")
-    autoload :Dbtime, "#{$knjpath}knjdb/dbtime.rb"
-    autoload :Revision, "#{$knjpath}knjdb/revision.rb"
+  #Autoloader.
+  def self.const_missing(name)
+    require "#{$knjpath}knjdb/#{name.to_s.downcase}"
+    return Knj::Db.const_get(name)
   end
   
   attr_reader :opts, :conn, :conns, :int_types
@@ -178,7 +179,7 @@ class Knj::Db
   end
   
   def insert(tablename, arr_insert, args = {})
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       sql = "INSERT INTO #{driver.escape_table}#{tablename.to_s}#{driver.escape_table} ("
       
       first = true
@@ -213,7 +214,7 @@ class Knj::Db
   end
   
   def insert_multi(tablename, arr_hashes)
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       if driver.respond_to?(:insert_multi)
         return false if arr_hashes.empty?
         driver.insert_multi(tablename, arr_hashes)
@@ -228,7 +229,7 @@ class Knj::Db
   def update(tablename, arr_update, arr_terms = {})
     return false if arr_update.empty?
     
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       sql = ""
       sql << "UPDATE #{driver.escape_col}#{tablename.to_s}#{driver.escape_col} SET "
       
@@ -256,7 +257,7 @@ class Knj::Db
   def select(tablename, arr_terms = nil, args = nil, &block)
     sql = ""
     
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       sql = "SELECT * FROM #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
       
       if arr_terms != nil and !arr_terms.empty?
@@ -285,18 +286,21 @@ class Knj::Db
     return self.q(sql, &block)
   end
   
-  def selectsingle(tablename, arr_terms = nil, args = {})
-    args["limit"] = 1
-    return self.select(tablename, arr_terms, args).fetch
-  end
-  
   def single(tablename, arr_terms = nil, args = {})
     args["limit"] = 1
-    return self.select(tablename, arr_terms, args).fetch
+    
+    #Experienced very weird memory leak if this was not done by block. Maybe bug in Ruby 1.9.2? - knj
+    self.select(tablename, arr_terms, args) do |data|
+      return data
+    end
+    
+    return false
   end
   
+  alias :selectsingle :single
+  
   def delete(tablename, arr_terms)
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       sql = "DELETE FROM #{driver.escape_table}#{tablename}#{driver.escape_table}"
       
       if arr_terms != nil and !arr_terms.empty?
@@ -305,6 +309,8 @@ class Knj::Db
       
       driver.query(sql)
     end
+    
+    return nil
   end
   
   def makeWhere(arr_terms, driver)
@@ -320,6 +326,8 @@ class Knj::Db
       
       if value.is_a?(Array)
         sql << "#{driver.escape_col}#{key}#{driver.escape_col} IN (#{Knj::ArrayExt.join(:arr => value, :sep => ",", :surr => "'", :callback => proc{|ele| self.esc(ele)})})"
+      elsif value.is_a?(Hash)
+        raise "Dont know how to handle hash."
       else
         sql << "#{driver.escape_col}#{key}#{driver.escape_col} = #{driver.escape_val}#{driver.escape(value)}#{driver.escape_val}"
       end
@@ -540,7 +548,7 @@ class Knj::Db
   end
   
   def method_missing(method_name, *args)
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       if driver.respond_to?(method_name.to_sym)
         return driver.send(method_name, *args)
       end

data/lib/knj/objects/objects_sqlhelper.rb

@@ -64,7 +64,7 @@ class Knj::Objects
             if val[1] == "asc"
               ordermode = " ASC"
             elsif val[1] == "desc"
-              ordermode = "DESC"
+              ordermode = " DESC"
             end
             
             if val[0].is_a?(Array)

data/lib/knj/php.rb

@@ -60,7 +60,7 @@ module Knj::Php
         end
         
         retstr << "[#{keystr}] => "
-        retstr << print_r(pair[1], true, count + 1).to_s
+        retstr << Knj::Php.print_r(pair[1], true, count + 1).to_s
       end
       
       i = 0
@@ -107,8 +107,8 @@ module Knj::Php
           i_spaces += 1
         end
         
-        retstr << "[" + arr_count.to_s + "] => "
-        retstr << print_r(i, true, count + 1).to_s
+        retstr << "[#{arr_count}] => "
+        retstr << Knj::Php.print_r(i, true, count + 1).to_s
         arr_count += 1
       end
       
@@ -128,21 +128,21 @@ module Knj::Php
     elsif argument.is_a?(Exception)
       retstr << "#\{#{argument.class.to_s}: #{argument.message}}\n"
     elsif cstr == "Knj::Unix_proc"
-      retstr << "#{argument.class.to_s}::data - "
-      retstr << print_r(argument.data, true, count).to_s
+      retstr << "#{argument.class.name}::data - "
+      retstr << Knj::Php.print_r(argument.data, true, count).to_s
     elsif cstr == "Thread"
-      retstr << "#{argument.class.to_s} - "
+      retstr << "#{argument.class.name} - "
       
       hash = {}
       argument.keys.each do |key|
         hash[key] = argument[key]
       end
       
-      retstr << print_r(hash, true, count).to_s
+      retstr << Knj::Php.print_r(hash, true, count).to_s
     elsif cstr == "Class"
       retstr << "#{argument.class.to_s} - "
       hash = {"name" => argument.name}
-      retstr << print_r(hash, true, count).to_s
+      retstr << Knj::Php.print_r(hash, true, count).to_s
     elsif cstr == "URI::Generic"
       retstr << "#{argument.class.to_s}{\n"
       methods = [:host, :port, :scheme, :path]
@@ -972,10 +972,5 @@ module Knj::Php
     return PHP.unserialize(argument.to_s)
   end
   
-  @methods = instance_methods
-  def self.php_list_defined_methods
-    return @methods
-  end
-  
   module_function(*instance_methods)
 end

data/lib/knj/process.rb

@@ -128,25 +128,39 @@ class Knj::Process
             @on_rec.call(result_obj) do |answer_block|
               $stderr.print "Running enum-block for #{answer_block}\n" if @debug
               
+              #Block has ended on hosts side - break out of block-loop.
               break if !@blocks_send.key?(id)
+              
+              #Throw the result at the block running.
               y << answer_block
+              
+              #This is to prevent the block-loop from running again, until host has confirmed it wants another result.
               dobreak = false
               
               loop do
+                #Block has ended on hosts-side - break of out block-loop.
                 if !@blocks_send.key?(id)
                   dobreak = true
                   break
                 end
                 
-                break if @blocks_send[id][:waiting_for_result]
+                #If waiting for result then release the loop and return another result.
+                if @blocks_send[id][:waiting_for_result]
+                  @blocks_send[id][:waiting_for_result] = false
+                  break
+                end
+                
+                #Wait a little with checking for another result to not use 100% CPU.
                 sleep 0.01
               end
               
+              #The block-loop should not run again - it has been prematurely interrupted on the host-side.
               break if dobreak
             end
           end
         when "send_block_res"
           begin
+            #The host wants another result. Set the 'waiting-for-result' and wait for the enumerator to run. Then return result from enumerator (code is right above here).
             @blocks_send[obj][:waiting_for_result] = true
             res = @blocks_send[obj][:enum].next
             self.answer(id, {"result" => res})
@@ -167,29 +181,38 @@ class Knj::Process
           
           self.answer(id, "ok")
         when "send_block_buffer"
-          buffer_use = true
-          
           Knj::Thread.new do
+            mutex = Mutex.new #Protecting 'buffer_answers'-variable. Crashing JRuby...
             result_obj = Knj::Process::Resultobject.new(:process => self, :id => id, :obj => obj)
             block_res = nil
+            buffer_done = false
             
             begin
-              if buffer_use
-                buffer_answers = []
-                buffer_done = false
-                
-                buffer_thread = Knj::Thread.new do
-                  loop do
+              buffer_answers = []
+              
+              buffer_thread = Knj::Thread.new do
+                dobreak = false
+                loop do
+                  arr = nil
+                  mutex.synchronize do
                     arr = buffer_answers.shift(200)
-                    
-                    if !arr.empty?
-                      $stderr.print "Sending: #{arr.length} results.\n" if @debug
-                      self.answer(id, arr, "answer_block")
-                    else
-                      sleep 0.05
+                  end
+                  
+                  if !arr.empty?
+                    $stderr.print "Sending: #{arr.length} results.\n" if @debug
+                    self.answer(id, arr, "answer_block")
+                  else
+                    $stderr.print "Waiting for buffer-stuff (#{arr.length}, #{buffer_done}).\n" if @debug
+                    sleep 0.05
+                  end
+                  
+                  if buffer_done
+                    mutex.synchronize do
+                      $stderr.print "Buffer-answers: #{buffer_answers.length}, #{buffer_answers.empty?}\n" if @debug
+                      dobreak = true if buffer_answers.empty? #since a break will not affect the real loop in Mutex#synchronize set this variable.
                     end
                     
-                    break if buffer_done and buffer_answers.empty?
+                    break if dobreak
                   end
                 end
               end
@@ -198,22 +221,23 @@ class Knj::Process
                 begin
                   count = 0
                   block_res = @on_rec.call(result_obj) do |answer_block|
-                    if buffer_use
-                      loop do
-                        if buffer_answers.length > 1000
-                          $stderr.print "Buffer is more than 1000 - sleeping and tries again in 0.05 sec.\n" if @debug
-                          sleep 0.05
-                        else
-                          break
-                        end
+                    loop do
+                      len = nil
+                      mutex.synchronize do
+                        len = buffer_answers.length
+                      end
+                      
+                      if len > 1000
+                        $stderr.print "Buffer is more than 1000 - sleeping and tries again in 0.05 sec.\n" if @debug
+                        sleep 0.05
+                      else
+                        break
                       end
                     end
                     
                     count += 1
-                    if buffer_use
+                    mutex.synchronize do
                       buffer_answers << answer_block
-                    else
-                      self.answer(id, [answer_block], "answer_block")
                     end
                     
                     if count >= 100
@@ -234,10 +258,10 @@ class Knj::Process
                     end
                   end
                 ensure
-                  buffer_done = true if buffer_use
+                  buffer_done = true
                 end
               ensure
-                buffer_thread.join if buffer_use
+                buffer_thread.join
               end
             rescue Exception => e
               $stderr.print Knj::Errors.error_str(e) if @debug

data/lib/knj/process_meta.rb

@@ -394,7 +394,7 @@ class Knj::Process_meta::Proxy_obj
   
   def initialize(args)
     @args = args
-    @_process_meta_buffer_use = false
+    @_process_meta_block_buffer_use = false
     ObjectSpace.define_finalizer(self, @args[:process_meta].method(:proxy_finalizer))
   end
   
@@ -538,9 +538,13 @@ class Knj::Process_meta::Proxy_obj::Buffered_caller
     self._pm_flush
     
     if @args[:async]
+      threads_remove = []
       @threads.each do |thread|
         thread.join
+        threads_remove << thread
       end
+      
+      @threads -= threads_remove
     end
     
     raise @raise_error if @raise_error

data/lib/knj/scripts/php_to_rb_helper.rb

@@ -354,7 +354,7 @@ end
 
 funcs_skip = [:foreach]
 funcs_remove = [:session_start]
-funcs_all = funcs_skip | Knj::Php.php_list_defined_methods
+funcs_all = funcs_skip | Knj::Php.instance_methods
 
 funcs_all.each do |method_name|
   next if funcs_skip.index(method_name) != nil

data/lib/knj/tests/test_degulesider.rb

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
 
 require "knj/autoload"
-include Knj
 
-dgs = Degulesider.new
+dgs = Knj::Degulesider.new
 results = dgs.search(
   :where => "Engvej 3, 4970 Rødby"
 )
 
-Php.print_r(results)
+Knj::Php.print_r(results)

data/lib/knj/threadsafe.rb

@@ -0,0 +1,33 @@
+#Copied from Headius: https://github.com/headius/thread_safe. Not just bundeled because I would like to make changes later...
+#Minor modifications from Headius's original lib like submoduled, lower-case-safe and more...
+
+if defined?(JRUBY_VERSION)
+  require "jruby/synchronized"
+  
+  module Knj::Threadsafe
+    # A thread-safe subclass of Array. This version locks
+    # against the object itself for every method call,
+    # ensuring only one thread can be reading or writing
+    # at a time. This includes iteration methods like
+    # #each.
+    class Array < ::Array
+      include JRuby::Synchronized
+    end
+    
+    # A thread-safe subclass of Hash. This version locks
+    # against the object itself for every method call,
+    # ensuring only one thread can be reading or writing
+    # at a time. This includes iteration methods like
+    # #each.
+    class Hash < ::Hash
+      include JRuby::Synchronized
+    end
+  end
+else
+  # Because MRI never runs code in parallel, the existing
+  # non-thread-safe structures should usually work fine.
+  module Knj::ThreadSafe
+    Array = ::Array
+    Hash = ::Hash
+  end
+end

data/lib/knj/win.rb

@@ -1,4 +1,6 @@
 module Knj::Win
-  autoload :Registry, $knjpath + "win_registry"
-  autoload :TightVNC, $knjpath + "win_tightvnc"
+  #Autoloader.
+  def self.const_missing(name)
+    require "#{$knjpath}knj/win_#{name.to_s.downcase}"
+  end
 end

data/lib/knj/wref.rb

@@ -6,6 +6,7 @@ class Knj::Wref
     @id = obj.__id__
     
     if RUBY_ENGINE == "jruby"
+      require "java"
       @weakref = java.lang.ref.WeakReference.new(obj)
     else
       @class_name = obj.class.name.to_sym

data/spec/amixer_spec.rb

@@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Amixer" do
   it "should load by using autoload" do
     require "knjrbfw"
-    require "knj/autoload"
     
     $amixer = Knj::Amixer.new
   end
@@ -20,6 +19,7 @@ describe "Amixer" do
         mixers.each do |name, mixer|
           next if !mixer.volume?
           mixer.vol_add -5
+          mixer.vol_add 3
         end
       end
     end

data/spec/db_spec.rb

@@ -8,7 +8,8 @@ describe "Db" do
     
     require "knj/db"
     require "knj/os"
-    require "sqlite3" if !Kernel.const_defined?("SQLite3")
+    require "rubygems"
+    require "sqlite3" if !Kernel.const_defined?("SQLite3") and RUBY_ENGINE != "jruby"
     
     db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
@@ -27,6 +28,15 @@ describe "Db" do
       ]
     })
     
+    
+    
+    #Get a list of tables and check the list for errors.
+    list = db.tables.list
+    raise "Table not found: 'test'." if !list.key?("test")
+    raise "Table-name expected to be 'test' but wasnt: '#{list["test"].name}'." if list["test"].name != "test"
+    
+    
+    #Test revision to create tables.
     schema = {
       "tables" => {
         "test_table" => {

data/spec/http2_spec.rb

@@ -49,7 +49,7 @@ describe "Http2" do
     ]
     urls = ["robots.txt"]
     
-    http = Knj::Http2.new(:host => "www.partyworm.dk", :debug => true)
+    http = Knj::Http2.new(:host => "www.partyworm.dk", :debug => false)
     0.upto(105) do |count|
       url = urls[rand(urls.size)]
       #print "Doing request #{count} of 200 (#{url}).\n"

data/spec/knjrbfw_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Knjrbfw" do
   it "should be able to generate a sample SQLite database and add a sample table, with sample columns and with a sample index to it" do
     require "knjrbfw"
-    require "sqlite3"
+    require "sqlite3" if RUBY_ENGINE != "jruby"
     
     db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     
@@ -193,7 +193,7 @@ describe "Knjrbfw" do
   end
   
   it "should delete the temp database again." do
-    db_path = "#{Dir.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
+    db_path = "#{Knj::Os.tmpdir}/knjrbfw_test_sqlite3.sqlite3"
     File.unlink(db_path) if File.exists?(db_path)
   end
   
@@ -296,7 +296,8 @@ describe "Knjrbfw" do
   end
   
   it "should be able to draw rounded transparent corners on images." do
-    require "rmagick"
+    require "rubygems"
+    require "RMagick"
     
     pic = Magick::Image.read("#{File.dirname(__FILE__)}/../testfiles/image.jpg").first
     pic.format = "png"

data/spec/process_meta_spec.rb

@@ -2,10 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Process_meta" do
   it "should be able to start a server and a client" do
-    require "knj/autoload"
+    require "knj/process_meta"
+    require "timeout"
     
     #Start the activity.
-    $process_meta = Knj::Process_meta.new("debug" => false, "debug_err" => true)
+    $process_meta = Knj::Process_meta.new("debug" => false, "debug_err" => true, "id" => "process_meta_spec")
   end
   
   it "should be able to do various operations" do
@@ -37,15 +38,13 @@ describe "Process_meta" do
     $ids << proxy_obj3.__id__
     
     proxy_obj.test_block do |i|
-      if i == 5
-        break
-      end
+      break if i == 5
     end
     
     last_num = proxy_obj.last_num
     raise "Expected last num to be 5 but it wasnt: '#{last_num}'." if last_num != 5
     
-    #Somehow define_finalizer is always one behind, so we have to do funny one here.
+    #Somehow define_finalizer is always one behind, so we have to do another funny one here.
     ObjectSpace.define_finalizer(self, $process_meta.method(:proxy_finalizer))
   end
   
@@ -74,14 +73,16 @@ describe "Process_meta" do
     
     #Do a lot of calls at the same time to test thread-safety.
     threads = []
-    0.upto(10) do |i|
-      should_return = "Kasper".slice(0, i)
-      threads << Knj::Thread.new do
-        0.upto(500) do
-          res = proxy_obj.slice(0, i)
+    0.upto(10) do |thread_i|
+      should_return = "Kasper".slice(0, thread_i)
+      thread = Knj::Thread.new do
+        0.upto(500) do |num_i|
+          res = proxy_obj.slice(0, thread_i)
           raise "Should return: '#{should_return}' but didnt: '#{res}'." if res != should_return
         end
       end
+      
+      threads << thread
     end
     
     threads.each do |thread|
@@ -99,19 +100,24 @@ describe "Process_meta" do
     end
     
     #Ensure the expected has actually been increased by running the block.
-    raise "Expected end-result of 11 but got: '#{expect}'." if expect != 1001
+    raise "Expected end-result of 1001 but got: '#{expect}'." if expect != 1001
     
     
+    proxy_int = $process_meta.spawn_object(:Integer, nil, 5)
     proxy_int._process_meta_block_buffer_use = true
     expect = 5
-    proxy_int.upto(10000) do |i|
-      raise "Expected '#{expect}' but got: '#{i}'." if i != expect
-      expect += 1
+    
+    #If this takes more than 10 secs - something is wrong (JRuby can take a long time)...
+    Timeout.timeout(10) do
+      proxy_int.upto(10000) do |i|
+        raise "Expected '#{expect}' but got: '#{i}'." if i != expect
+        expect += 1
+      end
     end
     
     
     #Ensure the expected has actually been increased by running the block.
-    raise "Expected end-result of 11 but got: '#{expect}'." if expect != 10001
+    raise "Expected end-result of 10001 but got: '#{expect}'." if expect != 10001
     
     #Try to unset an object.
     proxy_obj._process_meta_unset
@@ -132,14 +138,14 @@ describe "Process_meta" do
       nil
     ")
     
-    Timeout.timeout(5) do
+    Timeout.timeout(10) do
       expect = 8
       $process_meta.static("Kaspertest", "kaspertest") do |count|
-        raise "Expected '#{expect}' but got: '#{count}'."
+        raise "Expected '#{expect}' but got: '#{count}'." if expect != count
         expect += 1
       end
       
-      raise "Expected '13' but got: '#{expect}'."
+      raise "Expected '13' but got: '#{expect}'." if expect != 13
     end
   end
   

data/spec/process_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Process" do
   it "should be able to start a server and a client" do
-    require "knj/autoload"
+    require "timeout"
     
     tcp_server = TCPServer.new("0.0.0.0", 15678)
     conn_client = TCPSocket.new("localhost", 15678)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.28
+  version: 0.0.29
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000 +02:00
+date: 2012-05-03 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15665000 !ruby/object:Gem::Requirement
+  requirement: &20663780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *15665000
+  version_requirements: *20663780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15664000 !ruby/object:Gem::Requirement
+  requirement: &20663120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15664000
+  version_requirements: *20663120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15663060 !ruby/object:Gem::Requirement
+  requirement: &20626880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *15663060
+  version_requirements: *20626880
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15656020 !ruby/object:Gem::Requirement
+  requirement: &20625900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15656020
+  version_requirements: *20625900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15655380 !ruby/object:Gem::Requirement
+  requirement: &20624280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15655380
+  version_requirements: *20624280
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &15654840 !ruby/object:Gem::Requirement
+  requirement: &20621140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,7 +77,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15654840
+  version_requirements: *20621140
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -225,6 +225,7 @@ files:
 - lib/knj/jruby-gtk2/treeview.rb
 - lib/knj/jruby-gtk2/vbox.rb
 - lib/knj/jruby-gtk2/window.rb
+- lib/knj/jruby/sqlitejdbc-v056.jar
 - lib/knj/jruby_compiler.rb
 - lib/knj/knj.rb
 - lib/knj/knj_controller.rb
@@ -302,6 +303,7 @@ files:
 - lib/knj/thread2.rb
 - lib/knj/threadhandler.rb
 - lib/knj/threadpool.rb
+- lib/knj/threadsafe.rb
 - lib/knj/translations.rb
 - lib/knj/unix_proc.rb
 - lib/knj/web.rb
@@ -343,7 +345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 894302943033086074
+      hash: -1825671310375953872
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: