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,13 +3,9 @@
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
5
 
6
- class StylesTest < MiniTest::Spec
6
+ describe "Styles" do
7
7
 
8
- def teardown
9
- teardown_site
10
- end
11
-
12
- def setup
8
+ before do
13
9
  @site = setup_site
14
10
  @template_root = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures/styles"))
15
11
  @site.paths.add(:templates, @template_root)
@@ -17,9 +13,13 @@ class StylesTest < MiniTest::Spec
17
13
  S::Output.renderer = @renderer
18
14
  end
19
15
 
20
- context "styles for" do
16
+ after do
17
+ teardown_site
18
+ end
19
+
20
+ describe "styles for" do
21
21
 
22
- setup do
22
+ before do
23
23
  ::Content.delete
24
24
 
25
25
  ::Page.box :box1
@@ -31,7 +31,7 @@ class StylesTest < MiniTest::Spec
31
31
  class ::InvisibleClass < ::Piece; end
32
32
  end
33
33
 
34
- teardown do
34
+ after do
35
35
  ::Content.delete
36
36
  Object.send(:remove_const, :MissingClass) rescue nil
37
37
  Object.send(:remove_const, :TemplateClass) rescue nil
@@ -40,121 +40,121 @@ class StylesTest < MiniTest::Spec
40
40
  Object.send(:remove_const, :InvisibleClass) rescue nil
41
41
  end
42
42
 
43
- context "pieces" do
43
+ describe "pieces" do
44
44
 
45
45
 
46
- context "default styles" do
47
- setup do
46
+ describe "default styles" do
47
+ before do
48
48
  @page = ::Page.new
49
49
  @piece = TemplateClass.new
50
50
  @page.box1 << @piece
51
51
  end
52
52
 
53
- should "return anonymous style if no templates are found" do
53
+ it "return anonymous style if no templates are found" do
54
54
  piece = MissingClass.new
55
- piece.style.class.should == Spontaneous::Style::Default
55
+ piece.style.class.must_equal Spontaneous::Style::Default
56
56
  # piece.style.template.must_be_instance_of(Proc)
57
- piece.style.template.call.should == ""
57
+ piece.style.template.call.must_equal ""
58
58
  end
59
59
 
60
- should "derive path from owning class and name" do
60
+ it "derive path from owning class and name" do
61
61
  assert_correct_template(@piece, @template_root / 'template_class')
62
62
  end
63
63
 
64
- should "render using correct template" do
65
- @piece.render.should == "template_class.html.cut\n"
64
+ it "render using correct template" do
65
+ @piece.render.must_equal "template_class.html.cut\n"
66
66
  end
67
67
 
68
68
  # should "be able to give a list of available formats" do
69
69
  # skip("Need to re-implement the format functionality")
70
- # @piece.style.formats.should == [:epub, :html, :pdf]
70
+ # @piece.style.formats.must_equal [:epub, :html, :pdf]
71
71
  # end
72
72
 
73
- should "simply render an empty string if no templates are available" do
73
+ it "simply render an empty string if no templates are available" do
74
74
  piece = InvisibleClass.new
75
75
  @page.box1 << piece
76
- piece.render.should == ""
76
+ piece.render.must_equal ""
77
77
  end
78
78
  end
79
79
 
80
80
 
81
- context "named styles" do
82
- setup do
81
+ describe "named styles" do
82
+ before do
83
83
  @page = ::Page.new
84
84
  @piece = TemplateClass.new
85
85
  @page.box1 << @piece
86
86
  end
87
87
 
88
- should "use template found in class directory if exists" do
88
+ it "use template found in class directory if exists" do
89
89
  TemplateClass.style :named1
90
90
  assert_correct_template(@piece, @template_root / 'template_class/named1')
91
- @piece.render.should == "template_class/named1.html.cut\n"
91
+ @piece.render.must_equal "template_class/named1.html.cut\n"
92
92
  end
93
93
 
94
- should "use template in template root with correct name if it exists" do
94
+ it "use template in template root with correct name if it exists" do
95
95
  TemplateClass.style :named2
96
96
  assert_correct_template(@piece, @template_root / 'named2')
97
- @piece.render.should == "named2.html.cut\n"
97
+ @piece.render.must_equal "named2.html.cut\n"
98
98
  end
99
99
 
100
- should "allow passing of directory/stylename" do
100
+ it "allow passing of directory/stylename" do
101
101
  TemplateClass.style :'orange/apple'
102
- # piece.style.template.should == 'orange/apple'
102
+ # piece.style.template.must_equal 'orange/apple'
103
103
  assert_correct_template(@piece, @template_root / 'orange/apple')
104
- @piece.render.should == "orange/apple.html.cut\n"
104
+ @piece.render.must_equal "orange/apple.html.cut\n"
105
105
  end
106
106
 
107
- should "default to styles marked as 'default'" do
107
+ it "default to styles marked as 'default'" do
108
108
  TemplateClass.style :named1
109
109
  TemplateClass.style :named2, :default => true
110
110
  assert_correct_template(@piece, @template_root / 'named2')
111
- # @piece.style.template.should == 'named2'
112
- @piece.render.should == "named2.html.cut\n"
111
+ # @piece.style.template.must_equal 'named2'
112
+ @piece.render.must_equal "named2.html.cut\n"
113
113
  end
114
114
  end
115
115
 
116
- context "switching styles" do
117
- setup do
116
+ describe "switching styles" do
117
+ before do
118
118
  TemplateClass.style :named1
119
119
  TemplateClass.style :named2, :default => true
120
120
  @page = ::Page.new
121
121
  @piece = TemplateClass.new
122
122
  @page.box1 << @piece
123
123
  assert_correct_template(@piece, @template_root / 'named2')
124
- # @piece.style.template.should == 'named2'
125
- @piece.render.should == "named2.html.cut\n"
124
+ # @piece.style.template.must_equal 'named2'
125
+ @piece.render.must_equal "named2.html.cut\n"
126
126
  end
127
127
 
128
- should "be possible" do
128
+ it "be possible" do
129
129
  @piece.style = :named1
130
130
  assert_correct_template(@piece, @template_root / 'template_class/named1')
131
- @piece.render.should == "template_class/named1.html.cut\n"
131
+ @piece.render.must_equal "template_class/named1.html.cut\n"
132
132
  end
133
133
 
134
- should "persist" do
134
+ it "persist" do
135
135
  @piece.style = :named1
136
136
  @piece.save
137
137
  @piece = Content[@piece.id]
138
- # @piece.style.template.should == 'template_class/named1'
138
+ # @piece.style.template.must_equal 'template_class/named1'
139
139
  assert_correct_template(@piece, @template_root / 'template_class/named1')
140
140
  end
141
141
  end
142
142
 
143
- context "inheriting styles" do
144
- should "use default for sub class if it exists" do
143
+ describe "inheriting styles" do
144
+ it "use default for sub class if it exists" do
145
145
  piece = TemplateSubClass1.new
146
146
  assert_correct_template(piece, @template_root / 'template_sub_class1')
147
147
  end
148
148
 
149
- should "fall back to default style for superclass if default for class doesn't exist" do
149
+ it "fall back to default style for superclass if default for class doesn't exist" do
150
150
  piece = TemplateSubClass2.new
151
151
  assert_correct_template(piece, @template_root / 'template_class')
152
- # piece.style.template.should == 'template_class'
152
+ # piece.style.template.must_equal 'template_class'
153
153
  end
154
- should "fall back to defined default style for superclass if default for class doesn't exist" do
154
+ it "fall back to defined default style for superclass if default for class doesn't exist" do
155
155
  TemplateClass.style :named1
156
156
  piece = TemplateSubClass2.new
157
- # piece.style.template.should == 'template_class/named1'
157
+ # piece.style.template.must_equal 'template_class/named1'
158
158
  assert_correct_template(piece, @template_root / 'template_class/named1')
159
159
  end
160
160
  end
@@ -162,61 +162,61 @@ class StylesTest < MiniTest::Spec
162
162
 
163
163
 
164
164
 
165
- # context "inline templates" do
166
- # setup do
165
+ # describe "inline templates" do
166
+ # before do
167
167
  # @class = Class.new(Content)
168
168
  # end
169
169
  # should "be definiable" do
170
170
  # @class.style :simple
171
- # @class.styles.length.should == 1
171
+ # @class.styles.length.must_equal 1
172
172
  # t = @class.styles.first
173
- # t.name.should == :simple
173
+ # t.name.must_equal :simple
174
174
  # end
175
175
 
176
176
  # should "have configurable filenames" do
177
177
  # @class.style :simple, :filename => "funky"
178
178
  # t = @class.styles.first
179
- # t.filename.should == "funky.html.cut"
179
+ # t.filename.must_equal "funky.html.cut"
180
180
  # end
181
181
 
182
182
  # should "have sane default titles" do
183
183
  # @class.style :simple_style
184
184
  # t = @class.styles.first
185
- # t.title.should == "Simple Style"
185
+ # t.title.must_equal "Simple Style"
186
186
  # end
187
187
 
188
188
  # should "have configurable titles" do
189
189
  # @class.style :simple, :title => "A Simple Style"
190
190
  # t = @class.styles.first
191
- # t.title.should == "A Simple Style"
191
+ # t.title.must_equal "A Simple Style"
192
192
  # end
193
193
 
194
194
  # should "be accessable by name" do
195
195
  # @class.style :simple
196
196
  # @class.style :complex
197
- # @class.styles[:simple].should == @class.styles.first
197
+ # @class.styles[:simple].must_equal @class.styles.first
198
198
  # end
199
199
 
200
200
  # should "have #styles as a shortcut for #inliine_styles" do
201
201
  # @class.style :simple
202
- # @class.styles.should == @class.styles
202
+ # @class.styles.must_equal @class.styles
203
203
  # end
204
204
 
205
205
  # should "take the first style as the default" do
206
206
  # @class.style :simple
207
207
  # @class.style :complex
208
- # @class.styles.default.should == @class.styles[:simple]
208
+ # @class.styles.default.must_equal @class.styles[:simple]
209
209
  # end
210
210
 
211
211
  # should "honour the :default flag" do
212
212
  # @class.style :simple
213
213
  # @class.style :complex, :default => true
214
- # @class.styles.default.should == @class.styles[:complex]
214
+ # @class.styles.default.must_equal @class.styles[:complex]
215
215
  # end
216
216
  # end
217
217
 
218
- # context "assigned styles" do
219
- # setup do
218
+ # describe "assigned styles" do
219
+ # before do
220
220
  # class ::StyleTestClass < Content
221
221
  # style :first_style
222
222
  # style :default_style, :default => true
@@ -227,30 +227,30 @@ class StylesTest < MiniTest::Spec
227
227
  # @a << @b
228
228
  # end
229
229
 
230
- # teardown do
230
+ # after do
231
231
  # Object.send(:remove_const, :StyleTestClass)
232
232
  # end
233
233
 
234
234
  # should "assign the default style" do
235
- # @a.pieces.first.style.should == ::StyleTestClass.styles.default
235
+ # @a.pieces.first.style.must_equal ::StyleTestClass.styles.default
236
236
  # end
237
237
 
238
238
  # should "persist" do
239
239
  # @a.save
240
240
  # @b.save
241
241
  # @a = StyleTestClass[@a.id]
242
- # @a.pieces.first.style.should == ::StyleTestClass.styles.default
242
+ # @a.pieces.first.style.must_equal ::StyleTestClass.styles.default
243
243
  # end
244
244
 
245
245
  # should "be settable" do
246
246
  # @a.pieces.first.style = StyleTestClass.styles[:first_style]
247
247
  # @a.save
248
248
  # @a = StyleTestClass[@a.id]
249
- # @a.pieces.first.style.should == ::StyleTestClass.styles[:first_style]
249
+ # @a.pieces.first.style.must_equal ::StyleTestClass.styles[:first_style]
250
250
  # end
251
251
 
252
- # context "direct piece access" do
253
- # setup do
252
+ # describe "direct piece access" do
253
+ # before do
254
254
  # @a.pieces.first.style = StyleTestClass.styles[:first_style]
255
255
  # @a.save
256
256
  # piece_id = @a.pieces.first.target.id
@@ -258,7 +258,7 @@ class StylesTest < MiniTest::Spec
258
258
  # end
259
259
 
260
260
  # should "be accessible directly for pieces" do
261
- # @piece.style.should == ::StyleTestClass.styles[:first_style]
261
+ # @piece.style.must_equal ::StyleTestClass.styles[:first_style]
262
262
  # end
263
263
 
264
264
  # should "not be settable directly on bare pieces" do
@@ -267,8 +267,8 @@ class StylesTest < MiniTest::Spec
267
267
  # end
268
268
  # end
269
269
 
270
- context "inline templates" do
271
- setup do
270
+ describe "inline templates" do
271
+ before do
272
272
  Page.add_output :pdf
273
273
  class ::InlineTemplateClass < Piece
274
274
  field :title
@@ -283,20 +283,20 @@ class StylesTest < MiniTest::Spec
283
283
  @a.title = "Total Title"
284
284
  end
285
285
 
286
- teardown do
286
+ after do
287
287
  Object.send(:remove_const, :InlineTemplateClass) rescue nil
288
288
  end
289
289
 
290
- should "be used to render the content" do
291
- @a.render.should == "html: Total Title"
290
+ it "be used to render the content" do
291
+ @a.render.must_equal "html: Total Title"
292
292
  end
293
293
 
294
- should "be used to render the content with the right format" do
295
- @a.render(:pdf).should == "pdf: Total Title"
294
+ it "be used to render the content with the right format" do
295
+ @a.render(:pdf).must_equal "pdf: Total Title"
296
296
  end
297
297
  end
298
298
 
299
- # context "default styles" do
299
+ # describe "default styles" do
300
300
  # class ::DefaultStyleClass < Spontaneous::Box
301
301
  # field :title
302
302
  # end
@@ -308,7 +308,7 @@ class StylesTest < MiniTest::Spec
308
308
  # field :title
309
309
  # box :with_style, :type => :DefaultStyleClass
310
310
  # end
311
- # setup do
311
+ # before do
312
312
  # Content.delete
313
313
 
314
314
  # @with_default_style = WithDefaultStyleClass.new
@@ -319,7 +319,7 @@ class StylesTest < MiniTest::Spec
319
319
  # # @without_default_style.with_style.path = "Box Title"
320
320
  # end
321
321
 
322
- # teardown do
322
+ # after do
323
323
  # Content.delete
324
324
  # # Object.send(:remove_const, :DefaultStyleClass)
325
325
  # # Object.send(:remove_const, :WithDefaultStyleClass)
@@ -327,32 +327,32 @@ class StylesTest < MiniTest::Spec
327
327
  # end
328
328
 
329
329
  # should "be used when available" do
330
- # @with_default_style.render.should == "Title: Total Title\\n"
330
+ # @with_default_style.render.must_equal "Title: Total Title\\n"
331
331
  # end
332
332
 
333
333
  # should "be used by boxes too" do
334
- # @without_default_style.with_style.render.should == "Title: Box Title\\n"
334
+ # @without_default_style.with_style.render.must_equal "Title: Box Title\\n"
335
335
  # end
336
336
 
337
337
  # should "fallback to anonymous style when default style template doesn't exist" do
338
- # @without_default_style.render.should == "Title: Box Title\\n"
338
+ # @without_default_style.render.must_equal "Title: Box Title\\n"
339
339
  # end
340
340
  # end
341
341
  end
342
342
 
343
- context "boxes" do
344
- setup do
343
+ describe "boxes" do
344
+ before do
345
345
  class ::BoxA < ::Box; end
346
346
  class ::BoxB < ::Box; end
347
347
  end
348
348
 
349
- teardown do
349
+ after do
350
350
  Object.send(:remove_const, :BoxA) rescue nil
351
351
  Object.send(:remove_const, :BoxB) rescue nil
352
352
  end
353
353
 
354
- context "anonymous boxes" do
355
- setup do
354
+ describe "anonymous boxes" do
355
+ before do
356
356
  TemplateClass.box :results
357
357
  TemplateClass.box :entities
358
358
  @page = ::Page.new
@@ -360,28 +360,28 @@ class StylesTest < MiniTest::Spec
360
360
  @page.box1 << @piece
361
361
  end
362
362
 
363
- should "use template with their name inside container class template dir if it exists" do
363
+ it "use template with their name inside container class template dir if it exists" do
364
364
  @piece.results << TemplateClass.new
365
365
  assert_correct_template(@piece.results, @template_root / 'template_class/results')
366
- @piece.results.render.should == "template_class/results.html.cut\n"
366
+ @piece.results.render.must_equal "template_class/results.html.cut\n"
367
367
  end
368
368
 
369
- should "render a simple list of content if named template doesn't exist" do
369
+ it "render a simple list of content if named template doesn't exist" do
370
370
  @piece.entities << TemplateClass.new
371
371
  @piece.entities << TemplateClass.new
372
- @piece.entities.render.should == "template_class.html.cut\n\ntemplate_class.html.cut\n"
373
- @piece.entities.style.template.call.should == '${ render_content }'
372
+ @piece.entities.render.must_equal "template_class.html.cut\n\ntemplate_class.html.cut\n"
373
+ @piece.entities.style.template.call.must_equal '${ render_content }'
374
374
  end
375
375
 
376
376
 
377
- should "use a named template if given" do
377
+ it "use a named template if given" do
378
378
  TemplateClass.box :things do
379
379
  style :named1
380
380
  end
381
381
  @piece = TemplateClass.new
382
382
  @page.box1 << @piece
383
383
  assert_correct_template(@piece.things, @template_root / 'template_class/named1')
384
- @piece.things.render.should == "template_class/named1.html.cut\n"
384
+ @piece.things.render.must_equal "template_class/named1.html.cut\n"
385
385
 
386
386
  TemplateClass.box :dongles do
387
387
  style :named2
@@ -389,10 +389,10 @@ class StylesTest < MiniTest::Spec
389
389
  @piece = TemplateClass.new
390
390
  @page.box1 << @piece
391
391
  assert_correct_template(@piece.dongles, @template_root / 'named2')
392
- @piece.dongles.render.should == "named2.html.cut\n"
392
+ @piece.dongles.render.must_equal "named2.html.cut\n"
393
393
  end
394
394
 
395
- should "use styles assigned in a subclass xxx" do
395
+ it "use styles assigned in a subclass" do
396
396
  ::TemplateSubClass = Class.new(TemplateClass)
397
397
  ::TemplateSubSubClass = Class.new(TemplateSubClass)
398
398
 
@@ -435,8 +435,8 @@ class StylesTest < MiniTest::Spec
435
435
  end
436
436
  end
437
437
 
438
- context "boxes with a specified class" do
439
- setup do
438
+ describe "boxes with a specified class" do
439
+ before do
440
440
  TemplateClass.box :entities, :type => :BoxA
441
441
  TemplateClass.box :results, :type => :BoxB
442
442
  @page = ::Page.new
@@ -444,17 +444,17 @@ class StylesTest < MiniTest::Spec
444
444
  @page.box1 << @piece
445
445
  end
446
446
 
447
- should "use the box name template if it exists" do
447
+ it "use the box name template if it exists" do
448
448
  assert_correct_template(@piece.results, @template_root / 'template_class/results')
449
- @piece.results.render.should == "template_class/results.html.cut\n"
449
+ @piece.results.render.must_equal "template_class/results.html.cut\n"
450
450
  end
451
451
 
452
- should "use the box classes default template if box name template is missing" do
452
+ it "use the box classes default template if box name template is missing" do
453
453
  assert_correct_template(@piece.entities, @template_root / 'box_a')
454
- @piece.entities.render.should == "box_a.html.cut\n"
454
+ @piece.entities.render.must_equal "box_a.html.cut\n"
455
455
  end
456
456
 
457
- should "find templates for box subclasses with specified types defined in a supertype" do
457
+ it "find templates for box subclasses with specified types defined in a supertype" do
458
458
  Object.send(:remove_const, :TemplateSubClass) rescue nil
459
459
  Object.send(:remove_const, :BoxASubclass) rescue nil
460
460
  class ::BoxASubclass < BoxA; end
@@ -468,13 +468,13 @@ class StylesTest < MiniTest::Spec
468
468
  Object.send(:remove_const, :TemplateSubClass) rescue nil
469
469
  end
470
470
 
471
- context "with configured styles" do
472
- setup do
471
+ describe "with configured styles" do
472
+ before do
473
473
  BoxA.style :runny
474
474
  BoxA.style :walky
475
475
  end
476
476
 
477
- should "be configurable to use a specific style" do
477
+ it "be configurable to use a specific style" do
478
478
  TemplateClass.box :sprinters, :type => :BoxA, :style => :runny
479
479
  TemplateClass.box :strollers, :type => :BoxA, :style => :walky
480
480
  page = ::Page.new