sass 3.4.3 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2247321bf696ce2fefd8b57e4312ddc885595cdc
-  data.tar.gz: 7267469a257cb4ee1447ced88ae5b7460ed2e8b6
+  metadata.gz: e3fbc042c02c52b18d59b25d9c26459658baf6cf
+  data.tar.gz: faf525b9b4f1837dc790d9fdae267d0ed729b41e
 SHA512:
-  metadata.gz: 4773c1e62448e7ebb59025e7525bf7ac16c3b74366201d311d07de749c6f43745cdf6114a9a0be7b1f8f5bdaf79d40db423d997bfa0f0f35812dc1c4902b149f
-  data.tar.gz: 0014b9b892d70af234d5f79d8828f0ce6dc5ac87e95f1dd1803f0b15073d30fabffecaba56b79498355e5af9bc408ff2627520056a614d64c5200a1257c791d7
+  metadata.gz: 6cd8dc8c85660b360845e47b15c78218a076558e6ce0e09bbb13b4a79d2c74a72563e974189d8db5be708c30c6f04877c467a959670179b7244c4d91cd8b7c87
+  data.tar.gz: 7cd31825c789bc5744514aac91d5346b952a2286c5ea148f1cb2c1471b34769fae3df30bab1d7ffa728bb07a774a9560732fb4acb011062e6e7694f5bf8ea244

data/VERSION

@@ -1 +1 @@
-3.4.3
+3.4.4

data/VERSION_DATE

@@ -1 +1 @@
-05 September 2014 01:13:33 UTC
+13 September 2014 00:20:07 UTC

data/lib/sass/engine.rb

@@ -1130,8 +1130,9 @@ WARNING
 
       return "/* */" if content.empty?
       content.last.gsub!(/ ?\*\/ *$/, '')
+      first = content.shift unless removed_first
       content.map! {|l| l.gsub!(/^\*( ?)/, '\1') || (l.empty? ? "" : " ") + l}
-      content.first.gsub!(/^ /, '') unless removed_first
+      content.unshift first unless removed_first
       if silent
         "/*" + content.join("\n *") + " */"
       else

data/lib/sass/exec/sass_scss.rb

@@ -370,8 +370,8 @@ MSG
       input.close if input.is_a?(File)
 
       if @options[:sourcemap] != :none && @options[:sourcemap_filename]
-        relative_sourcemap_path = Sass::Util.pathname(@options[:sourcemap_filename]).
-          relative_path_from(Sass::Util.pathname(@options[:output_filename]).dirname)
+        relative_sourcemap_path = Sass::Util.relative_path_from(
+          @options[:sourcemap_filename], Sass::Util.pathname(@options[:output_filename]).dirname)
         rendered, mapping = engine.render_with_sourcemap(relative_sourcemap_path.to_s)
         write_output(rendered, output)
         write_output(mapping.to_json(

data/lib/sass/importers/filesystem.rb

@@ -68,15 +68,14 @@ module Sass
 
       def public_url(name, sourcemap_directory)
         file_pathname = Sass::Util.cleanpath(Sass::Util.absolute_path(name, @root))
-        if sourcemap_directory.nil?
+        return Sass::Util.file_uri_from_path(file_pathname) if sourcemap_directory.nil?
+
+        sourcemap_pathname = Sass::Util.cleanpath(sourcemap_directory)
+        begin
+          Sass::Util.file_uri_from_path(
+            Sass::Util.relative_path_from(file_pathname, sourcemap_pathname))
+        rescue ArgumentError # when a relative path cannot be constructed
           Sass::Util.file_uri_from_path(file_pathname)
-        else
-          sourcemap_pathname = Sass::Util.cleanpath(sourcemap_directory)
-          begin
-            Sass::Util.file_uri_from_path(file_pathname.relative_path_from(sourcemap_pathname))
-          rescue ArgumentError # when a relative path cannot be constructed
-            Sass::Util.file_uri_from_path(file_pathname)
-          end
         end
       end
 

data/lib/sass/plugin/compiler.rb

@@ -251,8 +251,7 @@ module Sass::Plugin
       template_location_array.each do |template_location, css_location|
         Sass::Util.glob(File.join(template_location, "**", "[^_]*.s[ca]ss")).sort.each do |file|
           # Get the relative path to the file
-          name = Sass::Util.pathname(file).relative_path_from(
-            Sass::Util.pathname(template_location.to_s)).to_s
+          name = Sass::Util.relative_path_from(file, template_location).to_s
           css = css_filename(name, css_location)
           sourcemap = Sass::Util.sourcemap_name(css) unless engine_options[:sourcemap] == :none
           files << [file, css, sourcemap]
@@ -558,7 +557,7 @@ module Sass::Plugin
     end
 
     def relative_to_pwd(f)
-      Sass::Util.pathname(f).relative_path_from(Sass::Util.pathname(Dir.pwd)).to_s
+      Sass::Util.relative_path_from(f, Dir.pwd).to_s
     rescue ArgumentError # when a relative path cannot be computed
       f
     end

data/lib/sass/scss/static_parser.rb

@@ -358,7 +358,7 @@ MESSAGE
       end
 
       def keyframes_selector_component
-        tok(/from|to/i) || tok(PERCENTAGE)
+        tok(IDENT) || tok(PERCENTAGE)
       end
 
       @sass_script_parser = Class.new(Sass::Script::CssParser)

data/lib/sass/source/map.rb

@@ -95,7 +95,8 @@ module Sass::Source
       end
       css_path &&= Sass::Util.pathname(Sass::Util.absolute_path(css_path))
       sourcemap_path &&= Sass::Util.pathname(Sass::Util.absolute_path(sourcemap_path))
-      css_uri ||= Sass::Util.file_uri_from_path(css_path.relative_path_from(sourcemap_path.dirname))
+      css_uri ||= Sass::Util.file_uri_from_path(
+        Sass::Util.relative_path_from(css_path, sourcemap_path.dirname))
 
       result = "{\n"
       write_json_field(result, "version", 3, true)

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

@@ -306,8 +306,8 @@ class Sass::Tree::Visitors::ToCss < Sass::Tree::Visitors::Base
             relative_filename =
               if node.options[:css_filename]
                 begin
-                  Sass::Util.pathname(node.filename).relative_path_from(
-                    Sass::Util.pathname(File.dirname(node.options[:css_filename]))).to_s
+                  Sass::Util.relative_path_from(
+                    node.filename, File.dirname(node.options[:css_filename])).to_s
                 rescue ArgumentError
                   nil
                 end

data/lib/sass/util.rb

@@ -664,7 +664,7 @@ module Sass
     # Returns `path` with all symlinks resolved.
     #
     # @param path [String, Pathname]
-    # @return [Pathanme]
+    # @return [Pathname]
     def realpath(path)
       path = Pathname.new(path) unless path.is_a?(Pathname)
 
@@ -681,6 +681,28 @@ module Sass
       end
     end
 
+    # Returns `path` relative to `from`.
+    #
+    # This is like `Pathname#relative_path_from` except it accepts both strings
+    # and pathnames, it handles Windows path separators correctly, and it throws
+    # an error rather than crashing if the paths use different encodings
+    # (https://github.com/ruby/ruby/pull/713).
+    #
+    # @param path [String, Pathname]
+    # @param from [String, Pathname]
+    # @return [Pathname?]
+    def relative_path_from(path, from)
+      pathname(path.to_s).relative_path_from(pathname(from.to_s))
+    rescue NoMethodError => e
+      raise e unless e.name == :zero?
+
+      # Work around https://github.com/ruby/ruby/pull/713.
+      path = path.to_s
+      from = from.to_s
+      raise ArgumentError("Incompatible path encodings: #{path.inspect} is #{path.encoding}, " +
+        "#{from.inspect} is #{from.encoding}")
+    end
+
     # Converts `path` to a "file:" URI. This handles Windows paths correctly.
     #
     # @param path [String, Pathname]

data/test/sass/conversion_test.rb

@@ -351,6 +351,23 @@ foo
 SASS
   end
 
+  def test_preserves_triple_slash_comments
+    assert_renders <<SASS, <<SCSS
+/// foo
+/// bar
+foo
+  /// bip bop
+  /// beep boop
+SASS
+/// foo
+/// bar
+foo {
+  /// bip bop
+  /// beep boop
+}
+SCSS
+  end
+
   def test_loud_comments
     assert_renders <<SASS, <<SCSS
 /* foo
@@ -467,6 +484,23 @@ foo
 SASS
   end
 
+  def test_preserves_double_star_comments
+    assert_renders <<SASS, <<SCSS
+/** foo
+ *  bar
+foo
+  /** bip bop
+   *  beep boop
+SASS
+/** foo
+ *  bar */
+foo {
+  /** bip bop
+   *  beep boop */
+}
+SCSS
+  end
+
   def test_loud_comments_with_weird_indentation
     assert_scss_to_sass <<SASS, <<SCSS
 foo

data/test/sass/scss/css_test.rb

@@ -701,6 +701,27 @@ CSS
   50% {background-color: black}
   100% {}
 }
+SCSS
+  end
+
+  def test_keyframes_with_custom_identifiers
+    assert_equal <<CSS, render(<<SCSS)
+@-skrollr-keyframes identifier {
+  center-top {
+    left: 100%; }
+  top-bottom {
+    left: 0%; } }
+CSS
+@-skrollr-keyframes identifier {
+  center-top {
+    left: 100%;
+  }
+
+  top-bottom {
+    left: 0%;
+  }
+}
+
 SCSS
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sass
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.4.4
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard