haml 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fa1e64aca629e46493a148b6159feb77763ba0d
-  data.tar.gz: 912f3565b782829c0651604333a0d5fd823c45a1
+  metadata.gz: f839cdb94174ba8781070c63c81802476e784313
+  data.tar.gz: 95438da1cb7cd8137a2d5d6a838c126530165797
 SHA512:
-  metadata.gz: d8e860a0fc047d158a7a1d08f349a5555ae9a0afd578327c16cca624c3c0425a323e40cc3185f8ba8fede3ed79d24babb44f634969a69707a46f27d92b925b15
-  data.tar.gz: f3e66b26cf401ac0081721f44322a4fe39c0b0c486d6b4b0dd7e665e483be86f6f1769a0c94ed00b2646e3d76fb7be0ebe2e40c75943c0a5774e38cb3f17a4e2
+  metadata.gz: 8bf0fb1e2b30d0c6b0fb02bc26ce4e994a3a806fcc2a3e46f8ef4b4ef850642b3e85cbfe5660b174bddd44d04e72facceefb2c2229eb57abc5ca32bd8305790d
+  data.tar.gz: 23439f7250b7c914333b0702a9eade9c96a7bbf123e5df44c6099c826263bd69e3986ab5343f2c8cf7bc1a68644283a4a46685c8cbd750680ee4ec9b01b4ec62

data/.gitignore

@@ -0,0 +1,18 @@
+/.yardoc
+/coverage
+/doc
+/log
+/pkg
+/test/rails
+/test/gemfiles/*.lock
+/.haml
+/site
+*.rbc
+.sass-cache
+.rbenv-version
+.rbx
+.ruby-version
+.rvmrc
+Gemfile.lock
+tmp
+.bundle/

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/haml-spec"]
+	path = test/haml-spec
+	url = git://github.com/haml/haml-spec.git

data/.travis.yml

@@ -0,0 +1,38 @@
+sudo: false
+dist: trusty
+language: ruby
+cache: bundler
+rvm:
+  - 2.4.1
+  - 2.3.4
+  - 2.2.7
+  - 2.1.10
+  - 2.0.0
+  - jruby-9.1.8.0
+  - rbx-3
+gemfile:
+  - test/gemfiles/Gemfile.rails-4.0.x
+  - test/gemfiles/Gemfile.rails-4.1.x
+  - test/gemfiles/Gemfile.rails-4.2.x
+  - test/gemfiles/Gemfile.rails-5.0.x
+  - test/gemfiles/Gemfile.rails-5.1.x
+matrix:
+  exclude:
+    - rvm: 2.0.0
+      gemfile: test/gemfiles/Gemfile.rails-5.1.x
+    - rvm: 2.1.10
+      gemfile: test/gemfiles/Gemfile.rails-5.1.x
+    - rvm: 2.0.0
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.1.10
+      gemfile: test/gemfiles/Gemfile.rails-5.0.x
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/Gemfile.rails-4.0.x
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/Gemfile.rails-4.1.x
+    - rvm: 2.4.1
+      gemfile: test/gemfiles/Gemfile.rails-4.2.x
+  allow_failures:
+    - rvm: rbx-3
+  fast_finish: true
+script: "bundle exec rake submodules test"

data/CHANGELOG.md

@@ -1,43 +1,67 @@
 # Haml Changelog
 
+## 5.0.1
+
+Released on May 3, 2017
+([diff](https://github.com/haml/haml/compare/v5.0.0...v5.0.1)).
+
+* Fix parsing attributes including string interpolation. [#917](https://github.com/haml/haml/pull/917) [#921](https://github.com/haml/haml/issues/921)
+* Stop distributing test files in gem package and allow installing on Windows.
+* Use ActionView's Erubi/Erubis handler for erb filter only on ActionView. [#914](https://github.com/haml/haml/pull/914)
+
 ## 5.0.0
 
 Released on April 26, 2017
-([diff](https://github.com/haml/haml/compare/4.0.7...5.0.0)).
+([diff](https://github.com/haml/haml/compare/4.0.7...v5.0.0)).
+
+Breaking Changes
 
 * Haml now requires Ruby 2.0.0 or above.
 * Rails 3 is no longer supported, matching the official
   [Maintenance Policy for Ruby on Rails](http://weblog.rubyonrails.org/2013/2/24/maintenance-policy-for-ruby-on-rails/).
   (Tee Parham)
+* The `haml` command's debug option (`-d`) no longer executes the Haml code, but
+  rather checks the generated Ruby syntax for errors.
+* Drop parser/compiler accessor from `Haml::Engine`. Modify `Haml::Engine#initialize` options
+  or `Haml::Template.options` instead. (Takashi Kokubun)
+* Drop dynamic quotes support and always escape `'` for `escape_html`/`escape_attrs` instead.
+  Also, escaped results are slightly changed and always unified to the same characters. (Takashi Kokubun)
+* Don't preserve newlines in attributes. (Takashi Kokubun)
+* HTML escape interpolated code in filters.
+  [#770](https://github.com/haml/haml/pull/770)
+  (Matt Wildig)
+
+        :javascript
+          #{JSON.generate(foo: "bar")}
+        Haml 4 output: {"foo":"bar"}
+        Haml 5 output: {"foo":"bar"}
+
+Added
+
+* Add a tracing option. When enabled, Haml will output a data-trace attribute on each tag showing the path
+  to the source Haml file from which it was generated. Thanks [Alex Babkin](https://github.com/ababkin).
+* Add `haml_tag_if` to render a block, conditionally wrapped in another element (Matt Wildig)
+* Support Rails 5.1 Erubi template handler.
+* Support Sprockets 3. Thanks [Sam Davies](https://github.com/samphilipd) and [Jeremy Venezia](https://github.com/jvenezia).
+* General performance and memory usage improvements. (Akira Matsuda)
+* Analyze attribute values by Ripper and render static attributes beforehand. (Takashi Kokubun)
+* Optimize attribute rendering about 3x faster. (Takashi Kokubun)
+* Add temple gem as dependency and create `Haml::TempleEngine` class.
+  Some methods in `Haml::Compiler` are migrated to `Haml::TempleEngine`. (Takashi Kokubun)
+
+Fixed
+
 * Fix for attribute merging. When an attribute method (or literal nested hash)
   was used in an old style attribute hash and there is also a (non-static) new
   style hash there is an error. The fix can result in different behavior in
   some circumstances. See the [commit message](https://github.com/haml/haml/tree/e475b015d3171fb4c4f140db304f7970c787d6e3)
   for detailed info. (Matt Wildig)
 * Make escape_once respect hexadecimal references. (Matt Wildig)
-* General performance and memory usage improvements. (Akira Matsuda)
 * Don't treat the 'data' attribute specially when merging attribute hashes. (Matt Wildig and Norman Clarke)
-* Add a tracing option. When enabled, Haml will output a data-trace attribute on each tag showing the path
-  to the source Haml file from which it was generated. Thanks [Alex Babkin](https://github.com/ababkin).
 * Fix #@foo and #$foo style interpolation that was not working in html_safe mode. (Akira Matsuda)
-* Add `haml_tag_if` to render a block, conditionally wrapped in another element (Matt Wildig)
-* Escape Ruby script interpolated in filters. (Matt Wildig)
-* The `haml` command's debug option (`-d`) no longer executes the Haml code, but
-  rather checks the generated Ruby syntax for errors.
-* Support Rails 5.1 Erubi template handler.
-* Support Sprockets 3. Thanks [Sam Davies](https://github.com/samphilipd) and [Jeremy Venezia](https://github.com/jvenezia).
 * Allow `@` as tag's class name. Thanks [Joe Bartlett](https://github.com/redoPop).
 * Raise `Haml::InvalidAttributeNameError` when attribute name includes invalid characters. (Takashi Kokubun)
-* Drop dynamic quotes support and always escape `'` for `escape_html`/`escape_attrs` instead.
-  Also, escaped results are slightly changed and always unified to the same characters. (Takashi Kokubun)
-* Don't preserve newlines in attributes. (Takashi Kokubun)
-* Add temple gem as dependency and create `Haml::TempleEngine` class.
-  Some methods in `Haml::Compiler` are migrated to `Haml::TempleEngine`. (Takashi Kokubun)
-* Drop parser/compiler accessor from `Haml::Engine`. Modify `Haml::Engine#initialize` options
-  or `Haml::Template.options` instead. (Takashi Kokubun)
 * Don't ignore unexpected exceptions on initializing `ActionView::OutputBuffer`. (Takashi Kokubun)
-* Analyze attribute values by Ripper and render static attributes beforehand. (Takashi Kokubun)
-* Optimize attribute rendering about 3x faster. (Takashi Kokubun)
 
 ## 4.0.7
 

data/Gemfile

@@ -0,0 +1,18 @@
+source "https://rubygems.org"
+gemspec
+
+gem "pry"
+
+group :docs do
+  gem "yard", "~> 0.8.0"
+  gem "kramdown"
+  gem "sass"
+end
+
+platform :mri do
+  gem "ruby-prof"
+end
+
+platform :mri_21 do
+  gem "simplecov"
+end

data/README.md

@@ -178,6 +178,7 @@ Haml currently supports Ruby 2.0.0 and higher, so please make sure your changes
 * [Akira Matsuda](https://github.com/amatsuda)
 * [Matt Wildig](https://github.com/mattwildig)
 * [Tee Parham](https://github.com/teeparham)
+* [Takashi Kokubun](https://github.com/k0kubun)
 
 ### Alumni
 

data/Rakefile

@@ -4,19 +4,13 @@ require "bundler/gem_tasks"
 
 task :default => :test
 
-# FIXME: Redefining :test task to run test/options_test.rb in isolated process since it depends on whether Rails is loaded or not.
+#FIXME: Redefining :test task to run each test in isolated process.
 # Remove this task when we finished changing escape_html option to be true by default.
-isolated_test = Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = %w[test/options_test.rb]
-  t.warning = true
-  t.verbose = true
-end
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-  t.test_files = Dir['test/*_test.rb'] + Dir['test/haml-spec/*_test.rb'] - isolated_test.file_list
-  t.warning = true
-  t.verbose = true
+task :test do
+  test_files = Dir.glob('test/**/*_test.rb').reject { |f| f.start_with?('test/gemfiles/vendor/bundle') }
+  test_files.all? do |file|
+    sh(Gem.ruby, '-w', '-I/lib', '-Itest', file)
+  end || raise('Failures')
 end
 
 CLEAN.replace %w(pkg doc coverage .yardoc test/haml vendor)

data/TODO

@@ -0,0 +1,24 @@
+# -*- mode: org -*-
+#+STARTUP: nofold
+
+* Documentation
+  Redo tutorial?
+  Using helpers
+    haml_concat and haml_tag in particular
+  Syntax highlighting?
+
+* Code
+  Keep track of error offsets everywhere
+    Use this to show error location in messages
+** Haml
+   Support finer-grained HTML-escaping in filters
+   Speed
+     Make tags with dynamic attributes pre-render as much as possible
+     Including the attribute name where doable
+   :html improvements
+     Ignore closing tags where we can
+       http://code.google.com/speed/articles/optimizing-html.html
+       Requires Haml parsing refactor
+     Don't quote attributes that don't require it
+       http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.2
+       http://www.w3.org/TR/html5/syntax.html#attributes

data/benchmark.rb

@@ -0,0 +1,66 @@
+require "bundler/setup"
+require "haml"
+require "rbench"
+
+times = (ARGV.first || 1000).to_i
+
+if times == 0 # Invalid parameter
+  puts <<END
+ruby #$0 [times=1000]
+  Benchmark Haml against various other templating languages.
+END
+  exit 1
+end
+
+%w[erb erubis rails active_support action_controller
+   action_view action_pack haml/template rbench].each {|dep| require(dep)}
+
+def view
+  base = ActionView::Base.new
+  base.view_paths << File.join(File.dirname(__FILE__), '/test')
+  base
+end
+
+def render(view, file)
+  view.render :file => file
+end
+
+RBench.run(times) do
+  column :haml, :title => "Haml"
+  column :erb, :title => "ERB"
+  column :erubis, :title => "Erubis"
+
+  template_name = 'standard'
+  haml_template    = File.read("#{File.dirname(__FILE__)}/test/templates/#{template_name}.haml")
+  erb_template     = File.read("#{File.dirname(__FILE__)}/test/erb/#{template_name}.erb")
+
+  report "Cached" do
+    obj = Object.new
+
+    Haml::Engine.new(haml_template).def_method(obj, :haml)
+    Erubis::Eruby.new(erb_template).def_method(obj, :erubis)
+    obj.instance_eval("def erb; #{ERB.new(erb_template, nil, '-').src}; end")
+
+    haml      { obj.haml }
+    erb       { obj.erb }
+    erubis    { obj.erubis }
+  end
+
+  report "ActionView" do
+    # To cache the template
+    render view, 'templates/standard'
+    render view, 'erb/standard'
+
+    haml { render view, 'templates/standard' }
+    erb  { render view, 'erb/standard' }
+  end
+
+  report "ActionView with deep partials" do
+    # To cache the template
+    render view, 'templates/action_view'
+    render view, 'erb/action_view'
+
+    haml { render view, 'templates/action_view' }
+    erb  { render view, 'erb/action_view' }
+  end
+end

data/haml.gemspec

@@ -0,0 +1,39 @@
+($LOAD_PATH << File.expand_path("../lib", __FILE__)).uniq!
+require "haml/version"
+
+Gem::Specification.new do |spec|
+  spec.name        = 'haml'
+  spec.summary     = "An elegant, structured (X)HTML/XML templating engine."
+  spec.version     = Haml::VERSION
+  spec.authors     = ['Natalie Weizenbaum', 'Hampton Catlin', 'Norman Clarke', 'Akira Matsuda']
+  spec.email       = ['haml@googlegroups.com', 'norman@njclarke.com']
+
+  readmes          = Dir['*'].reject{ |x| x =~ /(^|[^.a-z])[a-z]+/ || x == "TODO" }
+  spec.executables = ['haml']
+  spec.files       = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{\Atest/})
+  end
+  spec.homepage    = 'http://haml.info/'
+  spec.has_rdoc    = false
+  spec.test_files  = Dir["test/**/*_test.rb"]
+  spec.license     = "MIT"
+
+  spec.required_ruby_version = '>= 2.0.0'
+
+  spec.add_dependency 'temple', '>= 0.8.0'
+  spec.add_dependency 'tilt'
+
+  spec.add_development_dependency 'rails', '>= 4.0.0'
+  spec.add_development_dependency 'rbench'
+  spec.add_development_dependency 'minitest', '>= 4.0'
+  spec.add_development_dependency 'nokogiri'
+
+  spec.description = <<-END
+Haml (HTML Abstraction Markup Language) is a layer on top of HTML or XML that's
+designed to express the structure of documents in a non-repetitive, elegant, and
+easy way by using indentation rather than closing tags and allowing Ruby to be
+embedded with ease. It was originally envisioned as a plugin for Ruby on Rails,
+but it can function as a stand-alone templating engine.
+END
+
+end

data/lib/haml/.gitattributes

@@ -0,0 +1 @@
+version.rb merge=ours

data/lib/haml/attribute_parser.rb

@@ -131,6 +131,10 @@ module Haml
             open_tokens[:paren] += 1
           when :on_rparen
             open_tokens[:paren] -= 1
+          when :on_embexpr_beg
+            open_tokens[:embexpr] += 1
+          when :on_embexpr_end
+            open_tokens[:embexpr] -= 1
           when *IGNORED_TYPES
             next if attr_tokens.empty?
           end

data/lib/haml/compiler.rb

@@ -14,6 +14,7 @@ module Haml
       @to_merge    = []
       @temple      = [:multi]
       @node        = nil
+      @filters     = Filters.defined.merge(options[:filters])
       @attribute_compiler = AttributeCompiler.new(@options)
     end
 
@@ -168,7 +169,7 @@ module Haml
     end
 
     def compile_filter
-      unless filter = Filters.defined[@node.value[:name]]
+      unless filter = @filters[@node.value[:name]]
         name = @node.value[:name]
         if ["maruku", "textile"].include?(name)
           raise Error.new(Error.message(:install_haml_contrib, name), @node.line - 1)

data/lib/haml/helpers/safe_erubi_template.rb

@@ -15,13 +15,5 @@ module Haml
       @options.merge! engine_class: Haml::ErubiTemplateHandler
       super
     end
-
-    def precompiled_preamble(locals)
-      [super, "@output_buffer = ActionView::OutputBuffer.new;"].join("\n")
-    end
-
-    def precompiled_postamble(locals)
-      [super, '@output_buffer.to_s'].join("\n")
-    end
   end
 end

data/lib/haml/options.rb

@@ -164,6 +164,9 @@ module Haml
     # the path will be the full path.
     attr_accessor :trace
 
+    # Key is filter name in String and value is Class to use. Defaults to {}.
+    attr_accessor :filters
+
     def initialize(values = {}, &block)
       defaults.each {|k, v| instance_variable_set :"@#{k}", v}
       values.each {|k, v| send("#{k}=", v) if defaults.has_key?(k) && !v.nil?}

data/lib/haml/railtie.rb

@@ -9,6 +9,14 @@ if (activesupport_spec = Gem.loaded_specs['activesupport'])
 end
 
 module Haml
+  module Filters
+    module RailsErb
+      extend Plain
+      extend TiltFilter
+      extend PrecompiledTiltFilter
+    end
+  end
+
   class Railtie < ::Rails::Railtie
     initializer :haml do |app|
       ActiveSupport.on_load(:action_view) do
@@ -20,11 +28,12 @@ module Haml
 
         if defined? Erubi
           require "haml/helpers/safe_erubi_template"
-          Haml::Filters::Erb.template_class = Haml::SafeErubiTemplate
+          Haml::Filters::RailsErb.template_class = Haml::SafeErubiTemplate
         else
           require "haml/helpers/safe_erubis_template"
-          Haml::Filters::Erb.template_class = Haml::SafeErubisTemplate
+          Haml::Filters::RailsErb.template_class = Haml::SafeErubisTemplate
         end
+        Haml::Template.options[:filters] = { 'erb' => Haml::Filters::RailsErb }
       end
     end
   end

data/lib/haml/temple_engine.rb

@@ -25,6 +25,7 @@ module Haml
       parser_class:         ::Haml::Parser,
       compiler_class:       ::Haml::Compiler,
       trace:                false,
+      filters:              {},
     )
 
     use :Parser,   -> { options[:parser_class] }