From 514d791dd8602ad1d70d45a824927aafe44e838c Mon Sep 17 00:00:00 2001
From: Florian Frank <flori@ping.de>
Date: Wed, 26 Jan 2011 02:10:56 +0100
Subject: Support building of fat binary gem

This should fix issue #51 on Windows
---
 lib/json/ext.rb     | 17 +++++++++++++++--
 lib/json/version.rb |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'lib/json')

diff --git a/lib/json/ext.rb b/lib/json/ext.rb
index 7264a85..1fbc3fd 100644
--- a/lib/json/ext.rb
+++ b/lib/json/ext.rb
@@ -4,8 +4,21 @@ module JSON
   # This module holds all the modules/classes that implement JSON's
   # functionality as C extensions.
   module Ext
-    require 'json/ext/parser'
-    require 'json/ext/generator'
+    begin
+      if defined?(RUBY_ENGINE) == 'constant' and RUBY_ENGINE == 'ruby' and RUBY_VERSION =~ /\A1\.9\./
+        require 'json/ext/1.9/parser'
+        require 'json/ext/1.9/generator'
+      elsif !defined?(RUBY_ENGINE) && RUBY_VERSION =~ /\A1\.8\./
+        require 'json/ext/1.8/parser'
+        require 'json/ext/1.8/generator'
+      else
+        require 'json/ext/parser'
+        require 'json/ext/generator'
+      end
+    rescue LoadError
+      require 'json/ext/parser'
+      require 'json/ext/generator'
+    end
     $DEBUG and warn "Using Ext extension for JSON."
     JSON.parser = Parser
     JSON.generator = Generator
diff --git a/lib/json/version.rb b/lib/json/version.rb
index beff08b..86a741a 100644
--- a/lib/json/version.rb
+++ b/lib/json/version.rb
@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.5.0'
+  VERSION         = '1.5.1'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
-- 
cgit v1.2.1