sass 3.2.0.alpha.277 → 3.2.0.alpha.278

data/REVISION

@@ -1 +1 @@
-4b0ad099f2e46bb7a014a8b841a0ed089d1b4416
+daf44b6e5e3a25e1fadb77a4161ffe27edea74ab

data/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

data/VERSION

@@ -1 +1 @@
-3.2.0.alpha.277
+3.2.0.alpha.278

data/VERSION_DATE

@@ -0,0 +1 @@
+04 August 2012 00:02:51 GMT

data/lib/sass/selector/sequence.rb

@@ -46,15 +46,15 @@ module Sass
       # @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(

data/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,6 +18,7 @@ module Sass
     # 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:
     #
@@ -23,6 +26,7 @@ module Sass
     #       :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 Sass
     #     {
     #       :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 @@ module Sass
         :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 @@ module Sass
       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

data/test/sass/scss/scss_test.rb

@@ -1357,6 +1357,27 @@ a {& /foo/ b {c: d}}
 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 {

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require 'sass'
 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)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302391
+  hash: 592302385
   prerelease: 6
   segments: 
   - 3
   - 2
   - 0
   - alpha
-  - 277
-  version: 3.2.0.alpha.277
+  - 278
+  version: 3.2.0.alpha.278
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-27 00:00:00 -04:00
+date: 2012-08-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -132,7 +132,7 @@ files:
 - lib/sass/selector/simple.rb
 - lib/sass/selector/simple_sequence.rb
 - lib/sass/shared.rb
-- lib/sass/supports.rb
+- lib/sass/version.rb
 - lib/sass/tree/charset_node.rb
 - lib/sass/tree/comment_node.rb
 - lib/sass/tree/directive_node.rb
@@ -169,7 +169,7 @@ files:
 - lib/sass/tree/trace_node.rb
 - lib/sass/util/multibyte_string_scanner.rb
 - lib/sass/util/subset_map.rb
-- lib/sass/version.rb
+- lib/sass/supports.rb
 - vendor/listen/CHANGELOG.md
 - vendor/listen/Gemfile
 - vendor/listen/Guardfile
@@ -242,7 +242,7 @@ files:
 - test/sass/results/import_charset.css
 - test/sass/results/import_charset_1_8.css
 - test/sass/results/import_charset_ibm866.css
-- test/sass/results/import_content.css
+- test/sass/results/filename_fn.css
 - test/sass/results/line_numbers.css
 - test/sass/results/mixins.css
 - test/sass/results/multiline.css
@@ -257,7 +257,7 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
-- test/sass/results/filename_fn.css
+- test/sass/results/import_content.css
 - test/sass/script_conversion_test.rb
 - test/sass/test_helper.rb
 - test/sass/scss/css_test.rb
@@ -267,7 +267,7 @@ files:
 - test/sass/templates/_double_import_loop2.sass
 - test/sass/templates/_imported_charset_ibm866.sass
 - test/sass/templates/_imported_charset_utf8.sass
-- test/sass/templates/_imported_content.sass
+- test/sass/templates/_filename_fn_import.scss
 - test/sass/templates/_partial.sass
 - test/sass/templates/alt.sass
 - test/sass/templates/basic.sass
@@ -285,7 +285,7 @@ files:
 - test/sass/templates/import_charset.sass
 - test/sass/templates/import_charset_1_8.sass
 - test/sass/templates/import_charset_ibm866.sass
-- test/sass/templates/import_content.sass
+- test/sass/templates/filename_fn.scss
 - test/sass/templates/importee.less
 - test/sass/templates/importee.sass
 - test/sass/templates/line_numbers.sass
@@ -311,8 +311,8 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
-- test/sass/templates/_filename_fn_import.scss
-- test/sass/templates/filename_fn.scss
+- test/sass/templates/_imported_content.sass
+- test/sass/templates/import_content.sass
 - test/sass/util_test.rb
 - test/sass/util/multibyte_string_scanner_test.rb
 - test/sass/util/subset_map_test.rb
@@ -327,6 +327,7 @@ files:
 - VERSION
 - VERSION_NAME
 - REVISION
+- VERSION_DATE
 has_rdoc: true
 homepage: http://sass-lang.com/
 licenses: []