ffi-yajl 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 34f8ead0d7b0acd7c0b717d91620c434a6664e77
-  data.tar.gz: 35178ecea062849647eb0ebcdb174e70b31c3c12
+SHA256:
+  metadata.gz: 3650871b1a2b5266bfd1c14858a9575f168f28ae5db95953e7d57d223ce752e9
+  data.tar.gz: f704c34be8a4ded69a6c55355e7733d3dcde0ae1c8ecebeb34cb282fb5e068fa
 SHA512:
-  metadata.gz: fc7c2f379e5a565a278ff16723197b994c354f560364774d90c17ee491f26ba28a91bbce7655e51e2f9bce43f6ce2e4f2c17b1bb4068f17518bf4fb389b3bb78
-  data.tar.gz: 9b4137b8cd49ff37b49b474f442c350bd0ca2c4d767ae45cb39163a6c5b6a5ee59e5909d43d7e556a860ed253503ee882a21551ca46e97b18d7d65052820434f
+  metadata.gz: 1c3295991eec14b9de4059671482702c76a6d41641ca997cf182b467f532ceb21be55a2de653f0b16f86b54dd655f61705390c4bd2c00dccf9e573803d9f30ff
+  data.tar.gz: d6f6a1fd2e25c80c22682affb258e994a81752e7d9348290a07c53c6a84473b0d949b706df6aad3fd62be45c53e7f53555f6164012088b2e82eb9d41d5383c48

data/README.md

@@ -1,6 +1,15 @@
 # FFI YAJL
 
-[![Build Status](https://travis-ci.org/chef/ffi-yajl.svg?branch=master)](https://travis-ci.org/chef/ffi-yajl) [![Gem Version](https://badge.fury.io/rb/ffi-yajl.svg)](https://badge.fury.io/rb/ffi-yajl)
+[![Build status](https://badge.buildkite.com/35c43155d637f5201a5030cd4e7d8025573c0042094e00bbb3.svg?branch=master)](https://buildkite.com/chef-oss/chef-ffi-yajl-master-verify) [![Gem Version](https://badge.fury.io/rb/ffi-yajl.svg)](https://badge.fury.io/rb/ffi-yajl)
+
+**Umbrella Project**: [Chef Foundation](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-foundation.md)
+
+**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active)
+
+**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+
+**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+
 
 ffi-yajl is a Ruby adapter for the [yajl](http://lloyd.github.io/yajl/) JSON parser/generator library. ffi-yajl supports multiple Ruby C extension mechanisms, including both MRI native extensions and FFI in order to be compatible with as many Ruby implementations as possible while providing good performance where possible.
 
@@ -20,11 +29,7 @@ gem 'ffi-yajl'
 
 ## Supported Ruby VMs:
 
-- Ruby MRI 1.9.3/2.0.0/2.1.x/2.2.x
-- rbx 2.2.x (possibly earlier)
-- Jruby 1.7.x (possibly earlier)
-
-Ruby 1.8.7 support was dropped in 2.2.0
+- Ruby 2.2+ and compatible rbx or jruby
 
 ## Supported Distros:
 

data/ext/ffi_yajl/ext/encoder/extconf.rb

@@ -42,14 +42,14 @@ if !windows? && !find_header("yajl/yajl_tree.h")
     "/usr/local/include",                   # /usr/local
     RbConfig::CONFIG["includedir"],         # Ruby
     "/usr/include",                         # (default)
-  ]
+  ].freeze
 
   LIB_DIRS = [
     "/opt/local/lib",                       # MacPorts
     "/usr/local/lib",                       # /usr/local + Homebrew
     RbConfig::CONFIG["libdir"],             # Ruby
     "/usr/lib",                             # (default)
-  ]
+  ].freeze
 
   # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
   dir_config("yajl", HEADER_DIRS, LIB_DIRS)

data/ext/ffi_yajl/ext/parser/extconf.rb

@@ -42,14 +42,14 @@ if !windows? && !find_header("yajl/yajl_tree.h")
     "/usr/local/include",                   # /usr/local
     RbConfig::CONFIG["includedir"],         # Ruby
     "/usr/include",                         # (default)
-  ]
+  ].freeze
 
   LIB_DIRS = [
     "/opt/local/lib",                       # MacPorts
     "/usr/local/lib",                       # /usr/local + Homebrew
     RbConfig::CONFIG["libdir"],             # Ruby
     "/usr/lib",                             # (default)
-  ]
+  ].freeze
 
   # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
   dir_config("yajl", HEADER_DIRS, LIB_DIRS)

data/lib/ffi_yajl.rb

@@ -35,16 +35,16 @@
 # - Then we try the c-ext and rescue into ffi that fails
 #
 if ENV["FORCE_FFI_YAJL"] == "ext"
-  require "ffi_yajl/ext"
+  require_relative "ffi_yajl/ext"
 elsif ENV["FORCE_FFI_YAJL"] == "ffi"
-  require "ffi_yajl/ffi"
+  require_relative "ffi_yajl/ffi"
 elsif RUBY_PLATFORM == "java"
-  require "ffi_yajl/ffi"
+  require_relative "ffi_yajl/ffi"
 else
   begin
-    require "ffi_yajl/ext"
+    require_relative "ffi_yajl/ext"
   rescue LoadError
     warn "failed to load the ffi-yajl c-extension, falling back to ffi interface"
-    require "ffi_yajl/ffi"
+    require_relative "ffi_yajl/ffi"
   end
 end

data/lib/ffi_yajl/benchmark/encode.rb

@@ -13,7 +13,7 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
 else
   puts "INFO: skipping yajl-ruby on jruby"
 end
-require "ffi_yajl"
+require_relative "../../ffi_yajl"
 begin
   require "json"
 rescue LoadError

data/lib/ffi_yajl/benchmark/encode_profile.rb

@@ -2,7 +2,7 @@
 # See MIT-LICENSE
 
 require "rubygems"
-require "ffi_yajl"
+require_relative "../../ffi_yajl"
 begin
   require "perftools"
 rescue LoadError

data/lib/ffi_yajl/benchmark/parse.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 require "benchmark"
 require "yajl"
-require "ffi_yajl"
+require_relative "../../ffi_yajl"
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
   begin
     require "yajl"

data/lib/ffi_yajl/benchmark/parse_profile.rb

@@ -2,7 +2,7 @@
 # See MIT-LICENSE
 
 require "rubygems"
-require "ffi_yajl"
+require_relative "../../ffi_yajl"
 begin
   require "perftools"
 rescue LoadError

data/lib/ffi_yajl/benchmark/parse_profile_ruby_prof.rb

@@ -2,7 +2,7 @@
 # See MIT-LICENSE
 
 require "rubygems"
-require "ffi_yajl"
+require_relative "../../ffi_yajl"
 
 module FFI_Yajl
   class Benchmark

data/lib/ffi_yajl/benchmark/parse_stream.rb

@@ -33,7 +33,7 @@ Benchmark.bmbm do |x|
       puts "JSON.parse"
       times.times do
         json.rewind
-        while chunk = json.gets
+        while ( chunk = json.gets )
           JSON.parse(chunk, max_nesting: false)
         end
       end
@@ -44,7 +44,7 @@ Benchmark.bmbm do |x|
       puts "ActiveSupport::JSON.decode"
       times.times do
         json.rewind
-        while chunk = json.gets
+        while ( chunk = json.gets )
           ActiveSupport::JSON.decode(chunk)
         end
       end

data/lib/ffi_yajl/ext.rb

@@ -22,10 +22,10 @@
 
 require "rubygems"
 
-require "ffi_yajl/encoder"
-require "ffi_yajl/parser"
+require_relative "encoder"
+require_relative "parser"
 require "ffi_yajl/ext/dlopen"
-require "ffi_yajl/map_library_name"
+require_relative "map_library_name"
 
 # needed so the encoder c-code can find these symbols
 require "stringio"

data/lib/ffi_yajl/ffi.rb

@@ -31,7 +31,7 @@ rescue LoadError
   exit 1
 end
 
-require "ffi_yajl/map_library_name"
+require_relative "map_library_name"
 
 module FFI_Yajl
   extend ::FFI::Library
@@ -42,24 +42,24 @@ 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, [
-    :yajl_status_ok,
-    :yajl_status_client_canceled,
-    :yajl_status_insufficient_data,
-    :yajl_status_error,
-  ]
+  enum :yajl_status, %i{
+    yajl_status_ok
+    yajl_status_client_canceled
+    yajl_status_insufficient_data
+    yajl_status_error
+  }
 
   # FFI::Enums are slow, should remove the rest
   #  enum :yajl_gen_status, [
@@ -97,22 +97,22 @@ module FFI_Yajl
   # const char *yajl_status_to_string (yajl_status code)
   attach_function :yajl_status_to_string, [ :yajl_status ], :string
   # yajl_handle yajl_alloc(const yajl_callbacks * callbacks, yajl_alloc_funcs * afs, void * ctx)
-  attach_function :yajl_alloc, [:pointer, :pointer, :pointer], :yajl_handle
+  attach_function :yajl_alloc, %i{pointer pointer pointer}, :yajl_handle
   # void yajl_free (yajl_handle handle)
   attach_function :yajl_free, [:yajl_handle], :void
   # yajl_status yajl_parse (yajl_handle hand, const unsigned char *jsonText, unsigned int jsonTextLength)
-  attach_function :yajl_parse, [:yajl_handle, :ustring, :uint], :yajl_status
+  attach_function :yajl_parse, %i{yajl_handle ustring uint}, :yajl_status
   # yajl_status yajl_parse_complete (yajl_handle hand)
   attach_function :yajl_complete_parse, [:yajl_handle], :yajl_status
   # unsigned char *yajl_get_error (yajl_handle hand, int verbose, const unsigned char *jsonText, unsigned int jsonTextLength)
-  attach_function :yajl_get_error, [:yajl_handle, :int, :ustring, :int], :ustring
+  attach_function :yajl_get_error, %i{yajl_handle int ustring int}, :ustring
   # void yajl_free_error (yajl_handle hand, unsigned char *str)
-  attach_function :yajl_free_error, [:yajl_handle, :ustring], :void
+  attach_function :yajl_free_error, %i{yajl_handle ustring}, :void
 
   #
-  attach_function :yajl_config, [:yajl_handle, :yajl_option, :varargs], :int
+  attach_function :yajl_config, %i{yajl_handle yajl_option varargs}, :int
 
-  attach_function :yajl_gen_config, [:yajl_gen, :yajl_gen_option, :varargs], :int
+  attach_function :yajl_gen_config, %i{yajl_gen yajl_gen_option varargs}, :int
 
   # yajl_gen yajl_gen_alloc (const yajl_alloc_funcs *allocFuncs)
   attach_function :yajl_gen_alloc, [:pointer], :yajl_gen
@@ -121,33 +121,33 @@ module FFI_Yajl
   # void  yajl_gen_free (yajl_gen handle)
   attach_function :yajl_gen_free, [:yajl_gen], :void
 
-  attach_function :yajl_gen_integer, [:yajl_gen, :long_long], :int
-  attach_function :yajl_gen_double, [:yajl_gen, :double], :int
-  attach_function :yajl_gen_number, [:yajl_gen, :ustring, :int], :int
-  attach_function :yajl_gen_string, [:yajl_gen, :ustring, :int], :int
+  attach_function :yajl_gen_integer, %i{yajl_gen long_long}, :int
+  attach_function :yajl_gen_double, %i{yajl_gen double}, :int
+  attach_function :yajl_gen_number, %i{yajl_gen ustring int}, :int
+  attach_function :yajl_gen_string, %i{yajl_gen ustring int}, :int
   attach_function :yajl_gen_null, [:yajl_gen], :int
-  attach_function :yajl_gen_bool, [:yajl_gen, :int], :int
+  attach_function :yajl_gen_bool, %i{yajl_gen int}, :int
   attach_function :yajl_gen_map_open, [:yajl_gen], :int
   attach_function :yajl_gen_map_close, [:yajl_gen], :int
   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, %i{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"
-require "ffi_yajl/parser"
+require_relative "encoder"
+require_relative "parser"
 
 module FFI_Yajl
   class Parser
-    require "ffi_yajl/ffi/parser"
+    require_relative "ffi/parser"
     include FFI_Yajl::FFI::Parser
   end
 
   class Encoder
-    require "ffi_yajl/ffi/encoder"
+    require_relative "ffi/encoder"
     include FFI_Yajl::FFI::Encoder
   end
 end

data/lib/ffi_yajl/ffi/encoder.rb

@@ -161,6 +161,7 @@ class Integer
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
       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
         FFI_Yajl::Encoder.raise_error_for_status(status, str)
@@ -179,6 +180,7 @@ class Float
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
       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
         FFI_Yajl::Encoder.raise_error_for_status(status, str)

data/lib/ffi_yajl/ffi/parser.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Lamont Granquist
-# Copyright (c) 2015 Chef Software, Inc.
+# Copyright (c) 2015-2018, Chef Software Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,13 +23,14 @@
 module FFI_Yajl
   module FFI
     module Parser
-      def set_value(val) # rubocop:disable Style/AccessorMethodName
+      def set_value(val) # rubocop:disable Naming/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)
@@ -55,15 +56,15 @@ module FFI_Yajl
           set_value(nil)
           1
         end
-        @boolean_callback = ::FFI::Function.new(:int, [:pointer, :int]) do |ctx, boolval|
+        @boolean_callback = ::FFI::Function.new(:int, %i{pointer int}) do |ctx, boolval|
           set_value(boolval == 1 ? true : false)
           1
         end
-        @integer_callback = ::FFI::Function.new(:int, [:pointer, :long_long]) do |ctx, intval|
+        @integer_callback = ::FFI::Function.new(:int, %i{pointer long_long}) do |ctx, intval|
           set_value(intval)
           1
         end
-        @number_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t ]) do |ctx, stringval, stringlen|
+        @number_callback = ::FFI::Function.new(:int, %i{pointer string size_t}) do |ctx, stringval, 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.
@@ -71,11 +72,11 @@ module FFI_Yajl
           set_value(v)
           1
         end
-        @double_callback = ::FFI::Function.new(:int, [:pointer, :double]) do |ctx, doubleval|
+        @double_callback = ::FFI::Function.new(:int, %i{pointer double}) do |ctx, doubleval|
           set_value(doubleval)
           1
         end
-        @string_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, stringval, stringlen|
+        @string_callback = ::FFI::Function.new(:int, %i{pointer string size_t}) do |ctx, stringval, stringlen|
           s = stringval.slice(0, stringlen)
           s.force_encoding("UTF-8") if defined? Encoding
           set_value(s)
@@ -86,7 +87,7 @@ module FFI_Yajl
           stack.push({})
           1
         end
-        @map_key_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, key, keylen|
+        @map_key_callback = ::FFI::Function.new(:int, %i{pointer string size_t}) do |ctx, key, keylen|
           s = key.slice(0, keylen)
           s.force_encoding("UTF-8") if defined? Encoding
           self.key = @opts[:symbolize_keys] ? s.to_sym : s

data/lib/ffi_yajl/map_library_name.rb

@@ -34,7 +34,7 @@ module FFI_Yajl
     # Stub for tests to override the host_os
     #
     # @api private
-    # @return Array<String> lower case ruby host_os string
+    # @return [Array<String>] lower case ruby host_os string
     def host_os
       RbConfig::CONFIG["host_os"].downcase
     end
@@ -43,7 +43,7 @@ module FFI_Yajl
     # and Mac may have different names/extensions.
     #
     # @api private
-    # @return Array<String> Array of yajl library names for platform
+    # @return [Array<String>] Array of yajl library names for platform
     def library_names
       case host_os
       when /mingw|mswin/
@@ -63,7 +63,7 @@ module FFI_Yajl
     # the filesystem.  May return an empty array.
     #
     # @api private
-    # @return Array<String> Array of full paths to libyajl2 gem libraries
+    # @return [Array<String>] Array of full paths to libyajl2 gem libraries
     def expanded_library_names
       library_names.map do |libname|
         pathname = File.expand_path(File.join(Libyajl2.opt_path, libname))

data/lib/ffi_yajl/version.rb

@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module FFI_Yajl
-  VERSION = "2.3.1"
+  VERSION = "2.3.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.3
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2019-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -122,7 +122,6 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- Rakefile
 - bin/ffi-yajl-bench
 - ext/ffi_yajl/ext/dlopen/dlopen.c
 - ext/ffi_yajl/ext/dlopen/extconf.rb
@@ -161,10 +160,6 @@ files:
 - lib/ffi_yajl/parser.rb
 - lib/ffi_yajl/platform.rb
 - lib/ffi_yajl/version.rb
-- spec/ffi_yajl/encoder_spec.rb
-- spec/ffi_yajl/map_library_name_spec.rb
-- spec/ffi_yajl/parser_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/chef/ffi-yajl
 licenses:
 - MIT
@@ -184,8 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby FFI wrapper around YAJL 2.x