knjrbfw 0.0.4 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.7

data/knjrbfw.gemspec

@@ -0,0 +1,260 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{knjrbfw}
+  s.version = "0.0.7"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Kasper Johansen"]
+  s.date = %q{2011-08-03}
+  s.description = %q{Including stuff for HTTP, SSH and much more.}
+  s.email = %q{k@spernj.org}
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "knjrbfw.gemspec",
+    "lib/knj/.gitignore",
+    "lib/knj/arrayext.rb",
+    "lib/knj/autoload.rb",
+    "lib/knj/autoload/activesupport.rb",
+    "lib/knj/autoload/backups/facets_dictionary.rb",
+    "lib/knj/autoload/backups/parsedate.rb",
+    "lib/knj/autoload/backups/ping.rb",
+    "lib/knj/autoload/cinch.rb",
+    "lib/knj/autoload/erubis.rb",
+    "lib/knj/autoload/facebooker.rb",
+    "lib/knj/autoload/facets_dictionary.rb",
+    "lib/knj/autoload/gd2.rb",
+    "lib/knj/autoload/gettext.rb",
+    "lib/knj/autoload/gtk2.rb",
+    "lib/knj/autoload/json_autoload.rb",
+    "lib/knj/autoload/magick.rb",
+    "lib/knj/autoload/mysql.rb",
+    "lib/knj/autoload/parsedate.rb",
+    "lib/knj/autoload/ping.rb",
+    "lib/knj/autoload/rexml.rb",
+    "lib/knj/autoload/soap.rb",
+    "lib/knj/autoload/sqlite3.rb",
+    "lib/knj/autoload/tmail.rb",
+    "lib/knj/autoload/twitter.rb",
+    "lib/knj/autoload/xmlsimple.rb",
+    "lib/knj/autoload/zip.rb",
+    "lib/knj/compiler.rb",
+    "lib/knj/cpufreq.rb",
+    "lib/knj/datarow.rb",
+    "lib/knj/datestamp.rb",
+    "lib/knj/datet.rb",
+    "lib/knj/degulesider.rb",
+    "lib/knj/erb/apache_knjerb.conf",
+    "lib/knj/erb/cache/README",
+    "lib/knj/erb/erb.rb",
+    "lib/knj/erb/erb_1.9.rb",
+    "lib/knj/erb/erb_cache_clean.rb",
+    "lib/knj/erb/erb_fcgi.rb",
+    "lib/knj/erb/erb_fcgi_1.9.rb",
+    "lib/knj/erb/erb_fcgi_jruby.rb",
+    "lib/knj/erb/erb_jruby.rb",
+    "lib/knj/erb/include.rb",
+    "lib/knj/errors.rb",
+    "lib/knj/eruby.rb",
+    "lib/knj/event_filemod.rb",
+    "lib/knj/event_handler.rb",
+    "lib/knj/exchangerates.rb",
+    "lib/knj/ext/webrick.rb",
+    "lib/knj/filesystem.rb",
+    "lib/knj/fs/drivers/filesystem.rb",
+    "lib/knj/fs/drivers/ftp.rb",
+    "lib/knj/fs/drivers/ssh.rb",
+    "lib/knj/fs/fs.rb",
+    "lib/knj/gettext_fallback.rb",
+    "lib/knj/gettext_threadded.rb",
+    "lib/knj/google_sitemap.rb",
+    "lib/knj/gtk2.rb",
+    "lib/knj/gtk2_cb.rb",
+    "lib/knj/gtk2_menu.rb",
+    "lib/knj/gtk2_statuswindow.rb",
+    "lib/knj/gtk2_tv.rb",
+    "lib/knj/hash_methods.rb",
+    "lib/knj/http.rb",
+    "lib/knj/includes/appserver_cli.rb",
+    "lib/knj/ip2location.rb",
+    "lib/knj/ironruby-gtk2/button.rb",
+    "lib/knj/ironruby-gtk2/dialog.rb",
+    "lib/knj/ironruby-gtk2/entry.rb",
+    "lib/knj/ironruby-gtk2/gdk_event.rb",
+    "lib/knj/ironruby-gtk2/gdk_eventbutton.rb",
+    "lib/knj/ironruby-gtk2/gdk_pixbuf.rb",
+    "lib/knj/ironruby-gtk2/gladexml.rb",
+    "lib/knj/ironruby-gtk2/glib.rb",
+    "lib/knj/ironruby-gtk2/gtk2.rb",
+    "lib/knj/ironruby-gtk2/gtk_builder.rb",
+    "lib/knj/ironruby-gtk2/gtk_cellrenderertext.rb",
+    "lib/knj/ironruby-gtk2/gtk_combobox.rb",
+    "lib/knj/ironruby-gtk2/gtk_filechooserbutton.rb",
+    "lib/knj/ironruby-gtk2/gtk_liststore.rb",
+    "lib/knj/ironruby-gtk2/gtk_menu.rb",
+    "lib/knj/ironruby-gtk2/gtk_menuitem.rb",
+    "lib/knj/ironruby-gtk2/gtk_statusicon.rb",
+    "lib/knj/ironruby-gtk2/gtk_treeiter.rb",
+    "lib/knj/ironruby-gtk2/gtk_treeselection.rb",
+    "lib/knj/ironruby-gtk2/gtk_treeview.rb",
+    "lib/knj/ironruby-gtk2/gtk_treeviewcolumn.rb",
+    "lib/knj/ironruby-gtk2/iconsize.rb",
+    "lib/knj/ironruby-gtk2/image.rb",
+    "lib/knj/ironruby-gtk2/label.rb",
+    "lib/knj/ironruby-gtk2/stock.rb",
+    "lib/knj/ironruby-gtk2/tests/test.glade",
+    "lib/knj/ironruby-gtk2/tests/test_2.rb",
+    "lib/knj/ironruby-gtk2/tests/test_ironruby_window.rb",
+    "lib/knj/ironruby-gtk2/vbox.rb",
+    "lib/knj/ironruby-gtk2/window.rb",
+    "lib/knj/jruby-gtk2/builder.rb",
+    "lib/knj/jruby-gtk2/builder/test_builder.glade",
+    "lib/knj/jruby-gtk2/builder/test_builder.rb",
+    "lib/knj/jruby-gtk2/builder/test_builder.ui",
+    "lib/knj/jruby-gtk2/cellrenderertext.rb",
+    "lib/knj/jruby-gtk2/checkbutton.rb",
+    "lib/knj/jruby-gtk2/combobox.rb",
+    "lib/knj/jruby-gtk2/dialog.rb",
+    "lib/knj/jruby-gtk2/eventbutton.rb",
+    "lib/knj/jruby-gtk2/gladexml.rb",
+    "lib/knj/jruby-gtk2/gtk-4.0.jar",
+    "lib/knj/jruby-gtk2/gtk2.rb",
+    "lib/knj/jruby-gtk2/hbox.rb",
+    "lib/knj/jruby-gtk2/iconsize.rb",
+    "lib/knj/jruby-gtk2/image.rb",
+    "lib/knj/jruby-gtk2/liststore.rb",
+    "lib/knj/jruby-gtk2/menu.rb",
+    "lib/knj/jruby-gtk2/progressbar.rb",
+    "lib/knj/jruby-gtk2/statusicon.rb",
+    "lib/knj/jruby-gtk2/stock.rb",
+    "lib/knj/jruby-gtk2/tests/test_glade_window.glade",
+    "lib/knj/jruby-gtk2/tests/test_glade_window.rb",
+    "lib/knj/jruby-gtk2/tests/test_normal_window.rb",
+    "lib/knj/jruby-gtk2/tests/test_trayicon.png",
+    "lib/knj/jruby-gtk2/tests/test_trayicon.rb",
+    "lib/knj/jruby-gtk2/treeview.rb",
+    "lib/knj/jruby-gtk2/vbox.rb",
+    "lib/knj/jruby-gtk2/window.rb",
+    "lib/knj/jruby_compiler.rb",
+    "lib/knj/knj.rb",
+    "lib/knj/knj_controller.rb",
+    "lib/knj/knjdb/dbtime.rb",
+    "lib/knj/knjdb/drivers/mysql/knjdb_mysql.rb",
+    "lib/knj/knjdb/drivers/mysql/knjdb_mysql_columns.rb",
+    "lib/knj/knjdb/drivers/mysql/knjdb_mysql_indexes.rb",
+    "lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb",
+    "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb",
+    "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb",
+    "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_indexes.rb",
+    "lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb",
+    "lib/knj/knjdb/libknjdb.rb",
+    "lib/knj/knjdb/libknjdb_java_sqlite3.rb",
+    "lib/knj/knjdb/libknjdb_row.rb",
+    "lib/knj/knjdb/libknjdb_sqlite3_ironruby.rb",
+    "lib/knj/knjdb/mysql-connector-java-5.1.13-bin.jar",
+    "lib/knj/knjdb/sqlitejdbc-v056.jar",
+    "lib/knj/libqt.rb",
+    "lib/knj/libqt_window.rb",
+    "lib/knj/locale_strings.rb",
+    "lib/knj/locales.rb",
+    "lib/knj/maemo/fremantle-calendar/fremantle-calendar.rb",
+    "lib/knj/mail.rb",
+    "lib/knj/mailobj.rb",
+    "lib/knj/mount.rb",
+    "lib/knj/mutexcl.rb",
+    "lib/knj/notify.rb",
+    "lib/knj/nvidia_settings.rb",
+    "lib/knj/objects.rb",
+    "lib/knj/opts.rb",
+    "lib/knj/os.rb",
+    "lib/knj/php.rb",
+    "lib/knj/php_parser/arguments.rb",
+    "lib/knj/php_parser/functions.rb",
+    "lib/knj/php_parser/php_parser.rb",
+    "lib/knj/php_parser/tests/test.rb",
+    "lib/knj/php_parser/tests/test_function.php",
+    "lib/knj/php_parser/tests/test_function_run.rb",
+    "lib/knj/power_manager.rb",
+    "lib/knj/rand.rb",
+    "lib/knj/retry.rb",
+    "lib/knj/rhodes/mutex.rb",
+    "lib/knj/rhodes/rhodes.js",
+    "lib/knj/rhodes/rhodes.rb",
+    "lib/knj/rsvgbin.rb",
+    "lib/knj/scripts/degulesider.rb",
+    "lib/knj/scripts/filesearch.rb",
+    "lib/knj/scripts/ip2location.rb",
+    "lib/knj/scripts/keepalive.rb",
+    "lib/knj/scripts/svn_merge.rb",
+    "lib/knj/scripts/upgrade_knjrbfw_checker.rb",
+    "lib/knj/sms.rb",
+    "lib/knj/sshrobot/sshrobot.rb",
+    "lib/knj/strings.rb",
+    "lib/knj/sysuser.rb",
+    "lib/knj/tests/compiler/compiler_test.rb",
+    "lib/knj/tests/compiler/compiler_test_file.rb",
+    "lib/knj/tests/test_degulesider.rb",
+    "lib/knj/tests/test_mount.rb",
+    "lib/knj/tests/test_retry.rb",
+    "lib/knj/thread.rb",
+    "lib/knj/thread2.rb",
+    "lib/knj/threadhandler.rb",
+    "lib/knj/threadpool.rb",
+    "lib/knj/translations.rb",
+    "lib/knj/unix_proc.rb",
+    "lib/knj/web.rb",
+    "lib/knj/webscripts/image.rhtml",
+    "lib/knj/win.rb",
+    "lib/knj/win_registry.rb",
+    "lib/knj/win_tightvnc.rb",
+    "lib/knj/x11vnc.rb",
+    "lib/knj/youtube.rb",
+    "lib/knjrbfw.rb",
+    "spec/knjrbfw_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/kaspernj/knjrbfw}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{A framework with lots of stuff for Ruby.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    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<jeweler>, ["~> 1.6.3"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+    else
+      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
+    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/knj/autoload.rb

@@ -27,6 +27,7 @@ module Knj
 	autoload :Opts, $knjpath + "opts.rb"
 	autoload :Mail, $knjpath + "mail.rb"
 	autoload :Mailobj, $knjpath + "mailobj.rb"
+	autoload :Mutexcl, $knjpath + "mutexcl.rb"
 	autoload :Mount, $knjpath + "mount.rb"
 	autoload :Mplayer, $knjpath + "mplayer.rb"
 	autoload :Notify, $knjpath + "notify.rb"

data/lib/knj/compiler.rb

@@ -14,15 +14,14 @@ class Knj::Compiler
 	#Compiles file into cache as a method.
 	def compile_file(args)
 		raise "File does not exist." if !File.exist?(args[:filepath])
-		filepath = Knj::Php.realpath(args[:filepath])
-		defname = def_name_for_file_path(filepath)
+		defname = def_name_for_file_path(args[:filepath])
 		
 		evalcont = "class Knj::Compiler::Container; def self.#{defname};"
-		evalcont += File.read(filepath)
+		evalcont += File.read(args[:filepath])
 		evalcont += ";end;end"
 		
 		eval(evalcont, nil, args[:fileident])
-    @compiled[filepath] = Time.new
+    @compiled[args[:filepath]] = Time.new
 	end
 	
 	#Returns the method name for a filepath.
@@ -32,19 +31,23 @@ class Knj::Compiler
 	
 	#Compile and evaluate a file - it will be cached.
 	def eval_file(args)
-    filepath = Knj::Php.realpath(args[:filepath])
-    
 		#Compile if it hasnt been compiled yet.
-		@mutex.synchronize do
-      compile_file(args) if !@compiled.has_key?(filepath)
-      
-      #Compile if modified time has been changed.
-      mtime = File.mtime(filepath)
-      compile_file(args) if @compiled[filepath] < mtime
+    if !@compiled.has_key?(args[:filepath])
+      @mutex.synchronize do
+        compile_file(args) if !@compiled.has_key?(args[:filepath])
+      end
+    end
+    
+    #Compile if modified time has been changed.
+    mtime = File.mtime(args[:filepath])
+    if @compiled[args[:filepath]] < mtime
+      @mutex.synchronize do
+        compile_file(args)
+      end
     end
     
 		#Call the compiled function.
-		defname = def_name_for_file_path(filepath)
+		defname = def_name_for_file_path(args[:filepath])
 		Knj::Compiler::Container.send(defname)
 	end
 	

data/lib/knj/datarow.rb

@@ -37,15 +37,19 @@ class Knj::Datarow
         raise "Unknown argument: '#{val.class.name}'."
       end
       
-      if !methodname
-        methodname = "#{classname.to_s.downcase}s".to_sym
-      end
+      methodname = "#{classname.to_s.downcase}s".to_sym if !methodname
       
       define_method(methodname) do |*args|
         merge_args = args[0] if args and args[0]
         merge_args = {} if !merge_args
         return ob.list(classname, {colname.to_s => self.id}.merge(merge_args))
       end
+      
+      define_method("#{methodname}_count".to_sym) do |*args|
+        merge_args = args[0] if args and args[0]
+        merge_args = {} if !merge_args
+        return ob.list(classname, {"count" => true, colname.to_s => self.id}.merge(merge_args))
+      end
     end
 	end
 	
@@ -111,46 +115,95 @@ class Knj::Datarow
 		return @columns_sqlhelper_args
 	end
 	
+	def self.list(d)
+    if d.args["count"]
+      count = true
+      d.args.delete("count")
+      sql = "SELECT COUNT(*) AS count"
+    else
+      sql = "SELECT *"
+    end
+    
+    sql += " FROM #{d.db.enc_table}#{table}#{d.db.enc_table} WHERE 1=1"
+    
+    ret = list_helper(d)
+    d.args.each do |key, val|
+      raise "Invalid key: '#{key}'."
+    end
+    
+    sql += ret[:sql_where]
+    sql += ret[:sql_order]
+    sql += ret[:sql_limit]
+    
+    return d.db.query(sql).fetch[:count].to_i if count
+    return d.ob.list_bysql(table, sql)
+	end
+	
+	def self.load_columns(d)
+    if @columns_sqlhelper_args_working
+      sleep 0.1 while @columns_sqlhelper_args_working
+      return false
+    end
+    
+    begin
+      @columns_sqlhelper_args_working = true
+      cols = self.columns(d)
+      
+      inst_methods = instance_methods(false)
+      
+      sqlhelper_args = {
+        :db => d.db,
+        :table => table,
+        :cols_bools => [],
+        :cols_date => [],
+        :cols_dbrows => [],
+        :cols_num => [],
+        :cols_str => []
+      }
+      cols.each do |col_name, col_obj|
+        col_type = col_obj.type
+        col_type = "int" if col_type == "bigint" or col_type == "tinyint" or col_type == "mediumint" or col_type == "smallint"
+        
+        if col_type == "enum" and col_obj.maxlength == "'0','1'"
+          sqlhelper_args[:cols_bools] << col_name
+          method_name = "#{col_name}?".to_sym
+          
+          if !inst_methods.index(method_name)
+            define_method(method_name) do
+              return true if self[col_name.to_sym].to_s == "1"
+              return false
+            end
+          end
+        elsif col_type == "int" and col_name.slice(-3, 3) == "_id"
+          sqlhelper_args[:cols_dbrows] << col_name
+        elsif col_type == "int" or col_type == "bigint"
+          sqlhelper_args[:cols_num] << col_name
+        elsif col_type == "varchar" or col_type == "text" or col_type == "enum"
+          sqlhelper_args[:cols_str] << col_name
+        elsif col_type == "date" or col_type == "datetime"
+          sqlhelper_args[:cols_date] << col_name
+          method_name = "#{col_name}_str".to_sym
+          
+          if !inst_methods.index(method_name)
+            define_method(method_name) do |*args|
+              if Knj::Datet.is_nullstamp?(self[col_name.to_sym])
+                return ob.events.call(:no_date, self.class.name)
+              end
+              
+              return Knj::Datet.in(self[col_name.to_sym]).out(*args)
+            end
+          end
+        end
+      end
+      
+      @columns_sqlhelper_args = sqlhelper_args
+    ensure
+      @columns_sqlhelper_args_working = false
+    end
+	end
+	
 	def self.list_helper(d)
-		sleep 0.1 while @columns_sqlhelper_args_working
-		
-		if !@columns_sqlhelper_args
-			begin
-				@columns_sqlhelper_args_working = true
-				cols = self.columns(d)
-				
-				sqlhelper_args = {
-					:db => d.db,
-					:table => table,
-					:cols_bools => [],
-					:cols_date => [],
-					:cols_dbrows => [],
-					:cols_num => [],
-					:cols_str => []
-				}
-				cols.each do |col_name, col_obj|
-					col_type = col_obj.type
-					col_type = "int" if col_type == "bigint" or col_type == "tinyint" or col_type == "mediumint" or col_type == "smallint"
-					
-					if col_type == "enum" and col_obj.maxlength == "'0','1'"
-						sqlhelper_args[:cols_bools] << col_name
-					elsif col_type == "int" and col_name.slice(-3, 3) == "_id"
-						sqlhelper_args[:cols_dbrows] << col_name
-					elsif col_type == "int" or col_type == "bigint"
-						sqlhelper_args[:cols_num] << col_name
-					elsif col_type == "varchar" or col_type == "text" or col_type == "enum"
-						sqlhelper_args[:cols_str] << col_name
-					elsif col_type == "date" or col_type == "datetime"
-						sqlhelper_args[:cols_date] << col_name
-					end
-				end
-				
-				@columns_sqlhelper_args = sqlhelper_args
-			ensure
-				@columns_sqlhelper_args_working = false
-			end
-		end
-		
+		load_columns(d) if !@columns_sqlhelper_args
 		return d.ob.sqlhelper(d.args, @columns_sqlhelper_args)
 	end
 	
@@ -240,17 +293,4 @@ class Knj::Datarow
 	def each(&args)
 		return @data.each(&args)
 	end
-	
-	def method_missing(*args)
-		func_name = args[0].to_s
-		if match = func_name.match(/^(\S+)\?$/) and @data.has_key?(match[1].to_sym)
-			if @data[match[1].to_sym] == "1" or @data[match[1].to_sym] == "yes"
-				return true
-			elsif @data[match[1].to_sym] == "0" or @data[match[1].to_sym] == "no"
-				return false
-			end
-		end
-		
-		raise "No such method: '#{func_name}' on '#{self.class.name}'"
-	end
 end

data/lib/knj/datet.rb

@@ -420,6 +420,18 @@ class Knj::Datet
 		]
 	end
 	
+	def self.days_arr
+    return {
+      1 => _("Monday"),
+      2 => _("Tuesday"),
+      3 => _("Wednesday"),
+      4 => _("Thursday"),
+      5 => _("Friday"),
+      6 => _("Saturday"),
+      0 => _("Sunday")
+    }
+	end
+	
 	def loc_wday
 		return _(@time.strftime("%A"))
 	end

data/lib/knj/event_filemod.rb

@@ -4,6 +4,7 @@ class Knj::Event_filemod
 	def initialize(args, &block)
 		@args = args
 		@run = true
+		@mutex = Mutex.new
 		
 		@args[:wait] = 1 if !@args.has_key?(:wait)
 		
@@ -16,7 +17,8 @@ class Knj::Event_filemod
 			while @run do
 				break if !@args or !@args[:paths] or @args[:paths].empty?
 				
-				@args[:paths].clone.each do |path|
+				@mutex.synchronize do
+				@args[:paths].each do |path|
 					changed = false
 					
 					if @mtimes and !@mtimes.has_key?(path) and @mtimes.is_a?(Hash)
@@ -50,4 +52,8 @@ class Knj::Event_filemod
 		@run = false
 		@args = nil
 	end
+	
+	def add_path(fpath)
+    @args[:paths] << fpath
+	end
 end

data/lib/knj/event_handler.rb

@@ -22,7 +22,7 @@ class Knj::Event_handler
 	end
 	
 	def connect(name, &block)
-		raise "No such event." if !@events.has_key?(name)
+		raise "No such event: '#{name}'." if !@events.has_key?(name)
 		
 		event = @events[name]
 		

data/lib/knj/knjdb/libknjdb.rb

@@ -380,6 +380,16 @@ class Knj::Db
     end
   end
   
+  def enc_table
+    if !@enc_table
+      conn_exec do |driver|
+        @enc_table = driver.escape_table
+      end
+    end
+    
+    return @enc_table
+  end
+  
   def date_out(date_obj)
     return Knj::Datet.in(date_obj).dbstr
   end

data/lib/knj/mutexcl.rb

@@ -0,0 +1,48 @@
+class Knj::Mutexcl
+  def initialize(args = {})
+    @args = args
+    raise "No ':modes' given in arguments." if !@args.has_key?(:modes)
+    @mutex = Mutex.new
+    @blocked = {}
+    @args[:modes].each do |mode, data|
+      data[:blocks].each do |block|
+        @blocked[block] = {
+          :mutex => Mutex.new,
+          :count => 0
+        }
+      end
+    end
+  end
+  
+  def self.rw
+    return Knj::Mutexcl.new(
+      :modes => {
+        :reader => {:blocks => [:writer]},
+        :writer => {:blocks => [:writer, :reader]}
+      }
+    )
+  end
+  
+  def sync(mode)
+    raise "No such mode: '#{mode}'." if !@args[:modes].has_key?(mode)
+    
+    while @blocked[mode][:count].to_i > 0
+      STDOUT.print "Sleeping because blocked '#{mode}' (#{@blocked[mode][:count]}).\n"
+      sleep 0.1
+    end
+    
+    @mutex.synchronize do
+      @args[:modes][mode][:blocks].each do |block|
+        @blocked[block][:count] += 1
+      end
+    end
+    
+    begin
+      yield
+    ensure
+      @args[:modes][mode][:blocks].each do |block|
+        @blocked[block][:count] -= 1
+      end
+    end
+  end
+end

data/lib/knj/objects.rb

@@ -8,11 +8,14 @@ class Knj::Objects
 		@args[:class_pre] = "class_" if !@args[:class_pre]
 		@args[:module] = Kernel if !@args[:module]
 		@objects = {}
-		@objects_mutex = Mutex.new
 		
 		@events = Knj::Event_handler.new
 		@events.add_event(
       :name => :no_html,
+      :connections_max => 1
+		)
+		@events.add_event(
+      :name => :no_date,
       :connections_max => 1
 		)
 		
@@ -20,15 +23,18 @@ class Knj::Objects
 		raise "No class path given." if !@args[:class_path] and (@args[:require] or !@args.has_key?(:require))
 	end
 	
+	def init_class(classname)
+    return false if @objects.has_key?(classname)
+    @objects[classname] = {}
+	end
+	
 	#Returns a cloned version of the @objects variable. Cloned because iteration on it may crash some of the other methods in Ruby 1.9+
 	def objects
 		objs_cloned = {}
 		
-		@objects_mutex.synchronize do
-			@objects.each do |classn, newhash|
-				objs_cloned[classn] = newhash.clone
-			end
-		end
+    @objects.keys.each do |key|
+      objs_cloned[key] = @objects[key].clone
+    end
 		
 		return objs_cloned
 	end
@@ -39,13 +45,9 @@ class Knj::Objects
 	
 	def count_objects
 		count = 0
-		@objects_mutex.synchronize do
-			@objects.each do |key, value|
-				value.each do |id, object|
-					count += 1
-				end
-			end
-		end
+    @objects.keys.each do |key|
+      count += @objects[key].length
+    end
 		
 		return count
 	end
@@ -96,14 +98,20 @@ class Knj::Objects
 	end
 	
 	def requireclass(classname)
-		return nil if !@args[:require] and @args.has_key?(:require)
-		classname = classname.to_s
-		
-		if !Knj::Php.class_exists(classname)
+    classname = classname.to_sym
+    
+    if !@args[:require] and @args.has_key?(:require)
+      @objects[classname] = {} if !@objects.has_key?(classname)
+      return nil
+    end
+    
+		if !@objects.has_key?(classname)
 			filename = @args[:class_path] + "/#{@args[:class_pre]}#{classname.downcase}.rb"
 			filename_req = @args[:class_path] + "/#{@args[:class_pre]}#{classname.downcase}"
 			raise "Class file could not be found: #{filename}." if !File.exists?(filename)
 			require filename_req
+			@args[:module].const_get(classname).load_columns(Knj::Hash_methods.new(:args => args, :ob => self, :db => @args[:db]))
+			@objects[classname] = {}
 		end
 	end
 	
@@ -120,30 +128,21 @@ class Knj::Objects
 			raise Knj::Errors::InvalidData, "Unknown data: '#{data.class.to_s}'."
 		end
 		
-		return @objects[classname][id] if @objects.has_key?(classname) and @objects[classname].has_key?(id)
-		
-		retobj = nil
-		@objects_mutex.synchronize do
-			if !@objects.has_key?(classname)
-				self.requireclass(classname)
-				@objects[classname] = {}
-			end
-			
-			if @args[:datarow]
-				@objects[classname][id] = @args[:module].const_get(classname).new(Knj::Hash_methods.new(
-					:ob => self,
-					:data => data
-				))
-			else
-				args = [data]
-				args = args | @args[:extra_args] if @args[:extra_args]
-				@objects[classname][id] = @args[:module].const_get(classname).new(*args)
-			end
-			
-			return @objects[classname][id]
-		end
-		
-		raise "Something went wrong."
+    return @objects[classname][id] if @objects.has_key?(classname) and @objects[classname].has_key?(id)
+    self.requireclass(classname) if !@objects.has_key?(classname)
+    
+    if @args[:datarow]
+      @objects[classname][id] = @args[:module].const_get(classname).new(Knj::Hash_methods.new(
+        :ob => self,
+        :data => data
+      ))
+    else
+      args = [data]
+      args = args | @args[:extra_args] if @args[:extra_args]
+      @objects[classname][id] = @args[:module].const_get(classname).new(*args)
+    end
+    
+    return @objects[classname][id]
 	end
 	
 	def get_by(classname, args = {})
@@ -275,10 +274,10 @@ class Knj::Objects
 			obs = self.list(classname)
 		end
 		
-		if Knj::Php.class_exists("Dictionary")
+		if RUBY_VERSION[0..2] == 1.8 and Knj::Php.class_exists("Dictionary")
 			list = Dictionary.new
 		else
-			list = Hash.new
+			list = {}
 		end
 		
 		if args[:addnew] or args[:add]
@@ -430,9 +429,7 @@ class Knj::Objects
 			#errstr += "Could not find object ID in cache."
 			#raise errstr
 		#else
-			@objects_mutex.synchronize do
-				@objects[classname].delete(object.id.to_i)
-			end
+      @objects[classname].delete(object.id.to_i)
 		#end
 	end
 	
@@ -448,9 +445,7 @@ class Knj::Objects
 		classname = classname.to_sym
 		
 		return false if !@objects.has_key?(classname)
-		@objects_mutex.synchronize do
-			@objects[classname] = {}
-		end
+    @objects[classname] = {}
 	end
 	
 	# Delete an object. Both from the database and from the cache.
@@ -508,37 +503,32 @@ class Knj::Objects
 			end
 		else
 			return false if !@objects.has_key?(classn)
-			@objects_mutex.synchronize do
-				@objects[classn] = {}
-				GC.start
-			end
+      @objects[classn] = {}
+      GC.start
 		end
 	end
 	
 	def clean_all
 		classnames = []
-		@objects_mutex.synchronize do
-			@objects.each do |classn, hash_list|
-				classnames << classn
-			end
-			
-			classnames.each do |classn|
-				@objects[classn] = {}
-			end
-		end
+    @objects.keys.each do |classn|
+      classnames << classn
+    end
+    
+    classnames.each do |classn|
+      @objects[classn] = {}
+    end
 		
 		GC.start
 	end
 	
 	def clean_recover
-		@objects_mutex.synchronize do
-			@objects.each do |classn, hash_list|
-				classobj = Kernel.const_get(classn)
-				ObjectSpace.each_object(classobj) do |obj|
-					@objects[classn][obj.id] = obj
-				end
-			end
-		end
+    @objects.keys.each do |classn|
+      data = @objects[classn]
+      classobj = Kernel.const_get(classn)
+      ObjectSpace.each_object(classobj) do |obj|
+        data[obj.id] = obj
+      end
+    end
 	end
 	
 	def sqlhelper(list_args, args)

data/lib/knj/web.rb

@@ -865,6 +865,16 @@ class Knj::Web
 		html = ""
 		
 		hidden_arr.each do |hidden_hash|
+      if hidden_hash[:value].is_a?(Array)
+        if !hidden_hash[:value][0]
+          hidden_hash[:value] = nil
+        else
+          key = hidden_hash[:value][1]
+          obj = hidden_hash[:value][0]
+          hidden_hash[:value] = obj[key]
+        end
+      end
+      
 			html += "<input type=\"hidden\" name=\"#{hidden_hash[:name].to_s.html}\" value=\"#{hidden_hash[:value].to_s.html}\" />"
 		end
 		

data/spec/knjrbfw_spec.rb

@@ -266,4 +266,72 @@ describe "Knjrbfw" do
       #ignore.
     end
   end
+  
+  it "should be able to use Knj::Mutexcl with advanced arguments." do
+    mutex = Knj::Mutexcl.new(
+      :modes => {
+        :reader => {
+          :blocks => [:writer]
+        },
+        :writer => {
+          :blocks => [:reader, :writer]
+        }
+      }
+    )
+    
+    $count = 0
+    
+    Knj::Thread.new do
+      mutex.sync(:reader) do
+        sleep 0.2
+        $count += 1
+      end
+    end
+    
+    mutex.sync(:reader) do
+      $count += 1
+    end
+    
+    raise "Count should be 1 by now but it wasnt: '#{$count}'." if $count != 1
+    sleep 0.3
+    raise "Count should be 2 by now but it wasnt: '#{$count}'." if $count != 2
+    
+    
+    $count = 0
+    Knj::Thread.new do
+      mutex.sync(:reader) do
+        sleep 2
+        $count += 1
+      end
+    end
+    sleep 0.1
+    
+    Knj::Thread.new do
+      mutex.sync(:writer) do
+        $count += 1
+      end
+    end
+    
+    sleep 1
+    raise "Count should be 0 but it wasnt: '#{$count}'." if $count != 0
+    sleep 1.1
+    raise "Count should be 2 but it wasnt: '#{$count}'." if $count != 2
+    
+    Knj::Thread.new do
+      mutex.sync(:reader) do
+        sleep 0.2
+        $count += 1
+      end
+    end
+    
+    Knj::Thread.new do
+      mutex.sync(:reader) do
+        sleep 0.2
+        $count += 1
+      end
+    end
+    
+    sleep 0.35
+    raise "Count should be 4 but it wasnt: '#{$count}'." if $count != 4
+  end
 end

metadata

@@ -1,20 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: knjrbfw
 version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: !!null 
+  version: 0.0.7
+  prerelease: 
 platform: ruby
 authors:
 - Kasper Johansen
-autorequire: !!null 
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-28 00:00:00.000000000 +02:00
-default_executable: !!null 
+date: 2011-08-03 00:00:00.000000000 +02:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21954700 !ruby/object:Gem::Requirement
+  requirement: &13561560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *21954700
+  version_requirements: *13561560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21954220 !ruby/object:Gem::Requirement
+  requirement: &13537480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *21954220
+  version_requirements: *13537480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21953740 !ruby/object:Gem::Requirement
+  requirement: &13534260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.6.3
   type: :development
   prerelease: false
-  version_requirements: *21953740
+  version_requirements: *13534260
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &21953260 !ruby/object:Gem::Requirement
+  requirement: &13526740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21953260
+  version_requirements: *13526740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &21952780 !ruby/object:Gem::Requirement
+  requirement: &13524020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21952780
+  version_requirements: *13524020
 description: Including stuff for HTTP, SSH and much more.
 email: k@spernj.org
 executables: []
@@ -83,6 +83,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- knjrbfw.gemspec
 - lib/knj/.gitignore
 - lib/knj/arrayext.rb
 - lib/knj/autoload.rb
@@ -232,6 +233,7 @@ files:
 - lib/knj/mail.rb
 - lib/knj/mailobj.rb
 - lib/knj/mount.rb
+- lib/knj/mutexcl.rb
 - lib/knj/notify.rb
 - lib/knj/nvidia_settings.rb
 - lib/knj/objects.rb
@@ -286,7 +288,7 @@ has_rdoc: true
 homepage: http://github.com/kaspernj/knjrbfw
 licenses:
 - MIT
-post_install_message: !!null 
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -298,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3068308084372948741
+      hash: -3172684593992288463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -306,9 +308,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: !!null 
-rubygems_version: 1.5.0
-signing_key: !!null 
+rubyforge_project: 
+rubygems_version: 1.6.2
+signing_key: 
 specification_version: 3
 summary: A framework with lots of stuff for Ruby.
 test_files: []