filter_io 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2daf76da95ab847d8218f60d72f21bf35c5c9456
+  data.tar.gz: 045a05eb40a210da7c266a4467e0c85577c08055
+SHA512:
+  metadata.gz: 4203fb5d9ba5cde5c0cba11a105c62cb5b944069cb8ffe39b3691533d862477d47f8c6d52c766681d9ec25888311e8af0f1762f2eb76074e5ef6cdf064f2036c
+  data.tar.gz: 8c25baecac50a4b62d2c14147384dfd0cf875e2f7ce2336bd979bdb534d6d5c32fb661ee4fead5f2369ade08bcbb78235d45e7092ff83ed67e2b2a12e9d6c4fc

data/lib/filter_io/version.rb

@@ -1,3 +1,3 @@
 class FilterIO
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/filter_io.rb

@@ -215,8 +215,7 @@ class FilterIO
 
   def each_line(sep_string = $/)
     unless block_given?
-      klass = defined?(Enumerator) ? Enumerator : Enumerable::Enumerator
-      return klass.new(self, :each_line, sep_string)
+      return to_enum(:each_line, sep_string)
     end
     while line = gets(sep_string)
       yield line
@@ -264,10 +263,12 @@ class FilterIO
   def buffer_data(block_size = nil)
     block_size ||= DEFAULT_BLOCK_SIZE
 
-    data = unless @buffer_raw.empty?
-     @buffer_raw.slice! 0, @buffer_raw.bytesize
+    if !@buffer_raw.empty?
+     data = @buffer_raw.slice! 0, @buffer_raw.bytesize
+    elsif data = @io.read(block_size)
+      data.force_encoding(external_encoding)
     else
-     @io.read(block_size) or return
+      return
     end
 
     initial_data_size = data.bytesize
@@ -283,7 +284,7 @@ class FilterIO
       end
     rescue NeedMoreData => e
       raise EOFError, 'end of file reached' if @io.eof?
-      data << @io.read(block_size)
+      data << @io.read(block_size).force_encoding(external_encoding)
       retry
     end
 

data/spec/filter_io_spec.rb

@@ -240,6 +240,16 @@ describe FilterIO do
     end
   end
 
+  it 'supports reading multibyte characters overlapping block boundaries' do
+    input = "\x49\xE2\x99\xA5\x4E\x59\x49\xE2\x99\xA5\x4E\x59".force_encoding('UTF-8')
+
+    io = FilterIO.new(StringIO.new(input), :block_size => 6) do |data, state|
+      [data.byteslice(0).force_encoding('UTF-8'), data.byteslice(1..-1).force_encoding('UTF-8')]
+    end
+
+    expect(io.read).to eq input
+  end
+
   it 'supports a block returning mix of UTF-8 and ASCII-8BIT' do
     input = "X\xE2\x80\x94Y\xe2\x80\x99"
     input.force_encoding 'ASCII-8BIT'

metadata

@@ -1,94 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: filter_io
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.3.9
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
 description: 
@@ -98,12 +87,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - filter_io.gemspec
 - lib/filter_io.rb
 - lib/filter_io/version.rb
@@ -112,33 +100,26 @@ files:
 homepage: http://github.com/jasoncodes/filter_io
 licenses:
 - MIT
+metadata: {}
 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: 4419547183379968853
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4419547183379968853
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Filter IO streams with a block. Ruby's FilterInputStream.
 test_files:
 - spec/filter_io_spec.rb

data/VERSION

@@ -1 +0,0 @@
-0.1.6