sass 3.1.0.alpha.40 → 3.1.0.alpha.41

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.40
+3.1.0.alpha.41

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.40
+3.1.0.alpha.41

data/lib/sass/importers/rails.rb

@@ -16,11 +16,7 @@ module Sass
     # as well as the controller prefix for the view being generated.
     class Rails < Base
       # Creates a new Rails importer that imports files as Rails views.
-      #
-      # @param lookup_context [ActionView::LookupContext] The Rails view finder.
-      def initialize(lookup_context)
-        @lookup_context = lookup_context
-      end
+      def initialize; end
 
       # @see Base#find_relative
       def find_relative(uri, base, options)
@@ -35,11 +31,17 @@ module Sass
       # @see Base#mtime
       def mtime(uri, options)
         return unless template =
-          find_template(uri, nil, !:partial) ||
-          find_template(uri, nil, :partial)
+          find_template(uri, nil, !:partial, options) ||
+          find_template(uri, nil, :partial, options)
         template.updated_at
       end
 
+      # @see Base#key
+      def key(uri, options)
+        [self.class.name + ":" + uri.split('/')[0...-1].join('/'),
+          uri.split('/')[-1] + "." + options[:syntax].to_s]
+      end
+
       # @see Base#to_s
       def to_s
         "(Rails importer)"
@@ -49,13 +51,13 @@ module Sass
 
       def find_(uri, prefix, options)
         prepare_template(
-          find_template(uri, prefix, !:partial) ||
-            find_template(uri, prefix, :partial),
+          find_template(uri, prefix, !:partial, options) ||
+            find_template(uri, prefix, :partial, options),
           options)
       end
 
-      def find_template(uri, prefix, partial)
-        return @lookup_context.
+      def find_template(uri, prefix, partial, options)
+        return options[:_rails_lookup_context].
           find_all(uri, prefix, partial).
           find {|t| t.handler.is_a?(Sass::Plugin::TemplateHandler)}
       end

data/lib/sass/plugin/rails.rb

@@ -6,7 +6,8 @@ unless defined?(Sass::RAILS_LOADED)
     def default_options
       opts = {
         :quiet             => Sass::Util.rails_env != "production",
-        :full_exception    => Sass::Util.rails_env != "production"
+        :full_exception    => Sass::Util.rails_env != "production",
+        :cache_location    => Sass::Util.rails_root + '/tmp/sass-cache'
       }
 
       if Sass::Util.ap_geq?('3.1.0.beta')
@@ -16,7 +17,6 @@ unless defined?(Sass::RAILS_LOADED)
           :always_update      => false,
           :template_location => Sass::Util.rails_root + '/public/stylesheets/sass',
           :css_location      => Sass::Util.rails_root + '/public/stylesheets',
-          :cache_location    => Sass::Util.rails_root + '/tmp/sass-cache',
           :always_check      => Sass::Util.rails_env == "development")
       end
 
@@ -40,14 +40,13 @@ unless defined?(Sass::RAILS_LOADED)
       def handles_encoding?; true; end
 
       def call(template, view)
-        rails_importer = Sass::Importers::Rails.new(view.lookup_context)
         engine = Sass::Engine.new(template.source,
           Sass::Plugin.engine_options.merge(
-            :cache => false,
             :syntax => @syntax,
             :filename => template.virtual_path,
-            :importer => rails_importer,
-            :load_paths => [rails_importer] + Sass::Plugin.engine_options[:load_paths]))
+            :_rails_lookup_context => view.lookup_context,
+            :importer => Sass::Importers::Rails.new,
+            :load_paths => [Sass::Importers::Rails.new] + Sass::Plugin.engine_options[:load_paths]))
 
         template.data[:sass_importers] = engine.dependencies.map do |e|
           [e.options[:filename], e.options[:importer]]
@@ -64,7 +63,7 @@ unless defined?(Sass::RAILS_LOADED)
         <<RUBY
 begin
   if Sass::Plugin::TemplateHandler.dependencies_changed?(
-      @_template.data[:sass_importers], #{Time.now.to_i})
+      @_template.data[:sass_importers], #{Time.now.to_i}, lookup_context)
     @_template.expire!
     @_template.rerender(self)
   else
@@ -77,8 +76,8 @@ end
 RUBY
       end
 
-      def self.dependencies_changed?(deps, since)
-        opts = Sass::Plugin.engine_options.merge(:cache => false)
+      def self.dependencies_changed?(deps, since, lookup_context)
+        opts = Sass::Plugin.engine_options.merge(:_rails_lookup_context => lookup_context)
         deps.any? do |d, i|
           return true unless time = i.mtime(d, opts)
           time.to_i > since
@@ -86,8 +85,8 @@ RUBY
       end
 
       def self.munge_exception(e, lookup_context)
-        importer = Sass::Importers::Rails.new(lookup_context)
-        opts = Sass::Plugin.engine_options.merge(:cache => false)
+        importer = Sass::Importers::Rails.new
+        opts = Sass::Plugin.engine_options.merge(:_rails_lookup_context => lookup_context)
         e.sass_backtrace.each do |bt|
           next unless engine = importer.find(bt[:filename], opts)
           bt[:filename] = engine.options[:_rails_filename]

data/lib/sass/tree/if_node.rb

@@ -36,6 +36,25 @@ module Sass::Tree
       self.else.options = options if self.else
     end
 
+    # @see Node#_around_dump
+    def _around_dump
+      old_else = @else
+      old_last_else = @last_else
+      @else = Sass::Util.dump(@else)
+      @last_else = (self == @last_else ? nil : Sass::Util.dump(@last_else))
+      super
+    ensure
+      @else = old_else
+      @last_else = old_last_else
+    end
+
+    # @see Node#_after_load
+    def _after_load
+      super
+      @else = Sass::Util.load(@else)
+      @last_else = (@last_else ? Sass::Util.load(@last_else) : self)
+    end
+
     protected
 
     # @see Node#to_src

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.40
+  version: 3.1.0.alpha.41
 platform: ruby
 authors: 
 - Nathan Weizenbaum