yajl-ruby 0.8.1 → 0.8.2

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.8.2 (March 22nd, 2011)
+* define RSTRING_NOT_MODIFIED for rbx to prevent string caching, making things A LOT faster (100x)
+
 ## 0.8.1 (February 11th, 2011)
 * fixed a retart bug where Yajl::VERSION wasn't defined when explicitly requiring yajl/http_stream
 

data/README.rdoc

@@ -204,7 +204,7 @@ If you plan on embedding the output from the encoder in the DOM, you'll want to
 Meaning the following should be perfectly safe:
 
  <script type="text/javascript">
-   escaped_str = <%= Yajl::Encoder.encode("</script><script>alert('hi!');</script>", :html_safe => true) %>;
+   var escaped_str = <%= Yajl::Encoder.encode("</script><script>alert('hi!');</script>", :html_safe => true) %>;
  </script>
 
 == JSON gem Compatibility API

data/benchmark/encode.rb

@@ -10,50 +10,64 @@ begin
   require 'json'
 rescue LoadError
 end
-# Can't use ActiveSuport::JSON.encode with the JSON gem loaded
-# begin
-#   require 'active_support'
-# rescue LoadError
-# end
+begin
+  require 'psych'
+rescue LoadError
+end
+begin
+  require 'active_support'
+rescue LoadError
+end
 
 filename = ARGV[0] || 'benchmark/subjects/ohai.json'
-json = File.new(filename, 'r')
-hash = Yajl::Parser.new.parse(json)
-json.close
+hash = File.open(filename, 'rb') { |f| Yajl::Parser.new.parse(f.read) }
 
 times = ARGV[1] ? ARGV[1].to_i : 1000
 puts "Starting benchmark encoding #{filename} #{times} times\n\n"
 Benchmark.bmbm { |x|
   io_encoder = Yajl::Encoder.new
-  x.report {
-    puts "Yajl::Encoder#encode (to an IO)"
+  string_encoder = Yajl::Encoder.new
+
+  x.report("Yajl::Encoder#encode (to an IO)") {
     times.times {
       io_encoder.encode(hash, StringIO.new)
     }
   }
-  string_encoder = Yajl::Encoder.new
-  x.report {
-    puts "Yajl::Encoder#encode (to a String)"
+  x.report("Yajl::Encoder#encode (to a String)") {
     times.times {
       output = string_encoder.encode(hash)
     }
   }
   if defined?(JSON)
-    x.report {
-      puts "JSON.generate"
+    x.report("JSON.generate") {
       times.times {
         JSON.generate(hash)
       }
     }
   end
-  # Can't use ActiveSuport::JSON.encode with the JSON gem loaded
-  #
-  # if defined?(ActiveSupport::JSON)
-  #   x.report {
-  #     puts "ActiveSupport::JSON.encode"
-  #     times.times {
-  #       ActiveSupport::JSON.encode(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
+        }
+      }
+    end
+  end
+  if defined?(ActiveSupport::JSON)
+    x.report("ActiveSupport::JSON.encode") {
+      times.times {
+        ActiveSupport::JSON.encode(hash)
+      }
+    }
+  end
 }

data/benchmark/parse.rb

@@ -4,20 +4,25 @@ $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 require 'rubygems'
 require 'benchmark'
+require 'yaml'
 require 'yajl'
 begin
   require 'json'
 rescue LoadError
 end
+begin
+  require 'psych'
+rescue LoadError
+end
 begin
   require 'active_support'
 rescue LoadError
 end
 
-filename = ARGV[0] || 'benchmark/subjects/twitter_search.json'
+filename = ARGV[0] || 'benchmark/subjects/item.json'
 json = File.new(filename, 'r')
 
-times = ARGV[1] ? ARGV[1].to_i : 1000
+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|
   io_parser = Yajl::Parser.new
@@ -56,5 +61,35 @@ Benchmark.bmbm { |x|
       }
     }
   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 {
+      json.rewind
+      YAML.load(json.read)
+    }
+  }
+  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 {
+        json.rewind
+        Psych.load(json.read)
+      }
+    }
+  end
 }
 json.close

data/ext/yajl/yajl_ext.h

@@ -23,6 +23,12 @@
 
 #include "api/yajl_parse.h"
 #include "api/yajl_gen.h"
+
+// tell rbx not to use it's caching compat layer
+// by doing this we're making a promize to RBX that
+// we'll never modify the pointers we get back from RSTRING_PTR
+#define RSTRING_NOT_MODIFIED
+
 #include <ruby.h>
 
 #ifdef HAVE_RUBY_ENCODING_H

data/lib/yajl/version.rb

@@ -1,3 +1,3 @@
 module Yajl
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yajl-ruby
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Brian Lopez
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 -08:00
+date: 2011-03-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby C bindings to the excellent Yajl JSON stream-based parser library.