RubyGems - rumai - Versions diffs - 1.0.0 → 2.0.0 - Mend

rumai 1.0.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (179) hide show

data/doc/guide.erb CHANGED Viewed

@@ -51,7 +51,7 @@
     |_. Software |_. Notes |
     | "Ruby":<%= ruby_url %> | Version 1.8.x is required. |
-    | "wmii":<%= wmii_url %> | wmii-snap20070516 or newer is required. |
+    | "wmii":<%= wmii_url %> | Version 3.6 or newer is required. |
   <% end %>
   <% section "Installation" do %>
@@ -144,7 +144,7 @@
           Close the terminals we launched earlier:
           <code>
           terms = curr_view.clients.select {|c| colors.include? c.label.read }
-          terms.each {|c| c.ctl.write "kill" }
+          terms.each {|c| c.kill }
           </code>
         }.gsub(/^\s+/, '')
       %>

data/doc/guide.html CHANGED Viewed

@@ -2,11 +2,11 @@
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <meta name="date" content="26 January 2008"/>
+    <meta name="date" content="04 February 2008"/>
     <meta name="author" content="Suraj N. Kurapati"/>
-    <meta name="generator" content="Gerbil 1.1.0"/>
+    <meta name="generator" content="Gerbil 2.0.0"/>
     <link rel="alternate" type="application/rss+xml" href="http://rumai.rubyforge.org/news.xml"/>
-    <title>Rumai 1.0.0 user guide</title>
+    <title>Rumai 2.0.0 user guide</title>
     <style type="text/css" media="screen">
       body
@@ -754,15 +754,19 @@
     </style>
   </head>
   <body>
     <div id="header">
-      <h1 class="title">Rumai 1.0.0 user guide</h1>
+      <h1 class="title">Rumai 2.0.0 user guide</h1>
       <h2 class="authors"><a href="http://snk.tuxfamily.org">Suraj N. Kurapati</a></h2>
-      <h3 class="date">26 January 2008</h3>
+      <h3 class="date">04 February 2008</h3>
     </div>
-    <div id="toc"><h1>Contents</h1> <ul><li>1&nbsp;&nbsp;<a id="a-606956178" href="#Introduction">Introduction</a><ul><li>1.1&nbsp;&nbsp;<a id="a-606960438" href="#Resources">Resources</a></li><li>1.2&nbsp;&nbsp;<a id="a-606963908" href="#License">License</a></li></ul></li><li>2&nbsp;&nbsp;<a id="a-606966618" href="#Setup">Setup</a><ul><li>2.1&nbsp;&nbsp;<a id="a-606968098" href="#Requirements">Requirements</a></li><li>2.2&nbsp;&nbsp;<a id="a-606970128" href="#Installation">Installation</a></li><li>2.3&nbsp;&nbsp;<a id="a-606973738" href="#Manifest">Manifest</a></li><li>2.4&nbsp;&nbsp;<a id="a-606975918" href="#Version-numbering-system">Version numbering system</a></li></ul></li><li>3&nbsp;&nbsp;<a id="a-606978438" href="#Usage">Usage</a><ul><li>3.1&nbsp;&nbsp;<a id="a-606979948" href="#Concepts">Concepts</a></li><li>3.2&nbsp;&nbsp;<a id="a-606981988" href="#shell">Interactive shell</a><ul><li>3.2.1&nbsp;&nbsp;<a id="a-606983728" href="#Live-demonstration">Live demonstration</a><ul><li>3.2.1.1&nbsp;&nbsp;<a id="a-606985418" href="#Automated-client-arrangement">Automated client arrangement</a></li><li>3.2.1.2&nbsp;&nbsp;<a id="a-606092078" href="#Multiple-client-grouping">Multiple client grouping</a></li><li>3.2.1.3&nbsp;&nbsp;<a id="a-606113088" href="#Easy-column-manipulation">Easy column manipulation</a></li><li>3.2.1.4&nbsp;&nbsp;<a id="a-606129268" href="#Easy-client-manipulation">Easy client manipulation</a></li><li>3.2.1.5&nbsp;&nbsp;<a id="a-606134168" href="#Traversing-the-file-system">Traversing the file system</a></li></ul></li><li>3.2.2&nbsp;&nbsp;<a id="a-606141278" href="#Available-commands">Available commands</a></li></ul></li><li>3.3&nbsp;&nbsp;<a id="a-607083858" href="#wmiirc">Scripting your wmiirc</a></li></ul></li></ul></div>
+    <div id="toc"><h1>Contents</h1> <ul><li>1&nbsp;&nbsp;<a id="a-606974828" href="#Introduction">Introduction</a><ul><li>1.1&nbsp;&nbsp;<a id="a-606979088" href="#Resources">Resources</a></li><li>1.2&nbsp;&nbsp;<a id="a-606982558" href="#License">License</a></li></ul></li><li>2&nbsp;&nbsp;<a id="a-606985268" href="#Setup">Setup</a><ul><li>2.1&nbsp;&nbsp;<a id="a-606986748" href="#Requirements">Requirements</a></li><li>2.2&nbsp;&nbsp;<a id="a-606988778" href="#Installation">Installation</a></li><li>2.3&nbsp;&nbsp;<a id="a-606992388" href="#Manifest">Manifest</a></li><li>2.4&nbsp;&nbsp;<a id="a-606994568" href="#Version-numbering-system">Version numbering system</a></li></ul></li><li>3&nbsp;&nbsp;<a id="a-606997088" href="#Usage">Usage</a><ul><li>3.1&nbsp;&nbsp;<a id="a-606998598" href="#Concepts">Concepts</a></li><li>3.2&nbsp;&nbsp;<a id="a-607000638" href="#shell">Interactive shell</a><ul><li>3.2.1&nbsp;&nbsp;<a id="a-607002378" href="#Live-demonstration">Live demonstration</a><ul><li>3.2.1.1&nbsp;&nbsp;<a id="a-607004068" href="#Automated-client-arrangement">Automated client arrangement</a></li><li>3.2.1.2&nbsp;&nbsp;<a id="a-607006288" href="#Multiple-client-grouping">Multiple client grouping</a></li><li>3.2.1.3&nbsp;&nbsp;<a id="a-607008668" href="#Easy-column-manipulation">Easy column manipulation</a></li><li>3.2.1.4&nbsp;&nbsp;<a id="a-607011198" href="#Easy-client-manipulation">Easy client manipulation</a></li><li>3.2.1.5&nbsp;&nbsp;<a id="a-607013848" href="#Traversing-the-file-system">Traversing the file system</a></li></ul></li><li>3.2.2&nbsp;&nbsp;<a id="a-607016918" href="#Available-commands">Available commands</a></li></ul></li><li>3.3&nbsp;&nbsp;<a id="a-607024218" href="#wmiirc">Scripting your wmiirc</a></li></ul></li></ul></div>
@@ -770,7 +774,7 @@
 <div class="chapter">
   <h1 class="title">
     Chapter
-    <a class="toc" id="Introduction" href="#a-606956178">1</a>
+    <a class="toc" id="Introduction" href="#a-606974828">1</a>
     <br/>
@@ -791,7 +795,7 @@
 	<p><div class="section">
   <h2 class="title">
-    <a class="toc" id="Resources" href="#a-606960438">1.1</a>&nbsp;&nbsp;Resources
+    <a class="toc" id="Resources" href="#a-606979088">1.1</a>&nbsp;&nbsp;Resources
   </h2>
   <div class="content"><ul>
 	<li><a href="http://rumai.rubyforge.org/news.xml">News feed</a>
@@ -806,7 +810,7 @@
 </div>
 <div class="section">
   <h2 class="title">
-    <a class="toc" id="License" href="#a-606963908">1.2</a>&nbsp;&nbsp;License
+    <a class="toc" id="License" href="#a-606982558">1.2</a>&nbsp;&nbsp;License
   </h2>
   <div class="content"><p>Copyright 2006 Suraj N. Kurapati &lt;SNK at GNA dot ORG&gt;</p>
@@ -844,7 +848,7 @@ IMPLIED, INCLUDING <span class="caps">BUT NOT LIMITED TO THE WARRANTIES OF MERCH
 <div class="chapter">
   <h1 class="title">
     Chapter
-    <a class="toc" id="Setup" href="#a-606966618">2</a>
+    <a class="toc" id="Setup" href="#a-606985268">2</a>
     <br/>
@@ -853,7 +857,7 @@ IMPLIED, INCLUDING <span class="caps">BUT NOT LIMITED TO THE WARRANTIES OF MERCH
   <div class="content"><div class="section">
   <h2 class="title">
-    <a class="toc" id="Requirements" href="#a-606968098">2.1</a>&nbsp;&nbsp;Requirements
+    <a class="toc" id="Requirements" href="#a-606986748">2.1</a>&nbsp;&nbsp;Requirements
   </h2>
   <div class="content">Your system needs the following software to run Rumai.
@@ -869,13 +873,13 @@ IMPLIED, INCLUDING <span class="caps">BUT NOT LIMITED TO THE WARRANTIES OF MERCH
 		</tr>
 		<tr>
 			<td> <a href="http://www.suckless.org/wiki/wmii">wmii</a> </td>
-			<td> wmii-snap20070516 or newer is required. </td>
+			<td> Version 3.6 or newer is required. </td>
 		</tr>
 	</table></div>
 </div>
 <div class="section">
   <h2 class="title">
-    <a class="toc" id="Installation" href="#a-606970128">2.2</a>&nbsp;&nbsp;Installation
+    <a class="toc" id="Installation" href="#a-606988778">2.2</a>&nbsp;&nbsp;Installation
   </h2>
   <div class="content"><p>If your system has <a href="http://rubygems.org/">RubyGems</a>, then you can install Rumai by running the following commands:</p>
@@ -895,7 +899,7 @@ Otherwise, follow these instructions:
 	<pre>ruby bin/rumai -v</pre>
-	<p>If the installation was successful, then you will see output like this: <pre>Rumai 1.0.0 (2008-01-26) http://rumai.rubyforge.org /home/sun/src/rumai
+	<p>If the installation was successful, then you will see output like this: <pre>Rumai 2.0.0 (2008-02-04) http://rumai.rubyforge.org /home/sun/src/rumai
 </pre></p>
@@ -903,7 +907,7 @@ Otherwise, follow these instructions:
 </div>
 <div class="section">
   <h2 class="title">
-    <a class="toc" id="Manifest" href="#a-606973738">2.3</a>&nbsp;&nbsp;Manifest
+    <a class="toc" id="Manifest" href="#a-606992388">2.3</a>&nbsp;&nbsp;Manifest
   </h2>
   <div class="content">Now that Rumai is installed on your system, let us examine its installation directory.
 	<ul>
@@ -940,7 +944,7 @@ Inside Rumai&#8217;s installation directory, you will see (among other things) t
 </div>
 <div class="section">
   <h2 class="title">
-    <a class="toc" id="Version-numbering-system" href="#a-606975918">2.4</a>&nbsp;&nbsp;Version numbering system
+    <a class="toc" id="Version-numbering-system" href="#a-606994568">2.4</a>&nbsp;&nbsp;Version numbering system
   </h2>
   <div class="content">Rumai uses the <a href="http://www.rubygems.org/read/chapter/7">RubyGems rational versioning policy</a> to number its releases. This <strong>major.minor.patch</strong> numbering policy <a href="http://ablog.apress.com/?p=738">is summarized</a> as follows.
@@ -976,7 +980,7 @@ Inside Rumai&#8217;s installation directory, you will see (among other things) t
 <div class="chapter">
   <h1 class="title">
     Chapter
-    <a class="toc" id="Usage" href="#a-606978438">3</a>
+    <a class="toc" id="Usage" href="#a-606997088">3</a>
     <br/>
@@ -985,7 +989,7 @@ Inside Rumai&#8217;s installation directory, you will see (among other things) t
   <div class="content"><div class="section">
   <h2 class="title">
-    <a class="toc" id="Concepts" href="#a-606979948">3.1</a>&nbsp;&nbsp;Concepts
+    <a class="toc" id="Concepts" href="#a-606998598">3.1</a>&nbsp;&nbsp;Concepts
   </h2>
   <div class="content">If you wish to wield the power of Rumai more effectively, you should understand the following basic concepts:
 	<ul>
@@ -1001,7 +1005,7 @@ Inside Rumai&#8217;s installation directory, you will see (among other things) t
 </div>
 <div class="section">
   <h2 class="title">
-    <a class="toc" id="shell" href="#a-606981988">3.2</a>&nbsp;&nbsp;Interactive shell
+    <a class="toc" id="shell" href="#a-607000638">3.2</a>&nbsp;&nbsp;Interactive shell
   </h2>
   <div class="content"><p>Run the following command to start Rumai&#8217;s interactive shell (IRB):</p>
@@ -1029,14 +1033,14 @@ Inside Rumai&#8217;s installation directory, you will see (among other things) t
 	<p><div class="section">
   <h3 class="title">
-    <a class="toc" id="Live-demonstration" href="#a-606983728">3.2.1</a>&nbsp;&nbsp;Live demonstration
+    <a class="toc" id="Live-demonstration" href="#a-607002378">3.2.1</a>&nbsp;&nbsp;Live demonstration
   </h3>
   <div class="content"><p>Now that you have a command prompt, let us walk through a quick demonstration that highlights the main features of Rumai.  You can follow along by copying &#38; pasting the presented commands into the interactive shell.</p>
 	<p><div class="section">
   <h4 class="title">
-    <a class="toc" id="Automated-client-arrangement" href="#a-606985418">3.2.1.1</a>&nbsp;&nbsp;Automated client arrangement
+    <a class="toc" id="Automated-client-arrangement" href="#a-607004068">3.2.1.1</a>&nbsp;&nbsp;Automated client arrangement
   </h4>
   <div class="content"><p>Launch a few terminals so that we have something to work with:
 <pre class="code">
@@ -1066,12 +1070,12 @@ curr_view.arrange_as_larswm
 	<p>Close the terminals we launched earlier:
 <pre class="code">
 terms = curr_view.clients.select {|c| colors.include? c.label.read }
-terms.each {|c| c.ctl.write <span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="color:#D20">kill</span><span style="color:#710">&quot;</span></span> }
+terms.each {|c| c.kill }
 </pre></p></div>
 </div>
 <div class="section">
   <h4 class="title">
-    <a class="toc" id="Multiple-client-grouping" href="#a-606092078">3.2.1.2</a>&nbsp;&nbsp;Multiple client grouping
+    <a class="toc" id="Multiple-client-grouping" href="#a-607006288">3.2.1.2</a>&nbsp;&nbsp;Multiple client grouping
   </h4>
   <div class="content"><p>Launch a few terminals so that we have something to work with:
 <pre class="code">
@@ -1112,7 +1116,7 @@ grouping.each {|c| c.send <span style="background-color:#fff0f0"><span style="co
 	<p>Close the terminals we launched earlier:
 <pre class="code">
 terms = curr_view.clients.select {|c| colors.include? c.label.read }
-terms.each {|c| c.ctl.write <span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="color:#D20">kill</span><span style="color:#710">&quot;</span></span> }
+terms.each {|c| c.kill }
 </pre></p>
@@ -1123,7 +1127,7 @@ terms.each {|c| c.ctl.write <span style="background-color:#fff0f0"><span style="
 </div>
 <div class="section">
   <h4 class="title">
-    <a class="toc" id="Easy-column-manipulation" href="#a-606113088">3.2.1.3</a>&nbsp;&nbsp;Easy column manipulation
+    <a class="toc" id="Easy-column-manipulation" href="#a-607008668">3.2.1.3</a>&nbsp;&nbsp;Easy column manipulation
   </h4>
   <div class="content"><p>Launch a few terminals so that we have something to work with:
 <pre class="code">
@@ -1183,12 +1187,12 @@ curr_view.areas[<span style="color:#00D; font-weight:bold">3</span>].push terms
 	<p>Close the terminals we launched earlier:
 <pre class="code">
 terms = curr_view.clients.select {|c| colors.include? c.label.read }
-terms.each {|c| c.ctl.write <span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="color:#D20">kill</span><span style="color:#710">&quot;</span></span> }
+terms.each {|c| c.kill }
 </pre></p></div>
 </div>
 <div class="section">
   <h4 class="title">
-    <a class="toc" id="Easy-client-manipulation" href="#a-606129268">3.2.1.4</a>&nbsp;&nbsp;Easy client manipulation
+    <a class="toc" id="Easy-client-manipulation" href="#a-607011198">3.2.1.4</a>&nbsp;&nbsp;Easy client manipulation
   </h4>
   <div class="content"><p>Launch a few terminals so that we have something to work with:
 <pre class="code">
@@ -1259,12 +1263,12 @@ red.send curr_view.areas.last
 	<p>Close the terminals we launched earlier:
 <pre class="code">
 terms = curr_view.clients.select {|c| colors.include? c.label.read }
-terms.each {|c| c.ctl.write <span style="background-color:#fff0f0"><span style="color:#710">&quot;</span><span style="color:#D20">kill</span><span style="color:#710">&quot;</span></span> }
+terms.each {|c| c.kill }
 </pre></p></div>
 </div>
 <div class="section">
   <h4 class="title">
-    <a class="toc" id="Traversing-the-file-system" href="#a-606134168">3.2.1.5</a>&nbsp;&nbsp;Traversing the file system
+    <a class="toc" id="Traversing-the-file-system" href="#a-607013848">3.2.1.5</a>&nbsp;&nbsp;Traversing the file system
   </h4>
   <div class="content"><p>Show the root node of wmii&#8217;s IXP file system:
 <pre class="code">
@@ -1331,7 +1335,7 @@ b.exist? <span style="color:#888">#=&gt; false</span>
 </div>
 <div class="section">
   <h3 class="title">
-    <a class="toc" id="Available-commands" href="#a-606141278">3.2.2</a>&nbsp;&nbsp;Available commands
+    <a class="toc" id="Available-commands" href="#a-607016918">3.2.2</a>&nbsp;&nbsp;Available commands
   </h3>
   <div class="content">The following table lists all methods provided by the <code class="code"><span style="color:#036; font-weight:bold">Rumai</span></code> module and its subordinates.  See the <a href="api/index.html">API documentation</a> for more extensive documentation.
@@ -1476,13 +1480,6 @@ Checks if this area is a column in the managed area.
 			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">Area</span><span style="color:#888">#concat(aArea)</span></code> </td>
 			<td> <p>
 Concatenates the given area to the bottom of this area.
-</p>
- </td>
-		</tr>
-		<tr>
-			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">Area</span><span style="color:#888">#ctl_id()</span></code> </td>
-			<td> <p>
-Makes the ID usable in wmii&#8216;s /ctl commands.
 </p>
  </td>
 		</tr>
@@ -1649,6 +1646,13 @@ Adds this client to the current grouping.
 			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">Client</span><span style="color:#888">#group?()</span></code> </td>
 			<td> <p>
 Checks if this client is included in the current grouping.
+</p>
+ </td>
+		</tr>
+		<tr>
+			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">Client</span><span style="color:#888">#kill()</span></code> </td>
+			<td> <p>
+Terminates this client nicely (requests this window to be closed).
 </p>
  </td>
 		</tr>
@@ -1841,7 +1845,7 @@ Returns the parent node of this node.
  </td>
 		</tr>
 		<tr>
-			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">Node</span><span style="color:#888">#read()</span></code> </td>
+			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">Node</span><span style="color:#888">#read(*aArgs)</span></code> </td>
 			<td> <p>
 Returns the entire content of this node. See Rumai::IXP::Client#read for
 details.
@@ -1959,7 +1963,7 @@ processed in the iteration.
  </td>
 		</tr>
 		<tr>
-			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">View</span><span style="color:#888">#floating_area()</span></code> </td>
+			<td> <code class="code"><span style="color:#036; font-weight:bold">Rumai</span>::<span style="color:#036; font-weight:bold">View</span><span style="color:#888">#floater()</span></code> </td>
 			<td> <p>
 Returns the floating area of this view.
 </p>
@@ -2010,7 +2014,7 @@ Returns the currently focused view.
 </div>
 <div class="section">
   <h2 class="title">
-    <a class="toc" id="wmiirc" href="#a-607083858">3.3</a>&nbsp;&nbsp;Scripting your wmiirc
+    <a class="toc" id="wmiirc" href="#a-607024218">3.3</a>&nbsp;&nbsp;Scripting your wmiirc
   </h2>
   <div class="content"><p>One important application of Rumai is the support of Ruby-based <tt>wmiirc</tt> configuration files. For a solid example of such application, take a look at my personal <tt>wmiirc</tt> which uses Rumai extensively:</p>
@@ -2027,9 +2031,13 @@ Returns the currently focused view.
     <hr style="display: none"/>
     <br style="display: none"/>
     <div id="footer">
-      Generated on Sat Jan 26 19:52:45 -0800 2008 by <a href="http://gerbil.rubyforge.org">Gerbil</a> 1.1.0.
+      Generated on Mon Feb 04 22:22:40 -0800 2008 by <a href="http://gerbil.rubyforge.org">Gerbil</a> 2.0.0.
     </div>
   </body>
 </html>

data/lib/rumai/fs.rb CHANGED Viewed

@@ -67,14 +67,14 @@ module Rumai
     # Returns the entire content of this node.
     # See Rumai::IXP::Client#read for details.
-    def read
-      AGENT.read @path
+    def read *aArgs
+      AGENT.read @path, *aArgs
     end
     # Invokes the given block for every line in the content of this node.
     def each_line &aBlock #:yields: line
       open do |file|
-        until (chunk = file.read_partial).empty?
+        until (chunk = file.read(true)).empty?
           chunk.each_line(&aBlock)
         end
       end

data/lib/rumai/ixp/message.rb CHANGED Viewed

@@ -29,8 +29,7 @@ module Rumai
       # Unpacks the given number of bytes from this 9P2000 byte stream.
       def read_9p aNumBytes
-        fmt = PACKING_FLAGS[aNumBytes]
-        read(aNumBytes).unpack(fmt)[0]
+        read(aNumBytes).unpack(PACKING_FLAGS[aNumBytes])[0]
       end
     end
@@ -49,26 +48,16 @@ module Rumai
         @values = aFieldValues
       end
-      # Returns the value of the given field inside this structure.
-      def [] aField
-        @values[aField.name]
-      end
-      # Sets the value of the given field inside this structure.
-      def []= aField, aValue
-        @values[aField.name] = aValue
-      end
       # Transforms this object into a string of 9P2000 bytes.
       def to_9p
-        fields.inject('') {|s,f| s << f.to_9p(self) }
+        @fields.inject('') {|s,f| s << f.to_9p(@values) }
       end
       # Populates this object with information
       # from the given 9P2000 byte stream.
       def load_9p aStream
-        fields.each do |f|
-          f.load_9p aStream, self
+        @fields.each do |f|
+          f.load_9p aStream, @values
         end
       end
@@ -119,14 +108,9 @@ module Rumai
       private
-      # A field inside a Struct.
-      #
-      # * A field's value is considered to be:
-      #   * array of format when <code>counter && format.is_a? Class</code>
-      #   * raw byte string when <code>counter && format.nil?</code>
-      #
-      # Field values are stored as instance variables inside a structure.
-      #
+      # A field inside a Struct.  A field's value is considered to be:
+      # * array of format when <code>counter && format.is_a? Class</code>
+      # * raw byte string when <code>counter && format.nil?</code>
       class Field
         attr_reader :name, :format, :counter, :countee
@@ -174,14 +158,14 @@ module Rumai
         end
         # Transforms this object into a string of 9P2000 bytes.
-        def to_9p aStruct
-          value_to_9p aStruct[self]
+        def to_9p aFieldValues
+          value_to_9p aFieldValues[@name]
         end
         # Populates this object with information
         # taken from the given 9P2000 byte stream.
-        def load_9p aStream, aStruct
-          aStruct[self] = value_from_9p aStream
+        def load_9p aStream, aFieldValues
+          aFieldValues[@name] = value_from_9p aStream
         end
         private
@@ -200,15 +184,15 @@ module Rumai
         # Methods for a field that counts the length of another field.
         module CounterField
-          def to_9p aStruct
-            value_to_9p aStruct[@countee].length
+          def to_9p aFieldValues
+            value_to_9p aFieldValues[@countee.name].length
           end
         end
         # Methods for a field whose length is counted by another field.
         module CounteeField
-          def to_9p aStruct
-            value = aStruct[self]
+          def to_9p aFieldValues
+            value = aFieldValues[@name]
             if @format
               value.map {|v| value_to_9p v}.join
@@ -217,10 +201,10 @@ module Rumai
             end
           end
-          def load_9p aStream, aStruct
-            count = aStruct[@counter].to_i
+          def load_9p aStream, aFieldValues
+            count = aFieldValues[@counter.name].to_i
-            aStruct[self] =
+            aFieldValues[@name] =
               if @format
                 Array.new(count) { value_from_9p aStream }
               else
@@ -614,8 +598,7 @@ class String
   # Creates a new instance of this class from the
   # given 9P2000 byte stream and returns the instance.
   def self.from_9p aStream
-    count = aStream.read_9p(2)
-    aStream.read(count)
+    aStream.read(aStream.read_9p(2))
   end
 end