sass 3.3.0.alpha.369 → 3.3.0.alpha.370

data/REVISION

@@ -1 +1 @@
-da95ceeed652f28309ed53519113914945473558
+cc1787dbfd5db4c5ecb498d6be100336c8e23ef0

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.369
+3.3.0.alpha.370

data/VERSION_DATE

@@ -1 +1 @@
-08 October 2013 21:16:33 GMT
+08 October 2013 21:30:40 GMT

data/lib/sass/environment.rb

@@ -103,7 +103,7 @@ module Sass
     # @return [Selector::CommaSequence?] The current selector, with any
     #   nesting fully resolved.
     def selector
-      parent_selector = caller ? caller.selector : (@parent && @parent.selector)
+      parent_selector = @caller ? @caller.selector : (@parent && @parent.selector)
       return parent_selector unless @selector
       return @selector.resolve_parent_refs(parent_selector) if parent_selector
       @selector

data/test/sass/scss/scss_test.rb

@@ -2105,6 +2105,23 @@ CSS
 SCSS
   end
 
+  def test_at_root_with_at_root_through_mixin
+    assert_equal(<<CSS, render(<<SCSS))
+.bar-baz {
+  a: b; }
+CSS
+@mixin foo {
+  .bar {
+    @at-root \#{&}-baz {
+      a: b;
+    }
+  }
+}
+
+@include foo;
+SCSS
+  end
+
   ## Errors
 
   def test_nested_mixin_def_is_scoped

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302575
+  hash: 592302569
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 369
-  version: 3.3.0.alpha.369
+  - 370
+  version: 3.3.0.alpha.370
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -209,6 +209,7 @@ files:
 - bin/sass-convert
 - bin/scss
 - test/Gemfile.lock
+- test/test_helper.rb
 - test/sass/cache_test.rb
 - test/sass/callbacks_test.rb
 - test/sass/conversion_test.rb
@@ -328,7 +329,6 @@ files:
 - test/sass/util/subset_map_test.rb
 - test/sass/source_map_test.rb
 - test/sass/value_helpers_test.rb
-- test/test_helper.rb
 - extra/update_watch.rb
 - Rakefile
 - init.rb