sass 3.1.0.alpha.34 → 3.1.0.alpha.35

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.34
+3.1.0.alpha.35

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.34
+3.1.0.alpha.35

data/lib/sass/plugin/configuration.rb

@@ -113,7 +113,9 @@ module Sass
         return if options[:template_location].is_a?(Array)
         options[:template_location] =
           case options[:template_location]
-          when nil; [[File.join(options[:css_location], 'sass'), options[:css_location]]]
+          when nil
+            options[:css_location] ?
+              [[File.join(options[:css_location], 'sass'), options[:css_location]]] : []
           when String; [[options[:template_location], options[:css_location]]]
           else; options[:template_location].to_a
           end

data/lib/sass/plugin/rails.rb

@@ -42,11 +42,11 @@ unless defined?(Sass::RAILS_LOADED)
       def call(template, view)
         rails_importer = Sass::Importers::Rails.new(view.lookup_context)
         engine = Sass::Engine.new(template.source,
-          Sass::Plugin.options.merge(
+          Sass::Plugin.engine_options.merge(
             :syntax => @syntax,
             :filename => template.virtual_path,
             :importer => rails_importer,
-            :load_paths => [rails_importer] + Sass::Plugin.options[:load_paths]))
+            :load_paths => [rails_importer] + Sass::Plugin.engine_options[:load_paths]))
 
         # We need to serialize/deserialize the importers to make sure
         # that each dependency is matched up to its proper importer
@@ -68,7 +68,7 @@ unless defined?(Sass::RAILS_LOADED)
             engine.render
           rescue Sass::SyntaxError => e
             Sass::Plugin::TemplateHandler.munge_exception e, view.lookup_context
-            Sass::SyntaxError.exception_to_css(e, Sass::Plugin.options)
+            Sass::SyntaxError.exception_to_css(e, Sass::Plugin.engine_options)
           end
 
         <<RUBY

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.34
+  version: 3.1.0.alpha.35
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2010-11-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency