app/models/page.rb spec/models/page_spec.rb @@ -9,26 +9,14 @@ class Pages < Application end def show - @chapter = params[:chapter] - @page_name = params[:page_name] - - @page_file = find_page_file - raise NotFound unless @page_file - - text = File.open(@page_file).read - render Maruku::new(text).to_html + @page = Page.new( :name => params[:page_name], + :chapter => params[:chapter], + :language => language) + raise NotFound unless @page.file + render @page.to_html end private - # If no page name is passed, the first page is returned. - def find_page_file(format="markdown") - base = "#{Merb.root}/book-content/#{language}/*-#{@chapter}" - if @page_name - Dir["#{base}/*-#{@page_name}.#{format}"].entries.first - else - Dir["#{base}/toc.#{format}"].entries.first - end - end def find_toc(format="markdown") Dir["#{Merb.root}/book-content/#{language}/toc.#{format}"].entries.first app/controllers/pages.rb @@ -24,29 +24,28 @@ module Merb def page_nav_links(format = 'markdown') return if params[:action] != 'show' # Don't need navigation for the TOC (index). links = [] - @current_file =~ /book-content\/\w{2}\/(\d{1,})-[a-z-]+\/(\d{1,})-[a-z-]+[.]\w+/ - chapter_number, page_number = $1, $2 - - chapter_name, page_name = extract_previous_page(chapter_number, page_number) - links << previous_page(chapter_name, page_name) - + links << previous_page_url # Stick a link to the TOC in the middle of the array. links << link_to(language_text(language, 'Home'), url(:toc, :language => language)) - - chapter_name, page_name = extract_next_page(chapter_number, page_number) - links << next_page(chapter_name, page_name) - + links << next_page_url links.join(' | ') end # returns the table of contents link def toc_link - return unless params[:action] == 'show' # Don't need navigation for the TOC (index). + return unless action_name == 'show' # Don't need navigation for the TOC (index). link_to(language_text(language, 'Table of Contents'), url(:toc, :language => language)) end + + def next_page_url + link_to(language_text(language, 'Next'), url(:page, :language => language, :chapter => @page.next_chapter_name, :page_name => @page.next_page_name)) + end - private + def previous_page_url + link_to(language_text(language, 'Previous'), url(:page, :language => language, :chapter => @page.previous_chapter_name, :page_name => @page.previous_page_name)) + end + private # returns the translated text based on the current language def language_text(language_code, text) result = text @@ -56,56 +55,5 @@ module Merb result ||= text end - def next_page(chapter_name, page_name) - link_to(language_text(language, 'Next'), url(:page, :language => language, :chapter => chapter_name, :page_name => page_name)) - end - - def previous_page(chapter_name, page_name) - link_to(language_text(language, 'Previous'), url(:page, :language => language, :chapter => chapter_name, :page_name => page_name)) - end - - # This method returns a Regexp which contains match captures for the chapter and page names. - def chapter_and_page_names - /book-content\/\w{2}\/\d{1,}-([a-z-]+)\/\d{1,}-([a-z-]+)[.]\w+/ - end - - # Returns an array of the next chapter and page names. - def extract_next_page(chapter_number, page_number, format = 'markdown') - next_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number}-*/#{page_number.to_i + 1}-*.#{format}"].entries.first - if next_file - next_file.grep(chapter_and_page_names) - else - # We're on the last page, get the first page of the next chapter. - next_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number.to_i + 1}-*/**"].entries.first - if next_file - next_file.grep(chapter_and_page_names) - else - # We're on the last page of the last chapter, just return the TOC. - return 'table-of-contents' - end - end - chapter_name, page_name = $1, $2 - [chapter_name, page_name] - end - - # Returns an array of the previous chapter and page names. - def extract_previous_page(chapter_number, page_number, format = 'markdown') - next_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number}-*/#{page_number.to_i - 1}-*.#{format}"].entries.first - if next_file - next_file.grep(chapter_and_page_names) - else - # We're on the first page, get the last page of the previous chapter. - next_file = Dir["#{Merb.root}/book-content/#{language}/#{chapter_number.to_i - 1}-*/**"].entries.last - if next_file - next_file.grep(chapter_and_page_names) - else - # We're on the first page of the first chapter, just return the TOC. - return 'table-of-contents' - end - end - chapter_name, page_name = $1, $2 - [chapter_name, page_name] - end - end end app/helpers/global_helpers.rb 077410c854a8eacc3965ab6fd1633c8b9b8bb11c Matt Aimonetti mattaimonetti@gmail.com http://github.com/mattetti/merb-book/commit/c0594ee163156eadd6bccf56071ea260570992fd c0594ee163156eadd6bccf56071ea260570992fd 2009-01-16T22:16:04-08:00 2009-01-16T22:16:04-08:00 started refactoring the page controller and helpers 6d223c671588b8a3a644d733b25308e807ced0f7 Matt Aimonetti mattaimonetti@gmail.com