spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/unit/test_formats.rb

@@ -7,12 +7,11 @@ class FormatsTest < MiniTest::Spec
     setup do
       @site = setup_site
       @site.paths.add :templates, File.expand_path('../../fixtures/outputs/templates', __FILE__)
-      class Page < Spontaneous::Page; end
-      class FPage < Page; end
+      # class Page < ::Page; end
+      class FPage < ::Page; end
     end
 
     teardown do
-      self.class.send(:remove_const, :Page) rescue nil
       self.class.send(:remove_const, :FPage) rescue nil
       teardown_site
     end

data/test/unit/test_generators.rb

@@ -62,15 +62,16 @@ class GeneratorsTest < MiniTest::Spec
       end
       assert_file_exists(site_root, 'schema')
       assert_file_exists(site_root, 'schema/page.rb')
-      assert File.read(site_root / 'schema/page.rb') =~ /class Page < Spontaneous::Page/
+      assert File.read(site_root / 'schema/page.rb') =~ /class Page < Content::Page/
       assert_file_exists(site_root, 'schema/piece.rb')
       assert_file_exists(site_root, 'schema/box.rb')
-      assert File.read(site_root / 'schema/piece.rb') =~ /class Piece < Spontaneous::Piece/
+      assert File.read(site_root / 'schema/piece.rb') =~ /class Piece < Content::Piece/
       assert_file_exists(site_root, 'public/js')
       assert_file_exists(site_root, 'public/css')
-      assert_file_exists(site_root, 'lib/tasks/example_com.rake')
-      assert_file_exists(site_root, 'lib/site.rb')
-      assert File.read(site_root / 'lib/site.rb') =~ /class Site < Spontaneous::Site/
+      content_rb =  File.read(site_root / 'lib/content.rb')
+      assert content_rb =~ /class Content < Spontaneous::Model\(:content\)/
+      assert content_rb =~ /^Site = Spontaneous\.site\(Content\)/
+      assert_file_exists(site_root, 'lib/tasks/site.rake')
       assert_file_exists(site_root, 'log')
       assert_file_exists(site_root, 'tmp')
       assert_file_exists(site_root, 'cache/media')
@@ -78,7 +79,6 @@ class GeneratorsTest < MiniTest::Spec
       assert_file_exists(site_root, 'cache/revisions')
       assert_file_exists(site_root, '.gitignore')
       assert File.read(site_root / '.gitignore') =~ /cache\/\*/
-      assert File.read(site_root / 'schema/piece.rb') =~ /class Piece < Spontaneous::Piece/
     end
 
     should "specify the current version of spontaneous as the dependency" do

data/test/unit/test_helpers.rb

@@ -51,7 +51,7 @@ class HelpersTest < MiniTest::Spec
     end
 
     should "be available during the render step" do
-      class Page < Spontaneous::Page
+      class Page < Content::Page
         add_output :mobile
       end
 

data/test/unit/test_image_size.rb

@@ -8,18 +8,23 @@ class ImageSizeTest < MiniTest::Spec
       @base_dir = File.expand_path(File.join(File.dirname(__FILE__), '../fixtures/images'))
       @dimensions = [50, 67]
     end
+
     should "work for PNG24" do
-      ImageSize.read(File.join(@base_dir, "size.png24")).should == @dimensions
+      S::ImageSize.read(File.join(@base_dir, "size.png24")).should == @dimensions
     end
     should "work for PNG8" do
-      ImageSize.read(File.join(@base_dir, "size.png8")).should == @dimensions
+      S::ImageSize.read(File.join(@base_dir, "size.png8")).should == @dimensions
     end
     should "work for JPG" do
-      ImageSize.read(File.join(@base_dir, "size.jpg")).should == @dimensions
+      S::ImageSize.read(File.join(@base_dir, "size.jpg")).should == @dimensions
     end
     should "work for GIF" do
-      ImageSize.read(File.join(@base_dir, "size.gif")).should == @dimensions
+      S::ImageSize.read(File.join(@base_dir, "size.gif")).should == @dimensions
+    end
+    should "return 0x0 for empty files" do
+      Tempfile.open("imagesize") do |file|
+      S::ImageSize.read(file).should == [0,0]
+      end
     end
   end
 end
-

data/test/unit/test_images.rb

@@ -5,7 +5,7 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'fog'
 
 class ImagesTest < MiniTest::Spec
-  include Spontaneous
+
   def setup
     @site = setup_site
   end
@@ -16,7 +16,7 @@ class ImagesTest < MiniTest::Spec
 
   context "Image fields set using absolute values" do
     setup do
-      @image = FieldTypes::ImageField.new(:name => "image")
+      @image = S::Field::Image.new(:name => "image")
     end
     should "accept and not alter URL values" do
       url =  "http://example.com/image.png"
@@ -44,15 +44,14 @@ class ImagesTest < MiniTest::Spec
       @upload_dir.mkpath
 
       @revision = 10
-      Site.stubs(:working_revision).returns(@revision)
+      S::Site.stubs(:working_revision).returns(@revision)
 
       @src_image =  Pathname.new(File.join(File.dirname(__FILE__), "../fixtures/images/rose.jpg")).realpath
       @origin_image = @upload_dir + "rose.jpg"
-      # @origin_image.make_link(@src_image.to_s) unless @origin_image.exist?
       FileUtils.cp(@src_image.to_s, @origin_image.to_s)
       @origin_image = @origin_image.realpath.to_s
 
-      class ::ResizingImageField < FieldTypes::ImageField
+      class ::ResizingImageField < S::Field::Image
         size :preview do
           width 200
           optimize!
@@ -78,7 +77,7 @@ class ImagesTest < MiniTest::Spec
 
       ResizingImageField.register
 
-      class ::ContentWithImage < Content
+      class ::ContentWithImage < ::Content::Piece
         field :photo, :resizing_image
       end
 
@@ -103,11 +102,11 @@ class ImagesTest < MiniTest::Spec
       end
 
       should "create resized versions of the input image" do
-        ImageSize.read(@image.preview.filepath).should == [200, 267]
-        ImageSize.read(@image.tall.filepath).should == [150, 200]
-        ImageSize.read(@image.thumbnail.filepath).should == [38, 50]
-        ImageSize.read(@image.icon.filepath).should == [50, 50]
-        ImageSize.read(@image.greyscale.filepath).should == [38, 50]
+        S::ImageSize.read(@image.preview.filepath).should == [200, 267]
+        S::ImageSize.read(@image.tall.filepath).should == [150, 200]
+        S::ImageSize.read(@image.thumbnail.filepath).should == [38, 50]
+        S::ImageSize.read(@image.icon.filepath).should == [50, 50]
+        S::ImageSize.read(@image.greyscale.filepath).should == [38, 50]
       end
 
       should "preserve new format if processing has altered it" do
@@ -115,7 +114,7 @@ class ImagesTest < MiniTest::Spec
       end
     end
 
-    context "with optimization xxx" do
+    context "with optimization" do
       should "run jpegoptim" do
         Spontaneous.expects(:system).with(regexp_matches(/jpegoptim/)).at_least_once
         Spontaneous.expects(:system).with(regexp_matches(/jpegtran/)).at_least_once
@@ -177,7 +176,7 @@ class ImagesTest < MiniTest::Spec
         @image.height.should == 533
       end
 
-      should "have access to the original uploaded file through field.original" do
+      should "have access to the original uploaded file through field.original xxx" do
         @image.src.should == "/media/00234/0010/rose.jpg"
         @image.original.width.should == @image.width
         @image.original.height.should == @image.height
@@ -187,11 +186,11 @@ class ImagesTest < MiniTest::Spec
 
 
       should "have a 'sizes' config option that generates resized versions" do
-        assert_same_elements ResizingImageField.size_definitions.keys, [:preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
+        assert_same_elements ResizingImageField.size_definitions.keys, [:__ui__, :preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
       end
 
       should "serialise attributes" do
-        serialised = S::FieldTypes.deserialize_field(@image.serialize_db)[:processed_values]
+        serialised = S::Field.deserialize_field(@image.serialize_db)[:processed_values]
         [:preview, :thumbnail, :icon, :tall].each do |size|
           serialised.key?(size).should be_true
           serialised[size][:src].should == "/media/00234/0010/rose.#{size}.jpg"
@@ -232,12 +231,12 @@ class ImagesTest < MiniTest::Spec
         @image.original.filesize.should == @image.filesize
       end
       should "have a 'sizes' config option that generates resized versions" do
-        assert_same_elements @image.class.size_definitions.keys, [:preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
-        assert_same_elements @image.class.sizes.keys, [:preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
+        assert_same_elements @image.class.size_definitions.keys, [:__ui__, :preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
+        assert_same_elements @image.class.sizes.keys, [:__ui__, :preview, :thumbnail, :icon, :tall, :greyscale, :reformatted]
       end
 
       should "serialise attributes" do
-        serialised = S::FieldTypes.deserialize_field(@image.serialize_db)[:processed_values]
+        serialised = S::Field.deserialize_field(@image.serialize_db)[:processed_values]
         [:preview, :thumbnail, :icon, :tall].each do |size|
           serialised.key?(size).should be_true
           serialised[size][:src].should == "/media/00234/0010/rose.#{size}.jpg"

data/test/unit/test_layouts.rb

@@ -17,13 +17,13 @@ class LayoutsTest < MiniTest::Spec
   context "layouts" do
 
     setup do
-      class ::LayoutPage < Spontaneous::Page; end
-      class ::ABoxClass < Spontaneous::Box; end
+      class ::LayoutPage < ::Page; end
+      class ::ABoxClass < ::Box; end
       class ::SubPage < LayoutPage; end
       ABoxClass.style :monkey
       ABoxClass.style :crazy
 
-      class ::SomeContent < Spontaneous::Piece; end
+      class ::SomeContent < ::Piece; end
     end
 
     teardown do
@@ -41,6 +41,20 @@ class LayoutsTest < MiniTest::Spec
         page.render.should == "layouts/standard.html.cut\n"
       end
 
+      should "use the named template if it exists" do
+        layout = @template_root / "layouts/layout_page.html.cut"
+        begin
+          File.open(layout, "w") do |file|
+            file.write("layouts/layout_page.html.cut\n")
+          end
+          page = LayoutPage.new
+          assert_correct_template(page, @template_root / 'layouts/layout_page')
+          page.render.should == "layouts/layout_page.html.cut\n"
+        ensure
+          FileUtils.rm(layout)
+        end
+      end
+
       should "return the first layout if some are declared but none declared default" do
         LayoutPage.layout :custom1
         LayoutPage.layout :custom2
@@ -48,6 +62,7 @@ class LayoutsTest < MiniTest::Spec
         assert_correct_template(page, @template_root / 'layouts/custom1')
         page.render.should == "layouts/custom1.html.cut\n"
       end
+
       should "return the layout declared default" do
         LayoutPage.layout :custom1
         LayoutPage.layout :custom2, :default => true

data/test/unit/test_media.rb

@@ -9,14 +9,14 @@ class MediaTest < MiniTest::Spec
   end
 
   def teardown
+    ::Content.delete
     teardown_site
-    S::Content.delete
   end
 
   context "Utility methods" do
     should "be able to sanitise filenames" do
       filename = "Something with-dodgy 'characters'.many.jpg"
-      Media.to_filename(filename).should == "Something-with-dodgy-characters.many.jpg"
+      S::Media.to_filename(filename).should == "Something-with-dodgy-characters.many.jpg"
     end
   end
 
@@ -45,7 +45,7 @@ class MediaTest < MiniTest::Spec
       @storage = Spontaneous::Storage::Cloud.new(@aws_credentials, 'media.example.com')
       @storage.backend.directories.create(:key => @bucket_name)
       @site.stubs(:storage).with(anything).returns(@storage)
-      @content = S::Content.create
+      @content = ::Piece.create
       @content.stubs(:id).returns(99)
       Spontaneous::State.stubs(:revision).returns(853)
     end
@@ -108,7 +108,7 @@ class MediaTest < MiniTest::Spec
       @media_dir = Dir.mktmpdir
       @storage = Spontaneous::Storage::Local.new(@media_dir, '/media')
       @site.stubs(:storage).with(anything).returns(@storage)
-      @content = S::Content.create
+      @content = ::Piece.create
       @content.stubs(:id).returns(99)
       Spontaneous::State.stubs(:revision).returns(853)
     end
@@ -167,62 +167,87 @@ class MediaTest < MiniTest::Spec
     end
   end
 
-  context "Content items" do
+  context "temporary media items" do
     setup do
-      # @media_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/media"))
-      # Spontaneous.media_dir = @media_dir
-      Site.stubs(:working_revision).returns(74)
-      @instance = Content.new
-      @instance.stubs(:id).returns(101)
+      # Setup cloud storage as default to ensure that the temp files
+      # are bypassing this and being written locally
+      Fog.mock!
+      @bucket_name = "media.example.com"
+      @aws_credentials = {
+        :provider=>"AWS",
+        :aws_secret_access_key=>"SECRET_ACCESS_KEY",
+        :aws_access_key_id=>"ACCESS_KEY_ID",
+        :public_host => "http://media.example.com"
+      }
+      cloud = Spontaneous::Storage::Cloud.new(@aws_credentials, 'media.example.com')
+      cloud.backend.directories.create(:key => @bucket_name)
+      @site.stubs(:storage).with(anything).returns(cloud)
+      @media_dir = Dir.mktmpdir
+      @storage = Spontaneous::Storage::Local.new(@media_dir, '/media')
+      @site.stubs(:local_storage).with(anything).returns(@storage)
+      @site.stubs(:default_storage).with(anything).returns(@storage)
+      @content = ::Piece.create
+      @content.stubs(:id).returns(99)
     end
 
-    should "be able to generate a revision and id based media path" do
-      @instance.media_filepath("something.jpg").should == File.join(@site.media_dir, "00101/0074/something.jpg")
-      @instance.media_urlpath("something.jpg").should == "/media/00101/0074/something.jpg"
+    should "return an absolute path for the url" do
+      file = Spontaneous::Media::TempFile.new(@content, "file name.txt")
+      file.url.should == "/media/tmp/00099/file-name.txt"
     end
 
-    context "file manipulation" do
-      setup do
-        @tmp_dir = Pathname.new(Spontaneous.media_dir)
-        @src_image =  Pathname.new(File.join(File.dirname(__FILE__), "../fixtures/images/rose.jpg")).realpath
-        @upload_dir = @tmp_dir + "tmp/1234"
-        @upload_dir.mkpath
-        @origin_image = @upload_dir + "rose.jpg"
-        FileUtils.cp(@src_image.to_s, @origin_image.to_s)
-      end
+    should "place files into its configured root" do
+      file = Spontaneous::Media::TempFile.new(@content, "file name.txt")
+      file.path.should == File.join(@media_dir, "/tmp/00099/file-name.txt")
+    end
 
-      teardown do
-        # (@tmp_dir + "..").rmtree
-      end
+    should "be able to copy a file into place if passed the path of an existing file" do
+      file_path = File.join(@media_dir, "/tmp/00099/file-name.txt")
+      existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      ::File.exist?(file_path).should be_false
+      ::File.exist?(existing_file).should be_true
+      file = Spontaneous::Media::TempFile.new(@content, "file name.txt")
+      file.copy(existing_file)
+      ::File.exist?(file_path).should be_true
+      file.source.should == existing_file
+    end
 
-      should "be able to move a file into the media path" do
-        @instance.make_media_file(@origin_image)
-        @origin_image.exist?.should be_true
-        dest_image = @tmp_dir + "00101/0074/rose.jpg"
-        dest_image.exist?.should be_true
+    should "be able to copy a file into place if passed the handle of an existing file" do
+      file_path = File.join(@media_dir, "/tmp/00099/file-name.txt")
+      existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+      ::File.exist?(file_path).should be_false
+      ::File.exist?(existing_file).should be_true
+      file = Spontaneous::Media::TempFile.new(@content, "file name.txt")
+      File.open(existing_file, 'rb') do |f|
+        file.copy(f)
       end
+      ::File.exist?(file_path).should be_true
+      file.source.should == existing_file
+    end
 
-      should "honour the filename parameter when creating media files" do
-        @instance.make_media_file(@origin_image, 'crysanthemum.jpg')
-        @origin_image.exist?.should be_true
-        dest_image = @tmp_dir + "00101/0074/crysanthemum.jpg"
-        dest_image.exist?.should be_true
+    should "provide an open method that writes files to the correct location" do
+      file_path = File.join(@media_dir, "/tmp/00099/file-name.txt")
+      ::File.exist?(file_path).should be_false
+      file = Spontaneous::Media::TempFile.new(@content, "file name.txt")
+      content_string = "Hello"
+      file.open do |f|
+        f.write(content_string)
       end
+      File.read(file_path).should == content_string
+    end
+  end
 
-      should "sanitise filenames" do
-        origin_image = @upload_dir + "illegal filename!.jpg"
-        FileUtils.cp(@src_image.to_s, origin_image.to_s)
-        @instance.make_media_file(origin_image)
-        dest_image = @tmp_dir + "00101/0074/illegal-filename.jpg"
-        dest_image.exist?.should be_true
-      end
-      should "sanitise custom filenames" do
-        origin_image = @upload_dir + "rose.jpg"
-        FileUtils.cp(@src_image.to_s, origin_image.to_s)
-        @instance.make_media_file(origin_image,  "other, 'illegal' filename!.jpg")
-        dest_image = @tmp_dir + "00101/0074/other-illegal-filename.jpg"
-        dest_image.exist?.should be_true
-      end
+  context "Content items" do
+    setup do
+      # @media_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../tmp/media"))
+      # Spontaneous.media_dir = @media_dir
+      S::Site.stubs(:working_revision).returns(74)
+      @instance = ::Piece.new
+      @instance.stubs(:id).returns(101)
+    end
+
+    should "be able to generate a revision and id based media path" do
+      @instance.media_filepath("something.jpg").should == File.join(@site.media_dir, "00101/0074/something.jpg")
+      @instance.media_urlpath("something.jpg").should == "/media/00101/0074/something.jpg"
     end
   end
 end

data/test/unit/test_modifications.rb

@@ -21,11 +21,11 @@ class ModificationsTest < MiniTest::Spec
       # DB.logger = Logger.new($stdout)
       Content.delete
 
-      class Page < Spontaneous::Page
+      class Page < ::Page
         field :title, :string, :default => "New Page"
         box :things
       end
-      class Piece < Spontaneous::Piece
+      class Piece < ::Piece
         box :things
       end
 
@@ -79,7 +79,7 @@ class ModificationsTest < MiniTest::Spec
     should "update modification date of path when page visibility is changed" do
       now = @now + 100
       stub_time(now)
-      c = Page.first
+      c = Page.uid("0")
       (c.modified_at.to_i - @now.to_i).abs.should <= 1
       c.toggle_visibility!
       (c.modified_at - now).abs.should <= 1
@@ -136,7 +136,7 @@ class ModificationsTest < MiniTest::Spec
       page.modified_at.to_i.should == @now.to_i + 3600
     end
 
-    should "not update the parent page's timestamp on addition of a child page" do
+    should "not update the parent page's timestamp on addition of a child page yyyy" do
       stub_time(@now+1000)
       page = Page.first :uid => "0"
       page.things << Page.new
@@ -219,7 +219,7 @@ class ModificationsTest < MiniTest::Spec
       mods = page.pending_modifications(:slug)
       mods.length.should == 1
       mod = mods.first
-      mod.must_be_instance_of Spontaneous::Plugins::Modifications::SlugModification
+      mod.must_be_instance_of Spontaneous::Model::Core::Modifications::SlugModification
       mod.old_value.should == old_slug
       mod.new_value.should == "changed"
       mod.created_at.to_i.should == @now.to_i + 3600
@@ -356,7 +356,7 @@ class ModificationsTest < MiniTest::Spec
         @final_revision = 2
         Content.delete_revision(@initial_revision) rescue nil
         Content.delete_revision(@final_revision) rescue nil
-        S::Content.publish(@initial_revision)
+        ::Content.publish(@initial_revision)
       end
 
       teardown do
@@ -370,11 +370,11 @@ class ModificationsTest < MiniTest::Spec
         old_slug = page.slug
         page.slug = "changed"
         page.save
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           %w(1 1.1.1).each do |uid|
             published_page = Page.first :uid => uid
-            S::Content.with_editable do
+            ::Content.with_editable do
               editable_page = Page.first :uid => uid
               published_page.path.should == editable_page.path
             end
@@ -396,8 +396,8 @@ class ModificationsTest < MiniTest::Spec
         child_page.slug = "changed-too"
         child_page.save
 
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           published = Page.first :uid => "1.0.0"
           published.path.should == "/changed/#{old_slug}"
         end
@@ -417,8 +417,8 @@ class ModificationsTest < MiniTest::Spec
         child_page.slug = "changed-too"
         child_page.save
 
-        S::Content.publish(@final_revision, [child_page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [child_page.id])
+        ::Content.with_revision(@final_revision) do
           published = Page.first :uid => "1.0.0"
           published.path.should == "/#{old_slug}/changed-too"
         end
@@ -428,11 +428,11 @@ class ModificationsTest < MiniTest::Spec
       should "act on visibility modifications" do
         page = Page.first :uid => "1"
         page.hide!
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           %w(1 1.1.1).each do |uid|
             published_page = Page.first :uid => uid
-            S::Content.with_editable do
+            ::Content.with_editable do
               editable_page = Page.first :uid => uid
               published_page.hidden?.should == editable_page.hidden?
             end
@@ -448,9 +448,9 @@ class ModificationsTest < MiniTest::Spec
         page.things << child_page
         page.save
 
-        S::Content.publish(@final_revision, [child_page.id])
+        ::Content.publish(@final_revision, [child_page.id])
 
-        S::Content.with_revision(@final_revision) do
+        ::Content.with_revision(@final_revision) do
           published = Page.first :uid => "1.0.0"
           published.visible?.should be_true
           published = Page.first :uid => "child"
@@ -466,9 +466,9 @@ class ModificationsTest < MiniTest::Spec
         page.things << child_page
         page.save
 
-        S::Content.publish(@final_revision, [page.id, child_page.id])
+        ::Content.publish(@final_revision, [page.id, child_page.id])
 
-        S::Content.with_revision(@final_revision) do
+        ::Content.with_revision(@final_revision) do
           published = Page.first :uid => "child"
           published.visible?.should be_false
         end
@@ -484,9 +484,9 @@ class ModificationsTest < MiniTest::Spec
         child_page.slug = "changed-too"
         child_page.save
 
-        S::Content.publish(@final_revision, [child_page.id])
+        ::Content.publish(@final_revision, [child_page.id])
 
-        S::Content.with_revision(@final_revision) do
+        ::Content.with_revision(@final_revision) do
           published = Page.first :uid => "1.0.0"
           published.visible?.should be_true
         end
@@ -499,7 +499,7 @@ class ModificationsTest < MiniTest::Spec
         page.things << child_page
         page.save
 
-        S::Content.publish(@final_revision, [page.id, child_page.id])
+        ::Content.publish(@final_revision, [page.id, child_page.id])
 
         child_page.hidden?.should be_false
 
@@ -507,9 +507,9 @@ class ModificationsTest < MiniTest::Spec
 
         child_page.reload.hidden?.should be_true
 
-        S::Content.publish(@final_revision + 1, [page.id])
+        ::Content.publish(@final_revision + 1, [page.id])
 
-        S::Content.with_revision(@final_revision + 1) do
+        ::Content.with_revision(@final_revision + 1) do
           published = Page.first :uid => "newpage"
           published.visible?.should be_false
         end
@@ -524,44 +524,44 @@ class ModificationsTest < MiniTest::Spec
 
         child_page.reload.hidden?.should be_true
 
-        S::Content.publish(@final_revision, [page.id])
+        ::Content.publish(@final_revision, [page.id])
 
-        S::Content.with_revision(@final_revision) do
+        ::Content.with_revision(@final_revision) do
           published = Page.first :uid => "1.0.0"
           published.visible?.should be_false
         end
       end
 
-      should "maintain correct published visibility for pieces xxx" do
+      should "maintain correct published visibility for pieces" do
         page = Page.first :uid => "1"
         piece = page.things.first
         piece.hide!
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           piece = Page.first(:uid => "1").things.first
           piece.visible?.should be_false
         end
 
-        S::Content.publish(@final_revision+1, [page.id])
+        ::Content.publish(@final_revision+1, [page.id])
 
-        S::Content.with_revision(@final_revision+1) do
+        ::Content.with_revision(@final_revision+1) do
           piece = Page.first(:uid => "1").things.first
           piece.visible?.should be_false
         end
       end
 
-      should "maintain correct published visibility for pages xxx" do
+      should "maintain correct published visibility for pages" do
         page = Page.first :uid => "1.1.1"
         page.hide!
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           page = Page.first(:uid => "1.1.1")
           page.visible?.should be_false
         end
 
-        S::Content.publish(@final_revision+1, [page.id])
+        ::Content.publish(@final_revision+1, [page.id])
 
-        S::Content.with_revision(@final_revision+1) do
+        ::Content.with_revision(@final_revision+1) do
           page = Page.first(:uid => "1.1.1")
           page.visible?.should be_false
         end
@@ -574,11 +574,11 @@ class ModificationsTest < MiniTest::Spec
         page.slug = "changed-again"
         page.hide!
 
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           %w(1 1.1.1).each do |uid|
             published_page = Page.first :uid => uid
-            S::Content.with_editable do
+            ::Content.with_editable do
               editable_page = Page.first :uid => uid
               published_page.hidden?.should == editable_page.hidden?
               published_page.slug.should == editable_page.slug
@@ -592,8 +592,8 @@ class ModificationsTest < MiniTest::Spec
         page = Page.first(:uid => "1")
         page.destroy
         page = Page.first(:uid => "root")
-        S::Content.publish(@final_revision, [page.id])
-        S::Content.with_revision(@final_revision) do
+        ::Content.publish(@final_revision, [page.id])
+        ::Content.with_revision(@final_revision) do
           %w(1 1.1.1).each do |uid|
             published_page = Page.first :uid => uid
             published_page.should be_nil
@@ -607,7 +607,7 @@ class ModificationsTest < MiniTest::Spec
         page = Page.first :uid => "1"
         page.slug = "changed"
         page.hide!
-        S::Content.publish(@final_revision, [page.id])
+        ::Content.publish(@final_revision, [page.id])
         page = Page.first :id => page.id
         page.pending_modifications.length.should == 0
       end