sass 3.3.0.alpha.64 → 3.3.0.alpha.67

data/REVISION

@@ -1 +1 @@
-62e36b0efe872f1be55de2a82b01d88f2b08d9b1
+f2051741fd9b7025a9ad2a9601cabeaea16a9c35

data/VERSION

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

data/VERSION_DATE

@@ -1 +1 @@
-27 December 2012 22:38:55 GMT
+28 December 2012 21:03:29 GMT

data/lib/sass/engine.rb

@@ -273,7 +273,8 @@ module Sass
     #   to the location of the CSS file.
     # @return [(String, Sass::Source::Map)] The rendered CSS and the associated
     #   source map
-    # @raise [Sass::SyntaxError] if there's an error in the document
+    # @raise [Sass::SyntaxError] if there's an error in the document, or if the
+    #   public URL for this document couldn't be determined.
     # @raise [Encoding::UndefinedConversionError] if the source encoding
     #   cannot be converted to UTF-8
     # @raise [ArgumentError] if the document uses an unknown encoding with `@charset`
@@ -332,6 +333,21 @@ module Sass
     private
 
     def _render_with_sourcemap(sourcemap_uri)
+      if @options[:filename].nil?
+        raise Sass::SyntaxError.new(<<ERR)
+Error generating source map: couldn't determine public URL for the source stylesheet.
+  No filename is available so there's nothing for the source map to link to.
+ERR
+      elsif @options[:importer].nil? ||
+        !(@options[:importer].public_url(@options[:filename]) ||
+          @options[:importer].is_a?(Sass::Importers::Filesystem))
+        raise Sass::SyntaxError.new(<<ERR)
+Error generating source map: couldn't determine public URL for "#{@options[:filename]}".
+  Without a public URL, there's nothing for the source map to link to.
+  Custom importers should define the #public_url method.
+ERR
+      end
+
       rendered, sourcemap = _to_tree.render_with_sourcemap
       compressed = @options[:style] == :compressed
       rendered << "\n" if rendered[-1] != ?\n

data/lib/sass/plugin/compiler.rb

@@ -331,7 +331,7 @@ module Sass::Plugin
       end
 
       write_file(css, rendered)
-      write_file(sourcemap, mapping.to_json(css)) if mapping
+      write_file(sourcemap, mapping.to_json(:css_path => css, :sourcemap_path => sourcemap)) if mapping
       run_updated_stylesheet(filename, css, sourcemap) unless compilation_error_occured
     end
 

data/lib/sass/source/map.rb

@@ -76,9 +76,9 @@ module Sass::Source
     # layout of the server for the purposes of linking to source stylesheets
     # that use the filesystem importer.
     #
-    # Regardless of which options are passed to this method, sourcemap
-    # generation will fail if the source stylesheet contains any import that
-    # uses a non-default importer that doesn't implement
+    # Regardless of which options are passed to this method, source stylesheets
+    # that are imported using a non-default importer will only be linked to in
+    # the source map if their importers implement
     # \{Sass::Importers::Base#public\_url\}.
     #
     # @option options :css_uri [String]
@@ -88,10 +88,8 @@ module Sass::Source
     # @option options :sourcemap_path [String]
     #   The (eventual) local path of the sourcemap file.
     # @return [String] The JSON string.
-    # @raise [ArgumentError] If neither `:css_uri` nor `:css_path` are
-    #   specified.
-    # @raise [Sass::SyntaxError] If the public URL of a stylesheet cannot be
-    #   determined.
+    # @raise [ArgumentError] If neither `:css_uri` nor `:css_path` and
+    #   `:sourcemap_path` are specified.
     def to_json(options)
       css_uri, css_path, sourcemap_path = [:css_uri, :css_path, :sourcemap_path].map {|o| options[o]}
       unless css_uri || (css_path && sourcemap_path)
@@ -110,6 +108,7 @@ module Sass::Source
       next_source_id = 0
       line_data = []
       segment_data_for_line = []
+      no_public_url = Set.new
 
       # These track data necessary for the delta coding.
       previous_target_line = nil
@@ -124,10 +123,16 @@ module Sass::Source
           if importer.is_a?(Sass::Importers::Filesystem) && sourcemap_path
             file_path = Pathname.new(importer.root).join(file)
             source_uri = file_path.relative_path_from(sourcemap_path.dirname).to_s
+          elsif no_public_url.include?(file)
+            next
           else
-            raise Sass::SyntaxError.new(<<ERR)
-Error generating source map: couldn't determine public URL for "#{file}".
-ERR
+            no_public_url << file
+            Sass::Util.sass_warn <<WARNING
+WARNING: Couldn't determine public URL for "#{file}" while generating sourcemap.
+  Without a public URL, there's nothing for the source map to link to.
+  Custom importers should define the #public_url method.
+WARNING
+            next
           end
         end
 

data/test/sass/importer_test.rb

@@ -225,9 +225,11 @@ SCSS
 
     rendered, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
 
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {sourcemap.to_json(:css_uri => 'css_uri')}
-Error generating source map: couldn't determine public URL for "#{filename_for_test(:scss)}".
-MESSAGE
+    assert_warning(<<WARNING) {sourcemap.to_json(:css_uri => 'css_uri')}
+WARNING: Couldn't determine public URL for "#{filename_for_test(:scss)}" while generating sourcemap.
+  Without a public URL, there's nothing for the source map to link to.
+  Custom importers should define the #public_url method.
+WARNING
   end
 
   def test_source_map_with_css_uri_and_css_path_doesnt_support_filesystem_importer
@@ -244,9 +246,11 @@ SCSS
 
     rendered, sourcemap = engine.render_with_sourcemap('http://1.example.com/style.map')
 
-    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')}
-Error generating source map: couldn't determine public URL for "#{filename_for_test(:scss)}".
-MESSAGE
+    assert_warning(<<WARNING) {sourcemap.to_json(:css_uri => 'css_uri', :css_path => 'css_path')}
+WARNING: Couldn't determine public URL for "#{filename_for_test(:scss)}" while generating sourcemap.
+  Without a public URL, there's nothing for the source map to link to.
+  Custom importers should define the #public_url method.
+WARNING
   end
 
   def test_source_map_with_css_uri_and_sourcemap_path_supports_filesystem_importer
@@ -302,6 +306,24 @@ SCSS
 JSON
   end
 
+  def test_render_with_sourcemap_requires_filename
+    file_system_importer = Sass::Importers::Filesystem.new('.')
+    engine = Sass::Engine.new(".foo {a: b}", :syntax => :scss, :importer => file_system_importer)
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {engine.render_with_sourcemap('sourcemap_url')}
+Error generating source map: couldn't determine public URL for the source stylesheet.
+  No filename is available so there's nothing for the source map to link to.
+MESSAGE
+  end
+
+  def test_render_with_sourcemap_requires_importer_with_public_url
+    class_importer = ClassImporter.new({"pear" => "color: green;"}, {"pear" => Time.now})
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {class_importer.find("pear", {}).render_with_sourcemap('sourcemap_url')}
+Error generating source map: couldn't determine public URL for "pear".
+  Without a public URL, there's nothing for the source map to link to.
+  Custom importers should define the #public_url method.
+MESSAGE
+  end
+
   def fixture_dir
     File.join(File.dirname(__FILE__), "fixtures")
   end

data/test/sass/source_map_test.rb

@@ -375,7 +375,7 @@ CSS
   def test_extend_sourcemap_scss
     assert_parses_with_mapping <<'SCSS', <<'CSS'
 .error {
-  {{1}}border{{/1}}: {{2}}1px #f00{{/2}};
+  {{1}}border{{/1}}: {{2}}1px #ff00aa{{/2}};
   {{3}}background-color{{/3}}: {{4}}#fdd{{/4}};
 }
 .seriousError {
@@ -384,7 +384,7 @@ CSS
 }
 SCSS
 .error, .seriousError {
-  {{1}}border{{/1}}: {{2}}1px #f00{{/2}};
+  {{1}}border{{/1}}: {{2}}1px #ff00aa{{/2}};
   {{3}}background-color{{/3}}: {{4}}#fdd{{/4}}; }
 
 .seriousError {

metadata

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