knjrbfw 0.0.7 → 0.0.8

data/lib/knj/opts.rb

@@ -5,7 +5,7 @@ module Knj::Opts
 	
 	def self.init(arr_opts)
 		arr_opts.each do |pair|
-			if (pair[0] == "knjdb" or pair[0] == "table")
+			if pair[0] == "knjdb" or pair[0] == "table"
 				$knjoptions[pair[0]] = pair[1]
 			end
 		end
@@ -18,7 +18,9 @@ module Knj::Opts
 		if !value
 			return ""
 		else
-			return value["value"]
+			return value["value"] if value.key?("value")
+			return value[:value] if value.key?(:value)
+			raise "Could not figure out of value."
 		end
 	end
 	
@@ -26,13 +28,18 @@ module Knj::Opts
 		db = $knjoptions["knjdb"]
 		result = db.select($knjoptions["table"], {"title" => title}, {"limit" => 1}).fetch
 		
-		if result.class.to_s == "NilClass"
+		if !result
 			db.insert($knjoptions["table"], {
 				"title" => title,
 				"value" => value
 			})
 		else
-			db.update($knjoptions["table"], {"value" => value}, {"id" => result["id"]})
+      id = nil
+      id = result["id"] if result.key?("id")
+      id = result[:id] if result.key?(:id)
+      raise "Could not figure out of ID." if !id
+      
+			db.update($knjoptions["table"], {"value" => value}, {"id" => id})
 		end
 	end
 end

data/lib/knj/os.rb

@@ -99,9 +99,22 @@ module Knj::Os
 	#Returns the xauth file for GDM.
 	def self.xauth_file
 		authfile = ""
-		Dir.new("/var/run/gdm").each do |file|
-			next if file == "." or file == ".." or !file.match(/^auth-for-gdm-.+$/)
-			authfile = "/var/run/gdm/#{file}/database"
+		
+		if File.exists?("/var/run/gdm")
+      Dir.foreach("/var/run/gdm") do |file|
+        next if file == "." or file == ".." or !file.match(/^auth-for-gdm-.+$/)
+        authfile = "/var/run/gdm/#{file}/database"
+      end
+		end
+		
+		if File.exists?("/var/run/lightdm")
+      Dir.foreach("/var/run/lightdm") do |file|
+        next if file == "." or file == ".."
+        
+        Dir.foreach("/var/run/lightdm/#{file}") do |f2|
+          authfile = "/var/run/lightdm/#{file}/#{f2}" if f2.match(/^:(\d+)$/)
+        end
+      end
 		end
 		
 		if authfile.to_s.length <= 0

data/lib/knj/php.rb

@@ -13,7 +13,7 @@ module Knj::Php
 			send_paras << paras[1] if paras[1]
 			paras[0][0].send(*send_paras)
 		else
-			raise "Unknown user-func."
+			raise "Unknown user-func: '#{paras[0].class.name}'."
 		end
 	end
 	
@@ -118,6 +118,42 @@ module Knj::Php
 		elsif cstr == "Knj::Unix_proc"
 			retstr += "#{argument.class.to_s}::data - "
 			retstr += print_r(argument.data, true, count).to_s
+    elsif cstr == "Thread"
+      retstr += "#{argument.class.to_s} - "
+      
+      hash = {}
+      argument.keys.each do |key|
+        hash[key] = argument[key]
+      end
+      
+      retstr += 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
+    elsif cstr == "URI::Generic"
+      retstr += "#{argument.class.to_s}{\n"
+      methods = [:host, :port, :scheme, :path]
+      count += 1
+      methods.each do |method|
+        i_spaces = 0
+        while(i_spaces < count - 1)
+          retstr += "   "
+          i_spaces += 1
+        end
+        
+        retstr += "#{method}: #{argument.send(method)}\n"
+      end
+      
+      count -= 1
+      
+      i = 0
+      while(i < count - 1)
+        retstr += "   "
+        i += 1
+      end
+      
+      retstr += "}\n"
 		else
 			#print argument.to_s, "\n"
 			retstr += "Unknown class: " + cstr + "\n"
@@ -195,8 +231,7 @@ module Knj::Php
 	end
 	
 	def htmlspecialchars(string)
-		require "cgi"
-		return CGI.escapeHTML(string)
+		return Knj::Web.html(string)
 	end
 	
 	def isset(var)
@@ -250,16 +285,16 @@ module Knj::Php
 		end
 		
 		begin
-			_httpsession.eruby.header(key, value) #This is for knjAppServer - knj.
+			_kas.header(key, value) #This is for knjAppServer - knj.
 			sent = true
 		rescue NameError => e
 			if $knj_eruby
 				$knj_eruby.header(key, value)
 				sent = true
-			elsif $cgi.is_a?(CGI)
+			elsif $cgi.class.name == "CGI"
 				sent = true
 				$cgi.header(key => value)
-			elsif $_CGI.is_a?(CGI)
+			elsif $_CGI.class.name == "CGI"
 				sent = true
 				$_CGI.header(key => value)
 			end
@@ -273,23 +308,17 @@ module Knj::Php
 	end
 	
   def urldecode(string)
-    #require "cgi"
-    #return CGI.unescape(string)
-    
-    #Thanks to CGI framework
-    str = string.to_s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do
-      [$1.delete('%')].pack('H*')
-    end
+    return Knj::Web.urldec(string)
   end
   
   def urlencode(string)
-    #require "cgi"
-    #return CGI.escape(string.to_s)
-    
-    #Thanks to CGI framework
-    string.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) do
-      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
-    end.tr(' ', '+')
+    return Knj::Web.urlenc(string)
+  end
+  
+  def parse_str(str, hash)
+    CGI.parse(str).each do |key, val|
+      hash[key] = val
+    end
   end
 	
 	def file_put_contents(filepath, content)
@@ -421,8 +450,7 @@ module Knj::Php
 	end
 	
 	def html_entity_decode(string)
-		require "cgi"
-		string = CGI.unescapeHTML(string.to_s)
+		string = Knj::Web.html(string)
 		string = string.gsub("&oslash;", "ø").gsub("&aelig;", "æ").gsub("&aring;", "å").gsub("&euro;", "€").gsub("#39;", "'")
 		return string
 	end
@@ -527,9 +555,14 @@ module Knj::Php
 		args["expires"] = Time.at(expire) if expire
 		args["domain"] = domain if domain
 		
-		cookie = CGI::Cookie.new(args)
-		status = Knj::Php.header("Set-Cookie: #{cookie.to_s}")
-		$_COOKIE[cname] = cvalue if $_COOKIE
+		begin
+      _kas.cookie(args)
+		rescue NameError
+      cookie = CGI::Cookie.new(args)
+      status = Knj::Php.header("Set-Cookie: #{cookie.to_s}")
+      $_COOKIE[cname] = cvalue if $_COOKIE
+    end
+    
 		return status
 	end
 	
@@ -610,7 +643,7 @@ module Knj::Php
 		month = cur_time.month if month == nil
 		year = cur_time.year if year == nil
 		
-		new_time = Datestamp.from_dbstr("#{year.to_s}-#{month.to_s}-#{date.to_s} #{hour.to_s}:#{min.to_s}:#{sec.to_s}")
+		new_time = Knj::Datet.in("#{year.to_s}-#{month.to_s}-#{date.to_s} #{hour.to_s}:#{min.to_s}:#{sec.to_s}")
 		return new_time.to_i
 	end
 	
@@ -713,5 +746,19 @@ module Knj::Php
 		return plain_str.to_s
 	end
 	
+	#Sort methods.
+	def ksort(hash)
+    nhash = hash.sort do |a, b|
+      a[0] <=> b[0]
+    end
+    
+    newhash = {}
+    nhash.each do |val|
+      newhash[val[0]] = val[1][0]
+    end
+    
+    return newhash
+	end
+	
   module_function(*instance_methods)
 end

data/lib/knj/php_parser/php_parser.rb

@@ -5,7 +5,7 @@ class Knj::Php_parser
 		@args = args
 		@cont = File.read(@args["file"])
 		
-		if !args.has_key?("require_requirements") or args["require_requirements"]
+		if !args.key?("require_requirements") or args["require_requirements"]
 			@retcont = "require \"knj/autoload\"\n"
 			@retcont += "require \"knj/php\"\n"
 			@retcont += "require \"knj/php_parser/php_parser\"\n"
@@ -13,82 +13,6 @@ class Knj::Php_parser
 		else
 			@retcont = ""
 		end
-		
-		@regex_funcname = "([A-z][A-z\d_]*)"
-		@regex_varname = "([A-z][A-z\d]*)"
-		
-		@tabs = 0
-		@funcs_started = 0
-	end
-	
-	def parse
-		self.search_starttag
-		return @retcont
-	end
-	
-	def search_starttag
-		match = self.matchclear(/\A([\s\S]*?<\?(php|))/)
-		if !match
-			return nil
-		end
-		
-		self.clear_whitespace
-		self.search_newstuff
-	end
-	
-	def tabs
-		cont = ""
-		0.upto(@tabs - 1) do |count|
-			cont += "\t"
-		end
-		
-		return cont
-	end
-	
-	def clear_regex(regex)
-		@cont = @cont.gsub(regex, "")
-	end
-	
-	def clear_whitespace
-		@cont = @cont.gsub(/\A\s+/, "")
-	end
-	
-	def matchclear(regex, debug = false)
-		if match = @cont.match(regex)
-			print "Before (#{debug}):\n#{@cont}\n\n" if debug
-			@cont = @cont.gsub(regex, "")
-			self.clear_whitespace
-			print "After (#{debug}):\n#{@cont}\n\n\n" if debug
-			
-			return match
-		end
-		
-		return false
-	end
-	
-	def search_newstuff
-		loop do
-			if match = self.matchclear(/\Afunction\s+#{@regex_funcname}\(/)
-				self.func_args(match[1])
-			elsif match = self.matchclear(/\A(print|echo)\s+/)
-				@retcont += "#{self.tabs}Knj::Php.#{match[1]}("
-				self.func_args_single_given
-			elsif match = self.matchclear(/\A\}/)
-				@tabs -= 1
-				@retcont += "#{self.tabs}end\n"
-				@tabs -= 1
-				@retcont += "#{self.tabs}end\n"
-			elsif match = self.matchclear(/\A([A-z][A-z\d_]*)\(/)
-				@retcont += "#{self.tabs}Knj::Php_parser::Functions.#{match[1]}("
-				self.func_args_given
-			elsif match = self.matchclear(/\A\?>/)
-				self.search_starttag
-			elsif cont.length <= 0
-				break
-			else
-				raise "Could not find out whats next."
-			end
-		end
 	end
 end
 

data/lib/knj/retry.rb

@@ -30,12 +30,12 @@ class Knj::Retry
 				end
 			rescue Exception => e
 				if e.class == Interrupt
-					raise e if !args.has_key?(:interrupt) or args[:interrupt]
+					raise e if !args.key?(:interrupt) or args[:interrupt]
 				elsif e.class == SystemExit
-					raise e if !args.has_key?(:exit) or args[:exit]
-				elsif count <= 1 or (args.has_key?(:errors) and args[:errors].index(e.class) == nil)
+					raise e if !args.key?(:exit) or args[:exit]
+				elsif count <= 1 or (args.key?(:errors) and args[:errors].index(e.class) == nil)
 					doraise = e
-				elsif args.has_key?(:errors) and args[:errors].index(e.class) != nil
+				elsif args.key?(:errors) and args[:errors].index(e.class) != nil
 					#given error was in the :errors-array - do nothing. Maybe later it should be logged and returned in a stats-hash or something? - knj
 				end
 				

data/lib/knj/rhodes/rhodes.rb

@@ -1,4 +1,110 @@
+$knjautoload = false
+
 class Knj::Rhodes
+  attr_reader :db, :ob, :gettext, :args
+  
+  def initialize(args = {})
+    require "Knj/arrayext.rb"
+    require "Knj/php.rb"
+    require "Knj/objects.rb"
+    require "Knj/datarow.rb"
+    require "Knj/event_handler.rb"
+    require "Knj/hash_methods.rb"
+    require "Knj/errors.rb"
+    require "Knj/gettext_threadded.rb"
+    require "Knj/locales.rb"
+    require "Knj/web.rb"
+    require "Knj/rhodes/mutex.rb"
+    require "Knj/opts.rb"
+    
+    require "Knj/knjdb/libknjdb.rb"
+    require "Knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb"
+    require "Knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb"
+    require "Knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb"
+    require "Knj/knjdb/drivers/sqlite3/knjdb_sqlite3_indexes.rb"
+    
+    @args = args
+    
+    @db = Knj::Db.new(
+      :type => "sqlite3",
+      :subtype => "rhodes",
+      :path => "#{Rho::RhoApplication.get_base_app_path}app/rhodes_default.sqlite3",
+      :return_keys => "symbols",
+      :require => false
+    )
+    
+    if @args[:schema]
+      schema = @args[:schema]
+    else
+      schema = {"tables" => {}}
+    end
+    
+    schema["tables"]["Option"] = {
+      "columns" => [
+        {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+        {"name" => "title", "type" => "varchar"},
+        {"name" => "value", "type" => "text"}
+      ]
+    }
+    
+    require "knjdbrevision/knjdbrevision.rb"
+    dbrev = Knjdbrevision.new
+    dbrev.init_db(schema, @db)
+    
+    @ob = Knj::Objects.new(
+      :db => @db,
+      :class_path => "#{Rho::RhoApplication.get_base_app_path}app/Multinasser/include",
+      :require => false,
+      :module => @args[:module],
+      :datarow => true
+    )
+    
+    Knj::Opts.init(
+      "table" => "Option",
+      "knjdb" => @db
+    )
+    
+    @gettext = Knj::Gettext_threadded.new
+    @gettext.load_dir("#{Rho::RhoApplication.get_base_app_path}app/locales")
+  end
+  
+  def inputs(*arr)
+    html = ""
+    
+    arr.each do |data|
+      value = ""
+      
+      data[:type] = :text if !data.key?(:type)
+      
+      if data.key?(:value) and data[:value].is_a?(Array) and data[:value][0]
+        value = data[:value][0][data[:value][1]]
+      elsif data.key?(:value)
+        value = data[:value]
+      end
+      
+      extra_args = ""
+      extra_args = " autofocus=\"autofocus\"" if data[:autofocus]
+      
+      css = {}
+      
+      if data[:type] == :textarea
+        css["height"] = data[:height] if data.key?(:height)
+        
+        html += "<div data-role=\"fieldcontain\">"
+        html += "<label for=\"#{data[:name]}\">#{data[:title]}</label>"
+        html += "<textarea name=\"#{data[:name]}\" id=\"#{data[:name]}\"#{Knj::Web.style_html(css)}#{extra_args}>#{value}</textarea>"
+        html += "</div>"
+      else
+        html += "<div data-role=\"fieldcontain\">"
+        html += "<label for=\"#{data[:name]}\">#{data[:title]}</label>"
+        html += "<input type=\"#{data[:type]}\" name=\"#{data[:name]}\" id=\"#{data[:name]}\" value=\"#{value}\"#{Knj::Web.style_html(css)}#{extra_args} />"
+        html += "</div>"
+      end
+    end
+    
+    return html
+  end
+  
 	def self.html_links(args)
 		html_cont = "#{args[:html]}"