middleman 2.0.14.pre → 2.0.14.pre2

data/.travis.yml

@@ -2,4 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - rbx-2.0
+  - jruby
 script: "bundle exec rake test"

data/CHANGELOG

@@ -1,3 +1,11 @@
+2.0.14
+====
+Finally support Compass in Sprockets! Thanks to @xdite and @petebrowne
+
+2.0.13.2
+====
+Update Windows eventmachine dep
+
 2.0.13.1
 ====
 build --clean shouldn't remove dotfiles

data/features/sprockets.feature

@@ -7,9 +7,14 @@ Feature: Sprockets
     
   Scenario: Sprockets JS require with custom :js_dir
     Given the Server is running at "sprockets-app"
-    When I go to "/library/javascripts/sprockets_base.js"
+    When I go to "/library/js/sprockets_base.js"
     Then I should see "sprockets_sub_function"
     
+  Scenario: Plain JS require with custom :js_dir
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/plain.css"
+    Then I should see "helloWorld"
+    
   Scenario: Sprockets JS should have access to yaml data
     Given the Server is running at "test-app"
     When I go to "/javascripts/multiple_engines.js"
@@ -32,10 +37,15 @@ Feature: Sprockets
 
   Scenario: Sprockets CSS require with custom :css_dir //require
     Given the Server is running at "sprockets-app"
-    When I go to "/library/stylesheets/sprockets_base1.css"
+    When I go to "/library/css/sprockets_base1.css"
     Then I should see "hello"
     
+  Scenario: Plain CSS require with custom :css_dir
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/css/plain.css"
+    Then I should see "helloWorld"
+    
   Scenario: Sprockets CSS require with custom :css_dir @import
     Given the Server is running at "sprockets-app"
-    When I go to "/library/stylesheets/sprockets_base2.css"
+    When I go to "/library/css/sprockets_base2.css"
     Then I should see "hello"

data/features/sprockets_gems.feature

@@ -1,5 +1,10 @@
 Feature: Sprockets Gems
   Scenario: Sprockets can pull jQuery from gem
     Given the Server is running at "sprockets-app"
-    When I go to "/library/javascripts/jquery_include.js"
-    Then I should see "var jQuery ="
+    When I go to "/library/js/jquery_include.js"
+    Then I should see "var jQuery ="
+    
+  # Scenario: Sprockets can pull CSS from gem
+  #   Given the Server is running at "sprockets-app"
+  #   When I go to "/library/css/bootstrap_include.css"
+  #   Then I should see "Bootstrap"

data/fixtures/sprockets-app/config.rb

@@ -1,2 +1,2 @@
-set :js_dir, "library/javascripts"
-set :css_dir, "library/stylesheets"
+set :js_dir, "library/js"
+set :css_dir, "library/css"

data/fixtures/sprockets-app/source/library/css/plain.css

@@ -0,0 +1,3 @@
+#helloWorld {
+  color: red;
+}

data/fixtures/sprockets-app/source/library/js/plain.js

@@ -0,0 +1,3 @@
+function hellowWorld() {
+  
+}

data/fixtures/sprockets-app/source/library/stylesheets/bootstrap_include.css.scss

@@ -0,0 +1 @@
+//= require "bootstrap.scss"

data/lib/middleman.rb

@@ -48,7 +48,7 @@
 #
 # [Visit the website]:     http://middlemanapp.com
 # [Read the wiki]:         https://github.com/tdreyno/middleman/wiki
-# [Email the users group]: http://groups.google.com/group/middleman-users
+# [Email the users group]: https://convore.com/middleman/
 # [Submit bug reports]:    https://github.com/tdreyno/middleman/issues
 
 # Setup our load paths
@@ -73,6 +73,7 @@ module Middleman
     autoload :Sass,         "middleman/renderers/sass"
     autoload :Slim,         "middleman/renderers/slim"
     autoload :Markdown,     "middleman/renderers/markdown"
+    autoload :ERb,          "middleman/renderers/erb"
     autoload :CoffeeScript, "middleman/renderers/coffee_script"
     autoload :Liquid,       "middleman/renderers/liquid"
   end
@@ -199,4 +200,4 @@ module Middleman
 end
 
 require "middleman/version"
-Middleman.load_extensions_in_path
+Middleman.load_extensions_in_path

data/lib/middleman/cli.rb

@@ -12,7 +12,7 @@ module Middleman
       help_check if options[:help]
     end
 
-    desc "init NAME", "Create new Middleman project directory NAME"
+    desc "init NAME [options]", "Create new Middleman project directory NAME"
     available_templates = Middleman::Templates.registered_names.join(", ")
     method_option "template", :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
     method_option "css_dir", :default => "stylesheets", :desc => 'The path to the css files'

data/lib/middleman/core_extensions/front_matter.rb

@@ -101,6 +101,9 @@ module Middleman::CoreExtensions::FrontMatter
   class ERBTemplate < ::Tilt::ERBTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware
   end
+  class ErubisTemplate < ::Tilt::ErubisTemplate
+    include Middleman::CoreExtensions::FrontMatter::YamlAware
+  end
 
   class LiquidTemplate < ::Tilt::LiquidTemplate
     include Middleman::CoreExtensions::FrontMatter::YamlAware

data/lib/middleman/core_extensions/rendering.rb

@@ -11,6 +11,7 @@ module Middleman::CoreExtensions::Rendering
       app.register Middleman::Renderers::Haml
       app.register Middleman::Renderers::Sass
       app.register Middleman::Renderers::Markdown
+      app.register Middleman::Renderers::ERb
       app.register Middleman::Renderers::CoffeeScript
       app.register Middleman::Renderers::Liquid
     end

data/lib/middleman/core_extensions/sprockets.rb

@@ -6,6 +6,7 @@ module Middleman::CoreExtensions::Sprockets
   class << self
     def registered(app)
       app.set :js_compressor, false
+      app.set :css_compressor, false
       
       # Cut off every extension after .js (which sprockets eats up)
       app.build_reroute do |destination, request_path|
@@ -22,11 +23,18 @@ module Middleman::CoreExtensions::Sprockets
       app.after_configuration do
         js_env = Middleman::CoreExtensions::Sprockets::JavascriptEnvironment.new(app)
         
-        js_dir = File.join("vendor", "assets", "javascripts")
+        vendor_dir = File.join("vendor", "assets", "javascripts")
         gems_with_js = ::Middleman.rubygems_latest_specs.select do |spec|
-          ::Middleman.spec_has_file?(spec, js_dir)
+          ::Middleman.spec_has_file?(spec, vendor_dir)
         end.each do |spec|
-          js_env.append_path File.join(spec.full_gem_path, js_dir)
+          js_env.append_path File.join(spec.full_gem_path, vendor_dir)
+        end
+        
+        app_dir = File.join("app", "assets", "javascripts")
+        gems_with_js = ::Middleman.rubygems_latest_specs.select do |spec|
+          ::Middleman.spec_has_file?(spec, app_dir)
+        end.each do |spec|
+          js_env.append_path File.join(spec.full_gem_path, app_dir)
         end
         
         # add paths to js_env (vendor/assets/javascripts)
@@ -37,11 +45,19 @@ module Middleman::CoreExtensions::Sprockets
         
       app.after_compass_config do
         css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
-        css_dir = File.join("vendor", "assets", "stylesheets")
+        
+        vendor_dir = File.join("vendor", "assets", "stylesheets")
         gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
-          ::Middleman.spec_has_file?(spec, css_dir)
+          ::Middleman.spec_has_file?(spec, vendor_dir)
         end.each do |spec|
-          css_env.append_path File.join(spec.full_gem_path, css_dir)
+          css_env.append_path File.join(spec.full_gem_path, vendor_dir)
+        end
+
+        app_dir = File.join("app", "assets", "stylesheets")
+        gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
+          ::Middleman.spec_has_file?(spec, app_dir)
+        end.each do |spec|
+          css_env.append_path File.join(spec.full_gem_path, app_dir)
         end
         
         app.map "/#{app.css_dir}" do
@@ -78,7 +94,7 @@ module Middleman::CoreExtensions::Sprockets
       super
 
       # Disable css
-      unregister_processor "text/css", ::Sprockets::DirectiveProcessor
+      # unregister_processor "text/css", ::Sprockets::DirectiveProcessor
       
       self.js_compressor = app.settings.js_compressor
 
@@ -97,7 +113,9 @@ module Middleman::CoreExtensions::Sprockets
       super
   
       # Disable js
-      unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
+      # unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
+      
+      self.css_compressor = app.settings.css_compressor
   
       # configure search paths
       append_path app.css_dir

data/lib/middleman/features/minify_css.rb

@@ -1,9 +1,8 @@
 module Middleman::Features::MinifyCss
   class << self
     def registered(app)
-      app.compass_config do |config|
-        config.output_style = :compressed
-      end
+      require "middleman/features/minify_css/cssmin"
+      app.set :css_compressor, ::CSSMin
     end
     alias :included :registered
   end

data/lib/middleman/features/minify_css/cssmin.rb

@@ -0,0 +1,55 @@
+#--
+# Copyright (c) 2008 Ryan Grove <ryan@wonko.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+#   * Redistributions of source code must retain the above copyright notice,
+#     this list of conditions and the following disclaimer.
+#   * Redistributions in binary form must reproduce the above copyright notice,
+#     this list of conditions and the following disclaimer in the documentation
+#     and/or other materials provided with the distribution.
+#   * Neither the name of this project nor the names of its contributors may be
+#     used to endorse or promote products derived from this software without
+#     specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#++
+
+module CSSMin
+  def self.compress(input)
+    css = input.is_a?(IO) ? input.read : input.dup.to_s
+    css.gsub!(/\/\*[\s\S]*?\*\//, '')
+    css.gsub!(/\s+/, ' ')
+    css.gsub!(/"\\"\}\\""/, '___BMH___')
+    css.gsub!(/(?:^|\})[^\{:]+\s+:+[^\{]*\{/) do |match|
+      match.gsub(':', '___PSEUDOCLASSCOLON___')
+    end
+    css.gsub!(/\s+([!\{\};:>+\(\)\],])/, '\1')
+    css.gsub!('___PSEUDOCLASSCOLON___', ':')
+    css.gsub!(/([!\{\}:;>+\(\[,])\s+/, '\1')
+    css.gsub!(/([^;\}])\}/, '\1;}')
+    css.gsub!(/([\s:])([+-]?0)(?:%|em|ex|px|in|cm|mm|pt|pc)/i, '\1\2')
+    css.gsub!(/:(?:0 )+0;/, ':0;')
+    css.gsub!('background-position:0;', 'background-position:0 0;')
+    css.gsub!(/(:|\s)0+\.(\d+)/, '\1.\2')
+    css.gsub!(/rgb\s*\(\s*([0-9,\s]+)\s*\)/) do |match|
+      '#' << $1.scan(/\d+/).map{|n| n.to_i.to_s(16).rjust(2, '0') }.join
+    end
+    css.gsub!(/([^"'=\s])\s*#([0-9a-f])\2([0-9a-f])\3([0-9a-f])\4/i, '\1 #\2\3\4')
+    css.gsub!(/[^\}]+\{;\}\n/, '')
+    css.gsub!('___BMH___', '"\"}\""')
+    css.gsub!(/;;+/, ';')
+    css.strip
+  end
+end

data/lib/middleman/renderers/erb.rb

@@ -0,0 +1,34 @@
+require "tilt"
+
+module Middleman::Renderers::ERb
+  class << self
+    def registered(app)
+      app.extend ClassMethods
+      
+      app.set :erb_engine, :erb
+      
+      if !app.respond_to? :erb_engine_prefix
+        app.set :erb_engine_prefix, ::Tilt
+      end
+      
+      app.after_configuration do
+        engine = app.settings.erb_engine
+        
+        if engine.is_a? Symbol
+          engine = app.tilt_template_from_symbol(engine)
+        end
+        
+        ::Tilt.prefer(engine)
+      end
+    end
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    def tilt_template_from_symbol(engine)
+      engine = engine.to_s
+      engine = engine == "erb" ? "ERB" : engine.camelize
+      settings.erb_engine_prefix.const_get("#{engine}Template")
+    end
+  end
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.14.pre"
+  VERSION = "2.0.14.pre2"
 end

data/middleman-x86-mingw32.gemspec

@@ -55,11 +55,11 @@ eos
   s.add_dependency("padrino-core", ["~> 0.10.5"])
   s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
-  s.add_dependency("eventmachine", ["1.0.0.beta.3"])
+  s.add_dependency("eventmachine", ["1.0.0.beta.4.1"])
   s.add_dependency("win32-process", ["~> 0.6.5"])
   s.add_dependency("rb-fchange")
   
-  s.add_dependency("guard", ["~> 0.6.2"])
+  s.add_dependency("guard", ["~> 0.8.8"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
   
   # Development and test
@@ -70,5 +70,6 @@ eos
   s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
   s.add_development_dependency("jquery-rails")
+  s.add_development_dependency("bootstrap-rails")
 end
 

data/middleman.gemspec

@@ -57,7 +57,7 @@ eos
   s.add_dependency("padrino-core", ["~> 0.10.5"])
   s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
-  s.add_dependency("guard", ["~> 0.6.2"])
+  s.add_dependency("guard", ["~> 0.8.8"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
   
   # Development and test
@@ -67,5 +67,6 @@ eos
   s.add_development_dependency("rake", ["~> 0.9.2"])
   s.add_development_dependency("rspec", ["~> 2.6.0"])
   s.add_development_dependency("jquery-rails")
+  s.add_development_dependency("bootstrap-rails")
 end
 

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 961915996
+  hash: 1923831965
   prerelease: 7
   segments: 
   - 2
   - 0
   - 14
   - pre
-  version: 2.0.14.pre
+  - 2
+  version: 2.0.14.pre2
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -16,11 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-19 00:00:00 -07:00
+date: 2011-11-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +32,11 @@ dependencies:
         - 3
         - 5
         version: 1.3.5
-  type: :runtime
-  name: rack
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +48,11 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  type: :runtime
-  name: thin
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: thin
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +64,11 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
-  type: :runtime
-  name: thor
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,11 +80,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :runtime
-  name: tilt
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,11 +96,11 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :runtime
-  name: maruku
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: maruku
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -112,11 +112,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :runtime
-  name: sinatra
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +128,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  type: :runtime
-  name: rack-test
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,11 +144,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  name: uglifier
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  name: uglifier
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -160,11 +160,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :runtime
-  name: slim
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  name: slim
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -176,11 +176,11 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  type: :runtime
-  name: haml
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  name: haml
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -192,11 +192,11 @@ dependencies:
         - 1
         - 7
         version: 3.1.7
-  type: :runtime
-  name: sass
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  name: sass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -208,11 +208,11 @@ dependencies:
         - 11
         - 3
         version: 0.11.3
-  type: :runtime
-  name: compass
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  name: compass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -224,11 +224,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
-  name: coffee-script
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  name: coffee-script
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -240,11 +240,11 @@ dependencies:
         - 2
         - 7
         version: 1.2.7
-  type: :runtime
-  name: execjs
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  name: execjs
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -256,11 +256,11 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
-  type: :runtime
-  name: sprockets
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  name: sprockets
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -272,11 +272,11 @@ dependencies:
         - 3
         - 0
         version: 0.3.0
-  type: :runtime
-  name: sprockets-sass
   version_requirements: *id016
-- !ruby/object:Gem::Dependency 
+  name: sprockets-sass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -288,11 +288,11 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  type: :runtime
-  name: padrino-core
   version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+  name: padrino-core
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -304,27 +304,27 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  type: :runtime
-  name: padrino-helpers
   version_requirements: *id018
-- !ruby/object:Gem::Dependency 
+  name: padrino-helpers
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 0
-        - 6
-        - 2
-        version: 0.6.2
-  type: :runtime
-  name: guard
+        - 8
+        - 8
+        version: 0.8.8
   version_requirements: *id019
-- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -336,11 +336,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  type: :runtime
-  name: middleman-livereload
   version_requirements: *id020
-- !ruby/object:Gem::Dependency 
+  name: middleman-livereload
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -352,11 +352,11 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  type: :development
-  name: coffee-filter
   version_requirements: *id021
-- !ruby/object:Gem::Dependency 
+  name: coffee-filter
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -368,11 +368,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :development
-  name: liquid
   version_requirements: *id022
-- !ruby/object:Gem::Dependency 
+  name: liquid
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -384,11 +384,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
-  name: cucumber
   version_requirements: *id023
-- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -400,11 +400,11 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :development
-  name: rake
   version_requirements: *id024
-- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -416,11 +416,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
-  name: rspec
   version_requirements: *id025
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -430,9 +430,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  name: jquery-rails
   version_requirements: *id026
+  name: jquery-rails
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id027
+  name: bootstrap-rails
+  prerelease: false
+  type: :development
 description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
 - me@tdreyno.com
@@ -526,12 +541,15 @@ files:
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sprockets-app/config.rb
-- fixtures/sprockets-app/source/library/javascripts/jquery_include.js
-- fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
-- fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
-- fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss
-- fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss
-- fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss
+- fixtures/sprockets-app/source/library/css/plain.css
+- fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
+- fixtures/sprockets-app/source/library/js/jquery_include.js
+- fixtures/sprockets-app/source/library/js/plain.js
+- fixtures/sprockets-app/source/library/js/sprockets_base.js
+- fixtures/sprockets-app/source/library/js/sprockets_sub.js
+- fixtures/sprockets-app/source/library/stylesheets/bootstrap_include.css.scss
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json
@@ -629,10 +647,12 @@ files:
 - lib/middleman/features/directory_indexes.rb
 - lib/middleman/features/lorem.rb
 - lib/middleman/features/minify_css.rb
+- lib/middleman/features/minify_css/cssmin.rb
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/guard.rb
 - lib/middleman/renderers/coffee_script.rb
+- lib/middleman/renderers/erb.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/liquid.rb
 - lib/middleman/renderers/markdown.rb
@@ -865,12 +885,15 @@ test_files:
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
 - fixtures/sprockets-app/config.rb
-- fixtures/sprockets-app/source/library/javascripts/jquery_include.js
-- fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
-- fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
-- fixtures/sprockets-app/source/library/stylesheets/sprockets_base1.css.scss
-- fixtures/sprockets-app/source/library/stylesheets/sprockets_base2.css.scss
-- fixtures/sprockets-app/source/library/stylesheets/sprockets_sub.css.scss
+- fixtures/sprockets-app/source/library/css/plain.css
+- fixtures/sprockets-app/source/library/css/sprockets_base1.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss
+- fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss
+- fixtures/sprockets-app/source/library/js/jquery_include.js
+- fixtures/sprockets-app/source/library/js/plain.js
+- fixtures/sprockets-app/source/library/js/sprockets_base.js
+- fixtures/sprockets-app/source/library/js/sprockets_sub.js
+- fixtures/sprockets-app/source/library/stylesheets/bootstrap_include.css.scss
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/data/test2.json