oj 1.4.2 → 1.4.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of oj might be problematic. Click here for more details.

data/README.md CHANGED
@@ -32,15 +32,9 @@ A fast JSON parser and Object marshaller as a Ruby gem.
32
32
 
33
33
  ## <a name="release">Release Notes</a>
34
34
 
35
- ### Release 1.4.2
35
+ ### Release 1.4.3
36
36
 
37
- - Fixed dump and load of BigDecimals in :object mode.
38
-
39
- - BigDecimals are now dumped and loaded in all modes.
40
-
41
- ### Release 1.4.1
42
-
43
- - Windows RubyInstaller and TCS-Ruby now supported thanks to Jarmo Pertman. Thanks Jarmo.
37
+ - Fixed Exception encoding in Windows version.
44
38
 
45
39
  ## <a name="description">Description</a>
46
40
 
@@ -1,11 +1,14 @@
1
1
  require 'mkmf'
2
+ require 'rbconfig'
2
3
 
3
4
  extension_name = 'oj'
4
5
  dir_config(extension_name)
5
6
 
6
7
  parts = RUBY_DESCRIPTION.split(' ')
7
8
  type = parts[0]
9
+ type = type[4..-1] if type.start_with?('tcs-')
8
10
  type = 'ree' if 'ruby' == type && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
11
+ is_windows = RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
9
12
  platform = RUBY_PLATFORM
10
13
  version = RUBY_VERSION.split('.')
11
14
  puts ">>>>> Creating Makefile for #{type} version #{RUBY_VERSION} on #{platform} <<<<<"
@@ -22,12 +25,12 @@ dflags = {
22
25
  (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
23
26
  'HAS_NANO_TIME' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
24
27
  'HAS_RSTRUCT' => ('ruby' == type || 'ree' == type || 'tcs-ruby' == type) ? 1 : 0,
25
- 'HAS_IVAR_HELPERS' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
26
- 'HAS_EXCEPTION_MAGIC' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 0 : 1,
28
+ 'HAS_IVAR_HELPERS' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 1 : 0,
29
+ 'HAS_EXCEPTION_MAGIC' => ('ruby' == type && !is_windows && (('1' == version[0] && '9' == version[1]) || '2' <= version[0])) ? 0 : 1,
27
30
  'HAS_PROC_WITH_BLOCK' => ('ruby' == type && ('1' == version[0] && '9' == version[1]) || '2' <= version[0]) ? 1 : 0,
28
31
  'HAS_TOP_LEVEL_ST_H' => ('ree' == type || ('ruby' == type && '1' == version[0] && '8' == version[1])) ? 1 : 0,
29
- 'IS_WINDOWS' => ('i386-mingw32' == platform || 'tcs-ruby' == type) ? 1 : 0,
30
- 'SAFE_CACHE' => ('i386-mingw32' == platform || 'tcs-ruby' == type) ? 0 : 1,
32
+ 'IS_WINDOWS' => is_windows ? 1 : 0,
33
+ 'SAFE_CACHE' => is_windows ? 0 : 1,
31
34
  }
32
35
  # This is a monster hack to get around issues with 1.9.3-p0 on CentOS 5.4. SO
33
36
  # some reason math.h and string.h contents are not processed. Might be a
@@ -38,7 +41,7 @@ if 'x86_64-linux' == RUBY_PLATFORM && '1.9.3' == RUBY_VERSION && '2011-10-30' ==
38
41
  rescue Exception => e
39
42
  end
40
43
  else
41
- dflags['NEEDS_STPCPY'] = nil if 'i386-mingw32' == platform || 'tcs-ruby' == type
44
+ dflags['NEEDS_STPCPY'] = nil if is_windows
42
45
  end
43
46
 
44
47
  dflags.each do |k,v|
@@ -1,5 +1,5 @@
1
1
 
2
2
  module Oj
3
3
  # Current version of the module.
4
- VERSION = '1.4.2'
4
+ VERSION = '1.4.3'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oj
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.2
4
+ version: 1.4.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-10-17 00:00:00.000000000 Z
12
+ date: 2012-10-19 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: ! 'The fastest JSON parser and object serializer. '
15
15
  email: peter@ohler.com