URL TLC

emberjs · Mar 14, 2013 · d98cbe2 · d98cbe2
1 parent 0f782c7
commit d98cbe2
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 9 deletions.
diff --git a/config.rb b/config.rb
@@ -27,7 +27,23 @@
 activate :blog do |blog|
   blog.prefix = 'blog'
   blog.layout = 'layouts/blog'
-  blog.tag_template = 'blog/tag.html'
+  blog.tag_template = 'blog/tag'
+  blog.permalink = '/:year/:month/:day/:title'
+  blog.taglink = 'tags/:tag'
+end
+
+ready do
+  blog.articles.each do |article|
+    options = {
+      locals: {
+        redirect_to: article.url
+      },
+      layout: false,
+      ignore: true
+    }
+
+    proxy article.path + '.html', 'redirect.html', options
+  end
 end
 
 page '/blog/feed.xml', layout: false
@@ -75,7 +91,7 @@ def rendered_partial_for(key)
 
   def link_to_page name, url
     path = request.path
-    current = path =~ Regexp.new('^' + url[1..-1] + '.*\.html')
+    current = path =~ Regexp.new('^' + url[1..-1])
 
     if path == 'index.html' and name == 'about'
       current = true

diff --git a/lib/api_docs.rb b/lib/api_docs.rb
@@ -11,7 +11,7 @@ def registered(app, options={})
 
       @repo_url = options[:repo_url]
 
-      app.after_configuration do
+      app.ready do
         ApiClass.data = data.api
 
         page '/api*', directory_index: false, layout: 'layouts/api'

diff --git a/...-08-03-ember-1-0-prerelease.html.markdown → .../2012-08-03-ember-1-0-prerelease.markdown b/...-08-03-ember-1-0-prerelease.html.markdown → .../2012-08-03-ember-1-0-prerelease.markdown
diff --git a/...g/2012-10-25-ember-1-0-pre2.html.markdown → ...e/blog/2012-10-25-ember-1-0-pre2.markdown b/...g/2012-10-25-ember-1-0-pre2.html.markdown → ...e/blog/2012-10-25-ember-1-0-pre2.markdown
diff --git a/...log/2013-02-15-ember-1-0-rc.html.markdown → source/blog/2013-02-15-ember-1-0-rc.markdown b/...log/2013-02-15-ember-1-0-rc.html.markdown → source/blog/2013-02-15-ember-1-0-rc.markdown
diff --git a/source/blog/index.html.erb b/source/blog/index.html.erb
@@ -5,10 +5,10 @@ title: "Blog"
 <% partial_for :head, 'head' %>
 <% partial_for :sidebar, 'sidebar' %>
 
-<% blog.articles.each_with_index do |article, i| %>
-  <article class="blog-post-summary">
-    <h2><%= link_to article.title, article %> &ndash; <time><%= article.date.strftime('%b %d, %Y') %></time></span></h2>
-    <%= article.summary %>
-    <%= link_to "Read more...", article %>
-  </article>
+<% blog.articles.reject(&:proxied_to).each_with_index do |article, i| %>
+<article class="blog-post-summary">
+  <h2><%= link_to article.title, article %> &ndash; <time><%= article.date.strftime('%b %d, %Y') %></time></span></h2>
+  <%= article.summary %>
+  <%= link_to "Read more...", article %>
+</article>
 <% end %>
diff --git a/source/blog/_post.html.erb → source/blog/post.html.erb b/source/blog/_post.html.erb → source/blog/post.html.erb
diff --git a/source/examples/index.html b/source/examples/index.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Refresh" content="0; url=/" />

diff --git a/source/redirect.html.erb b/source/redirect.html.erb
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta http-equiv="Refresh" content="0; url=<%= redirect_to %>" />
+  </head>
+  <body>
+  </body>
+</html>