ffi-yajl 2.3.0 → 2.3.1

data/lib/ffi_yajl/encoder.rb

@@ -47,7 +47,7 @@ module FFI_Yajl
         if str.respond_to?(:scrub)
           str.scrub!
         else
-          str.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
+          str.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!("UTF-8")
         end
       end
       str
@@ -68,7 +68,7 @@ module FFI_Yajl
       if token.respond_to?(:scrub)
         token.scrub!
       else
-        token.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
+        token.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!("UTF-8")
       end
       case status
       when 1 # yajl_gen_keys_must_be_strings

data/lib/ffi_yajl/ext.rb

@@ -20,16 +20,16 @@
 # 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 'rubygems'
+require "rubygems"
 
-require 'ffi_yajl/encoder'
-require 'ffi_yajl/parser'
-require 'ffi_yajl/ext/dlopen'
-require 'ffi_yajl/map_library_name'
+require "ffi_yajl/encoder"
+require "ffi_yajl/parser"
+require "ffi_yajl/ext/dlopen"
+require "ffi_yajl/map_library_name"
 
 # needed so the encoder c-code can find these symbols
-require 'stringio'
-require 'date'
+require "stringio"
+require "date"
 
 module FFI_Yajl
   extend FFI_Yajl::MapLibraryName
@@ -38,12 +38,12 @@ module FFI_Yajl
   dlopen_yajl_library
 
   class Parser
-    require 'ffi_yajl/ext/parser'
+    require "ffi_yajl/ext/parser"
     include FFI_Yajl::Ext::Parser
   end
 
   class Encoder
-    require 'ffi_yajl/ext/encoder'
+    require "ffi_yajl/ext/encoder"
     include FFI_Yajl::Ext::Encoder
   end
 end

data/lib/ffi_yajl/ffi.rb

@@ -20,18 +20,18 @@
 # 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 'rubygems'
+require "rubygems"
 
-require 'libyajl2'
+require "libyajl2"
 begin
-  require 'ffi'
+  require "ffi"
 rescue LoadError
   $stderr.puts "FATAL: to use the ffi extension instead of the compiled C extension, the ffi gem must be installed"
   $stderr.puts "       (it is optional, so you must include it in your bundle manually)"
   exit 1
 end
 
-require 'ffi_yajl/map_library_name'
+require "ffi_yajl/map_library_name"
 
 module FFI_Yajl
   extend ::FFI::Library
@@ -137,17 +137,17 @@ module FFI_Yajl
   attach_function :yajl_gen_clear, [:yajl_gen], :void
 end
 
-require 'ffi_yajl/encoder'
-require 'ffi_yajl/parser'
+require "ffi_yajl/encoder"
+require "ffi_yajl/parser"
 
 module FFI_Yajl
   class Parser
-    require 'ffi_yajl/ffi/parser'
+    require "ffi_yajl/ffi/parser"
     include FFI_Yajl::FFI::Parser
   end
 
   class Encoder
-    require 'ffi_yajl/ffi/encoder'
+    require "ffi_yajl/ffi/encoder"
     include FFI_Yajl::FFI::Encoder
   end
 end

data/lib/ffi_yajl/ffi/encoder.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Lamont Granquist
-# Copyright (c) 2015 Chef Software, Inc.
+# Copyright (c) 2015-2017, Chef Software Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,8 +20,8 @@
 # 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 'date'
-require 'stringio'
+require "date"
+require "stringio"
 
 module FFI_Yajl
   module FFI
@@ -73,7 +73,7 @@ class Hash
       end
     else
       if ( status = FFI_Yajl.yajl_gen_map_open(yajl_gen) ) != 0
-        FFI_Yajl::Encoder.raise_error_for_status(status, '{')
+        FFI_Yajl::Encoder.raise_error_for_status(status, "{")
       end
       each do |key, value|
         # Perf Fix: mutate state hash rather than creating new copy
@@ -83,7 +83,7 @@ class Hash
         value.ffi_yajl(yajl_gen, state)
       end
       if ( status = FFI_Yajl.yajl_gen_map_close(yajl_gen) ) != 0
-        FFI_Yajl::Encoder.raise_error_for_status(status, '}')
+        FFI_Yajl::Encoder.raise_error_for_status(status, "}")
       end
     end
   end
@@ -98,13 +98,13 @@ class Array
       end
     else
       if ( status = FFI_Yajl.yajl_gen_array_open(yajl_gen) ) != 0
-        FFI_Yajl::Encoder.raise_error_for_status(status, '[')
+        FFI_Yajl::Encoder.raise_error_for_status(status, "[")
       end
       each do |value|
         value.ffi_yajl(yajl_gen, state)
       end
       if ( status = FFI_Yajl.yajl_gen_array_close(yajl_gen) ) != 0
-        FFI_Yajl::Encoder.raise_error_for_status(status, ']')
+        FFI_Yajl::Encoder.raise_error_for_status(status, "]")
       end
     end
   end
@@ -155,25 +155,7 @@ class FalseClass
   end
 end
 
-class Fixnum
-  def ffi_yajl(yajl_gen, state)
-    str = to_s
-    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)
-      end
-    else
-      if ( status = FFI_Yajl.yajl_gen_integer(yajl_gen, self) ) != 0
-        FFI_Yajl::Encoder.raise_error_for_status(status, str)
-      end
-    end
-  end
-end
-
-class Bignum
+class Integer
   def ffi_yajl(yajl_gen, state)
     str = to_s
     if str == "NaN" || str == "Infinity" || str == "-Infinity"
@@ -265,7 +247,7 @@ end
 # I feel dirty
 class Object
   def ffi_yajl(yajl_gen, state)
-    if !state[:processing_key] && self.respond_to?(:to_json)
+    if !state[:processing_key] && respond_to?(:to_json)
       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)

data/lib/ffi_yajl/ffi/parser.rb

@@ -65,7 +65,7 @@ module FFI_Yajl
         end
         @number_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t ]) do |ctx, stringval, stringlen|
           s = stringval.slice(0, stringlen)
-          s.force_encoding('UTF-8') if defined? Encoding
+          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
           set_value(v)
@@ -77,7 +77,7 @@ module FFI_Yajl
         end
         @string_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, stringval, stringlen|
           s = stringval.slice(0, stringlen)
-          s.force_encoding('UTF-8') if defined? Encoding
+          s.force_encoding("UTF-8") if defined? Encoding
           set_value(s)
           1
         end
@@ -88,7 +88,7 @@ module FFI_Yajl
         end
         @map_key_callback = ::FFI::Function.new(:int, [:pointer, :string, :size_t]) do |ctx, key, keylen|
           s = key.slice(0, keylen)
-          s.force_encoding('UTF-8') if defined? Encoding
+          s.force_encoding("UTF-8") if defined? Encoding
           self.key = @opts[:symbolize_keys] ? s.to_sym : s
           1
         end
@@ -143,12 +143,12 @@ module FFI_Yajl
           ::FFI_Yajl.yajl_config(yajl_handle, :yajl_allow_partial_values, :int, 1)
         end
 
-        if ( ::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, error
         end
-        if ( ::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, error

data/lib/ffi_yajl/map_library_name.rb

@@ -20,7 +20,7 @@
 # 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 'libyajl2'
+require "libyajl2"
 
 # Mixin for use in finding the right yajl library on the system.  The 'caller'
 # needs to also mixin either the FFI module or the DLopen module.  Those are
@@ -36,7 +36,7 @@ module FFI_Yajl
     # @api private
     # @return Array<String> lower case ruby host_os string
     def host_os
-      RbConfig::CONFIG['host_os'].downcase
+      RbConfig::CONFIG["host_os"].downcase
     end
 
     # Array of yajl library names on the platform.  Some platforms like Windows
@@ -103,7 +103,7 @@ module FFI_Yajl
         rescue LoadError
         end
       end
-      ffi_lib 'yajl' unless found
+      ffi_lib "yajl" unless found
     end
   end
 end

data/lib/ffi_yajl/parser.rb

@@ -65,10 +65,10 @@ module FFI_Yajl
         raise ArgumentError, "options check_utf8 and dont_validate_strings are both true which conflict"
       end
 
-      yajl_opts[:yajl_allow_comments]         = true
+      yajl_opts[:yajl_allow_comments] = true
 
       if @opts.key?(:allow_comments)
-        yajl_opts[:yajl_allow_comments]       = @opts[:allow_comments]
+        yajl_opts[:yajl_allow_comments] = @opts[:allow_comments]
       end
 
       yajl_opts[:yajl_dont_validate_strings]  = (@opts[:check_utf8] == false || @opts[:dont_validate_strings])

data/lib/ffi_yajl/version.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2015 Lamont Granquist
-# Copyright (c) 2015 Chef Software, Inc.
+# Copyright (c) 2015-2017, Chef Software Inc.
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,5 +21,5 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module FFI_Yajl
-  VERSION = "2.3.0"
+  VERSION = "2.3.1"
 end

data/spec/ffi_yajl/encoder_spec.rb

@@ -21,8 +21,8 @@
 # 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 'spec_helper'
-require 'date'
+require "spec_helper"
+require "date"
 
 describe "FFI_Yajl::Encoder" do
   let(:options) { {} }
@@ -30,7 +30,7 @@ describe "FFI_Yajl::Encoder" do
   let(:encoder) { FFI_Yajl::Encoder.new(options) }
 
   it "encodes hashes in keys as strings", ruby_gte_193: true do
-    ruby = { { 'a' => 'b' } => 2 }
+    ruby = { { "a" => "b" } => 2 }
     expect(encoder.encode(ruby)).to eq('{"{\"a\"=>\"b\"}":2}')
   end
 
@@ -126,23 +126,23 @@ describe "FFI_Yajl::Encoder" do
   end
 
   it "can encode Date objects" do
-    ruby = Date.parse('2001-02-03')
+    ruby = Date.parse("2001-02-03")
     expect(encoder.encode(ruby)).to eq( '"2001-02-03"' )
   end
 
   it "can encode StringIOs" do
-    ruby = { "foo" => StringIO.new('THING') }
+    ruby = { "foo" => StringIO.new("THING") }
     expect(encoder.encode(ruby)).to eq("{\"foo\":\"THING\"}")
   end
 
   context "when encoding Time objects in UTC timezone" do
     before do
-      @saved_tz = ENV['TZ']
-      ENV['TZ'] = 'UTC'
+      @saved_tz = ENV["TZ"]
+      ENV["TZ"] = "UTC"
     end
 
     after do
-      ENV['TZ'] = @saved_tz
+      ENV["TZ"] = @saved_tz
     end
 
     it "encodes them correctly" do
@@ -152,7 +152,7 @@ describe "FFI_Yajl::Encoder" do
   end
 
   it "can encode DateTime objects" do
-    ruby = DateTime.parse('2001-02-03T04:05:06.1+07:00')
+    ruby = DateTime.parse("2001-02-03T04:05:06.1+07:00")
     expect(encoder.encode(ruby)).to eq( '"2001-02-03T04:05:06+07:00"' )
   end
 
@@ -191,7 +191,7 @@ describe "FFI_Yajl::Encoder" do
     end
 
     context "when validate_utf8 is off" do
-      let(:options) {  { validate_utf8: false } }
+      let(:options) { { validate_utf8: false } }
 
       it "does not raise an error" do
         expect { encoder.encode(ruby) }.not_to raise_error

data/spec/ffi_yajl/map_library_name_spec.rb

@@ -20,7 +20,7 @@
 # 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 'spec_helper'
+require "spec_helper"
 
 class Test
   extend FFI_Yajl::MapLibraryName
@@ -107,7 +107,7 @@ describe "FFI_Yajl::MapLibraryName" do
           allow(File).to receive(:file?).with(path).and_return(true)
           allow(Test).to receive(:ffi_lib).with(path).and_raise(LoadError)
         end
-        allow(Test).to receive(:ffi_lib).with('yajl').and_return(nil)
+        allow(Test).to receive(:ffi_lib).with("yajl").and_return(nil)
         Test.send(:ffi_open_yajl_library)
       end
     end

data/spec/ffi_yajl/parser_spec.rb

@@ -21,12 +21,12 @@
 # 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 'spec_helper'
+require "spec_helper"
 
 describe "FFI_Yajl::Parser" do
   shared_examples_for "correct json parsing" do
     context "when json has 23456789012E666" do
-      let(:json) {  '{"key": 23456789012E666}' }
+      let(:json) { '{"key": 23456789012E666}' }
 
       it "should return infinity" do
         infinity = (1.0 / 0)
@@ -271,10 +271,10 @@ describe "FFI_Yajl::Parser" do
             Encoding.default_internal = @saved_encoding
           end
           it "encodes keys to UTF-8" do
-            expect(parser.keys.first.encoding).to eql(Encoding.find('utf-8'))
+            expect(parser.keys.first.encoding).to eql(Encoding.find("utf-8"))
           end
           it "encodes values to UTF-8" do
-            expect(parser.values.first.encoding).to eql(Encoding.find('utf-8'))
+            expect(parser.values.first.encoding).to eql(Encoding.find("utf-8"))
           end
         end
 
@@ -349,7 +349,7 @@ describe "FFI_Yajl::Parser" do
     # NOTE: we are choosing to be compatible with yajl-ruby here vs. JSON
     # gem and libyajl C behavior (which is to throw an exception in this case)
     context "when the JSON is empty string" do
-      let(:json) { '' }
+      let(:json) { "" }
 
       it "returns nil" do
         expect(parser).to be_nil
@@ -475,7 +475,7 @@ describe "FFI_Yajl::Parser" do
     # NOTE: parsing floats with 8 million digits on windows has some kind of huge
     #       perf issues likely in ruby and/or the underlying windows libs
     context "when parsing big floats", ruby_gte_193: true, unix_only: true do
-      let(:json) { '[0.' + '1' * 2**23 + ']' }
+      let(:json) { "[0." + "1" * 2**23 + "]" }
 
       it "parses" do
         expect { parser }.not_to raise_error
@@ -483,7 +483,7 @@ describe "FFI_Yajl::Parser" do
     end
 
     context "when parsing long hash keys with symbolize_keys option", ruby_gte_193: true do
-      let(:json) { '{"' + 'a' * 2**23 + '": 0}' }
+      let(:json) { '{"' + "a" * 2**23 + '": 0}' }
       let(:options) { { symbolize_keys: true } }
 
       it "parses" do

data/spec/spec_helper.rb

@@ -26,18 +26,18 @@ $LOAD_PATH << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
 # linked in the same process).  this should work, see:
 # http://stackoverflow.com/questions/3232822/linking-with-multiple-versions-of-a-library
 begin
-  require 'yajl'
+  require "yajl"
 rescue LoadError
-  puts 'WARN: yajl cannot be loaded, expected if this is jruby'
+  puts "WARN: yajl cannot be loaded, expected if this is jruby"
 end
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 RSpec.configure do |conf|
   conf.filter_run_excluding unix_only: true unless RUBY_PLATFORM !~ /mswin|mingw|windows/
   conf.filter_run_excluding ruby_gte_193: true unless RUBY_VERSION.to_f >= 2.0 || RUBY_VERSION =~ /^1\.9\.3/
 
-  conf.order = 'random'
+  conf.order = "random"
 
   conf.expect_with :rspec do |rspec|
     rspec.syntax = :expect

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.99'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: libyajl2
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 description: Ruby FFI wrapper around YAJL 2.x
-email: lamont@getchef.com
+email: lamont@chef.io
 executables:
 - ffi-yajl-bench
 extensions:
@@ -181,7 +167,7 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/chef/ffi-yajl
 licenses:
-- Apache-2.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -191,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -199,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby FFI wrapper around YAJL 2.x