haml-edge 2.3.220 → 2.3.221

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.220
+2.3.221

data/VERSION

@@ -1 +1 @@
-2.3.220
+2.3.221

data/lib/haml/exec.rb

@@ -58,8 +58,8 @@ module Haml
         # SyntaxErrors have weird line reporting
         # when there's trailing whitespace,
         # which there is for Haml documents.
-        return exception.message.scan(/:(\d+)/).first.first if exception.is_a?(::SyntaxError)
-        exception.backtrace[0].scan(/:(\d+)/).first.first
+        return (exception.message.scan(/:(\d+)/).first || ["??"]).first if exception.is_a?(::SyntaxError)
+        (exception.backtrace[0].scan(/:(\d+)/).first || ["??"]).first
       end
 
       # Tells optparse how to parse the arguments
@@ -371,8 +371,9 @@ MSG
         end
 
         dirs, files = @args.map {|name| name.split(':', 2)}.
-          map {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}.
           partition {|i, _| File.directory? i}
+        files.map! {|from, to| [from, to || from.gsub(/\..*?$/, '.css')]}
+        dirs.map! {|from, to| [from, to || from]}
         ::Sass::Plugin.options[:template_location] = dirs
 
         ::Sass::Plugin.on_updating_stylesheet do |_, css|
@@ -648,7 +649,7 @@ END
 
         super
         input = @options[:input]
-        raise "Error: '#{input}' is a directory (did you mean to use --recursive?)" if File.directory?(input)
+        raise "Error: '#{input.path}' is a directory (did you mean to use --recursive?)" if File.directory?(input)
         output = @options[:output]
         output = input if @options[:in_place]
         process_file(input, output)
@@ -750,7 +751,8 @@ END
         output.write(out)
       rescue ::Sass::SyntaxError => e
         raise e if @options[:trace]
-        raise "Syntax error on line #{get_line e}: #{e.message}\n  Use --trace for backtrace"
+        file = " of #{e.sass_filename}" if e.sass_filename
+        raise "Error on line #{e.sass_line}#{file}: #{e.message}\n  Use --trace for backtrace"
       end
     end
   end

data/lib/sass/files.rb

@@ -77,6 +77,7 @@ module Sass
       end
 
       new_filename = nil
+      load_paths = load_paths.uniq
       load_paths.each do |load_path|
         new_filename ||= find_full_path("#{filename}.sass", load_path) unless was_scss
         new_filename ||= find_full_path("#{filename}.scss", load_path) unless was_sass

data/lib/sass/script/number.rb

@@ -25,6 +25,14 @@ module Sass::Script
     # @return [Array<String>]
     attr_reader :denominator_units
 
+    # The original representation of this number.
+    # For example, although the result of `1px/2px` is `0.5`,
+    # the value of `#original` is `"1px/2px"`.
+    #
+    # This is only non-nil when the original value should be used as the CSS value,
+    # as in `font: 1px/2px`.
+    #
+    # @return [Boolean, nil]
     attr_accessor :original
 
     # The precision with which numbers will be printed to CSS files.

data/lib/sass/tree/directive_node.rb

@@ -25,7 +25,7 @@ module Sass::Tree
     # @see Node#to_src
     def to_src(tabs, opts, fmt)
       res = "#{'  ' * tabs}#{value}"
-      return res + "#{semi fmt}\n" if children.empty?
+      return res + "#{semi fmt}\n" unless has_children
       res + children_to_src(tabs, opts, fmt) + "\n"
     end
 

data/lib/sass/tree/mixin_def_node.rb

@@ -43,6 +43,18 @@ module Sass
         environment.set_mixin(@name, Sass::Mixin.new(@name, @args, environment, children))
         []
       end
+
+      # Returns an error message if the given child node is invalid,
+      # and false otherwise.
+      #
+      # {ExtendNode}s are valid within {MixinDefNode}s.
+      #
+      # @param child [Tree::Node] A potential child node.
+      # @return [Boolean, String] Whether or not the child node is valid,
+      #   as well as the error message to display if it is invalid
+      def invalid_child?(child)
+        super unless child.is_a?(ExtendNode)
+      end
     end
   end
 end

data/lib/sass/tree/node.rb

@@ -402,6 +402,8 @@ module Sass
       # @param fmt [Symbol] `:sass` or `:scss`
       # @return [String] The Sass or SCSS code corresponding to the children
       def children_to_src(tabs, opts, fmt)
+        return fmt == :sass ? "\n" : " {}\n" if children.empty?
+
         (fmt == :sass ? "\n" : " {\n") +
           children.map {|c| c.send("to_#{fmt}", tabs + 1, opts)}.join.rstrip +
           (fmt == :sass ? "\n" : " }\n")

data/lib/sass/tree/prop_node.rb

@@ -179,7 +179,6 @@ module Sass::Tree
     class << self
       # @private
       def val_to_sass(value, opts)
-        return value.to_sass(opts) unless value.context == :equals
         val_to_sass_comma(value, opts).to_sass(opts)
       end
 
@@ -208,7 +207,8 @@ module Sass::Tree
       def val_to_sass_div(node, opts)
         unless node.is_a?(Sass::Script::Operation) && node.operator == :div &&
             node.operand1.is_a?(Sass::Script::Number) &&
-            node.operand2.is_a?(Sass::Script::Number)
+            node.operand2.is_a?(Sass::Script::Number) &&
+            (node.context == :equals || !node.operand1.original || !node.operand2.original)
           return node
         end
 

data/lib/sass/tree/rule_node.rb

@@ -228,7 +228,7 @@ module Sass::Tree
     #
     # {ExtendNode}s are valid within {RuleNode}s.
     #
-    # @param child [Tree::Node] A potential child nodecompact.
+    # @param child [Tree::Node] A potential child node.
     # @return [Boolean, String] Whether or not the child node is valid,
     #   as well as the error message to display if it is invalid
     def invalid_child?(child)

data/test/sass/conversion_test.rb

@@ -23,6 +23,19 @@ foo bar {
 SCSS
   end
 
+  def test_empty_selector
+    assert_renders "foo bar", "foo bar {}"
+  end
+
+  def test_empty_directive
+    assert_scss_to_sass "@media screen", "@media screen {}"
+    assert_scss_to_scss "@media screen {}"
+  end
+
+  def test_empty_control_directive
+    assert_renders "@if false", "@if false {}"
+  end
+
   def test_nesting
     assert_renders <<SASS, <<SCSS
 foo bar
@@ -875,6 +888,60 @@ SCSS
     assert_sass_to_scss '$var: 12px $bar baz !default;', '$var ||= 12px $bar "baz"'
   end
 
+  def test_division_asserted_with_parens
+    assert_renders <<SASS, <<SCSS
+foo
+  a: (1px / 2px)
+SASS
+foo {
+  a: (1px / 2px); }
+SCSS
+  end
+
+  def test_division_not_asserted_when_unnecessary
+    assert_renders <<SASS, <<SCSS
+$var: 1px / 2px
+
+foo
+  a: $var
+SASS
+$var: 1px / 2px;
+
+foo {
+  a: $var; }
+SCSS
+
+    assert_renders <<SASS, <<SCSS
+$var: 1px
+
+foo
+  a: $var / 2px
+SASS
+$var: 1px;
+
+foo {
+  a: $var / 2px; }
+SCSS
+
+    assert_renders <<SASS, <<SCSS
+foo
+  a: 1 + 1px / 2px
+SASS
+foo {
+  a: 1 + 1px / 2px; }
+SCSS
+  end
+
+  def test_literal_slash
+    assert_renders <<SASS, <<SCSS
+foo
+  a: 1px / 2px
+SASS
+foo {
+  a: 1px / 2px; }
+SCSS
+  end
+
   # Hacks
 
   def test_declaration_hacks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml-edge
 version: !ruby/object:Gem::Version 
-  version: 2.3.220
+  version: 2.3.221
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency