deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge

Browse source
This commit is contained in:
Thomas Reynolds 2013-01-13 15:22:36 -08:00
parent 7c1d55cb38
commit 80fb3ff06f
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
middleman-core/lib/middleman-core/renderers/sass.rb
View file

@ -14,14 +14,14 @@ module Middleman
# Default sass options # Default sass options
app.config.define_setting :sass, {}, 'Sass engine options' app.config.define_setting :sass, {}, 'Sass engine options'
# Location of SASS .sass_cache directory. # Location of SASS .sass-cache directory.
# @return [String] # @return [String]
app.config.define_setting :sass_cache_path, nil, 'Location of sass cache' # runtime compile of path app.config.define_setting :sass_cache_path, nil, 'Location of sass cache' # runtime compile of path
app.before_configuration do app.before_configuration do
template_extensions :scss => :css, template_extensions :scss => :css,
:sass => :css :sass => :css
config[:sass_cache_path] = File.join(app.root_path, '.sass_cache') config[:sass_cache_path] = File.join(app.root_path, '.sass-cache')
end end
# Tell Tilt to use it as well (for inline sass blocks) # Tell Tilt to use it as well (for inline sass blocks)

8
middleman-more/features/sass_cache_path.feature
View file

@ -1,6 +1,6 @@
Feature: SASS .sass_cache custom location Feature: SASS .sass-cache custom location
Scenario: Using the default location for .sass_cache folder Scenario: Using the default location for .sass-cache folder
Given the Server is running at "sass-cache-path-default-app" Given the Server is running at "sass-cache-path-default-app"
When I go to "/stylesheets/plain.css" When I go to "/stylesheets/plain.css"
@ -10,10 +10,10 @@ Feature: SASS .sass_cache custom location
# Not sure how to test this location, as the directory is stored outside of the app root # Not sure how to test this location, as the directory is stored outside of the app root
# during testing, but inside app root in "production" # during testing, but inside app root in "production"
# Then a directory named ".sass_cache" should exist # Then a directory named ".sass-cache" should exist
Scenario: Using a custom location for .sass_cache folder Scenario: Using a custom location for .sass-cache folder
Given the Server is running at "sass-cache-path-custom-app" Given the Server is running at "sass-cache-path-custom-app"
When I go to "/stylesheets/plain.css" When I go to "/stylesheets/plain.css"

2
middleman-more/fixtures/sass-cache-path-default-app/config.rb
View file

@ -1,3 +1,3 @@
# Using default setting # Using default setting
# set :sass_cache_path, File.join(Dir.pwd, '.sass_cache') # set :sass_cache_path, File.join(Dir.pwd, '.sass-cache')