drx 0.4.4 → 0.4.5

data/ext/drx_core.c

@@ -72,7 +72,12 @@ static VALUE t_get_super(VALUE self, VALUE obj)
   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));
   }
+#ifdef RCLASS_SUPER
+  // Ruby 1.8.7 and above have this macro.
   return RCLASS_SUPER(obj) ? RCLASS_SUPER(obj) : Qnil;
+#else
+  return RCLASS(obj)->super ? RCLASS(obj)->super : Qnil;
+#endif
 }
 
 /**

data/lib/drx/graphviz.rb

@@ -236,7 +236,7 @@ module Drx
         # of included modules, or modules included in them). To prevent
         # clutter we print the arrow to Module only if it comes from
         # Class (or a module included in it).
-        return (my_ancestors + [self]).include? _Class
+        return (my_ancestors + [self]).include?(_Class)
         #
         # A somewhat irrelevant note (I don't have a better place to put it):
         #

data/lib/drx/tk/app.rb

@@ -8,7 +8,25 @@ module TkCore; RUN_EVENTLOOP_ON_MAIN_THREAD = true; end
 require 'tk'
 require 'drx/tk/imagemap'
 
-Tk.default_widget_set = :Ttk
+# -------- Start of legacy Tk handling ------------
+#
+# Tweaks for old Ruby/Tk should go here.
+#
+require 'tkextlib/tile' if !defined? Tk::Tile
+if Tk.respond_to? :default_widget_set
+  # Replace all legacy widgets by their nifty Tile versions.
+  Tk.default_widget_set = :Ttk
+else
+  # The non-Tile Panedwindow doesn't support :weight
+  class TkPanedwindow
+    alias original_add add
+    def add(what, opts = {})
+      opts.delete :weight
+      original_add(what, opts)
+    end
+  end
+end
+# -------- End of legacy Tk handling ------------
 
 module Drx
   module TkGUI
@@ -40,7 +58,7 @@ module Drx
       def initialize
         @navigation_history = []
         @eval_history = LineHistory.new
-        @graph_opts = { :size => '100%', :style => 'default' }
+        @graph_opts = { :size => '90%', :style => 'default' }
 
         @eval_entry = TkEntry.new(toplevel) {
           font 'Courier'
@@ -91,7 +109,7 @@ module Drx
         }
 
         @graph_size_menu = Tk::Tile::Combobox.new(toplevel) {
-          set '100%'
+          set '90%'
           values ['100%', '90%', '80%', '60%']
           state :readonly
           width 6
@@ -209,8 +227,8 @@ module Drx
       def system_customizations
         if Application.first_window?
           # Try to make the Unixy GUI less ugly.
-          if Tk.windowingsystem == 'x11' and Ttk.themes.include? 'clam'
-            Ttk.set_theme 'clam'
+          if Tk::Tile.respond_to? :themes and Tk.windowingsystem == 'x11' and Tk::Tile.themes.include? 'clam'
+            Tk::Tile.set_theme 'clam'
           end
         end
       end
@@ -387,7 +405,7 @@ module Drx
           when :rest;  '*' + (arg[1] || 'args').to_s
           when :block; '&' + (arg[1] || 'arg').to_s
           end
-        end.join ', '
+        end.join(', ')
       rescue NameError
         return '---'
       rescue SyntaxError => e
@@ -433,6 +451,7 @@ module Drx
         Tempfiles.new do |files|
           ObjInfo.new(obj).generate_diagram(files, @graph_opts)
           if (output = Tk.getSaveFile(:parent => toplevel, :defaultextension => '.gif')) != ''
+            require 'fileutils'
             FileUtils.cp(files['gif'], output)
           end
         end

data/lib/drx/tk/imagemap.rb

@@ -198,8 +198,11 @@ module TkImageMap
         # If there are few sides, we assume it's a real polygon.
         return nil
       end
-      x_min, x_max = points.map {|p| p[0]}.minmax
-      y_min, y_max = points.map {|p| p[1]}.minmax
+      # Alas, Ruby 1.8.6 doesn't have #minmax
+      xs = points.map {|p| p[0]}
+      ys = points.map {|p| p[1]}
+      x_min, x_max = xs.min, xs.max
+      y_min, y_max = ys.min, ys.max
       # @todo: try to figure out if the points trace a circle?
       #center_x = x_min + (x_max - x_min) / 2.0
       #center_y = y_min + (y_max - y_min) / 2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: drx
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Mooffie
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-19 00:00:00 +03:00
+date: 2010-04-21 00:00:00 +03:00
 default_executable: 
 dependencies: []