ffi-yajl 2.2.0-universal-java → 2.2.1-universal-java

data/lib/ffi_yajl/benchmark/parse_stream.rb

@@ -18,37 +18,37 @@ json = File.new(filename, 'r')
 
 times = ARGV[0] ? ARGV[0].to_i : 100
 puts "Starting benchmark parsing JSON stream (#{File.size(filename)} bytes of JSON data with 430 JSON separate strings) #{times} times\n\n"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   parser = Yajl::Parser.new
-  parser.on_parse_complete = lambda {|obj|}
-  x.report {
+  parser.on_parse_complete = ->(obj) {}
+  x.report do
     puts "Yajl::Parser#parse"
-    times.times {
+    times.times do
       json.rewind
       parser.parse(json)
-    }
-  }
+    end
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON.parse"
-      times.times {
+      times.times do
         json.rewind
         while chunk = json.gets
-          JSON.parse(chunk, :max_nesting => false)
+          JSON.parse(chunk, max_nesting: false)
         end
-      }
-    }
+      end
+    end
   end
   if defined?(ActiveSupport::JSON)
-    x.report {
+    x.report do
       puts "ActiveSupport::JSON.decode"
-      times.times {
+      times.times do
         json.rewind
         while chunk = json.gets
           ActiveSupport::JSON.decode(chunk)
         end
-      }
-    }
+      end
+    end
   end
-}
-json.close
+end
+json.close

data/lib/ffi_yajl/encoder.rb

@@ -41,7 +41,7 @@ module FFI_Yajl
       # call either the ext or ffi hook
       str = do_yajl_encode(obj, yajl_gen_opts, opts)
       # we can skip cleaning the whole string for utf-8 issues if we have yajl validate as we go
-      str.encode!("utf-8", "binary", :undef => :replace) unless yajl_gen_opts[:yajl_gen_validate_utf8]
+      str.encode!("utf-8", "binary", undef: :replace) unless yajl_gen_opts[:yajl_gen_validate_utf8]
       str
     end
 
@@ -54,9 +54,9 @@ module FFI_Yajl
       @opts ||= {}
     end
 
-    def self.raise_error_for_status(status, token=nil)
+    def self.raise_error_for_status(status, token = nil)
       # scrub token to valid utf-8 since we may be issuing an exception on an invalid utf-8 token
-      token = token.to_s.encode("utf-8", "binary", :undef => :replace)
+      token = token.to_s.encode("utf-8", "binary", undef: :replace)
       case status
       when 1 # yajl_gen_keys_must_be_strings
         raise FFI_Yajl::EncodeError, "YAJL internal error: attempted use of non-string object as key"

data/lib/ffi_yajl/ffi.rb

@@ -42,16 +42,16 @@ module FFI_Yajl
 
   class YajlCallbacks < ::FFI::Struct
     layout :yajl_null, :pointer,
-      :yajl_boolean, :pointer,
-      :yajl_integer, :pointer,
-      :yajl_double, :pointer,
-      :yajl_number, :pointer,
-      :yajl_string, :pointer,
-      :yajl_start_map, :pointer,
-      :yajl_map_key, :pointer,
-      :yajl_end_map, :pointer,
-      :yajl_start_array, :pointer,
-      :yajl_end_array, :pointer
+           :yajl_boolean, :pointer,
+           :yajl_integer, :pointer,
+           :yajl_double, :pointer,
+           :yajl_number, :pointer,
+           :yajl_string, :pointer,
+           :yajl_start_map, :pointer,
+           :yajl_map_key, :pointer,
+           :yajl_end_map, :pointer,
+           :yajl_start_array, :pointer,
+           :yajl_end_array, :pointer
   end
 
   enum :yajl_status, [
@@ -61,30 +61,30 @@ module FFI_Yajl
     :yajl_status_error,
   ]
 
-# FFI::Enums are slow, should remove the rest
-#  enum :yajl_gen_status, [
-#    :yajl_gen_status_ok,
-#    :yajl_gen_keys_must_be_strings,
-#    :yajl_max_depth_exceeded,
-#    :yajl_gen_in_error_state,
-#    :yajl_gen_generation_complete,
-#    :yajl_gen_invalid_number,
-#    :yajl_gen_no_buf,
-#  ]
+  # FFI::Enums are slow, should remove the rest
+  #  enum :yajl_gen_status, [
+  #    :yajl_gen_status_ok,
+  #    :yajl_gen_keys_must_be_strings,
+  #    :yajl_max_depth_exceeded,
+  #    :yajl_gen_in_error_state,
+  #    :yajl_gen_generation_complete,
+  #    :yajl_gen_invalid_number,
+  #    :yajl_gen_no_buf,
+  #  ]
 
   enum :yajl_option, [
     :yajl_allow_comments, 0x01,
     :yajl_dont_validate_strings, 0x02,
     :yajl_allow_trailing_garbage, 0x04,
     :yajl_allow_multiple_values, 0x08,
-    :yajl_allow_partial_values, 0x10,
+    :yajl_allow_partial_values, 0x10
   ]
 
   enum :yajl_gen_option, [
     :yajl_gen_beautify, 0x01,
     :yajl_gen_indent_string, 0x02,
     :yajl_gen_print_callback, 0x04,
-    :yajl_gen_validate_utf8, 0x08,
+    :yajl_gen_validate_utf8, 0x08
   ]
 
   typedef :pointer, :yajl_handle
@@ -132,10 +132,9 @@ module FFI_Yajl
   attach_function :yajl_gen_array_open, [:yajl_gen], :int
   attach_function :yajl_gen_array_close, [:yajl_gen], :int
   # yajl_gen_status yajl_gen_get_buf (yajl_gen hand, const unsigned char **buf, unsigned int *len)
-  attach_function :yajl_gen_get_buf, [:yajl_gen, :pointer ,:pointer], :int
+  attach_function :yajl_gen_get_buf, [:yajl_gen, :pointer, :pointer], :int
   # void yajl_gen_clear (yajl_gen hand)
   attach_function :yajl_gen_clear, [:yajl_gen], :void
-
 end
 
 require 'ffi_yajl/encoder'

data/lib/ffi_yajl/ffi/encoder.rb

@@ -20,13 +20,14 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'ffi_yajl/ffi'
+require 'date'
+require 'stringio'
 
 module FFI_Yajl
   module FFI
     module Encoder
       def do_yajl_encode(obj, yajl_gen_opts, opts)
-        yajl_gen = FFI_Yajl.yajl_gen_alloc(nil);
+        yajl_gen = FFI_Yajl.yajl_gen_alloc(nil)
 
         # configure the yajl encoder
         if yajl_gen_opts[:yajl_gen_beautify]
@@ -40,8 +41,8 @@ module FFI_Yajl
 
         # setup our own state
         state = {
-          :json_opts => opts,
-          :processing_key => false,
+          json_opts: opts,
+          processing_key: false,
         }
 
         # do the encoding
@@ -53,14 +54,12 @@ module FFI_Yajl
         if ( status = FFI_Yajl.yajl_gen_get_buf(yajl_gen, string_ptr, length_ptr) ) != 0
           FFI_Yajl::Encoder.raise_error_for_status(status)
         end
-        length = length_ptr.read_int
         string = string_ptr.get_pointer(0).read_string
 
         FFI_Yajl.yajl_gen_free(yajl_gen)
 
-        return string
+        string
       end
-
     end
   end
 end
@@ -68,7 +67,7 @@ end
 class Hash
   def ffi_yajl(yajl_gen, state)
     if state[:processing_key]
-      str = self.to_s
+      str = to_s
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
       end
@@ -76,7 +75,7 @@ class Hash
       if ( status = FFI_Yajl.yajl_gen_map_open(yajl_gen) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, '{')
       end
-      self.each do |key, value|
+      each do |key, value|
         # Perf Fix: mutate state hash rather than creating new copy
         state[:processing_key] = true
         key.ffi_yajl(yajl_gen, state)
@@ -93,7 +92,7 @@ end
 class Array
   def ffi_yajl(yajl_gen, state)
     if state[:processing_key]
-      str = self.to_s
+      str = to_s
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
       end
@@ -101,7 +100,7 @@ class Array
       if ( status = FFI_Yajl.yajl_gen_array_open(yajl_gen) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, '[')
       end
-      self.each do |value|
+      each do |value|
         value.ffi_yajl(yajl_gen, state)
       end
       if ( status = FFI_Yajl.yajl_gen_array_close(yajl_gen) ) != 0
@@ -113,7 +112,7 @@ end
 
 class NilClass
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -128,7 +127,7 @@ end
 
 class TrueClass
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -143,7 +142,7 @@ end
 
 class FalseClass
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -158,9 +157,9 @@ end
 
 class Fixnum
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
-      raise ::FFI_Yajl::EncodeError.new("'#{str}' is an invalid number")
+      raise ::FFI_Yajl::EncodeError, "'#{str}' is an invalid number"
     end
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
@@ -176,9 +175,9 @@ end
 
 class Bignum
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
-      raise ::FFI_Yajl::EncodeError.new("'#{str}' is an invalid number")
+      raise ::FFI_Yajl::EncodeError, "'#{str}' is an invalid number"
     end
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
@@ -194,9 +193,9 @@ end
 
 class Float
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
-      raise ::FFI_Yajl::EncodeError.new("'#{str}' is an invalid number")
+      raise ::FFI_Yajl::EncodeError, "'#{str}' is an invalid number"
     end
     if state[:processing_key]
       if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
@@ -212,7 +211,7 @@ end
 
 class Symbol
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -221,7 +220,7 @@ end
 
 class String
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, self, self.bytesize) ) != 0
+    if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, self, bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, self)
     end
   end
@@ -229,7 +228,7 @@ end
 
 class StringIO
   def ffi_yajl(yajl_gen, state)
-    str = self.read
+    str = read
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -238,7 +237,7 @@ end
 
 class Date
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -247,16 +246,16 @@ end
 
 class Time
   def ffi_yajl(yajl_gen, state)
-    str = self.strftime "%Y-%m-%d %H:%M:%S %z"
+    str = strftime "%Y-%m-%d %H:%M:%S %z"
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
   end
 end
 
-class DateTime < Date
+class DateTime
   def ffi_yajl(yajl_gen, state)
-    str = self.to_s
+    str = to_s
     if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status, str)
     end
@@ -267,15 +266,13 @@ end
 class Object
   def ffi_yajl(yajl_gen, state)
     if !state[:processing_key] && self.respond_to?(:to_json)
-      str = self.to_json(state[:json_opts])
+      str = to_json(state[:json_opts])
       # #yajl_gen_number outputs a string without quotes around it
       status = FFI_Yajl.yajl_gen_number(yajl_gen, str, str.bytesize)
     else
-      str = self.to_s
+      str = to_s
       status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize)
     end
-    if ( status ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status, str)
-    end
+    FFI_Yajl::Encoder.raise_error_for_status(status, str) if ( status ) != 0
   end
 end

data/lib/ffi_yajl/ffi/parser.rb

@@ -20,41 +20,35 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-require 'ffi_yajl/ffi'
-
 module FFI_Yajl
   module FFI
     module Parser
-
-        def set_value(val)
-          case stack.last
-          when Hash
-            raise FFI_Yajl::ParseError.new("internal error: missing key in parse") if key.nil?
-            if @opts[:unique_key_checking] && stack.last.has_key?(key)
-              raise FFI_Yajl::ParseError.new("repeated key: #{key}")
-            end
-            stack.last[key] = val
-          when Array
-            stack.last.push(val)
-          else
-            stack.push(val)
-          end
-        end
-
-        def stack_pop
-          if stack.length > 1
-            set_value( stack.pop )
+      def set_value(val) # rubocop:disable Style/AccessorMethodName
+        case stack.last
+        when Hash
+          raise FFI_Yajl::ParseError, "internal error: missing key in parse" if key.nil?
+          if @opts[:unique_key_checking] && stack.last.key?(key)
+            raise FFI_Yajl::ParseError, "repeated key: #{key}"
           end
+          stack.last[key] = val
+        when Array
+          stack.last.push(val)
+        else
+          stack.push(val)
         end
+      end
 
-        def key_push
-          key_stack.push(key)
-        end
+      def stack_pop
+        set_value( stack.pop ) if stack.length > 1
+      end
 
-        def key_pop
-          @key = key_stack.pop()
-        end
+      def key_push
+        key_stack.push(key)
+      end
 
+      def key_pop
+        @key = key_stack.pop
+      end
 
       def setup_callbacks
         @null_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
@@ -70,7 +64,7 @@ module FFI_Yajl
           1
         end
         @number_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t ]) do |ctx, stringval, stringlen|
-          s = stringval.slice(0,stringlen)
+          s = stringval.slice(0, stringlen)
           s.force_encoding('UTF-8') if defined? Encoding
           # XXX: I can't think of a better way to do this right now.  need to call to_f if and only if its a float.
           v = ( s =~ /[\.eE]/ ) ? s.to_f : s.to_i
@@ -82,18 +76,18 @@ module FFI_Yajl
           1
         end
         @string_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, stringval, stringlen|
-          s = stringval.slice(0,stringlen)
+          s = stringval.slice(0, stringlen)
           s.force_encoding('UTF-8') if defined? Encoding
           set_value(s)
           1
         end
         @start_map_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
           key_push  # for key => { } case, save the key
-          stack.push(Hash.new)
+          stack.push({})
           1
         end
         @map_key_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, key, keylen|
-          s = key.slice(0,keylen)
+          s = key.slice(0, keylen)
           s.force_encoding('UTF-8') if defined? Encoding
           self.key = @opts[:symbolize_keys] ? s.to_sym : s
           1
@@ -105,7 +99,7 @@ module FFI_Yajl
         end
         @start_array_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
           key_push  # for key => [ ] case, save the key
-          stack.push(Array.new)
+          stack.push([])
           1
         end
         @end_array_callback = ::FFI::Function.new(:int, [:pointer]) do |ctx|
@@ -115,7 +109,6 @@ module FFI_Yajl
         end
       end
 
-
       def do_yajl_parse(str, yajl_opts = {})
         setup_callbacks
         callback_ptr = ::FFI::MemoryPointer.new(::FFI_Yajl::YajlCallbacks)
@@ -150,15 +143,15 @@ module FFI_Yajl
           ::FFI_Yajl.yajl_config(yajl_handle, :yajl_allow_partial_values, :int, 1)
         end
 
-        if ( stat = ::FFI_Yajl.yajl_parse(yajl_handle, str, str.bytesize) != :yajl_status_ok )
+        if ( ::FFI_Yajl.yajl_parse(yajl_handle, str, str.bytesize) != :yajl_status_ok )
           # FIXME: dup the error and call yajl_free_error?
           error = ::FFI_Yajl.yajl_get_error(yajl_handle, 1, str, str.bytesize)
-          raise ::FFI_Yajl::ParseError.new(error)
+          raise ::FFI_Yajl::ParseError, error
         end
-        if ( stat = FFI_Yajl.yajl_complete_parse(yajl_handle) != :yajl_status_ok )
+        if ( ::FFI_Yajl.yajl_complete_parse(yajl_handle) != :yajl_status_ok )
           # FIXME: dup the error and call yajl_free_error?
           error = ::FFI_Yajl.yajl_get_error(yajl_handle, 1, str, str.bytesize)
-          raise ::FFI_Yajl::ParseError.new(error)
+          raise ::FFI_Yajl::ParseError, error
         end
         stack.pop
       ensure