io-segmenter 0.7.2 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41882b615cb02ee0e614e868104006e98fafb0ba0b96adb0d55431b13d285116
-  data.tar.gz: 86655c3225adc2bb178d3a31cb4b4cd37f37d538b419316eddd56e24b3059f1a
+  metadata.gz: eeada66a82cb120e8da0241a2847545e7579a2f297dd4e11647a15f118bb95e4
+  data.tar.gz: 128a87fe89da4ff96f55654aaf9da152b40dc3aca4d9be3d8ee76655bb4b76d6
 SHA512:
-  metadata.gz: cac57f6a5ac8b5e345867452acc553f184980541bc0328291eca69261c05471dd9631a5585540eed1bbf4512d062a4abc6b1c97d7f84e901c8cb5049e3b4c722
-  data.tar.gz: 478d2436eb58f002019125135351adaa69eb2c1611cbf610ace311d2ee715f76beb7b25b81b578eea271beeee31c122b1881c88a1664afe1813b5aad659b1b0a
+  metadata.gz: 281e984a75b8f827f7b631b19a26f6bb2522808e97a2727a07829e4d637afaf7949c659238b6311c1e85b3aa6c5a9e753b95b722eb8d5d905770935e2802e531
+  data.tar.gz: 9ecf8b025de77ca0e7ecfc870af16e0b57fd1b2ad8260a42967e8edea514b65e3315a608cfa350e68767b060f61f5b7acd379b20c7783b1db0a3c6b68b0c7b93

data/lib/io-segmenter.rb

@@ -1,97 +1,7 @@
 # frozen_string_literal: true
 
-# IO iterator for parsing segments of streams
-class IOSegmenter
-  include Enumerable
-
-  DEFAULT_READ_SIZE = 8192
-
-  attr_reader :buffer
-
-  def initialize(io, starting_char, ending_char, quote_char, escape_char, max_read_size=DEFAULT_READ_SIZE)
-    @io = io
-    @starting_char = starting_char
-    @ending_char = ending_char
-    @quote_char = quote_char
-    @escape_char = escape_char
-    @max_read_size = max_read_size
-
-    terms = [
-      @starting_char,
-      @ending_char,
-      @quote_char,
-      @escape_char
-    ]
-    terms.compact!
-    terms.map! { |str| Regexp.escape(str) }
-
-    @search = Regexp.new('(:?' + terms.join('|') + ')')
-    @buffer = String.new
-  end
-
-  def each
-    until @io.eof?
-      unpack(@io.read(@max_read_size)) do |segment|
-        yield segment
-      end
-    end
-  end
-
-  def unpack(str)
-    @buffer << str
-    each_segment(@buffer) do |segment|
-      yield segment
-    end
-  end
-    
-  def self.foreach(*args, &block)
-    new(*args).each(&block)
-  end
-
-  private
-
-  def each_segment(buffer)
-    return unless (start_offset = buffer.index(@starting_char))
-
-    brackets = 1
-    offset = start_offset
-
-    opened_quote = false
-
-    while (offset = buffer.index(@search, offset + 1))
-      case buffer[offset]
-      when @ending_char
-        next if opened_quote
-        brackets -= 1
-      when @starting_char
-        next if opened_quote
-        brackets += 1
-      when @quote_char
-        opened_quote = !opened_quote
-        next
-      when @escape_char
-        offset += @escape_char.size
-        next
-      else
-        if @ending_char == buffer[offset, @ending_char.size]
-          next if opened_quote
-          brackets -= 1
-        elsif @starting_char == buffer[offset, @starting_char.size]
-          next if opened_quote
-          brackets += 1
-        else
-          raise("unhandled offset #{offset}, at #{buffer[offset, 20]}...")
-        end
-      end
-
-      next unless brackets.zero?
-
-      len = (offset + @ending_char.size) - start_offset
-      yield buffer[start_offset, len]
-      buffer.slice!(0, offset + @ending_char.size)
-      return unless (start_offset = buffer.index(@starting_char))
-      offset = start_offset
-      brackets = 1
-    end
-  end
+module IOSegmenter
+  autoload :Parser, 'io-segmenter/parser'
+  autoload :Reader, 'io-segmenter/reader'
+  autoload :Writer, 'io-segmenter/writer'
 end

data/lib/io-segmenter/core_ext/file.rb

@@ -1,7 +1,7 @@
 class File
-  def self.each_segment(file, *args, &block)
+  def self.each_segment(file, *args, max_read_size, &block)
     handle = open(file, 'rb')
-    IOSegmenter.new(handle, *args).each(&block)
+    IOSegmenter::Reader.new(handle, IOSegmenter::Parser.new(*args), max_read_size).each(&block)
   ensure
     handle && handle.close
   end

data/lib/io-segmenter/core_ext/io.rb

@@ -1,5 +1,5 @@
 class IO
-  def each_segment(*args, &block)
-    IOSegmenter.new(self, *args).each(&block)
+  def each_segment(*args, max_read_size, &block)
+    IOSegmenter::Reader.new(self, IOSegmenter::Parser.new(*args), max_read_size).each(&block)
   end
 end

data/lib/io-segmenter/core_ext/json.rb

@@ -1,21 +1,21 @@
 # frozen_string_literal: true
 
 module JSON
-  def self.each_object(io, max_read_size=IOSegmenter::DEFAULT_READ_SIZE, &block)
-    IOSegmenter.new(io, '{', '}', '"', '\\', max_read_size).each do |segement|
+  def self.each_object(io, max_read_size=nil, &block)
+    IOSegmenter::Reader.new(io, IOSegmenter::Parser.new('{', '}', '"', '\\'), max_read_size || IOSegmenter::Reader::DEFAULT_READ_SIZE).each do |segement|
       yield parse(segement)
     end
   end
 
-  def self.each_string(io, max_read_size=IOSegmenter::DEFAULT_READ_SIZE)
-    IOSegmenter.new(io, '"', '"', nil, '\\', max_read_size).each do |segement|
+  def self.each_string(io, max_read_size=nil)
+    IOSegmenter::Reader.new(io, IOSegmenter::Parser.new('"', '"', nil, '\\'), max_read_size || IOSegmenter::Reader::DEFAULT_READ_SIZE).each do |segement|
       yield segement[1, segement.size-2]
     end
   end
 
-  def self.each_item(io, max_read_size=IOSegmenter::DEFAULT_READ_SIZE)
+  def self.each_list(io, max_read_size=nil)
     io.read(1)
-    IOSegmenter.new(io, '[', ']', '"', '\\', max_read_size).each do |segement|
+    IOSegmenter::Reader.new(io, IOSegmenter::Parser.new('[', ']', '"', '\\'), max_read_size || IOSegmenter::Reader::DEFAULT_READ_SIZE).each do |segement|
       yield parse(segement)
     end
   end

data/lib/io-segmenter/parser.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module IOSegmenter
+  class Parser
+    attr_reader :buffer
+
+    def initialize(starting_char, ending_char, quote_char, escape_char)
+      @starting_char = starting_char
+      @ending_char = ending_char
+      @quote_char = quote_char
+      @escape_char = escape_char
+
+      terms = [
+        @starting_char,
+        @ending_char,
+        @quote_char,
+        @escape_char
+      ]
+      terms.compact!
+      terms.map! { |str| Regexp.escape(str) }
+
+      @search = Regexp.new('(:?' + terms.join('|') + ')')
+      @buffer = String.new
+    end
+
+    def unpack(str)
+      @buffer << str
+      each_segment(@buffer) do |segment|
+        yield segment
+      end
+    end
+
+    def each_segment(buffer)
+      return unless (start_offset = buffer.index(@starting_char))
+
+      brackets = 1
+      offset = start_offset
+
+      opened_quote = false
+
+      while (offset = buffer.index(@search, offset + 1))
+        case buffer[offset]
+        when @ending_char
+          next if opened_quote
+          brackets -= 1
+        when @starting_char
+          next if opened_quote
+          brackets += 1
+        when @quote_char
+          opened_quote = !opened_quote
+          next
+        when @escape_char
+          offset += @escape_char.size
+          next
+        else
+          if @ending_char == buffer[offset, @ending_char.size]
+            next if opened_quote
+            brackets -= 1
+          elsif @starting_char == buffer[offset, @starting_char.size]
+            next if opened_quote
+            brackets += 1
+          else
+            raise("unhandled offset #{offset}, at #{buffer[offset, 20]}...")
+          end
+        end
+
+        next unless brackets.zero?
+
+        len = (offset + @ending_char.size) - start_offset
+        yield buffer[start_offset, len]
+        buffer.slice!(0, offset + @ending_char.size)
+        return unless (start_offset = buffer.index(@starting_char))
+        offset = start_offset
+        brackets = 1
+      end
+    end
+  end
+end

data/lib/io-segmenter/reader.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module IOSegmenter
+  class Reader
+    include Enumerable
+
+    DEFAULT_READ_SIZE = 8192
+
+    def initialize(io, parser, max_read_size=DEFAULT_READ_SIZE)
+      @io = io
+      @parser = parser
+      @max_read_size = max_read_size
+    end
+
+    def each
+      until @io.eof?
+        @parser.unpack(@io.read(@max_read_size)) do |segment|
+          yield segment
+        end
+      end
+    end
+
+    def self.foreach(*args, &block)
+      new(*args).each(&block)
+    end
+  end
+end

data/lib/io-segmenter/writer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module IOSegmenter
+  # Used to add a separator after the first write call
+  class Writer
+    def self.write(io, header, footer, separator)
+      io.write(header) if header
+      yield new(io, separator)
+      io.write(footer) if footer
+    end
+
+    def initialize(io, separator)
+      @io = io
+      @separator = separator
+      @add_separator = false
+    end
+
+    def write(str)
+      @io.write(@separator) if @separator && @add_separator
+      @io.write(str)
+      @add_separator = true
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io-segmenter
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5
 platform: ruby
 authors:
 - Doug Youch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-09 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies: []
 description: Used to iterate over segments of data in IO objects
 email: dyouch5@yahoo.com
@@ -20,6 +20,9 @@ files:
 - lib/io-segmenter/core_ext/file.rb
 - lib/io-segmenter/core_ext/io.rb
 - lib/io-segmenter/core_ext/json.rb
+- lib/io-segmenter/parser.rb
+- lib/io-segmenter/reader.rb
+- lib/io-segmenter/writer.rb
 homepage: https://github.com/dougyouch/io-segemnter
 licenses: []
 metadata: {}