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
@@ -2,192 +2,192 @@
2
2
 
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
- class FormatsTest < MiniTest::Spec
6
- context "Pages" do
7
- setup do
5
+ describe "Formats" do
6
+ describe "Pages" do
7
+ before do
8
8
  @site = setup_site
9
9
  @site.paths.add :templates, File.expand_path('../../fixtures/outputs/templates', __FILE__)
10
10
  # class Page < ::Page; end
11
11
  class FPage < ::Page; end
12
12
  end
13
13
 
14
- teardown do
15
- self.class.send(:remove_const, :FPage) rescue nil
14
+ after do
15
+ Object.send(:remove_const, :FPage) rescue nil
16
16
  teardown_site
17
17
  end
18
18
 
19
- context "default output" do
20
- should "be named :html" do
21
- FPage.outputs.map(&:name).should == [:html]
19
+ describe "default output" do
20
+ it "be named :html" do
21
+ FPage.outputs.map(&:name).must_equal [:html]
22
22
  end
23
23
 
24
- should "be html format" do
25
- FPage.outputs.map(&:format).should == [:html]
24
+ it "be html format" do
25
+ FPage.outputs.map(&:format).must_equal [:html]
26
26
  end
27
27
 
28
- should "be public" do
29
- FPage.outputs.map(&:private?).should == [false]
30
- FPage.outputs.map(&:public?).should == [true]
28
+ it "be public" do
29
+ FPage.outputs.map(&:private?).must_equal [false]
30
+ FPage.outputs.map(&:public?).must_equal [true]
31
31
  end
32
32
 
33
- should "be static" do
34
- FPage.outputs.map(&:dynamic?).should == [false]
33
+ it "be static" do
34
+ FPage.outputs.map(&:dynamic?).must_equal [false]
35
35
  end
36
36
  end
37
37
 
38
- should "have tests for supported outputs" do
39
- FPage.provides_output?(:html).should be_true
40
- FPage.provides_output?(:rss).should be_false
38
+ it "have tests for supported outputs" do
39
+ assert FPage.provides_output?(:html)
40
+ refute FPage.provides_output?(:rss)
41
41
  end
42
42
 
43
- should "map an empty output onto the default one" do
44
- FPage.provides_output?(nil).should be_true
43
+ it "map an empty output onto the default one" do
44
+ assert FPage.provides_output?(nil)
45
45
  end
46
46
 
47
- should "return the mime-type for a output" do
48
- FPage.mime_type(:html).should == "text/html"
49
- FPage.mime_type(:atom).should == "application/atom+xml"
47
+ it "return the mime-type for a output" do
48
+ FPage.mime_type(:html).must_equal "text/html"
49
+ FPage.mime_type(:atom).must_equal "application/atom+xml"
50
50
  end
51
51
 
52
52
 
53
- should "return the output class for a named output" do
53
+ it "return the output class for a named output" do
54
54
  FPage.output(:html).must_be_instance_of(Class)
55
- FPage.output(:html).ancestors.include?(S::Output::HTML).should be_true
55
+ assert FPage.output(:html).ancestors.include?(S::Output::HTML)
56
56
  end
57
57
 
58
- should "correctly determine mimetypes for new (known) formats" do
58
+ it "correctly determine mimetypes for new (known) formats" do
59
59
  FPage.add_output :au
60
- FPage.output(:au).mimetype.should == "audio/basic"
60
+ FPage.output(:au).mimetype.must_equal "audio/basic"
61
61
  end
62
62
 
63
- should "dynamically generate output classes for unknown formats" do
63
+ it "dynamically generate output classes for unknown formats" do
64
64
  FPage.add_output :fish, :format => :unknown
65
- FPage.output(:fish).ancestors[1].should == S::Output::UNKNOWN
66
- FPage.output(:fish).ancestors[2].should == S::Output::Plain
65
+ FPage.output(:fish).ancestors[1].must_equal S::Output::UNKNOWN
66
+ FPage.output(:fish).ancestors[2].must_equal S::Output::Plain
67
67
  end
68
68
 
69
- should "dynamically generate output classes based on HTML for outputs with unspecified formats" do
69
+ it "dynamically generate output classes based on HTML for outputs with unspecified formats" do
70
70
  FPage.add_output :fish
71
- FPage.output(:fish).ancestors[1].should == S::Output::HTML
71
+ FPage.output(:fish).ancestors[1].must_equal S::Output::HTML
72
72
  end
73
73
 
74
- should "return the format wrapper for a format name string" do
75
- FPage.output("html").should == FPage.output(:html)
74
+ it "return the format wrapper for a format name string" do
75
+ FPage.output("html").must_equal FPage.output(:html)
76
76
  end
77
77
 
78
- should "give the default format for blank format names" do
78
+ it "give the default format for blank format names" do
79
79
  html = FPage.output(:html)
80
- FPage.output(nil).should == html
81
- FPage.output.should == html
80
+ FPage.output(nil).must_equal html
81
+ FPage.output.must_equal html
82
82
  end
83
83
 
84
- should "provide a symbol version of the output name" do
85
- FPage.output(:html).to_sym.should == :html
84
+ it "provide a symbol version of the output name" do
85
+ FPage.output(:html).to_sym.must_equal :html
86
86
  end
87
87
 
88
- should "provide the correct output extension for dynamic pages" do
89
- FPage.output.extension(true).should == ".html.cut"
90
- FPage.output.extension(true, "erb").should == ".html.erb"
88
+ it "provide the correct output extension for dynamic pages" do
89
+ FPage.output.extension(true).must_equal ".html.cut"
90
+ FPage.output.extension(true, "erb").must_equal ".html.erb"
91
91
  end
92
92
 
93
- should "override an existing output if the format is the same" do
93
+ it "override an existing output if the format is the same" do
94
94
  FPage.add_output :rss
95
- FPage.outputs.length.should == 2
96
- FPage.outputs.map(&:format).should == [:html, :rss]
95
+ FPage.outputs.length.must_equal 2
96
+ FPage.outputs.map(&:format).must_equal [:html, :rss]
97
97
  format = FPage.outputs.first.format
98
98
  FPage.add_output format, :dynamic => true
99
- FPage.outputs.length.should == 2
100
- FPage.outputs.map(&:format).should == [:html, :rss]
101
- FPage.output(format).dynamic?.should be_true
99
+ FPage.outputs.length.must_equal 2
100
+ FPage.outputs.map(&:format).must_equal [:html, :rss]
101
+ assert FPage.output(format).dynamic?
102
102
  end
103
103
 
104
- should "correctly set the format from the output name if it's recognised" do
104
+ it "correctly set the format from the output name if it's recognised" do
105
105
  FPage.add_output :pdf
106
- FPage.output(:pdf).format.should == :pdf
107
- FPage.output(:pdf).mimetype.should == "application/pdf"
106
+ FPage.output(:pdf).format.must_equal :pdf
107
+ FPage.output(:pdf).mimetype.must_equal "application/pdf"
108
108
  end
109
109
 
110
- should "default to a format of html for unknown output formats" do
110
+ it "default to a format of html for unknown output formats" do
111
111
  FPage.outputs [:xyzz]
112
- FPage.default_output.format.should == :html
113
- FPage.output(:xyzz).format.should == :html
114
- FPage.output(:xyzz).mimetype.should == "text/html"
112
+ FPage.default_output.format.must_equal :html
113
+ FPage.output(:xyzz).format.must_equal :html
114
+ FPage.output(:xyzz).mimetype.must_equal "text/html"
115
115
  end
116
116
 
117
- should "allow the setting of a default format for an output" do
117
+ it "allow the setting of a default format for an output" do
118
118
  FPage.add_output :rss, :format => :html
119
- FPage.output(:rss).format.should == :html
120
- FPage.output(:rss).mimetype.should == "text/html"
119
+ FPage.output(:rss).format.must_equal :html
120
+ FPage.output(:rss).mimetype.must_equal "text/html"
121
121
  end
122
122
 
123
- should "allow for custom mimetypes" do
123
+ it "allow for custom mimetypes" do
124
124
  FPage.add_output :rss, :format => :html, :mimetype => "application/xhtml+xml"
125
- FPage.output(:rss).format.should == :html
126
- FPage.output(:rss).mimetype.should == "application/xhtml+xml"
125
+ FPage.output(:rss).format.must_equal :html
126
+ FPage.output(:rss).mimetype.must_equal "application/xhtml+xml"
127
127
  end
128
128
 
129
- should "allow for marking an output as 'private'" do
129
+ it "allow for marking an output as 'private'" do
130
130
  FPage.add_output :rss, :private => true
131
- FPage.output(:rss).public?.should be_false
132
- FPage.output(:rss).private?.should be_true
131
+ refute FPage.output(:rss).public?
132
+ assert FPage.output(:rss).private?
133
133
  end
134
134
 
135
- should "provide the correct output extension for static pages" do
136
- FPage.output(:html).extension.should == ".html"
135
+ it "provide the correct output extension for static pages" do
136
+ FPage.output(:html).extension.must_equal ".html"
137
137
  end
138
138
 
139
- should "provide the correct output extension for static pages of non-html formats" do
139
+ it "provide the correct output extension for static pages of non-html formats" do
140
140
  FPage.add_output :pdf
141
- FPage.output(:pdf).extension.should == ".pdf"
141
+ FPage.output(:pdf).extension.must_equal ".pdf"
142
142
  end
143
143
 
144
- should "name the output according to the format" do
144
+ it "name the output according to the format" do
145
145
  FPage.add_output :atom, :format => :html
146
- FPage.output(:atom).extension.should == ".atom"
146
+ FPage.output(:atom).extension.must_equal ".atom"
147
147
  end
148
148
 
149
- should "name the output using the configured extension" do
149
+ it "name the output using the configured extension" do
150
150
  FPage.add_output :atom, :format => :html, :extension => "rss"
151
- FPage.output(:atom).extension.should == ".rss"
151
+ FPage.output(:atom).extension.must_equal ".rss"
152
152
  end
153
153
 
154
- should "allow for complex custom file extensions" do
154
+ it "allow for complex custom file extensions" do
155
155
  FPage.add_output :rss, :extension => ".rss.xml.php"
156
- FPage.output(:rss).extension.should == ".rss.xml.php"
157
- FPage.output(:rss).extension(true).should == ".rss.xml.php"
156
+ FPage.output(:rss).extension.must_equal ".rss.xml.php"
157
+ FPage.output(:rss).extension(true).must_equal ".rss.xml.php"
158
158
  end
159
159
 
160
160
  # not sure I need this. The dynamic? flag is either set to always true in the output defn
161
161
  # in which case you can use the :extension setting to just absolutely set the final output
162
162
  # extension, or the rendered page is detected as dynamic by the templating system in which
163
163
  # case it's most likely that the output language is the same as the templating system.
164
- should "allow for setting a custom dynamic extension" do
164
+ it "allow for setting a custom dynamic extension" do
165
165
  FPage.add_output :fish, :format => :html, :dynamic => true, :language => "php"
166
- FPage.output(:fish).extension.should == ".fish.php"
166
+ FPage.output(:fish).extension.must_equal ".fish.php"
167
167
  FPage.add_output :foul, :format => :html, :language => "php"
168
- FPage.output(:foul).extension(true).should == ".foul.php"
168
+ FPage.output(:foul).extension(true).must_equal ".foul.php"
169
169
  end
170
170
 
171
171
  # What would be more useful perhaps is a way to define a custom, per output, test for "dynamicness"
172
- should "allow for a custom test for dynamicness"
172
+ it "allow for a custom test for dynamicness"
173
173
 
174
- should "override extension even for dynamic outputs" do
174
+ it "override extension even for dynamic outputs" do
175
175
  FPage.add_output :fish, :dynamic => true, :extension => "php"
176
- FPage.output(:fish).extension(true).should == ".php"
176
+ FPage.output(:fish).extension(true).must_equal ".php"
177
177
  FPage.add_output :foul, :dynamic => true, :extension => ".php"
178
- FPage.output(:foul).extension(true).should == ".php"
178
+ FPage.output(:foul).extension(true).must_equal ".php"
179
179
  end
180
180
 
181
- context "format classes" do
182
- should "enable new formats" do
183
- S::Output.unknown_format?(:fishhtml).should be_true
181
+ describe "format classes" do
182
+ it "enable new formats" do
183
+ assert S::Output.unknown_format?(:fishhtml)
184
184
  class FishHTMLFormat < S::Output::HTML
185
185
  provides_format :fishhtml
186
186
  end
187
- S::Output.unknown_format?(:fishhtml).should be_false
187
+ refute S::Output.unknown_format?(:fishhtml)
188
188
  end
189
189
 
190
- should "inherit helper classes from their superclass" do
190
+ it "inherit helper classes from their superclass" do
191
191
  module CustomHelper1
192
192
  def here_is_my_custom_helper1; end
193
193
  end
@@ -202,161 +202,161 @@ class FormatsTest < MiniTest::Spec
202
202
  output = page.output(:newhtml)
203
203
  newhtml_context = output.context
204
204
  html_context_ancestors = page.output(:html).context.ancestors[1..-1]
205
- Set.new(newhtml_context.ancestors[1..-1]).should == Set.new(html_context_ancestors + [CustomHelper1])
205
+ Set.new(newhtml_context.ancestors[1..-1]).must_equal Set.new(html_context_ancestors + [CustomHelper1])
206
206
  end
207
207
  end
208
208
 
209
- context "instances" do
210
- setup do
209
+ describe "instances" do
210
+ before do
211
211
  FPage.add_output :pdf, :dynamic => true
212
212
  @page = FPage.new
213
213
  end
214
214
 
215
- should "generate a list of output instances tied to the page" do
215
+ it "generate a list of output instances tied to the page" do
216
216
  outputs = @page.outputs
217
- outputs.map(&:class).should == [FPage.output(:html), FPage.output(:pdf)]
217
+ outputs.map(&:class).must_equal [FPage.output(:html), FPage.output(:pdf)]
218
218
  end
219
219
 
220
- should "generate output instances tied to the page" do
221
- @page.outputs.map(&:format).should == [:html, :pdf]
222
- @page.default_output.format.should == :html
220
+ it "generate output instances tied to the page" do
221
+ @page.outputs.map(&:format).must_equal [:html, :pdf]
222
+ @page.default_output.format.must_equal :html
223
223
 
224
224
  output = @page.output(:html)
225
225
  output.must_be_instance_of FPage.output(:html)
226
- output.page.should == @page
227
- output.format.should == :html
228
- output.dynamic?.should be_false
229
- output.extension.should == ".html"
226
+ output.page.must_equal @page
227
+ output.format.must_equal :html
228
+ refute output.dynamic?
229
+ output.extension.must_equal ".html"
230
230
 
231
- @page.output(:pdf).dynamic?.should be_true
231
+ assert @page.output(:pdf).dynamic?
232
232
  end
233
233
 
234
- should "provide a default output instance" do
234
+ it "provide a default output instance" do
235
235
  output = @page.default_output
236
236
  output.must_be_instance_of FPage.output(:html)
237
237
  end
238
238
 
239
- should "know that they provide a certain format" do
240
- @page.provides_output?(:html).should be_true
241
- @page.provides_output?(:pdf).should be_true
242
- @page.provides_output?(:xyz).should be_false
239
+ it "know that they provide a certain format" do
240
+ assert @page.provides_output?(:html)
241
+ assert @page.provides_output?(:pdf)
242
+ refute @page.provides_output?(:xyz)
243
243
  end
244
244
 
245
- should "provide a symbol version of the output name" do
246
- @page.output(:html).to_sym.should == :html
245
+ it "provide a symbol version of the output name" do
246
+ @page.output(:html).to_sym.must_equal :html
247
247
  end
248
248
 
249
- should "return the output instance if used as an output request" do
249
+ it "return the output instance if used as an output request" do
250
250
  output = @page.output(:html)
251
- @page.output(output).should == output
251
+ @page.output(output).must_equal output
252
252
  end
253
253
  end
254
254
 
255
- context "with custom formats" do
256
- setup do
255
+ describe "with custom formats" do
256
+ before do
257
257
  FPage.outputs :rss, :html, :json
258
258
  end
259
259
 
260
- should "be able to define their supported formats" do
261
- FPage.outputs.map(&:format).should == [:rss, :html, :json]
260
+ it "be able to define their supported formats" do
261
+ FPage.outputs.map(&:format).must_equal [:rss, :html, :json]
262
262
  end
263
263
 
264
- should "re-define the default format" do
265
- FPage.default_output.format.should == :rss
264
+ it "re-define the default format" do
265
+ FPage.default_output.format.must_equal :rss
266
266
  end
267
267
 
268
- should "have tests for supported formats" do
269
- FPage.provides_output?(:html).should be_true
270
- FPage.provides_output?(:rss).should be_true
271
- FPage.provides_output?(:json).should be_true
272
- FPage.provides_output?(:xyz).should be_false
268
+ it "have tests for supported formats" do
269
+ assert FPage.provides_output?(:html)
270
+ assert FPage.provides_output?(:rss)
271
+ assert FPage.provides_output?(:json)
272
+ refute FPage.provides_output?(:xyz)
273
273
  end
274
274
 
275
275
 
276
- should "accept new formats when accompanied by a mime-type" do
276
+ it "accept new formats when accompanied by a mime-type" do
277
277
  FPage.outputs [:xyz, {:mimetype => "application/xyz"}]
278
278
  end
279
279
 
280
- should "allow addition of a single format" do
280
+ it "allow addition of a single format" do
281
281
  FPage.add_output :atom
282
- FPage.outputs.map(&:format).should == [:rss, :html, :json, :atom]
282
+ FPage.outputs.map(&:format).must_equal [:rss, :html, :json, :atom]
283
283
  end
284
284
 
285
- should "allow custom post-processing of render" do
285
+ it "allow custom post-processing of render" do
286
286
  FPage.add_output :atom, :postprocess => lambda { |page, output| output.gsub(/a/, 'x') }
287
287
  page = FPage.new
288
- page.render(:atom).should =~ /<xtom>/
288
+ page.render(:atom).must_match /<xtom>/
289
289
  end
290
290
  end
291
291
 
292
- context "with custom mime-types" do
293
- setup do
292
+ describe "with custom mime-types" do
293
+ before do
294
294
  FPage.outputs [ :html, {:mimetype => "application/xhtml+xml"}], [:js, {:mimetype => "application/json"} ]
295
295
  end
296
296
 
297
- should "still provide the correct default format" do
298
- FPage.default_output.format.should == :html
299
- FPage.default_output.name.should == :html
297
+ it "still provide the correct default format" do
298
+ FPage.default_output.format.must_equal :html
299
+ FPage.default_output.name.must_equal :html
300
300
  end
301
301
 
302
- should "return the custom mime-type for a output" do
303
- FPage.mime_type(:html).should == "application/xhtml+xml"
304
- FPage.mime_type(:js).should == "application/json"
305
- FPage.mime_type(:atom).should == "application/atom+xml"
302
+ it "return the custom mime-type for a output" do
303
+ FPage.mime_type(:html).must_equal "application/xhtml+xml"
304
+ FPage.mime_type(:js).must_equal "application/json"
305
+ FPage.mime_type(:atom).must_equal "application/atom+xml"
306
306
  end
307
307
 
308
- should "return mime-type values from instances" do
308
+ it "return mime-type values from instances" do
309
309
  page = FPage.new
310
- page.mime_type(:html).should == "application/xhtml+xml"
310
+ page.mime_type(:html).must_equal "application/xhtml+xml"
311
311
  end
312
312
 
313
- should "allow addition of a single custom output" do
313
+ it "allow addition of a single custom output" do
314
314
  FPage.add_output :ddd, :mimetype => "application/ddd"
315
- FPage.outputs.map(&:format).should == [:html, :js, :ddd]
315
+ FPage.outputs.map(&:format).must_equal [:html, :js, :ddd]
316
316
  page = FPage.new
317
- page.mime_type(:ddd).should == "application/ddd"
317
+ page.mime_type(:ddd).must_equal "application/ddd"
318
318
  end
319
319
  end
320
320
 
321
- context "with subclasses" do
322
- setup do
321
+ describe "with subclasses" do
322
+ before do
323
323
  FPage.outputs :html, :rss, [:xxx, { :mimetype => "application/xxx" }]
324
324
  class FSubPage < FPage
325
325
  end
326
326
  end
327
327
 
328
- teardown do
329
- self.class.send(:remove_const, :FSubPage) rescue nil
328
+ after do
329
+ Object.send(:remove_const, :FSubPage) rescue nil
330
330
  end
331
331
 
332
- should "inherit the list of provided outputs" do
333
- FSubPage.outputs.should == FPage.outputs
332
+ it "inherit the list of provided outputs" do
333
+ FSubPage.outputs.must_equal FPage.outputs
334
334
  end
335
335
 
336
- should "inherit any custom mimetypes" do
337
- FPage.mime_type(:xxx).should == "application/xxx"
338
- FSubPage.mime_type(:xxx).should == "application/xxx"
336
+ it "inherit any custom mimetypes" do
337
+ FPage.mime_type(:xxx).must_equal "application/xxx"
338
+ FSubPage.mime_type(:xxx).must_equal "application/xxx"
339
339
  end
340
340
  end
341
341
 
342
- context "that generate dynamic outputs" do
343
- should "be able to specify that a output is always dynamic" do
342
+ describe "that generate dynamic outputs" do
343
+ it "be able to specify that a output is always dynamic" do
344
344
  FPage.add_output :rss, :dynamic => true
345
- FPage.output(:rss).dynamic?.should be_true
345
+ assert FPage.output(:rss).dynamic?
346
346
  end
347
347
 
348
- should "be able to specify that a output with custom mimetype is always dynamic" do
348
+ it "be able to specify that a output with custom mimetype is always dynamic" do
349
349
  FPage.add_output :mako, :mimetype => "application/x-mako", :dynamic => true
350
- FPage.output(:mako).mime_type.should == "application/x-mako"
351
- FPage.output(:mako).dynamic?.should be_true
350
+ FPage.output(:mako).mime_type.must_equal "application/x-mako"
351
+ assert FPage.output(:mako).dynamic?
352
352
  end
353
353
 
354
- should "be able to override the default dynamic extension" do
354
+ it "be able to override the default dynamic extension" do
355
355
  FPage.add_output :html, :dynamic => true, :language => "mako"
356
356
  FPage.add_output :alternate, :mimetype => "text/html", :dynamic => true, :language => "mako"
357
- FPage.output(:html).dynamic?.should be_true
358
- FPage.output(:html).extension.should == ".html.mako"
359
- FPage.output(:alternate).extension.should == ".alternate.mako"
357
+ assert FPage.output(:html).dynamic?
358
+ FPage.output(:html).extension.must_equal ".html.mako"
359
+ FPage.output(:alternate).extension.must_equal ".alternate.mako"
360
360
  end
361
361
  end
362
362
  end