watobo 0.9.19 → 0.9.20

data/lib/watobo/gui/status_bar.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # status_bar.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
-# .
+#.
+# Copyright 2014 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

data/lib/watobo/gui/table_editor.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # table_editor.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
-# .
+#.
+# Copyright 2014 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
@@ -51,15 +39,15 @@ module Watobo#:nodoc: all
 
         #  puts "create scopeframe with scope:"
         # @project.scope
-        FXLabel.new(frame, "Method:")
+        FXLabel.new(frame, "Location:")
         @location_combo = FXComboBox.new(frame, 5, nil, 0,
             COMBOBOX_STATIC|FRAME_SUNKEN|FRAME_THICK|LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
-        %w( Post Url Cookie ).each do |loc|
+        %w( WWWForm URL Cookie JSON ).each do |loc|
           item = @location_combo.appendItem(loc)
           @location_combo.setItemData(item, loc)
         end
 
-        @location_combo.numVisible = 3
+        @location_combo.numVisible = 4
         @location_combo.numColumns = 8
         @location_combo.currentItem = 0
         @location_combo.editable = false
@@ -98,12 +86,14 @@ module Watobo#:nodoc: all
       
       def create_param
         @param = case @location_combo.getItemData(@location_combo.currentItem)
-        when /Post/i
+        when /(Post|WWWForm)/i
          Watobo::WWWFormParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
          when /Url/i
            Watobo::UrlParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
          when /Cookie/i
            Watobo::CookieParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
+          when /JSON/i
+           Watobo::JSONParameter.new(:name => @parm_name_dt.value, :value => @parm_value_dt.value)
          else
            nil
          end
@@ -116,8 +106,26 @@ module Watobo#:nodoc: all
       def rawRequest
         parseRequest
       end
+      
+      def exportToClipboard
+        entries = []
+        self.numRows.times do |i|
+          entry = []
+          entry << self.getItemText(i, 1)
+          entry << self.getItemText(i, 0)
+          
+          entry << self.getItemText(i, 2).unpack("C*").pack("C*").strip 
+          entries << entry.join("|")
+        end
+        
+        types = [ FXWindow.stringType ]
+        if acquireClipboard(types)
+          @clipboard_text = entries.join("\n")
+        end        
+      end
 
       def parseRequest
+        return '' if @request.nil?
         request = @request.copy
         
         self.numRows.times do |i|
@@ -133,10 +141,11 @@ module Watobo#:nodoc: all
 
       def setRequest(request)
         initTable()
-        return false if request.empty?
+        @request = nil
+        return true if request.empty?
         @request = request.copy
 
-        return false if @request.content_type =~ /(multipart|json)/
+        #return false if @request.content_type =~ /(multipart|json)/
 
         
         @request = Watobo::Utils.text2request(request) if request.is_a? String
@@ -165,6 +174,12 @@ module Watobo#:nodoc: all
         @ctrl_pressed = false
 
         addKeyHandler(self)
+        
+        @clipboard_text = ""
+        self.connect(SEL_CLIPBOARD_REQUEST) do
+        # setDNDData(FROM_CLIPBOARD, FXWindow.stringType, Fox.fxencodeStringData(@clipboard_text))
+          setDNDData(FROM_CLIPBOARD, FXWindow.stringType, @clipboard_text + "\x00" )
+        end
 
         self.connect(SEL_DOUBLECLICKED) do |sender, sel, data|
           row = sender.getCurrentRow
@@ -232,6 +247,12 @@ module Watobo#:nodoc: all
                 encodeURL.connect(SEL_COMMAND) {
                   self.setItemText(row, 2, cell_value.url_encode)
                 }
+                
+                 FXMenuSeparator.new(menu_pane)
+                remRow = FXMenuCommand.new(menu_pane,"to Clipboard")
+                remRow.connect(SEL_COMMAND) {
+                  exportToClipboard
+                }
 
                 FXMenuSeparator.new(menu_pane)
                 remRow = FXMenuCommand.new(menu_pane,"Remove: #{parm_name}")
@@ -266,11 +287,16 @@ module Watobo#:nodoc: all
           self.appendRows(1)
           self.setItemText(lastRowIndex, 0, parm.location.to_s)
           self.setItemData(lastRowIndex, 0, parm)
-          self.setItemText(lastRowIndex, 1, CGI.unescape(parm.name))
+          n = parm.name.nil? ? "" : CGI.unescape(parm.name)
+          self.setItemText(lastRowIndex, 1, n) 
           self.setItemText(lastRowIndex, 2, parm.value)
          
           3.times do |i|
             self.getItem(lastRowIndex, i).justify = FXTableItem::LEFT
+            
+            ct_len = self.getItemText(lastRowIndex, i).length
+            ht_len = self.getColumnText(i).length
+            self.fitColumnsToContents(i) if ct_len > ht_len
           end
       end
 
@@ -380,39 +406,26 @@ module Watobo#:nodoc: all
         end
       end
 
-      def addParmList_UNUSED(parm_origin, parm_list)
-        parm_list.each do |parm|
-          p,v = parm.split("=")
-          lastRowIndex = self.getNumRows
-          self.appendRows(1)
-          self.setItemText(lastRowIndex, 0, parm_origin)
-          self.setItemText(lastRowIndex, 1, CGI.unescape(p))
-          self.setItemText(lastRowIndex, 2, v)
-         
-          3.times do |i|
-            self.getItem(lastRowIndex, i).justify = FXTableItem::LEFT
-          end
-        end
-
-      end
-
+      
       def initTable
+        cws = []
+        self.numColumns.times do |i|
+          cws << self.getColumnWidth(i)
+        end
+        
         self.clearItems()
         self.setTableSize(0, 3)
 
         self.setColumnText( 0, "Location" )
         self.setColumnText( 1, "Parm" )
         self.setColumnText( 2, "Value" )
-        #self.setColumnText( 3, "Pinned" )
-        #self.setColumnText( 4, "Ignore" )
-
+      
         self.rowHeader.width = 0
-        self.setColumnWidth(0, 60)
-
-        self.setColumnWidth(1, 80)
-        self.setColumnWidth(2, 120)
-      #self.setColumnWidth(3, 60)
-      #self.setColumnWidth(4, 60)
+              
+        cws.each_with_index do |w, i|
+          self.setColumnWidth(i, w)
+        end
+      
       end
 
     end
@@ -421,6 +434,11 @@ module Watobo#:nodoc: all
       def subscribe(event, &callback)
         @editor.subscribe event, &callback
       end
+      
+      def clear
+        @editor.setRequest ''
+        @req_line.text = ''
+      end
 
       def setRequest(raw_request)
         if raw_request.is_a? String
@@ -431,9 +449,14 @@ module Watobo#:nodoc: all
           request = Watobo::Request.new raw_request
         end
        
-
+        begin
         @editor.setRequest request
         @req_line.text = request.first.strip unless request.empty?
+        return true
+        rescue => bang
+          puts bang
+        end
+        false
 
       end
       

data/lib/watobo/gui/tagless_viewer.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # tagless_viewer.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
-# .
+#.
+# Copyright 2014 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
+
 require 'watobo/gui/request_editor'
 # @private 
 module Watobo#:nodoc: all
@@ -43,7 +31,8 @@ module Watobo#:nodoc: all
         # remove all inbetween tags
         normalized.gsub!(/<.*?>/m, '')
         # remove non printable characters, except LF (\x0a)
-        normalized.gsub!(/[\x00-\x09\x0b-\x1f\x7f-\xff]+/m,'')
+         r = Regexp.new '[\x00-\x09\x0b-\x1f\x7f-\xff]+', nil, 'n'
+        normalized.gsub!( r,'')
         # remove empty lines
         normalized.gsub!(/((\x20+)?\x0a(\x20+)?)+/,"\n")
        # decode html entities for better readability

data/lib/watobo/gui/templates/plugin.rb

@@ -1,24 +1,12 @@
-# .
+#.
 # plugin.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
-# .
+#.
+# Copyright 2014 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 Template

data/lib/watobo/gui/templates/plugin2.rb

@@ -1,113 +1,101 @@
-# .
+#.
 # plugin2.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
-  class Plugin2 < FXDialogBox
-    attr :plugin_name
-    # attr :icon
-
-    include Watobo::Gui
-    include Watobo::Gui::Icons
-
-    @icon_file = nil
-    def self.get_icon
-      @icon_file
-    end
-
-    def self.icon_file(icon_file)
-      # puts "Caller >> #{caller.class}"
-      # puts caller.to_yaml
-
-      dummy = caller.first.split(":")
-      dummy.pop
-      file = dummy.join(":")
-
-      @icon_file = File.join(File.dirname(file), "..","icons", icon_file)
-    end
-
-    def load_icon
-      icon = self.class.get_icon
-     # puts "* loading icon > #{icon}"
-      self.icon = Watobo::Gui.load_icon(icon) unless icon.nil?
-    end
-
-    def subscribe(event, &callback)
-      (@event_dispatcher_listeners[event] ||= []) << callback
-    end
-
-    def clearEvents(event)
-      @event_dispatcher_listener[event].clear
-    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
-
-    def updateView()
-      raise "!!! updateView not defined"
-    end
+#.
+# Copyright 2014 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
 
-    def logger(msg)
-      t = Time.now
-      now = t.strftime("%m/%d/%Y @ %H:%M:%S")
-
-      @update_lock.synchronize do
-        text = "\n#{now}: msg"
-        @log_messages << text
-      end
-    end
-
-    def initialize(owner, title, project, opts)
-      super(owner, title, :opts => DECOR_ALL,:width=>800, :height=>600)
-
-      @icon = nil
-      load_icon()
-      @plugin_name = "undefined"
-      @event_dispatcher_listeners = Hash.new
-      @update_lock = Mutex.new
-
-      @log_messages = []
-
-      add_update_timer(50)
-
-    end
-
-    private
-
-    def on_update_timer
-
-    end
-
-    def add_update_timer(ms)
-      @update_timer = FXApp.instance.addTimeout( ms, :repeat => true) {
-        @update_lock.synchronize do
-          on_update_timer()
-        end
-      }
-    end
-    
-  end
-end
+# @private 
+module Watobo#:nodoc: all
+  class Plugin2 < FXDialogBox
+    attr :plugin_name
+    # attr :icon
+
+    include Watobo::Gui
+    include Watobo::Gui::Icons
+
+    @icon_file = nil
+    def self.get_icon
+      @icon_file
+    end
+
+    def self.icon_file(icon_file)
+      # puts "Caller >> #{caller.class}"
+      # puts caller.to_yaml
+
+      dummy = caller.first.split(":")
+      dummy.pop
+      file = dummy.join(":")
+
+      @icon_file = File.join(File.dirname(file), "..","icons", icon_file)
+    end
+
+    def load_icon
+      icon = self.class.get_icon
+     # puts "* loading icon > #{icon}"
+      self.icon = Watobo::Gui.load_icon(icon) unless icon.nil?
+    end
+
+    def subscribe(event, &callback)
+      (@event_dispatcher_listeners[event] ||= []) << callback
+    end
+
+    def clearEvents(event)
+      @event_dispatcher_listener[event].clear
+    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
+
+    def updateView()
+      raise "!!! updateView not defined"
+    end
+
+    def logger(msg)
+      t = Time.now
+      now = t.strftime("%m/%d/%Y @ %H:%M:%S")
+
+      @update_lock.synchronize do
+        text = "\n#{now}: msg"
+        @log_messages << text
+      end
+    end
+
+    def initialize(owner, title, project, opts)
+      super(owner, title, :opts => DECOR_ALL,:width=>800, :height=>600)
+
+      @icon = nil
+      load_icon()
+      @plugin_name = "undefined"
+      @event_dispatcher_listeners = Hash.new
+      @update_lock = Mutex.new
+
+      @log_messages = []
+
+      add_update_timer(50)
+
+    end
+
+    private
+
+    def on_update_timer
+
+    end
+
+    def add_update_timer(ms)
+      @update_timer = FXApp.instance.addTimeout( ms, :repeat => true) {
+        @update_lock.synchronize do
+          on_update_timer()
+        end
+      }
+    end
+    
+  end
+end