moar fixes

CHANGELOG

@@ -1,3 +1,10 @@
+2.0.9
+=====
+- Added --glob option to build which only builds matching files
+- Allow data/ files to be in JSON format as well
+- Enabled Liquid {% include %} tag
+- RubyInstaller-specific gem
+
 2.0.8
 =====
 - Support accessing variables and data objects in ERb Sprockets files (library.js.coffee.erb)

lib/middleman/base.rb

@@ -6,7 +6,7 @@ require "active_support/core_ext/class/attribute_accessors"
 
 module Middleman::Base
   class << self
-    def registered(app)      
+    def registered(app)
       app.extend ClassMethods
       app.send :include, InstanceMethods
       

lib/middleman/builder.rb

@@ -5,14 +5,14 @@ require 'rack/test'
 SHARED_SERVER = Middleman.server
 SHARED_SERVER.set :environment, :build
 
-module Middleman  
+module Middleman
   module ThorActions
     def tilt_template(source, *args, &block)
       config = args.last.is_a?(Hash) ? args.pop : {}
       destination = args.first || source
       
       # source  = File.expand_path(find_in_source_paths(source.to_s))
-      context = instance_eval('binding')
+      # context = instance_eval('binding')
       
       request_path = destination.sub(/^#{SHARED_SERVER.build_dir}/, "")
       

lib/middleman/config.ru

@@ -1,2 +0,0 @@
-require 'middleman'
-run Middleman.server

lib/middleman/core_extensions/assets.rb

@@ -15,7 +15,7 @@ module Middleman::CoreExtensions::Assets
     alias :included :registered
   end
   
-  module ClassMethods    
+  module ClassMethods
     def register_asset_handler(handler_name, &block)
       @asset_handler_map   ||= []
       @asset_handler_stack ||= []

lib/middleman/core_extensions/compass.rb

@@ -76,6 +76,7 @@ module Middleman::CoreExtensions::Compass
             build_root = File.basename(self.build_dir)
             config.css_dir     = File.join(build_root, self.css_dir)
             config.images_dir  = File.join(build_root, self.images_dir)
+            config.fonts_dir   = File.join(build_root, self.fonts_dir)
           end
         end
         

lib/middleman/features/tiny_src.rb

@@ -1,11 +0,0 @@
-module Middleman::Features::TinySrc
-  class << self
-    def registered(app)
-      app.register_asset_handler :tiny_src do |path, prefix, request|
-        original_output = app.before_asset_handler(:tiny_src, path, prefix, request)
-        "http://i.tinysrc.mobi/#{original_output}"
-      end
-    end
-    alias :included :registered
-  end
-end