nesta 0.9.13 → 0.10.0

data/spec/config_spec.rb

@@ -4,6 +4,14 @@ describe "Config" do
   after(:each) do
     ENV.keys.each { |variable| ENV.delete(variable) if variable =~ /NESTA_/ }
   end
+
+  it 'should return default value for "Read more"' do
+    Nesta::Config.read_more.should == 'Continue reading'
+  end
+
+  it 'should return nil for author when not defined' do
+    Nesta::Config.author.should == nil
+  end
   
   describe "when settings defined in ENV" do
     before(:each) do
@@ -22,10 +30,25 @@ describe "Config" do
     end
     
     it "should know how to cope with boolean values" do
-      ENV["NESTA_CACHE"] = "true"
-      Nesta::Config.cache.should be_true
-      ENV["NESTA_CACHE"] = "false"
-      Nesta::Config.cache.should be_false
+      Nesta::Config.settings << 'a_boolean'
+      begin
+        ENV["NESTA_A_BOOLEAN"] = "true"
+        Nesta::Config.a_boolean.should be_true
+        ENV["NESTA_A_BOOLEAN"] = "false"
+        Nesta::Config.a_boolean.should be_false
+      ensure
+        Nesta::Config.settings.pop
+        ENV.delete('NESTA_A_BOOLEAN')
+      end
+    end
+
+    it 'should return configured value for "Read more"' do
+      ENV['NESTA_READ_MORE'] = 'Read on'
+      begin
+        Nesta::Config.read_more.should == 'Read on'
+      ensure
+        ENV.delete('NESTA_READ_MORE')
+      end
     end
     
     it "should set author hash from ENV" do
@@ -58,10 +81,47 @@ describe "Config" do
       Nesta::Config.author["email"].should be_nil
     end
     
-    it "should override top level settings with RACK_ENV specific settings" do
+    it "should override top level settings with environment specific settings" do
       stub_config_key('content', 'general/path')
-      stub_config_key('content', 'rack_env/path', :rack_env => true)
+      stub_config_key('content', 'rack_env/path', for_environment: true)
       Nesta::Config.content.should == 'rack_env/path'
     end
   end
+
+  describe 'Nesta::Config.fetch' do
+    it 'should be retrieve settings from environment' do
+      ENV['NESTA_MY_SETTING'] = 'value in ENV'
+      begin
+        Nesta::Config.fetch('my_setting').should == 'value in ENV'
+        Nesta::Config.fetch(:my_setting).should == 'value in ENV'
+      ensure
+        ENV.delete('NESTA_MY_SETTING')
+      end
+    end
+
+    it 'should retrieved settings from YAML' do
+      stub_config_key('my_setting', 'value in YAML')
+      Nesta::Config.fetch('my_setting').should == 'value in YAML'
+      Nesta::Config.fetch(:my_setting).should == 'value in YAML'
+    end
+
+    it "should throw NotDefined if a setting isn't defined" do
+      lambda {
+        Nesta::Config.fetch('no such setting')
+      }.should raise_error(Nesta::Config::NotDefined)
+    end
+
+    it 'should allow default values to be set' do
+      Nesta::Config.fetch('no such setting', 'default').should == 'default'
+    end
+
+    it 'should cope with non-truthy boolean values' do
+      ENV['NESTA_SETTING'] = 'false'
+      begin
+        Nesta::Config.fetch('setting').should == false
+      ensure
+        ENV.delete('NESTA_SETTING')
+      end
+    end
+  end
 end

data/spec/fixtures/nesta-plugin-test/lib/nesta-plugin-test/init.rb

@@ -2,9 +2,7 @@ module Nesta
   module Plugin
     module Test
       module Helpers
-        helpers do
-          # If your plugin needs any helper methods, add them here...
-        end
+        # If your plugin needs any helper methods, add them here...
       end
     end
   end

data/spec/model_factory.rb

@@ -6,28 +6,28 @@ module ModelFactory
     yield(path) if block_given?
     Nesta::Page.new(path)
   end
-  
+
   def create_article(options = {}, &block)
     o = {
-      :path => 'article-prefix/my-article',
-      :heading => 'My article',
-      :content => 'Content goes here',
-      :metadata => {
+      path: 'article-prefix/my-article',
+      heading: 'My article',
+      content: 'Content goes here',
+      metadata: {
         'date' => '29 December 2008'
       }.merge(options.delete(:metadata) || {})
     }.merge(options)
     create_page(o, &block)
   end
-  
+
   def create_category(options = {}, &block)
     o = {
-      :path => 'category-prefix/my-category',
-      :heading => 'My category',
-      :content => 'Content goes here'
+      path: 'category-prefix/my-category',
+      heading: 'My category',
+      content: 'Content goes here'
     }.merge(options)
     create_page(o, &block)
   end
-  
+
   def write_menu_item(indent, file, menu_item)
     if menu_item.is_a?(Array)
       indent.sub!(/^/, '  ')
@@ -42,20 +42,20 @@ module ModelFactory
     file = filename(Nesta::Config.content_path, 'menu', :txt)
     File.open(file, 'w') { |file| file.write(menu_text) }
   end
-  
+
   def delete_page(type, permalink, extension)
     file = filename(Nesta::Config.page_path, permalink, extension)
     FileUtils.rm(file)
   end
-  
+
   def create_content_directories
     FileUtils.mkdir_p(Nesta::Config.page_path)
     FileUtils.mkdir_p(Nesta::Config.attachment_path)
   end
-  
+
   def mock_file_stat(method, filename, time)
-    stat = mock(:stat)
-    stat.stub!(:mtime).and_return(Time.parse(time))
+    stat = double(:stat)
+    stat.stub(:mtime).and_return(Time.parse(time))
     File.send(method, :stat).with(filename).and_return(stat)
   end
 
@@ -63,7 +63,7 @@ module ModelFactory
     def filename(directory, basename, extension = :mdown)
       File.join(directory, "#{basename}.#{extension}")
     end
-    
+
     def heading(options)
       prefix = case options[:ext]
         when :haml

data/spec/models_spec.rb

@@ -26,47 +26,60 @@ module ModelMatchers
   end
 end
 
-describe "Page", :shared => true do
-  include ModelFactory
-  include ModelMatchers
+shared_context "Page testing" do
+  include Webrat::Matchers
 
   def create_page(options)
-    super(options.merge(:ext => @extension))
+    super(options.merge(ext: @extension))
   end
 
   before(:each) do
     stub_configuration
   end
-  
+
   after(:each) do
     remove_temp_directory
     Nesta::FileModel.purge_cache
   end
-  
+end
+
+shared_examples_for "Page" do
+  include ModelFactory
+  include ModelMatchers
+
   it "should be findable" do
-    create_page(:heading => 'Apple', :path => 'the-apple')
+    create_page(heading: 'Apple', path: 'the-apple')
     Nesta::Page.find_all.should have(1).item
   end
 
+  it "should return the filename for a path" do
+    create_page(heading: 'Banana', path: 'banana')
+    Nesta::Page.find_file_for_path('banana').should =~ /banana.#{@extension}$/
+  end
+
+  it "should return nil for files that don't exist" do
+    Nesta::Page.find_file_for_path('foobar').should be_nil
+  end
+
   it "should find by path" do
-    create_page(:heading => 'Banana', :path => 'banana')
+    create_page(heading: 'Banana', path: 'banana')
     Nesta::Page.find_by_path('banana').heading.should == 'Banana'
   end
-  
+
   it "should find index page by path" do
-    create_page(:heading => 'Banana', :path => 'banana/index')
+    create_page(heading: 'Banana', path: 'banana/index')
     Nesta::Page.find_by_path('banana').heading.should == 'Banana'
   end
 
   it "should respond to #parse_metadata, returning hash of key/value" do
-    page = create_page(:heading => 'Banana', :path => 'banana')
+    page = create_page(heading: 'Banana', path: 'banana')
     metadata = page.parse_metadata('My key: some value')
     metadata['my key'].should == 'some value'
   end
 
   it "should be parseable if metadata is invalid" do
     dodgy_metadata = "Key: value\nKey without value\nAnother key: value"
-    create_page(:heading => 'Banana', :path => 'banana') do |path|
+    create_page(heading: 'Banana', path: 'banana') do |path|
       text = File.read(path)
       File.open(path, 'w') do |file|
         file.puts(dodgy_metadata)
@@ -77,59 +90,60 @@ describe "Page", :shared => true do
   end
 
   describe "for home page" do
-    it "should set title to heading and site title" do
-      create_page(:heading => 'Home', :path => 'index')
-      Nesta::Page.find_by_path('/').title.should == 'Home - My blog'
+    it "should set title to heading" do
+      create_page(heading: 'Home', path: 'index')
+      Nesta::Page.find_by_path('/').title.should == 'Home'
     end
 
     it "should respect title metadata" do
-      create_page(:path => 'index', :metadata => { 'title' => 'Specific title' })
+      create_page(path: 'index', metadata: { 'title' => 'Specific title' })
       Nesta::Page.find_by_path('/').title.should == 'Specific title'
     end
 
     it "should set title to site title by default" do
-      create_page(:path => 'index')
+      create_page(path: 'index')
       Nesta::Page.find_by_path('/').title.should == 'My blog'
     end
 
     it "should set permalink to empty string" do
-      create_page(:path => 'index')
+      create_page(path: 'index')
       Nesta::Page.find_by_path('/').permalink.should == ''
     end
 
     it "should set abspath to /" do
-      create_page(:path => 'index')
+      create_page(path: 'index')
       Nesta::Page.find_by_path('/').abspath.should == '/'
     end
   end
-  
+
   it "should not find nonexistent page" do
     Nesta::Page.find_by_path("no-such-page").should be_nil
   end
-  
+
   it "should ensure file exists on instantiation" do
     lambda {
       Nesta::Page.new("no-such-file")
     }.should raise_error(Sinatra::NotFound)
   end
-  
+
   it "should reload cached files when modified" do
-    create_page(:path => "a-page", :heading => "Version 1")
-    File.stub!(:mtime).and_return(Time.new - 1)
+    create_page(path: "a-page", heading: "Version 1")
+    now = Time.now
+    File.stub(:mtime).and_return(now - 1)
     Nesta::Page.find_by_path("a-page")
-    create_page(:path => "a-page", :heading => "Version 2")
-    File.stub!(:mtime).and_return(Time.new)
+    create_page(path: "a-page", heading: "Version 2")
+    File.stub(:mtime).and_return(now)
     Nesta::Page.find_by_path("a-page").heading.should == "Version 2"
   end
 
   it "should have default priority of 0 in category" do
-    page = create_page(:metadata => { 'categories' => 'some-page' })
+    page = create_page(metadata: { 'categories' => 'some-page' })
     page.priority('some-page').should == 0
     page.priority('another-page').should be_nil
   end
 
   it "should read priority from category metadata" do
-    page = create_page(:metadata => {
+    page = create_page(metadata: {
       'categories' => ' some-page:1, another-page , and-another :-1 '
     })
     page.priority('some-page').should == 1
@@ -140,48 +154,48 @@ describe "Page", :shared => true do
   describe "with assigned pages" do
     before(:each) do
       @category = create_category
-      create_article(:heading => 'Article 1', :path => 'article-1')
+      create_article(heading: 'Article 1', path: 'article-1')
       create_article(
-        :heading => 'Article 2',
-        :path => 'article-2',
-        :metadata => {
+        heading: 'Article 2',
+        path: 'article-2',
+        metadata: {
           'date' => '30 December 2008',
           'categories' => @category.path
         }
       )
       @article = create_article(
-        :heading => 'Article 3',
-        :path => 'article-3',
-        :metadata => {
+        heading: 'Article 3',
+        path: 'article-3',
+        metadata: {
           'date' => '31 December 2008',
           'categories' => @category.path
         }
       )
       @category1 = create_category(
-        :path => 'category-1',
-        :heading => 'Category 1',
-        :metadata => { 'categories' => @category.path }
+        path: 'category-1',
+        heading: 'Category 1',
+        metadata: { 'categories' => @category.path }
       )
       @category2 = create_category(
-        :path => 'category-2',
-        :heading => 'Category 2',
-        :metadata => { 'categories' => @category.path }
+        path: 'category-2',
+        heading: 'Category 2',
+        metadata: { 'categories' => @category.path }
       )
       @category3 = create_category(
-        :path => 'category-3',
-        :heading => 'Category 3',
-        :metadata => { 'categories' => "#{@category.path}:1" }
+        path: 'category-3',
+        heading: 'Category 3',
+        metadata: { 'categories' => "#{@category.path}:1" }
       )
     end
 
     it "should find articles" do
       @category.articles.should have(2).items
     end
-    
+
     it "should order articles by reverse chronological order" do
       @category.articles.first.path.should == @article.path
     end
-    
+
     it "should find pages" do
       @category.pages.should have(3).items
     end
@@ -189,17 +203,17 @@ describe "Page", :shared => true do
     it "should sort pages by priority" do
       @category.pages.index(@category3).should == 0
     end
-    
+
     it "should order pages by heading if priority not set" do
       pages = @category.pages
       pages.index(@category1).should < pages.index(@category2)
     end
 
     it "should not find pages scheduled in the future" do
-      future_date = (Time.now + 86400).strftime("%d %B %Y")
-      article = create_article(:heading => "Article 4",
-                               :path => "foo/article-4",
-                               :metadata => { "date" => future_date })
+      future_date = (Time.now + 172800).strftime("%d %B %Y")
+      article = create_article(heading: "Article 4",
+                               path: "foo/article-4",
+                               metadata: { "date" => future_date })
       Nesta::Page.find_articles.detect{|a| a == article}.should be_nil
     end
   end
@@ -207,13 +221,13 @@ describe "Page", :shared => true do
   describe "with pages in draft" do
     before(:each) do
       @category = create_category
-      @draft = create_page(:heading => 'Forthcoming content',
-                           :path => 'foo/in-draft',
-                           :metadata => {
+      @draft = create_page(heading: 'Forthcoming content',
+                           path: 'foo/in-draft',
+                           metadata: {
         'categories' => @category.path,
         'flags' => 'draft'
       })
-      Nesta::App.stub!(:production?).and_return(true)
+      Nesta::App.stub(:production?).and_return(true)
     end
 
     it "should not find assigned drafts" do
@@ -224,105 +238,111 @@ describe "Page", :shared => true do
       Nesta::Page.find_by_path('foo/in-draft').should be_nil
     end
   end
-  
+
   describe "when finding articles" do
     before(:each) do
-      create_article(:heading => "Article 1", :path => "article-1")
-      create_article(:heading => "Article 2",
-                     :path => "article-2",
-                     :metadata => { "date" => "31 December 2008" })
-      create_article(:heading => "Article 3",
-                     :path => "foo/article-3",
-                     :metadata => { "date" => "30 December 2008" })
-    end
-    
+      create_article(heading: "Article 1", path: "article-1")
+      create_article(heading: "Article 2",
+                     path: "article-2",
+                     metadata: { "date" => "31 December 2008" })
+      create_article(heading: "Article 3",
+                     path: "foo/article-3",
+                     metadata: { "date" => "30 December 2008" })
+    end
+
     it "should only find pages with dates" do
       articles = Nesta::Page.find_articles
       articles.size.should > 0
       Nesta::Page.find_articles.each { |page| page.date.should_not be_nil }
     end
-    
+
     it "should return articles in reverse chronological order" do
       article1, article2 = Nesta::Page.find_articles[0..1]
       article1.date.should > article2.date
     end
   end
-  
+
   it "should be able to find parent page" do
-    category = create_category(:path => 'parent')
-    article = create_article(:path => 'parent/child')
+    category = create_category(path: 'parent')
+    article = create_article(path: 'parent/child')
     article.parent.should == category
   end
-    
+
   describe "(with deep index page)" do
     it "should be able to find index parent" do
-      home = create_category(:path => 'index', :heading => 'Home')
-      category = create_category(:path => 'parent')
+      home = create_category(path: 'index', heading: 'Home')
+      category = create_category(path: 'parent')
       category.parent.should == home
       home.parent.should be_nil
     end
 
     it "should be able to find parent of index" do
-      category = create_category(:path => "parent")
-      index = create_category(:path => "parent/child/index")
+      category = create_category(path: "parent")
+      index = create_category(path: "parent/child/index")
       index.parent.should == category
     end
 
     it "should be able to find permalink of index" do
-      index = create_category(:path => "parent/child/index")
+      index = create_category(path: "parent/child/index")
       index.permalink.should == 'child'
     end
   end
 
   describe "(with missing nested page)" do
     it "should consider grandparent to be parent" do
-      grandparent = create_category(:path => 'grandparent')
-      child = create_category(:path => 'grandparent/parent/child')
+      grandparent = create_category(path: 'grandparent')
+      child = create_category(path: 'grandparent/parent/child')
       child.parent.should == grandparent
     end
 
     it "should consider grandparent home page to be parent" do
-      home = create_category(:path => 'index')
-      child = create_category(:path => 'parent/child')
+      home = create_category(path: 'index')
+      child = create_category(path: 'parent/child')
       child.parent.should == home
     end
   end
 
   describe "when assigned to categories" do
     before(:each) do
-      create_category(:heading => "Apple", :path => "the-apple")
-      create_category(:heading => "Banana", :path => "banana")
+      create_category(heading: "Apple", path: "the-apple")
+      create_category(heading: "Banana", path: "banana")
       @article = create_article(
-          :metadata => { "categories" => "banana, the-apple" })
+          metadata: { "categories" => "banana, the-apple" })
     end
-    
+
     it "should be possible to list the categories" do
       @article.categories.should have(2).items
       @article.should be_in_category("the-apple")
       @article.should be_in_category("banana")
+      @article.should_not be_in_category("orange")
     end
 
-    it "should sort categories by heading" do
-      @article.categories.first.heading.should == "Apple"
+    it "should sort categories by link text" do
+      create_category(heading: "Orange",
+                      metadata: { "link text" => "A citrus fruit" },
+                      path: "orange")
+      article = create_article(metadata: { "categories" => "apple, orange" })
+      @article.categories.first.link_text.should == "Apple"
+      article.categories.first.link_text.should == "A citrus fruit"
     end
-    
+
     it "should not be assigned to non-existant category" do
       delete_page(:category, "banana", @extension)
       @article.should_not be_in_category("banana")
     end
   end
-  
+
   it "should set parent to nil when at root" do
-    create_category(:path => "top-level").parent.should be_nil
+    create_category(path: "top-level").parent.should be_nil
   end
-  
+
   describe "when not assigned to category" do
     it "should have empty category list" do
       article = create_article
       Nesta::Page.find_by_path(article.path).categories.should be_empty
     end
   end
-  
+
   describe "with no content" do
     it "should produce no HTML output" do
       create_article do |path|
@@ -338,7 +358,7 @@ describe "Page", :shared => true do
       create_article
       @article = Nesta::Page.find_all.first
     end
-    
+
     it "should use default layout" do
       @article.layout.should == :layout
     end
@@ -346,24 +366,28 @@ describe "Page", :shared => true do
     it "should use default template" do
       @article.template.should == :page
     end
-    
+
     it "should parse heading correctly" do
-      @article.to_html.should have_tag("h1", "My article")
+      @article.to_html.should have_selector("h1", content: "My article")
     end
-    
+
+    it "should use heading as link text" do
+      @article.link_text.should == "My article"
+    end
+
     it "should have default read more link text" do
       @article.read_more.should == "Continue reading"
     end
-    
+
     it "should not have description" do
       @article.description.should be_nil
     end
-    
+
     it "should not have keywords" do
       @article.keywords.should be_nil
     end
   end
-  
+
   describe "with metadata" do
     before(:each) do
       @layout = 'my_layout'
@@ -374,7 +398,8 @@ describe "Page", :shared => true do
       @summary = 'Multiline\n\nsummary'
       @read_more = 'Continue at your leisure'
       @skillz = 'ruby, guitar, bowstaff'
-      @article = create_article(:metadata => {
+      @link_text = 'Link to stuff page'
+      @article = create_article(metadata: {
         'date' => @date.gsub('September', 'Sep'),
         'description' => @description,
         'flags' => 'draft, orange',
@@ -383,70 +408,71 @@ describe "Page", :shared => true do
         'read more' => @read_more,
         'skillz' => @skillz,
         'summary' => @summary,
-        'template' => @template
+        'template' => @template,
+        'link text' => @link_text,
       })
     end
 
     it "should override default layout" do
       @article.layout.should == @layout.to_sym
     end
-    
+
     it "should override default template" do
       @article.template.should == @template.to_sym
     end
-    
+
     it "should set permalink to basename of filename" do
       @article.permalink.should == 'my-article'
     end
-    
+
     it "should set path from filename" do
       @article.path.should == 'article-prefix/my-article'
     end
-    
+
     it "should retrieve heading" do
       @article.heading.should == 'My article'
     end
-    
+
     it "should be possible to convert an article to HTML" do
-      @article.to_html.should have_tag("h1", "My article")
+      @article.to_html.should have_selector("h1", content: "My article")
     end
-    
+
     it "should not include metadata in the HTML" do
-      @article.to_html.should_not have_tag("p", /^Date/)
+      @article.to_html.should_not have_selector("p:contains('Date')")
     end
 
     it "should not include heading in body markup" do
       @article.body_markup.should_not include("My article")
     end
-    
+
     it "should not include heading in body" do
-      @article.body.should_not have_tag("h1", "My article")
+      @article.body.should_not have_selector("h1", content: "My article")
     end
 
     it "should retrieve description from metadata" do
       @article.description.should == @description
     end
-    
+
     it "should retrieve keywords from metadata" do
       @article.keywords.should == @keywords
     end
-    
+
     it "should retrieve date published from metadata" do
       @article.date.strftime("%d %B %Y").should == @date
     end
-    
+
     it "should retrieve read more link from metadata" do
       @article.read_more.should == @read_more
     end
-    
+
     it "should retrieve summary text from metadata" do
       @article.summary.should match(/#{@summary.split('\n\n').first}/)
     end
-    
+
     it "should treat double newline chars as paragraph break in summary" do
       @article.summary.should match(/#{@summary.split('\n\n').last}/)
     end
-    
+
     it "should allow access to metadata" do
       @article.metadata('skillz').should == @skillz
     end
@@ -459,92 +485,116 @@ describe "Page", :shared => true do
     it "should know whether or not it's a draft" do
       @article.should be_draft
     end
+
+    it "should allow link text to be specified explicitly" do
+      @article.link_text.should == @link_text
+    end
   end
-  
+
   describe "when checking last modification time" do
     before(:each) do
       create_article
       @article = Nesta::Page.find_all.first
     end
-    
+
     it "should check filesystem" do
       mock_file_stat(:should_receive, @article.filename, "3 January 2009")
       @article.last_modified.should == Time.parse("3 January 2009")
     end
   end
+
+  describe "with no heading" do
+    before(:each) do
+      @no_heading_page = create_page(path: 'page-with-no-heading')
+    end
+
+    it "should raise a HeadingNotSet exception if you call heading" do
+      lambda do
+        @no_heading_page.heading
+      end.should raise_error(Nesta::HeadingNotSet, /page-with-no-heading/);
+    end
+
+    it "should raise a LinkTextNotSet exception if you call link_text" do
+      lambda do
+        @no_heading_page.link_text
+      end.should raise_error(Nesta::LinkTextNotSet, /page-with-no-heading/);
+    end
+  end
 end
 
 describe "All types of page" do
   include ModelFactory
 
-  before(:each) do
-    stub_configuration
-  end
-  
-  after(:each) do
-    remove_temp_directory
-    Nesta::FileModel.purge_cache
-  end
-  
+  include_context "Page testing"
+
   it "should still return top level menu items" do
     # Page.menu_items is deprecated; we're keeping it for the moment so
     # that we don't break themes or code in a local app.rb (just yet).
-    page1 = create_category(:path => "page-1")
-    page2 = create_category(:path => "page-2")
+    page1 = create_category(path: "page-1")
+    page2 = create_category(path: "page-2")
     create_menu([page1.path, page2.path].join("\n"))
     Nesta::Page.menu_items.should == [page1, page2]
   end
 end
 
 describe "Markdown page" do
+  include ModelFactory
+
   before(:each) do
     @extension = :mdown
   end
 
+  include_context "Page testing"
   it_should_behave_like "Page"
 
   it "should set heading from first h1 tag" do
     page = create_page(
-      :heading => "First heading", :content => "# Second heading")
+      path: "a-page",
+      heading: "First heading",
+      content: "# Second heading"
+    )
     page.heading.should == "First heading"
   end
 
   it "should ignore trailing # characters in headings" do
-    article = create_article(:heading => 'With trailing #')
+    article = create_article(heading: 'With trailing #')
     article.heading.should == 'With trailing'
   end
 end
 
 describe "Haml page" do
+  include ModelFactory
+
   before(:each) do
     @extension = :haml
   end
 
+  include_context "Page testing"
   it_should_behave_like "Page"
 
   it "should set heading from first h1 tag" do
     page = create_page(
-      :path => "a-page",
-      :heading => "First heading",
-      :content => "%h1 Second heading"
+      path: "a-page",
+      heading: "First heading",
+      content: "%h1 Second heading"
     )
     page.heading.should == "First heading"
   end
 
   it "should wrap <p> tags around one line summary text" do
     page = create_page(
-      :path => "a-page",
-      :heading => "First para",
-      :metadata => { "Summary" => "Wrap me" }
+      path: "a-page",
+      heading: "First para",
+      metadata: { "Summary" => "Wrap me" }
     )
     page.summary.should include("<p>Wrap me</p>")
   end
 
   it "should wrap <p> tags around multiple lines of summary text" do
     page = create_page(
-      :path => "a-page",
-      :heading => "First para",
-      :metadata => { "Summary" => 'Wrap me\nIn paragraph tags' }
+      path: "a-page",
+      heading: "First para",
+      metadata: { "Summary" => 'Wrap me\nIn paragraph tags' }
     )
     page.summary.should include("<p>Wrap me</p>")
     page.summary.should include("<p>In paragraph tags</p>")
@@ -552,17 +602,20 @@ describe "Haml page" do
 end
 
 describe "Textile page" do
+  include ModelFactory
+
   before(:each) do
     @extension = :textile
   end
 
+  include_context "Page testing"
   it_should_behave_like "Page"
 
   it "should set heading from first h1 tag" do
     page = create_page(
-      :path => "a-page",
-      :heading => "First heading",
-      :content => "h1. Second heading"
+      path: "a-page",
+      heading: "First heading",
+      content: "h1. Second heading"
     )
     page.heading.should == "First heading"
   end
@@ -573,7 +626,7 @@ describe "Menu" do
 
   before(:each) do
     stub_configuration
-    @page = create_page(:path => "page-1")
+    @page = create_page(path: "page-1")
   end
 
   after(:each) do
@@ -596,7 +649,7 @@ describe "Menu" do
   describe "with nested sub menus" do
     before(:each) do
       (2..6).each do |i|
-        instance_variable_set("@page#{i}", create_page(:path => "page-#{i}"))
+        instance_variable_set("@page#{i}", create_page(path: "page-#{i}"))
       end
       text = <<-EOF
 #{@page.path}