RubyGems - spontaneous - Versions diffs - 0.2.0.beta5 → 0.2.0.beta6 - Mend

spontaneous 0.2.0.beta5 → 0.2.0.beta6

Files changed (227) hide show

checksums.yaml +4 -4
data/.gitignore +1 -0
data/CHANGELOG.md +39 -0
data/Gemfile +2 -0
data/Readme.markdown +4 -4
data/application/css/core.css.scss +144 -43
data/application/css/definitions.css.scss +50 -16
data/application/css/dialogue.css.scss +5 -2
data/application/css/editing.css.scss +7 -7
data/application/css/font.css.scss +1 -1
data/application/css/meta.css.scss +6 -6
data/application/css/popover.css.scss +6 -6
data/application/css/top.css.scss +8 -1
data/application/js/add_alias_dialogue.js +137 -36
data/application/js/add_home_dialogue.js +10 -10
data/application/js/ajax.js +26 -26
data/application/js/authentication.js +2 -2
data/application/js/box.js +21 -10
data/application/js/box_container.js +13 -7
data/application/js/compatibility.js +19 -17
data/application/js/conflicted_field_dialogue.js +5 -5
data/application/js/content.js +22 -16
data/application/js/content_area.js +62 -33
data/application/js/dialogue.js +16 -16
data/application/js/dom.js +9 -10
data/application/js/edit_panel.js +25 -20
data/application/js/editing.js +21 -8
data/application/js/entry.js +1 -1
data/application/js/extensions.js +11 -11
data/application/js/field/boolean.js +6 -6
data/application/js/field/date.js +1 -1
data/application/js/field/file.js +17 -17
data/application/js/field/image.js +27 -27
data/application/js/field/markdown.js +72 -71
data/application/js/field/select.js +9 -9
data/application/js/field/string.js +3 -3
data/application/js/field/webvideo.js +2 -2
data/application/js/field_preview.js +3 -0
data/application/js/init.js +3 -2
data/application/js/jquery-selection-position.js +13 -13
data/application/js/location.js +17 -12
data/application/js/login.js +2 -2
data/application/js/meta_view/user_admin.js +101 -101
data/application/js/metadata.js +1 -1
data/application/js/page.js +2 -2
data/application/js/page_browser.js +13 -13
data/application/js/page_entry.js +1 -1
data/application/js/panel/root_menu.js +10 -10
data/application/js/popover.js +6 -5
data/application/js/popover_view.js +5 -5
data/application/js/preview.js +10 -4
data/application/js/progress.js +6 -6
data/application/js/properties.js +35 -6
data/application/js/publish.js +43 -43
data/application/js/require.js +14 -14
data/application/js/services.js +3 -3
data/application/js/sharded_upload.js +9 -8
data/application/js/side_bar.js +5 -5
data/application/js/state.js +2 -2
data/application/js/status_bar.js +6 -6
data/application/js/top_bar.js +97 -65
data/application/js/types.js +9 -6
data/application/js/upload.js +4 -4
data/application/js/upload_manager.js +21 -21
data/application/js/user.js +1 -1
data/application/js/vendor/jquery.velocity.min.js +7 -0
data/application/js/views.js +32 -8
data/application/js/views/box_view.js +51 -31
data/application/js/views/page_piece_view.js +17 -15
data/application/js/views/page_view.js +54 -43
data/application/js/views/piece_view.js +44 -37
data/application/static/font/fontawesome-webfont-4f0022f25672c7f501c339cbf98d9117.ttf +0 -0
data/application/views/index.erb +1 -0
data/db/migrations/20130114120000_create_revision_tables.rb +2 -1
data/db/migrations/20130813111009_increase_path_length.rb +11 -2
data/db/migrations/20140506171823_add_index_to_target_id.rb +11 -0
data/db/migrations/20140514090204_add_content_hash.rb +59 -0
data/db/migrations/20140519150253_add_content_hash_timestamp.rb +20 -0
data/lib/spontaneous.rb +0 -1
data/lib/spontaneous/asset/environment.rb +77 -15
data/lib/spontaneous/box.rb +21 -0
data/lib/spontaneous/capistrano/deploy.rb +1 -1
data/lib/spontaneous/capistrano/sync.rb +8 -7
data/lib/spontaneous/change.rb +4 -2
data/lib/spontaneous/cli/fields.rb +7 -3
data/lib/spontaneous/cli/generate.rb +2 -0
data/lib/spontaneous/cli/init.rb +24 -93
data/lib/spontaneous/cli/init/db.rb +94 -0
data/lib/spontaneous/cli/init/mysql.rb +17 -0
data/lib/spontaneous/cli/init/postgresql.rb +33 -0
data/lib/spontaneous/cli/init/sqlite.rb +14 -0
data/lib/spontaneous/cli/site.rb +45 -20
data/lib/spontaneous/collections/box_set.rb +3 -0
data/lib/spontaneous/collections/entry_set.rb +43 -4
data/lib/spontaneous/collections/field_set.rb +14 -2
data/lib/spontaneous/data_mapper.rb +40 -7
data/lib/spontaneous/data_mapper/content_model.rb +1 -1
data/lib/spontaneous/data_mapper/content_model/associations.rb +63 -12
data/lib/spontaneous/data_mapper/content_model/timestamps.rb +9 -14
data/lib/spontaneous/data_mapper/content_table.rb +4 -2
data/lib/spontaneous/data_mapper/dataset.rb +31 -2
data/lib/spontaneous/data_mapper/scope.rb +37 -20
data/lib/spontaneous/errors.rb +6 -0
data/lib/spontaneous/facet.rb +20 -10
data/lib/spontaneous/field/base.rb +8 -1
data/lib/spontaneous/field/file.rb +28 -3
data/lib/spontaneous/field/image.rb +2 -0
data/lib/spontaneous/field/update.rb +6 -0
data/lib/spontaneous/field/webvideo/vimeo.rb +6 -1
data/lib/spontaneous/field/webvideo/vine.rb +1 -1
data/lib/spontaneous/field/webvideo/youtube.rb +1 -1
data/lib/spontaneous/generators/site.rb +6 -4
data/lib/spontaneous/generators/site/.gitignore +1 -0
data/lib/spontaneous/generators/site/Gemfile.tt +3 -3
data/lib/spontaneous/generators/site/config/{indexes.rb.tt → initializers/indexes.rb.tt} +0 -0
data/lib/spontaneous/generators/site/config/initializers/publishing.rb.tt +78 -0
data/lib/spontaneous/generators/site/{config/database.yml.tt → db/mysql2.yml.tt} +7 -6
data/lib/spontaneous/generators/site/db/postgres.yml.tt +25 -0
data/lib/spontaneous/generators/site/db/sqlite3.yml.tt +18 -0
data/lib/spontaneous/generators/site/public/humans.txt.tt +14 -0
data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt +51 -0
data/lib/spontaneous/loader.rb +1 -1
data/lib/spontaneous/logger.rb +1 -1
data/lib/spontaneous/media/image/optimizer.rb +1 -1
data/lib/spontaneous/media/image/processor.rb +11 -2
data/lib/spontaneous/media/image/renderable.rb +2 -0
data/lib/spontaneous/model.rb +3 -0
data/lib/spontaneous/model/box/allowed_types.rb +17 -4
data/lib/spontaneous/model/core.rb +36 -3
data/lib/spontaneous/model/core/aliases.rb +5 -2
data/lib/spontaneous/model/core/boxes.rb +6 -0
data/lib/spontaneous/model/core/cascading_change.rb +38 -0
data/lib/spontaneous/model/core/content_hash.rb +171 -0
data/lib/spontaneous/model/core/entries.rb +0 -19
data/lib/spontaneous/model/core/fields.rb +11 -0
data/lib/spontaneous/model/core/modifications.rb +22 -21
data/lib/spontaneous/model/core/render.rb +3 -0
data/lib/spontaneous/model/core/serialisation.rb +18 -17
data/lib/spontaneous/model/page.rb +35 -8
data/lib/spontaneous/model/page/page_tree.rb +20 -8
data/lib/spontaneous/model/page/paths.rb +79 -50
data/lib/spontaneous/model/page/singleton.rb +71 -0
data/lib/spontaneous/model/page/site_map.rb +2 -1
data/lib/spontaneous/model/page/site_timestamps.rb +2 -2
data/lib/spontaneous/model/piece.rb +10 -0
data/lib/spontaneous/output/context.rb +13 -6
data/lib/spontaneous/output/format.rb +30 -5
data/lib/spontaneous/output/helpers/script_helper.rb +8 -0
data/lib/spontaneous/output/helpers/stylesheet_helper.rb +7 -0
data/lib/spontaneous/output/renderable.rb +16 -0
data/lib/spontaneous/output/store.rb +1 -1
data/lib/spontaneous/output/template/renderer.rb +2 -2
data/lib/spontaneous/page_piece.rb +25 -1
data/lib/spontaneous/prototypes/box_prototype.rb +13 -0
data/lib/spontaneous/prototypes/field_prototype.rb +7 -4
data/lib/spontaneous/publishing.rb +10 -5
data/lib/spontaneous/publishing/immediate.rb +32 -349
data/lib/spontaneous/publishing/pipeline.rb +43 -0
data/lib/spontaneous/publishing/progress.rb +186 -0
data/lib/spontaneous/publishing/publish.rb +107 -0
data/lib/spontaneous/publishing/rerender.rb +17 -0
data/lib/spontaneous/publishing/revision.rb +53 -18
data/lib/spontaneous/publishing/simultaneous.rb +1 -1
data/lib/spontaneous/publishing/steps.rb +154 -0
data/lib/spontaneous/publishing/steps/activate_revision.rb +45 -0
data/lib/spontaneous/publishing/steps/archive_old_revisions.rb +22 -0
data/lib/spontaneous/publishing/steps/base_step.rb +49 -0
data/lib/spontaneous/publishing/steps/copy_static_files.rb +74 -0
data/lib/spontaneous/publishing/steps/create_revision_directory.rb +24 -0
data/lib/spontaneous/publishing/steps/generate_rackup_file.rb +51 -0
data/lib/spontaneous/publishing/steps/generate_search_indexes.rb +24 -0
data/lib/spontaneous/publishing/steps/render_revision.rb +69 -0
data/lib/spontaneous/publishing/steps/write_revision_file.rb +43 -0
data/lib/spontaneous/rack/back.rb +3 -1
data/lib/spontaneous/rack/back/alias.rb +9 -8
data/lib/spontaneous/rack/front.rb +1 -1
data/lib/spontaneous/rack/middleware.rb +7 -4
data/lib/spontaneous/rack/middleware/transaction.rb +14 -0
data/lib/spontaneous/rack/page_controller.rb +23 -8
data/lib/spontaneous/revision.rb +5 -10
data/lib/spontaneous/schema.rb +5 -0
data/lib/spontaneous/server.rb +3 -1
data/lib/spontaneous/site.rb +17 -10
data/lib/spontaneous/site/publishing.rb +25 -3
data/lib/spontaneous/site/state.rb +7 -3
data/lib/spontaneous/tasks/database.rake +5 -10
data/lib/spontaneous/utils/database/mysql_dumper.rb +5 -1
data/lib/spontaneous/version.rb +1 -1
data/spontaneous.gemspec +4 -3
data/test/fixtures/example_application/config/initializers/initializer1.rb +1 -0
data/test/fixtures/example_application/config/initializers/initializer2.rb +1 -0
data/test/fixtures/example_application/config/initializers/publishing.rb +13 -0
data/test/fixtures/search/config/{indexes.rb → initializers/indexes.rb} +0 -0
data/test/fixtures/serialisation/root_hash.yaml.erb +10 -4
data/test/functional/test_application.rb +10 -0
data/test/functional/test_back.rb +23 -5
data/test/functional/test_cli.rb +98 -34
data/test/functional/test_front.rb +7 -3
data/test/test_helper.rb +35 -28
data/test/unit/test_alias.rb +20 -3
data/test/unit/test_assets.rb +58 -30
data/test/unit/test_changesets.rb +20 -12
data/test/unit/test_content_hash.rb +496 -0
data/test/unit/test_context.rb +28 -1
data/test/unit/test_controllers.rb +96 -61
data/test/unit/test_crypt.rb +1 -8
data/test/unit/test_datamapper.rb +95 -19
data/test/unit/test_features.rb +1 -4
data/test/unit/test_fields.rb +61 -12
data/test/unit/test_generators.rb +39 -2
data/test/unit/test_images.rb +3 -1
data/test/unit/test_modifications.rb +224 -219
data/test/unit/test_output_store.rb +10 -0
data/test/unit/{test_formats.rb → test_outputs.rb} +75 -6
data/test/unit/test_page.rb +61 -15
data/test/unit/test_plugins.rb +2 -42
data/test/unit/test_publishing_pipeline.rb +1050 -0
data/test/unit/test_render.rb +30 -0
data/test/unit/test_revisions.rb +110 -2
data/test/unit/test_schema.rb +4 -0
data/test/unit/test_search.rb +1 -1
data/test/unit/test_serialisation.rb +6 -1
data/test/unit/test_singletons.rb +159 -0
data/test/unit/test_site.rb +71 -44
metadata +140 -86
data/application/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf +0 -0
data/test/unit/test_publishing.rb +0 -330

data/test/unit/test_render.rb CHANGED Viewed

@@ -147,6 +147,25 @@ describe "Render" do
       @content.render(:epub).must_equal "<EPUB><title>The Title</title><body>The Description</body></EPUB>\n"
     end
+    it "can specify an alternate object as the content source" do
+      class Page
+        layout(:html) { "=${title}"}
+      end
+      class DivertedPage < Page
+        layout(:html) { "!${title}"}
+        renders { sections1.first }
+      end
+      parent = DivertedPage.create(title: "parent")
+      child = Page.create(title: "child")
+      @root.sections1 << parent
+      @root.save
+      parent.sections1 << child
+      parent.save
+      child.save
+      expected = child.render(:html)
+      parent.render(:html).must_equal expected
+    end
     describe "piece trees" do
       before do
         @page = ::Page.create
@@ -412,6 +431,12 @@ describe "Render" do
         @parent.things.render.must_equal "Child\n"
         @parent.render.must_equal "<html>Child\n</html>\n"
       end
+      it "renders using the inline style when loaded directly" do
+        id = @page.id
+        PageClass.layout(:html) { "=${::PageClass.get(#{id})}" }
+        @parent.render.must_equal "=Child\n"
+      end
     end
     describe "params in templates" do
@@ -572,6 +597,7 @@ describe "Render" do
         @site.background_mode = :immediate
         @site.output_store :Memory
+        ::Spontaneous::State.delete
         ::Content.delete
         ::Content.delete_revision(1) rescue nil
         @renderer = Spontaneous::Output::Template::PublishedRenderer.new(@site, 1)
@@ -593,6 +619,10 @@ describe "Render" do
         [@root, @dynamic, @static].each(&:save)
+        @site.publish do
+          run :render_revision
+          run :activate_revision
+        end
         @site.publish_all
       end

data/test/unit/test_revisions.rb CHANGED Viewed

@@ -228,10 +228,21 @@ describe "Revisions" do
       Content.archive_dataset.select(:revision).group(:revision).all.must_equal [{:revision => 1}]
     end
+    it "adds an index for the primary key" do
+      Revision.create(Content, @revision)
+      pk = Content.primary_key
+      published_indexes = DB.indexes(Content.revision_table(@revision))
+      pk_index = published_indexes.detect { |name, index| index[:columns] == [pk] }
+      pk_index.wont_equal nil
+      name, options = pk_index
+      options[:unique].must_equal true
+    end
     it "have the correct indexes" do
       Revision.create(Content, @revision)
       content_indexes = DB.indexes(:content)
-      published_indexes = DB.indexes(Content.revision_table(@revision))
+      # filter out the pk index as the DB::indexes call doesn't include it
+      published_indexes = DB.indexes(Content.revision_table(@revision)).reject { |name, index| index[:columns] == [:id] }
       # made slightly complex by the fact that the index names depend on the table names
       # (which are different)
       assert_has_elements published_indexes.values, content_indexes.values
@@ -360,7 +371,7 @@ describe "Revisions" do
         end
       end
-      it "insert an entry value into the parent of a newly added page when that page is published aaa" do
+      it "insert an entry value into the parent of a newly added page when that page is published" do
         editable1 = Content.first(:uid => '0')
         new_page = Page.new(:uid => "new")
         editable1.things << new_page
@@ -442,6 +453,103 @@ describe "Revisions" do
     end
   end
+  describe "reverting changes" do
+    it "reverts page fields"
+    it "reverts piece fields"
+    it "removes added pieces"
+    it "restores removed pieces"
+    it "restores deleted pages"
+  end
+  describe "content hashes" do
+    before do
+      @revision = 1
+      Revision.delete(Content, @revision+1)
+    end
+    it "starts with a published_content_hash of nil" do
+      first = Content.first
+      first.published_content_hash.must_equal nil
+      first.content_hash.wont_equal nil
+      first.content_hash.length.must_equal 32
+    end
+    it "sets the published_content_hash on first publish" do
+      first = Content.first
+      content_hash = first.content_hash
+      first.reload.published_content_hash.must_be_nil
+      first.content_hash_changed.must_equal true
+      Revision.create(Content, @revision)
+      first.reload.published_content_hash.must_equal  content_hash
+      first.content_hash_changed.must_equal false
+      Content.with_editable do
+        first.reload.published_content_hash.must_equal content_hash
+        first.content_hash_changed.must_equal false
+      end
+      Content.with_revision(@revision) do
+        first.reload.published_content_hash.must_equal content_hash
+      end
+    end
+    it "updates the published_content_hash on later publishes" do
+      first = Page.first
+      content_hash = first.content_hash
+      Revision.create(Content, @revision)
+      first.reload.published_content_hash.must_equal content_hash
+      first.update(title: "not the same")
+      content_hash2 = first.content_hash
+      content_hash2.wont_equal content_hash
+      added = Page.create
+      added.published_content_hash.must_be_nil
+      added.content_hash_changed.must_equal true
+      content_hash_added = added.content_hash
+      Revision.create(Content, @revision+1)
+      first.reload.published_content_hash.must_equal content_hash2
+      first.content_hash_changed.must_equal false
+      Content.with_editable do
+        c = Page.first :id => added.id
+        c.published_content_hash.must_equal content_hash_added
+        c.content_hash_changed.must_equal false
+        c = Page.first :id => first.id
+        c.published_content_hash.must_equal content_hash2
+        c.content_hash_changed.must_equal false
+      end
+      Content.with_revision(@revision+1) do
+        c = Page.first :id => added.id
+        c.published_content_hash.must_equal content_hash_added
+        c.content_hash_changed.must_equal false
+        c = Page.first :id => first.id
+        c.published_content_hash.must_equal content_hash2
+        c.content_hash_changed.must_equal false
+      end
+    end
+    it "doesn't set published_content_hash for items not published" do
+      Revision.create(Content, @revision)
+      page = Page.first
+      page.title = "changed"
+      page.save
+      page.content_hash_changed.must_equal true
+      content_hash = page.content_hash
+      added = Page.create
+      added.published_content_hash.must_be_nil
+      added.reload.content_hash_changed.must_equal true
+      Revision.patch(Content, @revision+1, [page])
+      page.reload.published_content_hash.must_equal content_hash
+      page.content_hash_changed.must_equal false
+      added.reload.published_content_hash.must_be_nil
+      added.reload.content_hash_changed.must_equal true
+    end
+    it "doesn't set published_content_hash if exception raised in passed block" do
+      Content.first.published_content_hash.must_be_nil
+      begin
+        Revision.create(Content, @revision) do
+          raise "Fail"
+        end
+      rescue Exception; end
+      Content.first.published_content_hash.must_be_nil
+    end
+  end
   describe "publication timestamps" do
     before do

data/test/unit/test_schema.rb CHANGED Viewed

@@ -605,6 +605,10 @@ describe "Schema" do
       A.boxes.cgroup.allowed_types(nil).must_equal [A, C]
       C.boxes.bgroup.allowed_types(nil).must_equal [A, B]
     end
+    it "exports the list of allowed types to the ui" do
+      B.boxes.agroup.export(nil)[:allowed_types].must_equal [{type:"A"}, {type:"B"}, {type:"C"}]
+    end
   end

data/test/unit/test_search.rb CHANGED Viewed

@@ -686,7 +686,7 @@ describe "Search" do
       FileUtils.cp_r(File.expand_path("../../fixtures/search/config", __FILE__), @site.root)
     end
-    it "load the config/indexes.rb file" do
+    it "load the search initializer file" do
       @site.expects(:connect_to_database!)
       @site.initialize!
       index = @site.indexes[:fast]

data/test/unit/test_serialisation.rb CHANGED Viewed

@@ -97,7 +97,7 @@ describe "Serialisation" do
     end
   end
-  describe "pieces" do
+  describe "pages" do
     before do
       date = "2011-07-07"
@@ -161,6 +161,11 @@ describe "Serialisation" do
       assert_hashes_equal(@root_hash, @root.export)
     end
+    it "exports the private root state" do
+      page = SerialisedPage.create_root('#private')
+      page.export[:private].must_equal true
+    end
     it "serialise to JSON" do
       # hard to test this as the serialisation order appears to change
       Spot.deserialise_http(@root.serialise_http).must_equal @root.export

data/test/unit/test_singletons.rb ADDED Viewed

@@ -0,0 +1,159 @@
+# encoding: UTF-8
+require File.expand_path('../../test_helper', __FILE__)
+describe "Singletons" do
+  before do
+    @site = setup_site
+    class ::SingletonPage < ::Page
+      group :singletons
+      singleton :singleton, :malcom
+    end
+  end
+  after do
+    Object.send :remove_const, :SingletonPage rescue nil
+    teardown_site
+  end
+  it "prevents creation of two instances of a singleton type" do
+    a = SingletonPage.create
+    b = nil
+    proc {
+      b = SingletonPage.create
+    }.must_raise(Spontaneous::SingletonException)
+    b.must_equal nil
+    proc {
+      b = SingletonPage.new
+      b.save
+    }.must_raise(Spontaneous::SingletonException)
+    SingletonPage.count.must_equal 1
+  end
+  it "allows saving of existing singleton instances" do
+    a = SingletonPage.create
+    a.uid = "changed"
+    a.save
+  end
+  it "::singleton?" do
+    ::Piece.singleton?.must_equal false
+    ::Page.singleton?.must_equal false
+    ::SingletonPage.singleton?.must_equal true
+  end
+  it "::exists?" do
+    SingletonPage.exists?.must_equal false
+  end
+  it "exports singleton status to UI" do
+    SingletonPage.export[:is_singleton].must_equal true
+  end
+  describe "instances" do
+    before do
+      @page = SingletonPage.create
+      @page.reload
+    end
+    it "::exists?" do
+      SingletonPage.exists?.must_equal true
+    end
+    it "provides access to singletons through the site" do
+      @site.singleton_page.must_equal @page
+    end
+    it "gives a ::instance method on the type" do
+      SingletonPage.instance.must_equal @page
+    end
+    it "allows for multiple aliases to the instance" do
+      @site.singleton.must_equal @page
+      @site.malcom.must_equal @page
+    end
+    it "allows for testing if a singleton exists" do
+      @site.singleton?(:singleton_page).must_equal true
+      @site.singleton?(:not_singleton_page).must_equal false
+    end
+    it "uses a cache within a mapper scope" do
+      instance1 = instance2 = instance3 = nil
+      Content.scope do
+        instance1 = @site.singleton
+        instance2 = @site.singleton
+        Content.scope(nil, true) do
+          instance3 = @site.singleton
+        end
+      end
+      instance1.object_id.must_equal instance2.object_id
+      instance1.object_id.wont_equal instance3.object_id
+    end
+  end
+  describe "sub-classes" do
+    before do
+      class ::SingletonSubclassPage < SingletonPage
+      end
+    end
+    after do
+      Object.send :remove_const, :SingletonSubclassPage rescue nil
+    end
+    it "aren't singletons" do
+      SingletonSubclassPage.singleton?.must_equal false
+    end
+  end
+  describe "boxes" do
+    describe "allow" do
+      before do
+        ::Page.box(:stuff) { allow :Piece } # Make sure allowing pieces doesn't raise an exception
+        @box = ::Page.box :sub do
+          allow :SingletonPage
+        end
+      end
+      it "allows the addition of singletons without an instance" do
+        @box.allowed_types(nil).must_equal [SingletonPage]
+      end
+      it "restricts the addition of singletons with an instance" do
+        SingletonPage.create
+        @box.allowed_types(nil).must_equal []
+      end
+    end
+    describe "allow_group" do
+      before do
+        @box = ::Page.box :sub do
+          allow_group :singletons
+        end
+      end
+      it "allows the addition of singletons without an instance" do
+        @box.allowed_types(nil).must_equal [SingletonPage]
+      end
+      it "restricts the addition of singletons with an instance" do
+        SingletonPage.create
+        @box.allowed_types(nil).must_equal []
+      end
+    end
+    describe "allow_subclasses" do
+      before do
+        @box = ::Page.box :sub do
+          allow_subclasses :Page
+        end
+      end
+      it "allows the addition of singletons without an instance" do
+        @box.allowed_types(nil).must_equal [SingletonPage]
+      end
+      it "restricts the addition of singletons with an instance" do
+        SingletonPage.create
+        @box.allowed_types(nil).must_equal []
+      end
+    end
+  end
+end

data/test/unit/test_site.rb CHANGED Viewed

@@ -19,6 +19,10 @@ describe "Site" do
     teardown_site
   end
+  def assert_site_modified(time)
+    (@site.modified_at - time).must_be :<=, 1
+  end
   describe "contents" do
     before do
       @root = ::Page.new
@@ -77,15 +81,16 @@ describe "Site" do
           :type => 'Page',
           :type_id => ::Page.schema_id,
           :depth => 3,
+          :private => false,
           :children => {},
           :ancestors => [
-            { :id => @root.id, :title => "Homepage", :path => '/', :slug => '', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
-            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 },
-            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
+            { :id => @root.id, :title => "Homepage", :path => '/', :slug => '', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2, :private => false},
+            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1, :private => false},
+            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2, :private => false}
           ],
           :generation => { "Subpages" => [
-            { :id => @page3_1.id, :title => "Page 3 1", :path => '/page1-1/page2-1/page3-1', :slug => 'page3-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 },
-            { :id => @page3_2.id, :title => "Page 3 2", :path => '/page1-1/page2-1/page3-2', :slug => 'page3-2', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 }
+            { :id => @page3_1.id, :title => "Page 3 1", :path => '/page1-1/page2-1/page3-1', :slug => 'page3-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0, :private => false},
+            { :id => @page3_2.id, :title => "Page 3 2", :path => '/page1-1/page2-1/page3-2', :slug => 'page3-2', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0, :private => false}
           ] }
         })
@@ -97,12 +102,14 @@ describe "Site" do
           :type => 'Page',
           :type_id => ::Page.schema_id,
           :depth => 2,
+          :private => false,
           :children => {
             "Subpages" => [
               {:depth=>3,
                :type=>"Page",
                :type_id => ::Page.schema_id,
                :children=>0,
+               :private => false,
                :path=>"/page1-1/page2-1/page3-1",
                :slug => 'page3-1',
                :title=>"Page 3 1",
@@ -111,20 +118,26 @@ describe "Site" do
                 :type=>"Page",
                 :type_id => ::Page.schema_id,
                 :children=>0,
+                :private => false,
                 :path=>"/page1-1/page2-1/page3-2",
                 :slug => 'page3-2',
                 :title=>"Page 3 2",
                 :id=>@page3_2.id}]},
                 :ancestors => [
-                  { :id => @root.id, :title => "Homepage", :path => '/', :slug => '',:type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
-                  { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 }
+                  { :id => @root.id, :title => "Homepage", :path => '/', :slug => '',:type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2, :private => false },
+                  { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1, :private => false}
                 ],
                 :generation => {"Subpages" => [
-                  { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
+                  { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2, :private => false}
                 ]}
         })
       end
+      it "returns the private status of a page in the map" do
+        page = Page.create_root("#private")
+        page.map_entry[:private].must_equal true
+      end
       it "retrieve details of the root by default" do
         @site.map.must_equal Page.root.map_entry
@@ -206,73 +219,87 @@ describe "Site" do
     it "just return the current time if no modifications have been made" do
       now = @now + 12
-      Time.stubs(:now).returns(now)
-      @site.modified_at.must_equal now
+      Timecop.travel(now) do
+        assert_site_modified(now)
+      end
     end
     it "be updated when a page is added" do
       now = @now + 24
-      Time.stubs(:now).returns(now)
-      root = ::Page.create
-      Time.stubs(:now).returns(now + 200)
-      @site.modified_at.must_equal now
+      Timecop.travel(now) do
+        root = ::Page.create
+      end
+      assert_site_modified(now)
     end
     it "be updated when a page's title changes" do
       root = ::Page.create
       now = @now + 98
-      Time.stubs(:now).returns(now)
-      root.update(:title => "Some Title")
-      @site.modified_at.must_equal now
+      Timecop.travel(now) do
+        root.update(:title => "Some Title")
+      end
+      assert_site_modified(now)
     end
     it "be updated when a page's slug changes" do
       root = ::Page.create
       now = @now + 98
-      Time.stubs(:now).returns(now)
-      root.update(:slug => "updated-slug")
-      @site.modified_at.must_equal now
+      Timecop.travel(now) do
+        root.update(:slug => "updated-slug")
+      end
+      assert_site_modified(now)
     end
     it "not be updated when a piece is added" do
       now1 = @now + 24
-      Time.stubs(:now).returns(now1)
-      root = ::Page.create
+      root = nil
+      Timecop.travel(now1) do
+        root = ::Page.create
+      end
       now2 = @now + 240
-      Time.stubs(:now).returns(now2)
-      root.subpages << Piece.create
-      @site.modified_at.must_equal now1
+      Timecop.travel(now2) do
+        root.subpages << Piece.create
+      end
+      assert_site_modified(now1)
     end
     it "be updated when a page is deleted" do
       now1 = @now + 24
-      Time.stubs(:now).returns(now1)
-      root = ::Page.create
+      root = child = nil
+      Timecop.travel(now1) do
+        root = ::Page.create
+      end
       now2 = @now + 48
-      Time.stubs(:now).returns(now2)
-      child = ::Page.new
-      root.subpages << child
-      root.save
-      @site.modified_at.must_equal now2
+      Timecop.travel(now2) do
+        child = ::Page.new
+        root.subpages << child
+        root.save
+      end
+      assert_site_modified(now2)
       now3 = @now + 128
-      Time.stubs(:now).returns(now3)
-      child.destroy
-      @site.modified_at.must_equal now3
+      Timecop.travel(now3) do
+        child.destroy
+      end
+      assert_site_modified(now3)
     end
     it "not be updated when a piece is deleted" do
       now1 = @now + 24
-      Time.stubs(:now).returns(now1)
-      root = ::Page.create
+      root = piece = nil
+      Timecop.travel(now1) do
+        root = ::Page.create
+      end
       now2 = @now + 240
-      Time.stubs(:now).returns(now2)
-      piece = ::Piece.create
-      root.subpages << piece
-      @site.modified_at.must_equal now1
+      Timecop.travel(now2) do
+        piece = ::Piece.create
+        root.subpages << piece
+      end
+      assert_site_modified(now1)
       now3 = @now + 480
-      Time.stubs(:now).returns(now3)
-      piece.reload.destroy
-      @site.modified_at.must_equal now1
+      Timecop.travel(now3) do
+        piece.reload.destroy
+      end
+      assert_site_modified(now1)
     end
   end