Update middleman to version 3.3.0

This included small changes to the syntax for wrap_layout in haml, as well as a fix to a small typo.
WriteSpeakCode · Jun 30, 2014 · 5c921bc · 5c921bc
1 parent d088d78
commit 5c921bc
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 85 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@
 # the following line to use "https"
 source 'http://rubygems.org'
 
-gem "middleman", "~>3.0.13"
+gem "middleman", "~>3.3"
 gem "middleman-blog"
 gem "middleman-smusher"
 gem "haml"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,127 +1,133 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
+    activesupport (4.0.6)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
     bootstrap-sass (2.2.2.0)
       sass (~> 3.2)
     bourbon (3.0.1)
       sass (>= 3.2.0)
       thor
-    chunky_png (1.2.8)
+    chunky_png (1.3.1)
     coderay (1.0.8)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
-    compass (0.12.2)
+    coffee-script-source (1.7.0)
+    compass (0.12.6)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
-      sass (~> 3.1)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+      sass (~> 3.2.19)
+    compass-import-once (1.0.4)
+      sass (>= 3.2, < 3.5)
+    erubis (2.7.0)
+    execjs (2.2.1)
+    ffi (1.9.3)
     fssm (0.2.10)
-    haml (4.0.2)
+    haml (4.0.5)
       tilt
-    hike (1.2.2)
-    http_router (0.10.2)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
+    hike (1.2.3)
+    hooks (0.4.0)
+      uber (~> 0.0.4)
     httpclient (2.3.3)
-    i18n (0.6.1)
+    i18n (0.6.9)
     json (1.8.0)
-    listen (0.7.3)
+    kramdown (1.4.0)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
     maruku (0.6.1)
       syntax (>= 1.0.0)
     method_source (0.8.1)
-    middleman (3.0.13)
-      middleman-core (= 3.0.13)
-      middleman-more (= 3.0.13)
-      middleman-sprockets (~> 3.0.8)
+    middleman (3.3.2)
+      coffee-script (~> 2.2.0)
+      compass (>= 0.12.4)
+      compass-import-once (~> 1.0.4)
+      execjs (~> 2.0)
+      haml (>= 4.0.5)
+      kramdown (~> 1.2)
+      middleman-core (= 3.3.2)
+      middleman-sprockets (>= 3.1.2)
+      sass (>= 3.2.17, < 4.0)
+      uglifier (~> 2.5)
     middleman-blog (3.2.0)
       maruku (~> 0.6.0)
       middleman-core (~> 3.0)
       tzinfo (~> 0.3.0)
-    middleman-core (3.0.13)
-      activesupport (~> 3.2.6)
+    middleman-core (3.3.2)
+      activesupport (~> 4.0.1)
       bundler (~> 1.1)
-      listen (~> 0.7.3)
-      rack (~> 1.4.1)
-      rack-test (~> 0.6.1)
-      rb-fsevent (~> 0.9.3)
-      thor (~> 0.15.4)
-      tilt (~> 1.3.6)
-    middleman-more (3.0.13)
-      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, < 0.6.2)
-      maruku (~> 0.6.0)
-      middleman-core (= 3.0.13)
-      padrino-helpers (= 0.10.7)
-      sass (>= 3.1.20)
-      uglifier (~> 1.2.6)
+      erubis
+      hooks (~> 0.3)
+      i18n (~> 0.6.9)
+      listen (~> 1.1)
+      padrino-helpers (~> 0.12.1)
+      rack (>= 1.4.5, < 2.0)
+      rack-test (~> 0.6.2)
+      thor (>= 0.15.2, < 2.0)
+      tilt (~> 1.4.1, < 2.0)
     middleman-smusher (3.0.0)
       middleman (>= 3.0.0)
       smusher (~> 0.4.9)
-    middleman-sprockets (3.0.11)
-      middleman-more (>= 3.0.11)
-      sprockets (~> 2.1)
-      sprockets-sass (~> 0.9.1)
+    middleman-sprockets (3.3.3)
+      middleman-core (>= 3.2)
+      sprockets (~> 2.2)
+      sprockets-helpers (~> 1.1.0)
+      sprockets-sass (~> 1.1.0)
     mini_portile (0.5.0)
-    multi_json (1.7.2)
+    minitest (4.7.5)
+    multi_json (1.10.1)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    padrino-core (0.10.7)
-      activesupport (~> 3.2.0)
-      http_router (~> 0.10.2)
-      sinatra (~> 1.3.1)
-      thor (~> 0.15.2)
-      tilt (~> 1.3.0)
-    padrino-helpers (0.10.7)
-      i18n (~> 0.6)
-      padrino-core (= 0.10.7)
+    padrino-helpers (0.12.2)
+      i18n (~> 0.6, >= 0.6.7)
+      padrino-support (= 0.12.2)
+      tilt (~> 1.4.1)
+    padrino-support (0.12.2)
+      activesupport (>= 3.1)
     pry (0.9.10)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.5)
-    rack-protection (1.5.0)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.4)
-    rb-fsevent (0.9.3)
-    sass (3.2.7)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.5)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.3)
+      ffi (>= 0.5.0)
+    sass (3.2.19)
     slop (3.3.3)
     smusher (0.4.9)
       httpclient (>= 2.2)
       json
       rake
-    sprockets (2.9.3)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (0.9.1)
+    sprockets-helpers (1.1.0)
+      sprockets (~> 2.0)
+    sprockets-sass (1.1.0)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    syntax (1.0.0)
-    thor (0.15.4)
-    tilt (1.3.7)
+    syntax (1.2.0)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tilt (1.4.1)
     tzinfo (0.3.37)
-    uglifier (1.2.7)
+    uber (0.0.6)
+    uglifier (2.5.1)
       execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    url_mount (0.2.1)
-      rack
+      json (>= 1.8.0)
 
 PLATFORMS
   ruby
@@ -131,7 +137,7 @@ DEPENDENCIES
   bourbon
   compass
   haml
-  middleman (~> 3.0.13)
+  middleman (~> 3.3)
   middleman-blog
   middleman-smusher
   nokogiri

diff --git a/source/layouts/blog.haml b/source/layouts/blog.haml
@@ -1,8 +1,8 @@
-- wrap_layout :base_layout do
-  - wrap_layout :sub_main_layout do
+= wrap_layout :base_layout do
+  = wrap_layout :sub_main_layout do
     = yield
 
-  - wrap_layout :sub_sidebar_layout do
+  = wrap_layout :sub_sidebar_layout do
     .details
       %strong Recent Articles
       %ul

diff --git a/source/layouts/layout.haml b/source/layouts/layout.haml
@@ -1,14 +1,14 @@
-- wrap_layout :base_layout do
-  - wrap_layout :sub_main_layout do
+= wrap_layout :base_layout do
+  = wrap_layout :sub_main_layout do
     = yield
 
-  - wrap_layout :sub_sidebar_layout do
+  = wrap_layout :sub_sidebar_layout do
     %h4 Tickets on sale & CFP open!
     .details.what
       %strong what
       .detail
         %p
-          Write/Speak/Code is a 3-day action-oriented conference 
+          Write/Speak/Code is a 3-day action-oriented conference
           for women developers.
         %p
           = link_to('Buy tickets!', 'https://ti.to/rmw/writespeakcode-2014')
@@ -24,9 +24,9 @@
       %strong where
       .detail
         %p
-          Write/Speak/Code has pa`rtnered with 
-          = link_to('NYU ITP', 'http://itp.nyu.edu/itp/') 
-          for a bigger conference. 
+          Write/Speak/Code has partnered with
+          = link_to('NYU ITP', 'http://itp.nyu.edu/itp/')
+          for a bigger conference.
         %p
           721 Broadway
           %br
@@ -35,5 +35,5 @@
       %strong Why
       .detail
         %p
-          Empowering ourselves and each other to become thought leaders, 
+          Empowering ourselves and each other to become thought leaders,
           conference speakers, and open source contributors.