From b39dd56b31bc3fa358743e8e715db34b98dcdb80 Mon Sep 17 00:00:00 2001 From: "Michael B. Klein" Date: Tue, 21 Sep 2010 10:26:11 -0700 Subject: [PATCH] Changed requires to prefer json-pure over json/ext --- lib/edi/edi2json.rb | 7 ++++++- lib/edi/mapper.rb | 9 +++++++-- lib/openils/mapper.rb | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/edi/edi2json.rb b/lib/edi/edi2json.rb index 8f88fe4fc..0e637e9c6 100644 --- a/lib/edi/edi2json.rb +++ b/lib/edi/edi2json.rb @@ -1,4 +1,9 @@ -require 'json' +begin + require 'json/pure' +rescue LoadError + warn "WARNING: json-pure not found. Trying json." + require 'json' +end module EDI diff --git a/lib/edi/mapper.rb b/lib/edi/mapper.rb index 387eaa541..abeeeb937 100644 --- a/lib/edi/mapper.rb +++ b/lib/edi/mapper.rb @@ -1,3 +1,4 @@ +require 'forwardable' require 'edi4r' require 'edi4r/edifact' begin @@ -5,8 +6,12 @@ begin rescue LoadError warn "WARNING: edi4r-tdid not found. Only EDIFACT versions d96a and d01b will be supported!" end -require 'forwardable' -require 'json' +begin + require 'json/pure' +rescue LoadError + warn "WARNING: json-pure not found. Trying json." + require 'json' +end class String diff --git a/lib/openils/mapper.rb b/lib/openils/mapper.rb index 138bd5296..ad4bd2232 100644 --- a/lib/openils/mapper.rb +++ b/lib/openils/mapper.rb @@ -3,7 +3,7 @@ require 'edi/mapper' module OpenILS class Mapper < EDI::E::Mapper - VERSION = '0.9.7' + VERSION = '0.9.8' end end -- 2.11.0