sass 3.2.0.alpha.91 → 3.2.0.alpha.93

data/REVISION

@@ -1 +1 @@
-0f20305d2c2cff846f830634070e60bdb790e903
+f19a88c02e1ac7a174ad2ada5cab276a5084fb2e

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.91
+3.2.0.alpha.93

data/lib/sass/media.rb

@@ -171,9 +171,9 @@ module Sass::Media
     # @return [String]
     def to_src(options)
       src = ''
-      src << Sass::Media._interp_or_var_to_src(modifier, options)
+      src << Sass::Media._interp_to_src(modifier, options)
       src << ' ' unless modifier.empty?
-      src << Sass::Media._interp_or_var_to_src(type, options)
+      src << Sass::Media._interp_to_src(type, options)
       src << ' and ' unless type.empty? || expressions.empty?
       src << expressions.map {|e| e.to_src(options)}.join(' and ')
       src
@@ -205,7 +205,7 @@ module Sass::Media
   class Expression
     # The name of the feature being queried for.
     #
-    # @return [Array<String, Sass::Script::Node>]
+    # @return [Sass::Script::Node]
     attr_accessor :name
 
     # The name of the feature after any SassScript has been resolved.
@@ -225,7 +225,7 @@ module Sass::Media
     # @return [String]
     attr_accessor :resolved_value
 
-    # @param name [Array<String, Sass::Script::Node>] See \{#name}
+    # @param name [Sass::Script::Node] See \{#name}
     # @param value [Sass::Script::Node] See \{#value}
     def initialize(name, value)
       @name = name
@@ -239,7 +239,7 @@ module Sass::Media
     #   An interpolation array to perform.
     # @yieldreturn [String] The interpolated value.
     def perform
-      @resolved_name = yield name
+      @resolved_name = yield name ? [name] : []
       @resolved_value = yield value ? [value] : []
     end
 
@@ -260,7 +260,7 @@ module Sass::Media
     # @return [String]
     def to_src(options)
       src = '('
-      src << Sass::Media._interp_or_var_to_src(name, options)
+      src << name.to_sass(options)
       src << ': ' << value.to_sass(options) if value
       src << ')'
       src
@@ -270,28 +270,24 @@ module Sass::Media
     #
     # @return [Expression]
     def deep_copy
-      Expression.new(
-        name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
-        value && value.deep_copy)
+      Expression.new(name.deep_copy, value && value.deep_copy)
     end
 
     # Sets the options hash for the script nodes in the expression.
     #
     # @param options [{Symbol => Object}] The options has to set.
     def options=(options)
-      name.each {|n| n.options = options if n.is_a?(Sass::Script::Node)}
+      name.options = options
       value.options = options if value
     end
   end
 
-  # Converts an interpolation array that may represent a single variable to source.
+  # Converts an interpolation array to source.
   #
   # @param [Array<String, Sass::Script::Node>] The interpolation array to convert.
   # @param options [{Symbol => Object}] An options hash (see {Sass::CSS#initialize}).
   # @return [String]
-  def self._interp_or_var_to_src(interp, options)
-    interp = interp.reject {|v| v.is_a?(String) && v.empty?}
-    return interp[0].to_sass(options) if interp.length == 1 && interp[0].is_a?(Sass::Script::Variable)
+  def self._interp_to_src(interp, options)
     interp.map do |r|
       next r if r.is_a?(String)
       "\#{#{r.to_sass(options)}}"

data/lib/sass/scss/parser.rb

@@ -344,9 +344,9 @@ module Sass
       end
 
       def media_query
-        if ident1 = interp_ident_or_var
+        if ident1 = interp_ident
           ss
-          ident2 = interp_ident_or_var
+          ident2 = interp_ident
           ss
           if ident2 && ident2.length == 1 && ident2[0].is_a?(String) && ident2[0].downcase == 'and'
             query = Sass::Media::Query.new([], ident1, [])
@@ -380,9 +380,7 @@ module Sass
       def media_expr
         return unless tok(/\(/)
         ss
-        @expected = "media feature (e.g. min-device-width, color)"
-        name = expr!(:interp_ident_or_var)
-        ss
+        name = sass_script(:parse)
 
         if tok(/:/)
           ss; value = sass_script(:parse)

data/test/sass/conversion_test.rb

@@ -1163,14 +1163,14 @@ $baz: 12;
 SCSS
   end
 
-  def test_media_with_variables
+  def test_media_with_expressions
     assert_renders <<SASS, <<SCSS
 $media1: screen
 $media2: print
 $var: -webkit-min-device-pixel-ratio
 $val: 20
 
-@media $media1 and ($var: $val), only $media2
+@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
   a: b
 SASS
 $media1: screen;
@@ -1178,7 +1178,7 @@ $media2: print;
 $var: -webkit-min-device-pixel-ratio;
 $val: 20;
 
-@media $media1 and ($var: $val), only $media2 {
+@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2} {
   a: b;
 }
 SCSS

data/test/sass/engine_test.rb

@@ -634,12 +634,12 @@ SASS
 
   def test_import_with_dynamic_media_query
     assert_equal(<<CSS, render(<<SASS))
-@import "foo" print and (-webkit-min-device-pixel-ratio: 20);
+@import "foo" print and (-webkit-min-device-pixel-ratio-foo: 25);
 CSS
 $media: print
 $key: -webkit-min-device-pixel-ratio
 $value: 20
-@import "foo" $media and ($key: $value)
+@import "foo" \#{$media} and ($key + "-foo": $value + 5)
 SASS
   end
 
@@ -2227,14 +2227,14 @@ SASS
 
   def test_variables_in_media
     assert_equal <<CSS, render(<<SASS)
-@media screen and (-webkit-min-device-pixel-ratio: 20), only print {
+@media screen and (-webkit-min-device-pixel-ratio-foo: 25), only print {
   a: b; }
 CSS
 $media1: screen
 $media2: print
 $var: -webkit-min-device-pixel-ratio
 $val: 20
-@media $media1 and ($var: $val), only $media2
+@media \#{$media1} and ($var + "-foo": $val + 5), only \#{$media2}
   a: b
 SASS
   end

data/test/sass/scss/scss_test.rb

@@ -276,12 +276,12 @@ SCSS
 
   def test_dynamic_media_import
     assert_equal(<<CSS, render(<<SCSS))
-@import "foo" print and (-webkit-min-device-pixel-ratio: 20);
+@import "foo" print and (-webkit-min-device-pixel-ratio-foo: 25);
 CSS
 $media: print;
 $key: -webkit-min-device-pixel-ratio;
 $value: 20;
-@import "foo" $media and ($key: $value);
+@import "foo" \#{$media} and ($key + "-foo": $value + 5);
 SCSS
   end
 
@@ -914,7 +914,7 @@ $media1: screen;
 $media2: print;
 $var: -webkit-min-device-pixel-ratio;
 $val: 20;
-@media $media1 and ($var: $val), only $media2 {a: b}
+@media \#{$media1} and ($var: $val), only \#{$media2} {a: b}
 SCSS
 
     assert_equal <<CSS, render(<<SCSS)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592303019
+  hash: 592303015
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 91
-  version: 3.2.0.alpha.91
+  - 93
+  version: 3.2.0.alpha.93
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-01 00:00:00 -05:00
+date: 2012-03-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -150,9 +150,7 @@ files:
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/content_node.rb
-- lib/sass/tree/css_import_node.rb
 - lib/sass/tree/variable_node.rb
-- lib/sass/tree/warn_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
 - lib/sass/tree/visitors/convert.rb
@@ -161,7 +159,9 @@ files:
 - lib/sass/tree/visitors/perform.rb
 - lib/sass/tree/visitors/set_options.rb
 - lib/sass/tree/visitors/to_css.rb
+- lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/css_import_node.rb
 - lib/sass/tree/trace_node.rb
 - lib/sass/media.rb
 - lib/sass/util/multibyte_string_scanner.rb