ffi-yajl 2.2.2-universal-java → 2.3.4-universal-java

data/lib/ffi_yajl/benchmark/encode_json_and_marshal.rb

@@ -1,18 +1,18 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
-require 'stringio'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
+require "stringio" unless defined?(StringIO)
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
-filename = 'benchmark/subjects/ohai.json'
-json = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.json"
+json = File.new(filename, "r")
 hash = Yajl::Parser.new.parse(json)
 json.close
 

data/lib/ffi_yajl/benchmark/encode_json_and_yaml.rb

@@ -1,18 +1,18 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
-require 'yaml'
+require "yaml" unless defined?(YAML)
 
 # JSON Section
-filename = 'benchmark/subjects/ohai.json'
-json = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.json"
+json = File.new(filename, "r")
 hash = Yajl::Parser.new.parse(json)
 json.close
 
@@ -33,8 +33,8 @@ Benchmark.bmbm do |x|
 end
 
 # YAML Section
-filename = 'benchmark/subjects/ohai.yml'
-yml = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.yml"
+yml = File.new(filename, "r")
 data = YAML.load_stream(yml)
 yml.close
 

data/lib/ffi_yajl/benchmark/encode_profile.rb

@@ -1,15 +1,15 @@
 # Portions Originally Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
 # See MIT-LICENSE
 
-require 'rubygems'
-require 'ffi_yajl'
+require "rubygems" unless defined?(Gem)
+require_relative "../../ffi_yajl"
 begin
-  require 'perftools'
+  require "perftools"
 rescue LoadError
   puts "INFO: perftools.rb gem not installed"
 end
 
-ENV['CPUPROFILE_FREQUENCY'] = "4000"
+ENV["CPUPROFILE_FREQUENCY"] = "4000"
 
 module FFI_Yajl
   class Benchmark
@@ -18,7 +18,7 @@ module FFI_Yajl
         return unless defined?(PerfTools)
 
         filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
-        hash = File.open(filename, 'rb') { |f| FFI_Yajl::Parser.parse(f.read) }
+        hash = File.open(filename, "rb") { |f| FFI_Yajl::Parser.parse(f.read) }
 
         times = 1000
         puts "Starting profiling encoding #{filename} #{times} times\n\n"

data/lib/ffi_yajl/benchmark/http.rb

@@ -1,17 +1,17 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl/http_stream'
-require 'yajl/gzip'
-require 'yajl/deflate'
-require 'yajl/bzip2' unless defined?(Bzip2)
-require 'json'
-require 'uri'
-require 'net/http'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl/http_stream"
+require "yajl/gzip"
+require "yajl/deflate"
+require "yajl/bzip2" unless defined?(Bzip2)
+require "json" unless defined?(JSON)
+require "uri" unless defined?(URI)
+require "net/http" unless defined?(Net::HTTP)
 
-uri = URI.parse('http://search.twitter.com/search.json?q=github')
+uri = URI.parse("http://search.twitter.com/search.json?q=github")
 # uri = URI.parse('http://localhost/yajl-ruby.git/benchmark/subjects/contacts.json')
 
 times = ARGV[0] ? ARGV[0].to_i : 1

data/lib/ffi_yajl/benchmark/parse.rb

@@ -1,10 +1,10 @@
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
-require 'ffi_yajl'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
+require_relative "../../ffi_yajl"
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
   begin
-    require 'yajl'
+    require "yajl"
   rescue LoadError
     puts "INFO: yajl-ruby not installed"
   end
@@ -12,11 +12,11 @@ else
   puts "INFO: skipping yajl-ruby on jruby"
 end
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
 begin
-  require 'oj'
+  require "oj"
 rescue LoadError
 end
 
@@ -25,7 +25,7 @@ module FFI_Yajl
     class Parse
       def run
         filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "item.json"))
-        json = File.new(filename, 'r')
+        json = File.new(filename, "r")
         json_str = json.read
 
         times = ARGV[1] ? ARGV[1].to_i : 10_000

data/lib/ffi_yajl/benchmark/parse_json_and_marshal.rb

@@ -1,19 +1,19 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
 
 # JSON section
-filename = 'benchmark/subjects/ohai.json'
-marshal_filename = 'benchmark/subjects/ohai.marshal_dump'
-json = File.new(filename, 'r')
-marshal_file = File.new(marshal_filename, 'r')
+filename = "benchmark/subjects/ohai.json"
+marshal_filename = "benchmark/subjects/ohai.marshal_dump"
+json = File.new(filename, "r")
+marshal_file = File.new(marshal_filename, "r")
 
 hash = {}
 

data/lib/ffi_yajl/benchmark/parse_json_and_yaml.rb

@@ -1,18 +1,18 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
-require 'yaml'
+require "yaml" unless defined?(YAML)
 
 # JSON section
-filename = 'benchmark/subjects/ohai.json'
-json = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.json"
+json = File.new(filename, "r")
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
 puts "Starting benchmark parsing #{File.size(filename)} bytes of JSON data #{times} times\n\n"
@@ -39,8 +39,8 @@ end
 json.close
 
 # YAML section
-filename = 'benchmark/subjects/ohai.yml'
-yaml = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.yml"
+yaml = File.new(filename, "r")
 
 puts "Starting benchmark parsing #{File.size(filename)} bytes of YAML data #{times} times\n\n"
 Benchmark.bmbm do |x|

data/lib/ffi_yajl/benchmark/parse_profile.rb

@@ -1,15 +1,15 @@
 # Portions Originally Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
 # See MIT-LICENSE
 
-require 'rubygems'
-require 'ffi_yajl'
+require "rubygems" unless defined?(Gem)
+require_relative "../../ffi_yajl"
 begin
-  require 'perftools'
+  require "perftools"
 rescue LoadError
   puts "INFO: perftools.rb gem not installed"
 end
 
-ENV['CPUPROFILE_FREQUENCY'] = "4000"
+ENV["CPUPROFILE_FREQUENCY"] = "4000"
 
 module FFI_Yajl
   class Benchmark
@@ -18,7 +18,7 @@ module FFI_Yajl
         return if defined?(PerfTools)
 
         filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
-        json = File.new(filename, 'r').read
+        json = File.new(filename, "r").read
 
         times = 1000
         puts "Starting profiling encoding #{filename} #{times} times\n\n"

data/lib/ffi_yajl/benchmark/parse_profile_ruby_prof.rb

@@ -1,15 +1,15 @@
 # Portions Originally Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
 # See MIT-LICENSE
 
-require 'rubygems'
-require 'ffi_yajl'
+require "rubygems" unless defined?(Gem)
+require_relative "../../ffi_yajl"
 
 module FFI_Yajl
   class Benchmark
     class ParseProfileRubyProf
       def run
         begin
-          require 'ruby-prof'
+          require "ruby-prof"
         rescue LoadError
           puts "INFO: perftools.rb gem not installed"
         end
@@ -17,7 +17,7 @@ module FFI_Yajl
         return if defined?(RubyProf)
 
         filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
-        json = File.new(filename, 'r').read
+        json = File.new(filename, "r").read
 
         times = 1000
         puts "Starting profiling encoding #{filename} #{times} times\n\n"

data/lib/ffi_yajl/benchmark/parse_stream.rb

@@ -1,20 +1,20 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
 begin
-  require 'active_support'
+  require "active_support"
 rescue LoadError
 end
 
-filename = 'benchmark/subjects/twitter_stream.json'
-json = File.new(filename, 'r')
+filename = "benchmark/subjects/twitter_stream.json"
+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"
@@ -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/encoder.rb

@@ -41,7 +41,15 @@ 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.force_encoding("UTF-8")
+      unless yajl_gen_opts[:yajl_gen_validate_utf8]
+        if str.respond_to?(:scrub)
+          str.scrub!
+        else
+          str.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!("UTF-8")
+        end
+      end
       str
     end
 
@@ -56,7 +64,12 @@ module FFI_Yajl
 
     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.force_encoding("UTF-8")
+      if token.respond_to?(:scrub)
+        token.scrub!
+      else
+        token.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!("UTF-8")
+      end
       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/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" unless defined?(Gem)
 
-require 'ffi_yajl/encoder'
-require 'ffi_yajl/parser'
-require 'ffi_yajl/ext/dlopen'
-require 'ffi_yajl/map_library_name'
+require_relative "encoder"
+require_relative "parser"
+require "ffi_yajl/ext/dlopen"
+require_relative "map_library_name"
 
 # needed so the encoder c-code can find these symbols
-require 'stringio'
-require 'date'
+require "stringio" unless defined?(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" unless defined?(Gem)
 
-require 'libyajl2'
+require "libyajl2"
 begin
-  require 'ffi'
+  require "ffi" unless defined?(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_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