haml 3.0.16 → 3.0.17

data/VERSION

@@ -1 +1 @@
-3.0.16
+3.0.17

data/lib/haml/engine.rb

@@ -99,7 +99,7 @@ module Haml
       @index = 0
 
       unless [:xhtml, :html4, :html5].include?(@options[:format])
-        raise Haml::Error, "Invalid format #{@options[:format].inspect}"
+        raise Haml::Error, "Invalid output format #{@options[:format].inspect}"
       end
 
       if @options[:encoding] && @options[:encoding].is_a?(Encoding)

data/lib/haml/exec.rb

@@ -161,7 +161,7 @@ module Haml
         raise err if @options[:trace] || dep.nil? || dep.empty?
         $stderr.puts <<MESSAGE
 Required dependency #{dep} not found!
-  Run "gem install #{dep}" to get it.
+    Run "gem install #{dep}" to get it.
   Use --trace for backtrace.
 MESSAGE
         exit 1
@@ -388,6 +388,12 @@ END
         ::Sass::Plugin.options.merge! @options[:for_engine]
         ::Sass::Plugin.options[:unix_newlines] = @options[:unix_newlines]
 
+        raise <<MSG if @args.empty?
+What files should I watch? Did you mean something like:
+    sass --watch input.sass:output.css
+    sass --watch input-dir:output-dir
+MSG
+
         if !colon_path?(@args[0]) && probably_dest_dir?(@args[1])
           flag = @options[:update] ? "--update" : "--watch"
           err =
@@ -396,9 +402,9 @@ END
             elsif @args[1] =~ /\.css$/
               "is a CSS file"
             end
-          msg = <<MSG if err
+          raise <<MSG if err
 File #{@args[1]} #{err}.
-  Did you mean: sass #{flag} #{@args[0]}:#{@args[1]}
+    Did you mean: sass #{flag} #{@args[0]}:#{@args[1]}
 MSG
         end
 
@@ -416,15 +422,18 @@ MSG
           end
         end
 
+        had_error = false
         ::Sass::Plugin.on_creating_directory {|dirname| puts_action :directory, :green, dirname}
         ::Sass::Plugin.on_deleting_css {|filename| puts_action :delete, :yellow, filename}
         ::Sass::Plugin.on_compilation_error do |error, _, _|
           raise error unless error.is_a?(::Sass::SyntaxError)
+          had_error = true
           puts_action :error, :red, "#{error.sass_filename} (Line #{error.sass_line}: #{error.message})"
         end
 
         if @options[:update]
           ::Sass::Plugin.update_stylesheets(files)
+          exit 1 if had_error
           return
         end
 
@@ -456,6 +465,7 @@ MSG
       # Whether path is likely to be meant as the destination
       # in a source:dest pair.
       def probably_dest_dir?(path)
+        return false unless path
         return false if colon_path?(path)
         return Dir.glob(File.join(path, "*.s[ca]ss")).empty?
       end

data/lib/haml/util.rb

@@ -374,7 +374,7 @@ module Haml
     #
     # @return [Boolean]
     def windows?
-      RbConfig::CONFIG['host_os'] =~ /mswin|windows/i
+      RbConfig::CONFIG['host_os'] =~ /mswin|windows|mingw/i
     end
 
     ## Cross-Ruby-Version Compatibility

data/lib/sass/script/color.rb

@@ -114,7 +114,7 @@ module Sass::Script
       end
 
       unless (0..1).include?(@attrs[:alpha])
-        raise Sass::SyntaxError.new("Alpha channel must between 0 and 1")
+        raise Sass::SyntaxError.new("Alpha channel must be between 0 and 1")
       end
     end
 

data/lib/sass/script/lexer.rb

@@ -278,7 +278,7 @@ module Sass
 
       def color
         return unless s = scan(REGULAR_EXPRESSIONS[:color])
-        raise Sass::SyntaxError.new(<<MESSAGE) unless s.size == 4 || s.size == 7
+        raise Sass::SyntaxError.new(<<MESSAGE.rstrip) unless s.size == 4 || s.size == 7
 Colors must have either three or six digits: '#{s}'
 MESSAGE
         value = s.scan(/^#(..?)(..?)(..?)$/).first.

data/lib/sass/scss/css_parser.rb

@@ -7,6 +7,15 @@ module Sass
     # parent references, nested selectors, and so forth.
     # It does support all the same CSS hacks as the SCSS parser, though.
     class CssParser < StaticParser
+      # Parse a selector, and return its value as a string.
+      #
+      # @return [String, nil] The parsed selector, or nil if no selector was parsed
+      # @raise [Sass::SyntaxError] if there's a syntax error in the selector
+      def parse_selector_string
+        init_scanner!
+        str {return unless selector}
+      end
+
       private
 
       def parent_selector; nil; end

data/lib/sass/scss/parser.rb

@@ -109,11 +109,10 @@ module Sass
           return dir
         end
 
-        val = str do
-          # Most at-rules take expressions (e.g. @import),
-          # but some (e.g. @page) take selector-like arguments
-          expr || selector
-        end
+        # Most at-rules take expressions (e.g. @import),
+        # but some (e.g. @page) take selector-like arguments
+        val = str {break unless expr}
+        val ||= CssParser.new(@scanner, @line).parse_selector_string
         node = node(Sass::Tree::DirectiveNode.new("@#{name} #{val}".strip))
 
         if tok(/\{/)
@@ -644,11 +643,10 @@ MESSAGE
         unless e = tok(NUMBER) ||
             tok(URI) ||
             function ||
-            interp_string ||
+            tok(STRING) ||
             tok(UNICODERANGE) ||
             tok(IDENT) ||
-            tok(HEXCOLOR) ||
-            interpolation
+            tok(HEXCOLOR)
 
           return unless op = unary_operator
           @expected = "number or function"

data/lib/sass/scss/static_parser.rb

@@ -8,11 +8,9 @@ module Sass
     class StaticParser < Parser
       # Parses the text as a selector.
       #
-      # @param line [Fixnum] The line on which the selector appears.
-      #   Used for error reporting
       # @param filename [String, nil] The file in which the selector appears,
       #   or nil if there is no such file.
-      #   Used for error reporting
+      #   Used for error reporting.
       # @return [Selector::CommaSequence] The parsed selector
       # @raise [Sass::SyntaxError] if there's a syntax error in the selector
       def parse_selector(filename)

data/lib/sass/tree/prop_node.rb

@@ -167,7 +167,7 @@ module Sass::Tree
     def declaration(tabs = 0, opts = {:old => @prop_syntax == :old}, fmt = :sass)
       name = self.name.map {|n| n.is_a?(String) ? n : "\#{#{n.to_sass(opts)}}"}.join
       if name[0] == ?:
-        raise Sass::SyntaxError.new("The \":#{name}: #{self.class.val_to_sass(value, opts)}\" hack is not allowed in the Sass indented syntax")
+        raise Sass::SyntaxError.new("The \"#{name}: #{self.class.val_to_sass(value, opts)}\" hack is not allowed in the Sass indented syntax")
       end
 
       old = opts[:old] && fmt == :sass

data/test/haml/engine_test.rb

@@ -1236,7 +1236,9 @@ SASS
   end
 
   def test_arbitrary_output_option
-    assert_raise(Haml::Error, "Invalid output format :html1") { engine("%br", :format => :html1) }
+    assert_raise_message(Haml::Error, "Invalid output format :html1") do
+      engine("%br", :format => :html1)
+    end
   end
 
   def test_static_hashes

data/test/sass/conversion_test.rb

@@ -1031,7 +1031,7 @@ SCSS
   end
 
   def test_disallowed_colon_hack
-    assert_raise(Sass::SyntaxError, '":foo: bar" is not allowed in the Sass syntax') do
+    assert_raise_message(Sass::SyntaxError, 'The ":name: val" hack is not allowed in the Sass indented syntax') do
       to_sass("foo {:name: val;}", :syntax => :scss)
     end
   end

data/test/sass/engine_test.rb

@@ -2057,7 +2057,7 @@ SASS
   end
 
   def test_mixin_no_arg_error
-    assert_raise(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable name, was ")"') do
+    assert_raise_message(Sass::SyntaxError, 'Invalid CSS after "($bar,": expected variable (e.g. $foo), was ")"') do
       render(<<SASS)
 =foo($bar,)
   bip: bap

data/test/sass/script_test.rb

@@ -13,13 +13,13 @@ class SassScriptTest < Test::Unit::TestCase
   include Sass::Script
 
   def test_color_checks_input
-    assert_raise(Sass::SyntaxError, "Color values must be between 0 and 255") {Color.new([1, 2, -1])}
-    assert_raise(Sass::SyntaxError, "Color values must be between 0 and 255") {Color.new([256, 2, 3])}
+    assert_raise_message(Sass::SyntaxError, "Blue value must be between 0 and 255") {Color.new([1, 2, -1])}
+    assert_raise_message(Sass::SyntaxError, "Red value must be between 0 and 255") {Color.new([256, 2, 3])}
   end
 
   def test_color_checks_rgba_input
-    assert_raise(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
-    assert_raise(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
+    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, 1.1])}
+    assert_raise_message(Sass::SyntaxError, "Alpha channel must be between 0 and 1") {Color.new([1, 2, 3, -0.1])}
   end
 
   def test_string_escapes
@@ -63,13 +63,13 @@ class SassScriptTest < Test::Unit::TestCase
     assert_equal "rgba(50, 50, 100, 0.35)", resolve("rgba(1, 1, 2, 0.35) * rgba(50, 50, 50, 0.35)")
     assert_equal "rgba(52, 52, 52, 0.25)", resolve("rgba(2, 2, 2, 0.25) + rgba(50, 50, 50, 0.25)")
 
-    assert_raise(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do
+    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)") do
       resolve("rgba(1, 2, 3, 0.15) + rgba(50, 50, 50, 0.75)")
     end
-    assert_raise(Sass::SyntaxError, "Alpha channels must be equal: #123456 * rgba(50, 50, 50, 0.75)") do
+    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: #123456 * rgba(50, 50, 50, 0.75)") do
       resolve("#123456 * rgba(50, 50, 50, 0.75)")
     end
-    assert_raise(Sass::SyntaxError, "Alpha channels must be equal: #123456 / #123456") do
+    assert_raise_message(Sass::SyntaxError, "Alpha channels must be equal: rgba(50, 50, 50, 0.75) / #123456") do
       resolve("rgba(50, 50, 50, 0.75) / #123456")
     end
   end
@@ -360,15 +360,15 @@ SASS
   end
 
   def test_colors_with_wrong_number_of_digits
-    assert_raise(Sass::SyntaxError,
+    assert_raise_message(Sass::SyntaxError,
       "Colors must have either three or six digits: '#0'") {eval("#0")}
-    assert_raise(Sass::SyntaxError,
+    assert_raise_message(Sass::SyntaxError,
       "Colors must have either three or six digits: '#12'") {eval("#12")}
-    assert_raise(Sass::SyntaxError,
+    assert_raise_message(Sass::SyntaxError,
       "Colors must have either three or six digits: '#abcd'") {eval("#abcd")}
-    assert_raise(Sass::SyntaxError,
+    assert_raise_message(Sass::SyntaxError,
       "Colors must have either three or six digits: '#abcdE'") {eval("#abcdE")}
-    assert_raise(Sass::SyntaxError,
+    assert_raise_message(Sass::SyntaxError,
       "Colors must have either three or six digits: '#abcdEFA'") {eval("#abcdEFA")}
   end
 
@@ -386,7 +386,7 @@ SASS
   end
 
   def test_misplaced_comma_in_funcall
-    assert_raise(Sass::SyntaxError,
+    assert_raise_message(Sass::SyntaxError,
       'Invalid CSS after "foo(bar, ": expected function argument, was ")"') {eval('foo(bar, )')}
   end
 

data/test/sass/scss/scss_test.rb

@@ -965,7 +965,7 @@ SCSS
   end
 
   def test_parent_in_mid_selector_error
-    assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
 Invalid CSS after ".foo": expected "{", was "&.bar"
 
 In Sass 3, the parent selector & can only be used where element names are valid,
@@ -978,8 +978,8 @@ SCSS
   end
 
   def test_parent_in_mid_selector_error
-    assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
-Invalid CSS after ".foo.bar": expected "{", was "&"
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
+Invalid CSS after "  .foo.bar": expected "{", was "& {a: b}"
 
 In Sass 3, the parent selector & can only be used where element names are valid,
 since it could potentially be replaced by an element name.
@@ -991,8 +991,8 @@ SCSS
   end
 
   def test_double_parent_selector_error
-    assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
-Invalid CSS after "&": expected "{", was "&"
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
+Invalid CSS after "  &": expected "{", was "& {a: b}"
 
 In Sass 3, the parent selector & can only be used where element names are valid,
 since it could potentially be replaced by an element name.
@@ -1003,6 +1003,26 @@ flim {
 SCSS
   end
 
+  def test_no_interpolation_in_media_queries
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+Invalid CSS after "...nd (min-width: ": expected expression (e.g. 1px, bold), was "\#{100}px) {"
+MESSAGE
+@media screen and (min-width: \#{100}px) {
+  foo {bar: baz}
+}
+SCSS
+  end
+
+  def test_no_interpolation_in_unrecognized_directives
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+Invalid CSS after "@foo ": expected selector or at-rule, was "\#{100} {"
+MESSAGE
+@foo \#{100} {
+  foo {bar: baz}
+}
+SCSS
+  end
+
   # Regression
 
   def test_weird_added_space
@@ -1029,8 +1049,8 @@ SCSS
   end
 
   def test_extra_comma_in_mixin_arglist_error
-    assert_raise(Sass::SyntaxError, <<MESSAGE) {render <<SCSS}
-Invalid CSS after "@include foo(bar, ": expected mixin argument, was ")"
+    assert_raise_message(Sass::SyntaxError, <<MESSAGE.rstrip) {render <<SCSS}
+Invalid CSS after "...clude foo(bar, ": expected mixin argument, was ");"
 MESSAGE
 @mixin foo($a1, $a2) {
   baz: $a1 $a2;

data/test/test_helper.rb

@@ -78,4 +78,13 @@ class Test::Unit::TestCase
     return '' unless Haml::Util.ap_geq?("3.0.0.rc")
     return '<div style="margin:0;padding:0;display:inline"><input name="_snowman" type="hidden" value="&#9731;" /></div>'
   end
+
+  def assert_raise_message(klass, message)
+    yield
+  rescue Exception => e
+    assert_instance_of(klass, e)
+    assert_equal(message, e.message)
+  else
+    flunk "Expected exception #{klass}, none raised"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 3.0.16
+  version: 3.0.17
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2010-08-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency