drx 0.3.2 → 0.4.0

data/examples/{drx_test3.rb → drx_guitar.rb}

@@ -1,7 +1,6 @@
 #!/usr/bin/ruby
 
 require 'rubygems'
-
 require 'drx'
 
 class Instrument
@@ -11,23 +10,16 @@ end
 class Guitar < Instrument
   def initialize
     @strings = 5
-#    puts class # .add_some
   end
 
   def self.add_some
     @max_strings = 10
-    @@approved = 'by obama team'
+    @@approved = 'by team obama'
   end
 end
 
-require 'dm-core'
-class Post
-  include DataMapper::Resource
-  property :id, Serial
-end
-
+Guitar.add_some
 o = Guitar.new
-o = Post.new
 def o.unq
   def g;end
 end

data/ext/drx_core.c

@@ -1,14 +1,5 @@
 #include "ruby.h"
-
-#ifndef RUBY_VM
-# define RUBY_1_8
-#endif
-
-#ifdef RUBY_1_8
-# include "st.h"
-#else
-# include "ruby/st.h"
-#endif
+#include "st.h"
 
 /**
  * Gets the Ruby's engine type of a variable.
@@ -19,9 +10,11 @@ static VALUE t_get_type(VALUE self, VALUE obj)
 }
 
 // Helper for t_get_iv_tbl().
-static int record_var(st_data_t key, st_data_t value, VALUE hash) {
-  // We don't put the 'value' in the hash because it may not be a Ruby
-  // conventional value but a NODE (and acidentally printing it may crash ruby).
+int record_var(st_data_t key, st_data_t value, VALUE hash) {
+  // I originally did the following, but it breaks for object::Tk*. Perhaps these
+  // values are T_NODEs? (e.g. aliases) @todo: debug using INT2FIX(TYPE(value)).
+  rb_hash_aset(hash, ID2SYM(key), value);
+  // So...
   rb_hash_aset(hash, ID2SYM(key), Qtrue);
   return ST_CONTINUE;
 }
@@ -38,13 +31,9 @@ static VALUE t_get_iv_tbl(VALUE self, VALUE obj)
     rb_raise(rb_eTypeError, "Only T_OBJECT/T_CLASS/T_MODULE is expected as the argument (got %d)", TYPE(obj));
   }
 
-#ifdef RUBY_1_8
   if (ROBJECT(obj)->iv_tbl) {
     st_foreach(ROBJECT(obj)->iv_tbl, record_var, (st_data_t)hash);
   }
-#else
-  rb_ivar_foreach(obj, record_var, hash);
-#endif
 
   return hash;
 }
@@ -69,10 +58,11 @@ static VALUE t_get_ivar(VALUE self, VALUE obj, VALUE var_name)
  */
 static VALUE t_get_super(VALUE self, VALUE obj)
 {
+  VALUE super;
   if (TYPE(obj) != T_CLASS && TYPE(obj) != T_ICLASS && TYPE(obj) != T_MODULE) {
     rb_raise(rb_eTypeError, "Only T_CLASS/T_MODULE is expected as the argument (got %d)", TYPE(obj));
   }
-  return RCLASS_SUPER(obj) ? RCLASS_SUPER(obj) : Qnil;
+  return RCLASS(obj)->super ? RCLASS(obj)->super : Qnil;
 }
 
 /**
@@ -95,13 +85,9 @@ static VALUE t_get_flags(VALUE self, VALUE obj)
 }
 
 // Helper for t_get_m_tbl().
-// @todo: Store something useful in the values?
-static int record_method(st_data_t key, st_data_t value, VALUE hash) {
-  static ID id_allocator_symb = 0;
-  if (!id_allocator_symb) {
-    id_allocator_symb = rb_intern("<Allocator>");
-  }
-  rb_hash_aset(hash, ID2SYM(key == ID_ALLOCATOR ? id_allocator_symb : key), Qtrue);
+int record_method(st_data_t key, st_data_t value, VALUE hash) {
+  // @todo: Store something useful in the values?
+  rb_hash_aset(hash, key == ID_ALLOCATOR ? rb_str_new2("<Allocator>") : ID2SYM(key), INT2FIX(666));
   return ST_CONTINUE;
 }
 
@@ -132,7 +118,6 @@ static VALUE t_get_address(VALUE self, VALUE obj)
   return INT2NUM(obj);
 }
 
-#ifdef RUBY_1_8
 // {{{ Locating methods
 
 #include "node.h"
@@ -141,7 +126,7 @@ static VALUE t_get_address(VALUE self, VALUE obj)
 
 static VALUE t_do_locate_method(NODE *ND_method) {
   NODE *ND_scope = NULL, *ND_block = NULL;
-  VALUE location;
+  VALUE place;
   char line_s[20];
 
   //
@@ -210,24 +195,23 @@ static VALUE t_do_locate_method(NODE *ND_method) {
     return RSTR("<I'm expecting a NODE_BLOCK here...>");
   }
 
-  location = rb_ary_new();
-  rb_ary_push(location, RSTR(ND_block->nd_file));
-  rb_ary_push(location, INT2FIX(nd_line(ND_block)));
+  sprintf(line_s, "%d:", nd_line(ND_block));
+  place = RSTR(line_s);
+  rb_str_cat2(place, ND_block->nd_file);
 
-  return location;
+  return place;
 }
 
 /*
  *  call-seq:
- *     Drx::Core::locate_method(Date, "to_s")  => ...
+ *     Drx::Core::locate_method(Date, "to_s")  => str
  *
- *  Locates the filename and line-number where a method was defined.
+ *  Locates the filename and line-number where a method was defined. Returns a
+ *  string of the form "89:/path/to/file.rb", or nil if the method doesn't exist,
+ *  or a string of the form "<identifier>".
  *
- *  Returns one of:
- *   - [ "/path/to/file.rb", 89 ]
- *   - A string of the form "<identifier>" if the method isn't written
- *     in Ruby. Possibilities are <c>, <alias>, <attr reader>, and more.
- *   - raises NameError if the method doesn't exist.
+ *  If the method exists but isn't a Ruby method (e.g., if it's written in C),
+ *  an <identifier> string is returned. E.g., <c>, <alias>, <attr reader>.
  */
 static VALUE t_locate_method(VALUE self, VALUE obj, VALUE method_name)
 {
@@ -237,17 +221,19 @@ static VALUE t_locate_method(VALUE self, VALUE obj, VALUE method_name)
   if (TYPE(obj) != T_CLASS && TYPE(obj) != T_ICLASS && TYPE(obj) != T_MODULE) {
     rb_raise(rb_eTypeError, "Only T_CLASS/T_MODULE is expected as the argument (got %d)", TYPE(obj));
   }
+  if (!RCLASS(obj)->m_tbl) {
+    return Qnil;
+  }
   c_name = StringValuePtr(method_name);
   ID id = rb_intern(c_name);
-  if (RCLASS(obj)->m_tbl && st_lookup(RCLASS(obj)->m_tbl, id, (st_data_t *)&method_node))  {
+  if (st_lookup(RCLASS(obj)->m_tbl, id, (st_data_t *)&method_node))  {
     return t_do_locate_method(method_node);
   } else {
-    rb_raise(rb_eNameError, "method not found");
+    return Qnil;
   }
 }
 
 // }}}
-#endif // RUBY_1_8
 
 VALUE mDrx;
 VALUE mCore;
@@ -263,19 +249,18 @@ void Init_drx_core() {
   rb_define_module_function(mCore, "get_address", t_get_address, 1);
   rb_define_module_function(mCore, "get_type", t_get_type, 1);
   rb_define_module_function(mCore, "get_ivar", t_get_ivar, 2);
-#ifdef RUBY_1_8
   rb_define_module_function(mCore, "locate_method", t_locate_method, 2);
+  rb_define_const(mCore, "FL_SINGLETON", INT2FIX(FL_SINGLETON));
+  rb_define_const(mCore, "T_OBJECT", INT2FIX(T_OBJECT));
+  rb_define_const(mCore, "T_CLASS", INT2FIX(T_CLASS));
+  rb_define_const(mCore, "T_ICLASS", INT2FIX(T_ICLASS));
+  rb_define_const(mCore, "T_MODULE", INT2FIX(T_MODULE));
+
   // For the following, see explanation in t_do_locate_method().
   rb_eval_string("\
     class ::Proc;\
       def _location;\
-        if to_s =~ /@(.*?):(\\d+)>$/ then [$1, $2.to_i] end;\
+        if to_s =~ /@(.*?):(\\d+)>$/ then \"#$2:#$1\" end;\
       end;\
     end");
-#endif
-  rb_define_const(mCore, "FL_SINGLETON", INT2FIX(FL_SINGLETON));
-  rb_define_const(mCore, "T_OBJECT", INT2FIX(T_OBJECT));
-  rb_define_const(mCore, "T_CLASS", INT2FIX(T_CLASS));
-  rb_define_const(mCore, "T_ICLASS", INT2FIX(T_ICLASS));
-  rb_define_const(mCore, "T_MODULE", INT2FIX(T_MODULE));
 }

data/lib/drx/graphviz.rb

@@ -1,4 +1,4 @@
-# Adds Graphviz diagramming capability to ObjInfo
+# Adds Graphviz diagraming capability to ObjInfo
 
 module Drx
 
@@ -38,19 +38,16 @@ module Drx
     # Create an ID for the DOT node representing this object.
     def dot_id
        ('o' + address.to_s).sub('-', '_')
-       # Tip: when examining the DOT output you may wish to
-       # uncomment the following line. It will show you which
-       # ruby object the DOT node represents.
-       #('o' + address.to_s).sub('-', '_') + " /* #{repr} */ "
     end
 
     # Creates a pseudo URL for the HTML imagemap.
     def dot_url
-      "http://ruby/object/#{dot_id}"
+      "http://server/obj/#{dot_id}"
     end
 
     # Quotes a string to be used in DOT source.
     def dot_quote(s)
+      # @todo: find the documentation for tr()?
       '"' + s.gsub('\\') { '\\\\' }.gsub('"', '\\"').gsub("\n", '\\n') + '"'
     end
 
@@ -114,26 +111,18 @@ module Drx
       end
     end
 
-    # Builds the DOT source for the diagram. if you're only interested
-    # in the output image, use generate_diagram() instead.
-    def dot_source(opts = {}, &block) # :yield:
-      opts = opts.dup
-      opts[:base] = self
-      @@seen = {}
-
-      out = 'digraph {' "\n"
-      out << @@sizes[opts[:size] || '100%']
-      out << dot_fragment(opts, &block)
-      out << '}' "\n"
-      out
-    end
-
-    def dot_fragment(opts = {}, &block) # :yield:
+    def dot_source(level = 0, opts = {}, &block) # :yield:
       out = ''
-      # Note: since 'obj' may be a T_ICLASS, it doesn't respond to many methods,
+      # Note: since 'obj' may be a T_ICLASS, it doesn't repond to many methods,
       # including is_a?. So when we're querying things we're using Drx calls
       # instead.
 
+      if level.zero?
+        out << 'digraph {' "\n"
+        out << @@sizes[opts[:size] || '100%']
+        @@seen = {}
+      end
+
       seen = @@seen[address]
       @@seen[address] = true
 
@@ -148,8 +137,8 @@ module Drx
 
       if class_like?
         if spr = self.super and display_super?(spr)
-          out << spr.dot_fragment(opts, &block)
-          if insignificant_super_arrow?(opts)
+          out << spr.dot_source(level+1, opts, &block)
+          if [Module, ObjInfo.new(Module).klass.the_object].include? the_object
             # We don't want these relatively insignificant lines to clutter the display,
             # so we paint them lightly and tell DOT they aren't to affect the layout (width=0).
             out << "#{dot_id} -> #{spr.dot_id} [color=gray85, weight=0];" "\n"
@@ -161,38 +150,16 @@ module Drx
 
       kls = effective_klass
       if display_klass?(kls)
-        out << kls.dot_fragment(opts, &block)
-        # Recall that in Ruby there are two main inheritance groups: the class
-        # inheritance and the singleton inheritance.
-        #
-        # When an ICLASS has a singleton, we want this singleton to appear close
-        # to the ICLASS, because we want to keep the two groups visually distinct.
-        # We do this by setting the arrow's weight to 1.0.
-        #
-        # (To see the effect of this, set the weight unconditionally to '0' and
-        # see the graph for DataMapper.)
-        weight = t_iclass? ? 1 : 0
-        out << "#{dot_id} -> #{kls.dot_id} [style=dotted, weight=#{weight}];" "\n"
+        out << kls.dot_source(level+1, opts, &block)
+        out << "#{dot_id} -> #{kls.dot_id} [style=dotted];" "\n"
         out << "{ rank=same; #{dot_id}; #{kls.dot_id}; }" "\n"
       end
 
-      out
-    end
-
-    # Whether the 'super' arrow is infignificant and must not affect the DOT
-    # layout
-    #
-    # A Ruby object graph is cyclic. We don't want to feed DOT a cyclic graph
-    # because it will ruin our nice "rectangular" layout. The purpose of the
-    # following method is to break the cycle. Normally we break the cycle at
-    # Module (and its singleton). When the user is examining a module, we
-    # instead break the cycle at Class (and its singleton).
-    def insignificant_super_arrow?(opts)
-      if opts[:base].t_module?
-        [Class, ObjInfo.new(Class).klass.the_object].include? the_object
-      else
-        [Module, ObjInfo.new(Module).klass.the_object].include? the_object
+      if level.zero?
+        out << '}' "\n"
       end
+
+      return out
     end
 
     # Whether to display the klass.
@@ -200,12 +167,12 @@ module Drx
       if t_iclass?
         # We're interested in an ICLASS's klass only if it isn't Module.
         #
-        # Usually this means that the ICLASS has a singleton (see "Singletons
+        # Usualy this means that the ICLASS has a singleton (see "Singletons
         # of included modules" in display_super?()). We want to see this
         # singleton.
         return Module != kls.the_object
       else
-        # Displaying a singleton's klass is confusing and usually unneeded.
+        # Displaying a singletone's klass is confusing and usually unneeded.
         return !singleton?
       end
     end
@@ -248,7 +215,7 @@ module Drx
     #   end
     #
     def generate_diagram(files, opts = {}, &block)
-      source = self.dot_source(opts, &block)
+      source = self.dot_source(0, opts, &block)
       File.open(files['dot'], 'w') { |f| f.write(source) }
       command = GRAPHVIZ_COMMAND % [files['dot'], files['gif'], files['map']]
       message = Kernel.`(command)  # `

data/lib/drx/objinfo.rb

@@ -35,29 +35,8 @@ module Drx
     end
 
     # Returns the source-code position where a method is defined.
-    #
-    # Returns one of:
-    #  - [ 'file.rb', 12 ]
-    #  - "<c>", "<undef>", "<alias>", etc., if not a ruby code (for Ruby 1.9,
-    #    returns only "<c>").
-    #  - nil, if functionality not implemented.
-    #  - raises NameError if method not found.
     def locate_method(method_name)
-      if Core.respond_to? :locate_method
-        # Ruby 1.8
-        Core::locate_method(@obj, method_name)
-      elsif Method.method_defined? :source_location
-        # Ruby 1.9
-        location = @obj.instance_method(method_name).source_location
-        if location
-          location
-        else
-          '<c>'
-        end
-      else
-        # Some version of ruby that doesn't have Method#source_loction
-        nil
-      end
+      Core::locate_method(@obj, method_name)
     end
 
     def has_iv_tbl?

data/lib/drx/tk/app.rb

@@ -1,7 +1,8 @@
 require 'tk'
-#Tk.default_widget_set = :Ttk
 require 'drx/tk/imagemap'
 
+Tk.default_widget_set = :Ttk
+
 module Drx
   module TkGUI
 
@@ -17,6 +18,7 @@ module Drx
       def initialize
         @navigation_history = []
         @eval_history = LineHistory.new
+        @graph_opts = { :size => '100%', :style => 'default' }
 
         @eval_entry = TkEntry.new(toplevel) {
           font 'Courier'
@@ -45,16 +47,45 @@ module Drx
           navigate_back
         }
 
-        @varsbox = TkListbox.new(toplevel) {
-          width 25
+        @varsbox = Tk::Tile::Treeview.new(toplevel) {
+          columns 'name value'
+          heading_configure('name', :text => 'Name')
+          heading_configure('value', :text => 'Value')
+          column_configure('name', :stretch => false )
+          column_configure('value', :stretch => false )
+          show 'headings'
         }
-        @methodsbox = TkListbox.new(toplevel) {
-          width 35
+        @methodsbox = Tk::Tile::Treeview.new(toplevel) {
+          columns 'name location'
+          heading_configure('name', :text => 'Name')
+          heading_configure('location', :text => 'Location')
+          column_configure('name', :stretch => false )
+          column_configure('location', :stretch => false )
+          show 'headings'
+        }
+
+        @graph_size_menu = Tk::Tile::Combobox.new(toplevel) {
+          set '100%'
+          values ['100%', '90%', '80%', '60%']
+          state :readonly
+          width 6
+        }
+        @graph_style_menu = Tk::Tile::Combobox.new(toplevel) {
+          set 'default'
+          values ['default', 'crazy']
+          state :readonly
+          width 10
+        }
+        @save_btn = TkButton.new(toplevel) {
+          text 'Save...'
+        }
+        @save_btn.command {
+          save_graph tip
         }
 
         layout
 
-        @varsbox.bind('<ListboxSelect>') {
+        @varsbox.bind('<TreeviewSelect>') {
           if @varsbox.has_selection?
             require 'pp'
             output "\n== Variable #{@varsbox.get_selection}\n\n", 'info'
@@ -74,7 +105,7 @@ module Drx
         }
         @methodsbox.bind('Double-Button-1') {
           if @methodsbox.has_selection?
-            edit(current_object, @methodsbox.get_selection)
+            locate_method(current_object, @methodsbox.get_selection)
           end
         }
         @eval_entry.bind('Key-Return') {
@@ -97,15 +128,47 @@ module Drx
         toplevel.bind('Control-r') {
           # Refresh the display. Useful if you eval'ed some code that changes the
           # object inspected.
-          navigate_to tip
+          refresh
           # Note: it seems that #instance_eval creates a singleton for the object.
           # So after eval'ing something and pressing C-r, you're going to see this
           # extra class.
         }
+        @graph_size_menu.bind('<ComboboxSelected>') {
+          @graph_opts[:size] = @graph_size_menu.get
+          refresh
+        }
+        @graph_style_menu.bind('<ComboboxSelected>') {
+          @graph_opts[:style] = @graph_style_menu.get
+          refresh
+        }
 
         output "Please visit the homepage, http://drx.rubyforge.org/, for usage instructions.\n", 'info'
+
+        one_time_initialization
+        user_customizations
       end
 
+      def one_time_initialization
+        @@one_time_initialization ||= begin
+          # Try to make the Unixy GUI less ugly.
+          if Tk.windowingsystem == 'x11' and Ttk.themes.include? 'clam'
+            Ttk.set_theme 'clam'
+          end
+          rc = File.join(ENV['HOME'] || Dir.pwd, '.drxrc')
+          load rc if File.exist? rc
+          1
+        end
+      end
+
+      # Users may redefine this method in their ~/.drxrc
+      # to fine-tune the app.
+      def user_customizations
+      end
+
+      def vbox(*args); VBox.new(toplevel, args); end
+      def hbox(*args); HBox.new(toplevel, args); end
+      def separator; TkLabel.new(toplevel, :text => '  '); end
+
       # Arrange the main widgets inside layout widgets.
       def layout
         main_frame = TkPanedwindow.new(toplevel, :orient => :vertical) {
@@ -114,29 +177,35 @@ module Drx
           # We don't want them to obscure the main ones.
           lower
         }
-        main_frame.add VBox.new toplevel, [
+        main_frame.add vbox(
           [Scrolled.new(toplevel, @eval_result, :vertical => true), { :expand => true, :fill => 'both' } ],
           TkLabel.new(toplevel, :anchor => 'w') {
-            text 'Type some code to eval; \'self\' is the object at tip of diagram; prepend with "see" to examine result.'
+            text 'Type some code to eval; \'self\' is the object at the base of the graph; prepend with "see" to inspect result.'
           },
-          @eval_entry,
-        ]
+          @eval_entry
+        )
 
         panes = TkPanedwindow.new(main_frame, :orient => :horizontal) {
           lower
         }
-        panes.add VBox.new toplevel, [
+        # Note the :weight's on the followings.
+        panes.add vbox(
           TkLabel.new(toplevel, :text => 'Object graph (klass and super):', :anchor => 'w'),
-          [@im, { :expand => true, :fill => 'both' } ],
-        ]
-        panes.add VBox.new toplevel, [
+          [Scrolled.new(toplevel, @im), { :expand => true, :fill => 'both' } ],
+          hbox(TkLabel.new(toplevel, :text => 'Size: '), @graph_size_menu,
+               separator,
+               TkLabel.new(toplevel, :text => 'Style: '), @graph_style_menu,
+               separator,
+               [@save_btn, { :pady => 5 }])
+        ), :weight => 10
+        panes.add vbox(
           TkLabel.new(toplevel, :text => 'Variables (iv_tbl):', :anchor => 'w'),
           [Scrolled.new(toplevel, @varsbox), { :expand => true, :fill => 'both' } ]
-        ]
-        panes.add VBox.new toplevel, [
+        ), :weight => 50
+        panes.add vbox(
           TkLabel.new(toplevel, :text => 'Methods (m_tbl):', :anchor => 'w'),
           [Scrolled.new(toplevel, @methodsbox), { :expand => true, :fill => 'both' } ]
-        ]
+        ), :weight => 10
 
         main_frame.add(panes)
       end
@@ -151,7 +220,7 @@ module Drx
 
       def open_up_editor(filename, lineno)
         command = sprintf(ENV['DRX_EDITOR_COMMAND'] || EDITOR_COMMAND, lineno, filename)
-        output "Execting: #{command}...\n", 'info'
+        output "Executing: #{command}...\n", 'info'
         if !fork
           if !Kernel.system(command)
             output "Could not execute the command '#{command}'\n", 'error'
@@ -160,15 +229,15 @@ module Drx
         end
       end
 
-      def edit(obj, method_name)
-        location = ObjInfo.new(obj).locate_method(method_name) rescue nil
-        if !location
+      def locate_method(obj, method_name)
+        place = ObjInfo.new(obj).locate_method(method_name)
+        if !place
           output "Method #{method_name} doesn't exist\n", 'info'
         else
-          if location.is_a? String
-            output "Can't locate method, because it's a: #{location}\n", 'info'
+          if place =~ /\A(\d+):(.*)/
+            open_up_editor($2, $1)
           else
-            open_up_editor(location[0], location[1])
+            output "Can't locate method, because it's a: #{place}\n", 'info'
           end
         end
       end
@@ -212,23 +281,35 @@ module Drx
 
       # Fills the variables listbox with a list of the object's instance variables.
       def display_variables(obj)
-        @varsbox.delete('0', 'end')
+        allowed_names = [/^@/, /^[A-Z]/, '__classpath__', '__tmp_classpath__', '__classid__', '__attached__']
+        @varsbox.clear
         info = ObjInfo.new(obj)
         if obj and info.has_iv_tbl?
           vars = info.iv_tbl.keys.map do |v| v.to_s end.sort
           # Get rid of gazillions of Tk classes:
           vars = vars.reject { |v| v =~ /Tk|Ttk/ }
-          @varsbox.insert('end', *vars)
+          vars.each do |name|
+            value = if allowed_names.any? { |p| p === name }
+                      info.__get_ivar(name).inspect
+                    else
+                      # We don't want to inspect ruby's internal variables (because
+                      # they may not be Ruby values at all).
+                      ''
+                    end
+            @varsbox.insert('', 'end', :text => name, :values => [ name, value ] )
+          end
         end
       end
 
       # Fills the methods listbox with a list of the object's methods.
       def display_methods(obj)
-        @methodsbox.delete('0', 'end')
+        @methodsbox.clear
         info = ObjInfo.new(obj)
         if obj and info.class_like?
           methods = info.m_tbl.keys.map do |v| v.to_s end.sort
-          @methodsbox.insert('end', *methods)
+          methods.each do |name|
+            @methodsbox.insert('', 'end', :text => name, :values => [ name, File.basename(String(info.locate_method(name))) ] )
+          end
         end
       end
 
@@ -237,7 +318,7 @@ module Drx
         require 'drx/tempfiles'
         @objs = {}
         Tempfiles.new do |files|
-          ObjInfo.new(obj).generate_diagram(files) do |info|
+          ObjInfo.new(obj).generate_diagram(files, @graph_opts) do |info|
             @objs[info.dot_url] = info
           end
           @im.image = files['gif']
@@ -245,6 +326,17 @@ module Drx
         end
       end
 
+      # Saves the graph to a file.
+      def save_graph(obj)
+        require 'drx/tempfiles'
+        Tempfiles.new do |files|
+          ObjInfo.new(obj).generate_diagram(files, @graph_opts)
+          if (output = Tk.getSaveFile(:parent => toplevel, :defaultextension => '.gif')) != ''
+            FileUtils.cp(files['gif'], output)
+          end
+        end
+      end
+
       # Makes `obj` the primary object seen (the one which is the tip of the diagram).
       def navigate_to(obj)
         @current_object = obj
@@ -261,6 +353,11 @@ module Drx
         @navigation_history.last
       end
 
+      # Refreshes the display.
+      def refresh
+        navigate_to tip
+      end
+
       # Make `obj` the selected object. That is, the one the variable and method boxes reflect.
       def select_object(obj)
          @current_object = obj
@@ -315,7 +412,7 @@ module Drx
         @the_widget = the_widget
         if opts[:vertical]
           TkScrollbar.new(self) { |s|
-            pack :side => 'right', :fill => 'y'
+            grid(:row => 0, :column => 1, :rowspan => 1, :columnspan => 1, :sticky => 'news')
             command { |*args| the_widget.yview *args }
             the_widget.yscrollcommand { |first,last| s.set first,last }
           }
@@ -323,13 +420,15 @@ module Drx
         if opts[:horizontal]
           TkScrollbar.new(self) { |s|
             orient 'horizontal'
-            pack :side => 'bottom', :fill => 'x'
+            grid(:row => 1, :column => 0, :rowspan => 1, :columnspan => 1, :sticky => 'news')
             command { |*args| the_widget.xview *args }
             the_widget.xscrollcommand { |first,last| s.set first,last }
           }
         end
         the_widget.raise  # Since the frame is created after the widget, it obscures it by default.
-        the_widget.pack(:in => self, :side => 'left', :expand => 'true', :fill => 'both')
+        the_widget.grid(:in => self, :row => 0, :column => 0, :rowspan => 1, :columnspan => 1, :sticky => 'news')
+        TkGrid.rowconfigure(self, 0, :weight => 1, :minsize => 0)
+        TkGrid.columnconfigure(self, 0, :weight => 1, :minsize => 0)
       end
       def raise
         super
@@ -342,20 +441,35 @@ module Drx
       def initialize(parent, widgets)
         super(parent)
         widgets.each { |w, layout|
-          layout = {} if layout.nil?
-          layout = { :in => self, :side => 'top', :fill => 'x' }.merge layout
+          layout = default_layout.merge(layout || {})
           w.raise
           w.pack(layout)
         }
       end
+      def default_layout
+        { :in => self, :side => 'top', :fill => 'x' }
+      end
+      def raise
+        pack_slaves.each {|w| w.raise }
+      end
     end
 
-    class ::TkListbox
+    # Arranges widgets one beside the other.
+    class HBox < VBox
+      def default_layout
+        { :in => self, :side => 'left', :fill => 'none' }
+      end
+    end
+
+    class ::Tk::Tile::Treeview
       def get_selection
-        return get(curselection[0])
+        selection[0].text
       end
       def has_selection?
-        not curselection.empty?
+        not selection.empty?
+      end
+      def clear
+        children('').each { |i| delete i }
       end
     end
 

data/lib/drx/tk/imagemap.rb

@@ -2,12 +2,20 @@ class TkCanvas
   def coords(evt)
     return [canvasx(evt.x), canvasy(evt.y)]
   end
+
+  # TkCanvas redefines raise() (and lower()) to operate on tags.
+  # But our layout classes (VBox and Scrolled) require a proper raise(),
+  # so we restore its behavior.
+  # @todo: find out the "correct" way to do it.
+  def raise
+    super
+  end
 end
 
 module TkImageMap
 
   # A widget to show an image together with an HTML imagemap.
-  class ImageMap < TkFrame
+  class ImageMap < TkCanvas
 
     def select_command &block
       @select_command = block
@@ -22,10 +30,12 @@ module TkImageMap
       @hotspots.map { |h| h[:url] }
     end
 
-    # Delegates all bindings to the canvas. That's probably what the
-    # programmer expects.
-    def bind(*args, &block)
-      @canvas.bind *args, &block
+    # I'm not yet sure I want ImageMap to be a TkCanvas directly (an
+    # alternative would be for it to control an external canvas). So,
+    # for future compatibility, I access the canvas through canvas()
+    # instead of assuming it's 'self'.
+    def canvas
+      self
     end
 
     def initialize(parent, *rest)
@@ -37,22 +47,16 @@ module TkImageMap
       @select_command = proc {}
       @double_select_command = proc {}
 
-      @canvas = TkCanvas.new self, :scrollregion => [0, 0, 2000, 2000]
-
-      v_scr = TkScrollbar.new(self, :orient => 'vertical').pack :side=> 'right', :fill => 'y'
-      h_scr = TkScrollbar.new(self, :orient => 'horizontal').pack :side=> 'bottom', :fill => 'x'
-      @canvas.xscrollbar(h_scr)
-      @canvas.yscrollbar(v_scr)
       # Attach scrolling to middle button.
-      @canvas.bind('2', proc { |x,y| @canvas.scan_mark(x,y) }, '%x %y')
-      @canvas.bind('B2-Motion', proc { |x,y| @canvas.scan_dragto x, y }, '%x %y')
+      canvas.bind('2', proc { |x,y| canvas.scan_mark(x,y) }, '%x %y')
+      canvas.bind('B2-Motion', proc { |x,y| canvas.scan_dragto x, y }, '%x %y')
 
-      @canvas.pack :expand => true, :fill => 'both'
+      canvas.pack :expand => true, :fill => 'both'
 
       ['Motion','Control-Motion'].each { |sequence|
-        @canvas.bind sequence do |evt|
-          x, y = @canvas.coords(evt)
-          spot = @canvas.find('overlapping', x, y, x + 1, y + 1).first
+        canvas.bind sequence do |evt|
+          x, y = canvas.coords(evt)
+          spot = canvas.find('overlapping', x, y, x + 1, y + 1).first
           if spot and spot.cget('tags').include? 'hotspot'
             new_hover_region = spot.hotspot_region
           else
@@ -68,31 +72,31 @@ module TkImageMap
           end
         end
       }
-      @canvas.bind 'Button-1' do |evt|
-        x, y = @canvas.coords(evt)
-        spot = @canvas.find('overlapping', x, y, x+1, y+1).first
+      canvas.bind 'Button-1' do |evt|
+        x, y = canvas.coords(evt)
+        spot = canvas.find('overlapping', x, y, x+1, y+1).first
         if spot and spot.cget('tags').include? 'hotspot'
           self.active_region = spot.hotspot_region
         else
           self.active_region = nil
         end
       end
-      @canvas.bind 'Double-Button-1' do
+      canvas.bind 'Double-Button-1' do
         @double_select_command.call(active_url) if @active_region
       end
       # Middle button: vertical scrolling.
-      @canvas.bind 'Button-4' do
-        @canvas.yview_scroll(-1, 'units')
+      canvas.bind 'Button-4' do
+        canvas.yview_scroll(-1, 'units')
       end
-      @canvas.bind 'Button-5' do
-        @canvas.yview_scroll(1, 'units')
+      canvas.bind 'Button-5' do
+        canvas.yview_scroll(1, 'units')
       end
       # Middle button: horizontal scrolling.
-      @canvas.bind 'Shift-Button-4' do
-        @canvas.xview_scroll(-1, 'units')
+      canvas.bind 'Shift-Button-4' do
+        canvas.xview_scroll(-1, 'units')
       end
-      @canvas.bind 'Shift-Button-5' do
-        @canvas.xview_scroll(1, 'units')
+      canvas.bind 'Shift-Button-5' do
+        canvas.xview_scroll(1, 'units')
       end
     end
 
@@ -124,15 +128,15 @@ module TkImageMap
 
     def image=(pathname)
       @image = TkPhotoImage.new :file => pathname
-      @canvas.configure :scrollregion => [0, 0, @image.width, @image.height]
+      canvas.configure :scrollregion => [0, 0, @image.width, @image.height]
     end
 
     # You must call this after image=()
     def image_map=(pathname)
       # Delete the previous spot widgets and the image widget.
-      @canvas.find('all').each {|w| w.destroy }
-      @canvas.xview_moveto(0)
-      @canvas.yview_moveto(0)
+      canvas.find('all').each {|w| w.destroy }
+      canvas.xview_moveto(0)
+      canvas.yview_moveto(0)
 
       @hotspots = Utils.parse_imap(pathname)
 
@@ -140,7 +144,7 @@ module TkImageMap
       # Create the back spots.
       #
       @hotspots.each do |region|
-        args = [@canvas, *(region[:args])]
+        args = [canvas, *(region[:args])]
         opts = {
           :fill => 'red',
           :tags => ['hotspot']
@@ -156,13 +160,13 @@ module TkImageMap
         end
       end
 
-      @image_widget = TkcImage.new(@canvas,0,0, :image => @image, :anchor=> 'nw')
+      @image_widget = TkcImage.new(canvas,0,0, :image => @image, :anchor=> 'nw')
 
       #
       # Create the hover spots.
       #
       @hotspots.each do |region|
-        args = [@canvas, *(region[:args])]
+        args = [canvas, *(region[:args])]
         opts = {
           :dash => '. ',
           :width => 5,
@@ -187,9 +191,7 @@ module TkImageMap
     # DOT outputs oval elements as polygons with many many sides. Since Tk doesn't
     # draw them well, we convert such polygons to ovals.
     def self.to_oval(coords)
-      require 'enumerator'
-      #points = coords.each_slice(2).to_a # Doesn't work for older 1.8's.
-      points = coords.enum_for(:each_slice, 2).to_a
+      points = coords.enum_slice(2).to_a
       if points.size < 10
         # If there are few sides, we assume it's a real polygon.
         return nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drx
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Mooffie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +03:00
+date: 2010-03-28 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -31,10 +31,9 @@ files:
 - lib/drx.rb
 - ext/extconf.rb
 - ext/drx_core.c
-- examples/drx_test.rb
-- examples/drx_test3.rb
-- examples/drx_test2.rb
-- examples/drx_datamapper19.rb
+- examples/drx_datamapper.rb
+- examples/drx_date.rb
+- examples/drx_guitar.rb
 has_rdoc: true
 homepage: http://drx.rubyforge.org/
 licenses: []
@@ -46,9 +45,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
-      version: 1.8.2
+      version: "1.8"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -62,6 +61,6 @@ rubyforge_project: drx
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Object inspector for Ruby.
+summary: Inspect Ruby objects.
 test_files: []
 

data/examples/drx_datamapper19.rb

@@ -1,35 +0,0 @@
-require 'rubygems'
-require 'dm-core'
-$: << File.join('/home/mooffie/_drx.git/lib')
-require 'drx'
-
-
-
-#
-# This is part of a blogging website. Users write posts. A post
-# belongs to a user.
-#
-
-class Post
-  include DataMapper::Resource
-
-  property :post_id,  Serial
-  property :title,    String
-  property :body,     Text
-
-  belongs_to :user
-end
-
-class User
-  include DataMapper::Resource
-
-  property :user_uid,  Serial
-  property :name,      String
-  property :mail,      String
-end
-
-post = Post.new
-
-p post
-require 'drx'
-post.see