yajl-ffi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91b3e4f40a342d0b737483a32c14789d13901071
-  data.tar.gz: acfebb0bf6867ee99cc39f44411b394dd697acbf
+  metadata.gz: 6de3c945368d22be36236e10320d4f352eb30d92
+  data.tar.gz: fb7fb82310439d20429da612ac5e134bfeb1e733
 SHA512:
-  metadata.gz: 4894734f7816e431e19f05e81ddbc30e5e30aa79d1712d421af4f24f2b377b8868b4e1ff5324ff6a0bf49bceafd5cc79675ed495eaa63700502cbd1dcbb45e9e
-  data.tar.gz: 7dcc45a9609c6f9f99ff3db4fbdaa86e97e6a96ef247b7347dc418c56ba241f33e2a7a2848205b55db743f4bc5a4271da84189418e8d3cbb00200a4564facecf
+  metadata.gz: 42d060dadaf9bc2e0eea2e5ce7e218180b7bd6c483ae449ec4e8329d1da61bac9c85fd7c96a9ea374f49eca828fc967663f7caa0f43300bf458c4fe4a9567a4d
+  data.tar.gz: e0b43c9e8427a05d72f76e69e468baf69483e69fd0290571173b023a283c8f5ae7791b99fb36c6457ecd35a1be4346e5281063790a99bbe2cd6a17a539c7b8d6

data/README.md

@@ -158,10 +158,10 @@ several parsers. Here's a sample run.
 ```
 $ rake benchmark
                   user     system      total        real
-json          0.130000   0.010000   0.140000 (  0.136225)
-yajl-ruby     0.130000   0.010000   0.140000 (  0.133872)
-yajl-ffi      0.800000   0.010000   0.810000 (  0.812818)
-json-stream   9.500000   0.080000   9.580000 (  9.580571)
+json          0.120000   0.010000   0.130000 (  0.130072)
+yajl-ruby     0.130000   0.000000   0.130000 (  0.129388)
+yajl-ffi      0.790000   0.010000   0.800000 (  0.805279)
+json-stream   7.500000   0.030000   7.530000 (  7.524760)
 ```
 
 Yajl::FFI is about 6x slower than the pure native parsers. JSON::Stream is a

data/lib/yajl/ffi/builder.rb

@@ -36,13 +36,15 @@ module Yajl
 
       def end_object
         return if @stack.size == 1
+
         node = @stack.pop
+        top = @stack[-1]
 
-        case @stack.last
+        case top
         when Hash
-          @stack.last[@keys.pop] = node
+          top[@keys.pop] = node
         when Array
-          @stack.last << node
+          top << node
         end
       end
       alias :end_array :end_object
@@ -56,11 +58,12 @@ module Yajl
       end
 
       def value(value)
-        case @stack.last
+        top = @stack[-1]
+        case top
         when Hash
-          @stack.last[@keys.pop] = value
+          top[@keys.pop] = value
         when Array
-          @stack.last << value
+          top << value
         else
           @stack << value
         end

data/lib/yajl/ffi/parser.rb

@@ -287,7 +287,7 @@ module Yajl
       #
       # Returns a String.
       def extract(pointer, length)
-        string = pointer.read_string(length)
+        string = pointer.get_bytes(0, length)
         string.force_encoding(Encoding::UTF_8)
         unless string.valid_encoding?
           raise ParserError, 'Invalid UTF-8 byte sequence'

data/lib/yajl/ffi/version.rb

@@ -1,5 +1,5 @@
 module Yajl
   module FFI
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/spec/parser_spec.rb

@@ -35,7 +35,15 @@ describe Yajl::FFI::Parser do
       assert_equal expected, events('"test"')
     end
 
-    it 'parses an integer value document' do
+    it 'parses a single digit integer value document' do
+      expected = [:start_document, [:value, 2], :end_document]
+      events = events('2', subject)
+      assert events.empty?
+      subject.finish
+      assert_equal expected, events
+    end
+
+    it 'parses a multiple digit integer value document' do
       expected = [:start_document, [:value, 12], :end_document]
       events = events('12', subject)
       assert events.empty?
@@ -43,6 +51,30 @@ describe Yajl::FFI::Parser do
       assert_equal expected, events
     end
 
+    it 'parses a zero literal document' do
+      expected = [:start_document, [:value, 0], :end_document]
+      events = events('0', subject)
+      assert events.empty?
+      subject.finish
+      assert_equal expected, events
+    end
+
+    it 'parses a negative integer document' do
+      expected = [:start_document, [:value, -1], :end_document]
+      events = events('-1', subject)
+      assert events.empty?
+      subject.finish
+      assert_equal expected, events
+    end
+
+    it 'parses an exponent literal document' do
+      expected = [:start_document, [:value, 200.0], :end_document]
+      events = events('2e2', subject)
+      assert events.empty?
+      subject.finish
+      assert_equal expected, events
+    end
+
     it 'parses a float value document' do
       expected = [:start_document, [:value, 12.1], :end_document]
       events = events('12.1', subject)
@@ -113,6 +145,13 @@ describe Yajl::FFI::Parser do
       assert_equal expected, events('[fals1]')
     end
 
+    it 'rejects scrambled keyword tokens' do
+      expected = [:start_document, :start_array, :error]
+      assert_equal expected, events('[ture]')
+      assert_equal expected, events('[fales]')
+      assert_equal expected, events('[nlul]')
+    end
+
     it 'parses single keyword tokens' do
       expected = [:start_document, :start_array, [:value, true], :end_array, :end_document]
       assert_equal expected, events('[true]')
@@ -149,6 +188,36 @@ describe Yajl::FFI::Parser do
       -> { subject.finish }.must_raise Yajl::FFI::ParserError
     end
 
+    it 'rejects partial exponent' do
+      subject << '42e'
+      -> { subject.finish }.must_raise Yajl::FFI::ParserError
+    end
+
+    it 'rejects malformed exponent' do
+      subject << '42e+'
+      -> { subject.finish }.must_raise Yajl::FFI::ParserError
+    end
+
+    it 'rejects partial negative number' do
+      subject << '-'
+      -> { subject.finish }.must_raise Yajl::FFI::ParserError
+    end
+
+    it 'rejects partial string literal' do
+      subject << '"test'
+      -> { subject.finish }.must_raise Yajl::FFI::ParserError
+    end
+
+    it 'rejects partial object ending in literal value' do
+      subject << '{"test": 42'
+      -> { subject.finish }.must_raise Yajl::FFI::ParserError
+    end
+
+    it 'rejects partial array ending in literal value' do
+      subject << '[42'
+      -> { subject.finish }.must_raise Yajl::FFI::ParserError
+    end
+
     it 'does nothing on subsequent finish' do
       begin
         subject << 'false'
@@ -247,9 +316,34 @@ describe Yajl::FFI::Parser do
       assert_equal expected, events('[12.]')
     end
 
-    it 'parses positive exponent integers' do
-      expected = [:start_document, :start_array, [:value, 212], :end_array, :end_document]
+    it 'parses zero with implicit positive exponent as float' do
+      expected = [:start_document, :start_array, [:value, 0.0], :end_array, :end_document]
+      events = events('[0e2]')
+      assert_equal expected, events
+      assert_kind_of Float, events[2][1]
+    end
+
+    it 'parses zero with explicit positive exponent as float' do
+      expected = [:start_document, :start_array, [:value, 0.0], :end_array, :end_document]
+      events = events('[0e+2]')
+      assert_equal expected, events
+      assert_kind_of Float, events[2][1]
+    end
+
+    it 'parses zero with negative exponent as float' do
+      expected = [:start_document, :start_array, [:value, 0.0], :end_array, :end_document]
+      events = events('[0e-2]')
+      assert_equal expected, events
+      assert_kind_of Float, events[2][1]
+    end
+
+    it 'parses positive exponent integers as floats' do
+      expected = [:start_document, :start_array, [:value, 212.0], :end_array, :end_document]
+
+      events = events('[2.12e2]')
       assert_equal expected, events('[2.12e2]')
+      assert_kind_of Float, events[2][1]
+
       assert_equal expected, events('[2.12e02]')
       assert_equal expected, events('[2.12e+2]')
       assert_equal expected, events('[2.12e+02]')
@@ -452,11 +546,22 @@ describe Yajl::FFI::Parser do
     end
 
     describe 'parsing unicode escapes with surrogate pairs' do
+      it 'converts missing second pair to question mark' do
+        expected = [:start_document, :start_array, [:value, '?'], :end_array, :end_document]
+        assert_equal expected, events('["\uD834"]')
+      end
+
       it 'rejects missing first pair' do
         expected = [:start_document, :start_array, :error]
         assert_equal expected, events('["\uDD1E"]')
       end
 
+      it 'rejects double first pair' do
+        skip 'yajl incorrectly allows this'
+        expected = [:start_document, :start_array, :error]
+        assert_equal expected, events('["\uD834\uD834"]')
+      end
+
       it 'rejects double second pair' do
         expected = [:start_document, :start_array, :error]
         assert_equal expected, events('["\uDD1E\uDD1E"]')
@@ -610,7 +715,7 @@ describe Yajl::FFI::Parser do
     # is available. The \xC3 byte is the first byte of the é character.
     it 'rejects a partial two byte utf-8 string' do
       expected = [:start_document, :start_array, :error]
-      assert_equal expected, events('["\xC3"]')
+      assert_equal expected, events("[\"\xC3\"]")
     end
 
     it 'parses valid two byte utf-8 string' do
@@ -632,12 +737,12 @@ describe Yajl::FFI::Parser do
 
     it 'rejects one byte of three byte utf-8 string' do
       expected = [:start_document, :start_array, :error]
-      assert_equal expected, events('["\xE2"]')
+      assert_equal expected, events("[\"\xE2\"]")
     end
 
     it 'rejects two bytes of three byte utf-8 string' do
       expected = [:start_document, :start_array, :error]
-      assert_equal expected, events('["\xE2\x98"]')
+      assert_equal expected, events("[\"\xE2\x98\"]")
     end
 
     it 'parses full three byte utf-8 string' do
@@ -658,17 +763,17 @@ describe Yajl::FFI::Parser do
 
     it 'rejects one byte of four byte utf-8 string' do
       expected = [:start_document, :start_array, :error]
-      assert_equal expected, events('["\xF0"]')
+      assert_equal expected, events("[\"\xF0\"]")
     end
 
     it 'rejects two bytes of four byte utf-8 string' do
       expected = [:start_document, :start_array, :error]
-      assert_equal expected, events('["\xF0\x90"]')
+      assert_equal expected, events("[\"\xF0\x90\"]")
     end
 
     it 'rejects three bytes of four byte utf-8 string' do
       expected = [:start_document, :start_array, :error]
-      assert_equal expected, events('["\xF0\x90\x84"]')
+      assert_equal expected, events("[\"\xF0\x90\x84\"]")
     end
 
     it 'parses full four byte utf-8 string' do
@@ -749,9 +854,9 @@ describe Yajl::FFI::Parser do
 
   private
 
-  # Run a worst case, one character at a time, parse against the
-  # JSON string and return a list of events generated by the parser.
-  # A special :error event is included if the parser threw an exception.
+  # Run a worst case, one byte at a time, parse against the JSON string and
+  # return a list of events generated by the parser. A special :error event is
+  # included if the parser threw an exception.
   #
   # json   - The String to parse.
   # parser - The optional Parser instance to use.
@@ -761,7 +866,7 @@ describe Yajl::FFI::Parser do
     parser ||= Yajl::FFI::Parser.new
     collector = Events.new(parser)
     begin
-      json.each_char {|ch| parser << ch }
+      json.each_byte {|byte| parser << [byte].pack('C') }
     rescue Yajl::FFI::ParserError
       collector.error
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yajl-ffi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Graham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi