ffi-yajl 2.2.2 → 2.3.4

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" unless defined?(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,30 +155,13 @@ class FalseClass
   end
 end
 
-class Fixnum
+class Integer
   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
-  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)
@@ -197,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)
@@ -265,7 +249,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

@@ -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,29 +56,29 @@ 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
+          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)
           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
+          s.force_encoding("UTF-8") if defined? Encoding
           set_value(s)
           1
         end
@@ -86,9 +87,9 @@ 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
+          s.force_encoding("UTF-8") if defined? Encoding
           self.key = @opts[:symbolize_keys] ? s.to_sym : s
           1
         end
@@ -143,12 +144,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
@@ -34,16 +34,16 @@ 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
+      RbConfig::CONFIG["host_os"].downcase
     end
 
     # Array of yajl library names on the platform.  Some platforms like Windows
     # 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))
@@ -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.2.2"
+  VERSION = "2.3.4".freeze
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.4
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2020-08-17 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
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: libyajl2
   requirement: !ruby/object:Gem::Requirement
@@ -109,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:
@@ -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,13 +160,9 @@ 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:
-- Apache-2.0
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -177,15 +172,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby FFI wrapper around YAJL 2.x

data/Rakefile

@@ -1,173 +0,0 @@
-$LOAD_PATH << File.expand_path(File.join(File.dirname( __FILE__ ), "lib"))
-
-require 'rspec/core/rake_task'
-require 'rubygems/package_task'
-require 'rake/extensiontask'
-require 'ffi_yajl/version'
-
-Dir[File.expand_path("../*gemspec", __FILE__)].reverse_each do |gemspec_path|
-  gemspec = eval(IO.read(gemspec_path))
-  Gem::PackageTask.new(gemspec).define
-end
-
-desc "Build it and ship it"
-task ship: [:clean, :gem] do
-  sh("git tag #{FFI_Yajl::VERSION}")
-  sh("git push --tags")
-  Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse_each do |built_gem|
-    sh("gem push #{built_gem}")
-  end
-end
-
-unix_gemspec = eval(File.read("ffi-yajl.gemspec"))
-
-task :clean do
-  sh "rm -f Gemfile.lock"
-  sh "rm -rf pkg/* tmp/* .bundle lib/ffi_yajl/ext/*"
-end
-
-desc "install the gem locally"
-task install: [:package] do
-  if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
-    sh %{gem install pkg/#{unix_gemspec.name}-#{unix_gemspec.version}-universal-java.gem}
-  else
-    sh %{gem install pkg/#{unix_gemspec.name}-#{unix_gemspec.version}.gem}
-  end
-end
-
-spec = Gem::Specification.load('ffi-yajl.gemspec')
-
-Rake::ExtensionTask.new do |ext|
-  ext.name = 'encoder'
-  ext.lib_dir = 'lib/ffi_yajl/ext'
-  ext.ext_dir = 'ext/ffi_yajl/ext/encoder'
-  ext.gem_spec = spec
-end
-
-Rake::ExtensionTask.new do |ext|
-  ext.name = 'parser'
-  ext.lib_dir = 'lib/ffi_yajl/ext'
-  ext.ext_dir = 'ext/ffi_yajl/ext/parser'
-  ext.gem_spec = spec
-end
-
-Rake::ExtensionTask.new do |ext|
-  ext.name = 'dlopen'
-  ext.lib_dir = 'lib/ffi_yajl/ext'
-  ext.ext_dir = 'ext/ffi_yajl/ext/dlopen'
-  ext.gem_spec = spec
-end
-
-#
-# test tasks
-#
-
-desc "Run all specs against both extensions"
-task :spec do
-  Rake::Task["spec:ffi"].invoke
-  if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
-    Rake::Task["spec:ext"].invoke
-  end
-end
-
-namespace :spec do
-  desc "Run all specs against ffi extension"
-  RSpec::Core::RakeTask.new(:ffi) do |t|
-    ENV['FORCE_FFI_YAJL'] = "ffi"
-    t.pattern = FileList['spec/**/*_spec.rb']
-  end
-  if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
-    desc "Run all specs again c extension"
-    RSpec::Core::RakeTask.new(:ext) do |t|
-      ENV['FORCE_FFI_YAJL'] = "ext"
-      t.pattern = FileList['spec/**/*_spec.rb']
-    end
-  end
-end
-
-if RUBY_VERSION.to_f >= 1.9
-  namespace :integration do
-    begin
-      require 'kitchen'
-    rescue LoadError
-      task :vagrant do
-        puts "test-kitchen gem is not installed"
-      end
-      task :cloud do
-        puts "test-kitchen gem is not installed"
-      end
-    else
-      desc 'Run Test Kitchen with Vagrant'
-      task :vagrant do
-        Kitchen.logger = Kitchen.default_file_logger
-        Kitchen::Config.new.instances.each do |instance|
-          instance.test(:always)
-        end
-      end
-
-      desc 'Run Test Kitchen with cloud plugins'
-      task :cloud do
-        if ENV['TRAVIS_PULL_REQUEST'] != 'true'
-          ENV['KITCHEN_YAML'] = '.kitchen.cloud.yml'
-          sh "kitchen test --concurrency 4"
-        end
-      end
-    end
-  end
-  namespace :style do
-    desc 'Run Ruby style checks'
-    begin
-      require 'rubocop/rake_task'
-    rescue LoadError
-      task :rubocop do
-        puts "rubocop gem is not installed"
-      end
-    else
-      RuboCop::RakeTask.new(:rubocop) do |t|
-        t.fail_on_error = false
-      end
-    end
-
-    desc 'Run Ruby smell checks'
-    begin
-      require 'reek/rake/task'
-    rescue LoadError
-      task :reek do
-        puts "reek gem is not installed"
-      end
-    else
-      Reek::Rake::Task.new(:reek) do |t|
-        t.fail_on_error = false
-        #        t.config_files = '.reek.yml'
-      end
-    end
-  end
-else
-  namespace :integration do
-    task :vagrant do
-      puts "test-kitchen unsupported on ruby 1.8"
-    end
-    task :cloud do
-      puts "test-kitchen unsupported on ruby 1.8"
-    end
-  end
-  namespace :style do
-    task :rubocop do
-      puts "rubocop unsupported on ruby 1.8"
-    end
-    task :reek do
-      puts "reek unsupported on ruby 1.8"
-    end
-  end
-end
-
-desc 'Run all style checks'
-task style: ['style:rubocop', 'style:reek']
-
-desc 'Run style + spec tests by default on travis'
-task travis: %w{style spec}
-
-desc 'Run style, spec and test kichen on travis'
-task travis_all: ['style', 'spec', 'integration:cloud']
-
-task default: ['style', 'spec', 'integration:vagrant']