oj 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ed2da87bfa647cc35c9f601be6ad196d55d383
-  data.tar.gz: 10861e340f51bb1179829e04187115bf4c147370
+  metadata.gz: 75e4043274574e794d054c174097302ccb304834
+  data.tar.gz: 3088bfa698221df3861f69b262533c5e177c732b
 SHA512:
-  metadata.gz: 96b24f234c6f96ea1744d5696dce1544e9be1c8c99d0c25343727cb1302c0097e5cd2425a6a04335f4d662862c557d6e02daff06568e2b0b03c630f6fd8f9787
-  data.tar.gz: f87d369229b94e0ebaec6c2a8fffad056f1a41de63c108eacd4919166f743a74cb914622d2ac702bfe80511a029832c8247991ed896fdb61342341c776f12239
+  metadata.gz: 52c90ff21f5800a96ae30c48eb6fd7c3c4fb1c8c4fd643ae614c66ea94095e742651e716b1ffc7e8e818bc9d8522169dd7c6a50d13fca78e32113bc8be31bf38
+  data.tar.gz: 3d2371fcca9ff478b420292b3f6d6b4739dff8e45e25b8daa4a3d396ded515db17d19b87aa8c555c025d5d1f5437d52555379f2c2e9c66fcd535b1ac1cc26847

data/README.md

@@ -1,14 +1,14 @@
 # Oj gem
 A fast JSON parser and Object marshaller as a Ruby gem.
 
-## <a name="installation">Installation</a>
+## Installation
     gem install oj
 
-## <a name="documentation">Documentation</a>
+## Documentation
 
 *Documentation*: http://www.ohler.com/oj
 
-## <a name="source">Source</a>
+## Source
 
 *GitHub* *repo*: https://github.com/ohler55/oj
 
@@ -16,17 +16,22 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announcements and news about the Oj gem.
 
-## <a name="build_status">Build Status</a>
+## Build Status
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
+### Current Release 2.5.5
+
+ - Worked around the Rubinius failure to load bigdecimal from a require within
+   the C code.
+
 ### Current Release 2.5.4
 
  - Fixed bug where unterminated JSON did not raise an exception.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
-## <a name="description">Description</a>
+## Description
 
 Optimized JSON (Oj), as the name implies was written to provide speed optimized
 JSON handling. It was designed as a faster alternative to Yajl and other the
@@ -73,7 +78,7 @@ possible. The API is simple to use but does require a different approach than
 the conventional parse followed by access approach used by conventional JSON
 parsing.
 
-## <a name="proper_use">Proper Use</a>
+## Proper Use
 
 Two settings in Oj are useful for parsing but do expose a vunerability if used from an untrusted source. Symbolizing
 keys can be used to cause memory to be filled up since Ruby does not garbage collect Symbols. The same is true for auto
@@ -88,9 +93,7 @@ methods on the Objects created. As in any system, check your inputs before worki
 from a user and evaluating it is never a good idea from an unsecure source. The same is true for Object attributes as
 they are not more than Strings. Always check inputs from untrusted sources.
 
-## <a name="release">Release Notes</a>
-
-### Simple JSON Writing and Parsing:
+## Simple JSON Writing and Parsing:
 
 ```ruby
 require 'oj'
@@ -114,7 +117,7 @@ puts "Same? #{h == h2}"
 
 # Links
 
-## <a name="links">Performance Comparisons</a>
+## Performance Comparisons
 
 [Oj Strict Mode Performance](http://www.ohler.com/dev/oj_misc/performance_strict.html) compares Oj strict mode parser performance to other JSON parsers.
 
@@ -124,7 +127,7 @@ puts "Same? #{h == h2}"
 
 [Oj Callback Performance](http://www.ohler.com/dev/oj_misc/performance_callback.html) compares Oj callback parser performance to other JSON parsers.
 
-## <a name="links">Links of Interest</a>
+## Links of Interest
 
 *Fast XML parser and marshaller on RubyGems*: https://rubygems.org/gems/ox
 

data/ext/oj/oj.c

@@ -519,7 +519,7 @@ oj_parse_options(VALUE ropts, Options copts) {
  * true, false, or nil. It parses using a mode that is strict in that it maps
  * each primitive JSON type to a similar Ruby type. The :create_id is not
  * honored in this mode. Note that a Ruby Hash is used to represent the JSON
- * Object type. These two are not the same since teh JSON Object type can have
+ * Object type. These two are not the same since the JSON Object type can have
  * repeating entries with the same key and Ruby Hash can not.
  *
  * Raises an exception if the JSON is malformed or the classes specified are not

data/lib/oj.rb

@@ -24,6 +24,14 @@
 module Oj
 end
 
+begin
+  # This require exists to get around Rubinius failing to load bigdecimal from
+  # the C extension.
+  require 'bigdecimal'
+rescue Exception
+  # ignore
+end
+
 require 'oj/version'
 require 'oj/bag'
 require 'oj/error'

data/lib/oj/saj.rb

@@ -13,7 +13,7 @@ module Oj
   #      @hash_cnt = 0
   #    end
   #
-  #    def start_hash(key)
+  #    def hash_start(key)
   #      @hash_cnt += 1
   #    end
   #  end

data/lib/oj/schandler.rb

@@ -14,7 +14,7 @@ module Oj
   #      @hash_cnt = 0
   #    end
   #
-  #    def start_hash()
+  #    def hash_start()
   #      @hash_cnt += 1
   #    end
   #  end

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.5.4'
+  VERSION = '2.5.5'
 end

data/test/test_fast.rb

@@ -11,7 +11,6 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'test/unit'
-require 'bigdecimal'
 require 'oj'
 
 $json1 = %{{

data/test/test_gc.rb

@@ -12,7 +12,6 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'test/unit'
-require 'bigdecimal'
 require 'oj'
 
 class Goo

data/test/test_saj.rb

@@ -11,7 +11,6 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'test/unit'
-require 'bigdecimal'
 require 'oj'
 require 'pp'
 

data/test/test_scp.rb

@@ -11,7 +11,6 @@ $: << File.join(File.dirname(__FILE__), "../lib")
 $: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'test/unit'
-require 'bigdecimal'
 require 'oj'
 require 'pp'
 

data/test/test_writer.rb

@@ -13,7 +13,6 @@ $: << File.join(File.dirname(__FILE__), "../ext")
 require 'test/unit'
 require 'stringio'
 require 'date'
-require 'bigdecimal'
 require 'oj'
 
 class OjWriter < ::Test::Unit::TestCase

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies: []
 description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com