filter_io 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/filter_io.rb

@@ -1,4 +1,7 @@
 require 'active_support'
+require 'active_support/core_ext/string'
+require 'active_support/core_ext/array'
+require 'active_support/core_ext/hash'
 
 class FilterIO
   
@@ -269,7 +272,7 @@ class FilterIO
       end
       
     rescue NeedMoreData => e
-      raise EOFError, 'end of file reached' if eof?
+      raise EOFError, 'end of file reached' if @io.eof?
       data << @io.read(block_size)
       retry
     end
@@ -304,6 +307,7 @@ class FilterIO
       args = [data, state]
       args = args.first(@block.arity > 0 ? @block.arity : 1)
       data = @block.call(*args)
+      raise IOError, 'Block returned nil' if data.nil?
     end
     
     data

data/test/filter_io_test.rb

@@ -635,11 +635,20 @@ class FilterIOTest < ActiveSupport::TestCase
   
   test "need more data at eof" do
     input = "foo"
-    io = FilterIO.new(StringIO.new(input), :block_size => 2) do |data|
-      raise FilterIO::NeedMoreData
-    end
-    assert_raise EOFError do
-      io.readline
+    [2,3,6].each do |block_size|
+      [true, false].each do |always|
+        count = 0
+        io = FilterIO.new(StringIO.new(input), :block_size => block_size) do |data, state|
+          count += 1
+          raise FilterIO::NeedMoreData if state.eof? or always
+          data
+        end
+        assert_raise EOFError do
+          io.readline
+        end
+        expected_count = block_size < input.size ? 2 : 1
+        assert_equal expected_count, count
+      end
     end
   end
   
@@ -715,4 +724,11 @@ class FilterIOTest < ActiveSupport::TestCase
     end
   end
   
+  test "should raise IO error if block returns nil" do
+    io = FilterIO.new(StringIO.new("foo")) { |data| nil }
+    assert_raise IOError do
+      io.read.to_a
+    end
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: filter_io
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jason Weathered
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 +10:00
+date: 2010-07-12 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency