@@ -84,7 +84,7 @@ module OpenWFE # Our delegations map @delegates = { - 'JSON' => { :encode => 'dump', :decode => 'parse' }, + 'JSON' => { :encode => 'generate', :decode => 'parse' }, 'ActiveSupport' => { :encode => 'encode', :decode => 'decode', :class => 'ActiveSupport::JSON' } } @@ -140,8 +140,6 @@ module OpenWFE @priorities.each do |lib| begin - next if lib == 'JSON' && RUBY_VERSION.to_f >= 1.9 - require lib.downcase @available_backends ||= [] @available_backends << lib lib/openwfe/util/json.rb @@ -83,7 +83,7 @@ class RepresentationsHashTest < Test::Unit::TestCase wi0.fei = new_fei wi0.attributes['data'] = (0..5).to_a - s = wi0.to_h.to_json + s = OpenWFE::Json.encode( wi0.to_h ) #puts s #wi1 = OpenWFE::InFlowWorkItem.from_h(JSON.parse(s)) test/unit/ut_17b_representations_hash.rb @@ -49,7 +49,7 @@ class TestJSON < Test::Unit::TestCase json = OpenWFE::Json::Backend.delegates['JSON'] - assert_equal json[:encode], 'dump' + assert_equal json[:encode], 'generate' assert_equal json[:decode], 'parse' end test/unit/ut_2a_json.rb 78bcc1f78346d26a141b8463f25756200185d8e7 Kenneth Kalmer kenneth.kalmer@gmail.com http://github.com/jmettraux/ruote/commit/5a27c922833ab313544d4e47674599b1be1827e9 5a27c922833ab313544d4e47674599b1be1827e9 2009-05-24T09:38:05-07:00 2009-05-24T09:38:05-07:00 Minor json tweaks 4a14415f4ccee1f6efa35fce62f7445aa61ca401 Kenneth Kalmer kenneth.kalmer@gmail.com