watobo 0.9.20 → 0.9.21

data/lib/watobo/core/cookie.rb

@@ -35,9 +35,9 @@ module Watobo#:nodoc: all
         @name = prefs[:name]
         @value = prefs[:value]
       else
-        puts "= NEW COOKIE ="
-        puts prefs
-        puts prefs.class
+       # puts "= NEW COOKIE ="
+       # puts prefs
+       # puts prefs.class
         chunks = prefs.split(";")
         # first chunk
         @name, @value = chunks.first.split(":").last.split("=")

data/lib/watobo/core/finding.rb

@@ -45,6 +45,13 @@ module Watobo#:nodoc: all
         return @details[name]
       end
       super
+    end
+    
+    def to_h
+      h = { :details => @details }
+      h[:request] = @request.to_a
+      h[:response] = @response.to_a
+      h
     end
 
     def initialize(request, response, details = {})

data/lib/watobo/core/request.rb

@@ -124,7 +124,7 @@ module Watobo#:nodoc: all
       elsif r.is_a? String
         if r =~ /^http/
           uri = URI.parse r
-          self << "GET #{uri.to_s} HTTP/1.0\r\n"
+          self << "GET #{uri.to_s} HTTP/1.1\r\n"
           self << "Host: #{uri.host}\r\n"
         else
           r.extend Watobo::Mixins::RequestParser
@@ -134,8 +134,8 @@ module Watobo#:nodoc: all
       end
       self.extend Watobo::Mixin::Parser::Url
       self.extend Watobo::Mixin::Parser::Web10
-      self.extend Watobo::Mixin::Shaper::Web10
-
+      self.extend Watobo::Mixin::Shaper::Web10
+      
       @url = Watobo::HTTP::Url.new(self)
       case self.content_type
       when /www-form/i

data/lib/watobo/core/session.rb

@@ -92,7 +92,11 @@ module Watobo#:nodoc: all
           #---------------------------------------
          # request.removeHeader("^Proxy-Connection") #if not use_proxy
          # request.removeHeader("^Connection") #if not use_proxy
-          #request.removeHeader("^Accept-Encoding")
+         
+         # !!!
+         # remove Accept-Encoding header
+         # otherwise we won't get the content-length information for pass-through feature
+          request.removeHeader("^Accept-Encoding")
           # If-Modified-Since: Tue, 28 Oct 2008 11:06:43 GMT
           # If-None-Match: W/"3975-1225192003000"
           # request.removeHeader("^If-")
@@ -1117,7 +1121,7 @@ end
           return nil
         end
          
-         header = [ "HTTP/1.1 200 OK\r\n", "Server: WATOBO\r\n", "Content-Length: #{msg.length.to_i}\r\n", "Content-Type: text/html\r\n", "\r\n", "#{msg}" ] unless msg.nil?
+         header = [ "HTTP/1.1 502 Bad Gateway\r\n", "Server: WATOBO\r\n", "Content-Length: #{msg.length.to_i}\r\n", "Content-Type: text/html\r\n", "\r\n", "#{msg}" ] unless msg.nil?
 
         response = Watobo::Response.new header
         #  update_sids(header)

data/lib/watobo/framework/init_modules.rb

@@ -7,7 +7,7 @@
 # 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 
+# @private
 module Watobo#:nodoc: all
 
   private
@@ -36,14 +36,14 @@ module Watobo#:nodoc: all
         #  notify(:logger, LOG_DEBUG, "#{modules} loaded.")
 
       rescue => bang
-      puts "!!!"
-      puts bang
+        puts "!!!"
+        puts bang
       end
     end
     passive_modules
   end
-  
-   def self.init_passive_modules(filter='')
+
+  def self.init_passive_modules(filter='')
     # puts "get passive modules from path #{@settings[:module_path]}/passive"
     passive_modules = []
 
@@ -52,25 +52,24 @@ module Watobo#:nodoc: all
         mod = File.basename(mod_file)
 
         load mod_file
-        rescue => bang
-      puts "!!!"
-      puts bang
+      rescue => bang
+        puts "!!!"
+        puts bang
       end
     end
-    
+
     Watobo::Modules::Passive.constants.each do |m|
       begin
         class_constant = Watobo::Modules::Passive.const_get(m)
         passive_modules.push class_constant
       rescue => bang
-      puts "!!!"
-      puts bang
+        puts "!!!"
+        puts bang
       end
     end
     passive_modules
   end
 
-
   def self.init_active_modules()
 
     active_path = Watobo.active_module_path
@@ -96,7 +95,10 @@ module Watobo#:nodoc: all
             # notify(:logger, LOG_INFO, "#{module_class} loaded.")
             active_checks.push class_constant
           rescue => bang
-          puts bang
+            puts '---'
+            puts bang
+            puts "when loading module file #{mod_file}"
+            puts '---'
           # notify(:logger, LOG_DEBUG, "problems loading module: #{@settings[:module_path]}/active/#{group}/#{modules}")
           end
         end
@@ -125,9 +127,9 @@ module Watobo#:nodoc: all
       #@interface.log("#{modules} loaded.")
 
     rescue => bang
-    puts bang
-    #@interface.log("problems loading module: #{module_path}/#{group}/#{modules}")
-    puts "problems loading module: #{filename}"
+      puts bang
+      #@interface.log("problems loading module: #{module_path}/#{group}/#{modules}")
+      puts "problems loading module: #{filename}"
     end
   end
 end

data/lib/watobo/gui/conversation_table.rb

@@ -436,23 +436,19 @@ module Watobo#:nodoc: all
 
         parms = ""
         unless ps.empty?
-          #   parms = ps[0..50]
-          #   parms += "..." if ps.length > 50
+          ps_ascii = ps.force_encoding('ASCII-8BIT')
+          
           if @url_decode == true
             if chat.request.content_type =~ /(json|xml)/
-              parms = ps.unpack('C*').pack('U*')
-            else
-              parms = CGI.unescape(ps).unpack('C*').pack('U*')              
+              parms = ps_ascii
+            else              
+              parms = CGI.unescape(ps_ascii)              
             end
           end
           parms.gsub!(/[^[:print:]]/,'.')
 
         end
         
-        #if parms.length > 50
-        #  parms = parms[0..50] + "..."
-        #end
-
         self.setItemText(lastRowIndex, index, parms)
         self.getItem(lastRowIndex, index).justify = FXTableItem::LEFT
 
@@ -478,7 +474,9 @@ module Watobo#:nodoc: all
         self.setItemData(lastRowIndex, 0, chat)
 
         #self.makePositionVisible(self.numRows-1, 0) if @autoscroll == true
-        self.setPosition(self.xPosition, (self.viewportHeight - self.contentHeight - 20 ))
+        if @autoscroll == true
+          self.setPosition(self.xPosition, (self.viewportHeight - self.contentHeight - 20 ))
+        end
       end
 
       def update_table()
@@ -611,14 +609,13 @@ module Watobo#:nodoc: all
         else 
           sel = ni
         end
-        puts "neares: #{sel}"
-        if sel >= 0
-        selectRow(sel, false)
-       
-       setCurrentItem(sel, 2)
-       makePositionVisible(i,2)
         
+        if sel >= 0
+          selectRow(sel, false)       
+          setCurrentItem(sel, 2)
+          makePositionVisible(sel,2)        
         end
+        
         false
       end
       

data/lib/watobo/gui/conversation_table_ctrl2.rb

@@ -296,6 +296,7 @@ module Watobo#:nodoc: all
         @table_option_autoscroll.setCheck(true)
         
         @table_option_autoscroll.connect(SEL_COMMAND){
+          puts "* Autoscroll >> #{@table_option_autoscroll.checked?.class}"
           @table.autoscroll = @table_option_autoscroll.checked?
         }
         

data/lib/watobo/gui/custom_viewer.rb

@@ -10,12 +10,99 @@
 # @private 
 module Watobo#:nodoc: all
   module Gui
+    
+    class ViewerHandlerCtrl < FXHorizontalFrame
+      attr :handler
+      
+      def has_handler?
+        !@handler.nil?
+      end
+      
+      def initialize(parent, opts = { :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM, :padding => 0 })
+        super parent, opts
+        @parent = parent
+        #handler_ctrl_frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X, :padding => 0)
+        FXLabel.new(self, "View Handler:")
+        @handler_status_lbl = FXLabel.new(self, "None")
+        @handler_status_lbl.backColor = "red"
+        add_handler_btn = FXButton.new(self, "add", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        add_handler_btn.connect(SEL_COMMAND){ add_handler }
+        reload_handler_btn = FXButton.new(self, "reload", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        reload_handler_btn.connect(SEL_COMMAND){ load_handler(@handler_file) }
+        reset_handler_btn = FXButton.new(self, "reset", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
+        
+        reset_handler_btn.connect(SEL_COMMAND){
+          @handler = nil
+          @handler_file = nil
+          @handler_status_lbl.text =  "None"
+          @handler_status_lbl.backColor = "red"
+        }
+      end
+      
+      
+      def add_handler        
+         handler_filename = FXFileDialog.getOpenFilename(self, "Select handler file", @handler_path, "*.rb\n*")
+          if handler_filename != "" then
+            if File.exists?(handler_filename) then
+              @handler_file = handler_filename
+              @handler_path = File.dirname(handler_filename) + "/"
+              load_handler(handler_filename)
+            end
+          end
+        
+      end
+      
+      def load_handler(file)
+        @handler = nil
+        @handler_status_lbl.text = "None"
+        @handler_status_lbl.backColor = "red"
+        
+        return false if file.nil?
+        return false unless File.exist? file
+        begin
+          source = File.read(file)
+          #puts source
+          result = eval(source)
+          if result.respond_to? :call
+            @handler = result
+            @handler_status_lbl.text = "#{File.basename(file).gsub(/\.rb$/,'')}"
+            @handler_status_lbl.textColor = 'black'
+            @handler_status_lbl.backColor = 'green'
+            @parent.setText
+          end
+          return true
+                     
+         rescue SyntaxError, LocalJumpError, NameError => e
+           out = e.to_s
+           out << e.backtrace.join("\n")
+         rescue => bang
+           out = bang
+           out << bang.backtrace.join("\n")
+         end
+         puts out
+         return false
+      end
+      
+      def call_handler(object)
+        return object if @handler.nil?
+        begin
+          result = @handler.call(object)
+          return result       
+        rescue => bang
+          result = bang.to_s
+          result << bang.backtrace.join("\n")
+          return result
+        end
+        
+      end
+    end
 
    
     class CustomViewer < FXVerticalFrame
- SEL_TYPE_GREP = 0
-    SEL_TYPE_HIGHLIGHT = 1
+      SEL_TYPE_GREP = 0
+      SEL_TYPE_HIGHLIGHT = 1
       attr_accessor :max_len
+      
       def style=(new_style)
         @simple_text_view.style = new_style
       end
@@ -24,13 +111,17 @@ module Watobo#:nodoc: all
         @simple_text_view.editable = value
       end
 
-      def setText(text, prefs={})
+      def setText(object=nil, prefs={})
         
-        normalized_text = text
-        if text.is_a? Watobo::Request or text.is_a? Watobo::Response          
-           return false unless @handler.respond_to? :call
-           result = call_handler(text)
-           normalized_text =  result
+        o = object.nil? ? @object : object
+        return false if o.nil?
+        @object = o
+        normalized_text = o.to_s
+        if o.is_a? Watobo::Request or o.is_a? Watobo::Response          
+           if @handler_ctrl.has_handler?
+             result = @handler_ctrl.call_handler(o)
+             normalized_text =  result
+           end
         else
           return false
         end
@@ -64,6 +155,7 @@ module Watobo#:nodoc: all
 
         @style = 2 # default style
         @text = ''
+        @object = nil
         @max_len = 5000
         @filter_mode = SEL_TYPE_HIGHLIGHT
         @cur_match_pos = 0
@@ -74,20 +166,7 @@ module Watobo#:nodoc: all
         @handler_file = nil
         @handler_path = nil
         
-        handler_ctrl_frame = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X, :padding => 0)
-        @handler_status_lbl = FXLabel.new(handler_ctrl_frame, "No handler!")
-         @handler_status_lbl.textColor = "red"
-        add_handler_btn = FXButton.new(handler_ctrl_frame, "add", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
-        add_handler_btn.connect(SEL_COMMAND){ add_handler }
-        reload_handler_btn = FXButton.new(handler_ctrl_frame, "reload", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
-        reload_handler_btn.connect(SEL_COMMAND){ load_handler(@handler_file) }
-        reset_handler_btn = FXButton.new(handler_ctrl_frame, "reset", nil, nil, 0, FRAME_RAISED|LAYOUT_FILL_Y|LAYOUT_RIGHT)
-        reset_handler_btn.connect(SEL_COMMAND){
-          @handler = nil
-          @handler_file = nil
-          @handler_status_lbl = FXLabel.new(handler_ctrl_frame, "No handler!")
-          @handler_status_lbl.textColor = "red"
-        }
+        @handler_ctrl = ViewerHandlerCtrl.new(self)
 
         text_view_header = FXHorizontalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_SIDE_BOTTOM|LAYOUT_FIX_HEIGHT,:height => 24, :padding => 0)
 
@@ -163,60 +242,6 @@ module Watobo#:nodoc: all
       end
 
       private
-      
-      def add_handler
-        
-         handler_filename = FXFileDialog.getOpenFilename(self, "Select handler file", @handler_path, "*.rb\n*")
-          if handler_filename != "" then
-            if File.exists?(handler_filename) then
-              @handler_file = handler_filename
-              @handler_path = File.dirname(handler_filename) + "/"
-              load_handler(handler_filename)
-            end
-          end
-        
-      end
-      
-      def load_handler(file)
-        @handler = nil
-        @handler_status_lbl.text = "No handler!"
-        @handler_status_lbl.textColor = "red"
-        
-        return false if file.nil?
-        return false unless File.exist? file
-        begin
-          source = File.read(file)
-          #puts source
-          result = eval(source)
-          if result.respond_to? :call
-            @handler = result
-            @handler_status_lbl.text = "Handler ready!"
-            @handler_status_lbl.textColor = "green"
-          end
-          return true
-                     
-         rescue SyntaxError, LocalJumpError, NameError => e
-           out = e.to_s
-           out << e.backtrace.join("\n")
-         rescue => bang
-           out = bang
-           out << bang.backtrace.join("\n")
-         end
-         puts out
-         return false
-      end
-      
-      def call_handler(object)
-        begin
-          result = @handler.call(object)
-          return result       
-        rescue => bang
-          result = bang.to_s
-          result << bang.backtrace.join("\n")
-          return result
-        end
-        
-      end
 
       def gotoNextMatch()
         @cur_match_pos += 1 if @cur_match_pos < @simple_text_view.numMatches-1

data/lib/watobo/gui/define_scope_frame.rb

@@ -187,7 +187,7 @@ module Watobo#:nodoc: all
     class DefineScopeFrame < FXVerticalFrame
       
       def onDeselectAll(sender, sel, item)        
-        @scope.each do |site, val|        
+        @cb_sites.each_key do |site|        
           @cb_sites[site].setCheck(false)  
           @edit_btns[site].disable
         end
@@ -198,7 +198,7 @@ module Watobo#:nodoc: all
       
       def onSelectAll(sender, sel, item)
         sites = []
-        @scope.each do |site, scope|
+        @cb_sites.each_key do |site|
           @cb_sites[site].setCheck(true)
           @edit_btns[site].enable
         end
@@ -266,6 +266,17 @@ EOF
         #btn.font = @font
         #btn.backColor = FXColor::White
         btn.justify = JUSTIFY_LEFT
+        
+        quickFilterFrame = FXHorizontalFrame.new(self, LAYOUT_FILL_X)
+        FXLabel.new(quickFilterFrame, "Filter:", nil, :opts => LAYOUT_TOP|JUSTIFY_RIGHT)
+        filter_regexp = FXTextField.new(quickFilterFrame, 25, nil, 0, :opts => TEXTFIELD_NORMAL|LAYOUT_FILL_X|LAYOUT_LEFT)
+        filter_btn = FXButton.new(quickFilterFrame, "apply")
+
+        filter_regexp.connect(SEL_COMMAND){ list_sites(filter_regexp.text.strip) }
+        filter_btn.connect(SEL_COMMAND){ list_sites(filter_regexp.text.strip) }
+
+
+                
         quickSelectFrame = FXHorizontalFrame.new(self, LAYOUT_FILL_X)
         @sel_all_btn = FXButton.new(quickSelectFrame, "Select All", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X)
         @sel_all_btn.connect(SEL_COMMAND, method(:onSelectAll))
@@ -275,18 +286,41 @@ EOF
         
         @desel_all_btn = FXButton.new(quickSelectFrame, "Deselect All", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_FILL_X)
         @desel_all_btn.connect(SEL_COMMAND, method(:onDeselectAll)) 
-          frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE, :padding => 0)
+        frame = FXVerticalFrame.new(self, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y|FRAME_GROOVE, :padding => 0)
+        
         sitesArea = FXScrollWindow.new(frame, SCROLLERS_NORMAL|LAYOUT_FILL_X|LAYOUT_FILL_Y)
-        sitesFrame = FXVerticalFrame.new(sitesArea, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
-        puts "list sites"
+        @sitesFrame = FXVerticalFrame.new(sitesArea, :opts => LAYOUT_FILL_X|LAYOUT_FILL_Y, :padding => 0)
+        
+        list_sites
+        
+        updateFrame()
+      end
+      
+      private
+      
+      def list_sites(p='.*')
+        @cb_sites.clear  
+        @edit_btns.clear
+        # clear container
+        @sitesFrame.each_child do |c|
+          @sitesFrame.removeChild c
+        end
+        @sitesFrame.recalc
+        @sitesFrame.update
+        
+        pattern = p
+        pattern = '.*' if p.nil? or p.empty?
+        
         sites = Watobo::Chats.sites()
-        puts sites.length
+        sites.compact!
+        
         sites.sort.each do |site|     
-          puts site    
-          site_frame = FXHorizontalFrame.new(sitesFrame, :opts => LAYOUT_FILL_X)
+          next unless site =~ /#{pattern}/
+          site_frame = FXHorizontalFrame.new(@sitesFrame, :opts => LAYOUT_FILL_X)
           b = FXCheckButton.new(site_frame, site, nil, 0, ICON_BEFORE_TEXT|LAYOUT_SIDE_LEFT)
           eb = FXButton.new(site_frame, "edit..", nil, nil, 0, FRAME_RAISED|FRAME_THICK|LAYOUT_RIGHT)
           @edit_btns[site] = eb
+          site_frame.create if self.parent.created?
           
           b.connect(SEL_COMMAND){
             b.checked? ? @edit_btns[site].enable : @edit_btns[site].disable
@@ -316,11 +350,11 @@ EOF
           }
           
         end
-        updateFrame()
+        @sitesFrame.recalc
+        @sitesFrame.update
       end
       
       
-      
     end #EOC
     #--
   end