@@ -63,6 +63,12 @@ unless reloading? # List of filters to apply to comments. set :comment_filters, [:markdown, :sanitize] + # URL mappings for various sections of the site + set :writings_url, "/writings/" + set :linkings_url, "/linkings/" + set :archive_url , "/circa/" + set :tag_url , "/topics/" + set :drafts_url , "/drafts/" end lib/wink.rb @@ -128,7 +128,7 @@ module Wink::Helpers end def entry_url(entry) - entry.url || root_url('writings', entry.slug) + entry.url || Wink.writings_url + entry.slug end def entry_ref(entry, text=entry.title, *attrs) @@ -136,7 +136,7 @@ module Wink::Helpers end def draft_url(entry) - root_url('drafts', entry.slug) + Wink.drafts_url + entry.slug end def draft_ref(entry, text, *attrs) @@ -144,7 +144,7 @@ module Wink::Helpers end def topic_url(tag) - root_url('topics', tag.to_s) + Wink.tag_url + tag.to_s end def topic_ref(tag) @@ -191,25 +191,25 @@ get '/' do haml :home end -get '/writings/' do +get Wink.writings_url do @title = wink.writings @entries = Article.published haml :home end -get '/linkings/' do +get Wink.linkings_url do @title = wink.linkings @entries = Bookmark.published(:limit => 100) haml :home end -get '/circa/:year/' do +get (Wink.archive_url + ':year/') do @title = "#{wink.author} circa #{params[:year].to_i}" @entries = Entry.circa(params[:year].to_i) haml :home end -get '/topics/:tag' do +get (Wink.tag_url + ':tag') do @title = "Regarding: '#{h(params[:tag].to_s.upcase)}'" @entries = Entry.tagged(params[:tag]) @entries.reject! { |e| e.draft? } @@ -225,7 +225,7 @@ get '/topics/:tag' do haml :home end -get '/writings/:slug' do +get (Wink.writings_url + ':slug') do @entry = Article.first(:slug => params[:slug]) raise Sinatra::NotFound unless @entry require_administrative_privileges if @entry.draft? @@ -234,13 +234,13 @@ get '/writings/:slug' do haml :entry end -get '/drafts/' do +get Wink.drafts_url do require_administrative_privileges @entries = Entry.drafts haml :home end -get '/drafts/new' do +get (Wink.drafts_url + 'new') do require_administrative_privileges @title = 'New Draft' @entry = Article.new( @@ -251,7 +251,7 @@ get '/drafts/new' do haml :draft end -post '/drafts/' do +post Wink.drafts_url do require_administrative_privileges @entry = if params[:id].blank? @@ -265,7 +265,7 @@ post '/drafts/' do redirect entry_url(@entry) end -get '/drafts/:slug' do +get (Wink.drafts_url + ':slug') do require_administrative_privileges @entry = Entry.first(:slug => params[:slug]) raise Sinatra::NotFound unless @entry @@ -284,7 +284,7 @@ get '/feed' do builder :feed, :layout => :none end -get '/linkings/feed' do +get Wink.linkings_url + 'feed' do @title = wink.linkings @entries = Bookmark.published(:limit => 30) content_type :atom, :charset => 'utf-8' @@ -338,7 +338,7 @@ get '/comments/:id' do comment_body(comment) end -post '/writings/:slug/comment' do +post Wink.writings_url + ':slug/comment' do entry = Entry.first(:slug => params[:slug]) raise Sinatra::NotFound if entry.nil? attributes = { lib/wink/web.rb @@ -2,7 +2,7 @@ %h1= @title %p Regarding the - <a href='/writings/'>Writings</a> + %a{:href => wink.writings_url} Writings of <a href='/'> = wink.author views/comments.haml @@ -1,6 +1,6 @@ #content.entry - %form#draft{ :action => '/drafts/', :method => 'POST' } + %form#draft{ :action => wink.drafts_url, :method => 'POST' } = input(:hidden, :id, @entry.id) #header views/draft.haml @@ -1,7 +1,10 @@ #header %p - The various <a href='/writings/'>writings</a> - and <a href='/linkings/'>linkings</a> of + The various + %a{:href => wink.writings_url} writings + and + %a{:href => wink.linkings_url}linkings + of %h1 <a href='/'> = wink.author views/heading.haml @@ -6,7 +6,7 @@ <meta http-equiv='X-UA-Compatible' content='YOUR MOM'> %title= (h(@title) || wink.author) = feed '/feed', "Writings" - = feed '/linkings/feed', "Linkings" + = feed wink.linkings_url + 'feed', "Linkings" = feed '/comments/feed', "Comments (Experimental)" = css "wink" - if development? views/layout.haml @@ -46,4 +46,11 @@ set :begin_date, 2008 ## The del.icio.us username/password used for bookmark synchronization. #set :delicious, %w[username password] +## URL Mapping overrides. If you don't like /writings or any of the others, override them here. Be sure they end in / +#set :writings_url, "/writings/" +#set :linkings_url, "/linkings/" +#set :archive_url, "/circa/" +#set :tag_url, "/topics/" +#set :drafts_url, "/drafts/" + # vim: ft=ruby wink.conf.example abed87c84a3a468a02114432ee74c288e707fb18 Chris Schneider chris@christopher-schneider.com http://github.com/cschneid/wink/commit/41b0c292eb4c872d4654bdc7857004df647d13ce 41b0c292eb4c872d4654bdc7857004df647d13ce 2008-06-07T20:59:40-07:00 2008-06-07T20:59:40-07:00 Added *_url options to override the standard /writings/, /linkings/, /topics/, /drafts/, and /circa/ urls. 82b3537fb35cc0ac06210432b9cc473eee3081d7 Chris Schneider chris@christopher-schneider.com