book-content/en/10-recipes/1-simple-blog.markdown book-content/en/10-recipes/2-blog-slice.markdown book-content/en/11-appendix/toc.markdown book-content/en/12-deployment/1-passenger.markdown book-content/en/12-deployment/2-nginx.markdown book-content/en/12-deployment/3-jruby.markdown book-content/en/12-deployment/4-bundle.markdown book-content/en/12-deployment/toc.markdown book-content/en/13-migration-to-rails3/1-merb-and-rails-merge.markdown book-content/en/13-migration-to-rails3/toc.markdown book-content/en/14-appendix/1-hints-tips.markdown book-content/en/14-appendix/2-slices.markdown book-content/en/14-appendix/3-gems.markdown book-content/en/14-appendix/toc.markdown book-content/en/6-testing-your-application/1-why.markdown book-content/en/6-testing-your-application/2-models.markdown book-content/en/6-testing-your-application/3-requests.markdown book-content/en/6-testing-your-application/4-cucumber.markdown book-content/en/6-testing-your-application/toc.markdown book-content/en/7-merb-more/1-authentication.markdown book-content/en/7-merb-more/2-mailer.markdown book-content/en/7-merb-more/3-caching.markdown book-content/en/7-merb-more/4-exceptions.markdown book-content/en/7-merb-more/5-slices.markdown book-content/en/7-merb-more/toc.markdown book-content/en/8-recipes/toc.markdown book-content/en/9-deployment/toc.markdown @@ -24,10 +24,10 @@ module Merb def page_nav_links(format = 'markdown') return if params[:action] != 'show' || @page.nil? # Don't need navigation for the TOC (index). links = [] - links << previous_page_url + links << previous_page_url unless @page.previous_file.include?('table-of-contents') # Stick a link to the TOC in the middle of the array. links << link_to(language_text(language, 'Home'), url(:toc, :language => language)) - links << next_page_url + links << next_page_url unless @page.next_file.include?('table-of-contents') links.join(' | ') end app/helpers/global_helpers.rb @@ -38,7 +38,7 @@ class Page return @next_file unless @next_file.nil? n_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number}-*/#{page_number + 1}-*.*"].entries.first if n_file.nil? - n_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number + 1}-*/**"].entries.first + n_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number + 1}-*/toc.*"].entries.first # We're on the last page of the last chapter, just return the TOC. n_file = "#{Merb.root}/book-content/#{language}/table-of-contents" if n_file.nil? end @@ -61,7 +61,8 @@ class Page return @previous_file unless @previous_file.nil? p_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number}-*/#{page_number - 1}-*.*"].entries.first if p_file.nil? - p_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number - 1}-*/**"].entries.last + p_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number - 1}-*/[0-9]*?*.*"].entries.last + p_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number - 1}-*/toc.*"].entries.first if p_file.nil? # We're on the last page of the last chapter, just return the TOC. p_file = "#{Merb.root}/book-content/#{language}/table-of-contents" if p_file.nil? end @@ -91,8 +92,8 @@ class Page end def extract_chapter_and_page_number - file =~ /book-content\/\w{2}\/(\d{1,})-[a-z-]+\/(\d{1,})-[a-z-]+[.]\w+/ - @chapter_number, @page_number = $1.to_i, $2.to_i + file =~ /book-content\/\w{2}\/(\d{1,})-[a-z-]+\/((\d{1,})-[a-z-]+|toc)[.]\w+/ + @chapter_number, @page_number = $1.to_i, $3.to_i end def extract_next_chapter_and_page_name @@ -105,8 +106,8 @@ class Page # Returns an array with the chapter name and the page name of the file to process def extract_chapter_and_page_number_for_file(file_to_process) - file_to_process.grep(/book-content\/\w{2}\/\d{1,}-([a-z-]+)\/\d{1,}-([a-z-]+)[.]\w+/) - [$1, $2] + file_to_process.grep(/book-content\/\w{2}\/\d{1,}-([a-z-]+)\/(\d{1,}-([a-z-]+)|(toc))[.]\w+/) + [$1, $3] end end \ No newline at end of file app/models/page.rb book-content/en/11-deployment/toc.markdown book-content/en/12-recipes/1-simple-blog.markdown book-content/en/12-recipes/2-blog-slice.markdown book-content/en/12-recipes/toc.markdown book-content/en/13-appendix/toc.markdown book-content/en/14-deployment/1-passenger.markdown book-content/en/14-deployment/2-nginx.markdown book-content/en/14-deployment/3-jruby.markdown book-content/en/14-deployment/4-bundle.markdown book-content/en/14-deployment/toc.markdown book-content/en/15-migration-to-rails3/1-merb-and-rails-merge.markdown book-content/en/15-migration-to-rails3/toc.markdown book-content/en/16-appendix/1-hints-tips.markdown book-content/en/16-appendix/2-slices.markdown book-content/en/16-appendix/3-gems.markdown book-content/en/16-appendix/toc.markdown book-content/en/8-testing-your-application/1-why.markdown book-content/en/8-testing-your-application/2-models.markdown book-content/en/8-testing-your-application/3-requests.markdown book-content/en/8-testing-your-application/4-cucumber.markdown book-content/en/8-testing-your-application/toc.markdown book-content/en/9-merb-more/1-authentication.markdown book-content/en/9-merb-more/2-mailer.markdown book-content/en/9-merb-more/3-caching.markdown book-content/en/9-merb-more/4-exceptions.markdown book-content/en/9-merb-more/5-slices.markdown book-content/en/9-merb-more/toc.markdown cdc87f03186cc10d842ab44efba71cd3979ecedf Matt Aimonetti mattaimonetti@gmail.com http://github.com/akitaonrails/merb-book/commit/e633549a7cc8c388ea0d2921624f096e6c21c6a5 e633549a7cc8c388ea0d2921624f096e6c21c6a5 2009-01-30T18:57:53-08:00 2009-01-30T18:57:53-08:00 optimized navigation code and renamed folders 3e3a06686e04eeaa00887e829442458f713fc628 Matt Aimonetti mattaimonetti@gmail.com