bychar 1.2.1 → 2.0.0

data/test/{test_bychar.rb → test_ioreader.rb}

@@ -5,54 +5,53 @@ class TestBychar < Test::Unit::TestCase
   def test_reads_once
     s = StringIO.new("This is a string")
     
-    reader = Bychar::Reader.new(s)
-    assert_equal "T", reader.read_one_byte
-    assert_equal "h", reader.read_one_byte
-    assert !reader.eof?
+    reader = Bychar::ReaderIOBuf.new(s)
+    assert_equal "T", reader.read_one_char!
+    assert_equal "h", reader.read_one_char!
   end
   
   def test_reads_set_buffer_size
     s = StringIO.new("abcd")
     flexmock(s).should_receive(:read).with(4).once.and_return("abcd")
-    reader = Bychar::Reader.new(s, 4)
-    reader.read_one_byte
+    reader = Bychar::ReaderIOBuf.new(s, 4)
+    reader.read_one_char!
   end
   
   def test_reads_in_64kb_chunks_by_default
     s = StringIO.new("abcd")
     flexmock(s).should_receive(:read).with(Bychar::DEFAULT_BUFFER_SIZE).once.and_return("abcd")
-    reader = Bychar::Reader.new(s)
-    reader.read_one_byte
+    reader = Bychar::ReaderIOBuf.new(s)
+    reader.read_one_char!
   end
   
   def test_eof_with_empty
     s = StringIO.new
-    reader = Bychar::Reader.new(s)
-    assert s.eof?
+    reader = Bychar::ReaderIOBuf.new(s)
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
   end
   
   def test_eof_with_io_at_eof
     s = StringIO.new("foo")
     s.read(3)
-    reader = Bychar::Reader.new(s)
-    assert reader.eof?
+    reader = Bychar::ReaderIOBuf.new(s)
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
   end
   
   def test_eof_with_string_to_size
     s = "Foobarboo another"
     s = StringIO.new(s)
-    reader = Bychar::Reader.new(s, 1)
-    s.length.times { reader.read_one_byte }
-    assert reader.eof?
+    reader = Bychar::ReaderIOBuf.new(s, 1)
+    s.length.times { reader.read_one_char! }
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
   end
   
   def test_read_one_byte_and_raise_at_eof
     str = "Frobobo"
     
     bytes = []
-    assert_raise(Bychar::EOFError) do
-      s = Bychar::Reader.new(StringIO.new(str))
-      loop { bytes << s.read_one_byte! }
+    assert_raise(Bychar::EOF) do
+      s = Bychar::ReaderIOBuf.new(StringIO.new(str))
+      loop { bytes << s.read_one_char! }
     end
     
     assert_equal %w( F r o b o b o ), bytes

data/test/test_reader.rb

@@ -0,0 +1,45 @@
+require 'helper'
+require 'stringio'
+
+class TestReader < Test::Unit::TestCase
+  def test_reads_once
+    s = StringIO.new("This is a string")
+    
+    reader = Bychar.wrap(s)
+    assert_equal "T", reader.read_one_char!
+    assert_equal "h", reader.read_one_char!
+  end
+  
+  def test_eof_with_empty
+    s = StringIO.new
+    reader = Bychar.wrap(s)
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
+  end
+  
+  def test_eof_with_io_at_eof
+    s = StringIO.new("foo")
+    s.read(3)
+    reader = Bychar.wrap(s)
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
+  end
+  
+  def test_eof_with_string_to_size
+    s = "Foobarboo another"
+    s = StringIO.new(s)
+    reader = Bychar.wrap(s)
+    s.length.times { reader.read_one_char! }
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
+  end
+  
+  def test_read_one_byte_and_raise_at_eof
+    str = "Frobobo"
+    bytes = []
+    assert_raise(Bychar::EOF) do
+      s = Bychar.wrap(StringIO.new(str))
+      loop { bytes << s.read_one_char! }
+    end
+    
+    assert_equal %w( F r o b o b o ), bytes
+  end
+  
+end

data/test/test_strreader.rb

@@ -0,0 +1,46 @@
+require 'helper'
+require 'stringio'
+
+class TestStrReader < Test::Unit::TestCase
+  def test_reads_once
+    s = StringIO.new("This is a string")
+    
+    reader = Bychar::ReaderIOBuf.new(s)
+    assert_equal "T", reader.read_one_char!
+    assert_equal "h", reader.read_one_char!
+  end
+  
+  def test_eof_with_empty
+    s = StringIO.new
+    reader = Bychar::ReaderStrbuf.new(s)
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
+  end
+  
+  def test_eof_with_io_at_eof
+    s = StringIO.new("foo")
+    s.read(3)
+    reader = Bychar::ReaderStrbuf.new(s)
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
+  end
+  
+  def test_eof_with_string_to_size
+    s = "Foobarboo another"
+    s = StringIO.new(s)
+    reader = Bychar::ReaderStrbuf.new(s)
+    s.length.times { reader.read_one_char! }
+    assert_raise(Bychar::EOF) { reader.read_one_char! }
+  end
+  
+  def test_read_one_byte_and_raise_at_eof
+    str = "Frobobo"
+    
+    bytes = []
+    assert_raise(Bychar::EOF) do
+      s = Bychar::ReaderStrbuf.new(StringIO.new(str))
+      loop { bytes << s.read_one_char! }
+    end
+    
+    assert_equal %w( F r o b o b o ), bytes
+  end
+  
+end

data/test/test_z_bench.rb

@@ -0,0 +1,61 @@
+require 'helper'
+require 'stringio'
+require 'tempfile'
+
+
+
+class BenchReader
+  
+  def initialize(reader_class)
+    @reader = reader_class
+  end
+  
+  def get_reader(io)
+    @reader.new(io)
+  end
+  
+  def pick
+    get_reader(StringIO.new).class.to_s
+  end
+  
+  def run
+    File.open(File.dirname(__FILE__) + "/huge_nuke_tcl.tcl") do | io |
+      reader = get_reader(io)
+      begin
+        loop { reader.read_one_char! * 2 }
+      rescue Bychar::EOF
+      end
+    end
+  end
+end
+
+class Auto
+  def self.new(io)
+    Bychar.wrap(io)
+  end
+end
+
+class TestBenchmarkReaders < Test::Unit::TestCase
+  def test_perf
+    
+    reader0 = BenchReader.new(Bychar::ReaderBare)
+    reader1 = BenchReader.new(Bychar::ReaderIOBuf)
+    reader2 = BenchReader.new(Bychar::ReaderStrbuf)
+    reader3 = BenchReader.new(Auto)
+    
+    platform = "Platform-picked Bychar.wrap(io) #{reader3.pick}:"
+    
+    require 'benchmark'
+
+    Benchmark.bm(5) do |x|
+      x.report("Bare IO using read(1):".ljust(platform.length)) { reader0.run }
+      x.report("Bychar using StringIO:".ljust(platform.length)) { reader1.run }
+      x.report("Bychar using a String buffer:".ljust(platform.length)) { reader2.run }
+      x.report(platform) { reader3.run }
+
+    end
+    
+    assert true
+  end
+end
+

metadata

@@ -1,80 +1,82 @@
 --- !ruby/object:Gem::Specification
 name: bychar
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 2.0.0
+  prerelease:
 platform: ruby
 authors:
 - Julik Tarkhanov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.12'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.4
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: flexmock
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
+    none: false
+  prerelease: false
+  type: :development
 description: ! ' Helps parsing IO char by char '
 email: me@julik.nl
 executables: []
@@ -91,34 +93,43 @@ files:
 - Rakefile
 - bychar.gemspec
 - lib/bychar.rb
+- lib/impls/reader_bare.rb
+- lib/impls/reader_iobuf.rb
+- lib/impls/reader_strbuf.rb
 - test/helper.rb
-- test/test_bychar.rb
+- test/huge_nuke_tcl.tcl
+- test/test_ioreader.rb
+- test/test_reader.rb
+- test/test_strreader.rb
+- test/test_z_bench.rb
 homepage: http://github.com/julik/bychar
 licenses:
 - MIT
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -2517849728634494655
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Helps parsing IO char by char
 test_files: []