brianmario-yajl-ruby 0.5.5 → 0.5.6

data/lib/yajl/json_gem/encoding.rb

@@ -0,0 +1,40 @@
+# encoding: UTF-8
+require 'yajl' unless defined?(Yajl::Parser)
+
+# NOTE: this is probably temporary until I can split out the JSON compat C code into it's own
+# extension that can be included when this file is.
+Yajl::Encoder.enable_json_gem_compatability
+
+module JSON
+  def self.generate(obj, opts={})
+    begin
+      options_map = {}
+      if opts.has_key?(:indent)
+        options_map[:pretty] = true
+        options_map[:indent] = opts[:indent]
+      end
+      Yajl::Encoder.encode(obj, options_map)
+    rescue Yajl::ParseError => e
+      raise JSON::ParserError, e.message
+    end
+  end
+  
+  def self.pretty_generate(obj, opts={})
+    begin
+      options_map = {}
+      options_map[:pretty] = true
+      options_map[:indent] = opts[:indent] if opts.has_key?(:indent)
+      Yajl::Encoder.encode(obj, options_map)
+    rescue Yajl::ParseError => e
+      raise JSON::ParserError, e.message
+    end
+  end
+  
+  def self.dump(obj, io=nil, *args)
+    begin
+      Yajl::Encoder.encode(obj, io)
+    rescue Yajl::ParseError => e
+      raise JSON::ParserError, e.message
+    end
+  end
+end

data/lib/yajl/json_gem/parsing.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+require 'yajl' unless defined?(Yajl::Parser)
+
+module JSON
+  class ParserError < Yajl::ParseError; end
+  
+  def self.default_options
+    @default_options ||= {:symbolize_keys => false}
+  end
+   
+  def self.parse(str, opts=JSON.default_options)
+    begin
+      Yajl::Parser.parse(str, opts)
+    rescue Yajl::ParseError => e
+      raise JSON::ParserError, e.message
+    end
+  end
+  
+  def self.load(input, *args)
+    begin
+      Yajl::Parser.parse(input, default_options)
+    rescue Yajl::ParseError => e
+      raise JSON::ParserError, e.message
+    end
+  end
+end

data/lib/yajl/json_gem.rb

@@ -1,67 +1,12 @@
 # encoding: UTF-8
 require 'yajl' unless defined?(Yajl::Parser)
-
-# NOTE: this is probably temporary until I can split out the JSON compat C code into it's own
-# extension that can be included when this file is.
-Yajl::Encoder.enable_json_gem_compatability
-
-module JSON
-  
-  class ParserError < Yajl::ParseError; end
-  
-  def self.parse(str, opts={})
-    begin
-      Yajl::Parser.parse(str, opts)
-    rescue Yajl::ParseError => e
-      raise JSON::ParserError, e.message
-    end
-  end
-  
-  def self.generate(obj, opts={})
-    begin
-      options_map = {}
-      if opts.has_key?(:indent)
-        options_map[:pretty] = true
-        options_map[:indent] = opts[:indent]
-      end
-      Yajl::Encoder.encode(obj, options_map)
-    rescue Yajl::ParseError => e
-      raise JSON::ParserError, e.message
-    end
-  end
-  
-  def self.pretty_generate(obj, opts={})
-    begin
-      options_map = {}
-      options_map[:pretty] = true
-      options_map[:indent] = opts[:indent] if opts.has_key?(:indent)
-      Yajl::Encoder.encode(obj, options_map)
-    rescue Yajl::ParseError => e
-      raise JSON::ParserError, e.message
-    end
-  end
-  
-  def self.load(input, *args)
-    begin
-      Yajl::Parser.parse(input)
-    rescue Yajl::ParseError => e
-      raise JSON::ParserError, e.message
-    end
-  end
-  
-  def self.dump(obj, io=nil, *args)
-    begin
-      Yajl::Encoder.encode(obj, io)
-    rescue Yajl::ParseError => e
-      raise JSON::ParserError, e.message
-    end
-  end
-end
+require 'yajl/json_gem/parsing'
+require 'yajl/json_gem/encoding'
 
 module ::Kernel
   def JSON(object, opts = {})
     if object.respond_to? :to_s
-      JSON.parse(object.to_s, opts)
+      JSON.parse(object.to_s, JSON.default_options.merge(opts))
     else
       JSON.generate(object, opts)
     end

data/lib/yajl.rb

@@ -13,7 +13,7 @@ require 'yajl_ext'
 #
 # Ruby bindings to the excellent Yajl (Yet Another JSON Parser) ANSI C library.
 module Yajl
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
   
   class Parser
     # A helper method for parse-and-forget use-cases

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -45,6 +45,14 @@ describe "JSON Gem compatability API" do
     JSON.respond_to?(:dump).should be_true
   end
   
+  it "should allow default parsing options be set with JSON.default_options" do
+    default = JSON.default_options[:symbolize_keys]
+    JSON.parse('{"foo": 1234}').should === {"foo" => 1234}
+    JSON.default_options[:symbolize_keys] = true
+    JSON.parse('{"foo": 1234}').should === {:foo => 1234}
+    JSON.default_options[:symbolize_keys] = default # ensure the rest of the test cases expect the default
+  end
+  
   context "ported tests for Unicode" do
     it "should be able to encode and parse unicode" do
       pending if RUBY_VERSION.include?('1.9') # FIXME: Some string encoding problem with 1.9

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.5.5"
+  s.version = "0.5.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
-  s.date = %q{2009-06-18}
+  s.date = %q{2009-06-19}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -27,11 +27,10 @@ Gem::Specification.new do |s|
      "benchmark/parse_json_and_marshal.rb",
      "benchmark/parse_json_and_yaml.rb",
      "benchmark/parse_stream.rb",
-     "benchmark/subjects/contacts.json",
-     "benchmark/subjects/contacts.marshal_dump",
-     "benchmark/subjects/contacts.yml",
      "benchmark/subjects/item.json",
      "benchmark/subjects/ohai.json",
+     "benchmark/subjects/ohai.marshal_dump",
+     "benchmark/subjects/ohai.yml",
      "benchmark/subjects/twitter_search.json",
      "benchmark/subjects/twitter_stream.json",
      "benchmark/subjects/unicode.json",
@@ -71,6 +70,8 @@ Gem::Specification.new do |s|
      "lib/yajl/gzip/stream_writer.rb",
      "lib/yajl/http_stream.rb",
      "lib/yajl/json_gem.rb",
+     "lib/yajl/json_gem/encoding.rb",
+     "lib/yajl/json_gem/parsing.rb",
      "spec/encoding/encoding_spec.rb",
      "spec/http/fixtures/http.bzip2.dump",
      "spec/http/fixtures/http.deflate.dump",
@@ -145,6 +146,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/brianmario/yajl-ruby}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]
+  s.rubyforge_project = %q{yajl-ruby}
   s.rubygems_version = %q{1.3.4}
   s.summary = %q{Ruby C bindings to the excellent Yajl JSON stream-based parser library.}
   s.test_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-19 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -37,11 +37,10 @@ files:
 - benchmark/parse_json_and_marshal.rb
 - benchmark/parse_json_and_yaml.rb
 - benchmark/parse_stream.rb
-- benchmark/subjects/contacts.json
-- benchmark/subjects/contacts.marshal_dump
-- benchmark/subjects/contacts.yml
 - benchmark/subjects/item.json
 - benchmark/subjects/ohai.json
+- benchmark/subjects/ohai.marshal_dump
+- benchmark/subjects/ohai.yml
 - benchmark/subjects/twitter_search.json
 - benchmark/subjects/twitter_stream.json
 - benchmark/subjects/unicode.json
@@ -81,6 +80,8 @@ files:
 - lib/yajl/gzip/stream_writer.rb
 - lib/yajl/http_stream.rb
 - lib/yajl/json_gem.rb
+- lib/yajl/json_gem/encoding.rb
+- lib/yajl/json_gem/parsing.rb
 - spec/encoding/encoding_spec.rb
 - spec/http/fixtures/http.bzip2.dump
 - spec/http/fixtures/http.deflate.dump
@@ -173,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: yajl-ruby
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3