scarpe 0.2.1 → 0.3.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (347) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +4 -0
  3. data/.yardopts +12 -0
  4. data/CHANGELOG.md +16 -2
  5. data/Gemfile +3 -0
  6. data/Gemfile.lock +116 -0
  7. data/README.md +53 -30
  8. data/Rakefile +13 -1
  9. data/docs/yard/catscradle.md +44 -0
  10. data/docs/yard/template/default/fulldoc/html/setup.rb +13 -0
  11. data/docs/yard/template/default/layout/html/setup.rb +9 -0
  12. data/examples/animate.rb +20 -0
  13. data/examples/arrow.rb +10 -0
  14. data/examples/background_with_image.rb +16 -0
  15. data/examples/bloopsaphone/working/bronx_army_knife.rb +66 -0
  16. data/examples/bloopsaphone/working/morning_serenity.rb +21 -0
  17. data/examples/bloopsaphone/working/simpsons_theme_song_by_why.rb +6 -4
  18. data/examples/btn_tooltip.rb +7 -0
  19. data/examples/button_go_away.rb +1 -1
  20. data/examples/button_style_changed.rb +7 -0
  21. data/examples/button_styles_default.rb +6 -0
  22. data/examples/check.rb +18 -0
  23. data/examples/clear_and_append.rb +24 -0
  24. data/examples/download_and_show_image.rb +28 -0
  25. data/examples/edit_box.rb +3 -5
  26. data/examples/fonts.rb +2 -2
  27. data/examples/gen.rb +8 -8
  28. data/examples/get_headers.rb +10 -0
  29. data/examples/highlander.rb +4 -2
  30. data/examples/legacy/README.md +6 -0
  31. data/examples/legacy/not_checked/shoes-contrib/basic/shoes-notes.rb +1 -1
  32. data/examples/legacy/not_checked/simple/anim-shapes.rb +1 -1
  33. data/examples/legacy/not_checked/speedometer_app.rb +55 -0
  34. data/examples/legacy/working/simple/image-icon.rb +3 -0
  35. data/examples/legacy/{not_checked → working}/simple/image.rb +1 -1
  36. data/examples/link.rb +2 -2
  37. data/examples/list_box_choose.rb +17 -0
  38. data/examples/local_assets/local_file_server.rb +82 -0
  39. data/examples/local_assets/sample.gif +0 -0
  40. data/examples/local_assets/sample.mp4 +0 -0
  41. data/examples/local_fonts.rb +4 -0
  42. data/examples/local_images.rb +3 -0
  43. data/examples/motion_events.rb +20 -0
  44. data/examples/para/para_text.rb +14 -0
  45. data/examples/parse_xl_funnies.rb +58 -0
  46. data/examples/progress.rb +31 -0
  47. data/examples/radio/radio.rb +16 -0
  48. data/examples/radio/radio_groups.rb +18 -0
  49. data/examples/radio/radio_same_slot.rb +6 -0
  50. data/examples/rect.rb +4 -0
  51. data/examples/rotate_shapes.rb +17 -0
  52. data/examples/ruby_racer.rb +13 -15
  53. data/examples/selfitude.rb +18 -0
  54. data/examples/shapes/shapes_fill.rb +4 -3
  55. data/examples/shoes_school.rb +2 -4
  56. data/examples/show_hide.rb +6 -0
  57. data/examples/simpler-menu.rb +21 -0
  58. data/examples/skip_ci/change_my_audio_source.rb +21 -0
  59. data/examples/skip_ci/guitar_fretboard.rb +137 -0
  60. data/examples/video.rb +10 -0
  61. data/exe/scarpe +43 -66
  62. data/fonts/Pacifico.ttf +0 -0
  63. data/lacci/Gemfile +24 -0
  64. data/lacci/Gemfile.lock +79 -0
  65. data/lacci/Rakefile +12 -0
  66. data/lacci/lacci.gemspec +37 -0
  67. data/lacci/lib/lacci/scarpe_cli.rb +71 -0
  68. data/lacci/lib/lacci/scarpe_core.rb +22 -0
  69. data/lacci/lib/lacci/version.rb +13 -0
  70. data/lacci/lib/scarpe/niente/app.rb +23 -0
  71. data/lacci/lib/scarpe/niente/display_service.rb +62 -0
  72. data/lacci/lib/scarpe/niente/drawable.rb +57 -0
  73. data/lacci/lib/scarpe/niente/logger.rb +29 -0
  74. data/lacci/lib/scarpe/niente/shoes_spec.rb +87 -0
  75. data/lacci/lib/scarpe/niente.rb +20 -0
  76. data/lacci/lib/shoes/app.rb +309 -0
  77. data/{lib/scarpe → lacci/lib/shoes}/background.rb +2 -2
  78. data/{lib/scarpe → lacci/lib/shoes}/border.rb +2 -2
  79. data/lacci/lib/shoes/builtins.rb +63 -0
  80. data/lacci/lib/shoes/changelog.rb +52 -0
  81. data/{lib/scarpe → lacci/lib/shoes}/colors.rb +3 -1
  82. data/lacci/lib/shoes/constants.rb +47 -0
  83. data/{lib/scarpe → lacci/lib/shoes}/display_service.rb +71 -53
  84. data/lacci/lib/shoes/download.rb +123 -0
  85. data/lacci/lib/shoes/drawable.rb +380 -0
  86. data/lacci/lib/shoes/drawables/arc.rb +49 -0
  87. data/lacci/lib/shoes/drawables/arrow.rb +41 -0
  88. data/lacci/lib/shoes/drawables/button.rb +73 -0
  89. data/lacci/lib/shoes/drawables/check.rb +29 -0
  90. data/lacci/lib/shoes/drawables/document_root.rb +20 -0
  91. data/lacci/lib/shoes/drawables/edit_box.rb +29 -0
  92. data/{lib/scarpe → lacci/lib/shoes/drawables}/edit_line.rb +6 -6
  93. data/lacci/lib/shoes/drawables/flow.rb +22 -0
  94. data/{lib/scarpe → lacci/lib/shoes/drawables}/image.rb +7 -11
  95. data/lacci/lib/shoes/drawables/line.rb +20 -0
  96. data/lacci/lib/shoes/drawables/link.rb +34 -0
  97. data/lacci/lib/shoes/drawables/list_box.rb +56 -0
  98. data/lacci/lib/shoes/drawables/para.rb +118 -0
  99. data/lacci/lib/shoes/drawables/progress.rb +14 -0
  100. data/lacci/lib/shoes/drawables/radio.rb +33 -0
  101. data/lacci/lib/shoes/drawables/rect.rb +17 -0
  102. data/lacci/lib/shoes/drawables/shape.rb +36 -0
  103. data/lacci/lib/shoes/drawables/slot.rb +87 -0
  104. data/{lib/scarpe → lacci/lib/shoes/drawables}/span.rb +8 -7
  105. data/lacci/lib/shoes/drawables/stack.rb +26 -0
  106. data/lacci/lib/shoes/drawables/star.rb +50 -0
  107. data/lacci/lib/shoes/drawables/subscription_item.rb +93 -0
  108. data/lacci/lib/shoes/drawables/text_drawable.rb +63 -0
  109. data/lacci/lib/shoes/drawables/video.rb +16 -0
  110. data/lacci/lib/shoes/drawables/widget.rb +69 -0
  111. data/lacci/lib/shoes/drawables.rb +31 -0
  112. data/lacci/lib/shoes/errors.rb +28 -0
  113. data/lacci/lib/shoes/log.rb +71 -0
  114. data/lacci/lib/shoes/ruby_extensions.rb +15 -0
  115. data/lacci/lib/shoes/spacing.rb +9 -0
  116. data/lacci/lib/shoes-spec.rb +93 -0
  117. data/lacci/lib/shoes.rb +147 -0
  118. data/lacci/test/test_colors.rb +39 -0
  119. data/lacci/test/test_helper.rb +63 -0
  120. data/lacci/test/test_lacci.rb +18 -0
  121. data/lacci/test/test_shoes_errors.rb +49 -0
  122. data/lib/scarpe/cats_cradle.rb +271 -0
  123. data/lib/scarpe/errors.rb +77 -0
  124. data/lib/scarpe/evented_assertions.rb +121 -0
  125. data/lib/scarpe/shoes_spec.rb +181 -0
  126. data/lib/scarpe/version.rb +2 -2
  127. data/lib/scarpe/wv/app.rb +45 -23
  128. data/lib/scarpe/wv/arc.rb +4 -48
  129. data/lib/scarpe/wv/arrow.rb +9 -0
  130. data/lib/scarpe/wv/button.rb +7 -33
  131. data/lib/scarpe/wv/check.rb +27 -0
  132. data/lib/scarpe/wv/control_interface.rb +32 -40
  133. data/lib/scarpe/wv/document_root.rb +66 -31
  134. data/lib/scarpe/wv/drawable.rb +273 -0
  135. data/lib/scarpe/wv/edit_box.rb +4 -19
  136. data/lib/scarpe/wv/edit_line.rb +4 -18
  137. data/lib/scarpe/wv/flow.rb +2 -28
  138. data/lib/scarpe/wv/image.rb +10 -25
  139. data/lib/scarpe/wv/line.rb +3 -28
  140. data/lib/scarpe/wv/link.rb +3 -15
  141. data/lib/scarpe/wv/list_box.rb +6 -29
  142. data/lib/scarpe/wv/para.rb +11 -28
  143. data/lib/scarpe/wv/progress.rb +19 -0
  144. data/lib/scarpe/wv/radio.rb +33 -0
  145. data/lib/scarpe/wv/rect.rb +13 -0
  146. data/lib/scarpe/wv/shape.rb +41 -10
  147. data/lib/scarpe/wv/slot.rb +64 -0
  148. data/lib/scarpe/wv/span.rb +3 -25
  149. data/lib/scarpe/wv/stack.rb +2 -38
  150. data/lib/scarpe/wv/star.rb +3 -54
  151. data/lib/scarpe/wv/subscription_item.rb +84 -0
  152. data/lib/scarpe/wv/text_drawable.rb +32 -0
  153. data/lib/scarpe/wv/video.rb +34 -0
  154. data/lib/scarpe/wv/web_wrangler.rb +449 -299
  155. data/lib/scarpe/wv/webview_local_display.rb +63 -26
  156. data/lib/scarpe/wv/webview_relay_display.rb +24 -125
  157. data/lib/scarpe/wv/webview_relay_util.rb +140 -0
  158. data/lib/scarpe/wv/wv_display_worker.rb +19 -6
  159. data/lib/scarpe/wv.rb +76 -14
  160. data/lib/scarpe/wv_local.rb +1 -1
  161. data/lib/scarpe/wv_relay.rb +1 -1
  162. data/lib/scarpe.rb +4 -32
  163. data/logger/debug_web_wrangler.json +1 -1
  164. data/logger/scarpe_wv_test.json +1 -1
  165. data/scarpe-components/.gitignore +1 -0
  166. data/scarpe-components/Gemfile +22 -0
  167. data/scarpe-components/Gemfile.lock +86 -0
  168. data/scarpe-components/README.md +35 -0
  169. data/scarpe-components/Rakefile +12 -0
  170. data/scarpe-components/lib/scarpe/components/base64.rb +25 -0
  171. data/scarpe-components/lib/scarpe/components/calzini/alert.rb +49 -0
  172. data/scarpe-components/lib/scarpe/components/calzini/art_widgets.rb +203 -0
  173. data/scarpe-components/lib/scarpe/components/calzini/button.rb +39 -0
  174. data/scarpe-components/lib/scarpe/components/calzini/misc.rb +146 -0
  175. data/scarpe-components/lib/scarpe/components/calzini/para.rb +35 -0
  176. data/scarpe-components/lib/scarpe/components/calzini/slots.rb +155 -0
  177. data/scarpe-components/lib/scarpe/components/calzini/text_widgets.rb +65 -0
  178. data/scarpe-components/lib/scarpe/components/calzini.rb +149 -0
  179. data/scarpe-components/lib/scarpe/components/errors.rb +20 -0
  180. data/scarpe-components/lib/scarpe/components/file_helpers.rb +66 -0
  181. data/scarpe-components/lib/scarpe/components/html.rb +131 -0
  182. data/scarpe-components/lib/scarpe/components/minitest_export_reporter.rb +75 -0
  183. data/scarpe-components/lib/scarpe/components/minitest_import_runnable.rb +98 -0
  184. data/scarpe-components/lib/scarpe/components/minitest_result.rb +86 -0
  185. data/scarpe-components/lib/scarpe/components/modular_logger.rb +113 -0
  186. data/scarpe-components/lib/scarpe/components/print_logger.rb +47 -0
  187. data/{lib/scarpe → scarpe-components/lib/scarpe/components}/promises.rb +115 -48
  188. data/scarpe-components/lib/scarpe/components/segmented_file_loader.rb +189 -0
  189. data/scarpe-components/lib/scarpe/components/string_helpers.rb +10 -0
  190. data/scarpe-components/lib/scarpe/components/tiranti.rb +225 -0
  191. data/scarpe-components/lib/scarpe/components/unit_test_helpers.rb +257 -0
  192. data/scarpe-components/lib/scarpe/components/version.rb +7 -0
  193. data/scarpe-components/scarpe-components.gemspec +38 -0
  194. data/scarpe-components/test/calzini/test_calzini_alert.rb +30 -0
  195. data/scarpe-components/test/calzini/test_calzini_art_drawables.rb +105 -0
  196. data/scarpe-components/test/calzini/test_calzini_button.rb +52 -0
  197. data/scarpe-components/test/calzini/test_calzini_misc.rb +115 -0
  198. data/scarpe-components/test/calzini/test_calzini_para.rb +37 -0
  199. data/scarpe-components/test/calzini/test_calzini_slots.rb +130 -0
  200. data/scarpe-components/test/calzini/test_calzini_text_drawables.rb +41 -0
  201. data/scarpe-components/test/mtr_data/exception.json +1 -0
  202. data/scarpe-components/test/mtr_data/fail_with_message.json +1 -0
  203. data/scarpe-components/test/mtr_data/skipped_no_message.json +1 -0
  204. data/scarpe-components/test/mtr_data/skipped_w_msg.json +1 -0
  205. data/scarpe-components/test/mtr_data/succeed_2_asserts.json +1 -0
  206. data/scarpe-components/test/test_components.rb +9 -0
  207. data/scarpe-components/test/test_dimensions.rb +26 -0
  208. data/scarpe-components/test/test_helper.rb +43 -0
  209. data/scarpe-components/test/test_html.rb +65 -0
  210. data/scarpe-components/test/test_minitest_result.rb +61 -0
  211. data/scarpe-components/test/test_promises.rb +261 -0
  212. data/scarpe-components/test/test_segmented_app_files.rb +184 -0
  213. data/scarpegen.rb +14 -14
  214. data/sig/scarpe.rbs +1 -1
  215. data/{lib/scarpe → spikes}/glibui/widget.rb +2 -2
  216. data/{lib/scarpe → spikes}/glibui.rb +1 -1
  217. data/templates/basic_class_template.erb +13 -14
  218. data/templates/class_template_with_event_bind.erb +4 -4
  219. data/templates/class_template_with_shapes.erb +8 -17
  220. data/templates/example_template.erb +1 -1
  221. data/templates/module_template.erb +4 -4
  222. data/templates/webview_template.erb +3 -5
  223. metadata +236 -145
  224. data/examples/fill.rb +0 -25
  225. data/examples/legacy/not_checked/shoes-contrib/basic/class-book.yaml +0 -387
  226. data/examples/legacy/not_checked/shoes-contrib/elements/image-icon.rb +0 -3
  227. data/examples/legacy/not_checked/shoes-contrib/good/good-clock.rb +0 -51
  228. data/examples/legacy/not_checked/shoes-contrib/good/good-follow.rb +0 -26
  229. data/examples/legacy/not_checked/shoes-contrib/good/good-reminder.rb +0 -174
  230. data/examples/legacy/not_checked/shoes-contrib/good/good-vjot.rb +0 -56
  231. data/examples/legacy/not_checked/shoes-contrib/simple/simple-timer.rb +0 -13
  232. data/examples/legacy/not_checked/shoes-dep-samples/good-clock.rb +0 -51
  233. data/examples/legacy/not_checked/shoes-dep-samples/good-follow.rb +0 -26
  234. data/examples/legacy/not_checked/shoes-dep-samples/good-reminder.rb +0 -174
  235. data/examples/legacy/not_checked/shoes-dep-samples/good-vjot.rb +0 -56
  236. data/examples/legacy/not_checked/shoes-dep-samples/simple-accordion.rb +0 -75
  237. data/examples/legacy/not_checked/shoes-dep-samples/simple-anim-shapes.rb +0 -17
  238. data/examples/legacy/not_checked/shoes-dep-samples/simple-anim-text.rb +0 -13
  239. data/examples/legacy/not_checked/shoes-dep-samples/simple-arc.rb +0 -23
  240. data/examples/legacy/not_checked/shoes-dep-samples/simple-bounce.rb +0 -24
  241. data/examples/legacy/not_checked/shoes-dep-samples/simple-calc.rb +0 -70
  242. data/examples/legacy/not_checked/shoes-dep-samples/simple-chipmunk.rb +0 -26
  243. data/examples/legacy/not_checked/shoes-dep-samples/simple-control-sizes.rb +0 -24
  244. data/examples/legacy/not_checked/shoes-dep-samples/simple-curve.rb +0 -26
  245. data/examples/legacy/not_checked/shoes-dep-samples/simple-dialogs.rb +0 -29
  246. data/examples/legacy/not_checked/shoes-dep-samples/simple-draw.rb +0 -13
  247. data/examples/legacy/not_checked/shoes-dep-samples/simple-editor.rb +0 -28
  248. data/examples/legacy/not_checked/shoes-dep-samples/simple-form.rb +0 -28
  249. data/examples/legacy/not_checked/shoes-dep-samples/simple-form.shy +0 -0
  250. data/examples/legacy/not_checked/shoes-dep-samples/simple-mask.rb +0 -21
  251. data/examples/legacy/not_checked/shoes-dep-samples/simple-menu.rb +0 -31
  252. data/examples/legacy/not_checked/shoes-dep-samples/simple-menu1.rb +0 -35
  253. data/examples/legacy/not_checked/shoes-dep-samples/simple-rubygems.rb +0 -29
  254. data/examples/legacy/not_checked/shoes-dep-samples/simple-slide.rb +0 -45
  255. data/examples/legacy/not_checked/shoes-dep-samples/simple-sphere.rb +0 -28
  256. data/examples/legacy/not_checked/shoes-dep-samples/simple-sqlite3.rb +0 -13
  257. data/examples/legacy/not_checked/shoes-dep-samples/simple-timer.rb +0 -13
  258. data/examples/legacy/not_checked/shoes-dep-samples/simple-video.rb +0 -13
  259. data/examples/legacy/not_checked/simple/anim-text.rb +0 -13
  260. data/examples/legacy/not_checked/simple/arc.rb +0 -23
  261. data/examples/legacy/not_checked/simple/bounce.rb +0 -24
  262. data/examples/legacy/not_checked/simple/chipmunk.rb +0 -26
  263. data/examples/legacy/not_checked/simple/curve.rb +0 -26
  264. data/examples/legacy/not_checked/simple/dialogs.rb +0 -29
  265. data/examples/legacy/not_checked/simple/downloader.rb +0 -40
  266. data/examples/legacy/not_checked/simple/draw.rb +0 -13
  267. data/examples/legacy/not_checked/simple/mask.rb +0 -21
  268. data/examples/legacy/not_checked/simple/slide.rb +0 -45
  269. data/examples/legacy/not_checked/simple/sphere.rb +0 -28
  270. data/lib/constants.rb +0 -5
  271. data/lib/scarpe/alert.rb +0 -19
  272. data/lib/scarpe/app.rb +0 -78
  273. data/lib/scarpe/arc.rb +0 -49
  274. data/lib/scarpe/button.rb +0 -35
  275. data/lib/scarpe/document_root.rb +0 -20
  276. data/lib/scarpe/edit_box.rb +0 -24
  277. data/lib/scarpe/fill.rb +0 -23
  278. data/lib/scarpe/flow.rb +0 -19
  279. data/lib/scarpe/line.rb +0 -25
  280. data/lib/scarpe/link.rb +0 -25
  281. data/lib/scarpe/list_box.rb +0 -25
  282. data/lib/scarpe/logger.rb +0 -155
  283. data/lib/scarpe/para.rb +0 -90
  284. data/lib/scarpe/shape.rb +0 -19
  285. data/lib/scarpe/spacing.rb +0 -9
  286. data/lib/scarpe/stack.rb +0 -70
  287. data/lib/scarpe/star.rb +0 -47
  288. data/lib/scarpe/text_widget.rb +0 -42
  289. data/lib/scarpe/unit_test_helpers.rb +0 -163
  290. data/lib/scarpe/widget.rb +0 -198
  291. data/lib/scarpe/widgets.rb +0 -30
  292. data/lib/scarpe/wv/alert.rb +0 -65
  293. data/lib/scarpe/wv/background.rb +0 -18
  294. data/lib/scarpe/wv/border.rb +0 -22
  295. data/lib/scarpe/wv/control_interface_test.rb +0 -253
  296. data/lib/scarpe/wv/dimensions.rb +0 -22
  297. data/lib/scarpe/wv/fill.rb +0 -30
  298. data/lib/scarpe/wv/html.rb +0 -107
  299. data/lib/scarpe/wv/shape_helper.rb +0 -44
  300. data/lib/scarpe/wv/spacing.rb +0 -41
  301. data/lib/scarpe/wv/text_widget.rb +0 -30
  302. data/lib/scarpe/wv/widget.rb +0 -181
  303. data/scarpe-0.2.0.gem +0 -0
  304. /data/examples/legacy/not_checked/{expert → shoes-contrib/basic}/definr.rb +0 -0
  305. /data/examples/legacy/not_checked/{expert → shoes-contrib/basic}/funnies.rb +0 -0
  306. /data/examples/legacy/not_checked/shoes-contrib/{elements → basic}/list_box-select-class.rb +0 -0
  307. /data/examples/legacy/{not_checked/shoes-contrib/basic → working/simple}/basic-edit-box.rb +0 -0
  308. /data/examples/legacy/{not_checked/shoes-contrib/elements → working/simple}/basic-fps.rb +0 -0
  309. /data/examples/legacy/{not_checked/shoes-contrib/elements → working/simple}/border-cat.rb +0 -0
  310. /data/examples/legacy/{not_checked/shoes-contrib/elements → working/simple}/check-mate.rb +0 -0
  311. /data/examples/legacy/{not_checked/shoes-contrib/manipulation → working/simple}/clear-slot.rb +0 -0
  312. /data/examples/legacy/{not_checked/shoes-contrib/basic → working/simple}/clock.rb +0 -0
  313. /data/examples/legacy/{not_checked/shoes-contrib/basic → working/simple}/gradient-shoes.rb +0 -0
  314. /data/examples/legacy/{not_checked/shoes-contrib/basic → working/simple}/list_box-shape-report.rb +0 -0
  315. /data/examples/legacy/{not_checked/shoes-contrib/elements → working/simple}/list_box.rb +0 -0
  316. /data/examples/legacy/{not_checked/shoes-contrib/elements → working/simple}/phat-button.rb +0 -0
  317. /data/examples/legacy/{not_checked/shoes-contrib → working}/simple/simple-calc.rb +0 -0
  318. /data/examples/legacy/{not_checked/shoes-contrib/position → working/simple}/stack-width.rb +0 -0
  319. /data/examples/legacy/{not_checked/shoes-contrib/elements → working/simple}/width-introspec.rb +0 -0
  320. /data/{lib/scarpe → spikes}/glibui/README.md +0 -0
  321. /data/{lib/scarpe → spikes}/glibui/alert.rb +0 -0
  322. /data/{lib/scarpe → spikes}/glibui/app.rb +0 -0
  323. /data/{lib/scarpe → spikes}/glibui/background.rb +0 -0
  324. /data/{lib/scarpe → spikes}/glibui/border.rb +0 -0
  325. /data/{lib/scarpe → spikes}/glibui/button.rb +0 -0
  326. /data/{lib/scarpe → spikes}/glibui/dimensions.rb +0 -0
  327. /data/{lib/scarpe → spikes}/glibui/document_root.rb +0 -0
  328. /data/{lib/scarpe → spikes}/glibui/edit_box.rb +0 -0
  329. /data/{lib/scarpe → spikes}/glibui/edit_line.rb +0 -0
  330. /data/{lib/scarpe → spikes}/glibui/flow.rb +0 -0
  331. /data/{lib/scarpe → spikes}/glibui/html.rb +0 -0
  332. /data/{lib/scarpe → spikes}/glibui/image.rb +0 -0
  333. /data/{lib/scarpe → spikes}/glibui/link.rb +0 -0
  334. /data/{lib/scarpe → spikes}/glibui/local_display.rb +0 -0
  335. /data/{lib/scarpe → spikes}/glibui/para.rb +0 -0
  336. /data/{lib/scarpe → spikes}/glibui/spacing.rb +0 -0
  337. /data/{lib/scarpe → spikes}/glibui/stack.rb +0 -0
  338. /data/{lib/scarpe → spikes}/glibui/text_widget.rb +0 -0
  339. /data/{lib/scarpe → spikes}/libui/alert.rb +0 -0
  340. /data/{lib/scarpe → spikes}/libui/button.rb +0 -0
  341. /data/{lib/scarpe → spikes}/libui/colors.rb +0 -0
  342. /data/{lib/scarpe → spikes}/libui/core.rb +0 -0
  343. /data/{lib/scarpe → spikes}/libui/flow.rb +0 -0
  344. /data/{lib/scarpe → spikes}/libui/libui.rb +0 -0
  345. /data/{lib/scarpe → spikes}/libui/notepad.md +0 -0
  346. /data/{lib/scarpe → spikes}/libui/para.rb +0 -0
  347. /data/{lib/scarpe → spikes}/libui/stack.rb +0 -0
@@ -0,0 +1,35 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Scarpe::Components::Calzini
4
+ # para_element is a bit of a hard one, since it does not-entirely-trivial
5
+ # mapping between display objects and IDs. But we don't want Calzini
6
+ # messing with the display service or display objects.
7
+ def para_element(props, &block)
8
+ HTML.render do |h|
9
+ h.p(**para_options(props), &block)
10
+ end
11
+ end
12
+
13
+ private
14
+
15
+ def para_options(props)
16
+ (props["html_attributes"] || {}).merge(id: html_id, style: para_style(props))
17
+ end
18
+
19
+ def para_style(props)
20
+ drawable_style(props).merge({
21
+ color: rgb_to_hex(props["stroke"]),
22
+ "font-size": para_font_size(props),
23
+ "font-family": props["font"],
24
+ }.compact)
25
+ end
26
+
27
+ def para_font_size(props)
28
+ return nil unless props["size"]
29
+
30
+ sz = props["size"].to_s
31
+ font_size = SIZES[sz.to_sym] || sz.to_i
32
+
33
+ dimensions_length(font_size)
34
+ end
35
+ end
@@ -0,0 +1,155 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Scarpe::Components::Calzini
4
+ def slot_element(props, &block)
5
+ HTML.render do |h|
6
+ h.div((props["html_attributes"] || {}).merge(id: html_id, style: slot_style(props)), &block)
7
+ end
8
+ end
9
+
10
+ def flow_element(props, &block)
11
+ HTML.render do |h|
12
+ h.div((props["html_attributes"] || {}).merge(id: html_id, style: flow_style(props)), &block)
13
+ end
14
+ end
15
+
16
+ def stack_element(props, &block)
17
+ HTML.render do |h|
18
+ h.div((props["html_attributes"] || {}).merge(id: html_id, style: stack_style(props)), &block)
19
+ end
20
+ end
21
+
22
+ def documentroot_element(props, &block)
23
+ HTML.render do |h|
24
+ # DocumentRoot rendering intentionally uses flow styles.
25
+ h.div((props["html_attributes"] || {}).merge(id: html_id, style: flow_style(props)), &block)
26
+ end
27
+ end
28
+
29
+ private
30
+
31
+ def slot_style(props)
32
+ styles = drawable_style(props)
33
+ styles = background_style(props, styles)
34
+ styles = border_style(props, styles)
35
+ styles = spacing_styles_for_attr("margin", props, styles)
36
+ styles = spacing_styles_for_attr("padding", props, styles)
37
+
38
+ styles[:width] = dimensions_length(props["width"]) if props["width"]
39
+ styles[:height] = dimensions_length(props["height"]) if props["height"]
40
+
41
+ styles
42
+ end
43
+
44
+ def flow_style(props)
45
+ {
46
+ display: "flex",
47
+ "flex-direction": "row",
48
+ "flex-wrap": "wrap",
49
+ "align-content": "flex-start",
50
+ "justify-content": "flex-start",
51
+ "align-items": "flex-start",
52
+ }.merge(slot_style(props))
53
+ end
54
+
55
+ def stack_style(props)
56
+ {
57
+ display: "flex",
58
+ "flex-direction": "column",
59
+ "align-content": "flex-start",
60
+ "justify-content": "flex-start",
61
+ "align-items": "flex-start",
62
+ overflow: props["scroll"] ? "auto" : nil,
63
+ }.compact.merge(slot_style(props))
64
+ end
65
+
66
+ def border_style(props, styles)
67
+ bc = props["border_color"]
68
+ return styles unless bc
69
+
70
+ opts = props["options"] || {}
71
+
72
+ border_style_hash = case bc
73
+ when Range
74
+ { "border-image": "linear-gradient(45deg, #{bc.first}, #{bc.last})" }
75
+ when Array
76
+ { "border-color": "rgba(#{bc.join(", ")})" }
77
+ else
78
+ { "border-color": bc }
79
+ end
80
+ styles.merge(
81
+ "border-style": "solid",
82
+ "border-width": "#{opts["strokewidth"] || 1}px",
83
+ "border-radius": "#{opts["curve"] || 0}px",
84
+ ).merge(border_style_hash)
85
+ end
86
+
87
+ def background_style(props, styles)
88
+ bc = props["background_color"]
89
+ return styles unless bc
90
+
91
+ color = case bc
92
+ when Array
93
+ "rgba(#{bc.join(", ")})"
94
+ when Range
95
+ "linear-gradient(45deg, #{bc.first}, #{bc.last})"
96
+ when ->(value) { File.exist?(value) }
97
+ "url(data:image/png;base64,#{encode_file_to_base64(bc)})"
98
+ else
99
+ bc
100
+ end
101
+
102
+ styles.merge(background: color)
103
+ end
104
+
105
+ SPACING_DIRECTIONS = [:left, :right, :top, :bottom]
106
+
107
+ # We extract the appropriate margin and padding from the margin and
108
+ # padding properties. If there are no margin or padding properties,
109
+ # we fall back to props["options"] margin or padding, if it exists.
110
+ #
111
+ # Margin or padding (in either props or props["options"]) can be
112
+ # a Hash with directions as keys, or an Array of left/right/top/bottom,
113
+ # or a constant, which means all four are that constant. You can
114
+ # also specify a "margin" plus "margin-top" which is constant but
115
+ # margin-top is overridden, or similar.
116
+ #
117
+ # If any margin or padding property exists in props then we don't
118
+ # check props["options"].
119
+ def spacing_styles_for_attr(attr, props, styles, with_options: true)
120
+ spacing_styles = {}
121
+
122
+ case props[attr]
123
+ when Hash
124
+ props[attr].each do |dir, value|
125
+ spacing_styles[:"#{attr}-#{dir}"] = dimensions_length value
126
+ end
127
+ when Array
128
+ SPACING_DIRECTIONS.zip(props[attr]).to_h.compact.each do |dir, value|
129
+ spacing_styles[:"#{attr}-#{dir}"] = dimensions_length(value)
130
+ end
131
+ when String, Numeric
132
+ spacing_styles[attr.to_sym] = dimensions_length(props[attr])
133
+ end
134
+
135
+ SPACING_DIRECTIONS.each do |dir|
136
+ if props["#{attr}_#{dir}"]
137
+ spacing_styles[:"#{attr}-#{dir}"] = dimensions_length props["#{attr}_#{dir}"]
138
+ end
139
+ end
140
+
141
+ unless spacing_styles.empty?
142
+ return styles.merge(spacing_styles)
143
+ end
144
+
145
+ # We should see if there are spacing properties in props["options"],
146
+ # unless we're currently doing that.
147
+ if with_options && props["options"]
148
+ spacing_styles = spacing_styles_for_attr(attr, props["options"], {}, with_options: false)
149
+ styles.merge spacing_styles
150
+ else
151
+ # No "options" or we already checked it? Return the styles we were given.
152
+ styles
153
+ end
154
+ end
155
+ end
@@ -0,0 +1,65 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Scarpe::Components::Calzini
4
+ def link_element(props)
5
+ HTML.render do |h|
6
+ h.a(**link_attributes(props)) do
7
+ props["text"]
8
+ end
9
+ end
10
+ end
11
+
12
+ def span_element(props, &block)
13
+ HTML.render do |h|
14
+ h.span(**span_options(props), &block)
15
+ end
16
+ end
17
+
18
+ def code_element(props, &block)
19
+ HTML.render do |h|
20
+ h.code(&block)
21
+ end
22
+ end
23
+
24
+ def em_element(props, &block)
25
+ HTML.render do |h|
26
+ h.em(&block)
27
+ end
28
+ end
29
+
30
+ def strong_element(props, &block)
31
+ HTML.render do |h|
32
+ h.strong(&block)
33
+ end
34
+ end
35
+
36
+ private
37
+
38
+ def link_attributes(props)
39
+ {
40
+ id: html_id,
41
+ href: props["click"],
42
+ onclick: (handler_js_code("click") if props["has_block"]),
43
+ style: drawable_style(props),
44
+ }.compact
45
+ end
46
+
47
+ def span_style(props)
48
+ {
49
+ color: props["stroke"],
50
+ "font-size": span_font_size(props),
51
+ "font-family": props["font"],
52
+ }.compact
53
+ end
54
+
55
+ def span_options(props)
56
+ (props["html_attributes"] || {}).merge(id: html_id, style: span_style(props))
57
+ end
58
+
59
+ def span_font_size(props)
60
+ sz = props["size"]
61
+ font_size = SIZES.key?(sz.to_s.to_sym) ? SIZES[sz.to_s.to_sym] : sz
62
+
63
+ dimensions_length(font_size)
64
+ end
65
+ end
@@ -0,0 +1,149 @@
1
+ # frozen_string_literal: true
2
+
3
+ require_relative "html"
4
+ require_relative "base64"
5
+ require_relative "errors"
6
+
7
+ # Require all drawable rendering code under calzini directory
8
+ Dir.glob("calzini/*.rb", base: __dir__) do |drawable|
9
+ require_relative drawable
10
+ end
11
+
12
+ # The Calzini module expects to be included by a class defining
13
+ # the following methods:
14
+ #
15
+ # * html_id - the HTML ID for the specific rendered DOM object
16
+ # * handler_js_code(event_name) - the JS handler code for this DOM object and event name
17
+ # * (optional) shoes_styles - the Shoes styles for this object, unless overridden in render()
18
+ module Scarpe::Components::Calzini
19
+ extend self
20
+
21
+ HTML = Scarpe::Components::HTML
22
+ include Scarpe::Components::Base64
23
+
24
+ SIZES = {
25
+ inscription: 10,
26
+ ins: 10,
27
+ para: 12,
28
+ caption: 14,
29
+ tagline: 18,
30
+ subtitle: 26,
31
+ title: 34,
32
+ banner: 48,
33
+ }.freeze
34
+ private_constant :SIZES
35
+
36
+ # Render the Shoes drawable of type `drawable_name` with
37
+ # the given properties to HTML and return it. If the
38
+ # drawable type takes a block (e.g. Stack or Flow) then
39
+ # the block will be properly rendered.
40
+ #
41
+ # @param drawable_name [String] the drawable name like "alert", "button" or "rect"
42
+ # @param properties [Hash] a drawable-specific hash of property names to values
43
+ # @block the block which, when called, will return the contents for drawable types with contents
44
+ # @return [String] the rendered HTML
45
+ def render(drawable_name, properties = shoes_styles, &block)
46
+ send("#{drawable_name}_element", properties, &block)
47
+ end
48
+
49
+ # Return HTML for an empty page element, to be filled with HTML
50
+ # renderings of the DOM tree.
51
+ #
52
+ # The wrapper-wvroot element is where Scarpe will fill in the
53
+ # DOM element.
54
+ #
55
+ # @return [String] the rendered HTML for the empty page object.
56
+ def empty_page_element
57
+ <<~HTML
58
+ <html>
59
+ <head id='head-wvroot'>
60
+ <style id='style-wvroot'>
61
+ /** Style resets **/
62
+ body {
63
+ font-family: arial, Helvetica, sans-serif;
64
+ margin: 0;
65
+ height: 100%;
66
+ overflow: hidden;
67
+ }
68
+ p {
69
+ margin: 0;
70
+ }
71
+ </style>
72
+ </head>
73
+ <body id='body-wvroot'>
74
+ <div id='wrapper-wvroot'></div>
75
+ </body>
76
+ </html>
77
+ HTML
78
+ end
79
+
80
+ def text_size(sz)
81
+ case sz
82
+ when Numeric
83
+ sz
84
+ when Symbol
85
+ SIZES[sz]
86
+ when String
87
+ SIZES[sz.to_sym] || sz.to_i
88
+ else
89
+ raise "Unexpected text size object: #{sz.inspect}"
90
+ end
91
+ end
92
+
93
+ def dimensions_length(value)
94
+ case value
95
+ when Integer
96
+ if value < 0
97
+ "calc(100% - #{value.abs}px)"
98
+ else
99
+ "#{value}px"
100
+ end
101
+ when Float
102
+ "#{value * 100}%"
103
+ else
104
+ value
105
+ end
106
+ end
107
+
108
+ def drawable_style(props)
109
+ styles = {}
110
+ if props["hidden"]
111
+ styles[:display] = "none"
112
+ end
113
+ styles
114
+ end
115
+
116
+ # Convert an [r, g, b, a] array to an HTML hex color code
117
+ # Arrays support alpha. HTML hex does not. So premultiply.
118
+ def rgb_to_hex(color)
119
+ return color if color.nil?
120
+
121
+ r, g, b, a = *color
122
+ if r.is_a?(Float)
123
+ a ||= 1.0
124
+ r_float = r * a
125
+ g_float = g * a
126
+ b_float = b * a
127
+ else
128
+ a ||= 255
129
+ a_float = (a / 255.0)
130
+ r_float = (r.to_f / 255.0) * a_float
131
+ g_float = (g.to_f / 255.0) * a_float
132
+ b_float = (b.to_f / 255.0) * a_float
133
+ end
134
+
135
+ r_int = (r_float * 255.0).to_i.clamp(0, 255)
136
+ g_int = (g_float * 255.0).to_i.clamp(0, 255)
137
+ b_int = (b_float * 255.0).to_i.clamp(0, 255)
138
+
139
+ "#%0.2X%0.2X%0.2X" % [r_int, g_int, b_int]
140
+ end
141
+
142
+ def degrees_to_radians(degrees)
143
+ degrees * Math::PI / 180
144
+ end
145
+
146
+ def radians_to_degrees(radians)
147
+ radians * (180.0 / Math::PI)
148
+ end
149
+ end
@@ -0,0 +1,20 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Also defined in scarpe_core
4
+ class Scarpe::Error < StandardError; end
5
+
6
+ module Scarpe
7
+ class InternalError < Scarpe::Error; end
8
+
9
+ class FileContentError < Scarpe::Error; end
10
+
11
+ class NoOperationError < Scarpe::Error; end
12
+
13
+ class DuplicateFileError < Scarpe::Error; end
14
+
15
+ class NoSuchFile < Scarpe::Error; end
16
+
17
+ class MustOverrideMethod < Scarpe::Error; end
18
+
19
+ class InvalidHTMLTag < Scarpe::Error; end
20
+ end
@@ -0,0 +1,66 @@
1
+ # frozen_string_literal: true
2
+
3
+ require "tempfile"
4
+
5
+ # These can be used for unit tests, but also more generally.
6
+
7
+ module Scarpe; module Components; end; end
8
+ module Scarpe::Components::FileHelpers
9
+ # Create a temporary file with the given prefix and contents.
10
+ # Execute the block of code with it in place. Make sure
11
+ # it gets cleaned up afterward.
12
+ #
13
+ # @param prefix [String] the prefix passed to Tempfile to identify this file on disk
14
+ # @param contents [String] the file contents that should be written to Tempfile
15
+ # @param dir [String] the directory to create the tempfile in
16
+ # @yield The code to execute with the tempfile present
17
+ # @yieldparam the path of the new tempfile
18
+ def with_tempfile(prefix, contents, dir: Dir.tmpdir)
19
+ t = Tempfile.new(prefix, dir)
20
+ t.write(contents)
21
+ t.flush # Make sure the contents are written out
22
+
23
+ yield(t.path)
24
+ ensure
25
+ t.close
26
+ t.unlink
27
+ end
28
+
29
+ # Create multiple tempfiles, with given contents, in given
30
+ # directories, and execute the block in that context.
31
+ # When the block is finished, make sure all tempfiles are
32
+ # deleted.
33
+ #
34
+ # Pass an array of arrays, where each array is of the form:
35
+ # [prefix, contents, (optional)dir]
36
+ #
37
+ # I don't love inlining with_tempfile's contents into here.
38
+ # But calling it iteratively or recursively was difficult
39
+ # when I tried it the obvious ways.
40
+ #
41
+ # This method should be equivalent to calling with_tempfile
42
+ # once for each entry in the array, in a set of nested
43
+ # blocks.
44
+ #
45
+ # @param tf_specs [Array<Array>] The array of tempfile prefixes, contents and directories
46
+ # @yield The code to execute with those tempfiles present
47
+ # @yieldparam An array of paths to tempfiles, in the same order as tf_specs
48
+ def with_tempfiles(tf_specs, &block)
49
+ tempfiles = []
50
+ tf_specs.each do |prefix, contents, dir|
51
+ dir ||= Dir.tmpdir
52
+ t = Tempfile.new(prefix, dir)
53
+ tempfiles << t
54
+ t.write(contents)
55
+ t.flush # Make sure the contents are written out
56
+ end
57
+
58
+ args = tempfiles.map(&:path)
59
+ yield(args)
60
+ ensure
61
+ tempfiles.each do |t|
62
+ t.close
63
+ t.unlink
64
+ end
65
+ end
66
+ end
@@ -0,0 +1,131 @@
1
+ # frozen_string_literal: true
2
+
3
+ class Scarpe::Components::HTML
4
+ CONTENT_TAGS = [
5
+ :div,
6
+ :p,
7
+ :button,
8
+ :ul,
9
+ :li,
10
+ :textarea,
11
+ :a,
12
+ :video,
13
+ :strong,
14
+ :style,
15
+ :progress,
16
+ :em,
17
+ :code,
18
+ :defs,
19
+ :marker,
20
+ :u,
21
+ :line,
22
+ :span,
23
+ :svg,
24
+ :h1,
25
+ :h2,
26
+ :h3,
27
+ :h4,
28
+ :h5,
29
+ ].freeze
30
+ VOID_TAGS = [:input, :img, :polygon, :source, :link, :path, :rect].freeze
31
+
32
+ TAGS = (CONTENT_TAGS + VOID_TAGS).freeze
33
+
34
+ class << self
35
+ def render(&block)
36
+ new(&block).value
37
+ end
38
+ end
39
+
40
+ def initialize(&block)
41
+ @buffer = ""
42
+ block.call(self)
43
+ end
44
+
45
+ def value
46
+ @buffer
47
+ end
48
+
49
+ def respond_to_missing?(name, include_all = false)
50
+ TAGS.include?(name) || super(name, include_all)
51
+ end
52
+
53
+ def p(*args, &block)
54
+ method_missing(:p, *args, &block)
55
+ end
56
+
57
+ def option(**attrs, &block)
58
+ tag(:option, **attrs, &block)
59
+ end
60
+
61
+ def tag(name, **attrs, &block)
62
+ if VOID_TAGS.include?(name)
63
+ raise Shoes::Errors::InvalidAttributeValueError, "void tag #{name} cannot have content" if block_given?
64
+
65
+ @buffer += "<#{name}#{render_attributes(attrs)} />"
66
+ else
67
+ @buffer += "<#{name}#{render_attributes(attrs)}>"
68
+
69
+ if block_given?
70
+ result = block.call(self)
71
+ else
72
+ result = attrs[:content]
73
+ @buffer += result if result.is_a?(String)
74
+ end
75
+ @buffer += result if result.is_a?(String)
76
+
77
+ @buffer += "</#{name}>"
78
+ end
79
+
80
+ nil
81
+ end
82
+
83
+ def select(**attrs, &block)
84
+ tag(:select, **attrs, &block)
85
+ end
86
+
87
+ def method_missing(name, *args, &block)
88
+ raise Scarpe::InvalidHTMLTag, "no method #{name} for #{self.class.name}" unless TAGS.include?(name)
89
+
90
+ if VOID_TAGS.include?(name)
91
+ raise Shoes::Errors::InvalidAttributeValueError, "void tag #{name} cannot have content" if block_given?
92
+
93
+ @buffer += "<#{name}#{render_attributes(*args)} />"
94
+ else
95
+ @buffer += "<#{name}#{render_attributes(*args)}>"
96
+
97
+ if block_given?
98
+ result = block.call(self)
99
+ else
100
+ result = args.first
101
+ @buffer += result if result.is_a?(String)
102
+ end
103
+ @buffer += result if result.is_a?(String)
104
+
105
+ @buffer += "</#{name}>"
106
+ end
107
+
108
+ nil
109
+ end
110
+
111
+ private
112
+
113
+ def render_attributes(attributes = {})
114
+ return "" if attributes.empty?
115
+
116
+ attributes[:style] = render_style(attributes[:style]) if attributes[:style]
117
+ attributes.compact!
118
+
119
+ return if attributes.empty?
120
+
121
+ result = attributes.map { |k, v| "#{k}=\"#{v}\"" }.join(" ")
122
+ " #{result}"
123
+ end
124
+
125
+ def render_style(style)
126
+ return style unless style.is_a?(Hash)
127
+ return if style.empty?
128
+
129
+ style.map { |k, v| "#{k}:#{v}" }.join(";")
130
+ end
131
+ end
@@ -0,0 +1,75 @@
1
+ # frozen_string_literal: true
2
+
3
+ # Have to require this to get DefaultReporter and the Minitest::Reporters namespace.
4
+ ENV["MINITEST_REPORTER"] = "ShoesExportReporter"
5
+ require "minitest/reporters"
6
+ require "json"
7
+ require "json/add/exception"
8
+
9
+ module Minitest
10
+ module Reporters
11
+ # To use this Scarpe component, you'll need minitest-reporters in your Gemfile,
12
+ # probably in the "test" group. You'll need to require and activate ShoesExportReporter
13
+ # to register it as Minitest's reporter:
14
+ #
15
+ # require "scarpe/components/minitest_export_reporter"
16
+ # Minitest::Reporters::ShoesExportReporter.activate!
17
+ #
18
+ # Select a destination to export JSON test results to:
19
+ #
20
+ # export SHOES_MINITEST_EXPORT_FILE=/tmp/shoes_test_export.json
21
+ #
22
+ # This class overrides the MINITEST_REPORTER environment variable when you call activate.
23
+ # If MINITEST_REPORTER isn't set then when you run via Vim, TextMate, RubyMine, etc,
24
+ # the reporter will be automatically overridden and print to console instead.
25
+ #
26
+ # Based on https://gist.github.com/davidwessman/09a13840a8a80080e3842ac3051714c7
27
+ class ShoesExportReporter < DefaultReporter
28
+ def self.activate!
29
+ unless ENV["SHOES_MINITEST_EXPORT_FILE"]
30
+ raise "ShoesExportReporter is available, but no export file was specified! Set SHOES_MINITEST_EXPORT_FILE!"
31
+ end
32
+
33
+ Minitest::Reporters.use!
34
+ end
35
+
36
+ def serialize_failures(failures)
37
+ failures.map do |fail|
38
+ case fail
39
+ when Minitest::UnexpectedError
40
+ ["unexpected", fail.to_json, fail.error.to_json]
41
+ when Exception
42
+ ["exception", fail.to_json]
43
+ else
44
+ raise "Not sure how to serialize failure object! #{fail.inspect}"
45
+ end
46
+ end
47
+ end
48
+
49
+ def report
50
+ super
51
+
52
+ results = tests.map do |result|
53
+ failures = serialize_failures result.failures
54
+ {
55
+ name: result.name,
56
+ klass: test_class(result),
57
+ assertions: result.assertions,
58
+ failures: failures,
59
+ time: result.time,
60
+ metadata: result.respond_to?(:metadata) ? result.metadata : {},
61
+ source_location: begin
62
+ result.source_location
63
+ rescue
64
+ ["unknown", -1]
65
+ end,
66
+ }
67
+ end
68
+
69
+ out_file = File.expand_path ENV["SHOES_MINITEST_EXPORT_FILE"]
70
+ puts "Writing Minitest results to #{out_file.inspect}."
71
+ File.write(out_file, JSON.dump(results))
72
+ end
73
+ end
74
+ end
75
+ end