spontaneous 0.2.0.beta1 → 0.2.0.beta2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (335) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +24 -0
  3. data/.locat +42 -0
  4. data/.travis/gemfiles/Gemfile.empty +7 -0
  5. data/.travis.yml +18 -0
  6. data/Gemfile +12 -8
  7. data/LICENSE +1 -1
  8. data/Rakefile +15 -157
  9. data/Readme.markdown +1 -1
  10. data/application/css/core.css.scss +22 -146
  11. data/application/css/definitions.css.scss +7 -3
  12. data/application/css/dialogue.css.scss +26 -1
  13. data/application/css/editing.css.scss +70 -28
  14. data/application/css/font.css.scss +1 -1
  15. data/application/css/popover.css.scss +2 -0
  16. data/application/css/top.css.scss +231 -0
  17. data/application/js/add_alias_dialogue.js +1 -1
  18. data/application/js/add_home_dialogue.js +1 -1
  19. data/application/js/ajax.js +61 -31
  20. data/application/js/box.js +4 -4
  21. data/application/js/conflicted_field_dialogue.js +1 -1
  22. data/application/js/content.js +5 -5
  23. data/application/js/dom.js +5 -0
  24. data/application/js/edit_panel.js +1 -0
  25. data/application/js/editing.js +1 -1
  26. data/application/js/extensions.js +8 -0
  27. data/application/js/field/boolean.js +31 -0
  28. data/application/js/field/file.js +32 -4
  29. data/application/js/field/image.js +24 -9
  30. data/application/js/field/markdown.js +87 -59
  31. data/application/js/field/select.js +1 -1
  32. data/application/js/field/webvideo.js +6 -1
  33. data/application/js/init.js +2 -2
  34. data/application/js/jquery-selection-position.js +130 -0
  35. data/application/js/location.js +4 -25
  36. data/application/js/meta_view/user_admin.js +2 -2
  37. data/application/js/metadata.js +2 -2
  38. data/application/js/page_browser.js +1 -1
  39. data/application/js/panel/root_menu.js +0 -1
  40. data/application/js/popover.js +27 -12
  41. data/application/js/popover_view.js +20 -4
  42. data/application/js/preview.js +31 -16
  43. data/application/js/progress.js +22 -21
  44. data/application/js/publish.js +18 -7
  45. data/application/js/sharded_upload.js +9 -6
  46. data/application/js/spontaneous.js +3 -1
  47. data/application/js/top_bar.js +264 -173
  48. data/application/js/upload.js +12 -5
  49. data/application/js/upload_manager.js +4 -3
  50. data/application/js/user.js +1 -2
  51. data/application/js/views/box_view.js +1 -1
  52. data/application/js/views/page_view.js +16 -5
  53. data/application/js/views/piece_view.js +5 -4
  54. data/application/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf +0 -0
  55. data/application/views/index.erb +6 -14
  56. data/application/views/login.erb +6 -25
  57. data/application/views/schema_modification_error.html.erb +3 -7
  58. data/db/migrations/20130114120000_create_revision_tables.rb +2 -2
  59. data/db/migrations/20130813111009_increase_path_length.rb +14 -0
  60. data/gem-public_cert.pem +20 -0
  61. data/lib/spontaneous/asset/app_compiler.rb +44 -0
  62. data/lib/spontaneous/asset/environment.rb +225 -0
  63. data/lib/spontaneous/asset.rb +2 -67
  64. data/lib/spontaneous/box.rb +0 -1
  65. data/lib/spontaneous/capistrano/deploy.rb +2 -2
  66. data/lib/spontaneous/capistrano/sync.rb +1 -1
  67. data/lib/spontaneous/cli/init.rb +36 -13
  68. data/lib/spontaneous/cli/server.rb +0 -1
  69. data/lib/spontaneous/cli/site.rb +2 -1
  70. data/lib/spontaneous/cli.rb +3 -1
  71. data/lib/spontaneous/collections/entry_set.rb +4 -12
  72. data/lib/spontaneous/collections/hash_with_fallback.rb +20 -0
  73. data/lib/spontaneous/collections/prototype_set.rb +6 -5
  74. data/lib/spontaneous/crypt.rb +2 -2
  75. data/lib/spontaneous/data_mapper/content_model/associations.rb +115 -63
  76. data/lib/spontaneous/data_mapper.rb +1 -1
  77. data/lib/spontaneous/errors.rb +6 -0
  78. data/lib/spontaneous/extensions/object_space.rb +6 -0
  79. data/lib/spontaneous/facet.rb +1 -0
  80. data/lib/spontaneous/field/base.rb +86 -13
  81. data/lib/spontaneous/field/boolean.rb +65 -0
  82. data/lib/spontaneous/field/file.rb +17 -6
  83. data/lib/spontaneous/field/html.rb +13 -0
  84. data/lib/spontaneous/field/image/size.rb +76 -0
  85. data/lib/spontaneous/field/image.rb +99 -414
  86. data/lib/spontaneous/field/tags.rb +36 -0
  87. data/lib/spontaneous/field/update.rb +1 -1
  88. data/lib/spontaneous/field/webvideo/fallback.rb +41 -0
  89. data/lib/spontaneous/field/webvideo/vimeo.rb +113 -0
  90. data/lib/spontaneous/field/webvideo/vine.rb +94 -0
  91. data/lib/spontaneous/field/webvideo/youtube.rb +133 -0
  92. data/lib/spontaneous/field/webvideo.rb +100 -250
  93. data/lib/spontaneous/field.rb +1 -1
  94. data/lib/spontaneous/generators/site/Gemfile.tt +5 -14
  95. data/lib/spontaneous/generators/site/assets/README.md +20 -0
  96. data/lib/spontaneous/generators/site/assets/css/site.scss +8 -0
  97. data/lib/spontaneous/generators/site/assets/js/site.js +6 -0
  98. data/lib/spontaneous/generators/site/config/deploy.rb.tt +9 -0
  99. data/lib/spontaneous/generators/site/config/user_levels.yml +14 -3
  100. data/lib/spontaneous/generators/site/public/README.md +12 -0
  101. data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +2 -2
  102. data/lib/spontaneous/generators/site.rb +77 -35
  103. data/lib/spontaneous/layout.rb +6 -7
  104. data/lib/spontaneous/loader.rb +21 -13
  105. data/lib/spontaneous/media/file.rb +22 -9
  106. data/lib/spontaneous/media/image/attributes.rb +33 -0
  107. data/lib/spontaneous/media/image/format/gif.rb +4 -0
  108. data/lib/spontaneous/media/image/format/jpg.rb +17 -0
  109. data/lib/spontaneous/media/image/format/png.rb +4 -0
  110. data/lib/spontaneous/media/image/format/webp.rb +26 -0
  111. data/lib/spontaneous/media/image/format.rb +79 -0
  112. data/lib/spontaneous/media/image/optimizer.rb +69 -0
  113. data/lib/spontaneous/media/image/processor.rb +17 -0
  114. data/lib/spontaneous/media/image/renderable.rb +52 -0
  115. data/lib/spontaneous/media/image/skeptick.rb +70 -0
  116. data/lib/spontaneous/media/image.rb +50 -0
  117. data/lib/spontaneous/media/temp_file.rb +4 -0
  118. data/lib/spontaneous/media.rb +1 -0
  119. data/lib/spontaneous/model/core/aliases.rb +14 -8
  120. data/lib/spontaneous/model/core/boxes.rb +5 -2
  121. data/lib/spontaneous/model/core/entries.rb +4 -0
  122. data/lib/spontaneous/model/core/entry.rb +1 -0
  123. data/lib/spontaneous/model/core/fields.rb +5 -2
  124. data/lib/spontaneous/model/core/locks.rb +16 -0
  125. data/lib/spontaneous/model/core/media.rb +1 -15
  126. data/lib/spontaneous/model/core.rb +31 -1
  127. data/lib/spontaneous/model/page/controllers.rb +2 -2
  128. data/lib/spontaneous/model/page/formats.rb +1 -4
  129. data/lib/spontaneous/model/page/layouts.rb +6 -2
  130. data/lib/spontaneous/model/page/locks.rb +8 -2
  131. data/lib/spontaneous/model/page/page_tree.rb +2 -2
  132. data/lib/spontaneous/model/page/paths.rb +74 -9
  133. data/lib/spontaneous/model/page.rb +11 -3
  134. data/lib/spontaneous/model.rb +6 -6
  135. data/lib/spontaneous/output/context/render_cache.rb +23 -0
  136. data/lib/spontaneous/output/context.rb +56 -30
  137. data/lib/spontaneous/output/helpers/script_helper.rb +9 -53
  138. data/lib/spontaneous/output/helpers/stylesheet_helper.rb +8 -40
  139. data/lib/spontaneous/output/template/renderer.rb +17 -5
  140. data/lib/spontaneous/output.rb +0 -1
  141. data/lib/spontaneous/paths.rb +6 -2
  142. data/lib/spontaneous/permissions/access_key.rb +18 -0
  143. data/lib/spontaneous/permissions/user.rb +1 -1
  144. data/lib/spontaneous/permissions.rb +4 -1
  145. data/lib/spontaneous/plugins/application/state.rb +19 -12
  146. data/lib/spontaneous/prototypes/field_prototype.rb +14 -8
  147. data/lib/spontaneous/published_revision.rb +7 -0
  148. data/lib/spontaneous/publishing/immediate.rb +43 -34
  149. data/lib/spontaneous/publishing/revision.rb +9 -6
  150. data/lib/spontaneous/rack/asset_server.rb +20 -0
  151. data/lib/spontaneous/rack/back/alias.rb +46 -0
  152. data/lib/spontaneous/rack/back/application_assets.rb +28 -0
  153. data/lib/spontaneous/rack/back/base.rb +34 -0
  154. data/lib/spontaneous/rack/back/changes.rb +19 -0
  155. data/lib/spontaneous/rack/back/content.rb +54 -0
  156. data/lib/spontaneous/rack/back/events.rb +38 -0
  157. data/lib/spontaneous/rack/back/field.rb +37 -0
  158. data/lib/spontaneous/rack/back/file.rb +118 -0
  159. data/lib/spontaneous/rack/back/helpers.rb +71 -0
  160. data/lib/spontaneous/rack/back/index.rb +16 -0
  161. data/lib/spontaneous/rack/back/login.rb +47 -0
  162. data/lib/spontaneous/rack/back/map.rb +24 -0
  163. data/lib/spontaneous/rack/back/page.rb +46 -0
  164. data/lib/spontaneous/rack/back/preview.rb +43 -0
  165. data/lib/spontaneous/rack/back/schema.rb +30 -0
  166. data/lib/spontaneous/rack/back/site.rb +25 -0
  167. data/lib/spontaneous/rack/back/site_assets.rb +13 -0
  168. data/lib/spontaneous/rack/back/unsupported_browser.rb +7 -0
  169. data/lib/spontaneous/rack/{user_admin.rb → back/user_admin.rb} +2 -5
  170. data/lib/spontaneous/rack/back.rb +85 -764
  171. data/lib/spontaneous/rack/cacheable_file.rb +3 -3
  172. data/lib/spontaneous/rack/front.rb +16 -9
  173. data/lib/spontaneous/rack/middleware/authenticate.rb +65 -0
  174. data/lib/spontaneous/rack/middleware/csrf.rb +66 -0
  175. data/lib/spontaneous/rack/middleware/reloader.rb +52 -0
  176. data/lib/spontaneous/rack/middleware/scope.rb +60 -0
  177. data/lib/spontaneous/rack/middleware.rb +6 -0
  178. data/lib/spontaneous/rack/page_controller.rb +18 -5
  179. data/lib/spontaneous/rack/public.rb +17 -11
  180. data/lib/spontaneous/rack.rb +34 -24
  181. data/lib/spontaneous/revision.rb +29 -2
  182. data/lib/spontaneous/schema/uid.rb +4 -3
  183. data/lib/spontaneous/schema/uid_map.rb +5 -24
  184. data/lib/spontaneous/schema.rb +1 -0
  185. data/lib/spontaneous/search/database.rb +8 -0
  186. data/lib/spontaneous/search/field.rb +1 -1
  187. data/lib/spontaneous/search/index.rb +3 -5
  188. data/lib/spontaneous/server.rb +1 -1
  189. data/lib/spontaneous/simultaneous.rb +1 -1
  190. data/lib/spontaneous/site/features.rb +4 -5
  191. data/lib/spontaneous/site/helpers.rb +22 -5
  192. data/lib/spontaneous/site/instance.rb +2 -2
  193. data/lib/spontaneous/site/selectors.rb +22 -3
  194. data/lib/spontaneous/storage/cloud.rb +13 -9
  195. data/lib/spontaneous/storage/local.rb +11 -6
  196. data/lib/spontaneous/style.rb +40 -23
  197. data/lib/spontaneous/utils/database/mysql_dumper.rb +1 -1
  198. data/lib/spontaneous/utils/smush_it.rb +1 -1
  199. data/lib/spontaneous/version.rb +1 -1
  200. data/lib/spontaneous.rb +35 -33
  201. data/spontaneous.gemspec +53 -787
  202. data/test/experimental/test_crypt.rb +56 -56
  203. data/test/experimental/test_features.rb +16 -27
  204. data/test/fixtures/assets/public1/css/data.css.scss +3 -0
  205. data/test/fixtures/assets/public1/css/image1.css.scss +4 -0
  206. data/test/fixtures/assets/public1/css/import.css.scss +1 -0
  207. data/test/fixtures/assets/public1/css/urlhash.css.scss +3 -0
  208. data/test/fixtures/assets/public1/js/a.js +1 -1
  209. data/test/fixtures/assets/public1/js/all.js +4 -0
  210. data/test/fixtures/assets/public1/js/{m.coffee → m.js.coffee} +1 -0
  211. data/test/fixtures/assets/public1/x.js +1 -0
  212. data/test/fixtures/assets/public2/css/all.css +4 -0
  213. data/test/fixtures/assets/public2/css/missing.css.scss +3 -0
  214. data/test/fixtures/assets/public2/i/y.png +0 -0
  215. data/test/fixtures/assets/public2/js/b.js +1 -1
  216. data/test/fixtures/assets/public2/js/c.js +1 -1
  217. data/test/fixtures/images/size.extended.webp +0 -0
  218. data/test/fixtures/images/size.lossless.webp +0 -0
  219. data/test/fixtures/images/size.lossy.webp +0 -0
  220. data/test/fixtures/schema/before.yml +4 -4
  221. data/test/fixtures/schema/schema.yml +1 -1
  222. data/test/fixtures/templates/aliases/aaa.html.cut +0 -0
  223. data/test/fixtures/templates/extended/partial_with_renderer.html.cut +1 -0
  224. data/test/fixtures/templates/extended/with_includes_and_renderer.html.cut +2 -0
  225. data/test/functional/test_application.rb +108 -106
  226. data/test/functional/test_back.rb +924 -930
  227. data/test/functional/test_front.rb +285 -238
  228. data/test/functional/test_user_manager.rb +75 -100
  229. data/test/integration/test_installation.rb +1 -1
  230. data/test/support/matchers.rb +12 -0
  231. data/test/support/minitest.rb +121 -0
  232. data/test/support/rack.rb +45 -0
  233. data/test/support/test_start_finish.rb +103 -0
  234. data/test/test_helper.rb +21 -68
  235. data/test/test_integration_helper.rb +1 -3
  236. data/test/unit/test_alias.rb +432 -408
  237. data/test/unit/test_asset_bundler.rb +58 -58
  238. data/test/unit/test_assets.rb +485 -155
  239. data/test/unit/test_async.rb +16 -37
  240. data/test/unit/test_authentication.rb +425 -457
  241. data/test/unit/test_boxes.rb +191 -191
  242. data/test/unit/test_changesets.rb +244 -254
  243. data/test/unit/test_config.rb +128 -142
  244. data/test/unit/test_content.rb +313 -359
  245. data/test/unit/test_content_inheritance.rb +29 -30
  246. data/test/unit/test_datamapper.rb +1205 -1080
  247. data/test/unit/test_datamapper_content.rb +49 -51
  248. data/test/unit/test_extensions.rb +23 -23
  249. data/test/unit/test_fields.rb +1488 -1180
  250. data/test/unit/test_formats.rb +158 -158
  251. data/test/unit/test_generators.rb +98 -40
  252. data/test/unit/test_helpers.rb +73 -76
  253. data/test/unit/test_image_size.rb +53 -22
  254. data/test/unit/test_images.rb +164 -165
  255. data/test/unit/test_layouts.rb +133 -122
  256. data/test/unit/test_logger.rb +14 -17
  257. data/test/unit/test_media.rb +69 -84
  258. data/test/unit/test_modifications.rb +513 -525
  259. data/test/unit/test_page.rb +462 -361
  260. data/test/unit/test_permissions.rb +379 -364
  261. data/test/unit/test_piece.rb +67 -75
  262. data/test/unit/test_plugins.rb +82 -89
  263. data/test/unit/test_prototype_set.rb +215 -216
  264. data/test/unit/test_prototypes.rb +114 -124
  265. data/test/unit/test_publishing.rb +252 -289
  266. data/test/unit/test_render.rb +167 -115
  267. data/test/unit/test_revisions.rb +436 -444
  268. data/test/unit/test_schema.rb +339 -309
  269. data/test/unit/test_search.rb +577 -574
  270. data/test/unit/test_serialisation.rb +136 -147
  271. data/test/unit/test_site.rb +252 -227
  272. data/test/unit/test_skeptick.rb +130 -0
  273. data/test/unit/test_storage.rb +46 -40
  274. data/test/unit/test_structure.rb +57 -66
  275. data/test/unit/test_styles.rb +104 -104
  276. data/test/unit/test_templates.rb +72 -57
  277. data/test/unit/test_type_hierarchy.rb +15 -16
  278. data/test/unit/test_visibility.rb +239 -257
  279. metadata +455 -326
  280. data/application/js/vendor/JS.Class-2.1.5/CHANGELOG +0 -283
  281. data/application/js/vendor/JS.Class-2.1.5/MIT-LICENSE +0 -30
  282. data/application/js/vendor/JS.Class-2.1.5/README +0 -30
  283. data/application/js/vendor/JS.Class-2.1.5/min/command.js +0 -1
  284. data/application/js/vendor/JS.Class-2.1.5/min/comparable.js +0 -1
  285. data/application/js/vendor/JS.Class-2.1.5/min/constant_scope.js +0 -1
  286. data/application/js/vendor/JS.Class-2.1.5/min/decorator.js +0 -1
  287. data/application/js/vendor/JS.Class-2.1.5/min/enumerable.js +0 -1
  288. data/application/js/vendor/JS.Class-2.1.5/min/forwardable.js +0 -1
  289. data/application/js/vendor/JS.Class-2.1.5/min/hash.js +0 -1
  290. data/application/js/vendor/JS.Class-2.1.5/min/linked_list.js +0 -1
  291. data/application/js/vendor/JS.Class-2.1.5/min/loader.js +0 -1
  292. data/application/js/vendor/JS.Class-2.1.5/min/method_chain.js +0 -1
  293. data/application/js/vendor/JS.Class-2.1.5/min/observable.js +0 -1
  294. data/application/js/vendor/JS.Class-2.1.5/min/package.js +0 -1
  295. data/application/js/vendor/JS.Class-2.1.5/min/proxy.js +0 -1
  296. data/application/js/vendor/JS.Class-2.1.5/min/ruby.js +0 -1
  297. data/application/js/vendor/JS.Class-2.1.5/min/set.js +0 -1
  298. data/application/js/vendor/JS.Class-2.1.5/min/stack_trace.js +0 -1
  299. data/application/js/vendor/JS.Class-2.1.5/min/state.js +0 -1
  300. data/application/js/vendor/JS.Class-2.1.5/min/stdlib.js +0 -16
  301. data/application/js/vendor/jquery-1.6.2.min.js +0 -18
  302. data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +0 -791
  303. data/application/js/vendor/jquery-ui-1.8.9.custom.min.js +0 -415
  304. data/application/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf +0 -0
  305. data/application/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png +0 -0
  306. data/bin/limit-upload +0 -5
  307. data/bin/unlimit-upload +0 -3
  308. data/lib/spontaneous/asset/file.rb +0 -25
  309. data/lib/spontaneous/asset/source.rb +0 -28
  310. data/lib/spontaneous/image_size.rb +0 -123
  311. data/lib/spontaneous/output/assets/compression.rb +0 -58
  312. data/lib/spontaneous/output/assets.rb +0 -32
  313. data/lib/spontaneous/rack/around_back.rb +0 -20
  314. data/lib/spontaneous/rack/around_front.rb +0 -27
  315. data/lib/spontaneous/rack/around_preview.rb +0 -22
  316. data/lib/spontaneous/rack/assets.rb +0 -126
  317. data/lib/spontaneous/rack/authentication.rb +0 -20
  318. data/lib/spontaneous/rack/cookie_authentication.rb +0 -38
  319. data/lib/spontaneous/rack/helpers.rb +0 -52
  320. data/lib/spontaneous/rack/http.rb +0 -18
  321. data/lib/spontaneous/rack/media.rb +0 -30
  322. data/lib/spontaneous/rack/query_authentication.rb +0 -35
  323. data/lib/spontaneous/rack/reloader.rb +0 -45
  324. data/lib/spontaneous/rack/user_helpers.rb +0 -28
  325. /data/{README → application/js/field/markdown/text_command.js} +0 -0
  326. /data/application/js/vendor/{JS.Class-2.1.5/min/core.js → js.class-2.1.5.min.js} +0 -0
  327. /data/test/fixtures/assets/public1/css/{a.scss → a.css.scss} +0 -0
  328. /data/{lib/spontaneous/generators/site/public/css/site.scss → test/fixtures/assets/public1/x.css} +0 -0
  329. /data/{lib/spontaneous/generators/site/public/js/.empty_directory → test/fixtures/assets/public1/x.png} +0 -0
  330. /data/test/fixtures/assets/public2/css/{b.scss → b.css.scss} +0 -0
  331. /data/test/fixtures/assets/public2/js/{n.coffee → n.js.coffee} +0 -0
  332. /data/test/fixtures/back/{public → assets}/css/sass_include.scss +0 -0
  333. /data/test/fixtures/back/{public → assets}/css/sass_template.scss +0 -0
  334. /data/test/fixtures/back/{public → assets}/js/coffeescript.coffee +0 -0
  335. /data/{lib/spontaneous/generators/site/public/js/site.js → test/fixtures/templates/aliases/aa_alias.html.cut} +0 -0
@@ -3,177 +3,166 @@
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
  require 'erb'
5
5
 
6
-
7
- class SerialisationTest < MiniTest::Spec
8
-
9
- def setup
6
+ describe "Serialisation" do
7
+ before do
10
8
  @site = setup_site
11
- end
12
-
13
- def teardown
14
- teardown_site
15
- end
16
-
17
- context "Content" do
18
- setup do
19
- Content.delete
20
- Page.field :title, :string, :default => "New Page"
21
-
22
- Piece.style :tepid
23
-
24
- class ::SerialisedPage < ::Page
25
- field :direction, :title => "Pointing Direction", :comment => "NSEW" do
26
- def preprocess(value)
27
- ({
28
- "N" => "North",
29
- "S" => "South",
30
- "E" => "East",
31
- "W" => "West"
32
- })[value.upcase]
33
- end
9
+ Content.delete
10
+ Page.field :title, :string, :default => "New Page"
11
+
12
+ Piece.style :tepid
13
+
14
+ class ::SerialisedPage < ::Page
15
+ field :direction, :title => "Pointing Direction", :comment => "NSEW" do
16
+ def preprocess(value)
17
+ ({
18
+ "N" => "North",
19
+ "S" => "South",
20
+ "E" => "East",
21
+ "W" => "West"
22
+ })[value.upcase]
34
23
  end
35
- field :thumbnail, :image
24
+ end
25
+ field :thumbnail, :image
36
26
 
37
- style :dancing
38
- style :sitting
39
- style :kneeling
27
+ style :dancing
28
+ style :sitting
29
+ style :kneeling
40
30
 
41
- box :insides
42
- end
31
+ box :insides
32
+ end
43
33
 
44
- class ::SerialisedPiece < ::Piece
45
- title "Type Title"
46
- field :title, :string
47
- field :location, :string, :title => "Where", :comment => "Fill in the address"
48
- field :date, :date
49
- field :image do
50
- size :thumbnail do
51
- width 50
52
- end
34
+ class ::SerialisedPiece < ::Piece
35
+ title "Type Title"
36
+ field :title, :string
37
+ field :location, :string, :title => "Where", :comment => "Fill in the address"
38
+ field :date, :date
39
+ field :image do
40
+ size :thumbnail do
41
+ width 50
53
42
  end
43
+ end
54
44
 
55
- style :freezing
56
- style :boiling
45
+ style :freezing
46
+ style :boiling
57
47
 
58
- box :things, :title => "My Things" do
59
- allow :SerialisedPage, :styles => [:sitting, :kneeling]
60
- field :title, :string
61
- end
48
+ box :things, :title => "My Things" do
49
+ allow :SerialisedPage, :styles => [:sitting, :kneeling]
50
+ field :title, :string
62
51
  end
52
+ end
63
53
 
64
54
 
65
- @dancing_style = SerialisedPage.style_prototypes[:dancing].schema_id
66
- @sitting_style = SerialisedPage.style_prototypes[:sitting].schema_id
67
- @kneeling_style = SerialisedPage.style_prototypes[:kneeling].schema_id
55
+ @dancing_style = SerialisedPage.style_prototypes[:dancing].schema_id
56
+ @sitting_style = SerialisedPage.style_prototypes[:sitting].schema_id
57
+ @kneeling_style = SerialisedPage.style_prototypes[:kneeling].schema_id
68
58
 
69
- @freezing_style = SerialisedPiece.style_prototypes[:freezing].schema_id
70
- @boiling_style = SerialisedPiece.style_prototypes[:boiling].schema_id
71
- @tepid_style = SerialisedPiece.style_prototypes[:tepid].schema_id
59
+ @freezing_style = SerialisedPiece.style_prototypes[:freezing].schema_id
60
+ @boiling_style = SerialisedPiece.style_prototypes[:boiling].schema_id
61
+ @tepid_style = SerialisedPiece.style_prototypes[:tepid].schema_id
72
62
 
73
- @fp = SerialisedPiece.field_prototypes
63
+ @fp = SerialisedPiece.field_prototypes
74
64
 
75
- template = ERB.new(File.read(File.expand_path('../../fixtures/serialisation/class_hash.yaml.erb', __FILE__)))
76
- source = File.expand_path(__FILE__)
77
- @class_hash = YAML.load(template.result(binding))
78
- end
65
+ template = ERB.new(File.read(File.expand_path('../../fixtures/serialisation/class_hash.yaml.erb', __FILE__)))
66
+ source = File.expand_path(__FILE__)
67
+ @class_hash = YAML.load(template.result(binding))
68
+ end
79
69
 
80
- teardown do
81
- Object.send(:remove_const, :SerialisedPiece)
82
- Object.send(:remove_const, :SerialisedPage)
83
- end
70
+ after do
71
+ Object.send(:remove_const, :SerialisedPiece)
72
+ Object.send(:remove_const, :SerialisedPage)
73
+ teardown_site
74
+ end
84
75
 
85
- context "classes" do
86
- should "generate a hash for JSON serialisation" do
87
- unless @class_hash == SerialisedPiece.export
88
- pp SerialisedPiece.export; puts "="*60; pp @class_hash
89
- end
90
- # SerialisedPiece.export.should == @class_hash
91
- assert_hashes_equal(@class_hash, SerialisedPiece.export)
76
+ describe "classes" do
77
+ it "generate a hash for JSON serialisation" do
78
+ unless @class_hash == SerialisedPiece.export
79
+ pp SerialisedPiece.export; puts "="*60; pp @class_hash
92
80
  end
93
- should "serialise to JSON" do
94
- Spot::deserialise_http(SerialisedPiece.serialise_http).should == @class_hash
95
- end
96
- should "include the title field name in the serialisation of page types" do
97
- SerialisedPage.export(nil)[:title_field].should == 'title'
98
- end
99
- should "use JS friendly names for type keys xxx" do
100
- class ::SerialisedPage
101
- class InnerClass < Piece
102
- end
81
+ # SerialisedPiece.export.must_equal @class_hash
82
+ assert_hashes_equal(@class_hash, SerialisedPiece.export)
83
+ end
84
+ it "serialise to JSON" do
85
+ Spot::deserialise_http(SerialisedPiece.serialise_http).must_equal @class_hash
86
+ end
87
+ it "include the title field name in the serialisation of page types" do
88
+ SerialisedPage.export(nil)[:title_field].must_equal 'title'
89
+ end
90
+ it "use JS friendly names for type keys" do
91
+ class ::SerialisedPage
92
+ class InnerClass < Piece
103
93
  end
104
- Site.schema.export['SerialisedPage.InnerClass'].should == ::SerialisedPage::InnerClass.export
105
94
  end
95
+ Site.schema.export['SerialisedPage.InnerClass'].must_equal ::SerialisedPage::InnerClass.export
106
96
  end
97
+ end
107
98
 
108
- context "pieces" do
109
- setup do
110
-
111
- date = "2011-07-07"
112
- @root = SerialisedPage.new
113
- @piece1 = SerialisedPiece.new
114
- @piece2 = SerialisedPiece.new
115
- @piece3 = SerialisedPiece.new
116
- @child = SerialisedPage.new(:slug=> "about")
117
- @root.insides << @piece1
118
- @root.insides << @piece2
119
- @piece1.things << @child
120
- @child.insides << @piece3
121
-
122
- @piece1.things.title = "Things title"
123
- @root.title = "Home"
124
- @root.direction = "S"
125
- @root.thumbnail = "/images/home.jpg"
126
- @root.uid = "home"
127
-
128
-
129
- @piece1.label = "label1"
130
- @piece1.title = "Piece 1"
131
- @piece1.location = "Piece 1 Location"
132
- @piece1.date = date
133
-
134
- @piece2.label = "label2"
135
- @piece2.title = "Piece 2"
136
- @piece2.location = "Piece 2 Location"
137
- @piece2.date = date
138
-
139
- @piece3.title = "Piece 3"
140
- @piece3.location = "Piece 3 Location"
141
- @piece3.date = date
142
-
143
- @child.title = "Child Page"
144
- @child.thumbnail = "/images/thumb.jpg"
145
- @child.direction = "N"
146
- @child.uid = "about"
147
-
148
- [@child, @piece1, @piece2, @piece3].each { |c| c.save; c.reload }
149
- @root.insides[0].style = :freezing
150
- @root.insides[0].visible = false
151
- @root.insides[1].style = :boiling
152
- @root.insides.first.first.style = :sitting
153
-
154
- @child.path.should == "/about"
155
-
156
- @root.save
157
-
158
- template = ERB.new(File.read(File.expand_path('../../fixtures/serialisation/root_hash.yaml.erb', __FILE__)))
159
- @root_hash = YAML.load(template.result(binding))
160
- @root = Content[@root.id]
161
- end
162
-
163
- should "generate a hash for JSON serialisation" do
164
- unless @root_hash == @root.export
165
- # require 'differ'
166
- # p Differ.diff_by_line(@root.export.to_yaml, @root_hash.to_yaml)
167
- puts; pp @root_hash; puts "="*60; pp @root.export
168
- end
169
- assert_hashes_equal(@root_hash, @root.export)
170
- end
99
+ describe "pieces" do
100
+ before do
101
+
102
+ date = "2011-07-07"
103
+ @root = SerialisedPage.new
104
+ @piece1 = SerialisedPiece.new
105
+ @piece2 = SerialisedPiece.new
106
+ @piece3 = SerialisedPiece.new
107
+ @child = SerialisedPage.new(:slug=> "about")
108
+ @root.insides << @piece1
109
+ @root.insides << @piece2
110
+ @piece1.things << @child
111
+ @child.insides << @piece3
112
+
113
+ @piece1.things.title = "Things title"
114
+ @root.title = "Home"
115
+ @root.direction = "S"
116
+ @root.thumbnail = "/images/home.jpg"
117
+ @root.uid = "home"
118
+
119
+
120
+ @piece1.label = "label1"
121
+ @piece1.title = "Piece 1"
122
+ @piece1.location = "Piece 1 Location"
123
+ @piece1.date = date
124
+
125
+ @piece2.label = "label2"
126
+ @piece2.title = "Piece 2"
127
+ @piece2.location = "Piece 2 Location"
128
+ @piece2.date = date
129
+
130
+ @piece3.title = "Piece 3"
131
+ @piece3.location = "Piece 3 Location"
132
+ @piece3.date = date
133
+
134
+ @child.title = "Child Page"
135
+ @child.thumbnail = "/images/thumb.jpg"
136
+ @child.direction = "N"
137
+ @child.uid = "about"
138
+
139
+ [@child, @piece1, @piece2, @piece3].each { |c| c.save; c.reload }
140
+ @root.insides[0].style = :freezing
141
+ @root.insides[0].visible = false
142
+ @root.insides[1].style = :boiling
143
+ @root.insides.first.first.style = :sitting
144
+
145
+ @child.path.must_equal "/about"
146
+
147
+ @root.save
148
+
149
+ template = ERB.new(File.read(File.expand_path('../../fixtures/serialisation/root_hash.yaml.erb', __FILE__)))
150
+ @root_hash = YAML.load(template.result(binding))
151
+ @root = Content[@root.id]
152
+ end
171
153
 
172
- should "serialise to JSON" do
173
- # hard to test this as the serialisation order appears to change
174
- Spot.deserialise_http(@root.serialise_http).should == @root.export
154
+ it "generate a hash for JSON serialisation" do
155
+ unless @root_hash == @root.export
156
+ # require 'differ'
157
+ # p Differ.diff_by_line(@root.export.to_yaml, @root_hash.to_yaml)
158
+ puts; pp @root_hash; puts "="*60; pp @root.export
175
159
  end
160
+ assert_hashes_equal(@root_hash, @root.export)
161
+ end
176
162
 
163
+ it "serialise to JSON" do
164
+ # hard to test this as the serialisation order appears to change
165
+ Spot.deserialise_http(@root.serialise_http).must_equal @root.export
177
166
  end
178
167
  end
179
168
  end