Upgrade to middleman 3.x, now with RSS!

leehambley · Jan 1, 2013 · 5865ddb · 5865ddb
1 parent dec8c5f
commit 5865ddb
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 79 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,7 +1,7 @@
 # A sample Gemfile
 source "https://rubygems.org"
 
-gem "middleman", '~> 2.0.15.3'
+gem "middleman"
 gem "middleman-blog"
 gem "rb-fsevent"
 gem "haml"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,107 +1,107 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.3)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
-    chunky_png (1.2.5)
+    chunky_png (1.2.6)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    compass (0.12.1)
+    compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    daemons (1.1.8)
-    em-websocket (0.3.6)
-      addressable (>= 2.1.1)
-      eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
-    execjs (1.2.13)
+    execjs (1.4.0)
       multi_json (~> 1.0)
+    ffi (1.2.0)
     fssm (0.2.9)
-    guard (0.6.3)
-      thor (~> 0.14.6)
-    guard-livereload (0.3.1)
-      em-websocket (>= 0.2.0)
-      guard (>= 0.4.0)
-      multi_json (~> 1.0.3)
-    haml (3.1.6)
+    haml (3.1.7)
     hike (1.2.1)
     http_router (0.10.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    i18n (0.6.0)
+    i18n (0.6.1)
     libv8 (3.3.10.4)
-    maruku (0.6.0)
+    listen (0.5.3)
+    maruku (0.6.1)
       syntax (>= 1.0.0)
-    middleman (2.0.15.3)
-      coffee-script (~> 2.2.0)
-      compass (~> 0.11)
-      execjs (~> 1.2.7)
-      guard (~> 0.6.2)
-      haml (~> 3.1.0)
+    middleman (3.0.7)
+      middleman-core (= 3.0.7)
+      middleman-more (= 3.0.7)
+      middleman-sprockets (~> 3.0.2)
+    middleman-blog (3.1.1)
       maruku (~> 0.6.0)
-      middleman-livereload (~> 0.2.0)
-      padrino-core (~> 0.10.5)
-      padrino-helpers (~> 0.10.5)
-      rack (~> 1.3.5)
+      middleman-core (~> 3.0.1)
+      tzinfo (~> 0.3.0)
+    middleman-core (3.0.7)
+      activesupport (~> 3.2.6)
+      bundler (~> 1.1)
+      listen (~> 0.5.2)
+      rack (~> 1.4.1)
       rack-test (~> 0.6.1)
-      sass (>= 3.1.7)
-      sinatra (~> 1.3.1)
-      slim (~> 1.0.2)
-      sprockets (~> 2.0.3)
-      thin (~> 1.2.11)
-      thor (~> 0.14.0)
+      rb-fsevent (~> 0.9.1)
+      rb-inotify (~> 0.8.8)
+      thor (~> 0.15.4)
       tilt (~> 1.3.1)
-      uglifier (~> 1.2)
-    middleman-blog (0.1.5)
-    middleman-livereload (0.2.1)
-      guard-livereload (~> 0.3.1)
-    multi_json (1.0.4)
-    padrino-core (0.10.6)
+    middleman-more (3.0.7)
+      coffee-script (~> 2.2.0)
+      coffee-script-source (~> 1.3.3)
+      compass (>= 0.12.2)
+      execjs (~> 1.4.0)
+      haml (>= 3.1.6)
+      i18n (~> 0.6.0)
+      maruku (~> 0.6.0)
+      middleman-core (= 3.0.7)
+      padrino-helpers (= 0.10.7)
+      sass (>= 3.1.20)
+      uglifier (~> 1.2.6)
+    middleman-sprockets (3.0.6)
+      middleman-more (>= 3.0.1)
+      sprockets (~> 2.1, < 2.5)
+      sprockets-sass (~> 0.9.0)
+    multi_json (1.5.0)
+    padrino-core (0.10.7)
       activesupport (~> 3.2.0)
       http_router (~> 0.10.2)
       sinatra (~> 1.3.1)
-      thor (~> 0.14.3)
+      thor (~> 0.15.2)
       tilt (~> 1.3.0)
-    padrino-helpers (0.10.6)
+    padrino-helpers (0.10.7)
       i18n (~> 0.6)
-      padrino-core (= 0.10.6)
-    rack (1.3.6)
-    rack-protection (1.2.0)
+      padrino-core (= 0.10.7)
+    rack (1.4.1)
+    rack-protection (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
     rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     redcarpet (2.1.1)
-    sass (3.1.18)
-    sinatra (1.3.2)
+    sass (3.2.4)
+    sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.0.4)
-      temple (~> 0.3.4)
-      tilt (~> 1.3.2)
-    sprockets (2.0.4)
+    sprockets (2.4.5)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-sass (0.9.1)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
     syntax (1.0.0)
-    temple (0.3.5)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thin (1.2.11)
-      daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
-      rack (>= 1.0.0)
-    thor (0.14.6)
+    thor (0.15.4)
     tilt (1.3.3)
-    uglifier (1.2.4)
+    tzinfo (0.3.35)
+    uglifier (1.2.7)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     url_mount (0.2.1)
       rack
 
@@ -112,7 +112,7 @@ DEPENDENCIES
   execjs
   haml
   maruku
-  middleman (~> 2.0.15.3)
+  middleman
   middleman-blog
   rb-fsevent
   redcarpet

diff --git a/...01/14/rediscovering-hacking.html.markdown → ...01-14-rediscovering-hacking.html.markdown b/...01/14/rediscovering-hacking.html.markdown → ...01-14-rediscovering-hacking.html.markdown
@@ -1,6 +1,5 @@
 ---
 title: Rediscovering Hacking
-date: 2011/01/14
 
 ---
 

diff --git a/.../14/full-stack-entrepreneur.html.markdown → ...-14-full-stack-entrepreneur.html.markdown b/.../14/full-stack-entrepreneur.html.markdown → ...-14-full-stack-entrepreneur.html.markdown
@@ -1,6 +1,5 @@
 ---
 title: "Full-Stack Entrepreneur"
-date: 2011/02/14
 
 ---
 

diff --git a/...-better-ssh-driver-for-ruby.html.markdown → ...-better-ssh-driver-for-ruby.html.markdown b/...-better-ssh-driver-for-ruby.html.markdown → ...-better-ssh-driver-for-ruby.html.markdown
@@ -1,6 +1,6 @@
 ---
 title: "Building a better SSH driver for Ruby"
-date: 2011/04/29
+
 ---
 
 I’ve been maintaining Capistrano for a long time now, and most of the

diff --git a/...g/2012/01/04/the-enemy-team.html.markdown → ...e/2012-01-04-the-enemy-team.html.markdown b/...g/2012/01/04/the-enemy-team.html.markdown → ...e/2012-01-04-the-enemy-team.html.markdown
@@ -1,6 +1,6 @@
 ---
 title: "The Enemy Team"
-date: 2012/01/04
+
 ---
 
 ![I feel like the only sane person on PSN](http://25.media.tumblr.com/tumblr_lx439k2IP91r9t8ybo1_500.png)

diff --git a/...y_id-and-parallel-processes.html.markdown → ...y_id-and-parallel-processes.html.markdown b/...y_id-and-parallel-processes.html.markdown → ...y_id-and-parallel-processes.html.markdown
@@ -1,7 +1,7 @@
 ---
 title: "FriendlyId And Parallel Processes"
-date: 2012/02/27
 tags: ruby, rails, redis
+
 ---
 
 I've been using `friendly_id4` for a while now and noticed that it doesn't have a guard to ensure that processes to not race to generate the *next* slug when collisions occur.

diff --git a/...rails-3.2-and-chrome-on-osx.html.markdown → ...rails-3.2-and-chrome-on-osx.html.markdown b/...rails-3.2-and-chrome-on-osx.html.markdown → ...rails-3.2-and-chrome-on-osx.html.markdown
@@ -1,9 +1,8 @@
 ---
 title: Slow Local Development with Rails 3.2 and Chrome on Mac OS X
-date:  2012-05-26
 
 ---
-I've been seeing load times of 35+ seconds on OSX whilst using Chrome, and a local 
+I've been seeing load times of 35+ seconds on OSX whilst using Chrome, and a local
 development host using Rails on the latest Ruby (*1.9.3-p194*), with or without the [falcon
 patches], and to a lesser degree the same with Safari and Firefox.
 
@@ -29,16 +28,16 @@ enabled (which is still not the default, as far as I am aware) can cause this,
 as althoguh the host is available via IPv4, the system still attempts to
 resolve the host over IPv6 first (it would appear)
 
-Althoguh the suggestion was targeted at Windows 7, I had [tried] everything [else] and didn't 
+Althoguh the suggestion was targeted at Windows 7, I had [tried] everything [else] and didn't
 see that I had anything to lose by adding another couple of lines to my hosts
 file, now that it looks like this:
 
     127.0.0.1 example.com.local
     ::1       example.com.local
 
 It looks like if you are a Firefox user it might be possible to [disable
-IPv6] in Firefox ([also poissible with Chrome]) , but frankly in 2012 this isn't a wise thing to 
-do, as the alternative (adding 1 line to your hosts file) is much wiser, and IPv6 isn't going 
+IPv6] in Firefox ([also poissible with Chrome]) , but frankly in 2012 this isn't a wise thing to
+do, as the alternative (adding 1 line to your hosts file) is much wiser, and IPv6 isn't going
 away, even if it isn't changing the world quite yet.
 
 After making this change the resulting timed curl line looks like this:

diff --git a/...toros-ruby-open-air-belarus.html.markdown → ...toros-ruby-open-air-belarus.html.markdown b/...toros-ruby-open-air-belarus.html.markdown → ...toros-ruby-open-air-belarus.html.markdown
@@ -1,6 +1,5 @@
 ---
 title: "Ruby Open Air, an unconference in Minsk Belarus"
-date: 2012/06/19
 
 ---
 

diff --git a/...description-of-a-ruby-fiber.html.markdown → ...description-of-a-ruby-fiber.html.markdown b/...description-of-a-ruby-fiber.html.markdown → ...description-of-a-ruby-fiber.html.markdown
@@ -1,6 +1,5 @@
 ---
 title: "The best description of a ruby fiber"
-date: 2012/06/19
 
 ---
 

diff --git a/source/layout.haml b/source/layout.haml
@@ -16,7 +16,7 @@
 
     - if is_blog_article?
       %title
-        = current_article_title
+        = current_article.title
         Lee Hambley
 
     = yield_content :head
@@ -102,7 +102,7 @@
               .span8
                 - if is_blog_article?
                   .page-header
-                    %h1= current_article_title
+                    %h1= current_article.title
                 = yield
 
           .span4
@@ -124,9 +124,9 @@
             .blog-titles.noPrint
               %h2 Recent Articles
               %ul.blog-titles
-                - data.blog.articles.sort { |a,b| b.date <=> a.date }[0...10].each do |article|
+                - blog.articles.each do |article|
                   %li
-                    %span.article-date= article.date
+                    %span.article-date= article.date.strftime('%b %e %Y')
                     %br
                     .article-link= link_to article.title, article.url