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,8 +2,8 @@
2
2
 
3
3
  require File.expand_path('../../test_helper', __FILE__)
4
4
 
5
- class AssetBundler < MiniTest::Spec
6
- include ::Rack::Test::Methods
5
+ describe "AssetBundler" do
6
+ include RackTestMethods
7
7
 
8
8
  def app
9
9
  Spontaneous::Rack::Back.application
@@ -21,76 +21,76 @@ class AssetBundler < MiniTest::Spec
21
21
  teardown_site
22
22
  end
23
23
 
24
- context "CMS asset bundler" do
25
- should "compile Javascript into any destination directory ddd" do
24
+ describe "CMS asset bundler" do
25
+ it "compile Javascript into any destination directory ddd" do
26
26
  compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root, :compress => false)
27
27
  compiler.compile
28
28
  compiled_js_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.js"].first
29
29
  js = File.read(compiled_js_path)
30
- js.should =~ /var simple = "yes";/
31
- js.should =~ /var basic/
32
- js.should =~ /var complex/
33
- js.should =~ /complex = "#{Date.today.day}"/
34
- js.should =~ /var simple_subdir = "yes";/
35
- js.should =~ /var complex_subdir;/
36
- js.should =~ /complex_subdir = "subdir\/#{Date.today.day}";/
30
+ js.must_match /var simple = "yes";/
31
+ js.must_match /var basic/
32
+ js.must_match /var complex/
33
+ js.must_match /complex = "#{Date.today.day}"/
34
+ js.must_match /var simple_subdir = "yes";/
35
+ js.must_match /var complex_subdir;/
36
+ js.must_match /complex_subdir = "subdir\/#{Date.today.day}";/
37
37
  end
38
38
 
39
- should "produce compressed Javascript on demand" do
39
+ it "produce compressed Javascript on demand" do
40
40
  compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root, :compress => true)
41
41
  compiler.compile
42
42
  compiled_js_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.js"].first
43
43
  js = File.read(compiled_js_path)
44
44
  # hard to test because we don't know exactly what the uglifier is going to do
45
- js.should =~ /var (\w);\1="yes"/
46
- js.should =~ /var (\w);\1="#{Date.today.day}"/
47
- js.should =~ /var (\w);\1="subdir\/#{Date.today.day}"/
45
+ js.must_match /var (\w);\1="yes"/
46
+ js.must_match /var (\w);\1="#{Date.today.day}"/
47
+ js.must_match /var (\w);\1="subdir\/#{Date.today.day}"/
48
48
  end
49
49
 
50
- should "compile CSS into any destination directory" do
50
+ it "compile CSS into any destination directory" do
51
51
  compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root, :compress => false)
52
52
  compiler.compile
53
53
  compiled_css_path = Dir["#{@site.root}/public/@spontaneous/assets/*.css"].first
54
54
  css = File.read(compiled_css_path)
55
- css.should =~ /\.simple \{\s+color: #aaa/
56
- css.should =~ /\.basic \{\s+color: #aabbcc/
57
- css.should =~ /\.complex \{\s+color: #ddeeff;\s*width: #{Date.today.day}px/
58
- css.should =~ /\.subdir\.simple \{\s+color: #000;/
59
- css.should =~ /\.subdir\.complex \{\s+color: #aaaaaa;\s+height: #{Date.today.day}px/
55
+ css.must_match /\.simple \{\s+color: #aaa/
56
+ css.must_match /\.basic \{\s+color: #aabbcc/
57
+ css.must_match /\.complex \{\s+color: #ddeeff;\s*width: #{Date.today.day}px/
58
+ css.must_match /\.subdir\.simple \{\s+color: #000;/
59
+ css.must_match /\.subdir\.complex \{\s+color: #aaaaaa;\s+height: #{Date.today.day}px/
60
60
  end
61
61
 
62
- should "produce compressed CSS by default" do
62
+ it "produce compressed CSS by default" do
63
63
  compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root)
64
64
  compiler.compile
65
65
  compiled_css_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.css"].first
66
66
  css = File.read(compiled_css_path)
67
- css.should =~ /\.simple\{color:#aaa\}/
68
- css.should =~ /\.basic\{color:#aabbcc\}/
69
- css.should =~ /\.complex\{color:#ddeeff;width:#{Date.today.day}px\}/
70
- css.should =~ /\.subdir\.simple\{color:#000\}/
71
- css.should =~ /\.subdir\.complex\{color:#aaaaaa;height:#{Date.today.day}px\}/
67
+ css.must_match /\.simple\{color:#aaa\}/
68
+ css.must_match /\.basic\{color:#aabbcc\}/
69
+ css.must_match /\.complex\{color:#ddeeff;width:#{Date.today.day}px\}/
70
+ css.must_match /\.subdir\.simple\{color:#000\}/
71
+ css.must_match /\.subdir\.complex\{color:#aaaaaa;height:#{Date.today.day}px\}/
72
72
  end
73
73
  end
74
74
 
75
- context "Development mode editing app" do
76
- setup do
75
+ describe "Development mode editing app" do
76
+ before do
77
77
  @page = Content.create
78
78
  end
79
79
 
80
- teardown do
80
+ after do
81
81
  Content.delete
82
82
  end
83
83
 
84
- context "unauthorised users" do
85
- should "load a non-fingerprinted CSS file" do
84
+ describe "unauthorised users" do
85
+ it "load a non-fingerprinted CSS file" do
86
86
  get "/@spontaneous/#{@page.id}"
87
87
  assert_login_page
88
- last_response.body.should =~ %r{/@spontaneous/css/spontaneous\.css}
88
+ last_response.body.must_match %r{/@spontaneous/css/spontaneous\.css}
89
89
  end
90
90
  end
91
91
 
92
- context "authorised users" do
93
- setup do
92
+ describe "authorised users" do
93
+ before do
94
94
  @user = Spontaneous::Permissions::User.create(:email => "test@example.com", :login => "test", :name => "test name", :password => "testpass")
95
95
  @site.config.auto_login @user.login
96
96
 
@@ -105,62 +105,62 @@ class AssetBundler < MiniTest::Spec
105
105
  Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
106
106
 
107
107
  end
108
- teardown do
108
+ after do
109
109
  Content.delete
110
110
  Spontaneous::Permissions::User.delete
111
111
  end
112
112
  end
113
113
 
114
- should "be able to load spontaneous.css" do
114
+ it "be able to load spontaneous.css" do
115
115
  get "/@spontaneous/css/spontaneous.css"
116
116
  assert last_response.ok?, "Recieved a #{last_response.status} instead of 200"
117
- last_response.body.should =~ /#content/
117
+ last_response.body.must_match /#content/
118
118
  end
119
119
  end
120
120
 
121
- context "Production mode editing app" do
122
- setup do
121
+ describe "Production mode editing app" do
122
+ before do
123
123
  @compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root)
124
124
  @compiler.compile
125
125
  @page = Content.create
126
126
  end
127
127
 
128
- teardown do
128
+ after do
129
129
  Content.delete
130
130
  end
131
131
 
132
- should "be able to retrieve compiled assets" do
132
+ it "be able to retrieve compiled assets" do
133
133
  css_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.css"].first
134
134
  css_file = ::File.basename(css_path)
135
135
  get "/@spontaneous/assets/#{css_file}"
136
136
  assert last_response.ok?, "Recieved #{last_response.status} instead of 200 for /@spontaneous/assets/#{css_file}"
137
137
  end
138
138
 
139
- context "unauthorised users" do
140
- should "load a fingerprinted CSS file" do
139
+ describe "unauthorised users" do
140
+ it "load a fingerprinted CSS file" do
141
141
  get "/@spontaneous/#{@page.id}"
142
142
  assert_login_page
143
143
  css_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.css"].first
144
144
  css_file = ::File.basename(css_path)
145
- last_response.body.should =~ %r{/@spontaneous/assets/#{ css_file }}
145
+ last_response.body.must_match %r{/@spontaneous/assets/#{ css_file }}
146
146
  end
147
147
 
148
- should "load fingerpringed JS files" do
148
+ it "load fingerpringed JS files" do
149
149
  get "/@spontaneous/#{@page.id}"
150
150
  assert_login_page
151
151
 
152
152
  js_path = Dir["#{@site.root}/public/@spontaneous/assets/login*.js"].first
153
153
  js_file = ::File.basename(js_path)
154
- last_response.body.should =~ %r{/@spontaneous/assets/#{ js_file }}
154
+ last_response.body.must_match %r{/@spontaneous/assets/#{ js_file }}
155
155
 
156
156
  js_path = Dir["#{@site.root}/public/@spontaneous/assets/vendor/jquery*.js"].first
157
157
  js_file = ::File.basename(js_path)
158
- last_response.body.should =~ %r{/@spontaneous/assets/vendor/#{ js_file }}
158
+ last_response.body.must_match %r{/@spontaneous/assets/vendor/#{ js_file }}
159
159
  end
160
160
  end
161
161
 
162
- context "authorised users aaaa" do
163
- setup do
162
+ describe "authorised users aaaa" do
163
+ before do
164
164
  Spontaneous.stubs(:reload!)
165
165
  @user = Spontaneous::Permissions::User.create(:email => "test@example.com", :login => "test", :name => "test name", :password => "testpass")
166
166
  @user.update(:level => Spontaneous::Permissions[:editor])
@@ -187,34 +187,34 @@ class AssetBundler < MiniTest::Spec
187
187
  Spontaneous::Permissions::AccessKey.stubs(:valid?).with(@key, @user).returns(true)
188
188
  end
189
189
 
190
- teardown do
190
+ after do
191
191
  Content.delete
192
192
  Spontaneous::Permissions::User.delete
193
193
  end
194
194
 
195
- should "load fingerpringed JS files" do
195
+ it "load fingerpringed JS files" do
196
196
  get "/@spontaneous/"
197
- assert last_response.ok?, "User should be authorised but recieving a #{last_response.status}"
197
+ assert last_response.ok?, "User it be authorised but recieving a #{last_response.status}"
198
198
 
199
199
  js_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.js"].first
200
200
  js_file = ::File.basename(js_path)
201
201
  js_size = ::File.size(js_path)
202
- last_response.body.should =~ %r{\["/@spontaneous/assets/#{ js_file }", *#{js_size}\]}
202
+ last_response.body.must_match %r{\["/@spontaneous/assets/#{ js_file }", *#{js_size}\]}
203
203
 
204
204
  js_path = Dir["#{@site.root}/public/@spontaneous/assets/require*.js"].first
205
205
  js_file = ::File.basename(js_path)
206
- last_response.body.should =~ %r{/@spontaneous/assets/#{ js_file }}
206
+ last_response.body.must_match %r{/@spontaneous/assets/#{ js_file }}
207
207
 
208
208
  js_path = Dir["#{@site.root}/public/@spontaneous/assets/vendor/jquery*.js"].first
209
209
  js_file = ::File.basename(js_path)
210
- last_response.body.should =~ %r{/@spontaneous/assets/vendor/#{ js_file }}
210
+ last_response.body.must_match %r{/@spontaneous/assets/vendor/#{ js_file }}
211
211
  end
212
212
  end
213
213
 
214
- should "be able to load spontaneous.css" do
214
+ it "be able to load spontaneous.css" do
215
215
  get "/@spontaneous/css/spontaneous.css"
216
216
  assert last_response.ok?, "Recieved a #{last_response.status} instead of 200"
217
- last_response.body.should =~ /#content/
217
+ last_response.body.must_match /#content/
218
218
  end
219
219
  end
220
220
  end