ruote 0.9.19 → 0.9.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (401) hide show
  1. data/README.txt +16 -6
  2. data/examples/engine_template.rb +6 -43
  3. data/examples/quickstart.rb +87 -0
  4. data/examples/quotereporter.rb +42 -49
  5. data/examples/simple.rb +56 -0
  6. data/lib/openwfe.rb +20 -34
  7. data/lib/openwfe/contextual.rb +45 -36
  8. data/lib/openwfe/def.rb +21 -30
  9. data/lib/openwfe/engine.rb +17 -26
  10. data/lib/openwfe/engine/engine.rb +132 -397
  11. data/lib/openwfe/engine/expool_methods.rb +34 -122
  12. data/lib/openwfe/engine/file_persisted_engine.rb +39 -60
  13. data/lib/openwfe/engine/fs_engine.rb +54 -0
  14. data/lib/openwfe/engine/launch_methods.rb +245 -0
  15. data/lib/openwfe/engine/listener_methods.rb +128 -0
  16. data/lib/openwfe/engine/lookup_methods.rb +156 -0
  17. data/lib/openwfe/engine/participant_methods.rb +60 -52
  18. data/lib/openwfe/engine/status_methods.rb +102 -97
  19. data/lib/openwfe/engine/tc_engine.rb +55 -0
  20. data/lib/openwfe/engine/tt_engine.rb +55 -0
  21. data/lib/openwfe/engine/update_exp_methods.rb +46 -39
  22. data/lib/openwfe/expool/def_parser.rb +196 -0
  23. data/lib/openwfe/expool/errorjournal.rb +51 -219
  24. data/lib/openwfe/expool/errors.rb +69 -0
  25. data/lib/openwfe/expool/expool_pause_methods.rb +32 -43
  26. data/lib/openwfe/expool/expressionpool.rb +398 -594
  27. data/lib/openwfe/expool/expstorage.rb +68 -72
  28. data/lib/openwfe/expool/fs_expstorage.rb +302 -0
  29. data/lib/openwfe/expool/history.rb +54 -38
  30. data/lib/openwfe/expool/journal.rb +24 -38
  31. data/lib/openwfe/expool/journal_replay.rb +20 -36
  32. data/lib/openwfe/expool/representation.rb +62 -78
  33. data/lib/openwfe/expool/tc_expstorage.rb +239 -0
  34. data/lib/openwfe/expool/{threadedexpstorage.rb → threaded_expstorage.rb} +25 -53
  35. data/lib/openwfe/expool/tt_expstorage.rb +55 -0
  36. data/lib/openwfe/expool/wfidgen.rb +23 -43
  37. data/lib/openwfe/expool/yaml_errorjournal.rb +187 -0
  38. data/lib/openwfe/expressions/condition.rb +33 -58
  39. data/lib/openwfe/expressions/environment.rb +62 -76
  40. data/lib/openwfe/expressions/{expressionmap.rb → expression_map.rb} +40 -54
  41. data/lib/openwfe/expressions/expression_tree.rb +265 -0
  42. data/lib/openwfe/expressions/fe_cancel.rb +19 -39
  43. data/lib/openwfe/expressions/fe_command.rb +80 -84
  44. data/lib/openwfe/expressions/fe_concurrence.rb +250 -313
  45. data/lib/openwfe/expressions/fe_cron.rb +38 -55
  46. data/lib/openwfe/expressions/fe_cursor.rb +49 -74
  47. data/lib/openwfe/expressions/fe_define.rb +44 -90
  48. data/lib/openwfe/expressions/fe_do.rb +83 -70
  49. data/lib/openwfe/expressions/fe_equals.rb +17 -35
  50. data/lib/openwfe/expressions/fe_error.rb +103 -0
  51. data/lib/openwfe/expressions/fe_filter.rb +27 -44
  52. data/lib/openwfe/expressions/fe_filter_definition.rb +37 -54
  53. data/lib/openwfe/expressions/fe_fqv.rb +46 -65
  54. data/lib/openwfe/expressions/fe_http.rb +17 -31
  55. data/lib/openwfe/expressions/fe_if.rb +39 -55
  56. data/lib/openwfe/expressions/fe_iterator.rb +25 -42
  57. data/lib/openwfe/expressions/fe_listen.rb +71 -115
  58. data/lib/openwfe/expressions/fe_losfor.rb +34 -43
  59. data/lib/openwfe/expressions/fe_misc.rb +70 -109
  60. data/lib/openwfe/expressions/fe_participant.rb +61 -99
  61. data/lib/openwfe/expressions/fe_reserve.rb +28 -59
  62. data/lib/openwfe/expressions/fe_save.rb +62 -81
  63. data/lib/openwfe/expressions/fe_sequence.rb +45 -70
  64. data/lib/openwfe/expressions/fe_set.rb +22 -40
  65. data/lib/openwfe/expressions/fe_step.rb +22 -37
  66. data/lib/openwfe/expressions/fe_subprocess.rb +34 -55
  67. data/lib/openwfe/expressions/fe_timeout.rb +28 -44
  68. data/lib/openwfe/expressions/fe_wait.rb +142 -36
  69. data/lib/openwfe/expressions/fe_when.rb +22 -46
  70. data/lib/openwfe/expressions/filter.rb +24 -43
  71. data/lib/openwfe/expressions/flowexpression.rb +211 -192
  72. data/lib/openwfe/expressions/iterator.rb +24 -39
  73. data/lib/openwfe/expressions/merge.rb +30 -52
  74. data/lib/openwfe/expressions/raw.rb +168 -384
  75. data/lib/openwfe/expressions/rprocdef.rb +79 -76
  76. data/lib/openwfe/expressions/time.rb +89 -103
  77. data/lib/openwfe/expressions/timeout.rb +98 -92
  78. data/lib/openwfe/expressions/value.rb +43 -69
  79. data/lib/openwfe/extras/engine/ar_engine.rb +58 -0
  80. data/lib/openwfe/extras/engine/db_persisted_engine.rb +37 -57
  81. data/lib/openwfe/extras/engine/dm_engine.rb +59 -0
  82. data/lib/openwfe/extras/expool/ar_expstorage.rb +337 -0
  83. data/lib/openwfe/extras/expool/db_errorjournal.rb +165 -0
  84. data/lib/openwfe/extras/expool/db_expstorage.rb +73 -0
  85. data/lib/openwfe/extras/expool/db_history.rb +163 -0
  86. data/lib/openwfe/extras/expool/dm_expstorage.rb +327 -0
  87. data/lib/openwfe/extras/listeners/jabber_listeners.rb +102 -0
  88. data/lib/openwfe/extras/listeners/jabberlisteners.rb +26 -0
  89. data/lib/openwfe/extras/listeners/sqs_listeners.rb +128 -0
  90. data/lib/openwfe/extras/misc/activityfeed.rb +19 -34
  91. data/lib/openwfe/extras/misc/jabber_common.rb +122 -0
  92. data/lib/openwfe/extras/participants/active_participants.rb +724 -0
  93. data/lib/openwfe/extras/participants/active_resource_participants.rb +213 -0
  94. data/lib/openwfe/extras/participants/activeparticipants.rb +1 -747
  95. data/lib/openwfe/extras/participants/ar_participants.rb +285 -0
  96. data/lib/openwfe/extras/participants/atomfeed_participants.rb +19 -34
  97. data/lib/openwfe/extras/participants/atompub_participants.rb +19 -34
  98. data/lib/openwfe/extras/participants/basecamp_participants.rb +17 -31
  99. data/lib/openwfe/extras/participants/{csvparticipants.rb → decision_participants.rb} +17 -31
  100. data/lib/openwfe/extras/participants/jabber_participants.rb +147 -0
  101. data/lib/openwfe/extras/participants/jabberparticipants.rb +3 -0
  102. data/lib/openwfe/extras/participants/sqs_participants.rb +108 -0
  103. data/lib/openwfe/extras/participants/{twitterparticipants.rb → twitter_participants.rb} +20 -34
  104. data/lib/openwfe/extras/singlecon.rb +56 -0
  105. data/lib/openwfe/filterdef.rb +83 -65
  106. data/lib/openwfe/flowexpressionid.rb +99 -62
  107. data/lib/openwfe/listeners/listener.rb +54 -65
  108. data/lib/openwfe/listeners/listeners.rb +52 -56
  109. data/lib/openwfe/logging.rb +17 -31
  110. data/lib/openwfe/omixins.rb +25 -58
  111. data/lib/openwfe/participants.rb +1 -34
  112. data/lib/openwfe/participants/{enoparticipants.rb → mail_participants.rb} +33 -47
  113. data/lib/openwfe/participants/participant.rb +37 -36
  114. data/lib/openwfe/participants/participant_map.rb +245 -0
  115. data/lib/openwfe/participants/participants.rb +43 -69
  116. data/lib/openwfe/participants/{soapparticipants.rb → soap_participants.rb} +22 -36
  117. data/lib/openwfe/participants/{storeparticipants.rb → store_participants.rb} +57 -62
  118. data/lib/openwfe/{storage/yamlfilestorage.rb → participants/yaml_filestorage.rb} +35 -64
  119. data/lib/openwfe/representations.rb +770 -0
  120. data/lib/openwfe/rudefinitions.rb +17 -29
  121. data/lib/openwfe/service.rb +21 -32
  122. data/lib/openwfe/tools/flowtracer.rb +21 -35
  123. data/lib/openwfe/util/dollar.rb +48 -61
  124. data/lib/openwfe/util/irb.rb +19 -34
  125. data/lib/openwfe/util/json.rb +55 -0
  126. data/lib/openwfe/util/observable.rb +22 -41
  127. data/lib/openwfe/util/ometa.rb +21 -35
  128. data/lib/openwfe/util/treechecker.rb +17 -31
  129. data/lib/openwfe/util/workqueue.rb +45 -44
  130. data/lib/openwfe/util/xml.rb +80 -234
  131. data/lib/openwfe/utils.rb +67 -110
  132. data/lib/openwfe/version.rb +19 -27
  133. data/lib/openwfe/workitem.rb +119 -84
  134. data/lib/openwfe/worklist/storelocks.rb +17 -33
  135. data/lib/openwfe/worklist/storeparticipant.rb +1 -39
  136. data/lib/openwfe/worklist/worklist.rb +17 -31
  137. data/lib/pooltool.ru +311 -0
  138. data/test/{extras/active_connection.rb → ar_test_connection.rb} +26 -11
  139. data/test/bm/fatxml.rb +70 -0
  140. data/test/bm/load_26c.rb +79 -0
  141. data/test/dm_test_connection.rb +11 -0
  142. data/test/extras/base.rb +3 -0
  143. data/test/extras/et_0_sqs.rb +37 -0
  144. data/test/extras/et_jabber_test.rb +226 -0
  145. data/test/extras/test.rb +16 -0
  146. data/test/functional/base.rb +198 -0
  147. data/test/functional/db_ft_0_ar_participants.rb +136 -0
  148. data/test/functional/eft_0_process_definition.rb +34 -0
  149. data/test/functional/eft_10_unset.rb +60 -0
  150. data/test/functional/eft_11_sleep.rb +95 -0
  151. data/test/functional/eft_12_wait.rb +57 -0
  152. data/test/functional/eft_13_cursor.rb +139 -0
  153. data/test/functional/eft_14_loop.rb +36 -0
  154. data/test/functional/eft_15_undo.rb +77 -0
  155. data/test/functional/eft_16_redo.rb +88 -0
  156. data/test/functional/eft_1_print.rb +57 -0
  157. data/test/functional/eft_2_sequence.rb +47 -0
  158. data/test/functional/eft_3_equals.rb +98 -0
  159. data/test/functional/eft_4_if.rb +96 -0
  160. data/test/functional/eft_5_eval.rb +89 -0
  161. data/test/functional/eft_6_reval.rb +101 -0
  162. data/test/functional/eft_7_exp.rb +47 -0
  163. data/test/functional/eft_8_log.rb +50 -0
  164. data/test/functional/eft_9_set.rb +132 -0
  165. data/test/functional/engine_helper.rb +122 -0
  166. data/test/functional/ft_0_vars_at_launch.rb +27 -0
  167. data/test/functional/ft_1_process_status.rb +46 -0
  168. data/test/functional/ft_2_file_listener.rb +45 -0
  169. data/test/functional/ft_3_on_cancel.rb +171 -0
  170. data/test/functional/ft_4_on_error.rb +220 -0
  171. data/test/functional/ft_5_process_uri.rb +82 -0
  172. data/test/functional/ft_6_process_status.rb +62 -0
  173. data/test/functional/ft_7_parameters.rb +103 -0
  174. data/test/functional/ft_8_dollar.rb +53 -0
  175. data/test/functional/ft_9_register_participants.rb +119 -0
  176. data/test/functional/restart_base.rb +43 -0
  177. data/test/functional/rft_0_sleep.rb +76 -0
  178. data/test/functional/test.rb +24 -0
  179. data/test/path_helper.rb +12 -0
  180. data/test/test.rb +11 -1
  181. data/test/{rutest_utils.rb → test_helper.rb} +8 -31
  182. data/test/unit/test.rb +19 -0
  183. data/test/{fei_test.rb → unit/ut_0_fei.rb} +34 -49
  184. data/test/unit/ut_10_lookup_attribute.rb +86 -0
  185. data/test/unit/ut_11_filter.rb +124 -0
  186. data/test/{condition_test.rb → unit/ut_12_conditional.rb} +33 -40
  187. data/test/unit/ut_13_xmlutil.rb +57 -0
  188. data/test/unit/ut_14_var_field_lookup.rb +85 -0
  189. data/test/{fe_lookup_att_test.rb → unit/ut_15_fe_att_lookup.rb} +14 -21
  190. data/test/{storage_test.rb → unit/ut_16_expstorage_findexp.rb} +3 -9
  191. data/test/unit/ut_17_representations.rb +330 -0
  192. data/test/{hash_test.rb → unit/ut_17b_representations_hash.rb} +25 -21
  193. data/test/{slock_test.rb → unit/ut_18_store_lock.rb} +17 -20
  194. data/test/{wfid_test.rb → unit/ut_1_wfid.rb} +2 -73
  195. data/test/unit/ut_2_utils.rb +53 -0
  196. data/test/unit/ut_3_expmap.rb +65 -0
  197. data/test/{clone_test.rb → unit/ut_4_fulldup.rb} +41 -46
  198. data/test/{obs_test.rb → unit/ut_5_observable.rb} +9 -19
  199. data/test/unit/ut_6_treechecker.rb +101 -0
  200. data/test/unit/ut_7_parser_ruby.rb +344 -0
  201. data/test/unit/ut_7b_parser_ruby.rb +56 -0
  202. data/test/{description_test.rb → unit/ut_8_parser_description.rb} +8 -19
  203. data/test/unit/ut_9_workitem.rb +72 -0
  204. metadata +117 -234
  205. data/lib/openwfe/exceptions.rb +0 -51
  206. data/lib/openwfe/expool/parser.rb +0 -278
  207. data/lib/openwfe/expool/paused_error.rb +0 -77
  208. data/lib/openwfe/expool/yamlexpstorage.rb +0 -224
  209. data/lib/openwfe/expressions/fe_sleep.rb +0 -173
  210. data/lib/openwfe/extras/expool/dberrorjournal.rb +0 -189
  211. data/lib/openwfe/extras/expool/dbexpstorage.rb +0 -355
  212. data/lib/openwfe/extras/expool/dbhistory.rb +0 -135
  213. data/lib/openwfe/extras/listeners/sqslisteners.rb +0 -146
  214. data/lib/openwfe/extras/participants/sqsparticipants.rb +0 -125
  215. data/lib/openwfe/listeners/socketlisteners.rb +0 -272
  216. data/lib/openwfe/orest/definitions.rb +0 -113
  217. data/lib/openwfe/orest/osocket.rb +0 -148
  218. data/lib/openwfe/orest/xmlcodec.rb +0 -682
  219. data/lib/openwfe/participants/participantmap.rb +0 -249
  220. data/lib/openwfe/participants/socketparticipants.rb +0 -202
  221. data/lib/openwfe/storage/yamlcustom.rb +0 -106
  222. data/lib/openwfe/worklist/oldrest.rb +0 -244
  223. data/test/README.txt +0 -27
  224. data/test/back_0916_test.rb +0 -109
  225. data/test/bm/bm_1_xml_vs_prog.rb +0 -59
  226. data/test/bm/bm_2_step.rb +0 -109
  227. data/test/bm/ft_0f_5ms.rb +0 -35
  228. data/test/bm/ft_26_load.rb +0 -208
  229. data/test/bm/ft_26b_load.rb +0 -84
  230. data/test/bm/ft_26c_load.rb +0 -102
  231. data/test/bm/ft_recu.rb +0 -71
  232. data/test/concurrence_test.rb +0 -77
  233. data/test/console_test.rb +0 -12
  234. data/test/cron_ltest.rb +0 -15
  235. data/test/eno_test.rb +0 -76
  236. data/test/expmap_test.rb +0 -54
  237. data/test/expool_20031219_0916.tgz +0 -0
  238. data/test/extras/README.txt +0 -5
  239. data/test/extras/active_with_engine_test.rb +0 -140
  240. data/test/extras/activityfeed_test.rb +0 -85
  241. data/test/extras/ap_0_test.rb +0 -287
  242. data/test/extras/ap_1_test.rb +0 -53
  243. data/test/extras/ap_test_base.rb +0 -24
  244. data/test/extras/atomfeedp_test.rb +0 -113
  245. data/test/extras/atompubp_test.rb +0 -91
  246. data/test/extras/basecamp_test.rb +0 -53
  247. data/test/extras/db_errorjournal_utest.rb +0 -75
  248. data/test/extras/db_expstorage_utest.rb +0 -171
  249. data/test/extras/db_history_0_test.rb +0 -58
  250. data/test/extras/ft_19_csv.rb +0 -58
  251. data/test/extras/ft_71_b14008.rb +0 -85
  252. data/test/extras/sqs_test.rb +0 -57
  253. data/test/extras/twitter_test.rb +0 -62
  254. data/test/file_persisted_engine_test.rb +0 -64
  255. data/test/file_persistence_test.rb +0 -135
  256. data/test/filep_cancel_test.rb +0 -123
  257. data/test/filter_test.rb +0 -109
  258. data/test/flowtestbase.rb +0 -339
  259. data/test/ft_0.rb +0 -68
  260. data/test/ft_0b_sequence.rb +0 -36
  261. data/test/ft_0c_testname.rb +0 -33
  262. data/test/ft_0d_participant.rb +0 -30
  263. data/test/ft_0e_multibody.rb +0 -34
  264. data/test/ft_10_loop.rb +0 -133
  265. data/test/ft_11_ppd.rb +0 -411
  266. data/test/ft_11b_ppd.rb +0 -54
  267. data/test/ft_12_blockparticipant.rb +0 -97
  268. data/test/ft_13_eno.rb +0 -52
  269. data/test/ft_14_subprocess.rb +0 -88
  270. data/test/ft_14b_subprocess.rb +0 -192
  271. data/test/ft_14c_subprocess.rb +0 -68
  272. data/test/ft_15_iterator.rb +0 -216
  273. data/test/ft_15b_iterator.rb +0 -74
  274. data/test/ft_16_fqv.rb +0 -73
  275. data/test/ft_17_condition.rb +0 -84
  276. data/test/ft_18_pname.rb +0 -56
  277. data/test/ft_1_unset.rb +0 -175
  278. data/test/ft_1b_unset.rb +0 -39
  279. data/test/ft_20_cron.rb +0 -53
  280. data/test/ft_21_cron.rb +0 -87
  281. data/test/ft_21b_cron_pause.rb +0 -82
  282. data/test/ft_22_history.rb +0 -78
  283. data/test/ft_23_when.rb +0 -77
  284. data/test/ft_23b_when.rb +0 -70
  285. data/test/ft_23c_wait.rb +0 -80
  286. data/test/ft_23d_cww.rb +0 -58
  287. data/test/ft_24_def.rb +0 -44
  288. data/test/ft_25_cancel.rb +0 -92
  289. data/test/ft_27_getflowpos.rb +0 -143
  290. data/test/ft_28_fileparticipant.rb +0 -63
  291. data/test/ft_29_httprb.rb +0 -106
  292. data/test/ft_2_concurrence.rb +0 -137
  293. data/test/ft_2b_concurrence.rb +0 -188
  294. data/test/ft_2c_concurrence.rb +0 -64
  295. data/test/ft_30_socketlistener.rb +0 -203
  296. data/test/ft_31_flowname.rb +0 -39
  297. data/test/ft_32_journal.rb +0 -91
  298. data/test/ft_32c_journal.rb +0 -102
  299. data/test/ft_32d_journal.rb +0 -81
  300. data/test/ft_33_description.rb +0 -107
  301. data/test/ft_34_cancelwfid.rb +0 -80
  302. data/test/ft_35_localdefs.rb +0 -77
  303. data/test/ft_36_subprocids.rb +0 -97
  304. data/test/ft_37_pnames.rb +0 -70
  305. data/test/ft_38_tag.rb +0 -127
  306. data/test/ft_38b_tag.rb +0 -161
  307. data/test/ft_38c_tag.rb +0 -100
  308. data/test/ft_38d_tag.rb +0 -53
  309. data/test/ft_39_reserve.rb +0 -63
  310. data/test/ft_39b_reserve.rb +0 -84
  311. data/test/ft_3_equals.rb +0 -170
  312. data/test/ft_3b_lookup_vf.rb +0 -83
  313. data/test/ft_40_defined.rb +0 -61
  314. data/test/ft_41_case.rb +0 -110
  315. data/test/ft_42_environments.rb +0 -75
  316. data/test/ft_43_pat10.rb +0 -85
  317. data/test/ft_44_save.rb +0 -70
  318. data/test/ft_44b_restore.rb +0 -212
  319. data/test/ft_45_citerator.rb +0 -214
  320. data/test/ft_45b_citerator.rb +0 -77
  321. data/test/ft_46_pparams.rb +0 -62
  322. data/test/ft_47_filter.rb +0 -160
  323. data/test/ft_48_fe_filter.rb +0 -88
  324. data/test/ft_49_condition.rb +0 -133
  325. data/test/ft_4_misc.rb +0 -232
  326. data/test/ft_50_xml_attribute.rb +0 -152
  327. data/test/ft_51_stack.rb +0 -55
  328. data/test/ft_52_obs_participant.rb +0 -123
  329. data/test/ft_53_null_noop_participant.rb +0 -62
  330. data/test/ft_54_listen.rb +0 -288
  331. data/test/ft_54b_listen.rb +0 -66
  332. data/test/ft_54c_listen.rb +0 -99
  333. data/test/ft_55_ptimeout.rb +0 -58
  334. data/test/ft_56_timeout.rb +0 -59
  335. data/test/ft_57_a.rb +0 -148
  336. data/test/ft_58_ejournal.rb +0 -154
  337. data/test/ft_58b_ejournal.rb +0 -82
  338. data/test/ft_59_ps.rb +0 -212
  339. data/test/ft_5_time.rb +0 -118
  340. data/test/ft_60_ecancel.rb +0 -161
  341. data/test/ft_61_elsub.rb +0 -51
  342. data/test/ft_62_procparticipant.rb +0 -71
  343. data/test/ft_63_pause.rb +0 -137
  344. data/test/ft_64_alias.rb +0 -101
  345. data/test/ft_65_stringlaunch.rb +0 -59
  346. data/test/ft_66_subforget.rb +0 -70
  347. data/test/ft_67_schedlaunch.rb +0 -115
  348. data/test/ft_68_ifparticipant.rb +0 -70
  349. data/test/ft_69_cancelmissing.rb +0 -53
  350. data/test/ft_6_lambda.rb +0 -64
  351. data/test/ft_70_lookupvar.rb +0 -55
  352. data/test/ft_71_log.rb +0 -60
  353. data/test/ft_72_lookup_processes.rb +0 -79
  354. data/test/ft_73_cancel_sub.rb +0 -139
  355. data/test/ft_74_block_and_workitem_dup.rb +0 -63
  356. data/test/ft_75_ruby_attributes.rb +0 -89
  357. data/test/ft_76_merge_isolate.rb +0 -88
  358. data/test/ft_77_segments.rb +0 -35
  359. data/test/ft_78_eval.rb +0 -150
  360. data/test/ft_79_tticket.rb +0 -187
  361. data/test/ft_79b_tticket.rb +0 -172
  362. data/test/ft_79c_outcome.rb +0 -56
  363. data/test/ft_7_lose.rb +0 -104
  364. data/test/ft_7b_lose.rb +0 -78
  365. data/test/ft_80_spname.rb +0 -91
  366. data/test/ft_81_exp.rb +0 -60
  367. data/test/ft_82_trecu.rb +0 -52
  368. data/test/ft_83_badpause.rb +0 -58
  369. data/test/ft_84_updateexp.rb +0 -198
  370. data/test/ft_84b_subrepr.rb +0 -72
  371. data/test/ft_85_dolhash.rb +0 -43
  372. data/test/ft_86_dollar_fv.rb +0 -68
  373. data/test/ft_87_define.rb +0 -74
  374. data/test/ft_88_http.rb +0 -100
  375. data/test/ft_8_forget.rb +0 -44
  376. data/test/ft_9_cursor.rb +0 -154
  377. data/test/ft_9b_cursor.rb +0 -105
  378. data/test/ft_tests.rb +0 -130
  379. data/test/hparticipant_test.rb +0 -168
  380. data/test/lookup_att_test.rb +0 -90
  381. data/test/lookup_vf_test.rb +0 -94
  382. data/test/misc_test.rb +0 -94
  383. data/test/nut_0_irb.rb +0 -20
  384. data/test/param_test.rb +0 -290
  385. data/test/participant_test.rb +0 -101
  386. data/test/pending.rb +0 -23
  387. data/test/ps_representation.rb +0 -133
  388. data/test/rake_ltest.rb +0 -38
  389. data/test/rake_qtest.rb +0 -68
  390. data/test/raw_prog_test.rb +0 -407
  391. data/test/restart_cron_test.rb +0 -136
  392. data/test/restart_paused_test.rb +0 -103
  393. data/test/restart_sleep_test.rb +0 -140
  394. data/test/restart_tests.rb +0 -18
  395. data/test/restart_when_test.rb +0 -112
  396. data/test/ruby_procdef_test.rb +0 -132
  397. data/test/sec_test.rb +0 -206
  398. data/test/timeout_test.rb +0 -105
  399. data/test/treechecker_test.rb +0 -111
  400. data/test/util_xml_test.rb +0 -112
  401. data/test/wi_test.rb +0 -75
@@ -1,41 +1,27 @@
1
- #
2
1
  #--
3
- # Copyright (c) 2005-2008, John Mettraux, OpenWFE.org
4
- # All rights reserved.
5
- #
6
- # Redistribution and use in source and binary forms, with or without
7
- # modification, are permitted provided that the following conditions are met:
2
+ # Copyright (c) 2005-2009, John Mettraux, jmettraux@gmail.com
8
3
  #
9
- # . Redistributions of source code must retain the above copyright notice, this
10
- # list of conditions and the following disclaimer.
4
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
5
+ # of this software and associated documentation files (the "Software"), to deal
6
+ # in the Software without restriction, including without limitation the rights
7
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
+ # copies of the Software, and to permit persons to whom the Software is
9
+ # furnished to do so, subject to the following conditions:
11
10
  #
12
- # . Redistributions in binary form must reproduce the above copyright notice,
13
- # this list of conditions and the following disclaimer in the documentation
14
- # and/or other materials provided with the distribution.
11
+ # The above copyright notice and this permission notice shall be included in
12
+ # all copies or substantial portions of the Software.
15
13
  #
16
- # . Neither the name of the "OpenWFE" nor the names of its contributors may be
17
- # used to endorse or promote products derived from this software without
18
- # specific prior written permission.
14
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20
+ # THE SOFTWARE.
19
21
  #
20
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
- # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
- # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
- # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
- # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
- # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
- # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
- # POSSIBILITY OF SUCH DAMAGE.
22
+ # Made in Japan and Costa Rica.
31
23
  #++
32
- #
33
24
 
34
- #
35
- # "hecho en Costa Rica" and "made in Japan"
36
- #
37
- # john.mettraux@openwfe.org
38
- #
39
25
 
40
26
  require 'openwfe/rexml'
41
27
  require 'tmpdir'
@@ -72,7 +58,7 @@ module OpenWFE
72
58
  #
73
59
  def OpenWFE.fulldup (object)
74
60
 
75
- return object.fulldup if object.respond_to?("fulldup")
61
+ return object.fulldup if object.respond_to?(:fulldup)
76
62
  # trusting client objects providing a fulldup() implementation
77
63
  # Tomaso Tosolini 2007.12.11
78
64
 
@@ -102,9 +88,7 @@ module OpenWFE
102
88
  #
103
89
  # duplicate the attributes of the object
104
90
  object.instance_variables.each do |v|
105
- #puts "v is #{v}"
106
91
  value = object.instance_variable_get(v)
107
- #puts "value is '#{value}'"
108
92
  value = fulldup(value)
109
93
  begin
110
94
  o.instance_variable_set(v, value)
@@ -118,12 +102,12 @@ module OpenWFE
118
102
 
119
103
  def OpenWFE.to_underscore (string)
120
104
 
121
- string.gsub("-", "_")
105
+ string.gsub('-', '_')
122
106
  end
123
107
 
124
108
  def OpenWFE.to_dash (string)
125
109
 
126
- string.gsub("_", "-")
110
+ string.gsub('_', '-')
127
111
  end
128
112
 
129
113
  def OpenWFE.symbol_to_name (symbol)
@@ -143,7 +127,7 @@ module OpenWFE
143
127
  #
144
128
  def OpenWFE.stu (s)
145
129
 
146
- s.gsub("\s", "_")
130
+ s.gsub("\s", '_')
147
131
  end
148
132
 
149
133
  #
@@ -152,14 +136,10 @@ module OpenWFE
152
136
  #
153
137
  def OpenWFE.parse_uri (string)
154
138
 
155
- return nil if string.split("\n").size > 1
139
+ return nil if string.index("\n")
140
+ # cheap initial test
156
141
 
157
- begin
158
- return URI::parse(string)
159
- rescue Exception => e
160
- end
161
-
162
- nil
142
+ URI.parse(string) rescue nil
163
143
  end
164
144
 
165
145
  #
@@ -169,32 +149,33 @@ module OpenWFE
169
149
  #
170
150
  def OpenWFE.parse_known_uri (ref)
171
151
 
172
- uri = OpenWFE::parse_uri(ref.to_s)
152
+ uri = OpenWFE.parse_uri(ref.to_s)
173
153
 
174
154
  return nil unless uri
175
155
 
176
- return uri if uri.scheme == "file"
177
- return uri if uri.scheme == "http"
178
- return uri if uri.scheme == "https"
179
- return uri if uri.scheme == "ftp"
156
+ return uri if uri.scheme == 'file'
157
+ return uri if uri.scheme == 'http'
158
+ return uri if uri.scheme == 'https'
159
+ return uri if uri.scheme == 'ftp'
180
160
  # what else ...
181
161
 
182
162
  nil
183
163
  end
184
164
 
185
- #
165
+ #--
186
166
  # Returns true if the given string starts with the 'start' string.
187
167
  #
188
- def OpenWFE.starts_with (string, start)
189
- #
190
- # my favourite way of doing that would be by adding this
191
- # method to the String class, but that could be intrusive
192
- # (as OpenWFE is meant at first as an embeddable workflow engine).
193
- #
194
- return false unless string
195
- return false if string.length < start.length
196
- string[0, start.length] == start
197
- end
168
+ #def OpenWFE.starts_with (string, start)
169
+ # #
170
+ # # my favourite way of doing that would be by adding this
171
+ # # method to the String class, but that could be intrusive
172
+ # # (as OpenWFE is meant at first as an embeddable workflow engine).
173
+ # #
174
+ # return false unless string
175
+ # return false if string.length < start.length
176
+ # string[0, start.length] == start
177
+ #end
178
+ #++
198
179
 
199
180
  #
200
181
  # Returns true if the given string ends with the '_end' string.
@@ -209,10 +190,7 @@ module OpenWFE
209
190
  # Attempts at displaying a nice stack trace
210
191
  #
211
192
  def OpenWFE.exception_to_s (exception)
212
- s = "exception : "
213
- s << "#{exception}\n"
214
- s << exception.backtrace.join("\n")
215
- s
193
+ "exception : #{exception}\n#{exception.backtrace.join("\n")}"
216
194
  end
217
195
 
218
196
  #
@@ -227,21 +205,7 @@ module OpenWFE
227
205
  s
228
206
  end
229
207
 
230
- #
231
- # Sets the name of the current thread (the attribute :name if it is
232
- # a ruby thread, the java thread name if we're in JRuby)
233
- #
234
- def OpenWFE.set_current_thread_name (name)
235
-
236
- if defined?(JRUBY_VERSION)
237
- require 'java'
238
- java.lang.Thread.current_thread.name = "#{name} (Ruby Thread)"
239
- end
240
-
241
- Thread.current[:name] = name
242
- end
243
-
244
- #
208
+ #--
245
209
  # Some code for writing thinks like :
246
210
  #
247
211
  # if async
@@ -254,35 +218,29 @@ module OpenWFE
254
218
  #
255
219
  # Returns the new thread instance.
256
220
  #
257
- def OpenWFE.call_in_thread (caller_name, caller_object=nil, &block)
258
-
259
- return unless block
260
-
261
- Thread.new do
262
-
263
- #Thread.current[:name] = caller_name
264
- set_current_thread_name caller_name
265
-
266
- begin
267
- #$SAFE = safe_level
268
- #
269
- # (note)
270
- # doesn't work : the block inherits the safety level
271
- # of its surroundings, it's a closure, ne ?
272
-
273
- block.call
274
-
275
- rescue Exception => e
276
- msg = "#{caller_name} caught an exception\n" + exception_to_s(e)
277
- if caller_object and caller_object.respond_to? :lwarn
278
- caller_object.lwarn { msg }
279
- else
280
- puts msg
281
- end
282
- end
283
- end
284
- # returns the thread
285
- end
221
+ #def OpenWFE.call_in_thread (caller_name, caller_object=nil, &block)
222
+ # return nil unless block
223
+ # t = Thread.new do
224
+ # begin
225
+ # #$SAFE = safe_level
226
+ # #
227
+ # # (note)
228
+ # # doesn't work : the block inherits the safety level
229
+ # # of its surroundings, it's a closure, ne ?
230
+ # block.call
231
+ # rescue Exception => e
232
+ # msg = "#{caller_name} caught an exception\n" + exception_to_s(e)
233
+ # if caller_object and caller_object.respond_to? :lwarn
234
+ # caller_object.lwarn { msg }
235
+ # else
236
+ # puts msg
237
+ # end
238
+ # end
239
+ # end
240
+ # t[:name] = caller_name
241
+ # t
242
+ #end
243
+ #++
286
244
 
287
245
  #
288
246
  # A small Timer class for debug purposes.
@@ -500,7 +458,7 @@ module OpenWFE
500
458
  end
501
459
 
502
460
  #
503
- # looks up in a container (something that has a [] method) with a key,
461
+ # Looks up in a container (something that has a [] method) with a key,
504
462
  # if nothing has been found and the key is a number, turns the
505
463
  # the number into a String a does a last lookup.
506
464
  #
@@ -522,6 +480,5 @@ module OpenWFE
522
480
 
523
481
  value
524
482
  end
525
-
526
483
  end
527
484
 
@@ -1,37 +1,29 @@
1
- #
2
1
  #--
3
- # Copyright (c) 2005-2008, John Mettraux, OpenWFE.org
4
- # All rights reserved.
5
- #
6
- # Redistribution and use in source and binary forms, with or without
7
- # modification, are permitted provided that the following conditions are met:
2
+ # Copyright (c) 2005-2009, John Mettraux, jmettraux@gmail.com
8
3
  #
9
- # . Redistributions of source code must retain the above copyright notice, this
10
- # list of conditions and the following disclaimer.
4
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
5
+ # of this software and associated documentation files (the "Software"), to deal
6
+ # in the Software without restriction, including without limitation the rights
7
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
+ # copies of the Software, and to permit persons to whom the Software is
9
+ # furnished to do so, subject to the following conditions:
11
10
  #
12
- # . Redistributions in binary form must reproduce the above copyright notice,
13
- # this list of conditions and the following disclaimer in the documentation
14
- # and/or other materials provided with the distribution.
11
+ # The above copyright notice and this permission notice shall be included in
12
+ # all copies or substantial portions of the Software.
15
13
  #
16
- # . Neither the name of the "OpenWFE" nor the names of its contributors may be
17
- # used to endorse or promote products derived from this software without
18
- # specific prior written permission.
14
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20
+ # THE SOFTWARE.
19
21
  #
20
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
- # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
- # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
- # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
- # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
- # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
- # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
- # POSSIBILITY OF SUCH DAMAGE.
22
+ # Made in Japan.
31
23
  #++
32
- #
33
24
 
34
25
  module OpenWFE
35
26
 
36
- OPENWFERU_VERSION = '0.9.19'
27
+ OPENWFERU_VERSION = '0.9.20'
37
28
  end
29
+
@@ -1,42 +1,27 @@
1
- #
2
1
  #--
3
- # Copyright (c) 2005-2008, John Mettraux, OpenWFE.org
4
- # All rights reserved.
5
- #
6
- # Redistribution and use in source and binary forms, with or without
7
- # modification, are permitted provided that the following conditions are met:
2
+ # Copyright (c) 2005-2009, John Mettraux, jmettraux@gmail.com
8
3
  #
9
- # . Redistributions of source code must retain the above copyright notice, this
10
- # list of conditions and the following disclaimer.
4
+ # Permission is hereby granted, free of charge, to any person obtaining a copy
5
+ # of this software and associated documentation files (the "Software"), to deal
6
+ # in the Software without restriction, including without limitation the rights
7
+ # to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8
+ # copies of the Software, and to permit persons to whom the Software is
9
+ # furnished to do so, subject to the following conditions:
11
10
  #
12
- # . Redistributions in binary form must reproduce the above copyright notice,
13
- # this list of conditions and the following disclaimer in the documentation
14
- # and/or other materials provided with the distribution.
11
+ # The above copyright notice and this permission notice shall be included in
12
+ # all copies or substantial portions of the Software.
15
13
  #
16
- # . Neither the name of the "OpenWFE" nor the names of its contributors may be
17
- # used to endorse or promote products derived from this software without
18
- # specific prior written permission.
14
+ # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15
+ # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16
+ # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17
+ # AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18
+ # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
19
+ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
20
+ # THE SOFTWARE.
19
21
  #
20
- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21
- # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22
- # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
23
- # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
24
- # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25
- # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
26
- # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27
- # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28
- # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29
- # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30
- # POSSIBILITY OF SUCH DAMAGE.
22
+ # Made in Japan.
31
23
  #++
32
- #
33
24
 
34
- #
35
- # "hecho en Costa Rica"
36
- # and "made in Japan"
37
- #
38
- # john.mettraux@openwfe.org
39
- #
40
25
 
41
26
  require 'openwfe/utils'
42
27
 
@@ -47,7 +32,7 @@ module OpenWFE
47
32
  # The convention for the result of some expressions is to store
48
33
  # their result in a workitem field named "__result__".
49
34
  #
50
- FIELD_RESULT = "__result__"
35
+ FIELD_RESULT = '__result__'
51
36
 
52
37
  #--
53
38
  # WORKITEMS
@@ -77,19 +62,19 @@ module OpenWFE
77
62
  end
78
63
 
79
64
  def to_h
80
-
81
- h = {}
82
- h['type'] = self.class.name
83
- h['last_modified'] = @last_modified
84
- h['attributes'] = @attributes
85
- h
65
+ {
66
+ 'type' => self.class.name,
67
+ 'last_modified' => @last_modified,
68
+ 'attributes' => @attributes.clone
69
+ }
86
70
  end
87
71
 
88
72
  def self.from_h (h)
89
73
 
90
- wi = OpenWFE.get_class(h).new
74
+ klass = WI_CLASSES[h['type']] || self
75
+ wi = klass.new
91
76
  wi.last_modified = h['last_modified']
92
- wi.attributes = h['attributes']
77
+ wi.attributes = h['attributes'] || h['fields'] || {}
93
78
  wi
94
79
  end
95
80
 
@@ -148,25 +133,16 @@ module OpenWFE
148
133
  #
149
134
  def method_missing (m, *args)
150
135
 
151
- methodname = m.to_s
136
+ method_name = m.to_s
152
137
 
153
138
  if args.length == 0
154
- value = @attributes[methodname]
139
+ value = @attributes[method_name]
155
140
  return value if value != nil
156
- raise "Missing attribute '#{methodname}' in workitem"
141
+ raise "Missing attribute '#{method_name}' in workitem"
157
142
  end
158
143
 
159
- #if methodname == "[]" and args.length == 1
160
- # value = @attributes[args[0]]
161
- # return value if value
162
- # raise "Missing attribute '#{methodname}' in workitem"
163
- #end
164
- #if methodname == "[]=" and args.length == 2
165
- # return @attributes[args[0]] = args[1]
166
- #end
167
-
168
- if args.length == 1 and methodname[-1, 1] == '='
169
- return @attributes[methodname[0..-2]] = args[0]
144
+ if args.length == 1 and method_name[-1, 1] == '='
145
+ return @attributes[method_name[0..-2]] = args[0]
170
146
  end
171
147
 
172
148
  super(m, args)
@@ -283,7 +259,6 @@ module OpenWFE
283
259
  class InFlowWorkItem < InFlowItem
284
260
 
285
261
  attr_accessor :dispatch_time
286
- attr_accessor :filter
287
262
 
288
263
  #
289
264
  # in some contexts (ruote-rest, ruote-web2, the web...) workitems
@@ -303,25 +278,56 @@ module OpenWFE
303
278
  #
304
279
  # special : added by the ruby lib, not given by the worklist
305
280
 
281
+ #
282
+ # sets the filter for this workitem
283
+ #
284
+ def filter= (f)
285
+
286
+ f ? @attributes['__filter__'] = f : @attributes.delete('__filter__')
287
+ end
288
+
289
+ #
290
+ # returns the filter for this workitem
291
+ #
292
+ def filter
293
+
294
+ @attributes['__filter__']
295
+ end
296
+
297
+ #
298
+ # Returns the current timeout for the workitem (or nil if none is set).
299
+ #
300
+ # The result is an array [
301
+ # exp_class_name, exp_name, timestamp, timeout_duration, timeout_point ]
302
+ #
303
+ # 'timestamp' and 'timeout_point' are Float instances (use Time.at(f) to
304
+ # turn into local Time instances)
305
+ #
306
+ def current_timeout
307
+
308
+ stamps = self.attributes['__timeouts__']
309
+ return nil unless stamps
310
+
311
+ stamps["#{fei.wfid}__#{fei.expid}"]
312
+ end
313
+
306
314
  #
307
315
  # Outputting the workitem in a human readable format
308
316
  #
309
317
  def to_s
310
318
 
311
- s = ""
312
- s << " #{self.class} :\n"
319
+ s = " #{self.class} :\n"
313
320
  s << " - flow_expression_id : #{@flow_expression_id}\n"
314
321
  s << " - participant_name : #{@participant_name}\n"
315
322
  s << " - last_modified : #{@last_modified}\n"
316
323
  s << " - dispatch_time : #{@dispatch_time}\n"
317
324
  s << " - attributes :\n"
318
325
 
319
- s << " {\n"
326
+ s << ' {\n'
320
327
  @attributes.keys.sort.each do |k|
321
- v = @attributes[k]
322
- s << " #{k.inspect} => #{v.inspect},\n"
328
+ s << " #{k.inspect} => #{@attributes[k].inspect},\n"
323
329
  end
324
- s << " }"
330
+ s << ' }'
325
331
  s
326
332
  end
327
333
 
@@ -333,22 +339,37 @@ module OpenWFE
333
339
 
334
340
  h = super
335
341
  h['dispatch_time'] = @dispatch_time
336
- #h[:history] = @history
337
- h['filter'] = @filter
342
+ h['attributes']['__filter__'] &&= filter.to_h
338
343
  h
339
344
  end
340
345
 
341
346
  #
342
347
  # Rebuilds an InFlowWorkItem from its hash version.
343
348
  #
344
- def InFlowWorkItem.from_h (h)
349
+ def self.from_h (h)
345
350
 
346
- wi = super
347
- wi.dispatch_time = h['dispatch_time']
348
- wi.filter = h['filter']
351
+ wi = super(h)
352
+ wi.filter &&= OpenWFE::FilterDefinition.from_h(wi.filter)
349
353
  wi
350
354
  end
351
355
 
356
+ #
357
+ # Returns a String containing the XML representation of this workitem.
358
+ #
359
+ def to_xml (options={ :indent => 2 })
360
+
361
+ OpenWFE::Xml.workitem_to_xml(self, options)
362
+ end
363
+
364
+ #
365
+ # Reads a String or a REXML document or element and returns a copy of the
366
+ # InFlowWorkitem it represents.
367
+ #
368
+ def self.from_xml (xml)
369
+
370
+ OpenWFE::Xml.workitem_from_xml(xml)
371
+ end
372
+
352
373
  #
353
374
  # Sets the '__result__' field of this workitem
354
375
  #
@@ -362,7 +383,7 @@ module OpenWFE
362
383
  #
363
384
  def unset_result
364
385
 
365
- @attributes.delete FIELD_RESULT
386
+ @attributes.delete(FIELD_RESULT)
366
387
  end
367
388
 
368
389
  #
@@ -408,7 +429,7 @@ module OpenWFE
408
429
  #
409
430
  class LaunchItem < WorkItem
410
431
 
411
- DEF = "__definition"
432
+ DEF = '__definition'
412
433
  FIELD_DEF = "field:#{DEF}"
413
434
 
414
435
  attr_accessor :workflow_definition_url
@@ -417,6 +438,9 @@ module OpenWFE
417
438
  alias :wfdurl :workflow_definition_url
418
439
  alias :wfdurl= :workflow_definition_url=
419
440
 
441
+ alias :definition_url :workflow_definition_url
442
+ alias :definition_url= :workflow_definition_url=
443
+
420
444
  #
421
445
  # This constructor will build an empty LaunchItem.
422
446
  #
@@ -434,8 +458,8 @@ module OpenWFE
434
458
  # definition = """
435
459
  # <process-definition name="x" revision="y">
436
460
  # <sequence>
437
- # <participant ref="alpha" />
438
- # <participant ref="bravo" />
461
+ # <participant ref="alpha" />
462
+ # <participant ref="bravo" />
439
463
  # </sequence>
440
464
  # </process-definition>
441
465
  # """.strip
@@ -455,9 +479,18 @@ module OpenWFE
455
479
 
456
480
  super()
457
481
 
482
+ self.definition = process_definition
483
+ end
484
+
485
+ def definition
486
+ @attributes[DEF]
487
+ end
488
+
489
+ def definition= (process_definition)
458
490
  if process_definition
459
- @workflow_definition_url = FIELD_DEF
460
491
  @attributes[DEF] = process_definition
492
+ else
493
+ @attributes.delete(DEF)
461
494
  end
462
495
  end
463
496
 
@@ -472,10 +505,20 @@ module OpenWFE
472
505
  h
473
506
  end
474
507
 
508
+ #
509
+ # Turns a hash into a LaunchItem instance.
510
+ #
475
511
  def self.from_h (h)
476
512
 
477
513
  li = super
478
- li.workflow_definition_url = h['workflow_definition_url']
514
+ li.definition_url =
515
+ h['workflow_definition_url'] ||
516
+ h['definition_url'] ||
517
+ h['pdef_url']
518
+ li.definition =
519
+ h['workflow_definition'] ||
520
+ h['definition'] ||
521
+ h['pdef']
479
522
  li
480
523
  end
481
524
  end
@@ -484,9 +527,9 @@ module OpenWFE
484
527
  # Turns a hash into its corresponding workitem (InFlowWorkItem, CancelItem,
485
528
  # LaunchItem).
486
529
  #
487
- def OpenWFE.workitem_from_h (h)
530
+ def self.workitem_from_h (h)
488
531
 
489
- wi_class = get_class(h)
532
+ wi_class = WI_CLASSES[h['type']]
490
533
  wi_class.from_h(h)
491
534
  end
492
535
 
@@ -494,13 +537,5 @@ module OpenWFE
494
537
  OpenWFE::LaunchItem, OpenWFE::InFlowWorkItem, OpenWFE::CancelItem
495
538
  ].inject({}) { |r, c| r[c.to_s] = c; r }
496
539
 
497
- #
498
- # returns the workitem class for the given hash
499
- #
500
- def OpenWFE.get_class (h)
501
-
502
- WI_CLASSES[h['type']]
503
- end
504
-
505
540
  end
506
541