gollum-site 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (13) hide show
  1. data/lib/gollum-site/page.rb +8 -2
  2. data/lib/gollum-site/version.rb +1 -1
  3. data/test/examples/test_site.git/COMMIT_EDITMSG +1 -1
  4. data/test/examples/test_site.git/index +0 -0
  5. data/test/examples/test_site.git/logs/HEAD +2 -2
  6. data/test/examples/test_site.git/logs/refs/heads/master +2 -2
  7. data/test/examples/test_site.git/objects/6c/bc9f20aa7806196638e32f708e012568d4a959 +0 -0
  8. data/test/examples/test_site.git/objects/c3/d487fda322940d75eac154fc8383093f7bcdf3 +1 -0
  9. data/test/examples/test_site.git/objects/d9/4ddf467ffb57a73ce424b123dd04e80c760719 +0 -0
  10. data/test/examples/test_site.git/packed-refs +1 -1
  11. data/test/examples/test_site.git/refs/heads/master +1 -1
  12. data/test/test_site.rb +1 -1
  13. metadata +10 -4
data/lib/gollum-site/page.rb CHANGED
@@ -5,11 +5,17 @@ module Gollum
5
5
  cname = name.respond_to?(:gsub) ?
6
6
  name.gsub(%r{[ /<>]}, '-') :
7
7
  ''
8
- cname + '.html'
8
+
9
+ # account for anchor links (e.g. Page#anchor)
10
+ if pos = cname.index('#')
11
+ cname[0..(pos-1)] + '.html' + cname[pos..-1]
12
+ else
13
+ cname + '.html'
14
+ end
9
15
  end
10
16
 
11
17
  def find(cname, version)
12
- name = cname[0..-6]
18
+ name = cname.gsub(/.html$/, '')
13
19
  map = @wiki.tree_map_for(version)
14
20
  if page = find_page_in_tree(map, name)
15
21
  page.version = Grit::Commit.create(@wiki.repo, :id => version)
data/lib/gollum-site/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Gollum
2
2
  class Site
3
- VERSION = "0.0.4"
3
+ VERSION = "0.0.5"
4
4
  end
5
5
  end
data/test/examples/test_site.git/COMMIT_EDITMSG CHANGED
@@ -1 +1 @@
1
- Added link to Page1 on Home
1
+ Added hashed link
data/test/examples/test_site.git/index CHANGED
Binary file
data/test/examples/test_site.git/logs/HEAD CHANGED
@@ -1,2 +1,2 @@
1
- 0000000000000000000000000000000000000000 ddd9974bd919e3601cc015ee36d524f18b4b2df5 Daniel Reverri <reverri@gmail.com> 1288492555 -0700 clone: from /Users/dreverri/src/basho/gollum-site/test/examples/test_site.git
2
- ddd9974bd919e3601cc015ee36d524f18b4b2df5 9b063b69e53a11210e033ba953be56135a7b0281 Daniel Reverri <reverri@gmail.com> 1288492691 -0700 commit: Added link to Page1 on Home
1
+ 0000000000000000000000000000000000000000 9b063b69e53a11210e033ba953be56135a7b0281 Daniel Reverri <reverri@gmail.com> 1288896279 -0700 clone: from /Users/dreverri/src/basho/gollum-site/test/examples/test_site.git
2
+ 9b063b69e53a11210e033ba953be56135a7b0281 c3d487fda322940d75eac154fc8383093f7bcdf3 Daniel Reverri <reverri@gmail.com> 1288896347 -0700 commit: Added hashed link
data/test/examples/test_site.git/logs/refs/heads/master CHANGED
@@ -1,2 +1,2 @@
1
- 0000000000000000000000000000000000000000 ddd9974bd919e3601cc015ee36d524f18b4b2df5 Daniel Reverri <reverri@gmail.com> 1288492555 -0700 clone: from /Users/dreverri/src/basho/gollum-site/test/examples/test_site.git
2
- ddd9974bd919e3601cc015ee36d524f18b4b2df5 9b063b69e53a11210e033ba953be56135a7b0281 Daniel Reverri <reverri@gmail.com> 1288492691 -0700 commit: Added link to Page1 on Home
1
+ 0000000000000000000000000000000000000000 9b063b69e53a11210e033ba953be56135a7b0281 Daniel Reverri <reverri@gmail.com> 1288896279 -0700 clone: from /Users/dreverri/src/basho/gollum-site/test/examples/test_site.git
2
+ 9b063b69e53a11210e033ba953be56135a7b0281 c3d487fda322940d75eac154fc8383093f7bcdf3 Daniel Reverri <reverri@gmail.com> 1288896347 -0700 commit: Added hashed link
data/test/examples/test_site.git/objects/c3/d487fda322940d75eac154fc8383093f7bcdf3 ADDED
@@ -0,0 +1 @@
1
+ x��[j�0E��U�RF=�����`d�kQ����א�����Z`�~�.%�Rf��<g8�$�ج
data/test/examples/test_site.git/packed-refs CHANGED
@@ -1,2 +1,2 @@
1
1
  # pack-refs with: peeled
2
- ddd9974bd919e3601cc015ee36d524f18b4b2df5 refs/remotes/origin/master
2
+ 9b063b69e53a11210e033ba953be56135a7b0281 refs/remotes/origin/master
data/test/examples/test_site.git/refs/heads/master CHANGED
@@ -1 +1 @@
1
- 9b063b69e53a11210e033ba953be56135a7b0281
1
+ c3d487fda322940d75eac154fc8383093f7bcdf3
data/test/test_site.rb CHANGED
@@ -21,7 +21,7 @@ context "Site" do
21
21
  test "render page with layout and link" do
22
22
  home_path = File.join(@site.output_path, "Home.html")
23
23
  assert_equal(["<html><p>Site test\n",
24
- "<a class=\"internal present\" href=\"/Page1.html\">Page1</a></p></html>\n"], File.open(home_path).readlines)
24
+ "<a class=\"internal present\" href=\"/Page1.html#test\">Page1#test</a></p></html>\n"], File.open(home_path).readlines)
25
25
  end
26
26
 
27
27
  test "render page with layout from parent dir" do
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gollum-site
3
3
  version: !ruby/object:Gem::Version
4
- hash: 23
4
+ hash: 21
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 4
10
- version: 0.0.4
9
+ - 5
10
+ version: 0.0.5
11
11
  platform: ruby
12
12
  authors:
13
13
  - Daniel Reverri
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2010-10-30 00:00:00 -07:00
18
+ date: 2010-11-04 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -478,13 +478,16 @@ files:
478
478
  - test/examples/test_site.git/objects/33/c6cf51b72a58596114e5d2f03261b8deaaa0f0
479
479
  - test/examples/test_site.git/objects/4d/1311a57ece3dc2840c6e48d1b9bf5978e3dc91
480
480
  - test/examples/test_site.git/objects/4d/905a41381ad39d616dee245cf3e324f9fcc02e
481
+ - test/examples/test_site.git/objects/6c/bc9f20aa7806196638e32f708e012568d4a959
481
482
  - test/examples/test_site.git/objects/71/bb02bb7d563e86a558a0040d77f3cfc82dc4fd
482
483
  - test/examples/test_site.git/objects/7d/f37a9caf358dbb0244742503a456aeac1eaf82
483
484
  - test/examples/test_site.git/objects/91/e0f12260f005632f42619886d02ee0a1f9cb2f
484
485
  - test/examples/test_site.git/objects/9b/063b69e53a11210e033ba953be56135a7b0281
485
486
  - test/examples/test_site.git/objects/9b/3d7fbc0ed4fc1db28f361729e4396208e6f846
486
487
  - test/examples/test_site.git/objects/b1/99a056e7e0dfadc1350413de32d6c9a700e7fa
488
+ - test/examples/test_site.git/objects/c3/d487fda322940d75eac154fc8383093f7bcdf3
487
489
  - test/examples/test_site.git/objects/cd/68dbcff0518c406e8caee2fa163006a90626b7
490
+ - test/examples/test_site.git/objects/d9/4ddf467ffb57a73ce424b123dd04e80c760719
488
491
  - test/examples/test_site.git/objects/dd/d9974bd919e3601cc015ee36d524f18b4b2df5
489
492
  - test/examples/test_site.git/objects/e4/2feb142e65f08532eb10ca858e2275a1135462
490
493
  - test/examples/test_site.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
@@ -579,13 +582,16 @@ test_files:
579
582
  - test/examples/test_site.git/objects/33/c6cf51b72a58596114e5d2f03261b8deaaa0f0
580
583
  - test/examples/test_site.git/objects/4d/1311a57ece3dc2840c6e48d1b9bf5978e3dc91
581
584
  - test/examples/test_site.git/objects/4d/905a41381ad39d616dee245cf3e324f9fcc02e
585
+ - test/examples/test_site.git/objects/6c/bc9f20aa7806196638e32f708e012568d4a959
582
586
  - test/examples/test_site.git/objects/71/bb02bb7d563e86a558a0040d77f3cfc82dc4fd
583
587
  - test/examples/test_site.git/objects/7d/f37a9caf358dbb0244742503a456aeac1eaf82
584
588
  - test/examples/test_site.git/objects/91/e0f12260f005632f42619886d02ee0a1f9cb2f
585
589
  - test/examples/test_site.git/objects/9b/063b69e53a11210e033ba953be56135a7b0281
586
590
  - test/examples/test_site.git/objects/9b/3d7fbc0ed4fc1db28f361729e4396208e6f846
587
591
  - test/examples/test_site.git/objects/b1/99a056e7e0dfadc1350413de32d6c9a700e7fa
592
+ - test/examples/test_site.git/objects/c3/d487fda322940d75eac154fc8383093f7bcdf3
588
593
  - test/examples/test_site.git/objects/cd/68dbcff0518c406e8caee2fa163006a90626b7
594
+ - test/examples/test_site.git/objects/d9/4ddf467ffb57a73ce424b123dd04e80c760719
589
595
  - test/examples/test_site.git/objects/dd/d9974bd919e3601cc015ee36d524f18b4b2df5
590
596
  - test/examples/test_site.git/objects/e4/2feb142e65f08532eb10ca858e2275a1135462
591
597
  - test/examples/test_site.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391