oj 1.2.7 → 1.2.8

data/README.md

@@ -24,13 +24,11 @@ A fast JSON parser and Object marshaller as a Ruby gem.
 
 ## <a name="release">Release Notes</a>
 
-### Release 1.2.7
+### Release 1.2.8
 
- - Fixed bug where a float with too many characters would generate an error. It is not parsed as accuractly as Ruby will support.
+ - Included a contribution by nevans to fix a math.h issue with an old fedora linux machine.
 
- - Cleaned up documentation errors.
-
- - Added support for OS X Ruby 1.8.7.
+ - Included a fix to the documentation found by mat.
 
 ## <a name="description">Description</a>
 
@@ -40,7 +38,7 @@ other the common Ruby JSON parsers. So far is has achieved that at about 2
 time faster than Yajl for parsing and 3 or more times faster writing JSON.
 
 Oj has several dump or serialization modes which control how Objects are
-converted to JSON. These modes are set with the :effort option in either the
+converted to JSON. These modes are set with the :mode option in either the
 default options or as one of the options to the dump() method.
 
 - :strict mode will only allow the 7 basic JSON types to be serialized. Any other Object

data/ext/oj/extconf.rb

@@ -16,12 +16,13 @@ dflags = {
   'RUBY_VERSION_MAJOR' => version[0],
   'RUBY_VERSION_MINOR' => version[1],
   'RUBY_VERSION_MICRO' => version[2],
-  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && '1.9.3' == RUBY_VERSION) ? 1 : 0,
-  'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) && '1' == version[0] && '9' == version[1]) ? 1 : 0,
-  'HAS_NANO_TIME' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_RB_TIME_TIMESPEC' => ('ruby' == type && ('1.9.3' == RUBY_VERSION || '2' <= version[0])) ? 1 : 0,
+  'HAS_ENCODING_SUPPORT' => (('ruby' == type || 'rubinius' == type) &&
+                             (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
+  'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type) ? 1 : 0,
-  'HAS_IVAR_HELPERS' => ('ruby' == type && '1' == version[0] && '9' == version[1] && '2' <= version[2]) ? 1 : 0,
-  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && '1' == version[0] && '9' == version[1]) ? 1 : 0,
+  'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
+  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
   'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type &&  '1' == version[0] && '8' == version[1])) ? 1 : 0,
 }
 # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO

data/ext/oj/load.c

@@ -33,6 +33,11 @@
 #include <string.h>
 #include <math.h>
 
+//Workaround:
+#ifndef INFINITY
+#define INFINITY (1.0/0.0)
+#endif
+
 #include "oj.h"
 
 enum {

data/ext/oj/oj.c

@@ -727,6 +727,9 @@ define_mimic_json(VALUE self) {
 	VALUE	ext;
 	VALUE	dummy;
 
+	if (rb_const_defined_at(rb_cObject, rb_intern("JSON"))) {
+	    rb_raise(rb_eTypeError, "JSON module already exists. Can not mimic. Do not require 'json' before calling mimic_JSON.");
+	}
 	mimic = rb_define_module("JSON");
 	ext = rb_define_module_under(mimic, "Ext");
 	dummy = rb_define_class_under(ext, "Parser", rb_cObject);

data/lib/oj.rb

@@ -2,7 +2,7 @@
 # optimized JSON handling.
 # 
 # Oj has several dump or serialization modes which control how Objects are
-# converted to JSON. These modes are set with the :effort option in either the
+# converted to JSON. These modes are set with the :mode option in either the
 # default options or as one of the options to the dump() method.
 # 
 # - :strict mode will only allow the 7 basic JSON types to be serialized. Any other Object

data/lib/oj/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-22 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -83,9 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true