rio 0.3.6 → 0.3.7

data/test/tc/dirautoclose.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_dirss < Test::Unit::TestCase
@@ -35,9 +32,9 @@ class TC_dirss < Test::Unit::TestCase
     indir = rio('tdir')
     #indir = @d[1]
     $trace_states = true
-    p indir.map(&:to_s)
+    p indir.map{|el| el.to_s}
     ary = indir[]
-    #p ary.map(&:to_s)
+    #p ary.map{|el| el.to_s}
     p indir,indir.ioh
     newext = '.txt'
     indir.files.rename.each { |ent|
@@ -55,9 +52,9 @@ class TC_dirss < Test::Unit::TestCase
     indir = rio('tdir')
     #indir = @d[1]
     $trace_states = true
-    p indir.map(&:to_s)
+    p indir.map{|el| el.to_s}
     ary = indir[]
-    #p ary.map(&:to_s)
+    #p ary.map{|el| el.to_s}
     p indir,indir.ioh
     newext = '.txt'
     indir.files.rename.each { |ent|

data/test/tc/dirent.rb

@@ -7,11 +7,9 @@ end
 require 'rio'
 require 'test/unit'
 require 'test/unit/testsuite'
-require 'extensions/object'
 
 class TC_RIO_dirent < Test::Unit::TestCase
-  require 'extensions/symbol'
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def tdir() rio(%w/qp dirent/) end
   def mkafile(*args)
     file = rio(*args)
@@ -83,7 +81,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
         re = /1/
         exp = []
         rio('d0').entries(re).each { |ent| exp << ent }
-        rio('d0').files.each { |ent| exp << ent unless ent.in?(exp) }
+        rio('d0').files.each { |ent| exp << ent unless exp.include?(ent) }
 
         ans = []
         rio('d0').entries(re).files.each { |ent| ans << ent }
@@ -94,7 +92,7 @@ class TC_RIO_dirent < Test::Unit::TestCase
         re = /1/
         exp = []
         rio('d0').entries(re).each { |ent| exp << ent }
-        rio('d0').dirs.each { |ent| exp << ent unless ent.in?(exp) }
+        rio('d0').dirs.each { |ent| exp << ent unless exp.include?(ent) }
 
 
         ans = []

data/test/tc/dirss.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_dirss < Test::Unit::TestCase
@@ -69,9 +66,9 @@ class TC_dirss < Test::Unit::TestCase
     indir = rio('tdir')
     #indir = @d[1]
     $trace_states = true
-    p indir.map(&:to_s)
+    p indir.map{|el| el.to_s}
     ary = indir[]
-    #p ary.map(&:to_s)
+    #p ary.map{|el| el.to_s}
     p indir,indir.ioh
     newext = '.txt'
     indir.files.rename.each { |ent|

data/test/tc/each.rb

@@ -53,15 +53,15 @@ class TC_RIO_each < Test::Unit::TestCase
       
       ans = []
       rio('basic.txt').chomp.lines(/2/).each { |line| ans.push(line) }
-      assert_equal([expa[1],expa[4],expa[6]].map(&:chomp),ans)
+      assert_equal([expa[1],expa[4],expa[6]].map{|el| el.chomp},ans)
       
       ans = []
       rio('basic.txt').chomp.lines(/2/) { |line| ans.push(line) }
-      assert_equal([expa[1],expa[4],expa[6]].map(&:chomp),ans)
+      assert_equal([expa[1],expa[4],expa[6]].map{|el| el.chomp},ans)
       
       ans = []
       rio('basic.txt').lines(/2/).chomp { |line| ans.push(line) }
-      assert_equal([expa[1],expa[4],expa[6]].map(&:chomp),ans)
+      assert_equal([expa[1],expa[4],expa[6]].map{|el| el.chomp},ans)
       
       
       expb = ["L1: 0:0\nL2: 3:2\nL3: 6:4\nL4: 9:6\n", "L5: 12:8\nL6: 15:10\nL7: 18:12\nLin", "e Z\n"]

data/test/tc/each_break.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 
 class TC_each_break < Test::Unit::TestCase
@@ -71,7 +68,7 @@ class TC_each_break < Test::Unit::TestCase
     assert_array_equal(@dirs,ans)
 
   end
-  def broken_test_dir_sel
+  def test_dir_sel
     ans = []
     @dir.entries.each { |ent| ans << ent; break }
     assert_array_equal(@ents[0..0],ans)
@@ -131,48 +128,40 @@ class TC_each_break < Test::Unit::TestCase
     assert_equal(@e2[0..0],ans)
 
   end
-  def broken_test_dir_readmore
+  def test_dir_readmore
     ans = []
     ### LOOK INTO THIS
     ### Something changed in ruby 1.8.3
     ### See the file q/dir_readmore.q for a simple example
-    @d1.each { |ent| 
-      p ent
+    dir1 = rio(@d1)
+    dir1.each { |ent| 
       ans << ent; 
       break 
     }
-    assert(@d1.open?)
+    assert(dir1.open?)
     assert_equal(@e1[0..0],ans)
 
-#     #$trace_states = true
-#     ans = []
-#     @d1.each { |ent| 
-#       p ent
-#       ans << ent; 
-#       break 
-#     }
-#     assert(@d1.closed?)
-#     assert_equal([],ans)
-#     $trace_states = false
-
     ans = []
-    @d1.each { |ent| ans << ent; break }
-    assert(@d1.open?)
-    assert_equal(@e1[0..0],ans)
+    #$trace_states = true
+    dir1.each { |ent| ans << ent; break }
+    assert(dir1.closed?)
+    assert_equal([],ans)
+
+    dir2 = rio(@d2)
 
     ans = []
-    @d2.each { |ent| ans << ent; break }
-    assert(@d2.open?)
+    dir2.each { |ent| ans << ent; break }
+    assert(dir2.open?)
     assert_equal(@e2[0..0],ans)
 
     ans = []
-    @d2.each { |ent| ans << ent; break }
-    assert(@d2.open?)
+    dir2.each { |ent| ans << ent; break }
+    assert(dir2.open?)
     assert_equal(@e2[1..1],ans)
 
     ans = []
-    @d2.each { |ent| ans << ent; break }
-    assert(@d2.closed?)
+    dir2.each { |ent| ans << ent; break }
+    assert(dir2.closed?)
     assert_equal([],ans)
 
   end

data/test/tc/edf.rb

@@ -13,8 +13,7 @@ class TC_RIO_edf < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  require 'extensions/symbol'
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map{|el| el.to_s} end
   def mkafile(*args)
     file = rio(*args)
     file < (0..1).map { |i| "L#{i}:#{file.to_s}\n" }

data/test/tc/entary.rb

@@ -5,13 +5,10 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
 require 'tc/testcase'
 
 class TC_RIO_entary < Test::Unit::TestCase
-  require 'extensions/symbol'
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def tdir() rio(%w/qp entary/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/expand_path.rb

@@ -9,7 +9,6 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_expand_path < Test::Unit::TestCase
-  require 'extensions/symbol'
   def initialize(*args)
     super
     @once = false
@@ -18,7 +17,7 @@ class TC_RIO_expand_path < Test::Unit::TestCase
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map{|el| el.to_s} end
   def setup
     s_dir = ''
     #$trace_states = true

data/test/tc/ext.rb

@@ -5,9 +5,6 @@ if $0 == __FILE__
 end
 
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
-require 'extensions/symbol'
 require 'tc/testcase'
 class TC_ext < Test::Unit::TestCase
   @@once = false

data/test/tc/fileno.rb

@@ -9,11 +9,10 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_fileno < Test::Unit::TestCase
-  require 'extensions/symbol'
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map{|el| el.to_s} end
   def tdir() rio(%w/qp fileno/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/get.rb

@@ -0,0 +1,151 @@
+#!/usr/local/bin/ruby
+if $0 == __FILE__
+  Dir.chdir File.dirname(__FILE__)+'/../'
+  $:.unshift File.expand_path('../lib/')
+end
+
+require 'rio'
+require 'tc/testcase'
+
+class TC_get < Test::RIO::TestCase
+  @@once = false
+  def self.once
+    @@once = true
+  end
+  def setup
+    super
+    self.class.once unless @@once
+  end
+  def test_file
+    (0..4).each do |n_lines|
+      get_each(n_lines)
+    end
+  end
+  def get_each(n_lines)
+    f = rio('f.txt')
+    expa = (0..n_lines-1).map { |a| "Line#{a}\n" }
+    f < expa
+    
+    f = rio('f.txt')
+    assert_equal(expa,f[])
+    #  $trace_states = true
+
+    # iterate twice using #get (no auto close)
+    begin
+      f = rio('f.txt').nocloseoneof
+      ans = []
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+
+    # iterate using #get then using #each (no auto close)
+    begin
+      f = rio('f.txt').nocloseoneof
+      ans = []
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+    
+    # iterate using #each then using #get (no auto close)
+    begin
+      f = rio('f.txt').nocloseoneof
+      ans = []
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+    
+    # iterate twice using #get (with auto close)
+    begin
+      f = rio('f.txt')
+      ans = []
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa,ans)
+      while rec = f.get
+        ans << rec
+      end
+      assert_equal(expa+expa,ans)
+    end
+    
+    # assure get returns nil once after iteration using #get (with auto close)
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+
+      rec = f.get
+      assert_nil(rec)
+
+      rec = f.get
+      assert_equal(expa[0],rec)
+    end
+
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      rec = f.get
+      assert_equal(expa[0],rec)
+      ans << rec unless rec.nil?
+      f.each do |rec|
+        ans << rec
+      end
+      rec = f.get
+      assert_nil(rec)
+    end
+
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      (0...n_lines).each do |n|
+        rec = f.get
+        assert_equal(expa[n],rec)
+      end
+      rec = f.get
+      assert_nil(rec)
+
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+
+    begin
+      f = rio('f.txt')
+      ans = []
+
+      (0...n_lines).each do |n|
+        rec = f.get
+        assert_equal(expa[n],rec)
+      end
+      f.each do |rec|
+        ans << rec
+      end
+      assert_equal(expa,ans)
+    end
+  end
+end

data/test/tc/lineno.rb

@@ -9,11 +9,10 @@ require 'test/unit'
 require 'test/unit/testsuite'
 
 class TC_RIO_lineno < Test::Unit::TestCase
-  require 'extensions/symbol'
   def assert!(a,msg="negative assertion")
     assert((!(a)),msg)
   end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map{|el| el.to_s} end
   def tdir() rio(%w/qp lineno/) end
   def mkafile(*args)
     file = rio(*args)

data/test/tc/methods.rb

@@ -72,7 +72,7 @@ class TC_RIO_methods < Test::Unit::TestCase
 #    $trace_states = true
     @dir.mkpath.chdir
     @lines = (0..5).map { |n| "Line#{n}" }
-    @chlines = @lines.map(&:chomp)
+    @chlines = @lines.map{|el| el.chomp}
     ::File.open('lines','w') do |f|
       @lines.each do |li|
         f.puts(li)

data/test/tc/misc.rb

@@ -4,8 +4,6 @@ if $0 == __FILE__
   $:.unshift File.expand_path('../lib/')
 end
 require 'rio'
-require 'test/unit'
-require 'test/unit/testsuite'
 require 'tc/testcase'
 
 #require 'tc_myfirsttests'
@@ -246,9 +244,7 @@ class TC_RIO_misc < Test::Unit::TestCase
 
     }
   end
-  require 'extensions/symbol'
-  def pa(a) p a.map( &:to_s ) end
-  def smap(a) a.map( &:to_s ) end
+  def smap(a) a.map { |el| el.to_s } end
   def emap(d,a)
     exp = a.map { |f| File.join(d,f) }.sort
   end