ffi-yajl 2.2.0 → 2.2.1

data/lib/ffi_yajl/benchmark/parse.rb

@@ -1,17 +1,12 @@
 require 'rubygems'
 require 'benchmark'
-require 'yaml'
 require 'yajl'
 require 'ffi_yajl'
 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,127 +15,79 @@ begin
   require 'json'
 rescue LoadError
 end
-begin
-  require 'psych'
-rescue LoadError
-end
-begin
-  require 'active_support'
-rescue LoadError
-end
 begin
   require 'oj'
 rescue LoadError
 end
 
-class FFI_Yajl::Benchmark::Parse
-
-  def run
-    filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "item.json"))
-    json = File.new(filename, 'r')
-    json_str = json.read
+module FFI_Yajl
+  class Benchmark
+    class Parse
+      def run
+        filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "item.json"))
+        json = File.new(filename, 'r')
+        json_str = json.read
 
-    times = ARGV[1] ? ARGV[1].to_i : 10_000
-    puts "Starting benchmark parsing #{File.size(filename)} bytes of JSON data #{times} times\n\n"
-    Benchmark.bmbm { |x|
-      x.report {
-        puts "FFI_Yajl::Parser.parse (from a String)"
-        times.times {
-          FFI_Yajl::Parser.parse(json_str)
-        }
-      }
-#      ffi_parser = FFI_Yajl::Parser.new
-#      x.report {
-#        puts "FFI_Yajl::Parser#parse (from a String)"
-#        times.times {
-#          json.rewind
-#          ffi_parser.parse(json.read)
-#        }
-#      }
-      if defined?(Yajl::Parser)
-        x.report {
-          puts "Yajl::Parser.parse (from a String)"
-          times.times {
-            Yajl::Parser.parse(json_str)
-          }
-        }
-        io_parser = Yajl::Parser.new
-        io_parser.on_parse_complete = lambda {|obj|} if times > 1
-        x.report {
-          puts "Yajl::Parser#parse (from an IO)"
-          times.times {
-            json.rewind
-            io_parser.parse(json)
-          }
-        }
-        string_parser = Yajl::Parser.new
-        string_parser.on_parse_complete = lambda {|obj|} if times > 1
-        x.report {
-          puts "Yajl::Parser#parse (from a String)"
-          times.times {
-            json.rewind
-            string_parser.parse(json_str)
-          }
-        }
+        times = ARGV[1] ? ARGV[1].to_i : 10_000
+        puts "Starting benchmark parsing #{File.size(filename)} bytes of JSON data #{times} times\n\n"
+        ::Benchmark.bmbm do |x|
+          x.report do
+            puts "FFI_Yajl::Parser.parse (from a String)"
+            times.times { FFI_Yajl::Parser.parse(json_str) }
+          end
+          #      ffi_parser = FFI_Yajl::Parser.new
+          #      x.report {
+          #        puts "FFI_Yajl::Parser#parse (from a String)"
+          #        times.times {
+          #          json.rewind
+          #          ffi_parser.parse(json.read)
+          #        }
+          #      }
+          if defined?(Yajl::Parser)
+            x.report do
+              puts "Yajl::Parser.parse (from a String)"
+              times.times { Yajl::Parser.parse(json_str) }
+            end
+            io_parser = Yajl::Parser.new
+            io_parser.on_parse_complete = ->(obj) {} if times > 1
+            x.report do
+              puts "Yajl::Parser#parse (from an IO)"
+              times.times do
+                json.rewind
+                io_parser.parse(json)
+              end
+            end
+            string_parser = Yajl::Parser.new
+            string_parser.on_parse_complete = ->(obj) {} if times > 1
+            x.report do
+              puts "Yajl::Parser#parse (from a String)"
+              times.times do
+                json.rewind
+                string_parser.parse(json_str)
+              end
+            end
+          end
+          if defined?(Oj)
+            x.report do
+              puts "Oj.load"
+              times.times do
+                json.rewind
+                Oj.load(json.read)
+              end
+            end
+          end
+          if defined?(JSON)
+            x.report do
+              puts "JSON.parse"
+              times.times do
+                json.rewind
+                JSON.parse(json.read, max_nesting: false)
+              end
+            end
+          end
+        end
+        json.close
       end
-      if defined?(Oj)
-        x.report {
-          puts "Oj.load"
-          times.times {
-            json.rewind
-            Oj.load(json.read)
-          }
-        }
-      end
-      if defined?(JSON)
-        x.report {
-          puts "JSON.parse"
-          times.times {
-            json.rewind
-            JSON.parse(json.read, :max_nesting => false)
-          }
-        }
-      end
-      if defined?(ActiveSupport::JSON)
-        x.report {
-          puts "ActiveSupport::JSON.decode"
-          times.times {
-            json.rewind
-            ActiveSupport::JSON.decode(json.read)
-          }
-        }
-      end
-      x.report {
-        puts "YAML.load (from an IO)"
-        times.times {
-          json.rewind
-          YAML.load(json)
-        }
-      }
-      x.report {
-        puts "YAML.load (from a String)"
-        times.times {
-          YAML.load(json_str)
-        }
-      }
-      if defined?(Psych)
-        x.report {
-          puts "Psych.load (from an IO)"
-          times.times {
-            json.rewind
-            Psych.load(json)
-          }
-        }
-        x.report {
-          puts "Psych.load (from a String)"
-          times.times {
-            Psych.load(json_str)
-          }
-        }
-      end
-    }
-    json.close
-
+    end
   end
 end
-

data/lib/ffi_yajl/benchmark/parse_json_and_marshal.rb

@@ -19,32 +19,32 @@ hash = {}
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
 puts "Starting benchmark parsing #{File.size(filename)} bytes of JSON data #{times} times\n\n"
-Benchmark.bmbm { |x|
-  x.report {
+Benchmark.bmbm do |x|
+  x.report do
     puts "Yajl::Parser#parse"
     yajl = Yajl::Parser.new
-    yajl.on_parse_complete = lambda {|obj|} if times > 1
-    times.times {
+    yajl.on_parse_complete = ->(obj) {} if times > 1
+    times.times do
       json.rewind
       hash = yajl.parse(json)
-    }
-  }
+    end
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON.parse"
-      times.times {
+      times.times do
         json.rewind
-        JSON.parse(json.read, :max_nesting => false)
-      }
-    }
+        JSON.parse(json.read, max_nesting: false)
+      end
+    end
   end
-  x.report {
+  x.report do
     puts "Marshal.load"
-    times.times {
+    times.times do
       marshal_file.rewind
       Marshal.load(marshal_file)
-    }
-  }
-}
+    end
+  end
+end
 json.close
-marshal_file.close
+marshal_file.close

data/lib/ffi_yajl/benchmark/parse_json_and_yaml.rb

@@ -16,26 +16,26 @@ 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"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   parser = Yajl::Parser.new
-  parser.on_parse_complete = lambda {|obj|} if times > 1
-  x.report {
+  parser.on_parse_complete = ->(obj) {} if times > 1
+  x.report do
     puts "Yajl::Parser#parse"
-    times.times {
+    times.times do
       json.rewind
       parser.parse(json)
-    }
-  }
+    end
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON.parse"
-      times.times {
+      times.times do
         json.rewind
-        JSON.parse(json.read, :max_nesting => false)
-      }
-    }
+        JSON.parse(json.read, max_nesting: false)
+      end
+    end
   end
-}
+end
 json.close
 
 # YAML section
@@ -43,13 +43,13 @@ 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 { |x|
-  x.report {
+Benchmark.bmbm do |x|
+  x.report do
     puts "YAML.load_stream"
-    times.times {
+    times.times do
       yaml.rewind
       YAML.load(yaml)
-    }
-  }
-}
-yaml.close
+    end
+  end
+end
+yaml.close

data/lib/ffi_yajl/benchmark/parse_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,24 +14,20 @@ ENV['CPUPROFILE_FREQUENCY'] = "4000"
 module FFI_Yajl
   class Benchmark
     class ParseProfile
-
       def run
-        if defined?(PerfTools)
-          filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
-          json = File.new(filename, 'r').read
+        return if defined?(PerfTools)
+
+        filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
+        json = File.new(filename, 'r').read
 
-          times = 1000
-          puts "Starting profiling encoding #{filename} #{times} times\n\n"
+        times = 1000
+        puts "Starting profiling encoding #{filename} #{times} times\n\n"
 
-          PerfTools::CpuProfiler.start("/tmp/ffi_yajl_encode_profile.out") do
-            times.times {
-              output = FFI_Yajl::Parser.parse(json)
-            }
-          end
-          system("pprof.rb --text /tmp/ffi_yajl_encode_profile.out")
+        PerfTools::CpuProfiler.start("/tmp/ffi_yajl_encode_profile.out") do
+          times.times { FFI_Yajl::Parser.parse(json) }
         end
+        system("pprof.rb --text /tmp/ffi_yajl_encode_profile.out")
       end
-
     end
   end
 end

data/lib/ffi_yajl/benchmark/parse_profile_ruby_prof.rb

@@ -7,33 +7,28 @@ require 'ffi_yajl'
 module FFI_Yajl
   class Benchmark
     class ParseProfileRubyProf
-
       def run
         begin
           require 'ruby-prof'
-        rescue Exception
+        rescue LoadError
           puts "INFO: perftools.rb gem not installed"
         end
 
-        if defined?(RubyProf)
-          filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
-          json = File.new(filename, 'r').read
-
-          times = 1000
-          puts "Starting profiling encoding #{filename} #{times} times\n\n"
+        return if defined?(RubyProf)
 
-          result = RubyProf.profile do
-            times.times {
-              output = FFI_Yajl::Parser.parse(json)
-            }
-          end
+        filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
+        json = File.new(filename, 'r').read
 
-          printer = RubyProf::GraphPrinter.new(result)
-          printer.print(STDOUT, {})
+        times = 1000
+        puts "Starting profiling encoding #{filename} #{times} times\n\n"
 
+        result = RubyProf.profile do
+          times.times { FFI_Yajl::Parser.parse(json) }
         end
-      end
 
+        printer = RubyProf::GraphPrinter.new(result)
+        printer.print(STDOUT, {})
+      end
     end
   end
 end

data/lib/ffi_yajl/benchmark/parse_stream.rb

@@ -18,37 +18,37 @@ 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"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   parser = Yajl::Parser.new
-  parser.on_parse_complete = lambda {|obj|}
-  x.report {
+  parser.on_parse_complete = ->(obj) {}
+  x.report do
     puts "Yajl::Parser#parse"
-    times.times {
+    times.times do
       json.rewind
       parser.parse(json)
-    }
-  }
+    end
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON.parse"
-      times.times {
+      times.times do
         json.rewind
         while chunk = json.gets
-          JSON.parse(chunk, :max_nesting => false)
+          JSON.parse(chunk, max_nesting: false)
         end
-      }
-    }
+      end
+    end
   end
   if defined?(ActiveSupport::JSON)
-    x.report {
+    x.report do
       puts "ActiveSupport::JSON.decode"
-      times.times {
+      times.times do
         json.rewind
         while chunk = json.gets
           ActiveSupport::JSON.decode(chunk)
         end
-      }
-    }
+      end
+    end
   end
-}
-json.close
+end
+json.close

data/lib/ffi_yajl/benchmark.rb

@@ -25,4 +25,3 @@ require 'ffi_yajl/benchmark/encode_profile.rb'
 require 'ffi_yajl/benchmark/parse.rb'
 require 'ffi_yajl/benchmark/parse_profile.rb'
 require 'ffi_yajl/benchmark/parse_profile_ruby_prof.rb'
-

data/lib/ffi_yajl/encoder.rb

@@ -41,7 +41,7 @@ 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.encode!("utf-8", "binary", undef: :replace) unless yajl_gen_opts[:yajl_gen_validate_utf8]
       str
     end
 
@@ -54,9 +54,9 @@ module FFI_Yajl
       @opts ||= {}
     end
 
-    def self.raise_error_for_status(status, token=nil)
+    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.encode("utf-8", "binary", undef: :replace)
       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"