Merge branch 'stable'

Conflicts:
	lib/sass/selector/sequence.rb
	test/sass/scss/scss_test.rb

Rakefile

@@ -24,7 +24,7 @@ end
 # Don't use Rake::GemPackageTast because we want prerequisites to run
 # before we load the gemspec.
 desc "Build all the packages."
-task :package => [:revision_file, :submodules, :permissions] do
+task :package => [:revision_file, :date_file, :submodules, :permissions] do
   version = get_version
   File.open(scope('VERSION'), 'w') {|f| f.puts(version)}
   load scope('sass.gemspec')
@@ -63,8 +63,17 @@ task :revision_file do
   end
 end
 
+task :date_file do
+  File.open(scope('VERSION_DATE'), 'w') do |f|
+    f.puts Time.now.utc.strftime('%d %B %Y %T %Z')
+  end
+end
+
 # We also need to get rid of this file after packaging.
-at_exit { File.delete(scope('REVISION')) rescue nil }
+at_exit do
+  File.delete(scope('REVISION')) rescue nil
+  File.delete(scope('VERSION_DATE')) rescue nil
+end
 
 desc "Install Sass as a gem. Use SUDO=1 to install with sudo."
 task :install => [:package] do

doc-src/SASS_CHANGELOG.md

@@ -185,6 +185,11 @@ This will not print a warning.
 
 * Preserve single-line comments that are embedded within multi-line comments.
 
+* Preserve newlines in nested selectors when those selectors are used multiple
+  times in the same document.
+
+* Allow tests to be run without the `LANG` environment variable set.
+
 * Update the bundled version of [Listen](https://github.com/guard/listen) to
   0.4.7.
 

lib/sass/selector/sequence.rb

@@ -46,15 +46,15 @@ def initialize(seqs_and_ops)
       # @return [Sequence] This selector, with parent references resolved
       # @raise [Sass::SyntaxError] If a parent selector is invalid
       def resolve_parent_refs(super_seq)
-        members = @members
+        members = @members.dup
         nl = (members.first == "\n" && members.shift)
         unless members.any? do |seq_or_op|
             seq_or_op.is_a?(SimpleSequence) && seq_or_op.members.first.is_a?(Parent)
           end
-          members = []
+          old_members, members = members, []
           members << nl if nl
           members << SimpleSequence.new([Parent.new], false)
-          members += @members
+          members += old_members
         end
 
         Sequence.new(

lib/sass/version.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 # This is necessary for loading Sass when Haml is required in Rails 3.
 # Once the split is complete, we can remove it.
 require File.dirname(__FILE__) + '/../sass'
@@ -16,13 +18,15 @@ module Version
     # The `:name` key has the name of the version.
     # The `:string` key contains a human-readable string representation of the version.
     # The `:number` key is the major, minor, and teeny keys separated by periods.
+    # The `:date` key, which is not guaranteed to be defined, is the [DateTime] at which this release was cut.
     # If Sass is checked out from Git, the `:rev` key will have the revision hash.
     # For example:
     #
     #     {
     #       :string => "2.1.0.9616393",
     #       :rev    => "9616393b8924ef36639c7e82aa88a51a24d16949",
     #       :number => "2.1.0",
+    #       :date   => DateTime.parse("Apr 30 13:52:01 2009 -0700"),
     #       :major  => 2, :minor => 1, :teeny => 0
     #     }
     #
@@ -36,6 +40,7 @@ module Version
     #     {
     #       :string => "3.0.beta.1",
     #       :number => "3.0.beta.1",
+    #       :date   => DateTime.parse("Mar 31 00:38:04 2010 -0700"),
     #       :major => 3, :minor => 0, :teeny => -1,
     #       :prerelease => "beta",
     #       :prerelease_number => 1
@@ -55,6 +60,10 @@ def version
         :name => name
       }
 
+      if date = version_date
+        @@version[:date] = date
+      end
+
       if numbers[3].is_a?(String)
         @@version[:teeny] = -1
         @@version[:prerelease] = numbers[3]
@@ -101,6 +110,11 @@ def revision_number
       end
       return nil
     end
+
+    def version_date
+      return unless File.exists?(scope('VERSION_DATE'))
+      return DateTime.parse(File.read(scope('VERSION_DATE')).strip)
+    end
   end
 
   extend Sass::Version

test/sass/scss/scss_test.rb

@@ -1357,6 +1357,27 @@ def test_reference_combinator_with_parent_ref
 SCSS
   end
 
+  def test_newline_selector_rendered_multiple_times
+    assert_equal <<CSS, render(<<SCSS)
+form input,
+form select {
+  color: white; }
+
+form input,
+form select {
+  color: white; }
+CSS
+@for $i from 1 through 2 {
+  form {
+    input,
+    select {
+      color: white;
+    }
+  }
+}
+SCSS
+  end
+
   def test_prop_name_interpolation_after_hyphen
     assert_equal <<CSS, render(<<SCSS)
 a {

test/test_helper.rb

@@ -7,6 +7,7 @@
 require 'mathn' if ENV['MATHN'] == 'true'
 
 Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
+Encoding.default_external = 'UTF-8' if defined?(Encoding)
 
 module Sass::Script::Functions
   def option(name)