tinkerbell 0.01 → 0.03

data/lib/rwd/net.rb

@@ -562,6 +562,12 @@ class RequestRequest
   end
 end
 
+def url_unescape(string)
+string.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/n) do
+[$1.delete('%')].pack('H*')
+end
+end
+
 class Request < Hash
   attr_reader :peeraddr
   attr_reader :request
@@ -604,10 +610,14 @@ class Request < Hash
         @vars	= RequestGet.new(@request.data.nil? ? "" : @request.data)
       when "POST"
         data	= (@io.read(self["content-length"].to_i) or "")
+      #  data = url_unescape(data)
         @vars	= RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
       else
         $stderr.puts "Unknown request ('#{firstline}')."
-      end
+end
+
+$rwdtinkerlog.debug  data  
+     
     end
 
     @peeraddr	= @io.peeraddr
@@ -729,14 +739,15 @@ class HTTPServerException < Exception
 end
 
 class HTTPServer
-  def self.serve(portio=80, remote=false, auth=nil, realm="ev/net")
+  def self.serve(portio=80, remote=false, auth=nil, realm="rwd/net")
     port, server	= portio
 
     begin
       server	= TCPServer.new(remote ? "0.0.0.0" : "localhost", port)	if server.nil?
-
+if $DEBUG
       $stderr.puts "Just point your browser to http://localhost:#{port}/ ..."
-    rescue
+end  
+  rescue
       server	= nil
 
       $stderr.puts "Port #{port} is in use."

data/lib/rwd/ruby.rb

@@ -275,7 +275,7 @@ class String
     s.gsub!(/"/ , "\"")
     s.gsub!(/´/, "\'")
 
-    s	= CGI.unescapeHTML(self)
+   # s	= CGI.unescapeHTML(self)
 
     if eolconversion
       s.gsub!(/<br>/, "\n")

data/lib/rwd/rwd.rb

@@ -57,7 +57,8 @@ if ENV["RWDTHEME"]
 		load 'lib/rwdthemes/default.rwd'
 	end
 	if ENV["RWDTHEME"] = "DEFAULT"
-           $stderr.puts  "loading theme DEFAULT"
+		$rwdtinkerlog.info "rwd: loading theme DEFAULT"
+           
           load 'lib/rwdthemes/default.rwd'
        end
         if ENV["RWDTHEME"] = "WINDOWSLOOKALIKE"
@@ -267,7 +268,7 @@ class EVTable
 end
 
 class OpenTag
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     bef	= before[-1]
     res << Format % ["Before", @subtype]	if ($rwd_debug and not bef.nil?)
     res << bef	if not bef.nil?
@@ -299,7 +300,7 @@ class OpenTag
       args["nohelpbutton"]	= (not help)
 
       template	= $rwd_html_1
-      template	= $rwd_html_PDA_1	if pda
+      # template	= $rwd_html_PDA_1	if pda
 
       res << (template(template, args))
     when "p"		then res << "<p #{align}>"
@@ -493,7 +494,7 @@ class OpenTag
     after.push(aft)
   end
 
-  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def postchildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     case @subtype
     when "vertical", "window", "helpwindow", "tab", "panel"
       res << Format % ["BefPost", @subtype]	if $rwd_debug
@@ -635,7 +636,7 @@ class OpenTag
 end
 
 class Text
-  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda)
+  def prechildren(res, before, after, varshtml, varsstring, switches, help, oneormorefields, firstaction, tabs, tab, pda=false)
     if not @text.scan(/[^ \t\r\n]/).empty?
       res << Format % ["Text", ""]	if $rwd_debug
       res << "#{@text}"
@@ -683,70 +684,70 @@ class RWDWindow
 
     vars	= vars.deep_dup
 
-begin # error wrap
+    begin # error wrap
 
-    vars.each do |key, value|
-      if not key.empty?
-        if value.respond_to? "to_s"
-          @rwd.gsub!(/%%#{key}%%/, value.to_s)
-          @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
+           vars.each do |key, value|
+                                 if not key.empty?
+                                             if value.respond_to? "to_s"
+                                                   @rwd.gsub!(/%%#{key}%%/, value.to_s)
+                                                  @rwd.gsub!(/%#{key}%/, value.to_s.to_html)
 
-          @helprwd.gsub!(/%%#{key}%%/, value.to_s)
-          @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
+                                                  @helprwd.gsub!(/%%#{key}%%/, value.to_s)
+                                                  @helprwd.gsub!(/%#{key}%/, value.to_s.to_html)
 
-          varshtml[key]		= value.to_s.to_html
-          varsstring[key]	= value.to_s
-        end
-      end
-    end
+                                                  varshtml[key]		= value.to_s.to_html
+                                                  varsstring[key]	= value.to_s
+                                            end
+                                  end
+                           end
 
-    windowobject	= RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
-    helpobject		= RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
+                           windowobject	= RWDTree.new(@rwd).children.dup.delete_if{|obj| obj.subtype != "window"}[0]
+                             helpobject		= RWDTree.new(@helprwd).children.dup.delete_if{|obj| obj.subtype != "helpwindow"}[0]
 
-    tabsobj	= windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
+                                   tabsobj	= windowobject.children.dup.delete_if{|obj| obj.subtype != "tabs"}[0]
 
-    if not tabsobj.nil?
-      tabs	= tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
+                     if not tabsobj.nil?
+                              tabs	= tabsobj.children.dup.delete_if{|obj| (not obj.kind_of?(OpenTag)) or (obj.subtype != "tab")}
 
-      if tab.empty?
-        tab			= tabs[0].args["name"]
-      end
+                                    if tab.empty?
+                                              tab			= tabs[0].args["name"]
+                                      end
 
-      tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
-    end
+                                      tabsobj.children.delete_if{|obj| (obj.kind_of?(OpenTag)) and (obj.subtype == "tab") and obj.args["name"] != tab}
+                           end
 
-    if help
-      helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
-    else
-      windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
-    end
+                     if help
+                                helpobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, false, oneormorefields, firstaction, tabs, tab, pda)
+                        else
+                                  windowobject.parsetree("prechildren", "postchildren", html, [""], [""], varshtml, varsstring, switches, (not @helprwd.empty?), oneormorefields, firstaction, tabs, tab, pda)
+                        end
 
-    html	= html.join("")	# ???
+           html	= html.join("")	# ???
 
-    html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "")	if not $rwd_debug
-    html.gsub!(/%%/, "%")
-    html.gsub!(/\n\n*/, "\n")
+             html.gsub!(/%%*[[:alnum:]_\-]+%%*/, "")	if not $rwd_debug
+             html.gsub!(/%%/, "%")
+             html.gsub!(/\n\n*/, "\n")
 
-    if oneormorefields.empty?
-      focus	= ""
-    else
-      focus	= "document.bodyform.elements[0].focus();"
-    end
+           if oneormorefields.empty?
+                focus	= ""
+             else
+                focus	= "document.bodyform.elements[0].focus();"
+            end
 
-    firstaction	= action	if windowobject.args.keys.include?("refresh")	unless action.nil?
+              firstaction	= action	if windowobject.args.keys.include?("refresh")	unless action.nil?
 
-    html.gsub!(/\$RWD_FIRSTACTION\$/	, firstaction)
-    html.gsub!(/\$RWD_FOCUS\$/		, focus)
+                                                  html.gsub!(/\$RWD_FIRSTACTION\$/	, firstaction)
+                                             html.gsub!(/\$RWD_FOCUS\$/		, focus)
 
-    html
-  end
+                                          html
+                                          end
   
   rescue 
-  if $DEBUG
-  $stderr.puts  "error in RWDWindow - render method"
+		$rwdtinkerlog.error 	"error in RWDWindow - render method"
+  
   end
   end
-end
+
 
 class RWDMessage < RWDWindow
   def initialize(msg)
@@ -830,7 +831,9 @@ class RWDialog
 
     self
   end
+  
 
+  
   def render(res, path, post, download, downloadfile, pda, sessionid)
 		# Avoid a timeout.
 
@@ -862,8 +865,11 @@ class RWDialog
 
     post.sort.each do |key, value|
       puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
+      $rwdtinkerlog.info "Post: #{key} -> #{value.from_html.inspect}\n"
 
       vars[key]	= value.from_html
+      $rwdtinkerlog.info  "rwd: #{value.from_html}\n"
+    
     end
 
 		# Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -931,14 +937,24 @@ class RWDialog
 		# Copy vars from window to instance.
 
       vars.each do |k, v|
-        instance_eval "@#{k}	= vars['#{k}']"		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
+	      $rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+	 
+       		if ((not k.empty?) and k.scan(/^rwd_/).empty? and not @rwd_ignore_vars.include?("@#{k}"))
+			
+			 instance_eval "@#{k}	= ''"
+			instance_variable_set("@#{k}", vars.fetch("#{k}"))   
+			$rwdtinkerlog.info "rwd: Post: #{k} -> #{v}\n"
+
+		end	 
       end
 
 		# Callback.
 
       if (not back) or @rwd_call_after_back.include?(@rwd_action)
         unless @rwd_action =~ /^rwd_/
-          puts  "Method: #{@rwd_action}(#{@rwd_args.join(", ")})"	if $rwd_debug
+	
+	$rwdtinkerlog.debug  "Method: #{@rwd_action}(#{@rwd_args})"	
+       
           if methods.include?(@rwd_action)
             method(@rwd_action).call(*@rwd_args)
           else
@@ -1008,9 +1024,9 @@ begin # error block
 	      end
             res << RWDWindow.new($rwd_gui_tinker, @rwd_window).render(pda, @rwd_refresh_action, vars, @rwd_switches, help, @rwd_tab)
 rescue
- if $DEBUG
- $stderr.puts  "error in render"
- end
+
+$rwdtinkerlog.error "rwd: error in render"
+
  end
 end
         end
@@ -1088,7 +1104,9 @@ end
       Thread.new do
         loop do
           if Time.now - @rwd_time > @rwd_timeout
-            $stderr.puts "Exiting due to timeout (#{@rwd_timeout} seconds)."
+		  
+		  $rwdtinkerlog.info "rwd: Exiting due to timeout (#{@rwd_timeout} seconds)."
+            
             exit 1
           end
           sleep interval
@@ -1168,7 +1186,7 @@ class RWDSession < Hash
     @lastaccess	= Time.now
   end
 
-  def render(res, path, post, download, downloadfile, pda)
+  def render(res, path, post, download, downloadfile, pda=false)
     done	= self["object"].render(res, path, post, download, downloadfile, pda, @sessionid)
 
     res.gsub!(/\$RWD_SESSION\$/, done ? "" : "#{@sessionid}")
@@ -1195,7 +1213,8 @@ class RWDServer
 
         @browserthread	=
         Thread.new do
-          puts "Starting the browser..."
+		$rwdtinkerlog.warn "rwd: Starting the browser..."
+       
 
           #if ENV["RWDBROWSER"].downcase =~ /iexplore/	# ???
             #@ie	= IE.new("http://localhost:#{port}/")
@@ -1209,7 +1228,7 @@ class RWDServer
 
             command.gsub!(/%port%/, port.to_s)
 
-            system(command) or $stderr.puts "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
+            system(command) or $rwdtinkerlog.error "Starting of the browser failed, or the browser terminated abnormally.\nCommand => #{command}"
           #end
 
           puts "The browser has terminated."
@@ -1320,8 +1339,8 @@ class RWDServer
               resp << download
             end
           rescue
-            puts "Sending response to browser failed."
-
+           
+     $rwdtinkerlog.error "rwd: Sending response to browser failed."
             @sessions.delete(session.sessionid)
           end
 
@@ -1335,8 +1354,9 @@ class RWDServer
 
               if @browserstarted and not @browserthread.nil? and @browserthread.alive?
                 resp.stop do
-                  puts "Waiting for the browser to terminate..."
-
+                 
+         $rwdtinkerlog.warn "rwd: Waiting for the browser to terminate..."
+	 
                   @browserthread.join
                 end
               end

data/lib/rwdthemes/default.rwd

@@ -1,4 +1,4 @@
-$stderr.puts "in default theme load"
+$rwdtinkerlog.info "in default theme load"
 
 $rwd_html["DEFAULT"]	= "
 <!-- Generated by RubyWebDialog.                                               -->

data/lib/rwdtinker/rwdcodedir.rb

@@ -0,0 +1,56 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+require 'lib/rwdtinker/rwdtinkertools'
+
+tmpmodload = '
+def RwdtinkerTools.findfilesp(d)
+     
+	a = Array.new(Dir[d].entries.sort)
+	#loop through and get the files names
+	a.each do |x|
+		#adjust the filters to the files you want to see...
+		if(!test(?d,x))
+			# only rwd files
+			if x =~ /rb|rwd|txt/
+				fileA=File.open("#{x}","r")        #opens the file thats in fileName as read only
+				@@tempdoc+=fileA.read    #reads the file into the doc string
+				fileA.close    
+			end
+		end
+	end
+	
+end
+
+def RwdtinkerTools.findprogramfiles(codedir, specificdir = "")
+ @@tempdoc = ""
+#get a list of the files and subdirectories on the starting directory only
+  a = Array.new(Dir[codedir].entries.sort)
+  #loop through the list, ignore the files and add all new directories found
+  a.each do |x|
+	  #if a directory...
+	  if(test(?d,x))
+		  # add to the original list of directories
+		  @@root = x + "/**"
+		  #adds the new ones to the array
+		  b = Dir[@@root].entries.sort
+		  b.each do |x|
+			  if(test(?d,x))
+				  a.push(x)  #appends to the end of the array...
+			  end
+		  end
+	  end
+  end
+  a.each do |x|
+	  #if it is a file...
+	  if(!test(?d,x))
+		  a.delete(x)
+	  else              #it is a directory...
+		  findfilesp(x + "/**")
+	  end
+  end
+  return @@tempdoc
+end
+'
+
+RwdtinkerTools.module_eval(tmpmodload)

data/lib/rwdtinker/rwdguidir.rb

@@ -0,0 +1,57 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+require 'lib/rwdtinker/rwdtinkertools'
+
+tmpmodload = '
+def RwdtinkerTools.loadguifile(d)
+
+	a = Array.new(Dir[d].entries.sort)
+	#loop through and get the files names
+	a.each do |x|
+		#adjust the filters to the files you want to see...
+		if(!test(?d,x))
+			# only rwd files
+			if x =~ /rb|rwd|txt/
+
+				load x      #opens the file thats in fileName and reads it
+				@@tempdoc += $rwdguivar # adds the file into the doc string
+			end
+		end
+	end
+end 
+
+def RwdtinkerTools.findguifiles(guidir)
+      @@tempdoc = ""
+       #get a list of the files and subdirectories on the starting directory only
+       a = Array.new(Dir[guidir].entries.sort)
+       #loop through the list, ignore the files and add all new directories found
+      a.each do |x|
+	      #if a directory...
+	      if(test(?d,x))
+		     #use this new dir find to add to the original list of directories
+		     @@root = x + "/**"
+		     #adds the new ones to the array
+		     b = Dir[@@root].entries.sort
+		     b.each do |x|
+			       if(test(?d,x))
+				      a.push(x)  #appends to the end of the array...
+			        end
+		       end
+	      end
+       end
+      a.each do |x|
+	      #if it is a file...
+	      if(!test(?d,x)) 
+		    a.delete(x)
+
+	      else #it is a directory...
+		      loadguifile(x + "/**")
+	      end
+      end
+      return @@tempdoc
+      
+end
+'
+
+RwdtinkerTools.module_eval(tmpmodload)

data/lib/rwdtinker/rwdlangdir.rb

@@ -0,0 +1,60 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+require 'lib/rwdtinker/rwdtinkertools'
+
+tmpmodload = '
+def RwdtinkerTools.findfilest(d)
+	a = Array.new(Dir[d].entries.sort)
+	#loop through and get the files names
+	a.each do |x|
+		#adjust the filters to the files you want to see...
+		if(!test(?d,x))
+			# only rwd files
+			if x =~ /rb|po|txt/
+				fileA=File.open("#{x}","r")        #opens the file thats in fileName as read only
+				@@tempdoc+=fileA.read    #reads the file into the doc string
+				fileA.close    
+			end
+		end
+	end
+	
+end
+
+
+def RwdtinkerTools.findlanguagefiles(langdir,lang)
+     @@tempdoc = ""
+
+            startlangdir = File.join(langdir,lang)
+           #get a list of the files and subdirectories on the starting directory only
+            alanghash = Array.new(Dir[startlangdir].entries.sort)
+             #loop through the list, ignore the files and add all new directories found
+            alanghash.each do |x|
+	             #if a directory...
+	              if(test(?d,x))
+		          # add to the original list of directories
+		          @@tmproot = x + "/**"
+		          #adds the new ones to the array
+		          blanghash = Dir[@@tmproot].entries.sort
+		          blanghash.each do |x|
+			           if(test(?d,x))
+				        alanghash.push(x)  #appends to the end of the array...
+			           end
+		            end
+	            end
+            end
+            alanghash.each do |x|
+	                      #if it is a file...
+	                      if(!test(?d,x))
+		                      alanghash.delete(x)
+	                       else              #it is a directory...
+		                      findfilest(x + "/**")
+	                       end
+                end
+  
+	        return @@tempdoc
+  
+end
+'
+
+RwdtinkerTools.module_eval(tmpmodload)

data/lib/rwdtinker/rwdtinkertools.rb

@@ -0,0 +1,25 @@
+# part of rwdtinker smalllinux@gmail.com
+# copyleft gpl 2008 Steven Gibson
+
+module RwdtinkerTools
+
+# tools to use in rwdtinker
+
+   def RwdtinkerTools.tail(filename, lines=12)
+     
+           
+           begin
+                   tmpFile = File.open(filename, 'r') 
+       
+	           return     tmpFile.readlines.reverse!.slice(0,lines)
+     
+                   tmpFile.close
+          rescue
+              	return "error in opening log"
+ 	        $rwdtinkerlog.error "RwdtinkerTools.tail: file open error"
+          end
+    end
+
+end
+
+

data/rwd_files/HowTo_Tinker.txt

@@ -97,8 +97,7 @@ There are two ways to add applets to the directories.
       The gui files go into your gui directory
       The gui files need to be in order by name and end with .rwd
         
-
-      
+  
       If you need a config file that goes in the configuration directory
 
  internationalization and localization are helped by replacing the
@@ -136,9 +135,11 @@ To exit, press the x inside the browser window.
 
 == Languages
 
-
  You can add tranlations in the lang subdirectory
- You change the $lang constant in Tinker config file in the configuration directory
+ You change the $langarray constant in Tinker config file in the configuration directory
+
+to change language => in the tinkerwin2variables.cnf file the [0] setting of $langarray will be the language choosen.
+
  You can see one translation on the install applet tab, after you have installed and applet
  
 == Using over a Network
@@ -168,14 +169,15 @@ Ruby I am using version 1.8.2
 
 I have tested this under Linux-Debian kernel 2.6.9
 
-= Operation:
+== Operation:
+
 The code files reside in the code directory and are combined before 
 the main Class is loaded
 
 The rwd files in gui are combined before the gui is activated
 
 Translated text reside in the lang directory
-
+ 
 == Installing:
 
 untar the file
@@ -220,13 +222,37 @@ under the terms of the GPL licence:
   For more information see:
 http://rwdapplications.rubyforge.org/wiki/wiki.pl
 
-
 For more information about RubyWebDialogs see:
 http://www.erikveen.dds.nl/rubywebdialogs/index.html
 
 Thanks, Steven Gibson
 
 == Changelog
+version 1.82
+  switch to po files for translation files
+  add beginning of Hindi po file
+  added more Japanese strings
+  changed handling of lang change = in the tinkerwin2variables.cnf file the [0] setting of $langarray will be the language choosen.
+ 
+version 1.81
+  condensed config files from 4 -> 2
+  fixed document launch bug 
+  add $KCODE = 'u'
+  move help files to rwd_files directory
+  
+version 1.80
+ changed pda handling in rwd.rb
+ added logging
+ added log review screen on tinker back window
+ changed handling of live applet loading, to not list version in file names
+ 
+version 1.79
+ edited net.rb to fix text editing 
+ 
+version 1.78
+ modify config files
+ modify rconftools.rb to handle \r\n dos vs unix
+
 Version 1.77
  Fixed zips location to be relative or absolute
  Made themes loadable

data/rwd_files/HowTo_TinkerBell.txt

@@ -102,6 +102,12 @@ Steven Gibson
 steven@superant.com
 
 == Changelog 
+version 0.03
+ update for rwdtinker 1.80
+ 
+version 0.02
+ fix config file
+ 
 version 0.01
   First Release
   edit GUI