haml 1.8.0 → 1.8.1

data/Rakefile

@@ -71,7 +71,7 @@ unless ARGV[0] == 'benchmark'
       list.exclude(/[a-z]/)
       list.exclude('TODO')
     end.to_a
-    spec.executables = ['haml', 'html2haml', 'sass']
+    spec.executables = ['haml', 'html2haml', 'sass', 'css2sass']
     spec.files = FileList['lib/**/*', 'bin/*', 'test/**/*', 'Rakefile', 'init.rb'].to_a + readmes
     spec.autorequire = ['haml', 'sass']
     spec.homepage = 'http://haml.hamptoncatlin.com/'

data/VERSION

@@ -1 +1 @@
-1.8.0
+1.8.1

data/lib/haml.rb

@@ -750,7 +750,7 @@ $LOAD_PATH << dir unless $LOAD_PATH.include?(dir)
 #
 # [<tt>:autoclose</tt>]     A list of tag names that should be automatically self-closed
 #                           if they have no content.
-#                           Defaults to <tt>['meta', 'img', 'link', 'script', 'br', 'hr']</tt>.
+#                           Defaults to <tt>['meta', 'img', 'link', 'br', 'hr', 'input', 'area']</tt>.
 #
 module Haml
   # This method is called by init.rb,

data/lib/haml/buffer.rb

@@ -115,7 +115,7 @@ module Haml
         else
           @buffer << "\n#{tabs(@real_tabs+1)}#{content}\n#{tabs(@real_tabs)}</#{name}>\n"
         end
-      else
+      elsif !atomic
         @real_tabs += 1
       end
     end
@@ -123,11 +123,15 @@ module Haml
     def self.merge_attrs(to, from)
       if to['id'] && from['id']
         to['id'] << '_' << from.delete('id')
+      elsif to['id'] || from['id']
+        from['id'] ||= to['id']
       end
 
       if to['class'] && from['class']
         # Make sure we don't duplicate class names
         from['class'] = (from['class'].split(' ') | to['class'].split(' ')).join(' ')
+      elsif to['class'] || from['class']
+        from['class'] ||= to['class']
       end
 
       to.merge!(from)

data/lib/haml/precompiler.rb

@@ -122,7 +122,7 @@ END
       @tab_change  = 0
 
       old_line = Line.new
-      (@template + "\n-#").split("\n").each_with_index do |text, index|
+      (@template + "\n-#\n-#").split("\n").each_with_index do |text, index|
         line = Line.new text.strip, text.lstrip.chomp, index
         line.spaces, line.tabs = count_soft_tabs(text)
 

data/lib/haml/template/plugin.rb

@@ -1,12 +1,23 @@
+# :stopdoc:
 # This file makes Haml work with Rails
 # using the > 2.0.1 template handler API.
 
 module Haml
   class Template
+    include ActionView::TemplateHandlers::Compilable if defined?(ActionView::TemplateHandlers::Compilable)
+
     def self.line_offset
       1
     end
 
+    def compilable?
+      true
+    end
+ 
+    def line_offset
+      self.class.line_offset
+    end
+
     def initialize(view)
       @view = view
     end
@@ -19,3 +30,4 @@ module Haml
 end
 
 ActionView::Base.register_template_handler(:haml, Haml::Template)
+# :startdoc:

data/lib/sass/plugin/merb.rb

@@ -1,10 +1,19 @@
 unless defined?(Sass::MERB_LOADED)
   Sass::MERB_LOADED = true
 
-  Sass::Plugin.options.merge!(:template_location  => MERB_ROOT + '/public/stylesheets/sass',
-                              :css_location       => MERB_ROOT + '/public/stylesheets',
-                              :always_check       => MERB_ENV != "production",
-                              :full_exception     => MERB_ENV != "production")
+  version = Merb::VERSION.split('.').map { |n| n.to_i }
+  if version[0] <= 0 && version[1] < 5
+    root = MERB_ROOT
+    env  = MERB_ENV
+  else
+    root = Merb.root
+    env  = Merb.environment
+  end
+
+  Sass::Plugin.options.merge!(:template_location  => root + '/public/stylesheets/sass',
+                              :css_location       => root + '/public/stylesheets',
+                              :always_check       => env != "production",
+                              :full_exception     => env != "production")
   config = Merb::Plugins.config[:sass] || Merb::Plugins.config["sass"] || {}
   config.symbolize_keys!
   Sass::Plugin.options.merge!(config)

data/lib/sass/plugin/rails.rb

@@ -5,9 +5,10 @@ unless defined?(Sass::RAILS_LOADED)
                               :css_location       => RAILS_ROOT + '/public/stylesheets',
                               :always_check       => RAILS_ENV != "production",
                               :full_exception     => RAILS_ENV != "production")
-  
-  module ActionController # :nodoc:
-    class Base # :nodoc:
+
+  # :stopdoc:
+  module ActionController
+    class Base
       alias_method :sass_old_process, :process
       def process(*args)
         Sass::Plugin.update_stylesheets if Sass::Plugin.options[:always_update] || Sass::Plugin.options[:always_check]
@@ -15,4 +16,5 @@ unless defined?(Sass::RAILS_LOADED)
       end
     end
   end
+  # :startdoc:
 end

data/test/haml/engine_test.rb

@@ -93,6 +93,10 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<img alt='' src='/foo.png' />\n", render("%img{:width => nil, :src => '/foo.png', :alt => String.new}"))
   end
 
+  def test_end_of_file_multiline
+    assert_equal("<p>0</p>\n<p>1</p>\n<p>2</p>\n", render("- for i in (0...3)\n  %p= |\n   i |"))
+  end
+
   # Options tests
 
   def test_stop_eval
@@ -135,6 +139,19 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p>nil</p>\n", render("%p{ :attr => x } nil", :locals => {:x => nil}))
   end
 
+  def test_nil_id_with_syntactic_id
+    assert_equal("<p id='foo'>nil</p>\n", render("%p#foo{:id => nil} nil"))
+    assert_equal("<p id='foo_bar'>nil</p>\n", render("%p#foo{{:id => 'bar'}, :id => nil} nil"))
+    assert_equal("<p id='foo_bar'>nil</p>\n", render("%p#foo{{:id => nil}, :id => 'bar'} nil"))
+  end
+
+  def test_nil_class_with_syntactic_class
+    assert_equal("<p class='foo'>nil</p>\n", render("%p.foo{:class => nil} nil"))
+    assert_equal("<p class='bar foo'>nil</p>\n", render("%p.bar.foo{:class => nil} nil"))
+    assert_equal("<p class='bar foo'>nil</p>\n", render("%p.foo{{:class => 'bar'}, :class => nil} nil"))
+    assert_equal("<p class='bar foo'>nil</p>\n", render("%p.foo{{:class => nil}, :class => 'bar'} nil"))
+  end
+
   def test_locals
     assert_equal("<p>Paragraph!</p>\n", render("%p= text", :locals => { :text => "Paragraph!" }))
   end
@@ -156,6 +173,10 @@ class EngineTest < Test::Unit::TestCase
     assert_equal("<p a='b2c'>\n</p>\n", render("%p{:a => 'b' + (1 + 1).to_s + 'c'}"))
   end
 
+  def test_dynamic_attrs_with_self_closed_tag
+    assert_equal("<a b='2' />\nc\n", render("%a{'b' => 1 + 1}/\n= 'c'\n"))
+  end
+
   def test_rec_merge
     hash1 = {1=>2, 3=>{5=>7, 8=>9}}
     hash2 = {4=>5, 3=>{5=>2, 16=>12}}

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
-date: 2008-01-06 00:00:00 -08:00
+  version: 1.8.1
+date: 2008-01-28 00:00:00 -08:00
 summary: An elegant, structured XHTML/XML templating engine. Comes with Sass, a similar CSS templating engine.
 require_paths: 
 - lib
@@ -199,6 +199,7 @@ executables:
 - haml
 - html2haml
 - sass
+- css2sass
 extensions: []
 
 requirements: []