lib/sass/plugin/merb.rb in haml-2.0.10 vs lib/sass/plugin/merb.rb in haml-2.2.0
- old
+ new
@@ -8,25 +8,26 @@
else
root = Merb.root.to_s
env = Merb.environment
end
- Sass::Plugin.options.merge!(:template_location => root + '/public/stylesheets/sass',
- :css_location => root + '/public/stylesheets',
- :always_check => env != "production",
- :full_exception => env != "production")
+ Sass::Plugin.options.merge!(:template_location => root + '/public/stylesheets/sass',
+ :css_location => root + '/public/stylesheets',
+ :cache_location => root + '/tmp/sass-cache',
+ :always_check => env != "production",
+ :full_exception => env != "production")
config = Merb::Plugins.config[:sass] || Merb::Plugins.config["sass"] || {}
if defined? config.symbolize_keys!
config.symbolize_keys!
end
Sass::Plugin.options.merge!(config)
if version[0] > 0 || version[1] >= 9
- class Merb::Rack::Application # :nodoc:
+ class Merb::Rack::Application
def call_with_sass(env)
if !Sass::Plugin.checked_for_updates ||
Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
Sass::Plugin.update_stylesheets
end
@@ -37,10 +38,10 @@
alias_method :call, :call_with_sass
end
else
- class MerbHandler # :nodoc:
+ class MerbHandler
def process_with_sass(request, response)
if !Sass::Plugin.checked_for_updates ||
Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
Sass::Plugin.update_stylesheets
end