RubyGems - spontaneous - Versions diffs - 0.2.0.beta1 → 0.2.0.beta2 - Mend

spontaneous 0.2.0.beta1 → 0.2.0.beta2

Files changed (335) hide show

checksums.yaml +7 -0
data/.gitignore +24 -0
data/.locat +42 -0
data/.travis/gemfiles/Gemfile.empty +7 -0
data/.travis.yml +18 -0
data/Gemfile +12 -8
data/LICENSE +1 -1
data/Rakefile +15 -157
data/Readme.markdown +1 -1
data/application/css/core.css.scss +22 -146
data/application/css/definitions.css.scss +7 -3
data/application/css/dialogue.css.scss +26 -1
data/application/css/editing.css.scss +70 -28
data/application/css/font.css.scss +1 -1
data/application/css/popover.css.scss +2 -0
data/application/css/top.css.scss +231 -0
data/application/js/add_alias_dialogue.js +1 -1
data/application/js/add_home_dialogue.js +1 -1
data/application/js/ajax.js +61 -31
data/application/js/box.js +4 -4
data/application/js/conflicted_field_dialogue.js +1 -1
data/application/js/content.js +5 -5
data/application/js/dom.js +5 -0
data/application/js/edit_panel.js +1 -0
data/application/js/editing.js +1 -1
data/application/js/extensions.js +8 -0
data/application/js/field/boolean.js +31 -0
data/application/js/field/file.js +32 -4
data/application/js/field/image.js +24 -9
data/application/js/field/markdown.js +87 -59
data/application/js/field/select.js +1 -1
data/application/js/field/webvideo.js +6 -1
data/application/js/init.js +2 -2
data/application/js/jquery-selection-position.js +130 -0
data/application/js/location.js +4 -25
data/application/js/meta_view/user_admin.js +2 -2
data/application/js/metadata.js +2 -2
data/application/js/page_browser.js +1 -1
data/application/js/panel/root_menu.js +0 -1
data/application/js/popover.js +27 -12
data/application/js/popover_view.js +20 -4
data/application/js/preview.js +31 -16
data/application/js/progress.js +22 -21
data/application/js/publish.js +18 -7
data/application/js/sharded_upload.js +9 -6
data/application/js/spontaneous.js +3 -1
data/application/js/top_bar.js +264 -173
data/application/js/upload.js +12 -5
data/application/js/upload_manager.js +4 -3
data/application/js/user.js +1 -2
data/application/js/views/box_view.js +1 -1
data/application/js/views/page_view.js +16 -5
data/application/js/views/piece_view.js +5 -4
data/application/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf +0 -0
data/application/views/index.erb +6 -14
data/application/views/login.erb +6 -25
data/application/views/schema_modification_error.html.erb +3 -7
data/db/migrations/20130114120000_create_revision_tables.rb +2 -2
data/db/migrations/20130813111009_increase_path_length.rb +14 -0
data/gem-public_cert.pem +20 -0
data/lib/spontaneous/asset/app_compiler.rb +44 -0
data/lib/spontaneous/asset/environment.rb +225 -0
data/lib/spontaneous/asset.rb +2 -67
data/lib/spontaneous/box.rb +0 -1
data/lib/spontaneous/capistrano/deploy.rb +2 -2
data/lib/spontaneous/capistrano/sync.rb +1 -1
data/lib/spontaneous/cli/init.rb +36 -13
data/lib/spontaneous/cli/server.rb +0 -1
data/lib/spontaneous/cli/site.rb +2 -1
data/lib/spontaneous/cli.rb +3 -1
data/lib/spontaneous/collections/entry_set.rb +4 -12
data/lib/spontaneous/collections/hash_with_fallback.rb +20 -0
data/lib/spontaneous/collections/prototype_set.rb +6 -5
data/lib/spontaneous/crypt.rb +2 -2
data/lib/spontaneous/data_mapper/content_model/associations.rb +115 -63
data/lib/spontaneous/data_mapper.rb +1 -1
data/lib/spontaneous/errors.rb +6 -0
data/lib/spontaneous/extensions/object_space.rb +6 -0
data/lib/spontaneous/facet.rb +1 -0
data/lib/spontaneous/field/base.rb +86 -13
data/lib/spontaneous/field/boolean.rb +65 -0
data/lib/spontaneous/field/file.rb +17 -6
data/lib/spontaneous/field/html.rb +13 -0
data/lib/spontaneous/field/image/size.rb +76 -0
data/lib/spontaneous/field/image.rb +99 -414
data/lib/spontaneous/field/tags.rb +36 -0
data/lib/spontaneous/field/update.rb +1 -1
data/lib/spontaneous/field/webvideo/fallback.rb +41 -0
data/lib/spontaneous/field/webvideo/vimeo.rb +113 -0
data/lib/spontaneous/field/webvideo/vine.rb +94 -0
data/lib/spontaneous/field/webvideo/youtube.rb +133 -0
data/lib/spontaneous/field/webvideo.rb +100 -250
data/lib/spontaneous/field.rb +1 -1
data/lib/spontaneous/generators/site/Gemfile.tt +5 -14
data/lib/spontaneous/generators/site/assets/README.md +20 -0
data/lib/spontaneous/generators/site/assets/css/site.scss +8 -0
data/lib/spontaneous/generators/site/assets/js/site.js +6 -0
data/lib/spontaneous/generators/site/config/deploy.rb.tt +9 -0
data/lib/spontaneous/generators/site/config/user_levels.yml +14 -3
data/lib/spontaneous/generators/site/public/README.md +12 -0
data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +2 -2
data/lib/spontaneous/generators/site.rb +77 -35
data/lib/spontaneous/layout.rb +6 -7
data/lib/spontaneous/loader.rb +21 -13
data/lib/spontaneous/media/file.rb +22 -9
data/lib/spontaneous/media/image/attributes.rb +33 -0
data/lib/spontaneous/media/image/format/gif.rb +4 -0
data/lib/spontaneous/media/image/format/jpg.rb +17 -0
data/lib/spontaneous/media/image/format/png.rb +4 -0
data/lib/spontaneous/media/image/format/webp.rb +26 -0
data/lib/spontaneous/media/image/format.rb +79 -0
data/lib/spontaneous/media/image/optimizer.rb +69 -0
data/lib/spontaneous/media/image/processor.rb +17 -0
data/lib/spontaneous/media/image/renderable.rb +52 -0
data/lib/spontaneous/media/image/skeptick.rb +70 -0
data/lib/spontaneous/media/image.rb +50 -0
data/lib/spontaneous/media/temp_file.rb +4 -0
data/lib/spontaneous/media.rb +1 -0
data/lib/spontaneous/model/core/aliases.rb +14 -8
data/lib/spontaneous/model/core/boxes.rb +5 -2
data/lib/spontaneous/model/core/entries.rb +4 -0
data/lib/spontaneous/model/core/entry.rb +1 -0
data/lib/spontaneous/model/core/fields.rb +5 -2
data/lib/spontaneous/model/core/locks.rb +16 -0
data/lib/spontaneous/model/core/media.rb +1 -15
data/lib/spontaneous/model/core.rb +31 -1
data/lib/spontaneous/model/page/controllers.rb +2 -2
data/lib/spontaneous/model/page/formats.rb +1 -4
data/lib/spontaneous/model/page/layouts.rb +6 -2
data/lib/spontaneous/model/page/locks.rb +8 -2
data/lib/spontaneous/model/page/page_tree.rb +2 -2
data/lib/spontaneous/model/page/paths.rb +74 -9
data/lib/spontaneous/model/page.rb +11 -3
data/lib/spontaneous/model.rb +6 -6
data/lib/spontaneous/output/context/render_cache.rb +23 -0
data/lib/spontaneous/output/context.rb +56 -30
data/lib/spontaneous/output/helpers/script_helper.rb +9 -53
data/lib/spontaneous/output/helpers/stylesheet_helper.rb +8 -40
data/lib/spontaneous/output/template/renderer.rb +17 -5
data/lib/spontaneous/output.rb +0 -1
data/lib/spontaneous/paths.rb +6 -2
data/lib/spontaneous/permissions/access_key.rb +18 -0
data/lib/spontaneous/permissions/user.rb +1 -1
data/lib/spontaneous/permissions.rb +4 -1
data/lib/spontaneous/plugins/application/state.rb +19 -12
data/lib/spontaneous/prototypes/field_prototype.rb +14 -8
data/lib/spontaneous/published_revision.rb +7 -0
data/lib/spontaneous/publishing/immediate.rb +43 -34
data/lib/spontaneous/publishing/revision.rb +9 -6
data/lib/spontaneous/rack/asset_server.rb +20 -0
data/lib/spontaneous/rack/back/alias.rb +46 -0
data/lib/spontaneous/rack/back/application_assets.rb +28 -0
data/lib/spontaneous/rack/back/base.rb +34 -0
data/lib/spontaneous/rack/back/changes.rb +19 -0
data/lib/spontaneous/rack/back/content.rb +54 -0
data/lib/spontaneous/rack/back/events.rb +38 -0
data/lib/spontaneous/rack/back/field.rb +37 -0
data/lib/spontaneous/rack/back/file.rb +118 -0
data/lib/spontaneous/rack/back/helpers.rb +71 -0
data/lib/spontaneous/rack/back/index.rb +16 -0
data/lib/spontaneous/rack/back/login.rb +47 -0
data/lib/spontaneous/rack/back/map.rb +24 -0
data/lib/spontaneous/rack/back/page.rb +46 -0
data/lib/spontaneous/rack/back/preview.rb +43 -0
data/lib/spontaneous/rack/back/schema.rb +30 -0
data/lib/spontaneous/rack/back/site.rb +25 -0
data/lib/spontaneous/rack/back/site_assets.rb +13 -0
data/lib/spontaneous/rack/back/unsupported_browser.rb +7 -0
data/lib/spontaneous/rack/{user_admin.rb → back/user_admin.rb} +2 -5
data/lib/spontaneous/rack/back.rb +85 -764
data/lib/spontaneous/rack/cacheable_file.rb +3 -3
data/lib/spontaneous/rack/front.rb +16 -9
data/lib/spontaneous/rack/middleware/authenticate.rb +65 -0
data/lib/spontaneous/rack/middleware/csrf.rb +66 -0
data/lib/spontaneous/rack/middleware/reloader.rb +52 -0
data/lib/spontaneous/rack/middleware/scope.rb +60 -0
data/lib/spontaneous/rack/middleware.rb +6 -0
data/lib/spontaneous/rack/page_controller.rb +18 -5
data/lib/spontaneous/rack/public.rb +17 -11
data/lib/spontaneous/rack.rb +34 -24
data/lib/spontaneous/revision.rb +29 -2
data/lib/spontaneous/schema/uid.rb +4 -3
data/lib/spontaneous/schema/uid_map.rb +5 -24
data/lib/spontaneous/schema.rb +1 -0
data/lib/spontaneous/search/database.rb +8 -0
data/lib/spontaneous/search/field.rb +1 -1
data/lib/spontaneous/search/index.rb +3 -5
data/lib/spontaneous/server.rb +1 -1
data/lib/spontaneous/simultaneous.rb +1 -1
data/lib/spontaneous/site/features.rb +4 -5
data/lib/spontaneous/site/helpers.rb +22 -5
data/lib/spontaneous/site/instance.rb +2 -2
data/lib/spontaneous/site/selectors.rb +22 -3
data/lib/spontaneous/storage/cloud.rb +13 -9
data/lib/spontaneous/storage/local.rb +11 -6
data/lib/spontaneous/style.rb +40 -23
data/lib/spontaneous/utils/database/mysql_dumper.rb +1 -1
data/lib/spontaneous/utils/smush_it.rb +1 -1
data/lib/spontaneous/version.rb +1 -1
data/lib/spontaneous.rb +35 -33
data/spontaneous.gemspec +53 -787
data/test/experimental/test_crypt.rb +56 -56
data/test/experimental/test_features.rb +16 -27
data/test/fixtures/assets/public1/css/data.css.scss +3 -0
data/test/fixtures/assets/public1/css/image1.css.scss +4 -0
data/test/fixtures/assets/public1/css/import.css.scss +1 -0
data/test/fixtures/assets/public1/css/urlhash.css.scss +3 -0
data/test/fixtures/assets/public1/js/a.js +1 -1
data/test/fixtures/assets/public1/js/all.js +4 -0
data/test/fixtures/assets/public1/js/{m.coffee → m.js.coffee} +1 -0
data/test/fixtures/assets/public1/x.js +1 -0
data/test/fixtures/assets/public2/css/all.css +4 -0
data/test/fixtures/assets/public2/css/missing.css.scss +3 -0
data/test/fixtures/assets/public2/i/y.png +0 -0
data/test/fixtures/assets/public2/js/b.js +1 -1
data/test/fixtures/assets/public2/js/c.js +1 -1
data/test/fixtures/images/size.extended.webp +0 -0
data/test/fixtures/images/size.lossless.webp +0 -0
data/test/fixtures/images/size.lossy.webp +0 -0
data/test/fixtures/schema/before.yml +4 -4
data/test/fixtures/schema/schema.yml +1 -1
data/test/fixtures/templates/aliases/aaa.html.cut +0 -0
data/test/fixtures/templates/extended/partial_with_renderer.html.cut +1 -0
data/test/fixtures/templates/extended/with_includes_and_renderer.html.cut +2 -0
data/test/functional/test_application.rb +108 -106
data/test/functional/test_back.rb +924 -930
data/test/functional/test_front.rb +285 -238
data/test/functional/test_user_manager.rb +75 -100
data/test/integration/test_installation.rb +1 -1
data/test/support/matchers.rb +12 -0
data/test/support/minitest.rb +121 -0
data/test/support/rack.rb +45 -0
data/test/support/test_start_finish.rb +103 -0
data/test/test_helper.rb +21 -68
data/test/test_integration_helper.rb +1 -3
data/test/unit/test_alias.rb +432 -408
data/test/unit/test_asset_bundler.rb +58 -58
data/test/unit/test_assets.rb +485 -155
data/test/unit/test_async.rb +16 -37
data/test/unit/test_authentication.rb +425 -457
data/test/unit/test_boxes.rb +191 -191
data/test/unit/test_changesets.rb +244 -254
data/test/unit/test_config.rb +128 -142
data/test/unit/test_content.rb +313 -359
data/test/unit/test_content_inheritance.rb +29 -30
data/test/unit/test_datamapper.rb +1205 -1080
data/test/unit/test_datamapper_content.rb +49 -51
data/test/unit/test_extensions.rb +23 -23
data/test/unit/test_fields.rb +1488 -1180
data/test/unit/test_formats.rb +158 -158
data/test/unit/test_generators.rb +98 -40
data/test/unit/test_helpers.rb +73 -76
data/test/unit/test_image_size.rb +53 -22
data/test/unit/test_images.rb +164 -165
data/test/unit/test_layouts.rb +133 -122
data/test/unit/test_logger.rb +14 -17
data/test/unit/test_media.rb +69 -84
data/test/unit/test_modifications.rb +513 -525
data/test/unit/test_page.rb +462 -361
data/test/unit/test_permissions.rb +379 -364
data/test/unit/test_piece.rb +67 -75
data/test/unit/test_plugins.rb +82 -89
data/test/unit/test_prototype_set.rb +215 -216
data/test/unit/test_prototypes.rb +114 -124
data/test/unit/test_publishing.rb +252 -289
data/test/unit/test_render.rb +167 -115
data/test/unit/test_revisions.rb +436 -444
data/test/unit/test_schema.rb +339 -309
data/test/unit/test_search.rb +577 -574
data/test/unit/test_serialisation.rb +136 -147
data/test/unit/test_site.rb +252 -227
data/test/unit/test_skeptick.rb +130 -0
data/test/unit/test_storage.rb +46 -40
data/test/unit/test_structure.rb +57 -66
data/test/unit/test_styles.rb +104 -104
data/test/unit/test_templates.rb +72 -57
data/test/unit/test_type_hierarchy.rb +15 -16
data/test/unit/test_visibility.rb +239 -257
metadata +455 -326
data/application/js/vendor/JS.Class-2.1.5/CHANGELOG +0 -283
data/application/js/vendor/JS.Class-2.1.5/MIT-LICENSE +0 -30
data/application/js/vendor/JS.Class-2.1.5/README +0 -30
data/application/js/vendor/JS.Class-2.1.5/min/command.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/comparable.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/constant_scope.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/decorator.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/enumerable.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/forwardable.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/hash.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/linked_list.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/loader.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/method_chain.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/observable.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/package.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/proxy.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/ruby.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/set.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/stack_trace.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/state.js +0 -1
data/application/js/vendor/JS.Class-2.1.5/min/stdlib.js +0 -16
data/application/js/vendor/jquery-1.6.2.min.js +0 -18
data/application/js/vendor/jquery-ui-1.8.16.custom.min.js +0 -791
data/application/js/vendor/jquery-ui-1.8.9.custom.min.js +0 -415
data/application/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf +0 -0
data/application/static/select-arrow-6e7dd3745b00e934b0d7a3250c46558b.png +0 -0
data/bin/limit-upload +0 -5
data/bin/unlimit-upload +0 -3
data/lib/spontaneous/asset/file.rb +0 -25
data/lib/spontaneous/asset/source.rb +0 -28
data/lib/spontaneous/image_size.rb +0 -123
data/lib/spontaneous/output/assets/compression.rb +0 -58
data/lib/spontaneous/output/assets.rb +0 -32
data/lib/spontaneous/rack/around_back.rb +0 -20
data/lib/spontaneous/rack/around_front.rb +0 -27
data/lib/spontaneous/rack/around_preview.rb +0 -22
data/lib/spontaneous/rack/assets.rb +0 -126
data/lib/spontaneous/rack/authentication.rb +0 -20
data/lib/spontaneous/rack/cookie_authentication.rb +0 -38
data/lib/spontaneous/rack/helpers.rb +0 -52
data/lib/spontaneous/rack/http.rb +0 -18
data/lib/spontaneous/rack/media.rb +0 -30
data/lib/spontaneous/rack/query_authentication.rb +0 -35
data/lib/spontaneous/rack/reloader.rb +0 -45
data/lib/spontaneous/rack/user_helpers.rb +0 -28
/data/{README → application/js/field/markdown/text_command.js} +0 -0
/data/application/js/vendor/{JS.Class-2.1.5/min/core.js → js.class-2.1.5.min.js} +0 -0
/data/test/fixtures/assets/public1/css/{a.scss → a.css.scss} +0 -0
/data/{lib/spontaneous/generators/site/public/css/site.scss → test/fixtures/assets/public1/x.css} +0 -0
/data/{lib/spontaneous/generators/site/public/js/.empty_directory → test/fixtures/assets/public1/x.png} +0 -0
/data/test/fixtures/assets/public2/css/{b.scss → b.css.scss} +0 -0
/data/test/fixtures/assets/public2/js/{n.coffee → n.js.coffee} +0 -0
/data/test/fixtures/back/{public → assets}/css/sass_include.scss +0 -0
/data/test/fixtures/back/{public → assets}/css/sass_template.scss +0 -0
/data/test/fixtures/back/{public → assets}/js/coffeescript.coffee +0 -0
/data/{lib/spontaneous/generators/site/public/js/site.js → test/fixtures/templates/aliases/aa_alias.html.cut} +0 -0

data/test/unit/test_templates.rb CHANGED Viewed

@@ -4,7 +4,7 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'cgi'
-class TemplatesTest < MiniTest::Spec
+describe "Templates" do
   def first_pass(base_dir, filename, context=nil)
     render_with_renderer(Cutaneous::PublishRenderer, base_dir, filename, context)
   end
@@ -26,7 +26,7 @@ class TemplatesTest < MiniTest::Spec
     @template_root
   end
-  def setup
+  before do
     @site = setup_site
     make_template_root
     @klass = Class.new(Spontaneous::Output.context_class) do
@@ -55,40 +55,40 @@ class TemplatesTest < MiniTest::Spec
     @context = @klass.new(Object.new, :html)
   end
-  def teardown
+  after do
     teardown_site
   end
-  context "First render" do
-    setup do
+  describe "First render" do
+    before do
       # @template = Cutaneous::PublishTemplate.new
       @engine = S::Output::Template::PublishEngine.new(@template_root)
     end
-    should "ignore second level statements" do
+    it "ignore second level statements" do
       input = '<html><title>{{title}}</title>{{unsafe}}</html>'
       output = @engine.render_string(input, @context)
-      output.should ==  '<html><title>{{title}}</title>{{unsafe}}</html>'
+      output.must_equal  '<html><title>{{title}}</title>{{unsafe}}</html>'
     end
-    should "evaluate first level expressions" do
+    it "evaluate first level expressions" do
       output = @engine.render_string('<html><title>${title}</title>{{unsafe}}</html>', @context)
-      output.should == '<html><title>THE TITLE</title>{{unsafe}}</html>'
+      output.must_equal '<html><title>THE TITLE</title>{{unsafe}}</html>'
     end
-    should "evaluate first level statements" do
+    it "evaluate first level statements" do
       output = @engine.render_string('<html><title>${title}</title>%{ 2.times do }{{unsafe}}%{ end }</html>', @context)
-      output.should == '<html><title>THE TITLE</title>{{unsafe}}{{unsafe}}</html>'
+      output.must_equal '<html><title>THE TITLE</title>{{unsafe}}{{unsafe}}</html>'
     end
-    should "generate 2nd render templates" do
+    it "generate 2nd render templates" do
       output = @engine.render_string("<html><title>${title}</title>%{ 2.times do }{{bell}}\n%{ end }</html>", @context)
       second = S::Output::Template::RequestEngine.new(@template_root)
       output = second.render_string(output, @context)
-      output.should == "<html><title>THE TITLE</title>ding\nding\n</html>"
+      output.must_equal "<html><title>THE TITLE</title>ding\nding\n</html>"
     end
-    should "handle multiline statements" do
+    it "handle multiline statements" do
       output = @engine.render_string((<<-TEMPLATE), @context)
 %{
  something = 3
@@ -96,10 +96,10 @@ class TemplatesTest < MiniTest::Spec
 -}
 ${ something + nothing + another -}
       TEMPLATE
-      output.should == "12"
+      output.must_equal "12"
     end
-    should "correctly handle braces within statements" do
+    it "correctly handle braces within statements" do
       output = @engine.render_string((<<-TEMPLATE), @context)
 %{
 	a = { :a => "a", :b => "b" }
@@ -108,85 +108,91 @@ ${ something + nothing + another -}
 -}
 ${ a[:a] }${ a[:b] -}
       TEMPLATE
-      output.should == "ab"
+      output.must_equal "ab"
+    end
+    it "can convert a first-pass template to a second-pass template xxx" do
+      input = "${ template 'content/template' }"
+      output = @engine.render_string(input, @context)
+      output.must_equal "<html><title>{{{ title }}}</title></html>\n"
     end
   end
-  context "Second render" do
-    setup do
+  describe "Second render" do
+    before do
       @engine = S::Output::Template::RequestEngine.new(@template_root)
     end
-    should "a render unescaped expressions" do
-      output = @engine.render_string('<html><title>{{title}}</title>{{unsafe}}</html>', @context)
-      output.should == "<html><title>THE TITLE</title><script>alert('bad')</script></html>"
+    it "a render unescaped expressions" do
+      output = @engine.render_string('<html><title>{{title}}</title>{{{unsafe}}}</html>', @context)
+      output.must_equal "<html><title>THE TITLE</title><script>alert('bad')</script></html>"
     end
-    should "render escaped expressions" do
-      output = @engine.render_string('<html><title>{$ unsafe $}</title></html>', @context)
-      output.should == "<html><title>&lt;script&gt;alert('bad')&lt;/script&gt;</title></html>"
+    it "render escaped expressions" do
+      output = @engine.render_string('<html><title>{{ unsafe }}</title></html>', @context)
+      output.must_equal "<html><title>#{ERB::Util.html_escape(@context.unsafe)}</title></html>"
     end
-    should "evaluate expressions" do
+    it "evaluate expressions" do
       output = @engine.render_string('<html>{% 2.times do %}<title>{{title}}</title>{% end %}</html>', @context)
-      output.should == "<html><title>THE TITLE</title><title>THE TITLE</title></html>"
+      output.must_equal "<html><title>THE TITLE</title><title>THE TITLE</title></html>"
     end
   end
-  context "Content rendering" do
-    setup do
+  describe "Content" do
+    before do
       @engine = S::Output::Template::PublishEngine.new(@template_root / "content")
     end
-    should "render" do
+    it "render" do
       output = @engine.render_template('template', @context)
-      output.should == "<html><title>THE TITLE</title></html>\n"
+      output.must_equal "<html><title>THE TITLE</title></html>\n"
     end
-    should "preprocess" do
+    it "preprocess" do
       output = @engine.render_template('preprocess', @context)
-      output.should == "<html><title>THE TITLE</title>{{bell}}</html>\n"
+      output.must_equal "<html><title>THE TITLE</title>{{bell}}</html>\n"
     end
-    should "include imports" do
+    it "include imports" do
       output = @engine.render_template('include', @context)
-      output.should == "<html>{{bell}}ding\n</html>\n"
+      output.must_equal "<html>{{bell}}ding\n</html>\n"
     end
-    should "include imports in sub-directories" do
+    it "include imports in sub-directories" do
       output = @engine.render_template('include_dir', @context)
-      output.should == "<html>{{ bell }}ding\n</html>\n"
+      output.must_equal "<html>{{ bell }}ding\n</html>\n"
     end
-    should "preserve the format across includes" do
+    it "preserve the format across includes" do
       context = @klass.new(Object.new)
       output = @engine.render_template('template', @context, "epub")
-      output.should == "<epub><epub>{{ bell }}ding</epub>\n</epub>\n"
+      output.must_equal "<epub><epub>{{ bell }}ding</epub>\n</epub>\n"
     end
-    should "render a second pass" do
+    it "render a second pass" do
       engine = S::Output::Template::RequestEngine.new(@template_root / "content")
       output = engine.render_template('second', @context)
-      output.should == "<html><title>THE TITLE</title>ding</html>\n"
+      output.must_equal "<html><title>THE TITLE</title>ding</html>\n"
     end
   end
-  context "Template hierarchy" do
+  describe "hierarchy" do
-    setup do
+    before do
       @engine = S::Output::Template::PublishEngine.new(@template_root / "extended")
     end
-    should "work" do
+    it "work" do
       output = @engine.render_template('main', @context)
       expected = "Main Title {{page.title}}Grandparent Nav\nMain Body\nParent Body\nGrandparent Body\nGrandparent Footer\nParent Footer\n"
-      output.should == expected
+      output.must_equal expected
     end
-    should "allow the use of includes" do
+    it "allow the use of includes" do
       output = @engine.render_template('with_includes', @context)
-      output.should == (<<-RENDER)
+      output.must_equal (<<-RENDER)
 Parent Title
 INCLUDE
 PARTIAL
@@ -195,9 +201,9 @@ Parent Footer
       RENDER
     end
-    should "allow passing of local variables to included templates" do
+    it "allow passing of local variables to included templates" do
       output = @engine.render_template('with_includes_and_locals', @context)
-      output.should == (<<-RENDER)
+      output.must_equal (<<-RENDER)
 Parent Title
 INCLUDE
 local title
@@ -205,10 +211,19 @@ Grandparent Footer
 Parent Footer
       RENDER
     end
+    it "keeps a reference to the render cache in included templates" do
+      # The render cache is kept on the renderer so it needs to be passed by the
+      # context#clone method
+      @context._renderer = "renderer"
+      output = @engine.render_template('with_includes_and_renderer', @context)
+      output.must_equal "renderer\nrenderer\n"
+    end
   end
-  context "Output conversion xxx" do
-    setup do
+  describe "conversion" do
+    before do
       @context_class = Class.new(Spontaneous::Output.context_class) do
         include Spontaneous::Output::Context::ContextCore
@@ -249,20 +264,20 @@ Parent Footer
       @context = @context_class.new(Object.new)
     end
-    should "call #render(format) if context responds to it" do
+    it "call #render(format) if context responds to it" do
       output = @engine.render_string('${slot} ${ monkey }', @context)
-      output.should == "(html) magic"
+      output.must_equal "(html) magic"
     end
-    should "call to_format on non-strings" do
+    it "call to_format on non-strings" do
       output = @engine.render_string('${field} ${ monkey }', @context)
-      output.should == "(html) magic"
+      output.must_equal "(html) magic"
     end
-    should "call to_s on non-strings that have no specific handler" do
+    it "call to_s on non-strings that have no specific handler" do
       @context = @context_class.new(Object.new)
       output = @engine.render_string('${field} ${ monkey }', @context, "weird")
-      output.should == "'weird' magic"
+      output.must_equal "'weird' magic"
     end
   end
 end

data/test/unit/test_type_hierarchy.rb CHANGED Viewed

@@ -3,36 +3,35 @@
 require File.expand_path('../../test_helper', __FILE__)
-class TypeHierarchyTest < MiniTest::Spec
+describe "TypeHierarchy" do
-  def setup
+  before do
     @site = setup_site
   end
-  def teardown
+  after do
     teardown_site
   end
-  context "Content" do
-    should "have an empty supertype" do
-      ::Content.supertype.should be_nil
-      ::Content.supertype?.should be_false
-    end
+  it "has an empty supertype" do
+    ::Content.supertype.must_be_nil
+    refute ::Content.supertype?
   end
-  context "Schema classes" do
-    setup do
+  describe "Schema classes" do
+    before do
       class SchemaClass < ::Piece
       end
     end
-    teardown do
-      self.class.send :remove_const, :SchemaClass
+    after do
+      Object.send :remove_const, :SchemaClass
     end
-    should "have a reference to their super type" do
-      SchemaClass.supertype.should == ::Piece
+    it "have a reference to their super type" do
+      SchemaClass.supertype.must_equal ::Piece
     end
-    should "know what file they were defined in" do
-      SchemaClass.__source_file.should == File.expand_path(__FILE__)
+    it "know what file they were defined in" do
+      SchemaClass.__source_file.must_equal File.expand_path(__FILE__)
     end
   end
 end