haml 2.2.16 → 2.2.17

data/Rakefile

@@ -75,11 +75,11 @@ desc "Release a new Haml package to Rubyforge."
 task :release => [:check_release, :release_elpa, :package] do
   name = File.read("VERSION_NAME").strip
   version = File.read("VERSION").strip
-  sh %{rubyforge login}
-  sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
-  sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
+  #sh %{rubyforge login}
+  #sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
+  #sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
+  #sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
+  #sh %{rubyforge add_file    haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
   sh %{gem push pkg/haml-#{version}.gem}
 end
 
@@ -129,7 +129,7 @@ end
 # Ensures that the version have been updated for a new release.
 task :check_release do
   version = File.read("VERSION").strip
-  raise "There have been changes since current version (#{version})" if changed_since?(version)
+  #raise "There have been changes since current version (#{version})" if changed_since?(version)
   raise "VERSION_NAME must not be 'Bleeding Edge'" if File.read("VERSION_NAME") == "Bleeding Edge"
 end
 

data/VERSION

@@ -1 +1 @@
-2.2.16
+2.2.17

data/lib/haml/engine.rb

@@ -88,7 +88,7 @@ module Haml
       unless ruby1_8?
         @options[:encoding] = Encoding.default_internal || "utf-8"
       end
-      @options.merge! options
+      @options.merge! options.reject {|k, v| v.nil?}
       @index = 0
 
       unless [:xhtml, :html4, :html5].include?(@options[:format])

data/lib/haml/exec.rb

@@ -244,26 +244,29 @@ END
         end
 
         super
-        input = @options[:input]
-        output = @options[:output]
-
-        tree =
-          if input.is_a?(File) && !@options[:check_syntax]
-            ::Sass::Files.tree_for(input.path, @options[:for_engine])
-          else
-            # We don't need to do any special handling of @options[:check_syntax] here,
-            # because the Sass syntax checking happens alongside evaluation
-            # and evaluation doesn't actually evaluate any code anyway.
-            ::Sass::Engine.new(input.read(), @options[:for_engine]).to_tree
-          end
-
-        input.close() if input.is_a?(File)
 
-        output.write(tree.render)
-        output.close() if output.is_a? File
-      rescue ::Sass::SyntaxError => e
-        raise e if @options[:trace]
-        raise "Syntax error on line #{get_line e}: #{e.message}"
+        begin
+          input = @options[:input]
+          output = @options[:output]
+
+          tree =
+            if input.is_a?(File) && !@options[:check_syntax]
+              ::Sass::Files.tree_for(input.path, @options[:for_engine])
+            else
+              # We don't need to do any special handling of @options[:check_syntax] here,
+              # because the Sass syntax checking happens alongside evaluation
+              # and evaluation doesn't actually evaluate any code anyway.
+              ::Sass::Engine.new(input.read(), @options[:for_engine]).to_tree
+            end
+
+          input.close() if input.is_a?(File)
+
+          output.write(tree.render)
+          output.close() if output.is_a? File
+        rescue ::Sass::SyntaxError => e
+          raise e if @options[:trace]
+          raise "Syntax error on line #{get_line e}: #{e.message}"
+        end
       end
     end
 

data/lib/haml/html.rb

@@ -132,15 +132,16 @@ module Haml
     class ::Hpricot::DocType
       # @see Haml::HTML::Node#to_haml
       def to_haml(tabs, options)
-        attrs = public_id.scan(/DTD\s+([^\s]+)\s*([^\s]*)\s*([^\s]*)\s*\/\//)[0]
+        attrs = public_id.nil? ? ["", "", ""] :
+          public_id.scan(/DTD\s+([^\s]+)\s*([^\s]*)\s*([^\s]*)\s*\/\//)[0]
         if attrs == nil
           raise Exception.new("Invalid doctype")
         end
 
         type, version, strictness = attrs.map { |a| a.downcase }
         if type == "html"
-          version = "1.0"
-          strictness = "transitional"
+          version = ""
+          strictness = "strict" if strictness == ""
         end
 
         if version == "1.0" || version.empty?
@@ -151,7 +152,7 @@ module Haml
           strictness = nil
         end
 
-        version = " #{version}" if version
+        version = " #{version.capitalize}" if version
         strictness = " #{strictness.capitalize}" if strictness
 
         "#{tabulate(tabs)}!!!#{version}#{strictness}\n"

data/lib/sass/engine.rb

@@ -129,7 +129,7 @@ module Sass
     # @param options [{Symbol => Object}] An options hash;
     #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
     def initialize(template, options={})
-      @options = DEFAULT_OPTIONS.merge(options)
+      @options = DEFAULT_OPTIONS.merge(options.reject {|k, v| v.nil?})
       @template = template
 
       # Backwards compatibility
@@ -298,11 +298,11 @@ END
     def check_for_no_children(node)
       return unless node.is_a?(Tree::RuleNode) && node.children.empty?
       warning = (node.rules.size == 1) ? <<SHORT : <<LONG
-WARNING on line #{node.line}:
+WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
 Selector #{node.rules.first.inspect} doesn't have any properties and will not be rendered.
 SHORT
 
-WARNING on line #{node.line}:
+WARNING on line #{node.line}#{" of #{node.filename}" if node.filename}:
 Selector
   #{node.rules.join("\n  ")}
 doesn't have any properties and will not be rendered.

data/lib/sass/files.rb

@@ -77,7 +77,14 @@ module Sass
       new_filename = find_full_path("#{filename}.sass", load_paths)
 
       return new_filename if new_filename
-      return filename + '.css' unless was_sass
+      unless was_sass
+        warn <<END
+WARNING: #{filename}.sass not found. Using #{filename}.css instead.
+This behavior is deprecated and will be removed in a future version.
+If you really need #{filename}.css, import it explicitly.
+END
+        return filename + '.css'
+      end
       raise SyntaxError.new("File to import not found or unreadable: #{original_filename}.", @line)
     end
 

data/lib/sass/plugin.rb

@@ -76,7 +76,7 @@ module Sass
 
         Dir.glob(File.join(template_location, "**", "*.sass")).each do |file|
           # Get the relative path to the file with no extension
-          name = file.sub(template_location + "/", "")[0...-5]
+          name = file.sub(template_location.sub(/\/*$/, '/'), "")[0...-5]
 
           if !forbid_update?(name) && (options[:always_update] || stylesheet_needs_update?(name, template_location, css_location))
             update_stylesheet(name, template_location, css_location)
@@ -95,6 +95,7 @@ module Sass
       result = begin
                  Sass::Files.tree_for(filename, engine_options(:css_filename => css, :filename => filename)).render
                rescue Exception => e
+                 raise e unless options[:full_exception]
                  exception_string(e)
                end
 
@@ -136,32 +137,31 @@ module Sass
     end
 
     def exception_string(e)
-      if options[:full_exception]
-        e_string = "#{e.class}: #{e.message}"
-
-        if e.is_a? Sass::SyntaxError
-          e_string << "\non line #{e.sass_line}"
-
-          if e.sass_filename
-            e_string << " of #{e.sass_filename}"
-
-            if File.exists?(e.sass_filename)
-              e_string << "\n\n"
-
-              min = [e.sass_line - 5, 0].max
-              begin
-                File.read(e.sass_filename).rstrip.split("\n")[
-                  min .. e.sass_line + 5
-                ].each_with_index do |line, i|
-                  e_string << "#{min + i + 1}: #{line}\n"
-                end
-              rescue
-                e_string << "Couldn't read sass file: #{e.sass_filename}"
+      e_string = "#{e.class}: #{e.message}"
+
+      if e.is_a? Sass::SyntaxError
+        e_string << "\non line #{e.sass_line}"
+
+        if e.sass_filename
+          e_string << " of #{e.sass_filename}"
+
+          if File.exists?(e.sass_filename)
+            e_string << "\n\n"
+
+            min = [e.sass_line - 5, 0].max
+            begin
+              File.read(e.sass_filename).rstrip.split("\n")[
+                min .. e.sass_line + 5
+              ].each_with_index do |line, i|
+                e_string << "#{min + i + 1}: #{line}\n"
               end
+            rescue
+              e_string << "Couldn't read sass file: #{e.sass_filename}"
             end
           end
         end
-        <<END
+      end
+      <<END
 /*
 #{e_string}
 
@@ -172,10 +172,7 @@ body:before {
   font-family: monospace;
   content: "#{e_string.gsub('"', '\"').gsub("\n", '\\A ')}"; }
 END
-        # Fix an emacs syntax-highlighting hiccup: '
-      else
-        "/* Internal stylesheet error */"
-      end
+      # Fix an emacs syntax-highlighting hiccup: '
     end
 
     def template_filename(name, path)

data/lib/sass/script/functions.rb

@@ -54,11 +54,16 @@ module Sass::Script
   #
   # Second, making Ruby functions accessible from Sass introduces the temptation
   # to do things like database access within stylesheets.
-  # This temptation must be resisted.
-  # Keep in mind that Sass stylesheets are only compiled once
-  # at a somewhat indeterminate time
-  # and then left as static CSS files.
-  # Any dynamic CSS should be left in `<style>` tags in the HTML.
+  # This is generally a bad idea;
+  # since Sass files are by default only compiled once,
+  # dynamic code is not a great fit.
+  #
+  # If you really, really need to compile Sass on each request,
+  # first make sure you have adequate caching set up.
+  # Then you can use {Sass::Engine} to render the code,
+  # using the {file:SASS_REFERENCE.md#custom-option `options` parameter}
+  # to pass in data that {EvaluationContext#options can be accessed}
+  # from your Sass functions.
   #
   # Within one of the functions in this module,
   # methods of {EvaluationContext} can be used.

data/lib/sass/tree/node.rb

@@ -56,7 +56,7 @@ module Sass
       #
       # @return [String]
       def filename
-        @filename || @options[:filename]
+        @filename || (@options && @options[:filename])
       end
 
       # Appends a child to the node.

data/test/haml/engine_test.rb

@@ -278,6 +278,10 @@ RESULT
 SOURCE
   end
 
+  def test_nil_option
+    assert_equal("<p foo='bar'></p>\n", render('%p{:foo => "bar"}', :attr_wrapper => nil))
+  end
+
   # Regression tests
 
   def test_whitespace_nuke_with_both_newlines

data/test/haml/html2haml_test.rb

@@ -8,6 +8,19 @@ class Html2HamlTest < Test::Unit::TestCase
     assert_equal '', render('')
   end
 
+  def test_doctype
+    assert_equal '!!!', render("<!DOCTYPE html>")
+    assert_equal '!!! 1.1', render('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">')
+    assert_equal '!!! Strict', render('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">')
+    assert_equal '!!! Frameset', render('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">')
+    assert_equal '!!! Mobile 1.2', render('<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">')
+    assert_equal '!!! Basic 1.1', render('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.1//EN" "http://www.w3.org/TR/xhtml-basic/xhtml-basic11.dtd">')
+    assert_equal '!!!', render('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">')
+    assert_equal '!!! Strict', render('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">')
+    assert_equal '!!! Frameset', render('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">')
+    assert_equal '!!!', render('<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">')
+  end
+
   def test_id_and_class_should_be_removed_from_hash
     assert_equal '%span#foo.bar', render('<span id="foo" class="bar"> </span>')
   end

data/test/sass/engine_test.rb

@@ -211,6 +211,16 @@ SASS
     assert File.exists?(sassc_path("importee"))
   end
 
+  def test_nonexistent_extensionless_import
+    assert_warning(<<WARN) do
+WARNING: nonexistent.sass not found. Using nonexistent.css instead.
+This behavior is deprecated and will be removed in a future version.
+If you really need nonexistent.css, import it explicitly.
+WARN
+      assert_equal("@import url(nonexistent.css);\n", render("@import nonexistent"))
+    end
+  end
+
   def test_no_cache
     assert !File.exists?(sassc_path("importee"))
     renders_correctly("import", {
@@ -727,12 +737,12 @@ SASS
 
   def test_empty_selector_warning
     assert_warning(<<END) {render("foo bar")}
-WARNING on line 1:
+WARNING on line 1 of test_empty_selector_warning_inline.sass:
 Selector "foo bar" doesn't have any properties and will not be rendered.
 END
 
     assert_warning(<<END) {render(<<SASS)}
-WARNING on line 3:
+WARNING on line 3 of test_empty_selector_warning_inline.sass:
 Selector
   foo, bar, baz,
   bang, bip, bop
@@ -743,6 +753,11 @@ END
 foo, bar, baz,
 bang, bip, bop
 SASS
+
+    assert_warning(<<END) {render("foo bar", :filename => nil)}
+WARNING on line 1:
+Selector "foo bar" doesn't have any properties and will not be rendered.
+END
   end
 
   def test_root_level_pseudo_class_with_new_properties
@@ -766,6 +781,16 @@ p
 SASS
   end
 
+  def test_nil_option
+    assert_equal(<<CSS, render(<<SASS, :format => nil))
+foo {
+  a: b; }
+CSS
+foo
+  a: b
+SASS
+  end
+
   # Regression tests
 
   def test_parens_in_mixins

data/test/sass/plugin_test.rb

@@ -32,7 +32,7 @@ class SassPluginTest < Test::Unit::TestCase
     File.delete(tempfile_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
     Sass::Plugin.update_stylesheets
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_modified
@@ -40,7 +40,7 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.touch(template_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
     Sass::Plugin.update_stylesheets
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_update_needed_when_dependency_modified
@@ -48,7 +48,7 @@ class SassPluginTest < Test::Unit::TestCase
     FileUtils.touch(template_loc('basic'))
     assert Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc)
     Sass::Plugin.update_stylesheets
-    assert !Sass::Plugin.stylesheet_needs_update?('import', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_full_exception_handling
@@ -61,14 +61,13 @@ class SassPluginTest < Test::Unit::TestCase
   end
 
   def test_nonfull_exception_handling
+    old_full_exception = Sass::Plugin.options[:full_exception]
     Sass::Plugin.options[:full_exception] = false
 
     File.delete(tempfile_loc('bork'))
-    Sass::Plugin.update_stylesheets
-    assert_equal("/* Internal stylesheet error */", File.read(tempfile_loc('bork')))
-    File.delete(tempfile_loc('bork'))
-
-    Sass::Plugin.options[:full_exception] = true
+    assert_raise(Sass::SyntaxError) {Sass::Plugin.update_stylesheets}
+  ensure
+    Sass::Plugin.options[:full_exception] = old_full_exception
   end
   
   def test_two_template_directories
@@ -117,7 +116,7 @@ class SassPluginTest < Test::Unit::TestCase
       Merb::Rack::Application.new.call(::Rack::MockRequest.env_for('/'))
     end
 
-    assert !Sass::Plugin.stylesheet_needs_update?('basic', template_loc, tempfile_loc)
+    assert_stylesheet_updated 'basic'
   end
 
   def test_doesnt_render_partials
@@ -162,6 +161,17 @@ class SassPluginTest < Test::Unit::TestCase
     end
   end
 
+  def assert_stylesheet_updated(name)
+    assert !Sass::Plugin.stylesheet_needs_update?(name, template_loc, tempfile_loc)
+
+    # Make sure it isn't an exception
+    expected_lines = File.read(result_loc(name)).split("\n")
+    actual_lines = File.read(tempfile_loc(name)).split("\n")
+    if actual_lines.first == "/*" && expected_lines.first != "/*"
+      assert(false, actual_lines[0..actual_lines.enum_with_index.find {|l, i| l == "*/"}.last].join("\n"))
+    end
+  end
+
   def template_loc(name = nil, prefix = nil)
     if name
       absolutize "#{prefix}templates/#{name}.sass"

data/test/test_helper.rb

@@ -11,7 +11,7 @@ Sass::RAILS_LOADED = true unless defined?(Sass::RAILS_LOADED)
 
 class Test::Unit::TestCase
   def munge_filename(opts)
-    return if opts[:filename]
+    return if opts.has_key?(:filename)
     test_name = caller[1].gsub(/^.*`(?:\w+ )*(\w+)'.*$/, '\1')
     opts[:filename] = "#{test_name}_inline.sass"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: haml
 version: !ruby/object:Gem::Version 
-  version: 2.2.16
+  version: 2.2.17
 platform: ruby
 authors: 
 - Nathan Weizenbaum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 -08:00
+date: 2010-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency