sass 3.2.0.alpha.59 → 3.2.0.alpha.60

data/REVISION

@@ -1 +1 @@
-77d6cfe978e5d2d28ee6126e207e19b86b661c27
+3b7b3977a280d7117d185295abde521a6860f893

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.59
+3.2.0.alpha.60

data/lib/sass/engine.rb

@@ -224,7 +224,7 @@ module Sass
     # If you're compiling a single Sass file from the filesystem,
     # use \{Sass::Engine.for\_file}.
     # If you're compiling multiple files from the filesystem,
-    # use {Sass::Plugin}.
+    # use {Sass::Plugin.
     #
     # @param template [String] The Sass template.
     #   This template can be encoded using any encoding

data/lib/sass/media.rb

@@ -51,20 +51,6 @@ module Sass::Media
     def to_src(options)
       queries.map {|q| q.to_src(options)}.join(', ')
     end
-
-    # Returns a deep copy of this query list and all its children.
-    #
-    # @return [QueryList]
-    def deep_copy
-      QueryList.new(queries.map {|q| q.deep_copy})
-    end
-
-    # Sets the options hash for the script nodes in the media query.
-    #
-    # @param options [{Symbol => Object}] The options has to set.
-    def options=(options)
-      queries.each {|q| q.options = options}
-    end
   end
 
   # A single media query.
@@ -178,25 +164,6 @@ module Sass::Media
       src << expressions.map {|e| e.to_src(options)}.join(' and ')
       src
     end
-
-    # Returns a deep copy of this query and all its children.
-    #
-    # @return [Query]
-    def deep_copy
-      Query.new(
-        modifier.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
-        type.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
-        expressions.map {|q| q.deep_copy})
-    end
-
-    # Sets the options hash for the script nodes in the media query.
-    #
-    # @param options [{Symbol => Object}] The options has to set.
-    def options=(options)
-      modifier.each {|m| m.options = options if m.is_a?(Sass::Script::Node)}
-      type.each {|t| t.options = options if t.is_a?(Sass::Script::Node)}
-      expressions.each {|e| e.options = options}
-    end
   end
 
   # A media query expression.
@@ -265,23 +232,6 @@ module Sass::Media
       src << ')'
       src
     end
-
-    # Returns a deep copy of this expression.
-    #
-    # @return [Expression]
-    def deep_copy
-      Expression.new(
-        name.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c},
-        value.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c})
-    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)}
-      value.each {|v| v.options = options if v.is_a?(Sass::Script::Node)}
-    end
   end
 
   # Converts an interpolation array that may represent a single variable to source.

data/lib/sass/script/funcall.rb

@@ -36,7 +36,7 @@ module Sass
       # @return [String] A string representation of the function call
       def inspect
         args = @args.map {|a| a.inspect}.join(', ')
-        keywords = Sass::Util.hash_to_a(@keywords).
+        keywords = @keywords.sort_by {|k, v| k}.
             map {|k, v| "$#{k}: #{v.inspect}"}.join(', ')
         "#{name}(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords})"
       end
@@ -44,7 +44,7 @@ module Sass
       # @see Node#to_sass
       def to_sass(opts = {})
         args = @args.map {|a| a.to_sass(opts)}.join(', ')
-        keywords = Sass::Util.hash_to_a(@keywords).
+        keywords = @keywords.sort_by {|k, v| k}.
           map {|k, v| "$#{dasherize(k, opts)}: #{v.to_sass(opts)}"}.join(', ')
         "#{dasherize(name, opts)}(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords})"
       end

data/lib/sass/script/literal.rb

@@ -55,6 +55,26 @@ The #options attribute is not set on this #{self.class}.
 MSG
     end
 
+    # The SassScript `and` operation.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Literal] The result of a logical and:
+    #   `other` if this literal isn't a false {Bool},
+    #   and this literal otherwise
+    def and(other)
+      to_bool ? other : self
+    end
+
+    # The SassScript `or` operation.
+    #
+    # @param other [Literal] The right-hand side of the operator
+    # @return [Literal] The result of the logical or:
+    #   this literal if it isn't a false {Bool},
+    #   and `other` otherwise
+    def or(other)
+      to_bool ? self : other
+    end
+
     # The SassScript `==` operation.
     # **Note that this returns a {Sass::Script::Bool} object,
     # not a Ruby boolean**.

data/lib/sass/script/operation.rb

@@ -72,14 +72,6 @@ module Sass::Script
     # @raise [Sass::SyntaxError] if the operation is undefined for the operands
     def _perform(environment)
       literal1 = @operand1.perform(environment)
-
-      # Special-case :and and :or to support short-circuiting.
-      if @operator == :and
-        return literal1.to_bool ? @operand2.perform(environment) : literal1
-      elsif @operator == :or
-        return literal1.to_bool ? literal1 : @operand2.perform(environment)
-      end
-
       literal2 = @operand2.perform(environment)
 
       begin

data/lib/sass/selector.rb

@@ -379,7 +379,7 @@ module Sass
       attr_reader :selector
 
       # @param [String] The name of the pseudoclass
-      # @param [Selector::CommaSequence] The selector argument
+      # @param [Selector::Sequence] The selector argument
       def initialize(name, selector)
         @name = name
         @selector = selector

data/lib/sass/tree/visitors/convert.rb

@@ -168,8 +168,7 @@ class Sass::Tree::Visitors::Convert < Sass::Tree::Visitors::Base
   def visit_mixin(node)
     unless node.args.empty? && node.keywords.empty?
       args = node.args.map {|a| a.to_sass(@options)}.join(", ")
-      keywords = Sass::Util.hash_to_a(node.keywords).
-        map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
+      keywords = node.keywords.map {|k, v| "$#{dasherize(k)}: #{v.to_sass(@options)}"}.join(', ')
       arglist = "(#{args}#{', ' unless args.empty? || keywords.empty?}#{keywords})"
     end
     "#{tab_str}#{@format == :sass ? '+' : '@include '}#{dasherize(node.name)}#{arglist}#{node.has_children ? yield : semi}\n"

data/lib/sass/tree/visitors/deep_copy.rb

@@ -84,14 +84,4 @@ class Sass::Tree::Visitors::DeepCopy < Sass::Tree::Visitors::Base
     node.expr = node.expr.deep_copy
     yield
   end
-
-  def visit_directive(node)
-    node.value = node.value.map {|c| c.is_a?(Sass::Script::Node) ? c.deep_copy : c}
-    yield
-  end
-
-  def visit_media(node)
-    node.query = query.deep_copy
-    yield
-  end
 end

data/lib/sass/tree/visitors/perform.rb

@@ -247,8 +247,6 @@ END
   # Runs SassScript interpolation in the selector,
   # and then parses the result into a {Sass::Selector::CommaSequence}.
   def visit_rule(node)
-    rule = node.rule
-    rule = rule.map {|e| e.is_a?(String) && e != ' ' ? e.strip : e} if node.style == :compressed
     parser = Sass::SCSS::StaticParser.new(run_interp(node.rule), node.filename, node.line)
     node.parsed_rules ||= parser.parse_selector
     if node.options[:trace_selectors]
@@ -297,7 +295,6 @@ END
   end
 
   def visit_media(node)
-    node.query = node.query.deep_copy
     node.query.perform {|interp| run_interp(interp)}
     yield
   end

data/lib/sass/tree/visitors/set_options.rb

@@ -94,14 +94,4 @@ class Sass::Tree::Visitors::SetOptions < Sass::Tree::Visitors::Base
     node.expr.options = @options
     yield
   end
-
-  def visit_directive(node)
-    node.value.each {|c| c.options = @options if c.is_a?(Sass::Script::Node)}
-    yield
-  end
-
-  def visit_media(node)
-    node.query.options = @options
-    yield
-  end
 end

data/lib/sass/tree/visitors/to_css.rb

@@ -67,10 +67,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
   end
 
   def visit_directive(node)
-    was_in_directive = @in_directive
     return node.resolved_value + ";" unless node.has_children
     return node.resolved_value + " {}" if node.children.empty?
-    @in_directive = @in_directive || !node.is_a?(Sass::Tree::MediaNode)
     result = if node.style == :compressed
                "#{node.resolved_value}{"
              else
@@ -103,8 +101,6 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
                     else
                       (node.style == :expanded ? "\n" : " ") + "}\n"
                     end
-  ensure
-    @in_directive = was_in_directive
   end
 
   def visit_media(node)
@@ -137,11 +133,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       joined_rules = node.resolved_rules.members.map do |seq|
         next if seq.has_placeholder?
         rule_part = seq.to_a.join
-        if node.style == :compressed
-          rule_part.gsub!(/([^,])\s*\n\s*/m, '\1 ')
-          rule_part.gsub!(/\s*([,+>])\s*/m, '\1')
-          rule_part.strip!
-        end
+        rule_part.gsub!(/\s*([^,])\s*\n\s*/m, '\1 ') if node.style == :compressed
         rule_part
       end.compact.join(rule_separator)
 
@@ -153,7 +145,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
       old_spaces = '  ' * @tabs
       spaces = '  ' * (@tabs + 1)
       if node.style != :compressed
-        if node.options[:debug_info] && !@in_directive
+        if node.options[:debug_info]
           to_return << visit(debug_info_rule(node.debug_info, node.options)) << "\n"
         elsif node.options[:trace_selectors]
           to_return << "#{old_spaces}/* "
@@ -199,7 +191,7 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
 
   def debug_info_rule(debug_info, options)
     node = Sass::Tree::DirectiveNode.resolved("@media -sass-debug-info")
-    Sass::Util.hash_to_a(debug_info.map {|k, v| [k.to_s, v.to_s]}).each do |k, v|
+    debug_info.map {|k, v| [k.to_s, v.to_s]}.sort.each do |k, v|
       rule = Sass::Tree::RuleNode.new([""])
       rule.resolved_rules = Sass::Selector::CommaSequence.new(
         [Sass::Selector::Sequence.new(

data/lib/sass/util.rb

@@ -218,20 +218,6 @@ module Sass
       lcs_backtrace(lcs_table(x, y, &block), x, y, x.size-1, y.size-1, &block)
     end
 
-    # Converts a Hash to an Array. This is usually identical to `Hash#to_a`,
-    # with the following exceptions:
-    #
-    # * In Ruby 1.8, `Hash#to_a` is not deterministically ordered, but this is.
-    # * In Ruby 1.9 when running tests, this is ordered in the same way it would
-    #   be under Ruby 1.8 (sorted key order rather than insertion order).
-    #
-    # @param hash [Hash]
-    # @return [Array]
-    def hash_to_a(hash)
-      return has.to_a unless ruby1_8? || defined?(Test::Unit)
-      return hash.sort_by {|k, v| k}
-    end
-
     # Returns information about the caller of the previous method.
     #
     # @param entry [String] An entry in the `#caller` list, or a similarly formatted string

data/test/sass/engine_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/test_helper'
+require 'test_helper'
+require 'sass/test_helper'
 require 'sass/engine'
 require 'stringio'
 require 'mock_importer'
@@ -1028,23 +1028,6 @@ foo
 SASS
   end
 
-  def test_debug_info_in_keyframes
-    assert_equal(<<CSS, render(<<SASS, :debug_info => true))
-@-webkit-keyframes warm {
-  from {
-    color: black; }
-
-  to {
-    color: red; } }
-CSS
-@-webkit-keyframes warm
-  from
-    color: black
-  to
-    color: red
-SASS
-  end
-
   def test_empty_first_line
     assert_equal("#a {\n  b: c; }\n", render("#a\n\n  b: c"))
   end
@@ -2229,27 +2212,6 @@ SASS
 
   # Regression tests
 
-  def test_variable_in_media_in_mixin
-    assert_equal <<CSS, render(<<SASS)
-@media screen and (min-width: 10px) {
-  body {
-    background: red; } }
-@media screen and (min-width: 20px) {
-  body {
-    background: blue; } }
-CSS
-@mixin respond-to($width)
-  @media screen and (min-width: $width)
-    @content
-
-body
-  @include respond-to(10px)
-    background: red
-  @include respond-to(20px)
-    background: blue
-SASS
-  end
-
   def test_tricky_mixin_loop_exception
     render <<SASS
 @mixin foo($a)
@@ -2579,15 +2541,6 @@ CSS
 SASS
   end
 
-  def test_selector_compression
-    assert_equal <<CSS, render(<<SASS, :style => :compressed)
-a>b,c+d,:-moz-any(e,f,g){h:i}
-CSS
-a > b, c + d, :-moz-any(e, f, g)
-  h: i
-SASS
-  end
-
   # Encodings
 
   unless Sass::Util.ruby1_8?

data/test/sass/script_test.rb

@@ -432,11 +432,6 @@ SASS
     assert_raise_message(Sass::SyntaxError, "wrong number of arguments (1 for 0) for `arg-error'") {resolve("arg-error(1)")}
   end
 
-  def test_boolean_ops_short_circuit
-    assert_equal "false", resolve("$ie and $ie <= 7", {}, env('ie' => Sass::Script::Bool.new(false)))
-    assert_equal "true", resolve("$ie or $undef", {}, env('ie' => Sass::Script::Bool.new(true)))
-  end
-
   # Regression Tests
 
   def test_funcall_has_higher_precedence_than_color_name

data/test/sass/scss/scss_test.rb

@@ -1245,11 +1245,11 @@ SCSS
 
 
   def test_newlines_removed_from_selectors_when_compressed
-    assert_equal <<CSS, render(<<SCSS, :style => :compressed)
+    assert_equal <<CSS, render(<<SCSS, :style=>:compressed)
 z a,z b{display:block}
 CSS
-a
-, b {
+a,
+b {
   z & {
     display: block;
   }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302955
+  hash: 592302949
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 59
-  version: 3.2.0.alpha.59
+  - 60
+  version: 3.2.0.alpha.60
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 -05:00
+date: 2012-01-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,7 +86,6 @@ files:
 - lib/sass/logger.rb
 - lib/sass/logger/base.rb
 - lib/sass/logger/log_level.rb
-- lib/sass/util.rb
 - lib/sass/plugin.rb
 - lib/sass/plugin/compiler.rb
 - lib/sass/plugin/configuration.rb
@@ -134,7 +133,7 @@ files:
 - lib/sass/shared.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
-- lib/sass/tree/media_node.rb
+- lib/sass/tree/node.rb
 - lib/sass/tree/debug_node.rb
 - lib/sass/tree/directive_node.rb
 - lib/sass/tree/each_node.rb
@@ -143,15 +142,14 @@ files:
 - lib/sass/tree/function_node.rb
 - lib/sass/tree/if_node.rb
 - lib/sass/tree/import_node.rb
+- lib/sass/tree/media_node.rb
 - lib/sass/tree/mixin_def_node.rb
-- lib/sass/tree/node.rb
 - lib/sass/tree/mixin_node.rb
 - lib/sass/tree/prop_node.rb
 - lib/sass/tree/return_node.rb
 - lib/sass/tree/root_node.rb
 - lib/sass/tree/rule_node.rb
 - lib/sass/tree/content_node.rb
-- lib/sass/tree/trace_node.rb
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/visitors/base.rb
 - lib/sass/tree/visitors/check_nesting.rb
@@ -163,10 +161,12 @@ files:
 - lib/sass/tree/visitors/to_css.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
-- lib/sass/media.rb
+- lib/sass/tree/trace_node.rb
+- lib/sass/util.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb
+- lib/sass/media.rb
 - vendor/fssm/Gemfile
 - vendor/fssm/LICENSE
 - vendor/fssm/README.markdown