cheri 0.0.3 → 0.0.4

data/README

@@ -6,7 +6,7 @@ based on the framework, as well as a builder-builder tool for easily creating
 simple builders.  Cheri also comes with a demo application, Cheri::JRuby::Explorer,
 that is built using two of the supplied builders (Cheri::Swing and Cheri::Html).
 
-This version (0.0.3) is an early beta release. Some features are not yet fully
+This version (0.0.4) is an early beta release. Some features are not yet fully
 developed, in particular the HTML/XML components.  On the other hand, Cheri::Swing,
 which is the successor to JRBuilder (http://www2.webng.com/bdortch/jrbuilder), is
 relatively mature, in an adolescent sort of way, though many features could be added.
@@ -41,7 +41,7 @@ Cheri gem):
   Cheri::JRuby::Explorer.run
   
 This will take several seconds to load and start -- performance will be one area
-of improvement for versions 0.0.3 and beyond.  Once it loads, it should be fairly
+of improvement for versions 0.0.5 and beyond.  Once it loads, it should be fairly
 clear what to do.
 
 Some known issues:
@@ -54,21 +54,17 @@ Some known issues:
   NullPointerException (JList seems to get overwhelmed), requiring a restart of
   CJX. I had a fix in that did a GC on the target instance before each search,
   which seemed to help, but also seemed a little extreme. This will be a search
-  option in 0.0.4.
+  option in 0.0.5.
   
 * There are lots of layout issues; neither HTML (JEditorPane) nor BoxLayout provide 
   exactly what I'm looking for. Will probably have to bite the bullet and go to
   GridBagLayout.  Ugh.
   
-* Close buttons on tabs aren't available pre-Java 1.6.  There are alternatives for
-  the top tabs, but currently not for the bottom (search result) tabs.  Will resolve
-  in 0.0.4.
-  
-* Speaking of tabs, tab management (and navigation in general) is not yet quite right.
-  Will have history/back buttons and better tab management in 0.0.4.
+* Tab management (and navigation in general) is not yet quite right.
+  Will have history/back buttons and better tab management in 0.0.5.
   
 * Global variables are currently shown, um, globally, when many of them should be shown
-  per thread.  This will be fixed in 0.0.4, which will include a Thread section with
+  per thread.  This will be fixed in 0.0.5, which will include a Thread section with
   other goodies as well (thread-local vars, status, etc.).
   
 To install the CJX DRb server component in an instance (assuming the Cheri gem is
@@ -95,4 +91,4 @@ Please visit the Cheri site for more documentation, I'll be continually adding t
 in the coming days.
 
 Bill Dortch <cheri.project@gmail.com>
-8 June 2007
+10 June 2007

data/lib/cheri/builder/connecter.rb

@@ -26,12 +26,11 @@ module Cheri
 module Builder
 
 class TypeConnecter
-  # TODO: cache based on parent/child ancestors
-  #@cache = {}
 
   def initialize(*parents,&k)
     @t = {}
     @s = {}
+    @c = {}
     unless parents.empty?
       t = @t
       s = @s
@@ -80,14 +79,21 @@ class TypeConnecter
     end
     # then try parent type matches
     t = @t
-    (class<<builder.object;self;end).ancestors.each do |a|
+    bld_anc = (class<<builder.object;self;end).ancestors
+    anc ||= (class<<obj;self;end).ancestors
+    key = [bld_anc,anc,sym]
+    if (ctr = @c[key])
+      return ctr.prepare(ctx,builder,obj,sym,props)
+    end
+    bld_anc.each do |a|
       if (type = t[a])
         # child symbol match?
         if (sctr = type.sctrs[sym])
+          @c[key] = sctr
           return sctr.prepare(ctx,builder,obj,sym,props) 
         end
         # child type match?
-        anc ||= (class<<obj;self;end).ancestors
+        #anc ||= (class<<obj;self;end).ancestors
         ix ||= anc.length
         match = nil
         # match on nearest ancestor
@@ -97,7 +103,10 @@ class TypeConnecter
             match = tctr
           end
         end
-        return match.prepare(ctx,builder,obj,sym,props) if match
+        if match
+          @c[key] = match
+          return match.prepare(ctx,builder,obj,sym,props)
+        end
       end
     end
     false

data/lib/cheri/builder/generator.rb

@@ -332,10 +332,10 @@ class Generator
   private :create_mod
 
   class EvalBuilder
-    keep = /^(__|=|<|>|class|to_s|eql\?|equal\?|inspect|instance_|respond_to\?)/
-    instance_methods.each do |m|
-      undef_method m unless m =~ keep  
-    end
+#    keep = /^(__|=|<|>|class|to_s|eql\?|equal\?|inspect|require|warn|instance_|respond_to\?)/
+#    instance_methods.each do |m|
+#      undef_method m unless m =~ keep  
+#    end
 
     def initialize(*r,&k)
       @__mapped = {}

data/lib/cheri/cheri.rb

@@ -29,7 +29,7 @@ module Cheri
 module VERSION #:nodoc:
   MAJOR = 0
   MINOR = 0
-  TINY  = 3
+  TINY  = 4
   STRING = [MAJOR, MINOR, TINY].join('.').freeze
 end
 PathExp = Regexp.new "cheri-#{VERSION::STRING}\\/lib$" #:nodoc:

data/lib/cheri/cjx.rb

@@ -1,4 +1,3 @@
 # Loads and runs Cheri::JRuby::Explorer
-require 'rubygems'
 require 'cheri/jruby/explorer'
 Cheri::JRuby::Explorer.run

data/lib/cheri/explorer/explorer.rb

@@ -61,10 +61,10 @@ module Explorer
  If you have not taken adequate precautions to secure this installation, such as,
  but not limited to, firewalls, secure network access, and access control lists,
  you should terminate this application now by entering the following command:
- 
+
  Cheri::Explorer.thread.kill
- 
-    }   
+
+}   
   end
   def self.stop
     if (server = @server)

data/lib/cheri/jruby/explorer/dialogs.rb

@@ -319,9 +319,13 @@ end
 class AboutDialog
   include Cheri::Swing
   include Cheri::Html
+
+  # Undefining this so I can use it in Cheri::Html.  Could always
+  # just use html.p instead.
+  undef_method :p
+
   def initialize(main)
     swing[:auto]
-    undef p
     @main = main
     @main_frame = main.main_frame
     @dialog = dialog @main_frame, 'About Cheri::JRuby::Explorer', true do |d|
@@ -334,7 +338,7 @@ class AboutDialog
           content_type 'text/html'
           html { head { style 'body { font-family: sans-serif; }' }
             body(:bgolor=>:white) { div(:align=>:center) {
-            h3 font(:color=>:blue) {'Cheri::JRuby::Explorer version 0.0.2'}
+            h3 font(:color=>:blue) {"Cheri::JRuby::Explorer version #{Cheri::VERSION::STRING}"}
             p 'Written by Bill Dortch ', esc('<cheri.project@gmail.com>'), br,
               'Copyright &copy; 2007 William N Dortch'
             p

data/lib/cheri/jruby/explorer/viewers.rb

@@ -587,11 +587,11 @@ class ResultListViewer < Viewer
       id = res[i]
       val = nil
       begin
-        val = proxy.simple_value
+        val = proxy.simple_value(id)
       rescue
         val = 'Unavailable'
       end
-      list[i] = ResultListItem.new(id,value)
+      list[i] = ResultListItem.new(id,val)
     end
     list
   end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: cheri
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 date: 2007-06-10 00:00:00 -07:00
 summary: Cheri Builder Platform
 require_paths: