haml-edge 2.3.194 → 2.3.195

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-2.3.194
+2.3.195

data/VERSION

@@ -1 +1 @@
-2.3.194
+2.3.195

data/lib/haml/exec.rb

@@ -15,14 +15,11 @@ module Haml
 
       # Parses the command-line arguments and runs the executable.
       # Calls `Kernel#exit` at the end, so it never returns.
+      #
+      # @see #parse
       def parse!
         begin
-          @opts = OptionParser.new(&method(:set_opts))
-          @opts.parse!(@args)
-
-          process_result
-
-          @options
+          parse
         rescue Exception => e
           raise e if @options[:trace] || e.is_a?(SystemExit)
 
@@ -32,6 +29,19 @@ module Haml
         exit 0
       end
 
+      # Parses the command-line arguments and runs the executable.
+      # This does not handle exceptions or exit the program.
+      #
+      # @see #parse!
+      def parse
+        @opts = OptionParser.new(&method(:set_opts))
+        @opts.parse!(@args)
+
+        process_result
+
+        @options
+      end
+
       # @return [String] A description of the executable
       def to_s
         @opts.to_s

data/lib/sass/css.rb

@@ -79,7 +79,10 @@ module Sass
     # @param root [Tree::Node] The parent node
     def expand_commas(root)
       root.children.map! do |child|
-        next child unless Tree::RuleNode === child && child.rule.first.include?(',')
+        unless child.is_a?(Tree::RuleNode) && child.rule.first.include?(',')
+          expand_commas(child) if child.is_a?(Tree::DirectiveNode)
+          next child
+        end
         child.rule.first.split(',').map do |rule|
           node = Tree::RuleNode.new([rule.strip])
           node.children = child.children
@@ -126,9 +129,12 @@ module Sass
     def parent_ref_rules(root)
       current_rule = nil
       root.children.map! do |child|
-        next child unless child.is_a?(Tree::RuleNode)
+        unless child.is_a?(Tree::RuleNode)
+          parent_ref_rules(child) if child.is_a?(Tree::DirectiveNode)
+          next child
+        end
 
-        first, rest = child.rule.first.scan(/^(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?$/).first
+        first, rest = child.rule.first.scan(/\A(&?(?: .|[^ ])[^.#: \[]*)([.#: \[].*)?\Z/m).first
 
         if current_rule.nil? || current_rule.rule.first != first
           current_rule = Tree::RuleNode.new([first])
@@ -164,9 +170,12 @@ module Sass
     # @param root [Tree::Node] The parent node
     def remove_parent_refs(root)
       root.children.each do |child|
-        if child.is_a?(Tree::RuleNode)
+        case child
+        when Tree::RuleNode
           child.rule.first.gsub! /^& +/, ''
           remove_parent_refs child
+        when Tree::DirectiveNode
+          remove_parent_refs child
         end
       end
     end
@@ -195,7 +204,14 @@ module Sass
     #
     # @param root [Tree::Node] The parent node
     def flatten_rules(root)
-      root.children.each { |child| flatten_rule(child) if child.is_a?(Tree::RuleNode) }
+      root.children.each do |child|
+        case child
+        when Tree::RuleNode
+          flatten_rule(child)
+        when Tree::DirectiveNode
+          flatten_rules(child)
+        end
+      end
     end
 
     # Flattens a single rule
@@ -236,7 +252,10 @@ module Sass
     def fold_commas(root)
       prev_rule = nil
       root.children.map! do |child|
-        next child unless child.is_a?(Tree::RuleNode)
+        unless child.is_a?(Tree::RuleNode)
+          fold_commas(child) if child.is_a?(Tree::DirectiveNode)
+          next child
+        end
 
         if prev_rule && prev_rule.children == child.children
           prev_rule.rule.first << ", #{child.rule.first}"

data/test/sass/css2sass_test.rb

@@ -237,6 +237,37 @@ SASS
 CSS
   end
 
+  # Regressions
+
+  def test_nesting_within_media
+    assert_equal(<<SASS, css2sass(<<CSS))
+@media all
+  .next .vevent
+    padding-left: 0
+    padding-right: 0
+SASS
+@media all {
+  .next .vevent {
+    padding-left: 0;
+    padding-right: 0; } }
+CSS
+  end
+
+  def test_multiline_selector_within_media_and_with_child_selector
+    assert_equal(<<SASS, css2sass(<<CSS))
+@media all
+  foo bar, baz
+    padding-left: 0
+    padding-right: 0
+SASS
+@media all {
+  foo bar,
+  baz {
+    padding-left: 0;
+    padding-right: 0; } }
+CSS
+  end
+
   # Error reporting
 
   def test_error_reporting

metadata

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