piperator 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af5e198f4b96db3cee04f76d28630879c8a6d7f69a83b7aef26d895ccff7051a
-  data.tar.gz: 236c0753cdde6275d2e9bf350b2afa839312bbe72a636eff5a190a1a6bcd8b3b
+  metadata.gz: 13c2413016f50d1f376666a3997bb0419fd3bbe0311913c9b2d694ab80b47083
+  data.tar.gz: 5b452fb6d8bc029accb4c32cd5b692d377ead539cc164dd65f6aba4715d51c75
 SHA512:
-  metadata.gz: 17220ec804befc2717354c004a9c0b038d00618a3296ac773e77a99d14333d3dafc87d73b112dc1921eeaf6c67e4b7e8e8070ba42cd983b692d9a7c73999e44c
-  data.tar.gz: b74fe2c27cc940c5be501ecfb429dad7a89fde7283f30f67c64840013361a32101e7d9b5fa72b590d13750b8f75bc94683139cc38bdc8d0309516d04ffc931f5
+  metadata.gz: '07794c6e1760367b51fab0667afac9275fa61c81d34e1de3b1d68be245246a04d0040869e6e27f49e7d2de90057e0edddd3ab9bcba0cb0620fd4d61ac3112d7e'
+  data.tar.gz: 372fc0fb1fc79832d312bf661019ff6f4203c702a139a3c3fe03ab8f8b2636826ade5a20fa60e288580177ae58f812320e6419ab341d9ac2bb80c51e9fa599d9

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.0 (6 December 2019)
+
+- add `#pos` to Piperator::IO to get current position
+
 ## 1.0.0. (13 October 2019)
 
 - add `Piperator.build` to build pipelines with DSL

data/lib/piperator/io.rb

@@ -6,22 +6,24 @@ module Piperator
     FLUSH_THRESHOLD = 128 * 1028 # 128KiB
 
     attr_reader :eof
+    attr_reader :pos
 
     def initialize(enumerator, flush_threshold: FLUSH_THRESHOLD)
       @enumerator = enumerator
       @flush_threshold = flush_threshold
-      @io = StringIO.new
-      @buffer_start_pos = 0
-      @io_read_pos = 0
+      @buffer = StringIO.new
+      @pos = 0
+      @buffer_read_pos = 0
       @eof = false
     end
 
     alias eof? eof
+    alias tell pos
 
     # Return the first bytes of the buffer without marking the buffer as read.
     def peek(bytes)
       while @eof == false && readable_bytes < (bytes || 1)
-        @io.write(@enumerator.next)
+        @buffer.write(@enumerator.next)
       end
       peek_buffer(bytes)
     rescue StopIteration
@@ -38,22 +40,22 @@ module Piperator
     def gets(separator = $INPUT_RECORD_SEPARATOR, _limit = nil)
       while !@eof && !contains_line?(separator)
         begin
-          @io.write(@enumerator.next)
+          @buffer.write(@enumerator.next)
         rescue StopIteration
           @eof = true
           nil
         end
       end
-      read_with { @io.gets(separator) }
+      read_with { @buffer.gets(separator) }
     end
 
     # Flush internal buffer until the last unread byte
     def flush
-      if @io.pos == @io_read_pos
+      if @buffer.pos == @buffer_read_pos
         initialize_buffer
       else
-        @io.pos = @io_read_pos
-        initialize_buffer(@io.read)
+        @buffer.pos = @buffer_read_pos
+        initialize_buffer(@buffer.read)
       end
     end
 
@@ -62,56 +64,56 @@ module Piperator
     # @param length [Integer] number of bytes to read
     # @return String
     def read(length = nil)
-      return @enumerator.next if length.nil? && readable_bytes.zero?
-      @io.write(@enumerator.next) while !@eof && readable_bytes < (length || 1)
-      read_with { @io.read(length) }
+      return @enumerator.next.tap { |e| @pos += e.bytesize } if length.nil? && readable_bytes.zero?
+      @buffer.write(@enumerator.next) while !@eof && readable_bytes < (length || 1)
+      read_with { @buffer.read(length) }
     rescue StopIteration
       @eof = true
-      read_with { @io.read(length) } if readable_bytes > 0
+      read_with { @buffer.read(length) } if readable_bytes > 0
     end
 
     # Current buffer size - including non-freed read content
     #
     # @return [Integer] number of bytes stored in buffer
     def used
-      @io.size
+      @buffer.size
     end
 
     private
 
     def readable_bytes
-      @io.pos - @io_read_pos
+      @buffer.pos - @buffer_read_pos
     end
 
     def read_with
-      pos = @io.pos
-      @io.pos = @io_read_pos
+      pos = @buffer.pos
+      @buffer.pos = @buffer_read_pos
 
       yield.tap do |data|
-        @io_read_pos += data.bytesize if data
-        @io.pos = pos
+        @buffer_read_pos += data.bytesize if data
+        @buffer.pos = pos
         flush if flush?
       end
     end
 
     def peek_buffer(bytes)
-      @io.string.byteslice(@io_read_pos...@io_read_pos + bytes)
+      @buffer.string.byteslice(@buffer_read_pos...@buffer_read_pos + bytes)
     end
 
     def flush?
-      @io.pos == @io_read_pos || @io.pos > @flush_threshold
+      @buffer.pos == @buffer_read_pos || @buffer.pos > @flush_threshold
     end
 
     def initialize_buffer(data = nil)
-      @io_read_pos = 0
-      @buffer_start_pos += @io.pos if @io
-      @io = StringIO.new
-      @io.write(data) if data
+      @pos += @buffer_read_pos
+      @buffer_read_pos = 0
+      @buffer = StringIO.new
+      @buffer.write(data) if data
     end
 
     def contains_line?(separator = $INPUT_RECORD_SEPARATOR)
       return true if @eof
-      @io.string.byteslice(@io_read_pos..-1).include?(separator)
+      @buffer.string.byteslice(@buffer_read_pos..-1).include?(separator)
     rescue ArgumentError # Invalid UTF-8
       false
     end

data/lib/piperator/version.rb

@@ -1,4 +1,4 @@
 module Piperator
   # Piperator version
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: piperator
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Ville Lautanala
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-13 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler