haml 2.0.8 → 2.0.9

data/VERSION

@@ -1 +1 @@
-2.0.8
+2.0.9

data/lib/haml/helpers/action_view_mods.rb

@@ -86,7 +86,7 @@ if defined?(ActionView) and not defined?(Merb::Plugins)
       else
         module CaptureHelper
           def capture_with_haml(*args, &block)
-            if is_haml? && block_is_haml?(block)
+            if Haml::Helpers.block_is_haml?(block)
               capture_haml(*args, &block)
             else
               capture_without_haml(*args, &block)

data/lib/sass.rb

@@ -868,5 +868,6 @@ module Sass
 
 end
 
+require 'haml/util'
 require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)

data/lib/sass/css.rb

@@ -311,7 +311,7 @@ module Sass
     def remove_parent_refs(root)
       root.children.each do |child|
         if child.is_a?(Tree::RuleNode)
-          child.rule.gsub! /^& /, ''
+          child.rule.gsub! /^& +/, ''
           remove_parent_refs child
         end
       end
@@ -377,7 +377,7 @@ module Sass
     def fold_commas(root)
       prev_rule = nil
       root.children.map! do |child|
-        next child unless Tree::RuleNode === child
+        next child unless child.is_a?(Tree::RuleNode)
 
         if prev_rule && prev_rule.children == child.children
           prev_rule.rule << ", #{child.rule}"

data/lib/sass/tree/attr_node.rb

@@ -9,6 +9,10 @@ module Sass::Tree
       super(value, style)
     end
 
+    def ==(other)
+      self.class == other.class && name == other.name && super
+    end
+
     def to_s(tabs, parent_name = nil)
       if value[-1] == ?;
         raise Sass::SyntaxError.new("Invalid attribute: #{declaration.dump} (This isn't CSS!).", @line)

data/lib/sass/tree/node.rb

@@ -17,6 +17,10 @@ module Sass
         @children << child
       end
 
+      def ==(other)
+        self.class == other.class && other.children == children
+      end
+
       def to_s
         result = String.new
         children.each do |child|

data/lib/sass/tree/rule_node.rb

@@ -9,6 +9,10 @@ module Sass::Tree
     alias_method :rule, :value
     alias_method :rule=, :value=
 
+    def ==(other)
+      self.class == other.class && rules == other.rules && super
+    end
+
     def rules
       Array(rule)
     end

data/lib/sass/tree/value_node.rb

@@ -9,6 +9,10 @@ module Sass::Tree
       super(style)
     end
 
+    def ==(other)
+      self.class == other.class && value == other.value && super
+    end
+
     def to_s(tabs = 0)
       value
     end

data/test/haml/results/render_layout.xhtml

@@ -0,0 +1,3 @@
+Before
+During
+After

data/test/haml/template_test.rb

@@ -42,7 +42,8 @@ class TemplateTest < Test::Unit::TestCase
   TEMPLATES = %w{         very_basic        standard    helpers
     whitespace_handling   original_engine   list        helpful
     silent_script         tag_parsing       just_stuff  partials
-    filters               nuke_outer_whitespace         nuke_inner_whitespace }
+    filters               nuke_outer_whitespace         nuke_inner_whitespace
+    render_layout }
   # partial layouts were introduced in 2.0.0
   TEMPLATES << 'partial_layout' unless ActionPack::VERSION::MAJOR < 2
 

data/test/haml/templates/_layout.erb

@@ -0,0 +1,3 @@
+Before
+<%= yield -%>
+After

data/test/haml/templates/render_layout.haml

@@ -0,0 +1,2 @@
+= render :layout => 'layout' do
+  During

data/test/sass/css2sass_test.rb

@@ -0,0 +1,193 @@
+require 'test/unit'
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sass/css'
+
+class CSS2SassTest < Test::Unit::TestCase
+  def test_basic
+    css = <<CSS
+h1 {
+  color: red;
+}
+CSS
+    assert_equal(<<SASS, css2sass(css))
+h1
+  :color red
+SASS
+    assert_equal(<<SASS, css2sass(css, :alternate => true))
+h1
+  color: red
+SASS
+  end
+
+  def test_nesting
+    assert_equal(<<SASS, css2sass(<<CSS))
+li
+  :display none
+
+  a
+    :text-decoration none
+
+    span
+      :color yellow
+
+    &:hover
+      :text-decoration underline
+SASS
+li {
+  display: none;
+}
+
+li a {
+  text-decoration: none;
+}
+
+li a span {
+  color: yellow;
+}
+
+li a:hover {
+  text-decoration: underline;
+}
+CSS
+  end
+
+  def test_comments_multiline
+    css = <<CSS
+/* comment */
+elephant.rawr {
+  rampages: excessively;
+}
+
+/* actual multiline
+  comment */
+span.turkey {
+  isdinner: true;
+}
+
+.turducken {
+  /* Sounds funny
+     doesn't it */
+  chimera: not_really;
+}
+
+#overhere {
+  bored: sorta; /* it's for a good
+  cause */
+  better_than: thread_pools;
+}
+
+#one_more {
+  finally: srsly;
+} /* just a line here */
+CSS
+    sass = <<SASS
+elephant.rawr
+  :rampages excessively
+
+
+span.turkey
+  :isdinner true
+
+
+.turducken
+  :chimera not_really
+
+
+#overhere
+  :bored sorta
+  :better_than thread_pools
+
+
+#one_more
+  :finally srsly
+SASS
+    assert_equal(css2sass(css), sass)
+  end
+
+  def test_fold_commas
+    assert_equal(<<SASS, css2sass(<<CSS))
+li
+  .one, .two
+    :color red
+SASS
+li .one {
+  color: red;
+}
+li .two {
+  color: red;
+}
+CSS
+
+    assert_equal(<<SASS, css2sass(<<CSS))
+.one
+  :color green
+
+
+.two
+  :color green
+  :color red
+
+
+.three
+  :color red
+SASS
+.one, .two {
+  color: green;
+}
+
+.two, .three {
+  color: red;
+}
+CSS
+  end
+
+  def test_bad_formatting
+    assert_equal(<<SASS, css2sass(<<CSS))
+hello
+  :parent true
+
+  there
+    :parent false
+
+  who
+    :hoo false
+
+  why
+    :y true
+
+  when
+    :wen nao
+
+
+down_here
+  :yeah true
+SASS
+hello {
+  parent: true;
+}
+
+hello  there {
+  parent: false;
+}
+hello who  {
+  hoo: false;
+}
+hello why {
+   y: true;
+}
+hello when {
+  wen:  nao;
+}
+
+
+
+down_here { yeah: true; }
+CSS
+  end
+
+  private
+
+  def css2sass(string, opts={})
+    Sass::CSS.new(string, opts).render
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-13 00:00:00 -08:00
+date: 2009-02-21 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -81,6 +81,7 @@ files:
 - test/linked_rails.rb
 - test/benchmark.rb
 - test/sass
+- test/sass/css2sass_test.rb
 - test/sass/results
 - test/sass/results/constants.css
 - test/sass/results/parent_ref.css
@@ -144,6 +145,7 @@ files:
 - test/haml/results/eval_suppressed.xhtml
 - test/haml/results/nuke_inner_whitespace.xhtml
 - test/haml/results/whitespace_handling.xhtml
+- test/haml/results/render_layout.xhtml
 - test/haml/results/silent_script.xhtml
 - test/haml/results/standard.xhtml
 - test/haml/results/just_stuff.xhtml
@@ -161,10 +163,12 @@ files:
 - test/haml/templates/_layout_for_partial.haml
 - test/haml/templates/original_engine.haml
 - test/haml/templates/helpers.haml
+- test/haml/templates/_layout.erb
 - test/haml/templates/action_view_ugly.haml
 - test/haml/templates/content_for_layout.haml
 - test/haml/templates/silent_script.haml
 - test/haml/templates/very_basic.haml
+- test/haml/templates/render_layout.haml
 - test/haml/templates/filters.haml
 - test/haml/templates/_av_partial_1.haml
 - test/haml/templates/standard_ugly.haml
@@ -228,6 +232,7 @@ signing_key:
 specification_version: 2
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 test_files: 
+- test/sass/css2sass_test.rb
 - test/sass/engine_test.rb
 - test/sass/plugin_test.rb
 - test/haml/html2haml_test.rb