sass 3.1.0.alpha.22 → 3.1.0.alpha.23

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.22
+3.1.0.alpha.23

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.22
+3.1.0.alpha.23

data/lib/sass/engine.rb

@@ -17,6 +17,7 @@ require 'sass/tree/for_node'
 require 'sass/tree/debug_node'
 require 'sass/tree/warn_node'
 require 'sass/tree/import_node'
+require 'sass/tree/charset_node'
 require 'sass/selector'
 require 'sass/environment'
 require 'sass/script'
@@ -264,7 +265,14 @@ module Sass
     def _render
       rendered = _to_tree.render
       return rendered if ruby1_8?
-      return rendered.encode(source_encoding)
+      begin
+        # Try to convert the result to the original encoding,
+        # but if that doesn't work fall back on UTF-8
+        rendered = rendered.encode(source_encoding)
+      rescue EncodingError
+      end
+      rendered.gsub(Regexp.new('\A@charset "(.*?)"'.encode(source_encoding)),
+        "@charset \"#{source_encoding.name}\"".encode(source_encoding))
     end
 
     def _to_tree
@@ -628,6 +636,12 @@ WARNING
           :line => @line + 1) unless line.children.empty?
         offset = line.offset + line.text.index(value).to_i
         Tree::WarnNode.new(parse_script(value, :offset => offset))
+      elsif directive == "charset"
+        name = value && value[/\A(["'])(.*)\1\Z/, 2] #"
+        raise SyntaxError.new("Invalid charset directive '@charset': expected string.") unless name
+        raise SyntaxError.new("Illegal nesting: Nothing may be nested beneath charset directives.",
+          :line => @line + 1) unless line.children.empty?
+        Tree::CharsetNode.new(name)
       else
         Tree::DirectiveNode.new(line.text)
       end

data/lib/sass/plugin/compiler.rb

@@ -318,7 +318,10 @@ module Sass::Plugin
       # Finally, write the file
       flag = 'w'
       flag = 'wb' if Sass::Util.windows? && options[:unix_newlines]
-      File.open(css, flag) {|file| file.print(result)}
+      File.open(css, flag) do |file|
+        file.set_encoding(result.encoding) unless Sass::Util.ruby1_8?
+        file.print(result)
+      end
     end
 
     def try_delete_css(css)

data/lib/sass/scss/css_parser.rb

@@ -24,11 +24,6 @@ module Sass
       def interp_ident(ident = IDENT); tok(ident); end
       def use_css_import?; true; end
 
-      def special_directive(name)
-        return unless name == 'media' || name == 'import'
-        super
-      end
-
       def block_child(context)
         case context
         when :ruleset

data/lib/sass/scss/parser.rb

@@ -98,7 +98,8 @@ module Sass
         node << comment
       end
 
-      DIRECTIVES = Set[:mixin, :include, :debug, :warn, :for, :while, :if, :extend, :import, :media]
+      DIRECTIVES = Set[:mixin, :include, :debug, :warn, :for, :while, :if, :extend, :import,
+        :media, :charset]
 
       def directive
         return unless tok(/@/)
@@ -289,6 +290,13 @@ module Sass
         true
       end
 
+      def charset_directive
+        tok! STRING
+        name = @scanner[1] || @scanner[2]
+        ss
+        node(Sass::Tree::CharsetNode.new(name))
+      end
+
       def variable
         return unless tok(/\$/)
         name = tok!(IDENT)

data/lib/sass/scss/static_parser.rb

@@ -32,7 +32,7 @@ module Sass
       def use_css_import?; true; end
 
       def special_directive(name)
-        return unless name == 'media' || name == 'import'
+        return unless  %w[media import charset].include?(name)
         super
       end
     end

data/lib/sass/tree/charset_node.rb

@@ -0,0 +1,37 @@
+module Sass::Tree
+  # A static node representing an unproccessed Sass `@charset` directive.
+  #
+  # @see Sass::Tree
+  class CharsetNode < Node
+    # The name of the charset.
+    #
+    # @return [String]
+    attr_accessor :name
+
+    # @param name [String] see \{#name}
+    def initialize(name)
+      @name = name
+      super()
+    end
+
+    # @see Node#invisible?
+    def invisible?
+      !Sass::Util.ruby1_8?
+    end
+
+    protected
+
+    # @see Node#to_src
+    def to_src(tabs, opts, fmt)
+      "#{'  ' * tabs}@charset \"#{name}\"#{semi fmt}\n"
+    end
+
+    # Computes the CSS for the directive.
+    #
+    # @param tabs [Fixnum] The level of indentation for the CSS
+    # @return [String] The resulting CSS
+    def _to_s(tabs)
+      "@charset \"#{name}\";"
+    end
+  end
+end

data/lib/sass/tree/directive_node.rb

@@ -4,8 +4,8 @@ module Sass::Tree
   # are handled by their own nodes;
   # only CSS directives like `@media` and `@font-face` become {DirectiveNode}s.
   #
-  # `@import` is a bit of a weird case;
-  # it becomes an {ImportNode}.
+  # `@import` and `@charset` are special cases;
+  # they become {ImportNode}s and {CharsetNode}s, respectively.
   #
   # @see Sass::Tree
   class DirectiveNode < Node

data/lib/sass/tree/root_node.rb

@@ -47,7 +47,7 @@ module Sass
       # @return [(Tree::Node, Sass::Util::SubsetMap)] The resulting tree of static nodes
       #   *and* the extensions defined for this tree
       def cssize(extends = Sass::Util::SubsetMap.new, parent = nil)
-        return super(extends), extends
+        return super(extends, parent), extends
       rescue Sass::SyntaxError => e
         e.sass_template = @template
         raise e
@@ -106,7 +106,39 @@ module Sass
         end
         result.rstrip!
         return "" if result.empty?
-        return result + "\n"
+        result << "\n"
+        unless Sass::Util.ruby1_8? || result.ascii_only?
+          if children.first.is_a?(CharsetNode)
+            begin
+              encoding = children.first.name
+              # Default to big-endian encoding, because we have to decide somehow
+              encoding << 'BE' if encoding =~ /\Autf-(16|32)\Z/i
+              result = result.encode(Encoding.find(encoding))
+            rescue EncodingError
+            end
+          end
+
+          result = "@charset \"#{result.encoding.name}\";#{
+            style == :compressed ? '' : "\n"
+          }".encode(result.encoding) + result
+        end
+        result
+      end
+
+      # In Ruby 1.8, ensures that there's only one @charset directive
+      # and that it's at the top of the document.
+      #
+      # @see Node#cssize
+      def cssize!(extends, parent)
+        super
+
+        # In Ruby 1.9 we can make all @charset nodes invisible
+        # and infer the final @charset from the encoding of the final string.
+        if Sass::Util.ruby1_8? && parent.nil?
+          charset = self.children.find {|c| c.is_a?(CharsetNode)}
+          self.children.reject! {|c| c.is_a?(CharsetNode)}
+          self.children.unshift charset if charset
+        end
       end
 
       # Returns an error message if the given child node is invalid,

data/test/sass/conversion_test.rb

@@ -607,6 +607,14 @@ foo {
 SCSS
   end
 
+  def test_charset
+    assert_renders <<SASS, <<SCSS
+@charset "utf-8"
+SASS
+@charset "utf-8";
+SCSS
+  end
+
   def test_for
     assert_renders <<SASS, <<SCSS
 foo

data/test/sass/engine_test.rb

@@ -2241,7 +2241,7 @@ SASS
 
     def test_same_charset_as_encoding
       assert_renders_encoded(<<CSS, <<SASS)
-@charset "utf-8";
+@charset "UTF-8";
 fóó {
   a: b; }
 CSS
@@ -2253,7 +2253,7 @@ SASS
 
     def test_different_charset_than_encoding
       assert_renders_encoded(<<CSS.force_encoding("IBM866"), <<SASS)
-@charset "ibm866";
+@charset "IBM866";
 fóó {
   a: b; }
 CSS
@@ -2265,6 +2265,7 @@ SASS
 
     def test_different_encoding_than_system
       assert_renders_encoded(<<CSS.encode("IBM866"), <<SASS.encode("IBM866"))
+@charset "IBM866";
 тАЬ {
   a: b; }
 CSS
@@ -2274,20 +2275,20 @@ SASS
     end
 
     def test_multibyte_charset
-      assert_renders_encoded(<<CSS.encode("UTF-16BE"), <<SASS.encode("UTF-16BE").force_encoding("UTF-8"))
-@charset "utf-16be";
+      assert_renders_encoded(<<CSS.encode("UTF-16LE"), <<SASS.encode("UTF-16LE").force_encoding("UTF-8"))
+@charset "UTF-16LE";
 fóó {
   a: b; }
 CSS
-@charset "utf-16be"
+@charset "utf-16le"
 fóó
   a: b
 SASS
     end
 
     def test_multibyte_charset_without_endian_specifier
-      assert_renders_encoded(<<CSS.encode("UTF-32LE"), <<SASS.encode("UTF-32LE").force_encoding("UTF-8"))
-@charset "utf-32";
+      assert_renders_encoded(<<CSS.encode("UTF-32BE"), <<SASS.encode("UTF-32BE").force_encoding("UTF-8"))
+@charset "UTF-32BE";
 fóó {
   a: b; }
 CSS
@@ -2299,6 +2300,7 @@ SASS
 
     def test_utf8_bom
       assert_renders_encoded(<<CSS, <<SASS.force_encoding("BINARY"))
+@charset "UTF-8";
 fóó {
   a: b; }
 CSS
@@ -2309,6 +2311,7 @@ SASS
 
     def test_utf16le_bom
       assert_renders_encoded(<<CSS.encode("UTF-16LE"), <<SASS.encode("UTF-16LE").force_encoding("BINARY"))
+@charset "UTF-16LE";
 fóó {
   a: b; }
 CSS
@@ -2319,6 +2322,7 @@ SASS
 
     def test_utf32be_bom
       assert_renders_encoded(<<CSS.encode("UTF-32BE"), <<SASS.encode("UTF-32BE").force_encoding("BINARY"))
+@charset "UTF-32BE";
 fóó {
   a: b; }
 CSS

data/test/sass/plugin_test.rb

@@ -10,6 +10,8 @@ class SassPluginTest < Test::Unit::TestCase
     subdir/subdir subdir/nested_subdir/nested_subdir
     options
   }
+  @@templates += %w[import_charset import_charset_ibm866] unless Sass::Util.ruby1_8?
+  @@templates << 'import_charset_1_8' if Sass::Util.ruby1_8?
 
   @@cache_store = Sass::InMemoryCacheStore.new
 
@@ -279,11 +281,18 @@ CSS
     prefix = options[:prefix]
     result_name = arguments.shift
     tempfile_name = arguments.shift || result_name
-    expected_lines = File.read(result_loc(result_name, prefix)).split("\n")
-    actual_lines = File.read(tempfile_loc(tempfile_name, prefix)).split("\n")
+
+    expected_str = File.read(result_loc(result_name, prefix))
+    actual_str = File.read(tempfile_loc(tempfile_name, prefix))
+    unless Sass::Util.ruby1_8?
+      expected_str = expected_str.force_encoding('IBM866') if result_name == 'import_charset_ibm866'
+      actual_str = actual_str.force_encoding('IBM866') if tempfile_name == 'import_charset_ibm866'
+    end
+    expected_lines = expected_str.split("\n")
+    actual_lines = actual_str.split("\n")
 
     if actual_lines.first == "/*" && expected_lines.first != "/*"
-      assert(false, actual_lines[0..actual_lines.enum_with_index.find {|l, i| l == "*/"}.last].join("\n"))
+      assert(false, actual_lines[0..Sass::Util.enum_with_index(actual_lines).find {|l, i| l == "*/"}.last].join("\n"))
     end
 
     expected_lines.zip(actual_lines).each_with_index do |pair, line|

data/test/sass/results/import_charset.css

@@ -0,0 +1,4 @@
+@charset "UTF-8";
+.foo { a: b; }
+
+.bar { a: щ; }

data/test/sass/results/import_charset_1_8.css

@@ -0,0 +1,4 @@
+@charset "IBM866";
+.foo { a: b; }
+
+.bar { a: �; }

data/test/sass/results/import_charset_ibm866.css

@@ -0,0 +1,4 @@
+@charset "IBM866";
+.foo { a: b; }
+
+.bar { a: �; }

data/test/sass/scss/css_test.rb

@@ -49,11 +49,34 @@ baz {bar: baz}
 SCSS
   end
 
-  def test_unicode
-    assert_parses <<SCSS
+  if Sass::Util.ruby1_8?
+    def test_unicode
+      assert_parses <<SCSS
+@charset "UTF-8";
+foo {
+  bar: föö bâr; }
+SCSS
+      assert_parses <<SCSS
 foo {
   bar: föö bâr; }
 SCSS
+    end
+  else
+    def test_unicode
+      assert_parses <<SCSS
+@charset "UTF-8";
+foo {
+  bar: föö bâr; }
+SCSS
+      assert_equal <<CSS, render(<<SCSS)
+@charset "UTF-8";
+foo {
+  bar: föö bâr; }
+CSS
+foo {
+  bar: föö bâr; }
+SCSS
+    end
   end
 
   def test_invisible_comments
@@ -429,10 +452,6 @@ SCSS
 
   ## Directives
 
-  def test_charset_directive
-    assert_parses '@charset "utf-8";'
-  end
-
   def test_namespace_directive
     assert_parses '@namespace "http://www.w3.org/Profiles/xhtml1-strict";'
     assert_parses '@namespace url(http://www.w3.org/Profiles/xhtml1-strict);'
@@ -508,11 +527,11 @@ SCSS
   end
 
   def test_blockless_directive_without_semicolon
-    assert_equal "@charset \"utf-8\";\n", render('@charset "utf-8"')
+    assert_equal "@foo \"bar\";\n", render('@foo "bar"')
   end
 
   def test_directive_with_lots_of_whitespace
-    assert_equal "@charset \"utf-16\";\n", render('@charset    "utf-16"  ;')
+    assert_equal "@foo \"bar\";\n", render('@foo    "bar"  ;')
   end
 
   def test_empty_blockless_directive

data/test/sass/templates/_imported_charset_ibm866.sass

@@ -0,0 +1,4 @@
+@charset "IBM866"
+
+.bar
+  a: �

data/test/sass/templates/_imported_charset_utf8.sass

@@ -0,0 +1,4 @@
+@charset "UTF-8"
+
+.bar
+  a: щ

data/test/sass/templates/import_charset.sass

@@ -0,0 +1,7 @@
+.foo
+  a: b
+
+// Even though the imported file is in IBM866,
+// since the root file is in UTF-8/ASCII
+// the output will end up being UTF-8.
+@import "imported_charset_ibm866"

data/test/sass/templates/import_charset_1_8.sass

@@ -0,0 +1,4 @@
+.foo
+  a: b
+
+@import "imported_charset_ibm866"

data/test/sass/templates/import_charset_ibm866.sass

@@ -0,0 +1,9 @@
+@charset "IBM866"
+
+.foo
+  a: b
+
+// Even though the imported file is in UTF-8,
+// since the root file is in IBM866
+// the output will end up being IBM866.
+@import "imported_charset_utf8"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.22
+  version: 3.1.0.alpha.23
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -04:00
+date: 2010-10-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -118,6 +118,7 @@ files:
 - lib/sass/tree/variable_node.rb
 - lib/sass/tree/warn_node.rb
 - lib/sass/tree/while_node.rb
+- lib/sass/tree/charset_node.rb
 - lib/sass/util.rb
 - lib/sass/util/subset_map.rb
 - lib/sass/version.rb
@@ -193,6 +194,9 @@ files:
 - test/sass/results/units.css
 - test/sass/results/warn.css
 - test/sass/results/warn_imported.css
+- test/sass/results/import_charset.css
+- test/sass/results/import_charset_1_8.css
+- test/sass/results/import_charset_ibm866.css
 - test/sass/script_conversion_test.rb
 - test/sass/script_test.rb
 - test/sass/scss/css_test.rb
@@ -234,6 +238,11 @@ files:
 - test/sass/templates/units.sass
 - test/sass/templates/warn.sass
 - test/sass/templates/warn_imported.sass
+- test/sass/templates/_imported_charset_ibm866.sass
+- test/sass/templates/_imported_charset_utf8.sass
+- test/sass/templates/import_charset.sass
+- test/sass/templates/import_charset_1_8.sass
+- test/sass/templates/import_charset_ibm866.sass
 - test/sass/test_helper.rb
 - test/sass/util/subset_map_test.rb
 - test/sass/util_test.rb