spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (413) hide show
  1. data/Gemfile +40 -35
  2. data/LICENSE +20 -0
  3. data/Rakefile +39 -42
  4. data/Readme.markdown +155 -0
  5. data/application/css/definitions.scss +3 -0
  6. data/application/css/editing.scss +9 -4
  7. data/application/css/min/565d4c25e82148acb01c45c8d675b37a08676d77.css +1 -0
  8. data/application/css/min/84dbe894ea96eafd321c30823d630817bfc4b03b.css +1 -0
  9. data/application/css/min/d1b54ff4847c613618267ca1c15658e2aee0a4e5.css +1 -0
  10. data/application/css/v2.scss +144 -50
  11. data/application/js/add_alias_dialogue.js +18 -8
  12. data/application/js/ajax.js +1 -1
  13. data/application/js/authentication.js +8 -1
  14. data/application/js/box.js +37 -7
  15. data/application/js/box_container.js +1 -1
  16. data/application/js/compatibility.js +7 -0
  17. data/application/js/content.js +7 -0
  18. data/application/js/content_area.js +4 -0
  19. data/application/js/edit_panel.js +44 -18
  20. data/application/js/editing.js +12 -0
  21. data/application/js/event_source.js +17 -0
  22. data/application/js/extensions.js +2 -0
  23. data/application/js/field_types/file_field.js +2 -1
  24. data/application/js/field_types/image_field.js +35 -48
  25. data/application/js/field_types/long_string_field.js +12 -0
  26. data/application/js/field_types/markdown_field.js +2 -5
  27. data/application/js/field_types/string_field.js +5 -1
  28. data/application/js/field_types/webvideo_field.js +15 -0
  29. data/application/js/init.js +1 -0
  30. data/application/js/location.js +30 -19
  31. data/application/js/login.js +1 -2
  32. data/application/js/min/2a0c2962537a3181fedfff5c92596ba6d3122dc9.js +3 -0
  33. data/application/js/min/4cf1c493d3379ecba5287758c61238034c0893f9.js +2 -0
  34. data/application/js/min/78ac6b99d96750bb6b9f9aad4cb9cd91cd03f391.js +3 -0
  35. data/application/js/min/c8efb9b9f7c3f6613fcebc6be60f605b6570a382.js +90 -0
  36. data/application/js/page.js +1 -0
  37. data/application/js/page_entry.js +6 -40
  38. data/application/js/preview.js +2 -3
  39. data/application/js/top_bar.js +76 -31
  40. data/application/js/upload.js +5 -2
  41. data/application/js/upload_manager.js +2 -81
  42. data/application/js/vendor/jquery-1.7.1.min.js +4 -0
  43. data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +791 -0
  44. data/application/js/views.js +3 -3
  45. data/application/js/views/box_view.js +164 -83
  46. data/application/js/views/page_piece_view.js +2 -2
  47. data/application/js/views/page_view.js +46 -15
  48. data/application/js/views/piece_view.js +29 -8
  49. data/application/static/diagonal-texture.png +0 -0
  50. data/application/static/item-buttons-highlight.png +0 -0
  51. data/application/static/plus-box.png +0 -0
  52. data/application/static/plus_alt.svg +8 -0
  53. data/application/static/slot-up-arrow.png +0 -0
  54. data/application/views/{index.erubis → index.erb} +9 -5
  55. data/application/views/{login.erubis → login.erb} +14 -10
  56. data/application/views/schema_modification_error.html.erb +18 -6
  57. data/application/views/{unsupported.erubis → unsupported.erb} +0 -0
  58. data/bin/spot +15 -2
  59. data/db/migrations/20100610142136_init.rb +2 -2
  60. data/db/migrations/20101130104334_timestamps.rb +2 -2
  61. data/db/migrations/20110209152710_users_and_groups.rb +11 -11
  62. data/db/migrations/20120106171423_visibility_path.rb +19 -0
  63. data/db/migrations/20120107124541_owner_id.rb +19 -0
  64. data/docs/recipe-interface-screenshot.png +0 -0
  65. data/lib/cutaneous.rb +11 -10
  66. data/lib/cutaneous/context_helper.rb +119 -14
  67. data/lib/cutaneous/preview_context.rb +4 -3
  68. data/lib/cutaneous/preview_renderer.rb +1 -6
  69. data/lib/cutaneous/publish_context.rb +1 -0
  70. data/lib/cutaneous/{first_pass_renderer.rb → publish_renderer.rb} +2 -6
  71. data/lib/cutaneous/publish_template.rb +62 -0
  72. data/lib/cutaneous/publish_token_parser.rb +8 -0
  73. data/lib/cutaneous/renderer.rb +4 -2
  74. data/lib/cutaneous/request_context.rb +1 -0
  75. data/lib/cutaneous/{second_pass_renderer.rb → request_renderer.rb} +2 -5
  76. data/lib/cutaneous/request_template.rb +11 -0
  77. data/lib/cutaneous/request_token_parser.rb +9 -0
  78. data/lib/cutaneous/token_parser.rb +125 -0
  79. data/lib/sequel/plugins/content_table_inheritance.rb +19 -12
  80. data/lib/sequel/plugins/scoped_table_name.rb +45 -0
  81. data/lib/spontaneous.rb +123 -126
  82. data/lib/spontaneous/box.rb +127 -47
  83. data/lib/spontaneous/box_style.rb +39 -22
  84. data/lib/spontaneous/change.rb +2 -2
  85. data/lib/spontaneous/cli.rb +1 -0
  86. data/lib/spontaneous/cli/base.rb +12 -4
  87. data/lib/spontaneous/cli/console.rb +72 -0
  88. data/lib/spontaneous/cli/server.rb +36 -12
  89. data/lib/spontaneous/cli/site.rb +175 -1
  90. data/lib/spontaneous/collections/box_set.rb +19 -1
  91. data/lib/spontaneous/collections/entry_set.rb +70 -22
  92. data/lib/spontaneous/collections/field_set.rb +3 -3
  93. data/lib/spontaneous/collections/prototype_set.rb +28 -0
  94. data/lib/spontaneous/config.rb +14 -5
  95. data/lib/spontaneous/content.rb +23 -24
  96. data/lib/spontaneous/errors.rb +20 -4
  97. data/lib/spontaneous/extensions/array.rb +2 -2
  98. data/lib/spontaneous/extensions/json.rb +1 -1
  99. data/lib/spontaneous/extensions/nil.rb +13 -0
  100. data/lib/spontaneous/facet.rb +61 -7
  101. data/lib/spontaneous/field_types.rb +1 -3
  102. data/lib/spontaneous/field_types/date_field.rb +1 -0
  103. data/lib/spontaneous/field_types/field.rb +32 -15
  104. data/lib/spontaneous/field_types/image_field.rb +138 -69
  105. data/lib/spontaneous/field_types/location_field.rb +59 -0
  106. data/lib/spontaneous/field_types/long_string_field.rb +13 -0
  107. data/lib/spontaneous/field_types/markdown_field.rb +2 -1
  108. data/lib/spontaneous/field_types/string_field.rb +2 -2
  109. data/lib/spontaneous/field_types/webvideo_field.rb +255 -0
  110. data/lib/spontaneous/generators/page/inline.html.cut +1 -1
  111. data/lib/spontaneous/generators/page/page.html.cut.tt +5 -4
  112. data/lib/spontaneous/generators/page/page.rb.tt +1 -5
  113. data/lib/spontaneous/generators/site.rb +1 -0
  114. data/lib/spontaneous/generators/site/.gitignore +2 -0
  115. data/lib/spontaneous/generators/site/Gemfile.tt +3 -5
  116. data/lib/spontaneous/generators/site/config/environment.rb.tt +1 -0
  117. data/lib/spontaneous/generators/site/config/environments/development.rb.tt +3 -1
  118. data/lib/spontaneous/generators/site/config/environments/production.rb.tt +3 -1
  119. data/lib/spontaneous/generators/site/config/indexes.rb.tt +23 -0
  120. data/lib/spontaneous/generators/site/public/css/{site.css → site.scss} +0 -0
  121. data/lib/spontaneous/generators/site/schema/box.rb.tt +5 -0
  122. data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +11 -5
  123. data/lib/spontaneous/image_size.rb +0 -1
  124. data/lib/spontaneous/loader.rb +335 -218
  125. data/lib/spontaneous/logger.rb +7 -2
  126. data/lib/spontaneous/media.rb +64 -59
  127. data/lib/spontaneous/media/file.rb +74 -0
  128. data/lib/spontaneous/page.rb +47 -18
  129. data/lib/spontaneous/page_piece.rb +29 -27
  130. data/lib/spontaneous/paths.rb +0 -1
  131. data/lib/spontaneous/permissions.rb +3 -21
  132. data/lib/spontaneous/permissions/user.rb +5 -1
  133. data/lib/spontaneous/permissions/user_level.rb +6 -7
  134. data/lib/spontaneous/piece.rb +12 -7
  135. data/lib/spontaneous/plugins/aliases.rb +76 -31
  136. data/lib/spontaneous/plugins/allowed_types.rb +36 -37
  137. data/lib/spontaneous/plugins/application/facets.rb +7 -10
  138. data/lib/spontaneous/plugins/application/features.rb +17 -0
  139. data/lib/spontaneous/plugins/application/paths.rb +25 -31
  140. data/lib/spontaneous/plugins/application/render.rb +1 -5
  141. data/lib/spontaneous/plugins/application/serialisation.rb +2 -0
  142. data/lib/spontaneous/plugins/application/state.rb +6 -9
  143. data/lib/spontaneous/plugins/boxes.rb +65 -40
  144. data/lib/spontaneous/plugins/controllers.rb +22 -22
  145. data/lib/spontaneous/plugins/entries.rb +149 -150
  146. data/lib/spontaneous/plugins/entry.rb +50 -35
  147. data/lib/spontaneous/plugins/field/editor_class.rb +13 -0
  148. data/lib/spontaneous/plugins/fields.rb +41 -33
  149. data/lib/spontaneous/plugins/instance_code.rb +9 -9
  150. data/lib/spontaneous/plugins/layouts.rb +31 -35
  151. data/lib/spontaneous/plugins/media.rb +31 -32
  152. data/lib/spontaneous/plugins/page/formats.rb +56 -31
  153. data/lib/spontaneous/plugins/page/request.rb +15 -9
  154. data/lib/spontaneous/plugins/page_search.rb +30 -31
  155. data/lib/spontaneous/plugins/page_tree.rb +59 -12
  156. data/lib/spontaneous/plugins/paths.rb +84 -79
  157. data/lib/spontaneous/plugins/permissions.rb +26 -28
  158. data/lib/spontaneous/plugins/prototypes.rb +42 -37
  159. data/lib/spontaneous/plugins/publishing.rb +50 -94
  160. data/lib/spontaneous/plugins/render.rb +8 -16
  161. data/lib/spontaneous/plugins/schema_hierarchy.rb +20 -21
  162. data/lib/spontaneous/plugins/schema_id.rb +33 -25
  163. data/lib/spontaneous/plugins/schema_title.rb +3 -4
  164. data/lib/spontaneous/plugins/serialisation.rb +32 -35
  165. data/lib/spontaneous/plugins/site/features.rb +32 -0
  166. data/lib/spontaneous/plugins/site/instance.rb +3 -2
  167. data/lib/spontaneous/plugins/site/level.rb +18 -0
  168. data/lib/spontaneous/plugins/site/map.rb +2 -1
  169. data/lib/spontaneous/plugins/site/publishing.rb +56 -59
  170. data/lib/spontaneous/plugins/site/revisions.rb +24 -19
  171. data/lib/spontaneous/plugins/site/schema.rb +33 -0
  172. data/lib/spontaneous/plugins/site/search.rb +43 -0
  173. data/lib/spontaneous/plugins/site/selectors.rb +35 -30
  174. data/lib/spontaneous/plugins/site/storage.rb +63 -0
  175. data/lib/spontaneous/plugins/site_map.rb +23 -25
  176. data/lib/spontaneous/plugins/styles.rb +35 -43
  177. data/lib/spontaneous/plugins/supertype.rb +3 -1
  178. data/lib/spontaneous/plugins/visibility.rb +90 -83
  179. data/lib/spontaneous/prototypes/box_prototype.rb +55 -25
  180. data/lib/spontaneous/prototypes/field_prototype.rb +66 -19
  181. data/lib/spontaneous/prototypes/style_prototype.rb +2 -2
  182. data/lib/spontaneous/publishing.rb +1 -1
  183. data/lib/spontaneous/publishing/immediate.rb +128 -49
  184. data/lib/spontaneous/publishing/simultaneous.rb +70 -0
  185. data/lib/spontaneous/rack.rb +38 -26
  186. data/lib/spontaneous/rack/around_back.rb +3 -23
  187. data/lib/spontaneous/rack/around_preview.rb +3 -8
  188. data/lib/spontaneous/rack/assets.rb +7 -6
  189. data/lib/spontaneous/rack/authentication.rb +21 -0
  190. data/lib/spontaneous/rack/back.rb +310 -331
  191. data/lib/spontaneous/rack/cacheable_file.rb +27 -0
  192. data/lib/spontaneous/rack/cookie_authentication.rb +38 -0
  193. data/lib/spontaneous/rack/css.rb +43 -0
  194. data/lib/spontaneous/rack/event_source.rb +31 -0
  195. data/lib/spontaneous/rack/front.rb +30 -8
  196. data/lib/spontaneous/rack/helpers.rb +31 -0
  197. data/lib/spontaneous/rack/media.rb +22 -21
  198. data/lib/spontaneous/rack/public.rb +2 -1
  199. data/lib/spontaneous/rack/query_authentication.rb +35 -0
  200. data/lib/spontaneous/rack/reloader.rb +6 -3
  201. data/lib/spontaneous/rack/user_helpers.rb +28 -0
  202. data/lib/spontaneous/render.rb +64 -23
  203. data/lib/spontaneous/render/context_base.rb +143 -0
  204. data/lib/spontaneous/render/format.rb +24 -19
  205. data/lib/spontaneous/render/helpers.rb +14 -0
  206. data/lib/spontaneous/render/helpers/html_helper.rb +69 -0
  207. data/lib/spontaneous/render/helpers/script_helper.rb +17 -0
  208. data/lib/spontaneous/render/helpers/stylesheet_helper.rb +16 -0
  209. data/lib/spontaneous/render/preview_context.rb +8 -0
  210. data/lib/spontaneous/render/preview_renderer.rb +6 -0
  211. data/lib/spontaneous/render/publish_context.rb +22 -0
  212. data/lib/spontaneous/render/published_renderer.rb +12 -13
  213. data/lib/spontaneous/render/publishing_renderer.rb +3 -0
  214. data/lib/spontaneous/render/render_cache.rb +26 -0
  215. data/lib/spontaneous/render/renderer.rb +5 -1
  216. data/lib/spontaneous/render/request_context.rb +8 -0
  217. data/lib/spontaneous/schema.rb +56 -24
  218. data/lib/spontaneous/schema/schema_modification.rb +2 -2
  219. data/lib/spontaneous/schema/uid.rb +22 -106
  220. data/lib/spontaneous/schema/uid_map.rb +120 -0
  221. data/lib/spontaneous/search.rb +11 -0
  222. data/lib/spontaneous/search/compound_indexer.rb +26 -0
  223. data/lib/spontaneous/search/database.rb +72 -0
  224. data/lib/spontaneous/search/field.rb +95 -0
  225. data/lib/spontaneous/search/index.rb +184 -0
  226. data/lib/spontaneous/search/results.rb +34 -0
  227. data/lib/spontaneous/server.rb +5 -1
  228. data/lib/spontaneous/site.rb +56 -16
  229. data/lib/spontaneous/storage.rb +22 -0
  230. data/lib/spontaneous/storage/backend.rb +10 -0
  231. data/lib/spontaneous/storage/cloud.rb +104 -0
  232. data/lib/spontaneous/storage/local.rb +52 -0
  233. data/lib/spontaneous/style.rb +27 -9
  234. data/lib/spontaneous/version.rb +1 -1
  235. data/spontaneous.gemspec +719 -0
  236. data/test/disabled/test_slots.rb +1 -1
  237. data/test/experimental/test_cutaneous.rb +309 -0
  238. data/test/experimental/test_features.rb +129 -0
  239. data/test/fixtures/application/views/{index.erubis → index.erb} +0 -0
  240. data/test/fixtures/back/public/css/sass_include.scss +5 -0
  241. data/test/fixtures/back/public/css/sass_template.scss +4 -0
  242. data/test/fixtures/example_application/templates/client_project.html.cut +4 -4
  243. data/test/fixtures/example_application/templates/client_project/images.html.cut +1 -1
  244. data/test/fixtures/example_application/templates/client_projects.html.cut +2 -2
  245. data/test/fixtures/example_application/templates/inline_image.html.cut +1 -1
  246. data/test/fixtures/example_application/templates/layouts/home.html.cut +7 -7
  247. data/test/fixtures/example_application/templates/layouts/info.html.cut +1 -1
  248. data/test/fixtures/example_application/templates/layouts/project.html.cut +4 -4
  249. data/test/fixtures/example_application/templates/layouts/projects.html.cut +2 -2
  250. data/test/fixtures/example_application/templates/project.html.cut +2 -2
  251. data/test/fixtures/example_application/templates/project/inline.html.cut +3 -3
  252. data/test/fixtures/example_application/templates/project_image.html.cut +1 -1
  253. data/test/fixtures/example_application/templates/text.html.cut +1 -1
  254. data/test/fixtures/fields/youtube_api_response.xml +102 -0
  255. data/test/fixtures/layouts/layouts/custom4.html.cut +0 -0
  256. data/test/fixtures/plugins/schema_plugin/public/css/plugin.css +1 -0
  257. data/test/fixtures/plugins/schema_plugin/public/js/plugin.js +1 -0
  258. data/test/fixtures/plugins/schema_plugin/public/static.html +1 -0
  259. data/test/fixtures/plugins/schema_plugin/public/subdir/image.gif +1 -0
  260. data/test/fixtures/plugins/schema_plugin/public/subdir/include1.scss +3 -0
  261. data/test/fixtures/plugins/schema_plugin/public/subdir/sass.scss +4 -0
  262. data/test/fixtures/plugins/schema_plugin/public/subdir/sass/include2.scss +4 -0
  263. data/test/fixtures/public/templates/layouts/default.html.cut +1 -1
  264. data/test/fixtures/public/templates/layouts/default.pdf.cut +1 -1
  265. data/test/fixtures/public/templates/layouts/default.rss.cut +1 -1
  266. data/test/fixtures/public/templates/layouts/dynamic.html.cut +1 -1
  267. data/test/fixtures/schema_modification/config/database.yml +0 -0
  268. data/test/fixtures/schema_modification/config/environment.rb +2 -0
  269. data/test/fixtures/schema_modification/schema/box.rb +1 -0
  270. data/test/fixtures/schema_modification/schema/custom_box.rb +1 -0
  271. data/test/fixtures/schema_modification/schema/page.rb +6 -0
  272. data/test/fixtures/schema_modification/schema/piece.rb +1 -0
  273. data/test/fixtures/search/config/database.yml +1 -0
  274. data/test/fixtures/search/config/indexes.rb +4 -0
  275. data/test/fixtures/serialisation/root_hash.yaml.erb +16 -20
  276. data/test/fixtures/storage/cloud/environment.rb +12 -0
  277. data/test/fixtures/storage/default/environment.rb +1 -0
  278. data/test/fixtures/templates/aliases/layouts/c_alias.html.cut +1 -1
  279. data/test/fixtures/templates/content/include.html.cut +1 -1
  280. data/test/fixtures/templates/content/include_dir.html.cut +1 -1
  281. data/test/fixtures/templates/content/included.epub.cut +1 -1
  282. data/test/fixtures/templates/content/included.html.cut +1 -1
  283. data/test/fixtures/templates/content/partial/included.html.cut +1 -1
  284. data/test/fixtures/templates/content/preprocess.html.cut +1 -1
  285. data/test/fixtures/templates/content/second.html.cut +1 -1
  286. data/test/fixtures/templates/content/template.epub.cut +1 -1
  287. data/test/fixtures/templates/content/template.html.cut +1 -1
  288. data/test/fixtures/templates/default_style_class.html.cut +1 -1
  289. data/test/fixtures/templates/engine/braces.html.cut +6 -0
  290. data/test/fixtures/templates/engine/multiline.html.cut +5 -0
  291. data/test/fixtures/templates/extended/grandparent.html.cut +7 -7
  292. data/test/fixtures/templates/extended/main.html.cut +5 -5
  293. data/test/fixtures/templates/extended/parent.html.cut +10 -8
  294. data/test/fixtures/templates/extended/partial.html.cut +1 -0
  295. data/test/fixtures/templates/extended/partial_with_locals.html.cut +1 -0
  296. data/test/fixtures/templates/extended/with_includes.html.cut +9 -0
  297. data/test/fixtures/templates/extended/with_includes_and_locals.html.cut +9 -0
  298. data/test/fixtures/templates/layouts/entries.html.cut +7 -7
  299. data/test/fixtures/templates/layouts/page_style.html.cut +1 -1
  300. data/test/fixtures/templates/layouts/params.html.cut +1 -1
  301. data/test/fixtures/templates/layouts/preview_render.html.cut +2 -2
  302. data/test/fixtures/templates/layouts/standard_page.html.cut +1 -1
  303. data/test/fixtures/templates/layouts/subdir_style.html.cut +1 -1
  304. data/test/fixtures/templates/layouts/template_params.html.cut +1 -1
  305. data/test/fixtures/templates/layouts/variables.html.cut +7 -0
  306. data/test/fixtures/templates/page_class/inline_style.html.cut +1 -1
  307. data/test/fixtures/templates/preview_render/variables.html.cut +1 -0
  308. data/test/fixtures/templates/publishing/templates/layouts/dynamic.html.cut +1 -0
  309. data/test/fixtures/templates/publishing/templates/layouts/dynamic.rtf.cut +1 -0
  310. data/test/fixtures/templates/publishing/templates/layouts/static.html.cut +1 -0
  311. data/test/fixtures/templates/template_class/anonymous_style.html.cut +2 -2
  312. data/test/fixtures/templates/template_class/complex_template.html.cut +4 -4
  313. data/test/fixtures/templates/template_class/complex_template.pdf.cut +4 -4
  314. data/test/fixtures/templates/template_class/default_template_style.html.cut +2 -2
  315. data/test/fixtures/templates/template_class/images_with_template.html.cut +3 -3
  316. data/test/fixtures/templates/template_class/slots_template.html.cut +3 -3
  317. data/test/fixtures/templates/template_class/slots_template.pdf.cut +3 -3
  318. data/test/fixtures/templates/template_class/this_template.epub.cut +1 -1
  319. data/test/fixtures/templates/template_class/this_template.html.cut +1 -1
  320. data/test/fixtures/templates/template_class/this_template.pdf.cut +1 -1
  321. data/test/fixtures/templates/with_default_style_class.html.cut +1 -1
  322. data/test/functional/test_application.rb +19 -15
  323. data/test/functional/test_back.rb +130 -98
  324. data/test/functional/test_front.rb +72 -28
  325. data/test/javascript/test_dom.rb +1 -1
  326. data/test/javascript/test_markdown.rb +1 -1
  327. data/test/slow/test_publishing.rb +94 -75
  328. data/test/slow/test_visibility.rb +47 -14
  329. data/test/test_helper.rb +30 -3
  330. data/test/ui/test_page_editing.rb +1 -1
  331. data/test/unit/test_alias.rb +200 -16
  332. data/test/unit/test_authentication.rb +26 -28
  333. data/test/unit/test_boxes.rb +146 -75
  334. data/test/unit/test_config.rb +42 -20
  335. data/test/unit/test_content.rb +156 -37
  336. data/test/unit/test_content_inheritance.rb +4 -2
  337. data/test/unit/test_extensions.rb +7 -1
  338. data/test/unit/test_fields.rb +558 -290
  339. data/test/{experimental → unit}/test_formats.rb +42 -3
  340. data/test/unit/test_generators.rb +3 -2
  341. data/test/unit/test_helpers.rb +54 -0
  342. data/test/unit/test_image_size.rb +1 -1
  343. data/test/unit/test_images.rb +51 -40
  344. data/test/unit/test_layouts.rb +21 -4
  345. data/test/unit/test_logger.rb +1 -1
  346. data/test/unit/test_media.rb +165 -7
  347. data/test/unit/test_page.rb +158 -27
  348. data/test/unit/test_permissions.rb +170 -187
  349. data/test/unit/test_piece.rb +27 -9
  350. data/test/unit/test_plugins.rb +153 -0
  351. data/test/unit/test_prototype_set.rb +60 -2
  352. data/test/unit/test_prototypes.rb +81 -20
  353. data/test/unit/test_render.rb +97 -9
  354. data/test/unit/test_schema.rb +167 -120
  355. data/test/unit/test_search.rb +588 -0
  356. data/test/unit/test_serialisation.rb +26 -10
  357. data/test/unit/test_site.rb +42 -25
  358. data/test/unit/test_storage.rb +88 -0
  359. data/test/unit/test_structure.rb +11 -5
  360. data/test/unit/test_styles.rb +64 -3
  361. data/test/unit/test_table_scoping.rb +76 -0
  362. data/test/unit/test_templates.rb +69 -31
  363. data/test/unit/test_type_hierarchy.rb +9 -1
  364. metadata +274 -208
  365. data/Gemfile.lock +0 -146
  366. data/application/css/min/54ee0ed3c7fac7632bd5c020d69e9a2503e0c88c.css +0 -1
  367. data/application/css/min/c256adc144e2bdd0b0539356b04eb62db01e1dc3.css +0 -1
  368. data/application/js/edit_dialogue.js +0 -137
  369. data/application/js/min/492a209de8ee955fa9c729a765377495001e11b1.js +0 -17
  370. data/application/js/min/80f684d77c940887a1d4a63e3a96102e993baa98.js +0 -88
  371. data/application/js/min/c7140ec9475e5bf868b901e0621338d7d162358b.js +0 -3
  372. data/application/js/min/f07f2bd6630ee31e1c2288ec223383d8f0658ba6.js +0 -2
  373. data/application/js/vendor/.DS_Store +0 -0
  374. data/application/js/vendor/JS.Class-2.1.5/src/command.js +0 -93
  375. data/application/js/vendor/JS.Class-2.1.5/src/comparable.js +0 -37
  376. data/application/js/vendor/JS.Class-2.1.5/src/constant_scope.js +0 -48
  377. data/application/js/vendor/JS.Class-2.1.5/src/core.js +0 -1060
  378. data/application/js/vendor/JS.Class-2.1.5/src/decorator.js +0 -50
  379. data/application/js/vendor/JS.Class-2.1.5/src/enumerable.js +0 -505
  380. data/application/js/vendor/JS.Class-2.1.5/src/forwardable.js +0 -22
  381. data/application/js/vendor/JS.Class-2.1.5/src/hash.js +0 -334
  382. data/application/js/vendor/JS.Class-2.1.5/src/linked_list.js +0 -114
  383. data/application/js/vendor/JS.Class-2.1.5/src/loader.js +0 -553
  384. data/application/js/vendor/JS.Class-2.1.5/src/method_chain.js +0 -172
  385. data/application/js/vendor/JS.Class-2.1.5/src/observable.js +0 -55
  386. data/application/js/vendor/JS.Class-2.1.5/src/package.js +0 -472
  387. data/application/js/vendor/JS.Class-2.1.5/src/proxy.js +0 -58
  388. data/application/js/vendor/JS.Class-2.1.5/src/ruby.js +0 -44
  389. data/application/js/vendor/JS.Class-2.1.5/src/set.js +0 -332
  390. data/application/js/vendor/JS.Class-2.1.5/src/stack_trace.js +0 -151
  391. data/application/js/vendor/JS.Class-2.1.5/src/state.js +0 -95
  392. data/application/js/vendor/JS.Class-2.1.5/src/stdlib.js +0 -2612
  393. data/application/js/vendor/jquery-1.4.2.min.js +0 -154
  394. data/application/js/vendor/jquery-1.4.3.min.js +0 -166
  395. data/application/js/vendor/jquery-1.5.1.min.js +0 -16
  396. data/application/js/vendor/jquery-1.5.1rc1.min.js +0 -24
  397. data/application/js/vendor/jquery-ui-1.8.6.custom.min.js +0 -265
  398. data/application/js/vendor/jquery-ui-1.8.custom.min.js +0 -106
  399. data/application/js/vendor/jquery.hotkeys-0.7.9.js +0 -248
  400. data/application/js/vendor/jquery.hotkeys-0.7.9.min.js +0 -19
  401. data/application/js/vendor/jsdiff.js +0 -169
  402. data/lib/cutaneous/first_pass_parser.rb +0 -23
  403. data/lib/cutaneous/parser_core.rb +0 -18
  404. data/lib/cutaneous/second_pass_parser.rb +0 -23
  405. data/lib/sequel/plugins/yajl_serialization.rb +0 -154
  406. data/lib/spontaneous/plugins.rb +0 -20
  407. data/lib/spontaneous/proxy_object.rb +0 -12
  408. data/lib/spontaneous/publishing/fire_and_forget.rb +0 -57
  409. data/lib/spontaneous/render/context.rb +0 -100
  410. data/spontaneous.gemspec.tmpl +0 -66
  411. data/test/experimental/test_plugins.rb +0 -64
  412. data/test/fixtures/templates/publishing/layouts/dynamic.html.cut +0 -1
  413. data/test/fixtures/templates/publishing/layouts/static.html.cut +0 -1
@@ -1,6 +1,6 @@
1
1
  # encoding: UTF-8
2
2
 
3
- require 'test_helper'
3
+ require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
5
 
6
6
  class SlotsTest < MiniTest::Spec
@@ -0,0 +1,309 @@
1
+ # encoding: UTF-8
2
+
3
+ require File.expand_path('../../test_helper', __FILE__)
4
+
5
+
6
+ class CutaneousTest < MiniTest::Spec
7
+ PUBLISH_TEMPLATE = (<<-TEMPLATE)
8
+ Text here {{ preview_tag }}
9
+
10
+
11
+ !{ comment which should be ignored }
12
+ Text `problem`
13
+ ${ "<div>" }
14
+ $${ "<div>" }
15
+ %{
16
+ a = {:key => title}
17
+ b = a.map { |k, v| "\#{k}=\#{v}" }
18
+ }
19
+ Text \\problem
20
+ ${ b }
21
+ Text
22
+ TEMPLATE
23
+
24
+ VIEW_TEMPLATE = (<<-TEMPLATE)
25
+ <title>{{ title }}</title>
26
+
27
+ !{ comment }
28
+ Welome
29
+
30
+ {% 2.times do |n| %}
31
+ {{ names[n] }}
32
+ {% end %}
33
+
34
+ TEMPLATE
35
+
36
+ context "publishing parser" do
37
+ setup do
38
+ @parser = Cutaneous::PublishTokenParser.new(PUBLISH_TEMPLATE)
39
+ end
40
+
41
+ should "tokenize a single statement" do
42
+ lexer = Cutaneous::PublishTokenParser.new("%{ a = {:a => \"a\" }}")
43
+ tokens = lexer.tokens
44
+ tokens.length.should == 1
45
+ tokens.first.should == [:statement, 'a = {:a => "a" }']
46
+ end
47
+
48
+ should "tokenize a single expression" do
49
+ lexer = Cutaneous::PublishTokenParser.new("${ a }")
50
+ tokens = lexer.tokens
51
+ tokens.length.should == 1
52
+ tokens.first.should == [:expression, 'a']
53
+ end
54
+
55
+ should "tokenize plain text" do
56
+ lexer = Cutaneous::PublishTokenParser.new("Hello there")
57
+ tokens = lexer.tokens
58
+ tokens.length.should == 1
59
+ tokens.first.should == [:text, 'Hello there']
60
+ end
61
+
62
+ should "tokenize a single comment" do
63
+ lexer = Cutaneous::PublishTokenParser.new("!{ comment }")
64
+ tokens = lexer.tokens
65
+ tokens.length.should == 1
66
+ tokens.first.should == [:comment, ' comment ']
67
+ end
68
+
69
+ should "correctly tokenize tags within a comment" do
70
+ lexer = Cutaneous::PublishTokenParser.new("!{ %{ a = true } ${ value } !{ nested comment }}")
71
+ tokens = lexer.tokens
72
+ tokens.length.should == 1
73
+ tokens.first.should == [:comment, ' %{ a = true } ${ value } !{ nested comment }']
74
+ end
75
+ should "correctly tokenize a complex template string" do
76
+ @parser.tokens.map { |token| token[0] }.should == [
77
+ :text,
78
+ :comment,
79
+ :text,
80
+ :expression,
81
+ :text,
82
+ :escaped_expression,
83
+ :text,
84
+ :statement,
85
+ :text,
86
+ :expression,
87
+ :text
88
+ ]
89
+ end
90
+
91
+ should "correctly post process the expressions" do
92
+ expressions = @parser.tokens
93
+ expected = [
94
+ [:text, "Text here {{ preview_tag }}\n\n\n"],
95
+ [:comment, " comment which should be ignored "],
96
+ [:text, "Text \\`problem\\`\n"],
97
+ [:expression, %("<div>")],
98
+ [:text, "\n"],
99
+ [:escaped_expression, %("<div>")],
100
+ [:text, "\n"],
101
+ [:statement, "a = {:key => title}\n b = a.map { |k, v| \"\#{k}=\#{v}\" }"],
102
+ [:text, "Text \\\\problem\n "],
103
+ [:expression, "b"],
104
+ [:text, "\nText\n"]
105
+ ]
106
+ expressions.each_with_index do |s, i|
107
+ s.should == expected[i]
108
+ end
109
+ expressions.should == expected
110
+ end
111
+
112
+ should "correctly generate the template script" do
113
+ expected = [
114
+ %(_buf << %Q`Text here {{ preview_tag }}\n\n\n`),
115
+ %(_buf << %Q`Text \\`problem\\`\n`),
116
+ %(_buf << _decode_params(("<div>"))),
117
+ %(_buf << %Q`\n`),
118
+ %(_buf << escape(_decode_params(("<div>")))),
119
+ %(_buf << %Q`\n`),
120
+ "a = {:key => title}\n b = a.map { |k, v| \"\#{k}=\#{v}\" }",
121
+ %(_buf << %Q`Text \\\\problem\n `),
122
+ "_buf << _decode_params((b))",
123
+ %(_buf << %Q`\nText\n`),
124
+ ].join("\n") + "\n"
125
+ script = @parser.script
126
+ script.should == expected
127
+ end
128
+ end
129
+
130
+ context "view parser" do
131
+ setup do
132
+ end
133
+ should "tokenize a single statement" do
134
+ parser = Cutaneous::RequestTokenParser.new("{% a = {:a => \"a\" } %}")
135
+ tokens = parser.tokens
136
+ tokens.length.should == 1
137
+ tokens.first[0].should == :statement
138
+ tokens.first[1].should == 'a = {:a => "a" }'
139
+ end
140
+
141
+ should "tokenize a single expression" do
142
+ parser = Cutaneous::RequestTokenParser.new("{{ a }}")
143
+ tokens = parser.tokens
144
+ tokens.length.should == 1
145
+ tokens.first[0].should == :expression
146
+ tokens.first[1].should == 'a'
147
+ end
148
+
149
+ should "tokenize a single escaped expression" do
150
+ parser = Cutaneous::RequestTokenParser.new("{$ a $}")
151
+ tokens = parser.tokens
152
+ tokens.length.should == 1
153
+ tokens.first[0].should == :escaped_expression
154
+ tokens.first[1].should == 'a'
155
+ end
156
+
157
+ should "tokenize plain text" do
158
+ parser = Cutaneous::RequestTokenParser.new("Hello there")
159
+ tokens = parser.tokens
160
+ tokens.length.should == 1
161
+ tokens.first[0].should == :text
162
+ tokens.first[1].should == 'Hello there'
163
+ end
164
+
165
+ should "tokenize a single comment" do
166
+ parser = Cutaneous::RequestTokenParser.new("!{ comment }")
167
+ tokens = parser.tokens
168
+ tokens.length.should == 1
169
+ tokens.first[0].should == :comment
170
+ tokens.first[1].should == ' comment '
171
+ end
172
+
173
+ should "tokenize a mixed template" do
174
+ parser = Cutaneous::RequestTokenParser.new("{% a = [1,2].map { |x| x } %}!{ comment }{{ a }}")
175
+ tokens = parser.tokens
176
+ tokens.length.should == 3
177
+ tokens[0][0].should == :statement
178
+ tokens[1][0].should == :comment
179
+ tokens[2][0].should == :expression
180
+ tokens[0][1].should == 'a = [1,2].map { |x| x }'
181
+ tokens[1][1].should == ' comment '
182
+ tokens[2][1].should == 'a'
183
+ end
184
+ should "tokenize a mixed publish & view template" do
185
+ parser = Cutaneous::RequestTokenParser.new(PUBLISH_TEMPLATE)
186
+ tokens = parser.tokens
187
+ tokens.length.should == 5
188
+ tokens.map { |t| t[0] }.should == [
189
+ :text,
190
+ :expression,
191
+ :text,
192
+ :comment,
193
+ :text
194
+ ]
195
+ tokens[1][1].should == 'preview_tag'
196
+ end
197
+ end
198
+
199
+
200
+ context "publish templates" do
201
+ context "from files" do
202
+ setup do
203
+ @tmp = Dir.mktmpdir
204
+ @template_path = File.join(@tmp, "template.html.cut")
205
+ File.open(@template_path, "w") do |file|
206
+ file.write(PUBLISH_TEMPLATE)
207
+ end
208
+ end
209
+ teardown do
210
+ FileUtils.rm_r(@tmp)
211
+ end
212
+
213
+ should "just be empty if created empty" do
214
+ template = Cutaneous::PublishTemplate.new
215
+ template.filename.should be_nil
216
+ template.script.should be_nil
217
+ end
218
+
219
+ should "convert a string" do
220
+ template = Cutaneous::PublishTemplate.new
221
+ template.convert("!{ comment }${ title }", "/path/to/template.html.cut")
222
+ template.filename.should == "/path/to/template.html.cut"
223
+ context = Cutaneous::PublishContext.new(nil, :html, {:title => "title"})
224
+ template.render(context).should == "title"
225
+ end
226
+
227
+ should "parse the file if created with one" do
228
+ template = Cutaneous::PublishTemplate.new(@template_path)
229
+ template.filename.should == @template_path
230
+ template.script.should =~ /^\s*_buf/
231
+ context = Cutaneous::PublishContext.new(nil, :html, {:title => "title"})
232
+ # puts template.render(context)
233
+ template.render(context).should == (<<-HTML)
234
+ Text here {{ preview_tag }}
235
+
236
+
237
+ Text `problem`
238
+ <div>
239
+ <div>
240
+ Text \\problem
241
+ key=title
242
+ Text
243
+ HTML
244
+ end
245
+
246
+ should "reset if given a different string" do
247
+ template = Cutaneous::PublishTemplate.new
248
+ template.convert("${ title }")
249
+ context = Cutaneous::PublishContext.new(nil, :html, {:title => "title"})
250
+ template.render(context).should == "title"
251
+ template.convert("${ title }!")
252
+ template.render(context).should == "title!"
253
+ end
254
+ end
255
+ end
256
+ context "view templates" do
257
+ context "from files" do
258
+ setup do
259
+ @tmp = Dir.mktmpdir
260
+ @template_path = File.join(@tmp, "template.html.cut")
261
+ File.open(@template_path, "w") do |file|
262
+ file.write(VIEW_TEMPLATE)
263
+ end
264
+ end
265
+ teardown do
266
+ FileUtils.rm_r(@tmp)
267
+ end
268
+
269
+ should "just be empty if created empty" do
270
+ template = Cutaneous::RequestTemplate.new
271
+ template.filename.should be_nil
272
+ template.script.should be_nil
273
+ end
274
+
275
+ should "convert a string" do
276
+ template = Cutaneous::RequestTemplate.new
277
+ template.convert("!{ comment }{{ title }}", "/path/to/template.html.cut")
278
+ template.filename.should == "/path/to/template.html.cut"
279
+ context = Cutaneous::RequestContext.new(nil, :html, {:title => "title"})
280
+ template.render(context).should == "title"
281
+ end
282
+
283
+ should "parse the file if created with one" do
284
+ template = Cutaneous::RequestTemplate.new(@template_path)
285
+ template.filename.should == @template_path
286
+ template.script.should =~ /^\s*_buf/
287
+ context = Cutaneous::RequestContext.new(nil, :html, {:title => "title", :names => ["george", "mary"]})
288
+ # puts template.render(context)
289
+ template.render(context).should == (<<-HTML)
290
+ <title>title</title>
291
+
292
+ Welome
293
+
294
+ george
295
+ mary
296
+ HTML
297
+ end
298
+
299
+ should "reset if given a different string" do
300
+ template = Cutaneous::RequestTemplate.new
301
+ template.convert("{{ title }}")
302
+ context = Cutaneous::RequestContext.new(nil, :html, {:title => "title"})
303
+ template.render(context).should == "title"
304
+ template.convert("{{ title }}!")
305
+ template.render(context).should == "title!"
306
+ end
307
+ end
308
+ end
309
+ end
@@ -0,0 +1,129 @@
1
+ # encoding: UTF-8
2
+
3
+ require File.expand_path('../../test_helper', __FILE__)
4
+
5
+ require 'sinatra/base'
6
+
7
+ class FeaturesTest < MiniTest::Spec
8
+ include ::Rack::Test::Methods
9
+
10
+ def self.startup
11
+ # make sure that S::Piece & S::Page are removed from the schema
12
+ @site = setup_site
13
+ *ids = S::Page.schema_id, S::Piece.schema_id
14
+ Object.const_set(:Site, Class.new(S::Site))
15
+ end
16
+
17
+ def setup
18
+ @site = setup_site
19
+ end
20
+
21
+ def teardown
22
+ teardown_site
23
+ end
24
+
25
+ def app
26
+ Spontaneous::Rack.application
27
+ end
28
+
29
+ def auth_post(path, params={})
30
+ post(path, params.merge("__key" => @key))
31
+ end
32
+
33
+ def auth_get(path, params={})
34
+ get(path, params.merge("__key" => @key))
35
+ end
36
+
37
+ context "Feature" do
38
+ setup do
39
+ Content.delete
40
+ Spontaneous::Permissions::User.delete
41
+
42
+
43
+ config = mock()
44
+ config.stubs(:reload_classes).returns(false)
45
+ config.stubs(:auto_login).returns('root')
46
+ config.stubs(:default_charset).returns('utf-8')
47
+ config.stubs(:publishing_method).returns(:immediate)
48
+ config.stubs(:site_domain).returns('example.org')
49
+ config.stubs(:site_id).returns('example_org')
50
+ @site.stubs(:config).returns(config)
51
+
52
+ @user = Spontaneous::Permissions::User.create(:email => "root@example.com", :login => "root", :name => "root", :password => "rootpass", :password_confirmation => "rootpass")
53
+ @user.update(:level => Spontaneous::Permissions.root)
54
+ @user.save
55
+ @key = "c5AMX3r5kMHX2z9a5ExLKjAmCcnT6PFf22YQxzb4Codj"
56
+ @key.stubs(:user).returns(@user)
57
+
58
+ Spontaneous::Permissions::User.stubs(:[]).with(:login => 'root').returns(@user)
59
+ Spontaneous::Permissions::AccessKey.stubs(:authenticate).with(@key).returns(@key)
60
+ Spontaneous::Permissions::AccessKey.stubs(:valid?).with(nil, nil).returns(false)
61
+ Spontaneous::Permissions::AccessKey.stubs(:valid?).with(nil, @user).returns(false)
62
+ Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
63
+ end
64
+
65
+ teardown do
66
+ # (@all_classes.map { |k| k.name.to_sym }).each { |klass|
67
+ # Object.send(:remove_const, klass) rescue nil
68
+ # } rescue nil
69
+ Content.delete
70
+ end
71
+
72
+ context "controllers" do
73
+ setup do
74
+ class ::FeatureBackController < ::Sinatra::Base
75
+ get '/hello' do
76
+ 'Editor'
77
+ end
78
+ post '/goodbye' do
79
+ 'Cruel Editor'
80
+ end
81
+ end
82
+ class ::FeatureFrontController < ::Sinatra::Base
83
+ get '/hello' do
84
+ 'World'
85
+ end
86
+ post '/goodbye' do
87
+ 'Cruel World'
88
+ end
89
+ end
90
+ end
91
+
92
+ teardown do
93
+ Object.send(:remove_const, :FeatureBackController) rescue nil
94
+ Object.send(:remove_const, :FeatureFrontController) rescue nil
95
+ end
96
+
97
+ should "be able to injectable into the back application" do
98
+ Spontaneous.mode = :back
99
+ Spontaneous.register_back_controller(:myfeature, FeatureBackController)
100
+
101
+ get "/@myfeature/hello"
102
+ assert last_response.status == 401, "Expected an Unauthorised 401 response but got #{last_response.status}"
103
+
104
+ auth_get "/@myfeature/hello"
105
+ assert last_response.ok?
106
+ assert last_response.body == "Editor"
107
+
108
+ post "/@myfeature/goodbye"
109
+ assert last_response.status == 401
110
+
111
+ auth_post "/@myfeature/goodbye"
112
+ assert last_response.ok?
113
+ assert last_response.body == "Cruel Editor"
114
+ end
115
+
116
+ should "be able to inject controllers into the front application" do
117
+ Spontaneous.mode = :front
118
+ Spontaneous.register_front_controller(:myfeature, FeatureFrontController)
119
+ get "/@myfeature/hello"
120
+ assert last_response.ok?
121
+ assert last_response.body == "World"
122
+
123
+ post "/@myfeature/goodbye"
124
+ assert last_response.ok?
125
+ assert last_response.body == "Cruel World"
126
+ end
127
+ end
128
+ end
129
+ end