Merge branch 'master' of github.com:middleman/middleman

.travis.yml

@@ -2,7 +2,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  # - jruby
 script: "bundle exec rake test"
 
 branches:

middleman-core/features/request_params.feature

@@ -0,0 +1,6 @@
+Feature: Support request parameters
+  Scenario: Use request params in a template
+    Given the Server is running at "request-app"
+    When I go to "/index.html?say=Hello+World"
+    Then I should see "Quote Hello World"
+    Then I should see "Symbol Hello World"

middleman-core/fixtures/request-app/source/index.html.erb

@@ -0,0 +1,3 @@
+Dot <%= request.params.say %>
+Quote <%= request.params["say"] %>
+Symbol <%= request.params[:say] %>

middleman-core/lib/middleman-core/base.rb

@@ -265,7 +265,10 @@ class Middleman::Base
   # @return [void]
   def current_path=(path)
     @_current_path = path
-    @request = ::Thor::CoreExt::HashWithIndifferentAccess.new({ :path => path })
+    @request = ::Thor::CoreExt::HashWithIndifferentAccess.new({ 
+      :path   => path, 
+      :params => req ? ::Thor::CoreExt::HashWithIndifferentAccess.new(req.params) : {} 
+    })
   end
   
   # Initialize the Middleman project

middleman-more/features/sass_partials.feature

@@ -80,4 +80,8 @@ Feature: Sass Updates and Partials
       """
     When I go to "/stylesheets/main2.css"
       Then I should see "color: blue;"
-    Then I should see "font-size: 18px"
+    Then I should see "font-size: 18px"
+
+  Scenario: Sass partials should work when building
+    Given a successfully built app at "preview-app"
+    Then the file "build/stylesheets/main.css" should contain "font-size: 18px"