@@ -3,6 +3,8 @@
== ruote-rest - 0.9.19 not yet released
+- todo #21419 : removed direct dependency on json gem, relying on whatever is
+ present (activesupport or json)
- bug #21096 : reordered participant load order in conf/participants.rb
- todo #20647 : showing scheduled jobs for /processes
CHANGELOG.txt
@@ -95,7 +95,7 @@ end
#
unless {}.respond_to?(:to_json)
- require 'json/pure'
+ require 'json'
end
#
lib/misc.rb
@@ -81,7 +81,7 @@ class StProcessesTest < Test::Unit::TestCase
get_it "/processes/#{fei.wfid}/representation"
- js = JSON.parse(@response.body)
+ js = json_parse(@response.body)
assert_kind_of Array, js
assert_equal "application/json", @response["Content-Type"]
test/st_processes.rb
@@ -5,7 +5,7 @@ require 'rubygems'
require 'optparse'
-require 'json/pure'
+require 'json' # gem 'json' or 'json_pure'
require 'openwfe/workitem'
require 'openwfe/util/xml'
tools/launch.rb
@@ -52,12 +52,12 @@
<% if @expression.raw_representation %>
<br/>
raw representation :
- <div class="expression_raw_representation"><%= JSON.dump(@expression.raw_representation) %></div>
+ <div class="expression_raw_representation"><%= @expression.raw_representation.to_json %></div>
<% end %>
<% if @expression.raw_rep_updated %>
raw representation (updated) :
- <div class="expression_raw_rep_updated"><%= JSON.dump(@expression.raw_rep_updated) %></div>
+ <div class="expression_raw_rep_updated"><%= @expression.raw_rep_updated.to_json %></div>
<% end %>
<br/>
views/expression.erb
@@ -9,9 +9,12 @@
<a href="/errors">GET /errors</a> |
<a href="/participants">GET /participants</a>
</div>
+
+ <% t = request.path_info.split('/')[1] %>
+
<div class="h_right" style="float: right;">
<a href="<%= as_x_href('xml') %>">as xml</a> |
- <% if respond_to?("render_#{request.path_info.split('/')[1]}_json") %>
+ <% if respond_to?("render_#{t}_json") %>
<a href="<%= as_x_href('json') %>">as json</a>
<% else %>
as json
views/footer.erb
@@ -30,7 +30,7 @@
<div class="process_var">
<span class="process_var_key"><%= k.to_s %></span>
=>
- <span class="process_var_value"><%= JSON.dump(v) %></span>
+ <span class="process_var_value"><%= v.to_json %></span>
</div>
<% end %>
</div>
@@ -81,7 +81,7 @@
<div class="process_representation">
Representation :<br/>
- <span class="process_rep"><%= JSON.dump(@process.process_stack.representation) %></span>
+ <span class="process_rep"><%= @process.process_stack.representation.to_json %></span>
</div>
<br/>
views/process.erb
@@ -32,7 +32,7 @@
<input type="hidden" name="_method" value="PUT" />
attributes :<br/>
- <textarea name="attributes" cols="60" rows="12"><%= JSON.dump(@workitem.attributes) %></textarea>(json)<br/>
+ <textarea name="attributes" cols="60" rows="12"><%= @workitem.attributes.to_json %></textarea>(json)<br/>
proceed : <input type="checkbox" name="proceed" value="proceed" /><br/>
views/workitem.erb
0285b501d12e1fe977f806df80fe832b4c18c5b1
John Mettraux
jmettraux@gmail.com
http://github.com/jmettraux/ruote-rest/commit/35aef7d4093622360b274addc15c88766ac15022
35aef7d4093622360b274addc15c88766ac15022
2008-08-02T07:03:57-07:00
2008-08-02T07:03:57-07:00
todo #21419 : removed direct dependency on json gem, relying on whatever is present (activesupport or json).
90cc34ee927d224ab7e7ecd03f006a8411bbdabe
John Mettraux
jmettraux@gmail.com