ffi-yajl 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6033cc1e00b955a9910f2bd2bcf36711fbbe842
-  data.tar.gz: cfc7023e68822af31e4e634024fa9477064516f6
+  metadata.gz: 698b1ce561f77a88863731f081403af3f2e64c74
+  data.tar.gz: 399e10697124eda792a662aa1c43e4764211e9f5
 SHA512:
-  metadata.gz: 04cc3ba362d0d00cd1bca749b46e053cc24153725cc3a1475177f82f27ed9442483abff6ce11bba74ab691c7017c8e4aaf1339fb5f7ea593ec5b88b0b776b879
-  data.tar.gz: 73f5223e85d8ac1d15951eac652f02de799034b5698e0f4a2fe04e2e0e62401175a4deff8a687f85e7ca4e303ca041bdf19c9366be212ee0b0a12119424cff78
+  metadata.gz: 9df09671a4d54e5b4c132b94870245ff609d31eab5bc8a42c9dbf9d0725276f7238a5876be50c1458af77c84b6ff9c5214c076866c85b3650b9ec32fb82bed82
+  data.tar.gz: 1cf49ace03a77061306d8e8dd9fe015d1acdaa1be90c6c4100993466006512d0da49438ec63be8962f2dc916487b6a5938267122a4942c1f7a9a780961a1e4cf

data/README.md

@@ -45,7 +45,7 @@ Ruby 1.8.7 support was dropped in 2.2.0
 Start by requiring it:
 
 ```ruby
-require 'ffi-yajl'
+require 'ffi_yajl'
 ```
 
 You can encode and parse with class objects:
@@ -146,4 +146,3 @@ preserved and this source code has deliberately not been dual licensed under
 Chef's typical Apache License.  See the
 [LICENSE](https://github.com/chef/ffi-yajl/blob/master/LICENSE) file in this
 project.
-

data/Rakefile

@@ -1,20 +1,20 @@
-$: << File.expand_path(File.join(File.dirname( __FILE__ ), "lib"))
+$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|
+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
+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|
+  Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse_each do |built_gem|
     sh("gem push #{built_gem}")
   end
 end
@@ -27,7 +27,7 @@ task :clean do
 end
 
 desc "install the gem locally"
-task :install => [:package] do
+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
@@ -123,7 +123,7 @@ if RUBY_VERSION.to_f >= 1.9
         puts "rubocop gem is not installed"
       end
     else
-      Rubocop::RakeTask.new(:rubocop) do |t|
+      RuboCop::RakeTask.new(:rubocop) do |t|
         t.fail_on_error = false
       end
     end
@@ -138,7 +138,7 @@ if RUBY_VERSION.to_f >= 1.9
     else
       Reek::Rake::Task.new(:reek) do |t|
         t.fail_on_error = false
-#        t.config_files = '.reek.yml'
+        #        t.config_files = '.reek.yml'
       end
     end
   end
@@ -161,14 +161,13 @@ else
   end
 end
 
-
 desc 'Run all style checks'
-task :style => ['style:rubocop', 'style:reek']
+task style: ['style:rubocop', 'style:reek']
 
 desc 'Run style + spec tests by default on travis'
-task :travis => ['style', 'spec']
+task travis: %w{style spec}
 
 desc 'Run style, spec and test kichen on travis'
-task :travis_all => ['style', 'spec', 'integration:cloud']
+task travis_all: ['style', 'spec', 'integration:cloud']
 
-task :default => ['style', 'spec', 'integration:vagrant']
+task default: ['style', 'spec', 'integration:vagrant']

data/bin/ffi-yajl-bench

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-
-$: << File.expand_path(File.join(File.dirname( File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__ ), "../lib"))
+$LOAD_PATH << File.expand_path(File.join(File.dirname( File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__ ), "../lib"))
 
 require 'optparse'
 require 'ffi_yajl/benchmark'
@@ -30,8 +29,8 @@ ENV['FORCE_FFI_YAJL'] = 'ffi' if opts[:ffi]
 ENV['FORCE_FFI_YAJL'] = 'ext' if opts[:ext]
 
 if opts[:profile]
-  FFI_Yajl::Benchmark::ParseProfileRubyProf.new().run()
+  FFI_Yajl::Benchmark::ParseProfileRubyProf.new.run
 else
-  FFI_Yajl::Benchmark::Parse.new().run()
-  FFI_Yajl::Benchmark::Encode.new().run()
+  FFI_Yajl::Benchmark::Parse.new.run
+  FFI_Yajl::Benchmark::Encode.new.run
 end

data/ext/ffi_yajl/ext/dlopen/extconf.rb

@@ -1,3 +1,4 @@
+# rubocop:disable Style/GlobalVars
 require 'mkmf'
 require 'rubygems'
 

data/ext/ffi_yajl/ext/encoder/encoder.c

@@ -362,10 +362,15 @@ void Init_encoder() {
   cYajl_Gen = rb_define_class_under(mEncoder, "YajlGen", rb_cObject);
   rb_define_method(mEncoder, "do_yajl_encode", mEncoder_do_yajl_encode, 3);
 
-  cDate = rb_define_class("Date", rb_cObject);
-  cTime = rb_define_class("Time", rb_cObject);
-  cDateTime = rb_define_class("DateTime", cDate);
-  cStringIO = rb_define_class("StringIO", rb_cData);
+  /* use rb_const_get instead of rb_define_class so that we don't get superclass mismatches */
+  ID sym_Date = rb_intern("Date");
+  cDate = rb_const_get(rb_cObject, sym_Date);
+  ID sym_Time = rb_intern("Time");
+  cTime = rb_const_get(rb_cObject, sym_Time);
+  ID sym_DateTime = rb_intern("DateTime");
+  cDateTime = rb_const_get(rb_cObject, sym_DateTime);
+  ID sym_StringIO = rb_intern("StringIO");
+  cStringIO = rb_const_get(rb_cObject, sym_StringIO);
 
   rb_define_method(rb_cHash, "ffi_yajl", rb_cHash_ffi_yajl, 2);
   rb_define_method(rb_cArray, "ffi_yajl", rb_cArray_ffi_yajl, 2);

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

@@ -1,3 +1,4 @@
+# rubocop:disable Style/GlobalVars
 require 'mkmf'
 require 'rubygems'
 require 'libyajl2'
@@ -54,7 +55,7 @@ if !windows? && !find_header('yajl/yajl_tree.h')
   dir_config('yajl', HEADER_DIRS, LIB_DIRS)
 
   # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
-  if !(find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse'))
+  unless find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse')
     abort "libyajl2 is missing.  please install libyajl2"
   end
 end

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

@@ -1,3 +1,4 @@
+# rubocop:disable Style/GlobalVars
 require 'mkmf'
 require 'rubygems'
 require 'libyajl2'
@@ -54,7 +55,7 @@ if !windows? && !find_header('yajl/yajl_tree.h')
   dir_config('yajl', HEADER_DIRS, LIB_DIRS)
 
   # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
-  if !(find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse'))
+  unless find_header('yajl/yajl_tree.h') && find_library('yajl', 'yajl_complete_parse')
     abort "libyajl2 is missing.  please install libyajl2"
   end
 end

data/ext/ffi_yajl/ext/parser/parser.c

@@ -184,6 +184,7 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE yajl_opts) {
   unsigned char *err;
   volatile CTX ctx;
 
+  rb_ivar_set(self, rb_intern("key"), Qnil);
   rb_ivar_set(self, rb_intern("stack"), rb_ary_new());
   rb_ivar_set(self, rb_intern("key_stack"), rb_ary_new());
 

data/lib/ffi_yajl/benchmark/encode.rb

@@ -5,14 +5,10 @@ require 'rubygems'
 require 'benchmark'
 require 'stringio'
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
-  if ENV['FORCE_FFI_YAJL'] != 'ext'
-    begin
-      require 'yajl'
-    rescue Exception
-      puts "INFO: yajl-ruby not installed"
-    end
-  else
-    puts "INFO: skipping yajl-ruby because we're using the C extension"
+  begin
+    require 'yajl'
+  rescue LoadError
+    puts "INFO: yajl-ruby not installed"
   end
 else
   puts "INFO: skipping yajl-ruby on jruby"
@@ -20,121 +16,67 @@ end
 require 'ffi_yajl'
 begin
   require 'json'
-rescue Exception
+rescue LoadError
   puts "INFO: json gem not installed"
 end
-begin
-  require 'psych'
-rescue Exception
-  puts "INFO: psych gem not installed"
-end
-begin
-  require 'active_support'
-rescue Exception
-  puts "INFO: active_support gem not installed"
-end
 begin
   require 'oj'
-rescue Exception
+rescue LoadError
   puts "INFO: oj gem not installed"
 end
 
 module FFI_Yajl
   class Benchmark
     class Encode
-
       def run
-        #filename = ARGV[0] || 'benchmark/subjects/ohai.json'
+        # filename = ARGV[0] || 'benchmark/subjects/ohai.json'
         filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
         hash = File.open(filename, 'rb') { |f| FFI_Yajl::Parser.parse(f.read) }
 
         times = ARGV[1] ? ARGV[1].to_i : 1000
         puts "Starting benchmark encoding #{filename} #{times} times\n\n"
-        ::Benchmark.bmbm { |x|
-
-          x.report("FFI_Yajl::Encoder.encode (to a String)") {
-            times.times {
-              output = FFI_Yajl::Encoder.encode(hash)
-            }
-          }
+        ::Benchmark.bmbm do |x|
+          x.report("FFI_Yajl::Encoder.encode (to a String)") do
+            times.times { FFI_Yajl::Encoder.encode(hash) }
+          end
 
           ffi_string_encoder = FFI_Yajl::Encoder.new
-          x.report("FFI_Yajl::Encoder#encode (to a String)") {
-            times.times {
-              output = ffi_string_encoder.encode(hash)
-            }
-          }
+          x.report("FFI_Yajl::Encoder#encode (to a String)") do
+            times.times { ffi_string_encoder.encode(hash) }
+          end
 
           if defined?(Oj)
-            x.report("Oj.dump (to a String)") {
-              times.times {
-                output = Oj.dump(hash)
-              }
-            }
+            x.report("Oj.dump (to a String)") do
+              times.times { Oj.dump(hash) }
+            end
           end
 
           if defined?(Yajl::Encoder)
-            x.report("Yajl::Encoder.encode (to a String)") {
-              times.times {
-                output = Yajl::Encoder.encode(hash)
-              }
-            }
+            x.report("Yajl::Encoder.encode (to a String)") do
+              times.times { Yajl::Encoder.encode(hash) }
+            end
 
             io_encoder = Yajl::Encoder.new
-            x.report("Yajl::Encoder#encode (to an IO)") {
-              times.times {
-                io_encoder.encode(hash, StringIO.new)
-              }
-            }
+            x.report("Yajl::Encoder#encode (to an IO)") do
+              times.times { io_encoder.encode(hash, StringIO.new) }
+            end
 
             string_encoder = Yajl::Encoder.new
-            x.report("Yajl::Encoder#encode (to a String)") {
-              times.times {
-                output = string_encoder.encode(hash)
-              }
-            }
+            x.report("Yajl::Encoder#encode (to a String)") do
+              times.times { string_encoder.encode(hash) }
+            end
           end
 
           if defined?(JSON)
-            x.report("JSON.generate") {
-              times.times {
-                JSON.generate(hash)
-              }
-            }
-            x.report("JSON.fast_generate") {
-              times.times {
-                JSON.fast_generate(hash)
-              }
-            }
-          end
-          if defined?(Psych)
-            x.report("Psych.to_json") {
-              times.times {
-                Psych.to_json(hash)
-              }
-            }
-            if defined?(Psych::JSON::Stream)
-              x.report("Psych::JSON::Stream") {
-                times.times {
-                  io = StringIO.new
-                  stream = Psych::JSON::Stream.new io
-                  stream.start
-                  stream.push hash
-                  stream.finish
-                }
-              }
+            x.report("JSON.generate") do
+              times.times { JSON.generate(hash) }
+            end
+            x.report("JSON.fast_generate") do
+              times.times { JSON.fast_generate(hash) }
             end
           end
-#          if defined?(ActiveSupport::JSON)
-#            x.report("ActiveSupport::JSON.encode") {
-#              times.times {
-#                ActiveSupport::JSON.encode(hash)
-#              }
-#            }
-#          end
-        }
+        end
       end
     end
   end
-
 end

data/lib/ffi_yajl/benchmark/encode_json_and_marshal.rb

@@ -17,26 +17,26 @@ hash = Yajl::Parser.new.parse(json)
 json.close
 
 puts "Starting benchmark encoding #{filename} #{times} times\n\n"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   encoder = Yajl::Encoder.new
-  x.report {
+  x.report do
     puts "Yajl::Encoder#encode"
-    times.times {
+    times.times do
       encoder.encode(hash, StringIO.new)
-    }
-  }
+    end
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON's #to_json"
-      times.times {
+      times.times do
         JSON.generate(hash)
-      }
-    }
+      end
+    end
   end
-  x.report {
+  x.report do
     puts "Marshal.dump"
-    times.times {
+    times.times do
       Marshal.dump(hash)
-    }
-  }
-}
+    end
+  end
+end

data/lib/ffi_yajl/benchmark/encode_json_and_yaml.rb

@@ -18,23 +18,19 @@ json.close
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
 puts "Starting benchmark encoding #{filename} into JSON #{times} times\n\n"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   encoder = Yajl::Encoder.new
-  x.report {
+  x.report do
     puts "Yajl::Encoder#encode"
-    times.times {
-      encoder.encode(hash, StringIO.new)
-    }
-  }
+    times.times { encoder.encode(hash, StringIO.new) }
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON's #to_json"
-      times.times {
-        JSON.generate(hash)
-      }
-    }
+      times.times { JSON.generate(hash) }
+    end
   end
-}
+end
 
 # YAML Section
 filename = 'benchmark/subjects/ohai.yml'
@@ -43,11 +39,9 @@ data = YAML.load_stream(yml)
 yml.close
 
 puts "Starting benchmark encoding #{filename} into YAML #{times} times\n\n"
-Benchmark.bmbm { |x|
-  x.report {
+Benchmark.bmbm do |x|
+  x.report do
     puts "YAML.dump"
-    times.times {
-      YAML.dump(data, StringIO.new)
-    }
-  }
-}
+    times.times { YAML.dump(data, StringIO.new) }
+  end
+end

data/lib/ffi_yajl/benchmark/encode_profile.rb

@@ -5,7 +5,7 @@ require 'rubygems'
 require 'ffi_yajl'
 begin
   require 'perftools'
-rescue Exception
+rescue LoadError
   puts "INFO: perftools.rb gem not installed"
 end
 
@@ -14,25 +14,21 @@ ENV['CPUPROFILE_FREQUENCY'] = "4000"
 module FFI_Yajl
   class Benchmark
     class EncodeProfile
-
       def run
-        if 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) }
+        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) }
 
-          times = 1000
-          puts "Starting profiling encoding #{filename} #{times} times\n\n"
+        times = 1000
+        puts "Starting profiling encoding #{filename} #{times} times\n\n"
 
-          ffi_string_encoder = FFI_Yajl::Encoder.new
-          PerfTools::CpuProfiler.start("/tmp/ffi_yajl_encode_profile.out") do
-            times.times {
-              output = ffi_string_encoder.encode(hash)
-            }
-          end
-          system("pprof.rb --text /tmp/ffi_yajl_encode_profile.out")
+        ffi_string_encoder = FFI_Yajl::Encoder.new
+        PerfTools::CpuProfiler.start("/tmp/ffi_yajl_encode_profile.out") do
+          times.times { ffi_string_encoder.encode(hash) }
         end
+        system("pprof.rb --text /tmp/ffi_yajl_encode_profile.out")
       end
-
     end
   end
 end

data/lib/ffi_yajl/benchmark/http.rb

@@ -15,18 +15,14 @@ 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
-puts "Starting benchmark parsing #{uri.to_s} #{times} times\n\n"
-Benchmark.bmbm { |x|
-  x.report {
+puts "Starting benchmark parsing #{uri} #{times} times\n\n"
+Benchmark.bmbm do |x|
+  x.report do
     puts "Yajl::HttpStream.get"
-    times.times {
-      Yajl::HttpStream.get(uri)
-    }
-  }
-  x.report {
+    times.times { Yajl::HttpStream.get(uri) }
+  end
+  x.report do
     puts "JSON.parser"
-    times.times {
-      JSON.parse(Net::HTTP.get_response(uri).body, :max_nesting => false)
-    }
-  }
-}
+    times.times { JSON.parse(Net::HTTP.get_response(uri).body, max_nesting: false) }
+  end
+end