json-projection 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b331a3db1a52374a5cdfae9d4357696d5096c91
-  data.tar.gz: 50a134c347705a60af03fb8ad42f591431c5ea61
+  metadata.gz: 5b310ebdff6509d59c9737225a97b66de49a2ced
+  data.tar.gz: 705ca5b363df43245d2c8a3180343acb4584707c
 SHA512:
-  metadata.gz: 06f10ad2683686a49c487de9b045019a3e42279871815f276bfd0b365ed634cec990082e2725da7d59af207ef8d9a3db450d72f9ba50cbb83edb0731bc81cc21
-  data.tar.gz: a24b80cb879125ef11a14d050d6e7edf9c2e04855ec56dafe9e748ed99c2ff8dc6ed59b2efafd651a320d8239995238eff3cfbeaaa255e1b6e54c46fb1e34066
+  metadata.gz: 818bfe7cd12ea0b9a06316822b875595ee4608fe74114a39963901aa7f584a02e20edbca77fe1e926ffae64155debd31f7185fa983f53d82974f01686c085dfc
+  data.tar.gz: 9a911520fc8b962704ac1a3cf87dfef0d2528b52dc3dac4b17b89407328b1278338ec68fa01f0d21cf8b9fd443d5ef669d770f1831a9fdf2d2ae2b2b569fdd38

data/lib/json-projection/parser.rb

@@ -34,7 +34,6 @@ module JsonProjection
   # Use the json gem for small documents. Use this for huge documents that
   # won't fit in memory.
   class Parser
-    BUF_SIZE      = 4096
     CONTROL       = /[\x00-\x1F]/
     WS            = /[ \n\t\r]/
     HEX           = /[0-9a-fA-F]/
@@ -67,19 +66,25 @@ module JsonProjection
     # events are drawn from the parser. The parser maintains a small data cache
     # of bytes read from the stream.
     #
-    # stream :: IO
-    #           IO stream to read data from.
+    # stream     :: IO
+    #               IO stream to read data from.
+    #
+    # chunk_size :: Integer
+    #               Number of bytes to read from the stream at a time.
     #
     # Returns nothing.
-    def initialize(stream)
+    def initialize(stream, chunk_size = 4096)
       @stream = stream
+      @chunk_size = chunk_size
 
       @event_buffer = Fifo.new
 
-      @bytes_buffer = Buffer.new
-      @bytes = nil
+      @character_buffer = Buffer.new
+
+      @characters_cursor = -1
+      @characters = nil
 
-      @pos = -1
+      @stream_position = -1
       @state = :start_document
       @stack = []
 
@@ -93,7 +98,7 @@ module JsonProjection
     # Returns a JsonProject::StreamEvent subclass or raises StandardError.
     def next_event()
       # Are there any already read events, return the oldest
-      @event_buffer, event = @event_buffer.pop
+      event = @event_buffer.pop!
       return event unless event.nil?
 
       if @state == :end_document
@@ -101,30 +106,28 @@ module JsonProjection
       end
 
       while true do
-        if @bytes.nil? || @bytes.empty?
-          data = stream.read(BUF_SIZE)
+        if @characters.nil? || @characters_cursor == @characters.size
+          data = stream.read(@chunk_size)
           if data == nil # hit EOF
             error("unexpected EOF")
           end
 
-          @bytes = @bytes_buffer.<<(data).each_char.to_a
+          @characters = @character_buffer.<<(data).each_char.to_a
+          @characters_cursor = 0
         end
 
-        head = @bytes.first
-        tail = @bytes.slice!(1, @bytes.size - 1)
+        character = @characters[@characters_cursor]
+        @characters_cursor += 1
 
-        @bytes = tail
-        @pos += 1
+        @stream_position += 1
 
-        new_state, events = handle_character(@state, head)
+        new_state, new_events = handle_character(@state, character)
 
         @state = new_state
-        @event_buffer = events.append(@event_buffer)
+        @event_buffer.prepend!(new_events)
 
-        unless @event_buffer.empty?
-          @event_buffer, event = @event_buffer.pop
-          return event
-        end
+        event = @event_buffer.pop!
+        return event unless event.nil?
       end
     end
 
@@ -151,13 +154,13 @@ module JsonProjection
         when LEFT_BRACE
           @stack.push(:object)
 
-          events = Fifo.pure(StartDocument.empty).push(StartObject.empty)
+          events = Fifo.pure(StartObject.empty, StartDocument.empty)
 
           return :start_object, events
         when LEFT_BRACKET
           @stack.push(:array)
 
-          events = Fifo.pure(StartDocument.empty).push(StartArray.empty)
+          events = Fifo.pure(StartArray.empty, StartDocument.empty)
 
           return :start_array, events
         end
@@ -296,8 +299,9 @@ module JsonProjection
           state = :end_value
 
           state, new_events = handle_character(state, ch)
+          events.prepend!(new_events)
 
-          return state, new_events.append(events)
+          return state, events
         end
 
       when :start_float
@@ -324,8 +328,9 @@ module JsonProjection
           state = :end_value
 
           state, new_events = handle_character(state, ch)
+          events.prepend!(new_events)
 
-          return state, new_events.append(events)
+          return state, events
         end
 
       when :start_exponent
@@ -351,8 +356,9 @@ module JsonProjection
           state = :end_value
 
           state, new_events = handle_character(state, ch)
+          events.prepend!(new_events)
 
-          return state, new_events.append(events)
+          return state, events
         end
 
       when :start_int
@@ -373,8 +379,9 @@ module JsonProjection
           state = :end_value
 
           state, new_events = handle_character(state, ch)
+          events.prepend!(new_events)
 
-          return state, new_events.append(events)
+          return state, events
         end
 
       when :start_true
@@ -478,14 +485,14 @@ module JsonProjection
     # a value.
     def end_container(type)
       state = :end_value
-      events = Fifo.empty
+      events = Fifo.pure
 
       if @stack.pop == type
         case type
         when :object then
-          events = events.push(EndObject.empty)
+          events.push!(EndObject.empty)
         when :array  then
-          events = events.push(EndArray.empty)
+          events.push!(EndArray.empty)
         end
       else
         error("Expected end of #{type}")
@@ -493,7 +500,7 @@ module JsonProjection
 
       if @stack.empty?
         state = :end_document
-        events = events.push(EndDocument.empty)
+        events.push!(EndDocument.empty)
       end
 
       return state, events
@@ -587,7 +594,7 @@ module JsonProjection
     end
 
     def error(message)
-      raise ParseError, "#{message}: char #{@pos}"
+      raise ParseError, "#{message}: char #{@stream_position}"
     end
   end
 

data/lib/json-projection/parser/fifo.rb

@@ -2,28 +2,23 @@ module JsonProjection
   class Fifo
 
     def self.empty
-      @empty ||= self.new
+      @empty ||= self.new([].freeze)
     end
 
-    def self.pure(val)
-      Fifo.new([val])
+    def self.pure(*vals)
+      Fifo.new(vals)
     end
 
     def initialize(stack = [])
       @stack = stack
     end
 
-    def push(val)
-      Fifo.new(@stack.dup.insert(0, val))
+    def push!(val)
+      @stack.insert(0, val)
     end
 
-    def pop()
-      return self, nil if empty?
-
-      init = @stack.slice(0, @stack.size - 1)
-      last = @stack.last
-
-      return Fifo.new(init), last
+    def pop!
+      @stack.pop
     end
 
     def empty?
@@ -39,15 +34,20 @@ module JsonProjection
       stack.hash
     end
 
-    def append(fifo)
-      return self if fifo.empty?
-      return fifo if self.empty?
-      Fifo.new(@stack.concat(fifo.stack))
+    def prepend!(fifo)
+      return if fifo.empty?
+      if empty?
+        @stack = fifo.stack.dup
+        return
+      end
+      @stack = fifo.stack.concat(@stack)
     end
 
     protected
 
-    attr_reader :stack
+    def stack
+      @stack
+    end
 
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-projection
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Keith Duncan