rwdtinker 1.78 → 1.79

data/configuration/language.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.78)
+##VERSION: (1.79)
 #language selection file
 ##NAME: ($lang):(1.78)
 #$lang = "jp"

data/configuration/rwdapplicationidentity.dist

@@ -1,3 +1,3 @@
-##VERSION: (1.78)
+##VERSION: (1.79)
 $rwdapplicationidentity = "rwdtinker main application"
 

data/configuration/rwdtinker.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.78)
+##VERSION: (1.79)
 ConfigurationDir = "configuration" # for use in program - init.rb has this value without using this constant
 CodeName = "rwdtinker"
 CodeNameFile = CodeName + ".rb"
@@ -11,5 +11,5 @@ LangDir = "lang"
    $rwdcontrolports =["13713","13714","13715","13716"]   # remote control code not actived 2007
  $port = 7705
 Browser_Exe = 'mozilla '
-RwdTinkerVersion = "1.78"
+RwdTinkerVersion = "1.79"
 

data/configuration/tinkerwin2variables.dist

@@ -1,4 +1,4 @@
-##VERSION: (1.78)
+##VERSION: (1.79)
 TinkerWin2ConfigurationFileName = "tinkerwin2variables.cnf" # this file name - do not change
 ##NAME: ($zipslocation):(1.78)
 $zipslocation = "zips" # location of applets to add
@@ -14,5 +14,5 @@ $zipslocation = "zips" # location of applets to add
 # $geminstalled_directory = "/ruby/lib/ruby/gems/1.8/gems" # XP machine
  $geminstalled_directory = "/var/lib/gems/1.8/gems" # Debian Linux
 
-RwdTinkerWin2Version = "1.78"
+RwdTinkerWin2Version = "1.79"
 

data/lib/rwd/net.rb

@@ -610,13 +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)
+      #  data = url_unescape(data)
         @vars	= RequestPost.new((self["content-type"] == "application/x-www-form-urlencoded") ? data : "")
       else
         $stderr.puts "Unknown request ('#{firstline}')."
       end
-    $stderr.puts data  
-    
+        if $DEBUG
+           $stderr.puts data  
+        end
     end
 
     @peeraddr	= @io.peeraddr

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

@@ -683,70 +683,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"
   end
   end
-end
+
 
 class RWDMessage < RWDWindow
   def initialize(msg)
@@ -830,7 +830,9 @@ class RWDialog
 
     self
   end
+  
 
+  
   def render(res, path, post, download, downloadfile, pda, sessionid)
 		# Avoid a timeout.
 
@@ -862,8 +864,13 @@ class RWDialog
 
     post.sort.each do |key, value|
       puts  "Post: #{key} -> #{value.from_html.inspect}"	if $rwd_debug
-
+ if $DEBUG
+	$stderr.puts  "Post: #{key} -> #{value.from_html.inspect}\n"
+	end
       vars[key]	= value.from_html
+       if $DEBUG
+	$stderr.puts  " #{value.from_html}\n"
+	end
     end
 
 		# Stack handling for rwd_action, rwd_window and rwd_tab.
@@ -931,7 +938,17 @@ 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}"))
+	      if $DEBUG
+	$stderr.puts  "Post: #{k} -> #{v}\n"
+	end
+       		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}"))   
+			       if $DEBUG
+	$stderr.puts  "Post: #{k} -> #{v}\n"
+	end
+		end	 
       end
 
 		# Callback.

data/rwd_files/HowTo_Tinker.txt

@@ -227,6 +227,13 @@ http://www.erikveen.dds.nl/rubywebdialogs/index.html
 Thanks, Steven Gibson
 
 == Changelog
+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/tests/makedist.rb

@@ -15,7 +15,7 @@ require 'fileutils'
 
 DistroName = "rwdtinker"
 
-DistroVersion="1.78"
+DistroVersion="1.79"
 
 DistroTitle="#{DistroName}.dist"
 load "configuration/#{DistroTitle}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rwdtinker
 version: !ruby/object:Gem::Version 
-  version: "1.78"
+  version: "1.79"
 platform: ruby
 authors: 
 - Steven Gibson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-24 00:00:00 -07:00
+date: 2008-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -137,11 +137,12 @@ files:
 - rwd_files/HowTo_TinkerWin2.txt
 - rwd_files/RubyWebDialogs.html
 - rwd_files/HowTo_Tinker.txt
+- zips/tinkerbellw-0.02.zip
 - zips/rwdwgutenberg-0.09.zip
 - zips/temp.rb
 - zips/rwdwfoldeditor-0.04.zip
 - zips/rwdwcalc-0.62.zip
-- zips/rwdwruby-1.06.zip
+- zips/rwdwruby-1.07.zip
 - zips/rwdwaddresses-1.06.zip
 - zips/wrubyslippers-1.06.zip
 - tests/rdep.rb