middleman 2.0.13.2-x86-mingw32 → 2.0.14.pre2-x86-mingw32

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

@@ -1,16 +1,21 @@
 Feature: Sprockets
 
-  Scenario: Sprockets require
+  Scenario: Sprockets JS require
     Given the Server is running at "test-app"
     When I go to "/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"
     
-  Scenario: Sprockets require with custom :js_dir
+  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: Sprockets should have access to yaml data
+  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"
     Then I should see "Hello One"
@@ -18,4 +23,29 @@ Feature: Sprockets
   Scenario: Multiple engine files should build correctly
     Given a built app at "test-app"
     Then "javascripts/multiple_engines.js" should exist at "test-app" and include "Hello One"
-    And cleanup built app at "test-app"
+    And cleanup built app at "test-app"
+  
+  Scenario: Sprockets CSS require //require
+    Given the Server is running at "test-app"
+    When I go to "/stylesheets/sprockets_base1.css"
+    Then I should see "hello"
+    
+  Scenario: Sprockets CSS require @import
+    Given the Server is running at "test-app"
+    When I go to "/stylesheets/sprockets_base2.css"
+    Then I should see "hello"
+
+  Scenario: Sprockets CSS require with custom :css_dir //require
+    Given the Server is running at "sprockets-app"
+    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/css/sprockets_base2.css"
+    Then I should see "hello"

data/features/sprockets_gems.feature

@@ -1,7 +1,10 @@
-@wip
 Feature: Sprockets Gems
-
   Scenario: Sprockets can pull jQuery from gem
     Given the Server is running at "sprockets-app"
-    When I go to "/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 +1,2 @@
-set :js_dir, "library/javascripts"
+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/css/sprockets_base1.css.scss

@@ -0,0 +1 @@
+//= require "sprockets_sub"

data/fixtures/sprockets-app/source/library/css/sprockets_base2.css.scss

@@ -0,0 +1 @@
+@import "sprockets_sub";

data/fixtures/sprockets-app/source/library/css/sprockets_sub.css.scss

@@ -0,0 +1 @@
+hello { world: "hi"; }

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/fixtures/test-app/source/stylesheets/sprockets_base1.css.scss

@@ -0,0 +1 @@
+//= require "sprockets_sub"

data/fixtures/test-app/source/stylesheets/sprockets_base2.css.scss

@@ -0,0 +1 @@
+@import "sprockets_sub";

data/fixtures/test-app/source/stylesheets/sprockets_sub.css.scss

@@ -0,0 +1 @@
+hello { world: "hi"; }

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/compass.rb

@@ -68,7 +68,7 @@ module Middleman::CoreExtensions::Compass
           config.asset_cache_buster :none
           config.output_style = :nested
 
-          config.add_import_path(config.sass_dir)
+          # config.add_import_path(config.sass_dir)
         end
         
         # Required for relative paths
@@ -84,8 +84,9 @@ module Middleman::CoreExtensions::Compass
         end
         
         app.execute_after_compass_init!
+        app.execute_after_compass_config!
         
-        app.set :sass, ::Compass.configuration.to_sass_engine_options
+        # app.set :sass, ::Compass.configuration.to_sass_engine_options
       end
     end
     alias :included :registered
@@ -102,5 +103,15 @@ module Middleman::CoreExtensions::Compass
       @run_after_compass ||= []
       @run_after_compass.each { |block| block.call(::Compass.configuration) }
     end
+    
+    def after_compass_config(&block)
+      @run_after_compass_config ||= []
+      @run_after_compass_config << block
+    end
+    
+    def execute_after_compass_config!
+      @run_after_compass_config ||= []
+      @run_after_compass_config.each { |block| block.call() }
+    end
   end
 end

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,21 +23,46 @@ 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)
         app.map "/#{app.js_dir}" do
           run js_env
         end
+      end
+        
+      app.after_compass_config do
+        css_env = Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
         
-        # app.map "/#{app.css_dir}" do
-        #   run Middleman::CoreExtensions::Sprockets::StylesheetEnvironment.new(app)
-        # end
+        vendor_dir = File.join("vendor", "assets", "stylesheets")
+        gems_with_css = ::Middleman.rubygems_latest_specs.select do |spec|
+          ::Middleman.spec_has_file?(spec, vendor_dir)
+        end.each do |spec|
+          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
+          run css_env
+        end
       end
     end
     alias :included :registered
@@ -68,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
 
@@ -82,21 +108,22 @@ module Middleman::CoreExtensions::Sprockets
     end
   end
   
-  # class StylesheetEnvironment < MiddlemanEnvironment
-  #   def initialize(app)
-  #     super
-  # 
-  #     # Disable js
-  #     unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
-  # 
-  #     # configure search paths
-  #     stylesheets_path = File.join(File.expand_path(app.views), app.css_dir)
-  #     append_path stylesheets_path
-  #   end
-  #
-  #   def css_exception_response(exception)
-  #     expire_index!
-  #     super(exception)
-  #   end
-  # end
+  class StylesheetEnvironment < MiddlemanEnvironment
+    def initialize(app)
+      super
+  
+      # Disable js
+      # unregister_processor "application/javascript", ::Sprockets::DirectiveProcessor
+      
+      self.css_compressor = app.settings.css_compressor
+  
+      # configure search paths
+      append_path app.css_dir
+    end
+  
+    def css_exception_response(exception)
+      expire_index!
+      super(exception)
+    end
+  end
 end

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/renderers/sass.rb

@@ -1,5 +1,6 @@
+require "sprockets"
+require "sprockets-sass"
 require "sass"
-require "sass/plugin"
 
 module Middleman::Renderers::Sass
   class << self
@@ -9,41 +10,50 @@ module Middleman::Renderers::Sass
     end
     alias :included :registered
   end
-  
-  class SassPlusCSSFilenameTemplate < ::Tilt::SassTemplate
-    def sass_options_with_scope(scope)
-      return sass_options if basename.nil?
-    
-      location_of_sass_file = if scope.build?
-        File.join(scope.root, scope.build_dir)
-      else
-        scope.views
-      end
-    
-      parts = basename.split('.')
-      parts.pop
-      css_filename = File.join(location_of_sass_file, scope.css_dir, parts.join("."))
-      sass_options.merge(scope.settings.sass).merge(:css_filename => css_filename)
-    end
 
-    def evaluate(scope, locals, &block)
-      @engine = ::Sass::Engine.new(data, sass_options_with_scope(scope.class))
-        
+  class SassPlusCSSFilenameTemplate < ::Sprockets::Sass::SassTemplate
+    self.default_mime_type = "text/css"
+    
+    # Add exception messaging
+    def evaluate(context, locals, &block)
       begin
         super
       rescue Sass::SyntaxError => e
         Sass::SyntaxError.exception_to_css(e, :full_exception => true)
       end
     end
+  
+  protected
+    def sass_options
+      location_of_sass_file = if @context.build?
+        File.expand_path(@context.build_dir, @context.root)
+      else
+        File.expand_path(@context.views, @context.root)
+      end
+      
+      parts = basename.split('.')
+      parts.pop
+      css_filename = File.join(location_of_sass_file, @context.css_dir, parts.join("."))
+      
+      super.merge(
+        :css_filename => css_filename
+      )
+    end
   end
+  ::Sprockets.register_engine ".sass", SassPlusCSSFilenameTemplate
   ::Tilt.register 'sass', SassPlusCSSFilenameTemplate
   ::Tilt.prefer(SassPlusCSSFilenameTemplate)
-
+  
   class ScssPlusCSSFilenameTemplate < SassPlusCSSFilenameTemplate
-    def sass_options_with_scope(scope)
-      super.merge(:syntax => :scss)
+    self.default_mime_type = "text/css"
+    
+    # Define the expected syntax for the template
+    def syntax
+      :scss
     end
   end
+  
+  ::Sprockets.register_engine ".scss", ScssPlusCSSFilenameTemplate
   ::Tilt.register 'scss', ScssPlusCSSFilenameTemplate
   ::Tilt.prefer(ScssPlusCSSFilenameTemplate)
 end

data/lib/middleman/version.rb

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

data/middleman-x86-mingw32.gemspec

@@ -51,6 +51,7 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.3"])
+  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
   s.add_dependency("padrino-core", ["~> 0.10.5"])
   s.add_dependency("padrino-helpers", ["~> 0.10.5"])
   
@@ -58,7 +59,7 @@ eos
   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
@@ -68,5 +69,7 @@ eos
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   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

@@ -53,10 +53,11 @@ eos
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.0.3"])
+  s.add_dependency("sprockets-sass", ["~> 0.3.0"])
   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
@@ -65,5 +66,7 @@ eos
   s.add_development_dependency("cucumber", ["~> 1.0.2"])
   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: 95
-  prerelease: 
+  hash: 1923831965
+  prerelease: 7
   segments: 
   - 2
   - 0
-  - 13
+  - 14
+  - pre
   - 2
-  version: 2.0.13.2
+  version: 2.0.14.pre2
 platform: x86-mingw32
 authors: 
 - Thomas Reynolds
@@ -16,11 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-26 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,12 +240,28 @@ dependencies:
         - 0
         - 3
         version: 2.0.3
-  type: :runtime
-  name: sprockets
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  name: sprockets
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  version_requirements: *id015
+  name: sprockets-sass
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -256,12 +272,12 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  type: :runtime
+  version_requirements: *id016
   name: padrino-core
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -272,12 +288,12 @@ dependencies:
         - 10
         - 5
         version: 0.10.5
-  type: :runtime
+  version_requirements: *id017
   name: padrino-helpers
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -291,12 +307,12 @@ dependencies:
         - 4
         - 1
         version: 1.0.0.beta.4.1
-  type: :runtime
+  version_requirements: *id018
   name: eventmachine
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -307,12 +323,12 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  type: :runtime
+  version_requirements: *id019
   name: win32-process
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -321,28 +337,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  version_requirements: *id020
   name: rb-fchange
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id021 !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
+        - 8
+        - 8
+        version: 0.8.8
+  version_requirements: *id021
   name: guard
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -353,12 +369,12 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  type: :runtime
+  version_requirements: *id022
   name: middleman-livereload
-  version_requirements: *id021
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -369,12 +385,12 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  type: :development
+  version_requirements: *id023
   name: coffee-filter
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -385,12 +401,12 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :development
+  version_requirements: *id024
   name: liquid
-  version_requirements: *id023
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -401,12 +417,12 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
+  version_requirements: *id025
   name: cucumber
-  version_requirements: *id024
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -417,12 +433,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
-  type: :development
+  version_requirements: *id026
   name: rake
-  version_requirements: *id025
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -433,9 +449,38 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
+  version_requirements: *id027
   name: rspec
-  version_requirements: *id026
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id028
+  name: jquery-rails
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id029 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id029
+  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
@@ -529,9 +574,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/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/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
@@ -600,6 +651,9 @@ files:
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/source/stylesheets/static.css
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml
@@ -626,10 +680,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
@@ -778,12 +834,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -860,9 +918,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/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/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
@@ -931,6 +995,9 @@ test_files:
 - fixtures/test-app/source/stylesheets/relative_assets.css.sass
 - fixtures/test-app/source/stylesheets/site.css.sass
 - fixtures/test-app/source/stylesheets/site_scss.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base1.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_base2.css.scss
+- fixtures/test-app/source/stylesheets/sprockets_sub.css.scss
 - fixtures/test-app/source/stylesheets/static.css
 - fixtures/test-app/source/sub1/page-classes.html.haml
 - fixtures/test-app/source/sub1/sub2/page-classes.html.haml