haml 5.0.0 → 5.0.1

data/lib/haml/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Haml
-  VERSION = "5.0.0"
+  VERSION = "5.0.1"
 end

data/test/attribute_parser_test.rb

@@ -65,6 +65,10 @@ class AttributeParserTeset < Haml::TestCase
         it { assert_parse(nil, '%Q[f#{o}o] => bar ') }
       end
 
+      describe 'string interpolation' do
+        it { assert_parse({ 'foo' => %q["#{bar baz, '/abc/'}"] }, %q[{foo: "#{bar baz, '/abc/'}"}]) }
+      end
+
       describe 'multi lines' do
         it { assert_parse({ 'a' => 'b', 'c' => 'd' }, "{a: b,\nc: d}") }
       end

data/test/engine_test.rb

@@ -151,6 +151,13 @@ class EngineTest < Haml::TestCase
     assert_equal("<p class='3'>foo</p>", render("%p{:class => 1+2} foo").chomp)
   end
 
+  def test_attributes_with_interpolation
+    assert_equal("<iframe id='test' src='http://www.google.com/abc/'></iframe>\n", render(<<-'HAML'))
+- base_url = "http://www.google.com"
+%iframe#test{src: "#{File.join base_url, '/abc/'}"}
+    HAML
+  end
+
   def test_class_attr_with_array
     assert_equal("<p class='a b'>foo</p>\n", render("%p{:class => %w[a b]} foo")) # basic
     assert_equal("<p class='a b css'>foo</p>\n", render("%p.css{:class => %w[a b]} foo")) # merge with css

data/test/filters_test.rb

@@ -126,23 +126,18 @@ end
 
 class ErbFilterTest < Haml::TestCase
   test "multiline expressions should work" do
-    html = "foobarbaz\n"
+    html = "foobarbaz\n\n"
     haml = %Q{:erb\n  <%= "foo" +\n      "bar" +\n      "baz" %>}
     assert_equal(html, render(haml))
   end
 
   test "should evaluate in the same context as Haml" do
     haml  = ":erb\n  <%= foo %>"
-    html  = "bar\n"
+    html  = "bar\n\n"
     scope = Object.new.instance_eval {foo = "bar"; nil if foo; binding}
     assert_equal(html, render(haml, :scope => scope))
   end
 
-  test "should use Rails's XSS safety features" do
-    assert_equal("&lt;img&gt;\n", render(":erb\n  <%= '<img>' %>"))
-    assert_equal("<img>\n", render(":erb\n  <%= '<img>'.html_safe %>"))
-  end
-
 end
 
 class JavascriptFilterTest < Haml::TestCase

data/test/template_test.rb

@@ -250,6 +250,16 @@ HAML
     assert_equal("Foo & Bar & Baz\n", render('Foo #{Haml::Util.html_safe("&")} Bar #{"&"} Baz', :action_view))
   end
 
+  def test_xss_protection_with_erb_filter
+    if defined?(Haml::SafeErubiTemplate)
+      assert_equal("&lt;img&gt;\n\n", render(":erb\n  <%= '<img>' %>", :action_view))
+      assert_equal("<img>\n\n", render(":erb\n  <%= '<img>'.html_safe %>", :action_view))
+    else # For Haml::SafeErubisTemplate
+      assert_equal("&lt;img&gt;\n", render(":erb\n  <%= '<img>' %>", :action_view))
+      assert_equal("<img>\n", render(":erb\n  <%= '<img>'.html_safe %>", :action_view))
+    end
+  end
+
   def test_rendered_string_is_html_safe
     assert(render("Foo").html_safe?)
   end

data/yard/default/.gitignore

@@ -0,0 +1 @@
+*.css

data/yard/default/fulldoc/html/css/common.sass

@@ -0,0 +1,15 @@
+#filecontents
+  *:target, dt:target + dd
+    background-color: #ccf
+    border: 1px solid #88b
+  dt
+    font-weight: bold
+  dd
+    margin:
+      left: 0
+      bottom: 0.7em
+    padding-left: 3em
+  dt:target
+    border-bottom-style: none
+    & + dd
+      border-top-style: none

data/yard/default/layout/html/footer.erb

@@ -0,0 +1,12 @@
+<%= superb :footer %>
+<% if ENV["ANALYTICS"] %>
+  <script type="text/javascript">
+  var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+  document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+  </script>
+  <script type="text/javascript">
+  try {
+  var pageTracker = _gat._getTracker("<%= ENV["ANALYTICS"] %>");
+  pageTracker._trackPageview();
+  } catch(err) {}</script>
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haml
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Natalie Weizenbaum
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -111,15 +111,23 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - FAQ.md
+- Gemfile
 - MIT-LICENSE
 - README.md
 - REFERENCE.md
 - Rakefile
+- TODO
+- benchmark.rb
 - bin/haml
+- haml.gemspec
 - lib/haml.rb
+- lib/haml/.gitattributes
 - lib/haml/attribute_builder.rb
 - lib/haml/attribute_compiler.rb
 - lib/haml/attribute_parser.rb
@@ -151,76 +159,16 @@ files:
 - lib/haml/version.rb
 - test/attribute_parser_test.rb
 - test/engine_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-4.0.x
-- test/gemfiles/Gemfile.rails-4.0.x.lock
-- test/gemfiles/Gemfile.rails-4.1.x
-- test/gemfiles/Gemfile.rails-4.2.x
-- test/gemfiles/Gemfile.rails-5.0.x
 - test/helper_test.rb
-- test/markaby/standard.mab
-- test/mocks/article.rb
 - test/options_test.rb
 - test/parser_test.rb
-- test/results/bemit.xhtml
-- test/results/content_for_layout.xhtml
-- test/results/eval_suppressed.xhtml
-- test/results/helpers.xhtml
-- test/results/helpful.xhtml
-- test/results/just_stuff.xhtml
-- test/results/list.xhtml
-- test/results/nuke_inner_whitespace.xhtml
-- test/results/nuke_outer_whitespace.xhtml
-- test/results/original_engine.xhtml
-- test/results/partial_layout.xhtml
-- test/results/partial_layout_erb.xhtml
-- test/results/partials.xhtml
-- test/results/render_layout.xhtml
-- test/results/silent_script.xhtml
-- test/results/standard.xhtml
-- test/results/tag_parsing.xhtml
-- test/results/very_basic.xhtml
-- test/results/whitespace_handling.xhtml
 - test/template_test.rb
-- test/template_test_helper.rb
-- test/templates/_av_partial_1.haml
-- test/templates/_av_partial_2.haml
-- test/templates/_layout.erb
-- test/templates/_layout_for_partial.haml
-- test/templates/_partial.haml
-- test/templates/_text_area.haml
-- test/templates/_text_area_helper.html.haml
-- test/templates/action_view.haml
-- test/templates/bemit.haml
-- test/templates/breakage.haml
-- test/templates/content_for_layout.haml
-- test/templates/eval_suppressed.haml
-- test/templates/helpers.haml
-- test/templates/helpful.haml
-- test/templates/just_stuff.haml
-- test/templates/list.haml
-- test/templates/nuke_inner_whitespace.haml
-- test/templates/nuke_outer_whitespace.haml
-- test/templates/original_engine.haml
-- test/templates/partial_layout.haml
-- test/templates/partial_layout_erb.erb
-- test/templates/partialize.haml
-- test/templates/partials.haml
-- test/templates/render_layout.haml
-- test/templates/silent_script.haml
-- test/templates/standard.haml
-- test/templates/standard_ugly.haml
-- test/templates/tag_parsing.haml
-- test/templates/very_basic.haml
-- test/templates/whitespace_handling.haml
-- test/templates/with_bom.haml
 - test/temple_line_counter_test.rb
-- test/test_helper.rb
 - test/util_test.rb
+- yard/default/.gitignore
+- yard/default/fulldoc/html/css/common.sass
+- yard/default/layout/html/footer.erb
 homepage: http://haml.info/
 licenses:
 - MIT

data/test/erb/_av_partial_1.erb

@@ -1,12 +0,0 @@
-<h2>This is a pretty complicated partial</h2>
-<div class="partial">
-  <p>It has several nested partials,</p>
-  <ul>
-    <% 5.times do %>
-      <li>
-        <strong>Partial:</strong>
-        <% @nesting = 5 %>
-        <%= render :partial => 'erb/av_partial_2' %>
-    <% end %>
-  </ul>
-</div>

data/test/erb/_av_partial_2.erb

@@ -1,8 +0,0 @@
-<% @nesting -= 1 %>
-<div class="partial" level="<%= @nesting %>">
-  <h3>This is a crazy deep-nested partial.</h3>
-  <p>Nesting level <%= @nesting %></p>
-  <% if @nesting > 0 %>
-    <%= render :partial => 'erb/av_partial_2' %>
-  <% end %>
-</div>

data/test/erb/action_view.erb

@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US'>
-  <head>
-    <title>Hampton Catlin Is Totally Awesome</title>
-    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
-  </head>
-  <body>
-    <h1>
-      This is very much like the standard template,
-      except that it has some ActionView-specific stuff.
-      It's only used for benchmarking.
-    </h1>
-    <div class="crazy_partials">
-      <%= render :partial => 'erb/av_partial_1' %>
-    </div>
-    <!-- You're In my house now! -->
-    <div class='header'>
-      Yes, ladies and gentileman. He is just that egotistical.
-      Fantastic! This should be multi-line output
-      The question is if this would translate! Ahah!
-      <%= 1 + 9 + 8 + 2 %>
-      <%# numbers should work and this should be ignored %>
-    </div>
-    <% 120.times do |number| -%>
-      <%= number %>
-    <% end -%>
-    <div id='body'><%= " Quotes should be loved! Just like people!" %></div>
-    Wow.
-    <p>
-      <%= "Holy cow        " +
-          "multiline       " +
-          "tags!           " +
-          "A pipe (|) even!"  %>
-      <%= [1, 2, 3].collect { |n| "PipesIgnored|" } %>
-      <%= [1, 2, 3].collect { |n|
-          n.to_s
-        }.join("|") %>
-    </p>
-    <div class='silent'>
-      <% foo = String.new
-         foo << "this"
-         foo << " shouldn't"
-         foo << " evaluate" %>
-      <%= foo + "but now it should!" %>
-      <%# Woah crap a comment! %>
-    </div>
-    <ul class='really cool'>
-      <% ('a'..'f').each do |a|%>
-      <li><%= a %>
-      <% end %>
-    <div class='of_divs_with_underscore' id='combo'><%= @should_eval = "with this text" %></div>
-    <%= [ 104, 101, 108, 108, 111 ].map do |byte|
-      byte.chr
-    end %>
-    <div class='footer'>
-      <strong class='shout'>
-        <%= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid.\n" + 
-"        So, I'm just making it *really* long. God, I hope this works" %>
-      </strong>
-    </div>
-  </body>
-</html>

data/test/erb/standard.erb

@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en-US' lang='en-US'>
-  <head>
-    <title>Hampton Catlin Is Totally Awesome</title>
-    <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
-  </head>
-  <body>
-    <!-- You're In my house now! -->
-    <div class='header'>
-      Yes, ladies and gentileman. He is just that egotistical.
-      Fantastic! This should be multi-line output
-      The question is if this would translate! Ahah!
-      <%= 1 + 9 + 8 + 2 %>
-      <%# numbers should work and this should be ignored %>
-    </div>
-    <% 120.times do |number| -%>
-      <%= number %>
-    <% end -%>
-    <div id='body'><%= " Quotes should be loved! Just like people!" %></div>
-    Wow.
-    <p code="<%= 1 + 2 %>">
-      <%= "Holy cow        " +
-          "multiline       " +
-          "tags!           " +
-          "A pipe (|) even!"  %>
-      <%= [1, 2, 3].collect { |n| "PipesIgnored|" }.join %>
-      <%= [1, 2, 3].collect { |n|
-          n.to_s
-        }.join("|") %>
-    </p>
-    <% bar = 17 %>
-    <div class='silent' foo="<%= bar %>">
-      <% foo = String.new
-         foo << "this"
-         foo << " shouldn't"
-         foo << " evaluate" %>
-      <%= foo + "but now it should!" %>
-      <%# Woah crap a comment! %>
-    </div>
-    <ul class='really cool'>
-      <% ('a'..'f').each do |a|%>
-      <li><%= a %></li>
-      <% end %>
-    <div class='of_divs_with_underscore' id='combo'><%= @should_eval = "with this text" %></div>
-    <%= "foo".each_line do |line|
-      nil
-    end %>
-    <div class='footer'>
-      <strong class='shout'>
-        <%= "This is a really long ruby quote. It should be loved and wrapped because its more than 50 characters. This value may change in the future and this test may look stupid.\n" + 
-"        So, I'm just making it *really* long. God, I hope this works" %>
-      </strong>
-    </div>
-  </body>
-</html>

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

@@ -1,11 +0,0 @@
-source "https://rubygems.org"
-
-if ENV['TRAVIS']
-  platform :mri_21 do
-    gem 'coveralls', require: false
-  end
-end
-
-gem 'rails', '~> 4.0.0'
-gem 'nokogiri', RUBY_VERSION < '2.1' ? '~> 1.6.0' : '>= 1.7'
-gemspec :path => '../..'

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

@@ -1,87 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    haml (4.0.7)
-      tilt
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.0.13)
-      actionpack (= 4.0.13)
-      mail (~> 2.5, >= 2.5.4)
-    actionpack (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-      erubis (~> 2.7.0)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    activemodel (4.0.13)
-      activesupport (= 4.0.13)
-      builder (~> 3.1.0)
-    activerecord (4.0.13)
-      activemodel (= 4.0.13)
-      activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.13)
-      arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.4)
-    activesupport (4.0.13)
-      i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    arel (4.0.2)
-    builder (3.1.4)
-    concurrent-ruby (1.0.2)
-    erubis (2.7.0)
-    i18n (0.7.0)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (2.99.2)
-    minitest (4.7.5)
-    multi_json (1.12.1)
-    nokogiri (1.5.11)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.0.13)
-      actionmailer (= 4.0.13)
-      actionpack (= 4.0.13)
-      activerecord (= 4.0.13)
-      activesupport (= 4.0.13)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.13)
-      sprockets-rails (~> 2.0)
-    railties (4.0.13)
-      actionpack (= 4.0.13)
-      activesupport (= 4.0.13)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (11.2.2)
-    rbench (0.2.3)
-    sprockets (3.7.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.5)
-    tzinfo (0.3.51)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  haml!
-  mime-types (< 3)
-  minitest
-  nokogiri (~> 1.5.10)
-  rails (~> 4.0.0)
-  rbench
-
-BUNDLED WITH
-   1.12.5