diff --git a/.travis.yml b/.travis.yml index f7f410b23..3f6d00931 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ rvm: - 1.8.7 - 1.9.2 - 1.9.3 - # - jruby script: "bundle exec rake test" branches: diff --git a/middleman-core/features/request_params.feature b/middleman-core/features/request_params.feature new file mode 100644 index 000000000..968d0bfc2 --- /dev/null +++ b/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" diff --git a/middleman-core/fixtures/request-app/config.rb b/middleman-core/fixtures/request-app/config.rb new file mode 100644 index 000000000..e69de29bb diff --git a/middleman-core/fixtures/request-app/source/index.html.erb b/middleman-core/fixtures/request-app/source/index.html.erb new file mode 100644 index 000000000..f87a2bd9c --- /dev/null +++ b/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] %> diff --git a/middleman-core/lib/middleman-core/base.rb b/middleman-core/lib/middleman-core/base.rb index 7ab77383d..1631129fe 100644 --- a/middleman-core/lib/middleman-core/base.rb +++ b/middleman-core/lib/middleman-core/base.rb @@ -265,7 +265,10 @@ def current_path # @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 diff --git a/middleman-more/features/sass_partials.feature b/middleman-more/features/sass_partials.feature index a69727831..e40d360bd 100644 --- a/middleman-more/features/sass_partials.feature +++ b/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" \ No newline at end of file + 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"