hamlit 1.7.2 → 2.0.1

data/benchmark/etc/real_sample.rb

@@ -0,0 +1,11 @@
+def render(*)
+  '<div class="render"></div>'
+end
+
+def link_to(a, b, *c)
+  "<a href='" << b << ">".freeze << a << '</div>'.freeze
+end
+
+def image_tag(*)
+  '<img src="https://github.com/favicon.ico" />'
+end

data/benchmark/etc/static_analyzer.haml

@@ -0,0 +1 @@
+#foo.bar{ data: { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 } }

data/benchmark/etc/tags.haml

@@ -0,0 +1,3 @@
+%span hello
+%div
+  world

data/benchmark/ext/build_data.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+require 'faml'
+require 'benchmark/ips'
+require_relative '../utils/benchmark_ips_extension'
+
+h = { 'user' => { id: 1234, name: 'k0kubun' }, book_id: 5432 }
+
+Benchmark.ips do |x|
+  x.report("Faml::AB.build")    { Faml::AttributeBuilder.build("'", true, nil, data: h) }
+  x.report("Hamlit.build_data") { Hamlit::AttributeBuilder.build_data(true, "'", h) }
+  x.compare!
+end

data/benchmark/ext/build_id.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+require 'faml'
+require 'benchmark/ips'
+require_relative '../utils/benchmark_ips_extension'
+
+Benchmark.ips do |x|
+  x.report("Faml::AB.build")      { Faml::AttributeBuilder.build("'", true, nil, {:id=>"book"},  id: %w[content active]) }
+  x.report("Hamlit::AB.build_id") { Hamlit::AttributeBuilder.build_id(true, "book", %w[content active]) }
+  x.compare!
+end

data/benchmark/id_attribute.haml

@@ -0,0 +1,3 @@
+#book{ id: 'content active' }
+- id = %w[content active]
+#book{ id: id }

data/benchmark/plain.haml

@@ -0,0 +1,4 @@
+- hello = 'world'
+%span aaa#{hello}bbb
+%span
+  aaa#{hello}bbb

data/benchmark/script.haml

@@ -0,0 +1,4 @@
+- dynamic = 'dynamic'
+= "#{ dynamic } script"
+= "#{ 'static'} script"
+= ['&', '"', "'", '<', '>']

data/benchmark/slim/LICENSE

@@ -0,0 +1,21 @@
+The MIT License
+
+Copyright (c) 2010 - 2015 Slim Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/{benchmarks → benchmark/slim}/context.rb

@@ -4,10 +4,8 @@ class Context
   end
 
   def item
-    [
-      { name: 'red',   current: true,  url: '#red'   },
+    [ { name: 'red',   current: true,  url: '#red'   },
       { name: 'green', current: false, url: '#green' },
-      { name: 'blue',  current: false, url: '#blue'  },
-    ]
+      { name: 'blue',  current: false, url: '#blue'  } ]
   end
 end

data/benchmark/slim/run-benchmarks.rb

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+
+=begin
+The MIT License
+
+Copyright (c) 2010 - 2015 Slim Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+=end
+
+#
+# Original: https://github.com/slim-template/slim/blob/v3.0.6/benchmarks/run-benchmarks.rb
+#
+# SlimBenchmarks with following modifications:
+#   1. Skipping slow engines, tilt and parsing benches.
+#   2. All Ruby script and attributes are escaped for fairness.
+#   3. Faml and Hamlit are added.
+#
+
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
+
+require 'slim'
+require 'context'
+
+require 'benchmark/ips'
+require 'tilt'
+require 'erubis'
+require 'erb'
+require 'haml'
+require 'faml'
+require 'hamlit'
+
+class SlimBenchmarks
+  def initialize(slow)
+    @benches    = []
+
+    @erb_code  = File.read(File.dirname(__FILE__) + '/view.erb')
+    @haml_code = File.read(File.dirname(__FILE__) + '/view.haml')
+    @slim_code = File.read(File.dirname(__FILE__) + '/view.slim')
+
+    init_compiled_benches
+  end
+
+  def init_compiled_benches
+    haml_ugly   = Haml::Engine.new(@haml_code, format: :html5, ugly: true, escape_html: true)
+
+    context  = Context.new
+
+    haml_ugly.def_method(context, :run_haml_ugly)
+    context.instance_eval %{
+      def run_erubis; #{Erubis::Eruby.new(@erb_code).src}; end
+      def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
+      def run_faml; #{Faml::Engine.new.call @haml_code}; end
+      def run_hamlit; #{Hamlit::Engine.new.call @haml_code}; end
+    }
+
+    bench("erubis v#{Erubis::VERSION}") { context.run_erubis }
+    bench("slim v#{Slim::VERSION}")     { context.run_slim_ugly }
+    bench("haml v#{Haml::VERSION}")     { context.run_haml_ugly }
+    bench("faml v#{Faml::VERSION}")     { context.run_faml }
+    bench("hamlit v#{Hamlit::VERSION}") { context.run_hamlit }
+  end
+
+  def run
+    Benchmark.ips do |x|
+      @benches.each do |name, block|
+        x.report(name.to_s, &block)
+      end
+      x.compare!
+    end
+  end
+
+  def bench(name, &block)
+    @benches.push([name, block])
+  end
+end
+
+SlimBenchmarks.new(ENV['slow']).run

data/{benchmarks → benchmark/slim}/view.erb

@@ -5,14 +5,14 @@
     <title>Simple Benchmark</title>
   </head>
   <body>
-    <h1><%= header %></h1>
+    <h1><%== header %></h1>
     <% unless item.empty? %>
       <ul>
       <% for i in item %>
         <% if i[:current] %>
-          <li><strong><%= i[:name] %></strong></li>
+          <li><strong><%== i[:name] %></strong></li>
         <% else %>
-          <li><a href="<%= i[:url] %>"><%= i[:name] %></a></li>
+          <li><a href="<%== i[:url] %>"><%== i[:name] %></a></li>
         <% end %>
       <% end %>
       </ul>

data/{benchmarks/view.escaped.slim → benchmark/slim/view.slim}

@@ -12,6 +12,6 @@ html
               strong = i[:name]
           - else
             li
-              a href==i[:url] = i[:name]
+              a href=i[:url] = i[:name]
     - else
       p The list is empty.

data/benchmark/string_interpolation.haml

@@ -0,0 +1,2 @@
+- id = 12347
+%a{ href: "https://example.com/users/#{id}" }= "id: #{id}"

data/benchmark/utils/benchmark_ips_extension.rb

@@ -0,0 +1,43 @@
+# Monkey patch to show milliseconds
+module Benchmark
+  module IPS
+    class Report
+      module EntryExtension
+        def body
+          return super if Benchmark::IPS.options[:format] != :human
+
+          left = "%s i/s (%1.3fms)" % [Helpers.scale(ips), (1000.0 / ips)]
+          iters = Helpers.scale(@iterations)
+
+          if @show_total_time
+            left.ljust(20) + (" - %s in %10.6fs" % [iters, runtime])
+          else
+            left.ljust(20) + (" - %s" % iters)
+          end
+        end
+      end
+      Entry.send(:prepend, EntryExtension)
+    end
+  end
+
+  module CompareExtension
+    def compare(*reports)
+      return if reports.size < 2
+
+      sorted = reports.sort_by(&:ips).reverse
+      best = sorted.shift
+      $stdout.puts "\nComparison:"
+      $stdout.printf "%20s: %10.1f i/s (%1.3fms)\n", best.label, best.ips, (1000.0 / best.ips)
+
+      sorted.each do |report|
+        name = report.label.to_s
+
+        x = (best.ips.to_f / report.ips.to_f)
+        $stdout.printf "%20s: %10.1f i/s (%1.3fms) - %.2fx slower\n", name, report.ips, (1000.0 / report.ips), x
+      end
+
+      $stdout.puts
+    end
+  end
+  extend CompareExtension
+end

data/bin/bench

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+require 'faml'
+require 'thor'
+require 'benchmark/ips'
+require 'hamlit1' if File.exist?('hamlit1')
+require_relative '../benchmark/utils/benchmark_ips_extension'
+
+class Bench < Thor
+  class_option :show_template, type: :boolean, aliases: ['-t']
+
+  desc 'bench HAML', 'Benchmark haml template'
+  option :compile, type: :boolean, aliases: ['-c']
+  option :show_code, type: :boolean, aliases: ['-s']
+  def bench(*files)
+    files.each { |file| render(file) unless options[:compile] }
+    files.each { |file| compile(file) if options[:compile] }
+    files.each { |file| code(file) if options[:show_code] }
+  end
+
+  desc 'compile HAML', 'Benchmark compilation'
+  def compile(file)
+    puts "#{?= * 49}\n Compilation: #{file}\n#{?= * 49}"
+    haml = File.read(file)
+
+    Benchmark.ips do |x|
+      x.report("haml v#{Haml::VERSION}") { Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).precompiled }
+      x.report("faml v#{Faml::VERSION}") { Faml::Engine.new.call(haml) }
+      x.report("hamlit#{File.exist?('hamlit1') ? '2' : ''} v#{Hamlit::VERSION}") { Hamlit::Engine.new.call(haml) }
+      x.report("hamlit1 v#{Hamlit1::VERSION}") { Hamlit1::Engine.new.call(haml) } if File.exist?('hamlit1')
+      x.compare!
+    end
+  end
+
+  desc 'render HAML', 'Benchmark rendering'
+  def render(file)
+    puts "#{?= * 49}\n Rendering: #{file}\n#{?= * 49}"
+    haml = File.read(file)
+    puts haml + "\n" if options[:show_template]
+    object = Object.new
+    ruby_file = file.gsub(/\.haml\z/, '.rb')
+    if File.exist?(ruby_file)
+      object.instance_eval(File.read(ruby_file))
+    end
+
+    Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).def_method(object, :haml)
+    object.instance_eval "def faml; #{Faml::Engine.new.call(haml)}; end"
+    object.instance_eval "def hamlit; #{Hamlit::Engine.new.call(haml)}; end"
+    object.instance_eval "def hamlit1; #{Hamlit1::Engine.new.call(haml)}; end" if File.exist?('hamlit1')
+
+    Benchmark.ips do |x|
+      x.report("haml v#{Haml::VERSION}") { object.haml }
+      x.report("faml v#{Faml::VERSION}") { object.faml }
+      x.report("hamlit#{File.exist?('hamlit1') ? '2' : ''} v#{Hamlit::VERSION}") { object.hamlit }
+      x.report("hamlit1 v#{Hamlit1::VERSION}") { object.hamlit1 } if File.exist?('hamlit1')
+      x.compare!
+    end
+  end
+
+  desc 'code HAML', 'Show compiled code'
+  def code(file)
+    haml = File.read(file)
+    puts "#{?= * 49}\n Haml Source: #{file}\n#{?= * 49}"
+    puts Haml::Engine.new(haml, escape_html: true, escape_attrs: true, ugly: true).precompiled
+    puts "\n#{?= * 49}\n Faml Source: #{file}\n#{?= * 49}"
+    puts Faml::Engine.new.call(haml)
+    puts "\n#{?= * 49}\n Hamlit Source: #{file}\n#{?= * 49}"
+    puts Hamlit::Engine.new.call(haml)
+    if File.exist?('hamlit1')
+      puts "\n#{?= * 49}\n Hamlit1 Source: #{file}\n#{?= * 49}"
+      puts Hamlit1::Engine.new.call(haml)
+    end
+  end
+
+  private
+
+  def method_missing(*args)
+    return super if args.length > 1
+    render(args.first.to_s)
+  end
+end
+
+Bench.start

data/bin/clone

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [ -e hamlit1 ]; then
+  echo 'With hamlit1'
+  exit 0
+fi
+
+git clone --depth=1 -b v1.7.2 https://github.com/k0kubun/hamlit hamlit1
+cd hamlit1
+git grep --name-only Hamlit | xargs sed -i "" -e "s/Hamlit/Hamlit1/g" 2> /dev/null
+git grep --name-only hamlit | xargs sed -i "" -e "s/hamlit/hamlit1/g" 2> /dev/null
+git mv hamlit.gemspec hamlit1.gemspec
+git mv lib/hamlit.rb lib/hamlit1.rb
+git mv lib/hamlit lib/hamlit1

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require 'pry'
+Pry.start

data/bin/lineprof

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'hamlit'
+require 'lineprof'
+require 'tempfile'
+require 'thor'
+
+class CLI < Thor
+  desc 'render HAML', 'Benchmark render'
+  def render(file)
+    haml = File.read(file)
+    compiled = Hamlit::Engine.new.call(haml)
+    code = [
+      'require "lineprof"',
+      'require "hamlit"',
+
+      'Lineprof.profile(/./) do',
+        '100.times do',
+          compiled,
+        'end',
+      'end',
+    ].join("\n")
+
+    file = Tempfile.create('compiled')
+    file.write(code)
+    file.close
+
+    system("bundle exec ruby #{file.path}")
+  end
+
+  desc 'compile HAML', 'Benchmark compile'
+  def compile(file)
+    haml = File.read(file)
+    Lineprof.profile(/./) do
+      100.times { Hamlit::Engine.new.call(haml) }
+    end
+  end
+
+  private
+
+  def method_missing(*args)
+    return super if args.length > 1
+    render(args.first.to_s)
+  end
+end
+
+CLI.start