fix front_matter load order. fixes #122

lib/middleman/core_extensions/front_matter.rb

@@ -28,7 +28,7 @@ module Middleman::CoreExtensions::FrontMatter
       ::Tilt.prefer(HamlTemplate)
       
       app.after_configuration do
-        app.before_processing(:front_matter) do |result|
+        app.before_processing(:front_matter, 0) do |result|
           if result && Tilt.mappings.has_key?(result[1].to_s)
             extensionless_path, template_engine = result
             full_file_path = "#{extensionless_path}.#{template_engine}"

lib/middleman/renderers/liquid.rb

@@ -16,6 +16,7 @@ module Middleman::Renderers::Liquid
             if result && result[1] == :liquid
               request['custom_locals'] ||= {}
               request['custom_locals'][:data] = data.to_h
+              # request['custom_locals'].merge(data.to_h)
             end
 
             true

lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.9"
+  VERSION = "2.0.10"
 end

middleman-x86-mingw32.gemspec

@@ -45,7 +45,7 @@ eos
   s.add_dependency("sinatra", ["~> 1.2.6"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
-  s.add_dependency("slim", ["~> 1.0.1"])
+  s.add_dependency("slim", ["~> 1.0.2"])
   s.add_dependency("haml", ["~> 3.1.0"])
   s.add_dependency("sass", ["~> 3.1.7"])
   s.add_dependency("compass", ["~> 0.11.3"])

middleman.gemspec

@@ -46,7 +46,7 @@ eos
   # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
-  s.add_dependency("slim", ["~> 1.0.1"])
+  s.add_dependency("slim", ["~> 1.0.2"])
   s.add_dependency("haml", ["~> 3.1.0"])
   s.add_dependency("sass", ["~> 3.1.7"])
   s.add_dependency("compass", ["~> 0.11.3"])