haml 4.0.7 → 4.1.0.alpha.2

data/test/gemfiles/Gemfile.rails-4.0.x.lock

@@ -0,0 +1,101 @@
+PATH
+  remote: ../../..
+  specs:
+    rails (4.0.0.beta1)
+      actionmailer (= 4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activerecord (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0.beta1)
+      sprockets-rails (~> 2.0.0.rc4)
+
+PATH
+  remote: /Users/norman/work/haml
+  specs:
+    haml (4.0.3)
+      tilt
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actionmailer (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      mail (~> 2.5.3)
+    actionpack (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+      erubis (~> 2.7.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      builder (~> 3.1.0)
+    activerecord (4.0.0.beta1)
+      activemodel (= 4.0.0.beta1)
+      activerecord-deprecated_finders (~> 0.0.3)
+      activesupport (= 4.0.0.beta1)
+      arel (~> 4.0.0.beta1)
+    activerecord-deprecated_finders (0.0.3)
+    activesupport (4.0.0.beta1)
+      i18n (~> 0.6.2)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.33)
+    arel (4.0.0)
+    atomic (1.1.9)
+    builder (3.1.4)
+    erubis (2.7.0)
+    hike (1.2.2)
+    i18n (0.6.4)
+    json (1.8.0)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    minitest (4.7.4)
+    multi_json (1.7.3)
+    nokogiri (1.5.9)
+    polyglot (0.3.3)
+    rack (1.5.2)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    railties (4.0.0.beta1)
+      actionpack (= 4.0.0.beta1)
+      activesupport (= 4.0.0.beta1)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.17.0, < 2.0)
+    rake (10.0.4)
+    rbench (0.2.3)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    sprockets (2.9.3)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0.rc4)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
+    thor (0.18.1)
+    thread_safe (0.1.0)
+      atomic
+    tilt (1.4.1)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.3.0)
+  haml!
+  minitest
+  nokogiri
+  rails (~> 4.0.0.beta1)!
+  rbench

data/test/helper_test.rb

@@ -14,16 +14,6 @@ module Haml::Helpers
   def something_that_uses_haml_concat
     haml_concat('foo').to_s
   end
-
-  def render_something_with_haml_concat
-    haml_concat "<p>"
-  end
-
-  def render_something_with_haml_tag_and_concat
-    haml_tag 'p' do
-      haml_concat '<foo>'
-    end
-  end
 end
 
 class HelperTest < MiniTest::Unit::TestCase
@@ -58,15 +48,6 @@ class HelperTest < MiniTest::Unit::TestCase
     super
   end
 
-  def test_rendering_with_escapes
-    output = render(<<-HAML, :action_view)
-- render_something_with_haml_concat
-- render_something_with_haml_tag_and_concat
-- render_something_with_haml_concat
-HAML
-    assert_equal("&lt;p&gt;\n<p>\n  <foo>\n</p>\n&lt;p&gt;\n", output)
-  end
-
   def test_flatten
     assert_equal("FooBar", Haml::Helpers.flatten("FooBar"))
 
@@ -140,16 +121,16 @@ HAML
   def test_form_tag
     # This is usually provided by ActionController::Base.
     def @base.protect_against_forgery?; false; end
-
-    rendered = render(<<HAML, :action_view)
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form accept-charset="UTF-8" action="foo" method="post">#{rails_form_opener}
+  <p>bar</p>
+  <strong>baz</strong>
+</form>
+HTML
 = form_tag 'foo' do
   %p bar
   %strong baz
 HAML
-    fragment = Nokogiri::HTML.fragment(rendered)
-    assert_equal 'foo', fragment.css('form').first.attributes['action'].to_s
-    assert_equal 'bar', fragment.css('form p').first.text.strip
-    assert_equal 'baz', fragment.css('form strong').first.text.strip
   end
 
   def test_pre
@@ -244,10 +225,11 @@ HAML
 
   def test_form_tag_in_helper_with_string_block
     def @base.protect_against_forgery?; false; end
-    rendered = render('= wacky_form', :action_view)
-    fragment = Nokogiri::HTML.fragment(rendered)
-    assert_equal 'bar', fragment.text.strip
-    assert_equal '/foo', fragment.css('form').first.attributes['action'].to_s
+    assert_equal(<<HTML, render(<<HAML, :action_view))
+<form accept-charset="UTF-8" action="/foo" method="post">#{rails_form_opener}bar</form>
+HTML
+= wacky_form
+HAML
   end
 
   def test_haml_tag_name_attribute_with_id
@@ -306,8 +288,12 @@ HAML
     assert_equal("<p id='foo&amp;bar'>baz</p>\n", render("%p{:id => 'foo&bar'} baz", :escape_html => true))
   end
 
-  def test_haml_tag_autoclosed_tags_are_closed
-    assert_equal("<br class='foo' />\n", render("- haml_tag :br, :class => 'foo'"))
+  def test_haml_tag_autoclosed_tags_are_closed_xhtml
+    assert_equal("<br class='foo' />\n", render("- haml_tag :br, :class => 'foo'", :format => :xhtml))
+  end
+
+  def test_haml_tag_autoclosed_tags_are_closed_html
+    assert_equal("<br class='foo'>\n", render("- haml_tag :br, :class => 'foo'", :format => :html5))
   end
 
   def test_haml_tag_with_class_array
@@ -338,7 +324,8 @@ HAML
   end
 
   def test_haml_tag_flags
-    assert_equal("<p />\n", render("- haml_tag :p, :/"))
+    assert_equal("<p />\n", render("- haml_tag :p, :/", :format => :xhtml))
+    assert_equal("<p>\n", render("- haml_tag :p, :/", :format => :html5))
     assert_equal("<p>kumquat</p>\n", render("- haml_tag :p, :< do\n  kumquat"))
 
     assert_raises(Haml::Error) { render("- haml_tag :p, 'foo', :/") }
@@ -385,6 +372,41 @@ HTML
 HAML
   end
 
+  def test_haml_tag_if_positive
+    assert_equal(<<HTML, render(<<HAML))
+<div class='conditional'>
+  <p>A para</p>
+</div>
+HTML
+- haml_tag_if true, '.conditional' do
+  %p A para
+HAML
+  end
+
+  def test_haml_tag_if_positive_with_attributes
+    assert_equal(<<HTML, render(<<HAML))
+<div class='conditional' foo='bar'>
+  <p>A para</p>
+</div>
+HTML
+- haml_tag_if true, '.conditional',  {:foo => 'bar'} do
+  %p A para
+HAML
+  end
+
+  def test_haml_tag_if_negative
+    assert_equal(<<HTML, render(<<HAML))
+<p>A para</p>
+HTML
+- haml_tag_if false, '.conditional' do
+  %p A para
+HAML
+  end
+
+  def test_haml_tag_if_error_return
+    assert_raises(Haml::Error) { render("= haml_tag_if false, '.conditional' do\n  %p Hello") }
+  end
+
   def test_is_haml
     assert(!ActionView::Base.new.is_haml?)
     assert_equal("true\n", render("= is_haml?"))
@@ -559,7 +581,7 @@ HAML
 
   def test_escape_once_leaves_numeric_references
     assert_equal "&quot;&gt;&lt;&amp; &#160;", Haml::Helpers.escape_once('"><& &#160;') #decimal
-    #assert_equal "&quot;&gt;&lt;&amp; &#x00a0;", Haml::Helpers.escape_once('"><& &#x00a0;') #hexadecimal
+    assert_equal "&quot;&gt;&lt;&amp; &#x00a0;", Haml::Helpers.escape_once('"><& &#x00a0;') #hexadecimal
   end
 
   def test_escape_once_encoding
@@ -571,6 +593,36 @@ HAML
     $stderr = old_stderr
   end
 
+  def test_html_attrs_xhtml
+    assert_equal("<html lang='en-US' xml:lang='en-US' xmlns='http://www.w3.org/1999/xhtml'></html>\n",
+                  render("%html{html_attrs}", :format => :xhtml))
+  end
+
+  def test_html_attrs_html4
+    assert_equal("<html lang='en-US'></html>\n",
+                  render("%html{html_attrs}", :format => :html4))
+  end
+
+  def test_html_attrs_html5
+    assert_equal("<html lang='en-US'></html>\n",
+                  render("%html{html_attrs}", :format => :html5))
+  end
+
+  def test_html_attrs_xhtml_other_lang
+    assert_equal("<html lang='es-AR' xml:lang='es-AR' xmlns='http://www.w3.org/1999/xhtml'></html>\n",
+                  render("%html{html_attrs('es-AR')}", :format => :xhtml))
+  end
+
+  def test_html_attrs_html4_other_lang
+    assert_equal("<html lang='es-AR'></html>\n",
+                  render("%html{html_attrs('es-AR')}", :format => :html4))
+  end
+
+  def test_html_attrs_html5_other_lang
+    assert_equal("<html lang='es-AR'></html>\n",
+                  render("%html{html_attrs('es-AR')}", :format => :html5))
+  end
+
   def test_escape_once_should_work_on_frozen_strings
     begin
       Haml::Helpers.escape_once('foo'.freeze)

data/test/parser_test.rb

@@ -94,6 +94,28 @@ module Haml
       end
     end
 
+    test "revealed conditional comments are detected" do
+      text = "some revealed text"
+      cond = "[cond]"
+
+      node = parse("/!#{cond} #{text}").children[0]
+
+      assert_equal text, node.value[:text]
+      assert_equal cond, node.value[:conditional]
+      assert node.value[:revealed]
+    end
+
+    test "hidden conditional comments are detected" do
+      text = "some revealed text"
+      cond = "[cond]"
+
+      node = parse("/#{cond} #{text}").children[0]
+
+      assert_equal text, node.value[:text]
+      assert_equal cond, node.value[:conditional]
+      refute node.value[:revealed]
+    end
+
     private
 
     def parse(haml, options = nil)

data/test/template_test.rb

@@ -83,12 +83,7 @@ class TemplateTest < MiniTest::Unit::TestCase
   def assert_renders_correctly(name, &render_method)
     old_options = Haml::Template.options.dup
     Haml::Template.options[:escape_html] = false
-    if ActionPack::VERSION::MAJOR < 2 ||
-        (ActionPack::VERSION::MAJOR == 2 && ActionPack::VERSION::MINOR < 2)
-      render_method ||= proc { |n| @base.render(n) }
-    else
-      render_method ||= proc { |n| @base.render(:file => n) }
-    end
+    render_method ||= proc { |n| @base.render(:file => n) }
 
     silence_warnings do
       load_result(name).split("\n").zip(render_method[name].split("\n")).each_with_index do |pair, line|
@@ -116,29 +111,6 @@ class TemplateTest < MiniTest::Unit::TestCase
     end
   end
 
-  def test_render_method_returning_null_with_ugly
-    @base.instance_eval do
-      def empty
-        nil
-      end
-      def render_something(&block)
-        capture(self, &block)
-      end
-    end
-
-    content_to_render = "%h1 This is part of the broken view.\n= render_something do |thing|\n  = thing.empty do\n    = 'test'"
-    result = render(content_to_render, :ugly => true)
-    expected_result = "<h1>This is part of the broken view.</h1>\n"
-    assert_equal(expected_result, result)
-  end
-
-  def test_simple_rendering_with_ugly
-    content_to_render = "%p test\n= capture { 'foo' }"
-    result = render(content_to_render, :ugly => true)
-    expected_result = "<p>test</p>\nfoo\n"
-    assert_equal(expected_result, result)
-  end
-
   def test_templates_should_render_correctly_with_render_proc
     assert_renders_correctly("standard") do |name|
       engine = Haml::Engine.new(File.read(File.dirname(__FILE__) + "/templates/#{name}.haml"), :format => :xhtml)

data/test/templates/with_bom.haml

@@ -0,0 +1 @@
+BOMG

data/test/test_helper.rb

@@ -65,6 +65,10 @@ class MiniTest::Unit::TestCase
     Haml::Util.silence_warnings(&block)
   end
 
+  def rails_form_opener
+    '<div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>'
+  end
+
   def assert_raises_message(klass, message)
     yield
   rescue Exception => e

data/test/util_test.rb

@@ -4,7 +4,6 @@ class UtilTest < MiniTest::Unit::TestCase
   include Haml::Util
 
   def test_powerset
-    return unless Set[Set[]] == Set[Set[]] # There's a bug in Ruby 1.8.6 that breaks nested set equality
     assert_equal([[].to_set].to_set,
       powerset([]))
     assert_equal([[].to_set, [1].to_set].to_set,
@@ -60,4 +59,11 @@ RUBY
       c.send(static_method_name(:static_method, false, false),
         "brush your teeth", "play with fire"))
   end
+
+  def test_check_encoding_does_not_destoy_the_given_string
+    string_with_bom = File.read(File.dirname(__FILE__) + '/templates/with_bom.haml', :encoding => Encoding::UTF_8)
+    original = string_with_bom.dup
+    check_encoding(string_with_bom)
+    assert_equal(original, string_with_bom)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 4.0.7
+  version: 4.1.0.alpha.2
 platform: ruby
 authors:
 - Nathan Weizenbaum
@@ -10,73 +10,73 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  type: :runtime
   name: tilt
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rails
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
+  type: :development
   name: rbench
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: minitest
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
+  type: :development
   name: nokogiri
+  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.10
-  type: :development
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -96,14 +96,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".yardopts"
-- CHANGELOG.md
-- FAQ.md
-- MIT-LICENSE
-- README.md
-- REFERENCE.md
-- Rakefile
-- bin/haml
 - lib/haml.rb
 - lib/haml/buffer.rb
 - lib/haml/compiler.rb
@@ -112,40 +104,39 @@ files:
 - lib/haml/exec.rb
 - lib/haml/filters.rb
 - lib/haml/helpers.rb
-- lib/haml/helpers/action_view_extensions.rb
-- lib/haml/helpers/action_view_mods.rb
-- lib/haml/helpers/action_view_xss_mods.rb
-- lib/haml/helpers/safe_erubis_template.rb
-- lib/haml/helpers/xss_mods.rb
 - lib/haml/options.rb
 - lib/haml/parser.rb
 - lib/haml/railtie.rb
 - lib/haml/sass_rails_filter.rb
 - lib/haml/template.rb
-- lib/haml/template/options.rb
-- lib/haml/template/plugin.rb
 - lib/haml/util.rb
 - lib/haml/version.rb
+- lib/haml/helpers/action_view_extensions.rb
+- lib/haml/helpers/action_view_mods.rb
+- lib/haml/helpers/action_view_xss_mods.rb
+- lib/haml/helpers/safe_erubis_template.rb
+- lib/haml/helpers/xss_mods.rb
+- lib/haml/template/options.rb
+- lib/haml/template/plugin.rb
+- bin/haml
 - test/engine_test.rb
+- test/filters_test.rb
+- test/helper_test.rb
+- test/parser_test.rb
+- test/template_test.rb
+- test/test_helper.rb
+- test/util_test.rb
 - test/erb/_av_partial_1.erb
 - test/erb/_av_partial_2.erb
 - test/erb/action_view.erb
 - test/erb/standard.erb
-- test/filters_test.rb
 - test/gemfiles/Gemfile.rails-3.0.x
 - test/gemfiles/Gemfile.rails-3.1.x
 - test/gemfiles/Gemfile.rails-3.2.x
 - test/gemfiles/Gemfile.rails-4.0.x
-- test/haml-spec/LICENSE
-- test/haml-spec/README.md
-- test/haml-spec/lua_haml_spec.lua
-- test/haml-spec/perl_haml_test.pl
-- test/haml-spec/ruby_haml_test.rb
-- test/haml-spec/tests.json
-- test/helper_test.rb
+- test/gemfiles/Gemfile.rails-4.0.x.lock
 - test/markaby/standard.mab
 - test/mocks/article.rb
-- test/parser_test.rb
 - test/results/content_for_layout.xhtml
 - test/results/eval_suppressed.xhtml
 - test/results/helpers.xhtml
@@ -164,7 +155,6 @@ files:
 - test/results/tag_parsing.xhtml
 - test/results/very_basic.xhtml
 - test/results/whitespace_handling.xhtml
-- test/template_test.rb
 - test/templates/_av_partial_1.haml
 - test/templates/_av_partial_1_ugly.haml
 - test/templates/_av_partial_2.haml
@@ -197,8 +187,14 @@ files:
 - test/templates/tag_parsing.haml
 - test/templates/very_basic.haml
 - test/templates/whitespace_handling.haml
-- test/test_helper.rb
-- test/util_test.rb
+- test/templates/with_bom.haml
+- Rakefile
+- ".yardopts"
+- CHANGELOG.md
+- FAQ.md
+- MIT-LICENSE
+- README.md
+- REFERENCE.md
 homepage: http://haml.info/
 licenses:
 - MIT
@@ -226,22 +222,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.1.5
 signing_key: 
 specification_version: 4
 summary: An elegant, structured (X)HTML/XML templating engine.
 test_files:
 - test/engine_test.rb
 - test/filters_test.rb
-- test/haml-spec/ruby_haml_test.rb
 - test/helper_test.rb
 - test/parser_test.rb
 - test/template_test.rb