From fe0eb72fa3f34d1b15dae0e0b06ea467b4fa8845 Mon Sep 17 00:00:00 2001 From: Daniel Kimsey Date: Fri, 9 Nov 2012 18:29:49 -0500 Subject: [PATCH] Renamed page.meta_data to page.metadata for consistency with views --- lib/gollum/page.rb | 2 +- test/test_markup.rb | 6 +++--- test/test_page.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/gollum/page.rb b/lib/gollum/page.rb index 31ee542a..f056659f 100644 --- a/lib/gollum/page.rb +++ b/lib/gollum/page.rb @@ -221,7 +221,7 @@ module Gollum # Public: Embedded metadata. # # Returns Hash of metadata. - def meta_data() + def metadata() formatted_data if markup_class.metadata == nil markup_class.metadata end diff --git a/test/test_markup.rb b/test/test_markup.rb index 3db5e56a..c7e78d66 100644 --- a/test/test_markup.rb +++ b/test/test_markup.rb @@ -656,7 +656,7 @@ np.array([[2,2],[1,3]],np.float) page = @wiki.page("Bilbo Baggins") rendered = Gollum::Markup.new(page).render assert_equal output, rendered - assert_equal result, page.meta_data + assert_equal result, page.metadata end test "metadata blocks with newline" do @@ -671,7 +671,7 @@ np.array([[2,2],[1,3]],np.float) page = @wiki.page("Bilbo Baggins") rendered = Gollum::Markup.new(page).render assert_equal output, rendered - assert_equal result, page.meta_data + assert_equal result, page.metadata end test "metadata sanitation" do @@ -686,7 +686,7 @@ np.array([[2,2],[1,3]],np.float) page = @wiki.page("Bilbo Baggins") rendered = Gollum::Markup.new(page).render assert_equal output, rendered - assert_equal result, page.meta_data + assert_equal result, page.metadata end ######################################################################### diff --git a/test/test_page.rb b/test/test_page.rb index d934e2b9..24c8ce13 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -231,7 +231,7 @@ context "within a sub-directory" do test "get metadata on page" do page = @wiki.page('Elrond') assert_equal Gollum::Page, page.class - assert_equal 'elf', page.meta_data['race'] + assert_equal 'elf', page.metadata['race'] end end