sass 3.3.6 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ebb0ff4acc7bb742ad25e99839228582145f498
-  data.tar.gz: 9cbece862e1858dfccb32123986e2866951ee2ca
+  metadata.gz: 3056f55a693a030fff05f6e9cdb3c828c4092823
+  data.tar.gz: 03510d67bb0d7206043ba4fd8ea0f056f036b970
 SHA512:
-  metadata.gz: 11bf00f275bb42c48f4c1a1bed1066f025bf613e4f07d90065cb59c5879734e6cdd759232b01e810a4180c9d81ed4a093aa687b72fa8fdb5259d30b867ad47b7
-  data.tar.gz: e45333b121ba8f5c042d8fbdc27fe1ec564ec89b9b0e30f414220b93f357b697460abec18b471c8b13f6b0d442b52890861beeda68b888bfa9108ba24fe894e8
+  metadata.gz: 890d0f4b3049a3cad64dfb4aa70ce63b4cbc29d32fcb510f92c2d0dfd23a15f7c438f86fcbc865ecd3035df1e3019cf3225c63cedcb17a692d6597eb9c5e955e
+  data.tar.gz: d550673bc5cbd178c362aa1389ef22aadce524127a9016f0b11299cffd19eccb13af568b8b67f3b56f27698dd60baee9a2daaaf1685be2872a1afdcca1ff3871

data/VERSION

@@ -1 +1 @@
-3.3.6
+3.3.7

data/VERSION_DATE

@@ -1 +1 @@
-26 April 2014 01:17:48 UTC
+03 May 2014 00:22:30 UTC

data/lib/sass/plugin.rb

@@ -123,9 +123,9 @@ module Sass
   end
 end
 
-# On Rails 3+ the rails plugin is loaded at the right time in railtie.rb
-if defined?(ActionController) && !Sass::Util.ap_geq_3?
-  require 'sass/plugin/rails'
+if defined?(ActionController)
+  # On Rails 3+ the rails plugin is loaded at the right time in railtie.rb
+  require 'sass/plugin/rails' unless Sass::Util.ap_geq_3?
 elsif defined?(Merb::Plugins)
   require 'sass/plugin/merb'
 else

data/lib/sass/script/lexer.rb

@@ -370,7 +370,7 @@ MESSAGE
         return unless str
         c = str.count("\n")
         @line += c
-        @offset = (c == 0 ? @offset + str.size : str.size - str.rindex("\n") + 1)
+        @offset = (c == 0 ? @offset + str.size : str.size - str.rindex("\n"))
         str
       end
 

data/lib/sass/script/parser.rb

@@ -226,8 +226,8 @@ module Sass
                   return other_interp
                 end
 
-                start_pos = source_position
-                e = node(Tree::Operation.new(e, assert_expr(#{sub.inspect}), tok.type), start_pos)
+                e = node(Tree::Operation.new(e, assert_expr(#{sub.inspect}), tok.type),
+                         e.source_range.start_pos)
               end
               e
             end

data/lib/sass/scss/parser.rb

@@ -1235,7 +1235,7 @@ MESSAGE
 
         unless name
           # Display basic regexps as plain old strings
-          source = rx.source.gsub(%r{\\/}, '/')
+          source = rx.source.gsub(/\\\//, '/')
           string = rx.source.gsub(/\\(.)/, '\1')
           name = source == Regexp.escape(string) ? string.inspect : rx.inspect
         end

data/test/sass/source_map_test.rb

@@ -748,6 +748,18 @@ SASS
   {{6}}name{{/6}}: {{7}}value{{/7}};
   {{8}}name{{/8}}: {{9}}value{{/9}}; }
 
+/*# sourceMappingURL=test.css.map */
+CSS
+  end
+
+  def test_multiline_script_scss
+    assert_parses_with_mapping <<SCSS, <<CSS, :syntax => :scss
+$var: {{3}}foo +
+    bar{{/3}}; {{1}}x {{/1}}{ {{2}}y{{/2}}: $var }
+SCSS
+{{1}}x{{/1}} {
+  {{2}}y{{/2}}: {{3}}foobar{{/3}}; }
+
 /*# sourceMappingURL=test.css.map */
 CSS
   end
@@ -810,11 +822,18 @@ CSS
 
   def assert_positions_equal(expected, actual, lines, message = nil)
     prefix = message ? message + ": " : ""
+    expected_location = lines[expected.line - 1] + "\n" + ("-" * (expected.offset - 1)) + "^"
+    actual_location = lines[actual.line - 1] + "\n" + ("-" * (actual.offset - 1)) + "^"
     assert_equal(expected.line, actual.line, prefix +
-      "Expected #{expected.inspect} but was #{actual.inspect}")
+      "Expected #{expected.inspect}\n" +
+      expected_location + "\n\n" +
+      "But was #{actual.inspect}\n" +
+      actual_location)
     assert_equal(expected.offset, actual.offset, prefix +
-      "Expected #{expected.inspect} but was #{actual.inspect}\n" +
-      lines[actual.line - 1] + "\n" + ("-" * (actual.offset - 1)) + "^")
+      "Expected #{expected.inspect}\n" +
+      expected_location + "\n\n" +
+      "But was #{actual.inspect}\n" +
+      actual_location)
   end
 
   def assert_ranges_equal(expected, actual, lines, prefix)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.3.6
+  version: 3.3.7
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard