From 2783257f06df0d59908d491c03c4d182a48f8a82 Mon Sep 17 00:00:00 2001 From: Daniel Kimsey Date: Fri, 9 Nov 2012 18:25:33 -0500 Subject: [PATCH 1/2] Added page.meta_data to tests --- test/examples/lotr.git/logs/HEAD | 1 + test/examples/lotr.git/logs/refs/heads/master | 1 + .../36/cc196afddbbc924aac1ef863f09dbf0191e186 | Bin 0 -> 54 bytes .../45/71349a92aa180e230345e4e44c9be7d9d4f96c | 2 ++ .../54/508a71fad5151d39ba6f7ff768e1e3d3c7392a | Bin 0 -> 379 bytes .../7d/6aeab8b84c895f21f6c66b84a457b0fced9693 | 1 + test/examples/lotr.git/refs/heads/master | 2 +- test/test_committer.rb | 2 +- test/test_git_access.rb | 2 +- test/test_page.rb | 7 +++++++ 10 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 test/examples/lotr.git/objects/36/cc196afddbbc924aac1ef863f09dbf0191e186 create mode 100644 test/examples/lotr.git/objects/45/71349a92aa180e230345e4e44c9be7d9d4f96c create mode 100644 test/examples/lotr.git/objects/54/508a71fad5151d39ba6f7ff768e1e3d3c7392a create mode 100644 test/examples/lotr.git/objects/7d/6aeab8b84c895f21f6c66b84a457b0fced9693 diff --git a/test/examples/lotr.git/logs/HEAD b/test/examples/lotr.git/logs/HEAD index 31a4e256..3259d5f7 100644 --- a/test/examples/lotr.git/logs/HEAD +++ b/test/examples/lotr.git/logs/HEAD @@ -5,3 +5,4 @@ a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi 1336984025 -0700 push b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley 1341830099 +0100 push cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley 1341830833 +0100 push +629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey 1352501984 -0500 push diff --git a/test/examples/lotr.git/logs/refs/heads/master b/test/examples/lotr.git/logs/refs/heads/master index 31a4e256..3259d5f7 100644 --- a/test/examples/lotr.git/logs/refs/heads/master +++ b/test/examples/lotr.git/logs/refs/heads/master @@ -5,3 +5,4 @@ a8ad3c09dd842a3517085bfadd37718856dee813 1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e b16b3d9fad9d78e5a669e7f33d94c96da374eccd b0de6e794dfdc7ef3400e894225bfe23308aae5c kristi 1336984025 -0700 push b0de6e794dfdc7ef3400e894225bfe23308aae5c cfea406f5f77afc7fb673a43e97721234385b1bd Darren Oakley 1341830099 +0100 push cfea406f5f77afc7fb673a43e97721234385b1bd 629aa678272b017a4d136d35e77ac94d80b08dc2 Darren Oakley 1341830833 +0100 push +629aa678272b017a4d136d35e77ac94d80b08dc2 7d6aeab8b84c895f21f6c66b84a457b0fced9693 Daniel Kimsey 1352501984 -0500 push diff --git a/test/examples/lotr.git/objects/36/cc196afddbbc924aac1ef863f09dbf0191e186 b/test/examples/lotr.git/objects/36/cc196afddbbc924aac1ef863f09dbf0191e186 new file mode 100644 index 0000000000000000000000000000000000000000..eb87165415caa5e71b291f9144654bbe9afa115d GIT binary patch literal 54 zcmV-60LlM&0V^p=O;s>9XD~D{Ff%bxaLp;o&r8wEO<`~?G?_JNl?0zMv+I*5KC_?S Myz(;#06N$Z<`8-ny#N3J literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/objects/45/71349a92aa180e230345e4e44c9be7d9d4f96c b/test/examples/lotr.git/objects/45/71349a92aa180e230345e4e44c9be7d9d4f96c new file mode 100644 index 00000000..9fce83a8 --- /dev/null +++ b/test/examples/lotr.git/objects/45/71349a92aa180e230345e4e44c9be7d9d4f96c @@ -0,0 +1,2 @@ +xEOK1 =S0fhc|0V^p=O;s>4He@g~FfcPQQEYF!db67`ac%NP!Cv765^Et{jSigD5tv+XNdLiAWo41hqvJwGoc zzlb5vWA&e~u+Wm$c^q<2`_`q#dYmtW8sd?ko2plmT2YdjlgjYx`TJlO1?^pqnyc>! zv++)vesfAH#30}NB9KA6CmC~AY8>wkQCvAIcyr}eOHCy?s6oD!x&cM0$(i}3V0W+D zCjVk?*pEaXuExMyCO<9jy#18{F)AptEHy7BH7AF`?2KgA-`jg8d99KAk^Euqe#VIp z+n}ZeC+3!C7N;t>C+4Q7rt0OUrer3TXJ%(IEQ{P+X5FNFv(zO?{=&ZZVtR|KMWA}( z-SYEGQj0*L_U4um>%NDs3ahp*-)&GliOqX*Uo%XVM`~gUL{;q!nVT(ZBj(wB;B8bA Z=gF_lh^&OE3eHSPO-jUR7yzZ#r^y^Wy{Z5J literal 0 HcmV?d00001 diff --git a/test/examples/lotr.git/objects/7d/6aeab8b84c895f21f6c66b84a457b0fced9693 b/test/examples/lotr.git/objects/7d/6aeab8b84c895f21f6c66b84a457b0fced9693 new file mode 100644 index 00000000..aa40cd23 --- /dev/null +++ b/test/examples/lotr.git/objects/7d/6aeab8b84c895f21f6c66b84a457b0fced9693 @@ -0,0 +1 @@ +x=j1@:t?cC\Y Zm|tyct>Dh*q0ŊbLbı+%G]fɢAl\dJ[ZgY>]x˗q d֪Ǫ+0ܖ|ڡS b^/M1 \ No newline at end of file diff --git a/test/examples/lotr.git/refs/heads/master b/test/examples/lotr.git/refs/heads/master index a19ee561..f01a5091 100644 --- a/test/examples/lotr.git/refs/heads/master +++ b/test/examples/lotr.git/refs/heads/master @@ -1 +1 @@ -629aa678272b017a4d136d35e77ac94d80b08dc2 +7d6aeab8b84c895f21f6c66b84a457b0fced9693 diff --git a/test/test_committer.rb b/test/test_committer.rb index 57d8c2b8..e9b2e17b 100644 --- a/test/test_committer.rb +++ b/test/test_committer.rb @@ -50,7 +50,7 @@ context "Wiki" do end test "parents with default master ref" do - ref = '629aa678272b017a4d136d35e77ac94d80b08dc2' + ref = '7d6aeab8b84c895f21f6c66b84a457b0fced9693' committer = Gollum::Committer.new(@wiki) assert_equal ref, committer.parents.first.sha end diff --git a/test/test_git_access.rb b/test/test_git_access.rb index df49b17d..caaa37d5 100644 --- a/test/test_git_access.rb +++ b/test/test_git_access.rb @@ -18,7 +18,7 @@ context "GitAccess" do assert @access.ref_map.empty? assert @access.tree_map.empty? @access.tree 'master' - assert_equal({"master"=>"629aa678272b017a4d136d35e77ac94d80b08dc2"}, @access.ref_map) + assert_equal({"master"=>"7d6aeab8b84c895f21f6c66b84a457b0fced9693"}, @access.ref_map) @access.tree '1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3' map = @access.tree_map['1db89ebba7e2c14d93b94ff98cfa3708a4f0d4e3'] diff --git a/test/test_page.rb b/test/test_page.rb index ebd4e7a0..d934e2b9 100644 --- a/test/test_page.rb +++ b/test/test_page.rb @@ -227,5 +227,12 @@ context "within a sub-directory" do assert page.header.raw_data =~ /^Hobbits/ assert page.footer.raw_data =~ /^Lord of the Rings/ end + + test "get metadata on page" do + page = @wiki.page('Elrond') + assert_equal Gollum::Page, page.class + assert_equal 'elf', page.meta_data['race'] + end + end From fe0eb72fa3f34d1b15dae0e0b06ea467b4fa8845 Mon Sep 17 00:00:00 2001 From: Daniel Kimsey Date: Fri, 9 Nov 2012 18:29:49 -0500 Subject: [PATCH 2/2] 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