filter_io 0.1.4 → 0.1.5

data/.gitignore

@@ -1,3 +1,4 @@
 *.gemspec
 pkg
 coverage
+.bundle

data/Gemfile

@@ -0,0 +1,6 @@
+source :gemcutter
+
+gem 'jeweler'
+gem 'activesupport', '>=2.3.9'
+gem 'i18n', '>=0.4.1'
+gem 'test-unit'

data/Gemfile.lock

@@ -0,0 +1,24 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.0)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    i18n (0.4.1)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    test-unit (2.1.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 2.3.9)
+  i18n (>= 0.4.1)
+  jeweler
+  test-unit

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/filter_io.rb

@@ -279,6 +279,11 @@ class FilterIO
     
     data = [data] unless data.is_a? Array
     raise 'Block must have 1 or 2 values' unless data.size <= 2
+    if @buffer.respond_to?(:encoding) && @buffer.encoding != data[0].encoding
+      if [@buffer, data[0]].any? { |x| x.encoding.to_s == 'ASCII-8BIT' }
+        data[0] = data[0].dup.force_encoding @buffer.encoding
+      end
+    end
     @buffer << data[0]
     if data[1]
       if @io.respond_to?(:internal_encoding) && @io.internal_encoding

data/test/filter_io_test.rb

@@ -242,6 +242,16 @@ class FilterIOTest < ActiveSupport::TestCase
       end
     end
     
+    test "block returning mix of UTF-8 and ASCII-8BIT" do
+      input = "X\xE2\x80\x94Y\xe2\x80\x99"
+      input.force_encoding 'ASCII-8BIT'
+      io = FilterIO.new(StringIO.new(input), :block_size => 4) do |data, state|
+        data.force_encoding data[0] == 'Y' ? 'UTF-8' : 'ASCII-8BIT'
+        data
+      end
+      assert_equal input, io.read
+    end
+    
   end
   
   test "read" do
@@ -431,7 +441,7 @@ class FilterIOTest < ActiveSupport::TestCase
   
   test "need more data" do
     input = '1ab123456cde78f9ghij0'
-    expected = input.gsub /\d+/, '[\0]'
+    expected = input.gsub(/\d+/, '[\0]')
     (1..5).each do |block_size|
       expected_size = 0
       io = FilterIO.new(StringIO.new(input), :block_size => block_size) do |data, state|
@@ -439,7 +449,7 @@ class FilterIOTest < ActiveSupport::TestCase
         raise FilterIO::NeedMoreData if data =~ /\d\z/ && !state.eof?
         assert_equal expected_size, data.size unless state.eof?
         expected_size = 0
-        data.gsub /\d+/, '[\0]'
+        data.gsub(/\d+/, '[\0]')
       end
       assert_equal expected, io.read
     end
@@ -451,7 +461,7 @@ class FilterIOTest < ActiveSupport::TestCase
     (1..5).each do |block_size|
       io = FilterIO.new(StringIO.new(input), :block_size => block_size) do |data, state|
         raise FilterIO::NeedMoreData if data =~ /[\r\n]\z/ && !state.eof?
-        data.gsub /\r\n|\r|\n/, "\n"
+        data.gsub(/\r\n|\r|\n/, "\n")
       end
       assert_equal expected, io.read
     end
@@ -459,10 +469,10 @@ class FilterIOTest < ActiveSupport::TestCase
   
   test "dropping characters" do
     input = "ab1cde23f1g4hijklmno567pqr8stu9vw0xyz"
-    expected = input.gsub /\d+/, ''
+    expected = input.gsub(/\d+/, '')
     (1..5).each do |block_size|
       io = FilterIO.new(StringIO.new(input), :block_size => block_size) do |data|
-        data.gsub /\d+/, ''
+        data.gsub(/\d+/, '')
       end
       assert_equal 0, io.pos
       assert_equal expected, io.read
@@ -621,19 +631,19 @@ class FilterIOTest < ActiveSupport::TestCase
     assert_equal 'c', io.read(1)
     assert_equal 3, io.pos
     assert_raise Errno::EINVAL do
-      io.seek -1, IO::SEEK_CUR
+      io.seek(-1, IO::SEEK_CUR)
     end
     assert_equal 3, io.pos
     
     # forwards fail
     assert_equal 3, io.pos
     assert_raise Errno::EINVAL do
-      io.seek 2, IO::SEEK_CUR
+      io.seek(2, IO::SEEK_CUR)
     end
     assert_equal 3, io.pos
     
     # beginning
-    io.seek -io.pos, IO::SEEK_CUR
+    io.seek(-io.pos, IO::SEEK_CUR)
     assert_equal 0, io.pos
     
   end
@@ -641,13 +651,13 @@ class FilterIOTest < ActiveSupport::TestCase
   test "seek end" do
     io = FilterIO.new(StringIO.new("abcdef"))
     assert_raise Errno::EINVAL do
-      io.seek 0, IO::SEEK_END
+      io.seek(0, IO::SEEK_END)
     end
     assert_raise Errno::EINVAL do
-      io.seek 6, IO::SEEK_END
+      io.seek(6, IO::SEEK_END)
     end
     assert_raise Errno::EINVAL do
-      io.seek -6, IO::SEEK_END
+      io.seek(-6, IO::SEEK_END)
     end
   end
   

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: filter_io
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jason Weathered
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +10:00
+date: 2010-09-13 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -43,6 +41,8 @@ extra_rdoc_files:
 - README.markdown
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.markdown
 - Rakefile
@@ -64,7 +64,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -73,7 +72,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"