fxri 0.3.3 → 0.3.4

data/lib/RiManager.rb

@@ -1,155 +1,160 @@
-require "yaml"
-require 'rdoc/ri/ri_driver'
-require 'pp'
-
-class NameDescriptor
-  CLASS = 0
-  INSTANCE_METHOD = 1
-  CLASS_METHOD = 2
-  def type
-    @method_name ||= false
-    @is_class_method ||= false
-    if @method_name
-      if @is_class_method
-        CLASS_METHOD
-      else
-        INSTANCE_METHOD
-      end
-    else
-      CLASS
-    end
-  end
-
-  def to_s
-    str = ""
-    str << @class_names.join("::")
-    if @method_name && str != ""
-      str << (@is_class_method ? "::" : "#")
-    end
-    str << @method_name if @method_name
-    str
-  end
-end
-
-# This basically is a stripped down version of RiDriver.
-# I cannot use RiDriver directly, because I need to set the driver.
-class RiManager
-  def initialize(display, path = RI::Paths::PATH)
-    @reader = RI::RiReader.new(RI::RiCache.new(RI::Paths::PATH))
-    @display = display
-    @display.reader = @reader
-    # prepare all names
-    @all_names = prepare_all_names
-  end
-
-  def prepare_all_names
-    names = Array.new
-    @reader.all_names.each do |name|
-      begin
-        names.push NameDescriptor.new(name)
-      rescue RiError => e
-        # silently ignore errors
-      end
-    end
-    names
-  end
-
-  def check_names
-    @reader.all_names.each do |name|
-      begin
-        if (NameDescriptor.new(name).to_s != name)
-          p [name, NameDescriptor.new(name).to_s, NameDescriptor.new(name)]
-        end
-      rescue RiError => e
-        puts e
-      end
-    end
-  end
-
-  # Returns all fully names as name descriptors
-  def all_names
-    @all_names
-  end
-
-  # Searches for the description of a name and shows it using +display+.
-  def show(name_descriptor, width)
-    @display.width = width
-    # narrow down namespace
-    namespace = @reader.top_level_namespace
-    name_descriptor.class_names.each do |classname|
-      namespace = @reader.lookup_namespace_in(classname, namespace)
-      if namespace.empty?
-        raise RiError.new("Nothing known about #{name_descriptor}")
-      end
-    end
-
-    # At this point, if we have multiple possible namespaces, but one
-    # is an exact match for our requested class, prune down to just it
-    # PS: this comment is shamlessly stolen from ri_driver.rb
-    entries = namespace.find_all {|m| m.full_name == name_descriptor.full_class_name}
-    namespace = entries if entries.size == 1
-
-    if name_descriptor.method_name
-      methods = @reader.find_methods(name_descriptor.method_name, name_descriptor.is_class_method, namespace)
-      report_method_stuff(name_descriptor.method_name, methods)
-    else
-      report_class_stuff(namespace)
-    end
-  end
-
-  def report_class_stuff(namespace)
-    raise RiError.new("namespace") unless namespace.size==1
-    @display.display_class_info @reader.get_class(namespace[0])
-  end
-
-  def report_method_stuff(requested_method_name, methods)
-    if methods.size == 1
-      method = @reader.get_method(methods[0])
-      @display.display_method_info(method)
-    else
-      entries = methods.find_all {|m| m.name == requested_method_name}
-      if entries.size == 1
-        method = @reader.get_method(entries[0])
-        @display.display_method_info(method)
-      else
-        puts methods.map {|m| m.full_name}.join(", ")
-      end
-    end
-=begin
-
-    method = if (methods.size == 1)
-      @reader.get_method(methods[0])
-    else
-      entries = methods.find_all {|m| m.name == requested_method_name}
-      entries.size
-      # there really should be just *one* method that matches.
-      raise RiError.new("got a strange method") unless entries.size == 1
-      @reader.get_method(entries[0])
-    end
-    @display.display_method_info(method)
-=end
-  end
-end
-
-if __FILE__ == $0
-  display = Displayer.new
-  ri = RiManager.new(display)
-  ri.all_names.each do |name|
-    p [name.type, name.to_s] if name.type==0
-  end
-end
-
-
-=begin
-# iterate through everything
-reader.full_class_names.sort.each do |class_name|
-  classDesc = reader.find_class_by_name(class_name)
-
-  if class_name=="Integer"
-    pp classDesc.instance_methods
-    puts classDesc.to_yaml
-    #puts classDesc.methods
-    gets
-  end
-end
+require "yaml"
+require 'rdoc/ri/ri_driver'
+require 'pp'
+
+class NameDescriptor
+  CLASS = 0
+  INSTANCE_METHOD = 1
+  CLASS_METHOD = 2
+  def type
+    @method_name ||= false
+    @is_class_method ||= false
+    if @method_name
+      if @is_class_method
+        CLASS_METHOD
+      else
+        INSTANCE_METHOD
+      end
+    else
+      CLASS
+    end
+  end
+
+  def to_s
+    str = ""
+    str << @class_names.join("::")
+    if @method_name && str != ""
+      str << (@is_class_method ? "::" : "#")
+    end
+    str << @method_name if @method_name
+    str
+  end
+end
+
+# This basically is a stripped down version of RiDriver.
+# I cannot use RiDriver directly, because I need to set the driver.
+class RiManager
+  def initialize(display, path = RI::Paths::PATH)
+    # See if search_paths exists, if so, append it to path
+    begin 
+      path << $cfg.search_paths.split(';')
+    rescue
+    end
+    @reader = RI::RiReader.new(RI::RiCache.new(path))
+    @display = display
+    @display.reader = @reader
+    # prepare all names
+    @all_names = prepare_all_names
+  end
+
+  def prepare_all_names
+    names = Array.new
+    @reader.all_names.each do |name|
+      begin
+        names.push NameDescriptor.new(name)
+      rescue RiError => e
+        # silently ignore errors
+      end
+    end
+    names
+  end
+
+  def check_names
+    @reader.all_names.each do |name|
+      begin
+        if (NameDescriptor.new(name).to_s != name)
+          p [name, NameDescriptor.new(name).to_s, NameDescriptor.new(name)]
+        end
+      rescue RiError => e
+        puts e
+      end
+    end
+  end
+
+  # Returns all fully names as name descriptors
+  def all_names
+    @all_names
+  end
+
+  # Searches for the description of a name and shows it using +display+.
+  def show(name_descriptor, width)
+    @display.width = width
+    # narrow down namespace
+    namespace = @reader.top_level_namespace
+    name_descriptor.class_names.each do |classname|
+      namespace = @reader.lookup_namespace_in(classname, namespace)
+      if namespace.empty?
+        raise RiError.new("Nothing known about #{name_descriptor}")
+      end
+    end
+
+    # At this point, if we have multiple possible namespaces, but one
+    # is an exact match for our requested class, prune down to just it
+    # PS: this comment is shamlessly stolen from ri_driver.rb
+    entries = namespace.find_all {|m| m.full_name == name_descriptor.full_class_name}
+    namespace = entries if entries.size == 1
+
+    if name_descriptor.method_name
+      methods = @reader.find_methods(name_descriptor.method_name, name_descriptor.is_class_method, namespace)
+      report_method_stuff(name_descriptor.method_name, methods)
+    else
+      report_class_stuff(namespace)
+    end
+  end
+
+  def report_class_stuff(namespace)
+    raise RiError.new("namespace") unless namespace.size==1
+    @display.display_class_info @reader.get_class(namespace[0])
+  end
+
+  def report_method_stuff(requested_method_name, methods)
+    if methods.size == 1
+      method = @reader.get_method(methods[0])
+      @display.display_method_info(method)
+    else
+      entries = methods.find_all {|m| m.name == requested_method_name}
+      if entries.size == 1
+        method = @reader.get_method(entries[0])
+        @display.display_method_info(method)
+      else
+        puts methods.map {|m| m.full_name}.join(", ")
+      end
+    end
+=begin
+
+    method = if (methods.size == 1)
+      @reader.get_method(methods[0])
+    else
+      entries = methods.find_all {|m| m.name == requested_method_name}
+      entries.size
+      # there really should be just *one* method that matches.
+      raise RiError.new("got a strange method") unless entries.size == 1
+      @reader.get_method(entries[0])
+    end
+    @display.display_method_info(method)
+=end
+  end
+end
+
+if __FILE__ == $0
+  display = Displayer.new
+  ri = RiManager.new(display)
+  ri.all_names.each do |name|
+    p [name.type, name.to_s] if name.type==0
+  end
+end
+
+
+=begin
+# iterate through everything
+reader.full_class_names.sort.each do |class_name|
+  classDesc = reader.find_class_by_name(class_name)
+
+  if class_name=="Integer"
+    pp classDesc.instance_methods
+    puts classDesc.to_yaml
+    #puts classDesc.methods
+    gets
+  end
+end
 =end

data/lib/Search_Engine.rb

@@ -1,165 +1,165 @@
-# Copyright (c) 2005 Martin Ankerl
-class Search_Engine
-  def initialize(gui, data)
-    @gui = gui
-    @data = data
-    @search_thread = nil
-  end
-
-  # Executed whenever a search criteria changes to update the packet list.
-  def on_search
-    # restart current search
-    @end_time = Time.now + $cfg.search_delay
-    @restart_search = true
-    @gui.search_label.enabled = false
-    return if @search_thread && @search_thread.status
-
-    @search_thread = Thread.new(@search_thread) do
-      begin
-        @gui.search_label.enabled = false
-        # wait untill deadline
-        while (t = (@end_time - Time.now)) > 0
-          sleep(t)
-        end
-
-        @data.gui_mutex.synchronize do
-          # the thread has to use the gui mutex inside
-          @restart_search = false
-
-          match_data = get_match_data
-
-          # remove all items
-          @gui.packet_list.dirty_clear
-
-          # add all items that match the search criteria
-          status_text_deadline = Time.now + $cfg.status_line_update_interval
-          @data.items.each do |item|
-            #item.parent = @gui.packet_list if match?(item, match_data)
-            if match?(item, match_data)
-              item.show
-              now = Time.now
-              if now > status_text_deadline
-                update_search_status_text
-                status_text_deadline = now + $cfg.status_line_update_interval
-              end
-            end
-            break if @restart_search
-          end
-          update_search_status_text
-
-          if (@gui.packet_list.numItems > 0)
-            @gui.packet_list.setCurrentItem(0)
-            @gui.packet_list.selectItem(0)
-            @gui.main.show_info(@gui.packet_list.getItem(0).packet_item.data)
-          end
-          @gui.search_label.enabled = true
-
-        end # synchronize
-      end while @restart_search# || match_data != @gui.search_field.text.downcase.split
-    end #thread.new
-  end
-
-  def get_match_data
-    str_to_match_data(@gui.search_field.text)
-  end
-
-  # Converts a string into a match_data representation.
-  def str_to_match_data(str, index=0)
-    words = [ ]
-    exclude = [ ]
-    is_exclude = false
-
-    while str[index]
-      case str[index]
-      when ?", ?'
-        word, index = get_word(str, index+1, str[index])
-        unless word.empty?
-          if is_exclude
-            exclude.push word
-            is_exclude = false
-          else
-            words.push word
-          end
-        end
-
-      when 32 # space
-        is_exclude = false
-
-=begin
-      when ?>
-        min, index = get_word(str, index+1)
-        min = @gui.logic.size_to_nr(min)
-
-      when ?<
-        max, index = get_word(str, index+1)
-        max = @gui.logic.size_to_nr(max)
-=end
-      when ?-
-        is_exclude = true
-
-      else
-        word, index = get_word(str, index)
-        if is_exclude
-          exclude.push word
-          is_exclude = false
-        else
-          words.push word
-        end
-      end
-
-      index += 1
-    end
-
-    # check if word has upcase letters
-    words.collect! do |w|
-      [w, /[A-Z]/.match(w)!=nil]
-    end
-    exclude.collect! do |w|
-      [w, /[A-Z]/.match(w)!=nil]
-    end
-    [words, exclude]
-  end
-
-  def get_word(str, index, delim=32) # 32==space
-    word = ""
-    c = str[index]
-    while (c && c != delim)
-      word += c.chr
-      index += 1
-      c = str[index]
-    end
-    [word, index]
-  end
-
-  # Update the text for the number of displayed packs.
-  def update_search_status_text
-    @gui.search_label.text = sprintf($cfg.text.search, @gui.packet_list.numItems, @data.items.size)
-  end
-
-  # Find out if item is matched by current search criteria.
-  def match?(item, match_data)
-    words, exclude, min, max = match_data
-
-    # check text that has to be there
-    searchable, sortable_downcase, sortable_normal = item.sortable(0)
-    words.each do |match_str, is_sensitive|
-      if is_sensitive
-        return false unless sortable_normal.include?(match_str)
-      else
-        return false unless sortable_downcase.include?(match_str)
-      end
-    end
-
-    # check text not allowed to be there
-    exclude.each do |match_str, is_sensitive|
-      if is_sensitive
-        return false if sortable_normal.include?(match_str)
-      else
-        return false if sortable_downcase.include?(match_str)
-      end
-    end
-
-    # each check ok
-    true
-  end
-end
+# Copyright (c) 2005 Martin Ankerl
+class Search_Engine
+  def initialize(gui, data)
+    @gui = gui
+    @data = data
+    @search_thread = nil
+  end
+
+  # Executed whenever a search criteria changes to update the packet list.
+  def on_search
+    # restart current search
+    @end_time = Time.now + $cfg.search_delay
+    @restart_search = true
+    @gui.search_label.enabled = false
+    return if @search_thread && @search_thread.status
+
+    @search_thread = Thread.new(@search_thread) do
+      begin
+        @gui.search_label.enabled = false
+        # wait untill deadline
+        while (t = (@end_time - Time.now)) > 0
+          sleep(t)
+        end
+
+        @data.gui_mutex.synchronize do
+          # the thread has to use the gui mutex inside
+          @restart_search = false
+
+          match_data = get_match_data
+
+          # remove all items
+          @gui.packet_list.dirty_clear
+
+          # add all items that match the search criteria
+          status_text_deadline = Time.now + $cfg.status_line_update_interval
+          @data.items.each do |item|
+            #item.parent = @gui.packet_list if match?(item, match_data)
+            if match?(item, match_data)
+              item.show
+              now = Time.now
+              if now > status_text_deadline
+                update_search_status_text
+                status_text_deadline = now + $cfg.status_line_update_interval
+              end
+            end
+            break if @restart_search
+          end
+          update_search_status_text
+
+          if (@gui.packet_list.numItems > 0)
+            @gui.packet_list.setCurrentItem(0)
+            @gui.packet_list.selectItem(0)
+            @gui.main.show_info(@gui.packet_list.getItem(0).packet_item.data)
+          end
+          @gui.search_label.enabled = true
+
+        end # synchronize
+      end while @restart_search# || match_data != @gui.search_field.text.downcase.split
+    end #thread.new
+  end
+
+  def get_match_data
+    str_to_match_data(@gui.search_field.text)
+  end
+
+  # Converts a string into a match_data representation.
+  def str_to_match_data(str, index=0)
+    words = [ ]
+    exclude = [ ]
+    is_exclude = false
+
+    while str[index]
+      case str[index]
+      when ?", ?'
+        word, index = get_word(str, index+1, str[index])
+        unless word.empty?
+          if is_exclude
+            exclude.push word
+            is_exclude = false
+          else
+            words.push word
+          end
+        end
+
+      when 32 # space
+        is_exclude = false
+
+=begin
+      when ?>
+        min, index = get_word(str, index+1)
+        min = @gui.logic.size_to_nr(min)
+
+      when ?<
+        max, index = get_word(str, index+1)
+        max = @gui.logic.size_to_nr(max)
+=end
+      when ?-
+        is_exclude = true
+
+      else
+        word, index = get_word(str, index)
+        if is_exclude
+          exclude.push word
+          is_exclude = false
+        else
+          words.push word
+        end
+      end
+
+      index += 1
+    end
+
+    # check if word has upcase letters
+    words.collect! do |w|
+      [w, /[A-Z]/.match(w)!=nil]
+    end
+    exclude.collect! do |w|
+      [w, /[A-Z]/.match(w)!=nil]
+    end
+    [words, exclude]
+  end
+
+  def get_word(str, index, delim=32) # 32==space
+    word = ""
+    c = str[index]
+    while (c && c != delim)
+      word += c.chr
+      index += 1
+      c = str[index]
+    end
+    [word, index]
+  end
+
+  # Update the text for the number of displayed packs.
+  def update_search_status_text
+    @gui.search_label.text = sprintf($cfg.text.search, @gui.packet_list.numItems, @data.items.size)
+  end
+
+  # Find out if item is matched by current search criteria.
+  def match?(item, match_data)
+    words, exclude, min, max = match_data
+
+    # check text that has to be there
+    searchable, sortable_downcase, sortable_normal = item.sortable(0)
+    words.each do |match_str, is_sensitive|
+      if is_sensitive
+        return false unless sortable_normal.include?(match_str)
+      else
+        return false unless sortable_downcase.include?(match_str)
+      end
+    end
+
+    # check text not allowed to be there
+    exclude.each do |match_str, is_sensitive|
+      if is_sensitive
+        return false if sortable_normal.include?(match_str)
+      else
+        return false if sortable_downcase.include?(match_str)
+      end
+    end
+
+    # each check ok
+    true
+  end
+end