watobo 0.9.12 → 0.9.13

data/lib/watobo/gui/master_pw_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # master_pw_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class MasterPWDialog < FXDialogBox
 

data/lib/watobo/gui/mixins/gui_settings.rb

@@ -1,7 +1,7 @@
 # .
 # gui_settings.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     module Settings
        def self.save_gui_settings(settings)

data/lib/watobo/gui/page_tree.rb

@@ -1,7 +1,7 @@
 # .
 # page_tree.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -21,7 +21,8 @@
 # .
  #require 'qcustomize.rb'
 
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class PageTree < FXTreeList
 

data/lib/watobo/gui/password_policy_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # password_policy_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class PasswordPolicyDialog < FXDialogBox
 

data/lib/watobo/gui/plugin_board.rb

@@ -1,7 +1,7 @@
 # .
 # plugin_board.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,77 +19,107 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
-   module Gui
-
-      class PluginBoard < FXVerticalFrame
-         include Watobo::Gui::Icons
-
-         def updateBoard()
-
-            return false unless Watobo::Gui.plugins.first.respond_to? :plugin_name
-            begin
-               @matrix.each_child do |child|
-                  @matrix.removeChild(child)
-               end
-
-               Watobo::Gui.plugins.each do |p|
-                  pbtn = FXButton.new( @matrix, "\n"+p.plugin_name, p.icon, nil, 0,
-                  :opts => ICON_ABOVE_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_RIGHT,
-                  :width => 80, :height => 80)
-                  pbtn.create
-
-                  pbtn.connect(SEL_COMMAND) {
-                     p.create
-                     p.show(Fox::PLACEMENT_SCREEN)
-                     p.updateView()
-                  }
-
-                  frame = FXFrame.new(@matrix, :opts => FRAME_NONE|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, :width => 80, :height => 80)
-                  frame.backColor = FXColor::White
-               end
-
-               @plugin_frame.recalc
-               @plugin_frame.update
-
-            rescue => bang
-               puts bang
-               puts bang.backtrace if $DEBUG
-            end
-         end
-
-         def initialize(parent)
-            begin
-
-               super(parent, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
-               # db_title = FXLabel.new(self, "PLUGIN-BOARD", :opts => LAYOUT_LEFT)
-               main = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
-               main.backColor = FXColor::White
-
-               frame  = FXHorizontalFrame.new(main, :opts => LAYOUT_FILL_X|FRAME_GROOVE)
-               frame.backColor = FXColor::White
-               title_icon = FXButton.new(frame, '', ICON_PLUGIN, :opts => FRAME_NONE)
-               title_icon.backColor = FXColor::White
-
-
-               @font_title = FXFont.new(getApp(), "helvetica", 14, FONTWEIGHT_BOLD, FONTSLANT_ITALIC, FONTENCODING_DEFAULT)
-               title  = FXLabel.new(frame, "Plugin-Board", nil, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-               title.backColor = FXColor::White
-               title.setFont(@font_title)
-               title.justify = JUSTIFY_LEFT|JUSTIFY_CENTER_Y
-
-               @plugin_frame = FXVerticalFrame.new(main, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
-
-               @plugin_frame.backColor = FXColor::White
-
-               @matrix = FXMatrix.new(@plugin_frame, 7, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
-               @matrix.backColor = FXColor::White
-            rescue => bang
-               puts bang
-               puts bang.backtrace if $DEBUG
-            end
-            # update(nil)
-         end
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class PluginBoard < FXVerticalFrame
+      include Watobo::Gui::Icons
+      def updateBoard()
+
+        return false unless Watobo::Gui.plugins.first.respond_to? :plugin_name
+        begin
+          @matrix.each_child do |child|
+            @matrix.removeChild(child)
+          end
+
+          loaded = []
+
+          Watobo::Gui.plugins.each do |p|
+            plugin_name = p.respond_to?(:get_plugin_name) ? p.get_plugin_name : p.plugin_name
+            next if loaded.include? plugin_name
+            loaded << plugin_name
+            icon =p.respond_to?(:icon) ? p.icon : p.gui.icon
+            pbtn = FXButton.new( @matrix, "\n" + plugin_name, icon, nil, 0,
+            :opts => ICON_ABOVE_TEXT|FRAME_RAISED|FRAME_THICK|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT|LAYOUT_RIGHT,
+            :width => 80, :height => 80)
+            pbtn.create
+
+            pbtn.connect(SEL_COMMAND) {
+              gui =  p.respond_to?(:create) ? p : p.gui
+              gui.create
+              gui.show(Fox::PLACEMENT_SCREEN)
+            # gui.updateView()
+            }
+
+            pbtn.connect(SEL_RIGHTBUTTONPRESS) { |sender, sel, event|
+              description = nil
+              description = p.get_description if p.respond_to?(:get_description)
+              description = "No description available." if description.nil?
+
+              plugin_name = p.respond_to?(:get_plugin_name) ? p.get_plugin_name : p.plugin_name
+              unless event.moved?
+                FXMenuPane.new(self) do |menu_pane|
+                  #title = FXMenuCaption.new(menu_pane, "Description: #{plugin_name}")
+                  #title.backColor = 'red'
+                   #f = FXVerticalFrame.new(menu_pane, :opts=>LAYOUT_FILL_X|LAYOUT_FILL_Y)
+                  t = FXLabel.new(menu_pane, "#{plugin_name}")
+                 # t.justify = JUSTIFY_LEFT
+                  t.font = FXFont.new(getApp(), "courier", 12, FONTWEIGHT_BOLD)
+
+                  f = FXVerticalFrame.new(menu_pane, :opts=>LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_THICK|FRAME_SUNKEN)
+                  FXLabel.new(f, description).justify = JUSTIFY_LEFT
+
+                  menu_pane.create
+                  menu_pane.popup(nil, event.root_x, event.root_y)
+                  app.runModalWhileShown(menu_pane)
+                end
+              end
+            }
+
+            frame = FXFrame.new(@matrix, :opts => FRAME_NONE|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, :width => 80, :height => 80)
+            frame.backColor = FXColor::White
+          end
+
+          @plugin_frame.recalc
+          @plugin_frame.update
+
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
       end
-   end
+
+      def initialize(parent)
+        begin
+
+          super(parent, LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN)
+          # db_title = FXLabel.new(self, "PLUGIN-BOARD", :opts => LAYOUT_LEFT)
+          main = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
+          main.backColor = FXColor::White
+
+          frame  = FXHorizontalFrame.new(main, :opts => LAYOUT_FILL_X|FRAME_GROOVE)
+          frame.backColor = FXColor::White
+          title_icon = FXButton.new(frame, '', ICON_PLUGIN, :opts => FRAME_NONE)
+          title_icon.backColor = FXColor::White
+
+          @font_title = FXFont.new(getApp(), "helvetica", 14, FONTWEIGHT_BOLD, FONTSLANT_ITALIC, FONTENCODING_DEFAULT)
+          title  = FXLabel.new(frame, "Plugin-Board", nil, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
+          title.backColor = FXColor::White
+          title.setFont(@font_title)
+          title.justify = JUSTIFY_LEFT|JUSTIFY_CENTER_Y
+
+          @plugin_frame = FXVerticalFrame.new(main, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
+
+          @plugin_frame.backColor = FXColor::White
+
+          @matrix = FXMatrix.new(@plugin_frame, 7, :opts => MATRIX_BY_COLUMNS|LAYOUT_FILL_X)
+          @matrix.backColor = FXColor::White
+        rescue => bang
+          puts bang
+          puts bang.backtrace if $DEBUG
+        end
+      # update(nil)
+      end
+    end
+  end
 end

data/lib/watobo/gui/preferences_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # preferences_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class PreferencesDialog_UNUSED < FXDialogBox
       

data/lib/watobo/gui/progress_window.rb

@@ -1,7 +1,7 @@
 # .
 # progress_window.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class ProgressWindow < FXTopWindow
       def increment(x)

data/lib/watobo/gui/project_wizzard.rb

@@ -1,7 +1,7 @@
 # .
 # project_wizzard.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     
     

data/lib/watobo/gui/proxy_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # proxy_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class AddProxyDialog < FXDialogBox
 

data/lib/watobo/gui/quick_scan_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # quick_scan_dialog.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,15 +19,19 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class QuickScanOptionsFrame < FXVerticalFrame
       def options()
+        csrf_requests = Watobo::OTTCache.requests(@target_chat)
+        
         o = Hash.new
         o[:enable_logging] = @logScanChats.checked?
         o[:scanlog_name] = @scanlog_name_dt.value
         o[:csrf_tokens] = @csrf_patterns
         o[:csrf_request_ids] = @csrf_ids
+        o[:csrf_requests] = csrf_requests
         o[:update_csrf_tokens] = @csrfToken.checked?
         o[:use_orig_request] = @useOriginalRequest.checked?
         o[:detect_logout] = @detectLogout.checked?
@@ -36,8 +40,7 @@ module Watobo
         o
       end
 
-      def initialize(owner, project=nil, prefs = {} )
-        @project = project
+      def initialize(owner, prefs = {} )
 
         super(owner, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
@@ -46,14 +49,14 @@ module Watobo
         @target_chat = prefs[:target_chat]
 
         # scan_opt_frame= FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        @useOriginalRequest = FXCheckButton.new(self, "Use Original Request", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        @useOriginalRequest = FXCheckButton.new(self, "Use original request", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
         @useOriginalRequest.checkState = true
         
-        @followRedirects = FXCheckButton.new(self, "Follow Redirects", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        @followRedirects = FXCheckButton.new(self, "Follow redirects", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
         @followRedirects.checkState = false
         
-        @detectLogout = FXCheckButton.new(self, "Detect Logout & Re-Login", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
-               @detectLogout.checkState = false
+        @detectLogout = FXCheckButton.new(self, "Autom. login when logged out", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
+        @detectLogout.checkState = false
 
         frame = FXGroupBox.new(self, "Logging", LAYOUT_SIDE_TOP|FRAME_GROOVE|LAYOUT_FILL_X, 0, 0, 0, 0)
         @logScanChats = FXCheckButton.new(frame, "Log Scan", nil, 0, JUSTIFY_LEFT|JUSTIFY_TOP|ICON_BEFORE_TEXT|LAYOUT_SIDE_TOP)
@@ -111,31 +114,13 @@ module Watobo
       private
 
       def openCSRFTokenDialog(sender, sel, item)
-        csrf_dlg = CSRFTokenDialog.new(self, @project, @target_chat)
+        csrf_dlg = CSRFTokenDialog.new(self, @target_chat)
         if csrf_dlg.execute != 0 then
           @csrf_ids = csrf_dlg.getTokenScriptIds()
           @csrf_patterns = csrf_dlg.getTokenPatterns()
 
-          # puts "* update CSRF Settings"
-          puts @csrf_ids
-          puts @csrf_patterns
-          puts @target_chat
-
-          @project.setCSRFRequest(@target_chat.request, @csrf_ids, @csrf_patterns)
-
-          # puts csrf_ids.to_yaml
-          # puts "= = ="
-          # puts csrf_patterns.to_yaml
+          Watobo.project.setCSRFRequest(@target_chat.request, @csrf_ids, @csrf_patterns)
 
-          # if @project
-          #   @csrf_requests = []
-          #   csrf_ids.each do |id|
-          #     chat = @project.getChat(id)
-          #     @csrf_requests.push chat.copyRequest
-          #   end
-
-          #end
-        
         end
       end
 
@@ -159,21 +144,21 @@ module Watobo
       attr :selectedModules
       attr :options
       
-      def initialize(parent, project=nil, prefs={} )
+      def initialize(parent, prefs={} )
         super(parent, "Quick Scan", DECOR_ALL, :width => 300, :height => 400)
         # @active_policy = 'Default'
         @selectedModules = []
-        @project = project
+        
         
         FXMAPFUNC(SEL_COMMAND, ID_ACCEPT, :onAccept)
 
         base_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
         @switcher = FXSwitcher.new(base_frame,LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
-        @quickScanOptionsFrame = QuickScanOptionsFrame.new(@switcher, @project, prefs)
+        @quickScanOptionsFrame = QuickScanOptionsFrame.new(@switcher, prefs)
 
       #  @policyFrame = ChecksPolicyFrame.new(@switcher, project.active_checks, project.settings[:policy])
-       @policyFrame = ChecksPolicyFrame.new(@switcher, project.active_checks)
+       @policyFrame = ChecksPolicyFrame.new(@switcher)
 
         # BUTTONS
         buttons_frame = FXHorizontalFrame.new(base_frame, :opts => LAYOUT_FILL_X)

data/lib/watobo/gui/request_builder_frame.rb

@@ -0,0 +1,134 @@
+# .
+# request_builder_frame.rb
+# 
+# Copyright 2013 by siberas, http://www.siberas.de
+# 
+# This file is part of WATOBO (Web Application Tool Box)
+#        http://watobo.sourceforge.com
+# 
+# WATOBO is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation version 2 of the License.
+# 
+# WATOBO is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with WATOBO; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# .
+# @private 
+module Watobo#:nodoc: all
+  module Gui
+    class RequestBuilder < FXVerticalFrame
+      def subscribe(event, &callback)
+        (@event_dispatcher_listeners[event] ||= []) << callback
+      end
+
+      def clearEvents(event)
+        @event_dispatcher_listener[event].clear
+      end
+
+      def setRequest(raw_request)
+        begin
+        # request
+          if raw_request.is_a? String
+            request = Watobo::Utils.text2request(raw_request)
+          else
+            request = Watobo::Request.new raw_request
+          end
+         
+
+          @editors.each do |name, item|
+            e = item[:editor]
+            if e.setRequest(request)
+              item[:tab_item].enable
+            else
+              item[:tab_item].disable
+            end
+
+          end
+
+        rescue => bang
+          puts bang
+         puts bang.backtrace 
+        # puts request
+        # puts "== EOE =="
+        end
+      end
+
+      def highlight(pattern)
+       # @text_edit.highlight(pattern)
+      end
+
+      def rawRequest
+       @current.rawRequest
+      end
+
+      def parseRequest
+
+        @current.parseRequest
+       
+      end
+
+      def initialize(owner, opts)
+        super(owner,opts)
+
+        @event_dispatcher_listeners = Hash.new
+        @last_editor = nil
+
+        @tab = FXTabBook.new(self, nil, 0, LAYOUT_FILL_X|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        @tab.connect(SEL_COMMAND){
+          @current = @editors.to_a[@tab.current][1][:editor] 
+          unless @last_editor.nil?
+            last_request = @last_editor.rawRequest
+            @current.setRequest(last_request)
+          end
+         @last_editor = @editors.to_a[@tab.current][1][:editor]
+          #puts @current.class
+          }
+        @editors = {}
+        @current = nil
+
+        add_editor("Text") do |frame|
+          Watobo::Gui::RequestEditor.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+        end
+
+        add_editor("Table") do |frame|
+          Watobo::Gui::TableEditorFrame.new(frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_SUNKEN|FRAME_THICK, :padding => 0)
+        end
+        
+        @current = @editors.first[1][:editor]
+
+      
+
+      end
+
+      private
+
+      def add_editor(tab_name, &b)
+        tab_item = FXTabItem.new(@tab, tab_name, nil)
+        frame = FXVerticalFrame.new(@tab, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_RAISED)
+        editor = yield(frame) if block_given?
+
+        @editors[tab_name.to_sym] = {
+          :editor => editor,
+          :tab_item => tab_item
+        }
+        editor.subscribe(:hotkey_ctrl_enter){ notify(:hotkey_ctrl_enter) }
+        editor.subscribe(:error) { |msg| notify(:error, msg) }
+
+      end
+
+      def notify(event, *args)
+        if @event_dispatcher_listeners[event]
+          @event_dispatcher_listeners[event].each do |m|
+            m.call(*args) if m.respond_to? :call
+          end
+        end
+      end
+    end
+  end
+end

data/lib/watobo/gui/request_editor.rb

@@ -1,7 +1,7 @@
 # .
 # request_editor.rb
 # 
-# Copyright 2012 by siberas, http://www.siberas.de
+# Copyright 2013 by siberas, http://www.siberas.de
 # 
 # This file is part of WATOBO (Web Application Tool Box)
 #        http://watobo.sourceforge.com
@@ -19,7 +19,8 @@
 # along with WATOBO; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 # .
-module Watobo
+# @private 
+module Watobo#:nodoc: all
   module Gui
     class SimpleTextView < FXVerticalFrame
 
@@ -177,7 +178,10 @@ module Watobo
         @text = normalizeText(text)
       
         showText(@text)
+        true
       end
+      
+      alias_method :setRequest, :setText
 
       def filter(pattern)
         #dummy = @textbox.to_s.split(/\n/)
@@ -401,13 +405,13 @@ module Watobo
                 text = @textbox.extractText(pos,len)
                 rptxt = case event.code
                 when KEY_u
-                  CGI::escape(text).strip
+                  CGI::escape(text)
                 when KEY_b
-                  Base64.encode64(text).strip
+                  Base64.strict_encode64(text)
                 when KEY_U
-                  CGI::unescape(text).strip
+                  CGI::unescape(text)
                 when KEY_B
-                  Base64.decode64(text).strip
+                  Base64.decode64(text)
                 else
                 text
                 end
@@ -432,8 +436,9 @@ module Watobo
       def parseRequest
         begin
           return @textbox.to_request
-        rescue SyntaxError, LocalJumpError, NameError
-        #  puts bang
+        rescue SyntaxError, LocalJumpError, NameError => bang
+          puts bang
+          puts bang.backtrace
         #  puts bang.backtrace if $DEBUG
           notify(:error, "#{$!}")
         rescue => bang
@@ -476,6 +481,6 @@ module Watobo
       end
     end
 
-  # -> module Watobo::Gui
+  # -> # module Watobo::Gui
   end
 end