sass 3.1.0.alpha.217 → 3.1.0.alpha.218

data/REVISION

@@ -1 +1 @@
-3ee1e35e2dfa2c1f5c2a24ca5cc807700d249ced
+03e3ddbf0f214df543c3f570f24fea124017f6b4

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.217
+3.1.0.alpha.218

data/lib/sass/tree/if_node.rb

@@ -42,13 +42,16 @@ module Sass::Tree
     end
 
     def _dump(f)
-      Marshal.dump([self.expr, self.else])
+      Marshal.dump([self.expr, self.else, self.children])
     end
 
     def self._load(data)
-      expr, else_ = Marshal.load(data)
+      expr, else_, children = Marshal.load(data)
       node = IfNode.new(expr)
       node.else = else_
+      node.children = children
+      node.instance_variable_set('@last_else',
+        node.else ? node.else.instance_variable_get('@last_else') : node)
       node
     end
 

data/test/sass/plugin_test.rb

@@ -282,6 +282,16 @@ CSS
     Sass::Plugin.options[:always_update] = old_always_update
   end
 
+  def test_cached_if
+    set_plugin_opts :cache_store => Sass::CacheStores::Filesystem.new(tempfile_loc + '/cache')
+    update_all_stylesheets!
+    assert_renders_correctly 'if'
+    update_all_stylesheets!
+    assert_renders_correctly 'if'
+  ensure
+    set_plugin_opts :cache_store => @@cache_store
+  end
+
  private
 
   def assert_renders_correctly(*arguments)

data/test/sass/results/if.css

@@ -0,0 +1,3 @@
+a { branch: if; }
+
+b { branch: else; }

data/test/sass/templates/if.sass

@@ -0,0 +1,11 @@
+a
+  @if true
+    branch: if
+  @else
+    branch: else
+
+b
+  @if false
+    branch: if
+  @else
+    branch: else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.217
+  version: 3.1.0.alpha.218
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 -05:00
+date: 2011-01-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -215,6 +215,7 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
+- test/sass/results/if.css
 - test/sass/script_conversion_test.rb
 - test/sass/mock_importer.rb
 - test/sass/scss/css_test.rb
@@ -262,6 +263,7 @@ files:
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
 - test/sass/templates/nested_import.sass
+- test/sass/templates/if.sass
 - test/sass/test_helper.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb