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
@@ -0,0 +1,59 @@
1
+ # encoding: UTF-8
2
+
3
+ require 'open-uri'
4
+
5
+ module Spontaneous::FieldTypes
6
+ class LocationField < StringField
7
+
8
+ def outputs
9
+ [:html, :lat, :lng]
10
+ end
11
+
12
+ def generate_outputs(input)
13
+ values = {}
14
+ values[:html] = escape_html(input)
15
+ values.update(geolocate(input))
16
+ values
17
+ end
18
+
19
+ def geolocate(address)
20
+ return {} if address.blank?
21
+ url = "http://maps.google.com/maps/api/geocode/json?address=#{URI.escape(address)}&sensor=false"
22
+
23
+ response = open(url).read rescue "{}"
24
+ data = Spontaneous.parse_json(response) rescue {}
25
+ return {} unless data[:results]
26
+ values = {}
27
+ result = data[:results].first
28
+ values[:formatted_address] = result[:formatted_address]
29
+ geometry = result[:geometry]
30
+ values[:lat] = geometry[:location][:lat]
31
+ values[:lng] = geometry[:location][:lng]
32
+ country = (result[:address_components].detect { |c| c[:types].first == "country" } || {})[:long_name]
33
+ values[:country] = country
34
+ values
35
+ end
36
+
37
+ def latitude
38
+ value(:lat)
39
+ end
40
+
41
+ def longitude
42
+ value(:lng)
43
+ end
44
+
45
+ def country
46
+ value(:country)
47
+ end
48
+
49
+ def formatted_address
50
+ value(:formatted_address)
51
+ end
52
+
53
+ alias_method :lat, :latitude
54
+ alias_method :lng, :longitude
55
+
56
+ self.register
57
+ end # LongStringField
58
+ end
59
+
@@ -0,0 +1,13 @@
1
+ # encoding: UTF-8
2
+
3
+ module Spontaneous::FieldTypes
4
+ class LongStringField < Field
5
+ include Spontaneous::Plugins::Field::EditorClass
6
+
7
+ def generate_html(value)
8
+ escape_html(value).gsub(/[\r\n]+/, "<br />")
9
+ end
10
+
11
+ self.register
12
+ end # LongStringField
13
+ end
@@ -5,6 +5,8 @@ require 'kramdown'
5
5
  module Spontaneous
6
6
  module FieldTypes
7
7
  class MarkdownField < Field
8
+ include Spontaneous::Plugins::Field::EditorClass
9
+
8
10
  def outputs
9
11
  [:html]
10
12
  end
@@ -34,4 +36,3 @@ module Spontaneous
34
36
  MarkdownField.register(:markdown, :text, :richtext)
35
37
  end
36
38
  end
37
-
@@ -1,9 +1,10 @@
1
1
  # encoding: UTF-8
2
2
 
3
-
4
3
  module Spontaneous
5
4
  module FieldTypes
6
5
  class StringField < Field
6
+ include Spontaneous::Plugins::Field::EditorClass
7
+
7
8
  def generate_html(value)
8
9
  escape_html(value)
9
10
  end
@@ -11,4 +12,3 @@ module Spontaneous
11
12
  StringField.register
12
13
  end
13
14
  end
14
-
@@ -0,0 +1,255 @@
1
+ # encoding: UTF-8
2
+
3
+ require 'open-uri'
4
+ require 'nokogiri'
5
+
6
+ module Spontaneous
7
+ module FieldTypes
8
+ class WebVideoField < Field
9
+ include Spontaneous::Plugins::Field::EditorClass
10
+
11
+ def outputs
12
+ [:type, :id]
13
+ end
14
+
15
+ def id
16
+ value(:id)
17
+ end
18
+
19
+ def video_type
20
+ value(:type)
21
+ end
22
+
23
+
24
+ def generate_outputs(input)
25
+ values = {}
26
+ values[:html] = escape_html(input)
27
+ case input
28
+ when "", nil
29
+ # ignore this
30
+ when /youtube\.com.*\?.*v=([^&]+)/, /youtu.be\/([^&]+)/
31
+ id = $1
32
+ values.update(retrieve_youtube_metadata(id))
33
+ values[:id] = id
34
+ values[:type] = "youtube"
35
+ when /vimeo\.com\/(\d+)/
36
+ id = $1
37
+ values[:type] = "vimeo"
38
+ values.update(retrieve_vimeo_metadata(id))
39
+ values[:id] = id.to_s
40
+ else
41
+ logger.warn "WebVideo field doesn't recognise the URL '#{input}'"
42
+ end
43
+ values
44
+ end
45
+
46
+
47
+ def render(format=:html, *args)
48
+ case format
49
+ when :html
50
+ to_html(*args)
51
+ when :json
52
+ to_json(*args)
53
+ else
54
+ value(format)
55
+ end
56
+ end
57
+
58
+
59
+ def to_html(*args)
60
+ opts = args.extract_options!
61
+ case video_type
62
+ when "youtube"
63
+ to_youtube_html(opts)
64
+ when "vimeo"
65
+ to_vimeo_html(opts)
66
+ else
67
+ value(:html)
68
+ end
69
+ end
70
+
71
+
72
+ def to_json(*args)
73
+ opts = args.extract_options!
74
+ params = \
75
+ case video_type
76
+ when "youtube"
77
+ youtube_attributes(opts)
78
+ when "vimeo"
79
+ vimeo_attributes(opts)
80
+ else
81
+ {:tagname => "iframe", :tag => "<iframe/>", :attr => {:src => value(:html)}}
82
+ end
83
+ Spontaneous.encode_json(params)
84
+ end
85
+
86
+
87
+ def ui_preview_value
88
+ render(:html, :width => 480, :height => 270)
89
+ end
90
+
91
+ def retrieve_vimeo_metadata(id)
92
+ url = "http://vimeo.com/api/v2/video/%s.json" % id
93
+ response = \
94
+ begin
95
+ open(url).read
96
+ rescue => e
97
+ logger.error("Unable to retrieve metadata for video ##{id} from Vimeo: '#{e}'")
98
+ "[{}]"
99
+ end
100
+ metadata = Spontaneous.parse_json(response) rescue [{}]
101
+ metadata = metadata.first || {}
102
+ end
103
+
104
+ def retrieve_youtube_metadata(id)
105
+ url = "http://gdata.youtube.com/feeds/api/videos/%s?v=2" % id
106
+ begin
107
+ doc = Nokogiri::XML(open(url))
108
+ entry = doc.xpath("xmlns:entry")
109
+
110
+ { "title" => entry.xpath("xmlns:title").text.strip,
111
+ "description" => entry.xpath("media:group/media:description").text.strip,
112
+ "thumbnail_large" => entry.xpath('media:group/media:thumbnail[@yt:name="hqdefault"]').first["url"].strip,
113
+ "thumbnail_small" => entry.xpath('media:group/media:thumbnail[@yt:name="default"]').first["url"].strip,
114
+ "user_name" => entry.xpath("xmlns:author/xmlns:name").text.strip,
115
+ "upload_date" => Time.parse(entry.xpath("xmlns:published").text.strip).strftime("%Y-%m-%d %H:%M:%S"),
116
+ "tags" => entry.xpath("media:group/media:keywords").text.strip,
117
+ "duration" => entry.xpath("media:group/yt:duration").first['seconds'].to_i,
118
+ "stats_number_of_likes" => entry.xpath("yt:rating").first['numLikes'].to_i,
119
+ "stats_number_of_plays" => entry.xpath("yt:statistics").first['viewCount'].to_i,
120
+ "stats_number_of_comments" => entry.xpath("gd:comments/gd:feedLink").first['countHint'].to_i }
121
+ rescue
122
+ {}
123
+ end
124
+ end
125
+
126
+ def default_player_options
127
+ {
128
+ :width => 640,
129
+ :height => 360,
130
+ :fullscreen => true,
131
+ :api => false,
132
+ :autoplay => false,
133
+ :loop => false,
134
+ :showinfo => true
135
+ }.merge(prototype.options[:player] || {})
136
+ end
137
+
138
+
139
+ def to_vimeo_html(options = {})
140
+ params = vimeo_attributes(options)
141
+
142
+ attributes = make_html_attributes(params[:attr])
143
+ %(<iframe #{attributes}></iframe>)
144
+ end
145
+
146
+ def vimeo_attributes(options = {})
147
+
148
+ o = default_player_options
149
+ vimeo_options = o.delete(:vimeo) || {}
150
+
151
+ o.merge!(vimeo_options)
152
+
153
+ if o.delete(:showinfo)
154
+ o[:portrait] = true
155
+ o[:title] = true
156
+ o[:byline] = true
157
+ else
158
+ o[:portrait] = false
159
+ o[:title] = false
160
+ o[:byline] = false
161
+ end
162
+
163
+ vimeo_options = options.delete(:vimeo) || {}
164
+
165
+ o = {
166
+ :portrait => true,
167
+ :title => true,
168
+ :byline => true,
169
+ :player_id => "vimeo#{owner.id}id#{value(:id)}"
170
+ }.merge(o).merge(vimeo_options).merge(options)
171
+
172
+ attributes = {
173
+ :type => "text/html",
174
+ :frameborder => "0",
175
+ :width => o.delete(:width),
176
+ :height => o.delete(:height)
177
+ }
178
+ attributes.update(:webkitAllowFullScreen => "yes", :allowFullScreen => "yes") if o[:fullscreen]
179
+
180
+ make_query_options!(o)
181
+
182
+ attributes[:src] = "http://player.vimeo.com/video/#{value(:id)}?title=#{o[:title]}&byline=#{o[:byline]}&portrait=#{o[:portrait]}&autoplay=#{o[:autoplay]}&loop=#{o[:loop]}&api=#{o[:api]}&player_id=#{o[:player_id]}#{o.key?(:color) ? "&color=#{o[:color]}" : ""}"
183
+
184
+ {:tagname => "iframe", :tag => "<iframe/>", :attr => attributes}
185
+
186
+ end
187
+
188
+
189
+ def to_youtube_html(options = {})
190
+ params = youtube_attributes(options)
191
+ attributes = make_html_attributes(params[:attr])
192
+ %(<iframe #{attributes}></iframe>)
193
+ end
194
+
195
+
196
+ def youtube_attributes(options = {})
197
+
198
+ o = default_player_options
199
+ youtube_options = o.delete(:youtube) || {}
200
+
201
+ o.merge!(youtube_options)
202
+
203
+ if o.delete(:showinfo)
204
+ o[:showinfo] = true
205
+ o[:showsearch] = true
206
+ else
207
+ o[:showinfo] = false
208
+ o[:showsearch] = false
209
+ end
210
+
211
+ youtube_options = options.delete(:youtube) || {}
212
+ o = {
213
+ :theme => "dark",
214
+ :hd => true,
215
+ :controls => true,
216
+ :showinfo => true,
217
+ :showsearch => true,
218
+ :autohide => 2,
219
+ :rel => true
220
+ }.merge(o).merge(youtube_options).merge(options)
221
+
222
+ attributes = {
223
+ :type => "text/html",
224
+ :frameborder => "0",
225
+ :width => o.delete(:width),
226
+ :height => o.delete(:height)
227
+ }
228
+
229
+ make_query_options!(o)
230
+
231
+ attributes[:src] = "http://www.youtube.com/embed/#{value(:id)}?modestbranding=1&theme=#{o[:theme]}&hd=#{o[:hd]}&fs=#{o[:fullscreen]}&controls=#{o[:controls]}&autoplay=#{o[:autoplay]}&showinfo=#{o[:showinfo]}&showsearch=#{o[:showsearch]}&loop=#{o[:loop]}&autohide=#{o[:autohide]}&rel=#{o[:rel]}&enablejsapi=#{o[:api]}"
232
+ attributes.update(:webkitAllowFullScreen => "yes", :allowFullScreen => "yes") if o[:fullscreen]
233
+
234
+
235
+ {:tagname => "iframe", :tag => "<iframe/>", :attr => attributes}
236
+ end
237
+
238
+
239
+ def make_html_attributes(attributes)
240
+ attributes.to_a.map { |name, value| "#{name}=\"#{escape_html(value)}\"" }.join(" ")
241
+ end
242
+
243
+
244
+ def make_query_options!(hash)
245
+ hash.each { |k, v|
246
+ hash[k] = 1 if v == true
247
+ hash[k] = 0 if v == false
248
+ }
249
+ end
250
+
251
+ self.register(:webvideo)
252
+ end
253
+
254
+ end
255
+ end
@@ -1 +1 @@
1
- <li><a href="{{ page.path }}">{{ page.title }}</a></li>
1
+ <li><a href="#{ page.path }">#{ page.title }</a></li>
@@ -1,4 +1,5 @@
1
- {% extends 'page' %}
2
- {% block :content %}
3
- <h2>{{ title }}</h2>
4
- {% endblock :content %}
1
+ %{ extends 'layouts/standard' }
2
+
3
+ %{ block :content }
4
+ <h2>#{ title }</h2>
5
+ %{ endblock :content }
@@ -1,9 +1,5 @@
1
+ # encoding: UTF-8
1
2
 
2
3
  class <%= class_name %> < Page
3
- # see 'templates/<%= disk_name.underscore %>/page.html.cut'
4
- page_style :page
5
4
 
6
- # see 'templates/<%= disk_name.underscore %>/inline.html.cut'
7
- inline_style :inline
8
5
  end
9
-
@@ -35,6 +35,7 @@ module Spontaneous
35
35
  directory "templates"
36
36
  directory "public"
37
37
  template "Gemfile.tt", "Gemfile"
38
+ template "Capfile.tt", "Capfile"
38
39
  template "Rakefile.tt", "Rakefile"
39
40
  template "lib/site.rb.tt", "lib/site.rb"
40
41
  empty_directory "lib/tasks"
@@ -1,4 +1,6 @@
1
1
  log/*
2
2
  tmp/*
3
3
  cache/*
4
+ .Procfile
5
+ .irb_history
4
6
 
@@ -5,16 +5,14 @@ source :rubygems
5
5
  gem 'mysql2', '~> 0.2'
6
6
 
7
7
  # Deploy with Capistrano
8
- # gem 'capistrano'
8
+ gem 'capistrano', '~> 2.9'
9
9
 
10
10
 
11
11
  ## TODO: replace this path based gem with a version once the gem is live
12
12
  #gem 'spontaneous', '<%= Spontaneous::VERSION %>'
13
13
  gem 'spontaneous', :path => "/Users/garry/Dropbox/Development/spontaneous3/working"
14
-
15
- # Choose a Rack handler
16
- gem 'thin'
17
- # gem 'mongrel'
14
+ ## TODO: Remove this line when Simultaneous is published
15
+ gem 'simultaneous', :path => "/Users/garry/Dropbox/Development/spontaneous3/simultaneous"
18
16
 
19
17
  # group :development, :test do
20
18
  # gem 'webrat'
@@ -6,3 +6,4 @@ site_id '<%= @site_name %>'
6
6
  # change this to alter the content-type encoding sent in public HTTP headers
7
7
  # TODO: enable this setting on a per-page, per-format basis
8
8
  default_charset "utf-8"
9
+
@@ -1,5 +1,7 @@
1
1
 
2
- publishing_method :threaded
2
+ publishing_method :simultaneous
3
+
4
+ simultaneous_connection "/tmp/simultaneous.<%= @site_name %>.sock"
3
5
 
4
6
  # ensures that schema classes are reloaded with every request
5
7
  reload_classes true
@@ -1,5 +1,7 @@
1
1
 
2
- publishing_method :fire_and_forget
2
+ publishing_method :simultaneous
3
+
4
+ simultaneous_connection "/tmp/simultaneous.sock"
3
5
 
4
6
  # used by publishing mech to determine a restart strategy
5
7
  handler :unicorn