sass 3.3.0.alpha.67 → 3.3.0.alpha.69

data/REVISION

@@ -1 +1 @@
-f2051741fd9b7025a9ad2a9601cabeaea16a9c35
+2ada675414fd60b696703b85500d3528d482c64a

data/VERSION

@@ -1 +1 @@
-3.3.0.alpha.67
+3.3.0.alpha.69

data/VERSION_DATE

@@ -1 +1 @@
-28 December 2012 21:03:29 GMT
+05 January 2013 02:52:38 GMT

data/lib/sass/engine.rb

@@ -426,7 +426,7 @@ ERR
       comment_tab_str = nil
       first = true
       lines = []
-      string.gsub(/\r|\n|\r\n|\r\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
+      string.gsub(/\r\n|\r|\n/, "\n").scan(/^[^\n]*?$/).each_with_index do |line, index|
         index += (@options[:line] || 1)
         if line.strip.empty?
           lines.last.text << "\n" if lines.last && lines.last.comment?

data/lib/sass/importers/filesystem.rb

@@ -115,6 +115,9 @@ module Sass
       # @param name [String] The filename to search for.
       # @return [(String, Symbol)] A filename-syntax pair.
       def find_real_file(dir, name, options)
+        # on windows 'dir' can be in native File::ALT_SEPARATOR form
+        dir = dir.gsub(File::ALT_SEPARATOR, File::SEPARATOR) unless File::ALT_SEPARATOR.nil?
+
         found = possible_files(remove_root(name)).map do |f, s|
           path = (dir == "." || Pathname.new(f).absolute?) ? f : "#{dir}/#{f}"
           Dir[path].map do |full_path|

data/lib/sass/selector/simple_sequence.rb

@@ -102,7 +102,7 @@ module Sass
           # seq is A, sels is B, and self is C
 
           self_without_sel = self.members - sels
-          group.each {|e, _| e.result = :failed_to_unify}
+          group.each {|e, _| e.result = :failed_to_unify unless e.result == :succeeded}
           next unless unified = seq.members.last.unify(self_without_sel, subject?)
           group.each {|e, _| e.result = :succeeded}
           group.each {|e, _| check_directives_match!(e, parent_directives)}

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

@@ -140,7 +140,7 @@ class Sass::Tree::Visitors::CheckNesting < Sass::Tree::Visitors::Base
   end
 
   def try_send(method, *args)
-    return unless respond_to?(method)
+    return unless respond_to?(method, true)
     send(method, *args)
   end
 end

data/lib/sass/util.rb

@@ -379,6 +379,7 @@ module Sass
     #
     # @param msg [String]
     def sass_warn(msg)
+      msg = msg + "\n" unless ruby1?
       Sass.logger.warn(msg)
     end
 
@@ -484,6 +485,13 @@ module Sass
 
     ## Cross-Ruby-Version Compatibility
 
+    # Whether or not this is running under a Ruby version under 2.0.
+    #
+    # @return [Boolean]
+    def ruby1?
+      Sass::Util::RUBY_VERSION[0] <= 1
+    end
+
     # Whether or not this is running under Ruby 1.8 or lower.
     #
     # Note that IronRuby counts as Ruby 1.8,

data/test/sass/engine_test.rb

@@ -2369,6 +2369,21 @@ SASS
 
   # Regression tests
 
+  def test_line_numbers_with_dos_line_endings
+    assert_equal <<CSS, render(<<SASS, :line_comments => true)
+/* line 5, test_line_numbers_with_dos_line_endings_inline.sass */
+.foo {
+  a: b; }
+CSS
+\r
+\r
+\r
+\r
+.foo
+  a: b
+SASS
+  end
+
   def test_variable_in_media_in_mixin
     assert_equal <<CSS, render(<<SASS)
 @media screen and (min-width: 10px) {

data/test/sass/extend_test.rb

@@ -1130,6 +1130,20 @@ SCSS
 
   # Regression Tests
 
+  def test_partially_failed_extend
+    assert_no_warning {assert_equal(<<CSS, render(<<SCSS))}
+.rc, test {
+  color: white; }
+
+.prices span.pill span.rc {
+  color: red; }
+CSS
+test { @extend .rc; }
+.rc {color: white;}
+.prices span.pill span.rc {color: red;}
+SCSS
+  end
+
   def test_newline_near_combinator
     assert_equal <<CSS, render(<<SCSS)
 .a +

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  hash: 592302987
+  hash: 592302983
   prerelease: 6
   segments: 
   - 3
   - 3
   - 0
   - alpha
-  - 67
-  version: 3.3.0.alpha.67
+  - 69
+  version: 3.3.0.alpha.69
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-28 00:00:00 -05:00
+date: 2013-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency