json 1.5.0 → 1.5.1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of json might be problematic. Click here for more details.
- data/CHANGES +4 -1
- data/Rakefile +5 -1
- data/VERSION +1 -1
- data/lib/json/ext.rb +15 -2
- data/lib/json/version.rb +1 -1
- metadata +3 -6
data/CHANGES
CHANGED
@@ -1,4 +1,7 @@
|
|
1
|
-
|
1
|
+
2011-01-24 (1.5.1)
|
2
|
+
* Made rake-compiler build a fat binary gem. This should fix issue
|
3
|
+
https://github.com/flori/json/issues#issue/54.
|
4
|
+
2011-01-22 (1.5.0)
|
2
5
|
* Included Java source codes for the Jruby extension made by Daniel Luz
|
3
6
|
<dev@mernen.com>.
|
4
7
|
* Output full exception message of deep_const_get to aid debugging.
|
data/Rakefile
CHANGED
@@ -386,8 +386,12 @@ else
|
|
386
386
|
desc "Generate diagrams of ragel parser"
|
387
387
|
task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
|
388
388
|
|
389
|
+
task :environment do
|
390
|
+
ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2'
|
391
|
+
end
|
392
|
+
|
389
393
|
desc "Build all gems and archives for a new release of json and json_pure."
|
390
|
-
task :release => [ :clean, :version, :cross, :native, :gem, ] do
|
394
|
+
task :release => [ :clean, :version, :environment, :cross, :native, :gem, ] do
|
391
395
|
sh "#$0 clean native gem"
|
392
396
|
sh "#$0 clean package"
|
393
397
|
end
|
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
1.5.
|
1
|
+
1.5.1
|
data/lib/json/ext.rb
CHANGED
@@ -4,8 +4,21 @@ module JSON
|
|
4
4
|
# This module holds all the modules/classes that implement JSON's
|
5
5
|
# functionality as C extensions.
|
6
6
|
module Ext
|
7
|
-
|
8
|
-
|
7
|
+
begin
|
8
|
+
if defined?(RUBY_ENGINE) == 'constant' and RUBY_ENGINE == 'ruby' and RUBY_VERSION =~ /\A1\.9\./
|
9
|
+
require 'json/ext/1.9/parser'
|
10
|
+
require 'json/ext/1.9/generator'
|
11
|
+
elsif !defined?(RUBY_ENGINE) && RUBY_VERSION =~ /\A1\.8\./
|
12
|
+
require 'json/ext/1.8/parser'
|
13
|
+
require 'json/ext/1.8/generator'
|
14
|
+
else
|
15
|
+
require 'json/ext/parser'
|
16
|
+
require 'json/ext/generator'
|
17
|
+
end
|
18
|
+
rescue LoadError
|
19
|
+
require 'json/ext/parser'
|
20
|
+
require 'json/ext/generator'
|
21
|
+
end
|
9
22
|
$DEBUG and warn "Using Ext extension for JSON."
|
10
23
|
JSON.parser = Parser
|
11
24
|
JSON.generator = Generator
|
data/lib/json/version.rb
CHANGED
metadata
CHANGED
@@ -1,13 +1,12 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: json
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash: 3
|
5
4
|
prerelease: false
|
6
5
|
segments:
|
7
6
|
- 1
|
8
7
|
- 5
|
9
|
-
-
|
10
|
-
version: 1.5.
|
8
|
+
- 1
|
9
|
+
version: 1.5.1
|
11
10
|
platform: ruby
|
12
11
|
authors:
|
13
12
|
- Florian Frank
|
@@ -15,7 +14,7 @@ autorequire:
|
|
15
14
|
bindir: bin
|
16
15
|
cert_chain: []
|
17
16
|
|
18
|
-
date: 2011-01-
|
17
|
+
date: 2011-01-26 00:00:00 +01:00
|
19
18
|
default_executable: edit_json.rb
|
20
19
|
dependencies: []
|
21
20
|
|
@@ -191,7 +190,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
191
190
|
requirements:
|
192
191
|
- - ">="
|
193
192
|
- !ruby/object:Gem::Version
|
194
|
-
hash: 3
|
195
193
|
segments:
|
196
194
|
- 0
|
197
195
|
version: "0"
|
@@ -200,7 +198,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
200
198
|
requirements:
|
201
199
|
- - ">="
|
202
200
|
- !ruby/object:Gem::Version
|
203
|
-
hash: 3
|
204
201
|
segments:
|
205
202
|
- 0
|
206
203
|
version: "0"
|