watobo 0.9.12 → 0.9.13

data/lib/watobo/gui/rewrite_filters_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # rewrite_filters_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 FilterTableCtrl < FXHorizontalFrame
       attr_accessor :target
@@ -215,7 +216,7 @@ module Watobo
 
         super(owner, parms)
         
-        self.extend Watobo::Gui::Subscriber
+        self.extend Watobo::Subscriber
         self.setBackColor(FXRGB(255, 255, 255))
         self.setCellColor(0, 0, FXRGB(255, 255, 255))
         self.setCellColor(0, 1, FXRGB(255, 240, 240))

data/lib/watobo/gui/rewrite_rules_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # rewrite_rules_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 RulesTableCtrl < FXHorizontalFrame
       attr_accessor :target
@@ -216,7 +217,7 @@ module Watobo
 
         super(owner, parms)
         
-        self.extend Watobo::Gui::Subscriber
+        self.extend Watobo::Subscriber
         self.setBackColor(FXRGB(255, 255, 255))
         self.setCellColor(0, 0, FXRGB(255, 255, 255))
         self.setCellColor(0, 1, FXRGB(255, 240, 240))

data/lib/watobo/gui/save_chat_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # save_chat_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 SaveChatDialog < FXDialogBox
       class Sender < Watobo::Session
@@ -38,7 +39,10 @@ module Watobo
 
           id = 0
           if prefs[:run_login ] == true
-            runLogin(@project.getLoginChats(), prefs)
+            puts prefs.to_yaml
+            puts "Scanner Settings:"
+            puts Watobo::Conf::Scanner.to_h.to_yaml
+            runLogin( prefs[:login_chats], prefs)
           end
           #if prefs[:update_session ] == true and
           unless prefs[:update_csrf_tokens] == true

data/lib/watobo/gui/scanner_settings_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # scanner_settings_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 ScannerSettingsFrame < FXVerticalFrame
@@ -334,7 +335,7 @@ module Watobo
         
         #  puts "create scopeframe with scope:"
         # @project.scope
-        # @defineScopeFrame = DefineScopeFrame.new(base_frame, @project.listSites(), YAML.load(YAML.dump(@project.scope)), prefs)
+        # @defineScopeFrame = DefineScopeFrame.new(base_frame, Watobo::Chats.sites(), YAML.load(YAML.dump(@project.scope)), prefs)
         @scannerSettingsFrame = ScannerSettingsFrame.new(base_frame, :opts => SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
         
         buttons_frame = FXHorizontalFrame.new(base_frame,

data/lib/watobo/gui/select_chat_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # select_chat_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 SelectChatDialog < FXDialogBox
          include Watobo::Gui::Utils
@@ -34,7 +35,7 @@ module Watobo
                   @chatTable.selectRow(row)
                   chatid = @chatTable.getRowText(row).to_i
                   # @logText.appendText("selected ID: (#{chatid})\n")
-                  @chat_list.each do |chat|
+                  Watobo::Chats.each do |chat|
                      if chat.id == chatid then
                         @sel_chat = chatid
 
@@ -72,18 +73,13 @@ module Watobo
          end
 
          def updateTable()
-            dummy = @chat_list
-            unless @project.nil?
-
-               if @show_scope_only.checked?
-
-                  dummy = @chat_list.select{ |x|
-                     @project.siteInScope?(x.request.site)
-                  }
-               end
-
-            end
-            @chatTable.showConversation(dummy)
+           chats = nil
+           if @show_scope_only.checked?
+             chats = Watobo::Chats.in_scope
+           else
+             chats = Watobo::Chats.to_a
+           end
+           @chatTable.showConversation( chats )
 
          end
 
@@ -98,11 +94,11 @@ module Watobo
             end
          end
 
-         def initialize(owner, title, chat_list=[], project=nil)
+         def initialize(owner, title)
             #  @chat_selection = []
-            @project = project
+           
             @selection = FXDataTarget.new('')
-            @chat_list = chat_list
+
             @sel_chat = nil
             super(owner, title, DECOR_ALL, :width=>600, :height=>600)
             main_frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
@@ -111,18 +107,12 @@ module Watobo
 
             preview_frame = FXVerticalFrame.new(splitter, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :height => 300, :padding => 0)
 
-            unless @project.nil?
+           
                quick_filter_gb = FXGroupBox.new(top_frame, "Quick Filter", FRAME_GROOVE|LAYOUT_FILL_X)
                quick_filter_frame = FXHorizontalFrame.new(quick_filter_gb, :opts => FRAME_NONE|LAYOUT_FILL_X, :padding => 0)
                @show_scope_only = FXCheckButton.new(quick_filter_frame, "scope only", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
                @show_scope_only.setCheck(false)
                @show_scope_only.connect(SEL_COMMAND) { updateTable }
-
-               #  @show_referer = FXCheckButton.new(quick_filter_frame, "show referer", nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
-               #  @show_referer.setCheck(false)
-               #  @show_referer.connect(SEL_COMMAND) { updateTable }
-            end
-
             table_frame = FXVerticalFrame.new(top_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE)
 
             @chatTable = ConversationTable.new(table_frame, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)

data/lib/watobo/gui/session_management_dialog.rb

@@ -1,7 +1,7 @@
 # .
 # session_management_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 SidTable < FXTable
       def subscribe(event, &callback)
@@ -30,7 +31,7 @@ module Watobo
         @event_dispatcher_listener[event].clear
       end
 
-      def updateSID(new_sids = {})
+      def updateSID_UNUSED(new_sids = {})
         initTable()
         new_sids.each_key do |site|
           addSID(site, new_sids[site])
@@ -45,17 +46,13 @@ module Watobo
 
         self.connect(SEL_COMMAND, method(:onTableClick))
 
-        # KEY_Return
-        # KEY_Control_L
-        # KEY_Control_R
-        # KEY_s
-        @ctrl_pressed = false
-
-        #       addKeyHandler(self)
-
         self.columnHeader.connect(SEL_COMMAND) do |sender, sel, index|
           self.fitColumnsToContents(index)
         end
+        
+        Watobo::SIDCache.acquire(Thread.current.object_id).sids.each_key do |site|
+           addSID(site, new_sids[site])
+        end
       end
 
       private
@@ -400,7 +397,7 @@ module Watobo
           @requestCombo.clearItems()
 
           req_id_list.each do |id|
-            chat = @project.getChat(id)
+            chat = Watobo::Chats.get_by_id(id)
             text = "[#{id}] #{chat.request.first}"
             @requestCombo.appendItem(text.slice(0..60), chat)
           end
@@ -467,7 +464,7 @@ module Watobo
         @response_viewer = SidPreview.new(sunken, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
 
         
-        Watobo::Conf::Scanner.sid_patterns.each do |p|
+        Watobo::Conf::SidCache.patterns.each do |p|
             item = @pattern_list.appendItem("#{p}")
             @pattern_list.setItemData(item, p)
           end
@@ -483,10 +480,9 @@ module Watobo
       #  refresh_btn = FXButton.new(button_frame, "Refresh")
 
         @sidTable = SidTable.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y)
-
-        @session = Watobo::Session.new(@project.object_id)
-
-        @sidTable.updateSID @session.sidCache()
+       # sid_cache = Watobo::SIDCache.acquire(Thread.current.object_id)
+        
+        #@sidTable.updateSID @session.sidCache()
       end
     end
 
@@ -521,7 +517,7 @@ module Watobo
             chatid = @scriptTable.getRowText(item.row).to_i
             # @logText.appendText("selected ID: (#{chatid})\n")
             if chatid >= 0
-              chat = @project.getChat(chatid)
+              chat = Watobo::Chats.get_by_id(chatid)
               showChat(chat) if chat
               @sel_row = row
               @rem_button.enable
@@ -546,13 +542,13 @@ module Watobo
 
       def startSelectChatDialog(sender, sel, item)
         begin
-          dlg = Watobo::Gui::SelectChatDialog.new(self, "Select Login Chat", @project.chats)
+          dlg = Watobo::Gui::SelectChatDialog.new(self, "Select Login Chat")
           if dlg.execute != 0 then
 
             chats_selected = dlg.selection.value.split(",")
 
             chats_selected.each do |chatid|
-              chat = @project.getChat(chatid.strip)
+              chat = Watobo::Chats.get_by_id(chatid.strip)
               addRequest(chat) if chat
             end
           end
@@ -611,7 +607,7 @@ module Watobo
 
         if @project.respond_to? :getLoginChatIds then
           @project.getLoginChatIds.each do |id|
-            chat = @project.getChat(id)
+            chat = Watobo::Chats.get_by_id(id)
             addRequest(chat)
           end
         end
@@ -662,10 +658,10 @@ module Watobo
         logout_tab = FXTabItem.new(tabBook, "Logout Signatures", nil)
         @logoutSettings = LogoutSettings.new(tabBook)
 
-        unless Watobo.project.nil?
-        sidcache_tab = FXTabItem.new(tabBook, "SID-Cache", nil)
-        SIDCacheFrame.new(tabBook)
-        end
+#        unless Watobo.project.nil?
+#        sidcache_tab = FXTabItem.new(tabBook, "SID-Cache", nil)
+#        SIDCacheFrame.new(tabBook)
+#        end
         
         tabBook.connect(SEL_COMMAND) do |sender, sel, tabItem|
 

data/lib/watobo/gui/sites_tree.rb

@@ -1,7 +1,7 @@
 # .
 # sites_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 SitesTree < FXTreeList
       attr_accessor :project
@@ -35,7 +36,7 @@ module Watobo
       def reload()
         self.clearItems
 
-        @project.chats.each do |chat|
+        Watobo::Chats.each do |chat|
           addChat(chat)
         end
 
@@ -45,7 +46,7 @@ module Watobo
       def refresh_tree()
         self.clearItems
 
-        @project.chats.each do |chat|
+        Watobo::Chats.each do |chat|
           addChat(chat)
         end
 

data/lib/watobo/gui/status_bar.rb

@@ -1,7 +1,7 @@
 # .
 # status_bar.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 StatusBar < FXHorizontalFrame
       def setStatusInfo( prefs={} )