slim 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11a9cb2acf2b4cdc15e88f19f4b83e7b4ac35ef2bcfe3cce9faff694cd08a761
-  data.tar.gz: 4f097cd7b0c48768b8be27c1d3983826bbdb0dd370b4e617667a6c2b5da7b05e
+  metadata.gz: 7876d1b9fd825ae7f0afc3a94ceae2464b34d14a74018ad90f812b512d8cc4c0
+  data.tar.gz: b522e774b1d808a57842796a414df8f9380ea8b24491d3799a1bd237c5ba71d1
 SHA512:
-  metadata.gz: 2eedadac31b851ef0c1d5552c5f199a36ff11cb4a6b6ac8c80b0c0725e81404327b1edc2d43c01033dcb47d5eefbb7145d989ac3619aa635cd9903d390998d2c
-  data.tar.gz: 71ea954ab4041ee8b02f39e056c4954d0ed814b8eaf9e368a48d5a639a314825717996e263bdab0c414c63143a0fe8de1aed29d3ce68c37ebc6a591e1829750e
+  metadata.gz: db31ed4b35df749588fb4acf91e7180c8971931c3647b754afbcaf4f2c654aa65b908e1af13f86a68510a00774cddb2e23fc28eae56f60d0ba13b63c0df4fc12
+  data.tar.gz: 77494b4cdac5ecb85d1ba4d569adcba6ebe01fb4024e5a4a02da4db6f96bf5af10919365af57783ad88b79ddcef75e113af20412225ab3166b2948f1a3967b3c

data/CHANGES

@@ -1,3 +1,11 @@
+5.1.0 (2023-03-06)
+
+  * Allow whitespace markers for verbatim text: `|<`, `|>`, and `|<>` - #912
+  * Do not swallow single quote after output line indicator - #911
+  * Support Tilt 2.1.0 - #910
+  * Fix Railtie load error - #904
+  * Fix attribute parsing with square brackets - #796
+
 5.0.0 (2023-01-23)
 
   * Fix markdown interpolation #773

data/Gemfile

@@ -2,11 +2,10 @@ source 'https://rubygems.org/'
 
 gemspec
 
-group :perf do
-  gem 'benchmark-ips'
-  gem 'erubi'
-  gem 'haml'
-end
+gem 'test-unit', '~> 3.5'
+gem 'minitest', '~> 5.15'
+gem 'rake', '~> 13.0'
+gem 'kramdown', '~> 2.4'
 
 if ENV['TEMPLE'] && ENV['TEMPLE'] != 'master'
   gem 'temple', "= #{ENV['TEMPLE']}"
@@ -34,11 +33,6 @@ if ENV['RAILS']
   end
 end
 
-gem 'test-unit', '~> 3.5'
-gem 'minitest', '~> 5.15'
-gem 'rake', '~> 13.0'
-gem 'kramdown', '~> 2.4'
-
 if ENV['SINATRA']
   gem 'rack-test'
 
@@ -48,13 +42,3 @@ if ENV['SINATRA']
     gem 'sinatra', :tag => "v#{ENV['SINATRA']}"
   end
 end
-
-if ENV['TASK'] == 'bench'
-  gem 'benchmark-ips'
-  gem 'erubi'
-  gem 'haml'
-end
-
-if ENV['CODECLIMATE_REPO_TOKEN']
-  gem 'codeclimate-test-reporter'
-end

data/README.jp.md

@@ -2,8 +2,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/slim.svg)](http://rubygems.org/gems/slim)
 ![Build Status](https://github.com/slim-template/slim/actions/workflows/test.yml/badge.svg)
-[![Code Climate](https://codeclimate.com/github/slim-template/slim/badges/gpa.svg)](https://codeclimate.com/github/slim-template/slim)
-[![Test Coverage](https://codeclimate.com/github/slim-template/slim/badges/coverage.svg)](https://codeclimate.com/github/slim-template/slim/coverage)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 Slim は 不可解にならない程度に view の構文を本質的な部品まで減らすことを目指したテンプレート言語です。標準的な HTML テンプレートからどれだけのものを減らせるか、検証するところから始まりました。(<, >, 閉じタグなど) 多くの人が Slim に興味を持ったことで, 機能的で柔軟な構文に成長しました。

data/README.md

@@ -2,8 +2,6 @@
 
 [![Gem Version](https://img.shields.io/gem/v/slim.svg)](http://rubygems.org/gems/slim)
 ![Build Status](https://github.com/slim-template/slim/actions/workflows/test.yml/badge.svg)
-[![Code Climate](https://codeclimate.com/github/slim-template/slim/badges/gpa.svg)](https://codeclimate.com/github/slim-template/slim)
-[![Test Coverage](https://codeclimate.com/github/slim-template/slim/badges/coverage.svg)](https://codeclimate.com/github/slim-template/slim/coverage)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/slim-template)](https://github.com/sponsors/slim-template)
 
 Slim is a template language whose goal is to reduce the view syntax to the essential parts without becoming cryptic. It started as an exercise to see how much could be removed from a standard html template (<, >, closing tags, etc...). As more people took an interest in Slim, the functionality grew and so did the flexibility of the syntax.
@@ -155,6 +153,17 @@ You can also embed html in the text line
   | <tr><td>#{a.name}</td><td>#{a.description}</td></tr>
 ~~~
 
+#### Verbatim text with leading and/or treailing white space `|<` `|>` `|<>`
+
+You can add white space around verbatim text in the same way as for `=` output:
+~~~ slim
+| This line will not have any extra white space.
+|  This line will have a leading space, but it is difficult to see.
+|< This line will have a leading white space.
+|> This line will have a trailing white space.
+|<> This line will have both leading and trailing white space.
+~~~
+
 ### Verbatim text with trailing white space `'`
 
 The single quote tells Slim to copy the line (similar to `|`), but makes sure that a single trailing white space is appended.

data/Rakefile

@@ -6,11 +6,6 @@ end
 
 require 'rake/testtask'
 
-desc 'Run Slim benchmarks! (default parameters slow=false)'
-task :bench, :slow do
-  ruby('benchmarks/run-benchmarks.rb')
-end
-
 task 'test' => %w(test:core test:literate test:logic_less test:translator test:smart test:include)
 
 namespace 'test' do

data/lib/slim/parser.rb

@@ -79,7 +79,7 @@ module Slim
       @attr_list_delims_re = /\A\s*([#{keys}])/
       @embedded_re = /\A(#{Regexp.union(Embedded.engines.keys.map(&:to_s))})(?:\s*(?:(.*)))?:(\s*)/
       keys = Regexp.escape ('"\'></='.split(//) + @attr_list_delims.flatten + @code_attr_delims.flatten).uniq.join
-      @attr_name = "\\A\\s*([^\0\s#{keys}]+)"
+      @attr_name = "\\A\\s*([^\\0\\s#{keys}]+)"
       @quoted_attr_re = /#{@attr_name}\s*=(=?)\s*("|')/
       @code_attr_re = /#{@attr_name}\s*=(=?)\s*/
 
@@ -209,10 +209,12 @@ module Slim
       when /\A\//
         # Slim comment
         parse_comment_block
-      when /\A([\|'])( ?)/
+      when /\A([\|'])([<>]{1,2}(?: |\z)| ?)/
         # Found verbatim text block.
-        trailing_ws = $1 == "'"
-        @stacks.last << [:slim, :text, :verbatim, parse_text_block($', @indents.last + $2.size + 1)]
+        leading_ws = $2.include?('<'.freeze)
+        trailing_ws = ($1 == "'") || $2.include?('>'.freeze)
+        @stacks.last << [:static, ' '] if leading_ws
+        @stacks.last << [:slim, :text, :verbatim, parse_text_block($', @indents.last + $2.count(' ') + 1)]
         @stacks.last << [:static, ' '] if trailing_ws
       when /\A</
         # Inline html
@@ -226,13 +228,14 @@ module Slim
         block = [:multi]
         @stacks.last << [:slim, :control, parse_broken_line, block]
         @stacks << block
-      when /\A=(=?)(['<>]*)/
+      when /\A=(=?)([<>]*)/
         # Found an output block.
         # We expect the line to be broken or the next line to be indented.
         @line = $'
+        leading_ws = $2.include?('<'.freeze)
         trailing_ws = $2.include?('>'.freeze)
         block = [:multi]
-        @stacks.last << [:static, ' '] if $2.include?('<'.freeze)
+        @stacks.last << [:static, ' '] if leading_ws
         @stacks.last << [:slim, :output, $1.empty?, parse_broken_line, block]
         @stacks.last << [:static, ' '] if trailing_ws
         @stacks << block

data/lib/slim/railtie.rb

@@ -1,5 +1,5 @@
 module Slim
-  class Railtie < Rails::Railtie
+  class Railtie < ::Rails::Railtie
     initializer "initialize slim template handler" do
       ActiveSupport.on_load(:action_view) do
         Slim::RailsTemplate = Temple::Templates::Rails(Slim::Engine,

data/lib/slim/version.rb

@@ -1,5 +1,5 @@
 module Slim
   # Slim version string
   # @api public
-  VERSION = '5.0.0'
+  VERSION = '5.1.0'
 end

data/slim.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
   s.required_ruby_version = '>= 2.5.0'
 
   s.add_runtime_dependency('temple', ['~> 0.10.0'])
-  s.add_runtime_dependency('tilt', ['>= 2.0.6', '< 2.1'])
+  s.add_runtime_dependency('tilt', ['>= 2.0.6', '< 2.2'])
 end

data/test/core/test_html_structure.rb

@@ -311,6 +311,12 @@ p[id="marvin" class="martian" data-info="Illudium Q-36"] = output_number
     assert_html '<p class="martian" data-info="Illudium Q-36" id="marvin">1337</p>', source
   end
 
+  # Regression test for bug #796
+  def test_square_brackets_around_attributes_multiline_with_tabs
+    source = "div\n\tp[\n\t\tclass=\"martian\"\n\t]\n\tp Next line"
+    assert_html '<div><p class="martian"></p><p>Next line</p></div>', source
+  end
+
   def test_parens_around_attributes_with_equal_sign_snug_to_right_paren
     source = %q{
 p(id="marvin" class="martian" data-info="Illudium Q-36")= output_number

data/test/literate/TESTS.md

@@ -27,6 +27,22 @@ renders as
 Text block
 ~~~
 
+You can add leading or trailing white space with the `<` and `>` markers:
+
+~~~ slim
+|< Text with leading whitespace.
+|  Text with leading whitespace.
+|> Text with trailing whitespace.
+|<> Text with both leading and trailing whitespace.
+~~~
+
+renders as
+
+~~~ html
+ Text with leading whitespace. Text with leading whitespace.Text with trailing whitespace.  Text with both leading and trailing whitespace. 
+~~~
+
+
 Multiple lines can be indented beneath the first text line.
 
 ~~~ slim
@@ -77,6 +93,30 @@ Text
 lines
 ~~~
 
+~~~ slim
+|><
+
+   Text
+    block
+
+     with
+
+    multiple
+   lines
+~~~
+
+renders as
+
+~~~ html
+ Text
+ block
+
+  with
+
+ multiple
+lines 
+~~~
+
 You can nest text blocks beneath tags.
 
 ~~~ slim
@@ -104,6 +144,16 @@ renders as
 <a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
 ~~~
 
+~~~ slim
+|<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
+renders as
+
+~~~ html
+<a href="http://github.com/slim-template/slim">github.com/slim-template/slim</a>
+~~~
+
 ### Text with trailing white space `'`
 
 A text blocks with trailing white space starts with the `'` as line indicator.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Daniel Mendler
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
@@ -35,7 +35,7 @@ dependencies:
         version: 2.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: 2.0.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -66,14 +66,6 @@ files:
 - README.jp.md
 - README.md
 - Rakefile
-- benchmarks/context.rb
-- benchmarks/profile-parser.rb
-- benchmarks/profile-render.rb
-- benchmarks/run-benchmarks.rb
-- benchmarks/run-diffbench.rb
-- benchmarks/view.erb
-- benchmarks/view.haml
-- benchmarks/view.slim
 - bin/slimrb
 - doc/include.md
 - doc/jp/include.md

data/benchmarks/context.rb

@@ -1,11 +0,0 @@
-class Context
-  def header
-    'Colors'
-  end
-
-  def item
-    [ { name: 'red',   current: true,  url: '#red'   },
-      { name: 'green', current: false, url: '#green' },
-      { name: 'blue',  current: false, url: '#blue'  } ]
-  end
-end

data/benchmarks/profile-parser.rb

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-engine = Slim::Engine.new
-
-1000.times { engine.call(content) }

data/benchmarks/profile-render.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-slim = Slim::Template.new { content }
-context = Context.new
-
-10000.times { slim.render(context) }

data/benchmarks/run-benchmarks.rb

@@ -1,115 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-
-require 'benchmark/ips'
-require 'tilt'
-require 'erubi'
-require 'erb'
-require 'haml'
-
-class SlimBenchmarks
-  def initialize(slow)
-    @benches   = Hash.new { |h, k| h[k] = [] }
-
-    @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
-    init_tilt_benches
-    init_parsing_benches if slow
-  end
-
-  def init_compiled_benches
-    context  = Context.new
-
-    context.instance_eval %{
-      def run_erb; #{ERB.new(@erb_code).src}; end
-      def run_erubi; #{Erubi::Engine.new(@erb_code).src}; end
-      def run_temple_erb; #{Temple::ERB::Engine.new.call @erb_code}; end
-      def run_slim_pretty; #{Slim::Engine.new(pretty: true).call @slim_code}; end
-      def run_slim_ugly; #{Slim::Engine.new.call @slim_code}; end
-      def run_haml; #{Haml::Engine.new.call @haml_code}; end
-    }
-
-    bench(:compiled, 'erb')         { context.run_erb }
-    bench(:compiled, 'erubi')       { context.run_erubi }
-    bench(:compiled, 'temple erb')  { context.run_temple_erb }
-    bench(:compiled, 'slim pretty') { context.run_slim_pretty }
-    bench(:compiled, 'slim ugly')   { context.run_slim_ugly }
-    bench(:compiled, 'haml')        { context.run_haml }
-  end
-
-  def init_tilt_benches
-    tilt_erb         = Tilt::ERBTemplate.new { @erb_code }
-    tilt_erubi       = Tilt::ErubiTemplate.new { @erb_code }
-    tilt_temple_erb  = Temple::ERB::Template.new { @erb_code }
-    tilt_haml        = Tilt::HamlTemplate.new(format: :html5) { @haml_code }
-    tilt_slim_pretty = Slim::Template.new(pretty: true) { @slim_code }
-    tilt_slim_ugly   = Slim::Template.new { @slim_code }
-
-    context  = Context.new
-
-    bench(:tilt, 'erb')         { tilt_erb.render(context) }
-    bench(:tilt, 'erubi')       { tilt_erubi.render(context) }
-    bench(:tilt, 'temple erb')  { tilt_temple_erb.render(context) }
-    bench(:tilt, 'slim pretty') { tilt_slim_pretty.render(context) }
-    bench(:tilt, 'slim ugly')   { tilt_slim_ugly.render(context) }
-    bench(:tilt, 'haml')        { tilt_haml.render(context) }
-  end
-
-  def init_parsing_benches
-    context  = Context.new
-    context_binding = context.instance_eval { binding }
-
-    bench(:parsing, 'erb')         { ERB.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'erubi')       { Erubi::Engine.new(@erb_code).result(context_binding) }
-    bench(:parsing, 'temple erb')  { Temple::ERB::Template.new { @erb_code }.render(context) }
-    bench(:parsing, 'slim pretty') { Slim::Template.new(pretty: true) { @slim_code }.render(context) }
-    bench(:parsing, 'slim ugly')   { Slim::Template.new { @slim_code }.render(context) }
-    bench(:parsing, 'haml')        { Haml::Engine.new(@haml_code, format: :html5).render(context) }
-  end
-
-  def run
-    @benches.each do |group_name, group_benches|
-      puts "Running #{group_name} benchmarks:"
-
-      Benchmark.ips do |x|
-        group_benches.each do |name, block|
-          x.report("#{group_name} #{name}", &block)
-        end
-
-        x.compare!
-      end
-    end
-
-    puts "
-Compiled benchmark: Template is parsed before the benchmark and
-    generated ruby code is compiled into a method.
-    This is the fastest evaluation strategy because it benchmarks
-    pure execution speed of the generated ruby code.
-
-Compiled Tilt benchmark: Template is compiled with Tilt, which gives a more
-    accurate result of the performance in production mode in frameworks like
-    Sinatra, Ramaze and Camping. (Rails still uses its own template
-    compilation.)
-
-Parsing benchmark: Template is parsed every time.
-    This is not the recommended way to use the template engine
-    and Slim is not optimized for it. Activate this benchmark with 'rake bench slow=1'.
-
-Temple ERB is the ERB implementation using the Temple framework. It shows the
-overhead added by the Temple framework compared to ERB.
-"
-  end
-
-  def bench(group, name, &block)
-    @benches[group].push([name, block])
-  end
-end
-
-SlimBenchmarks.new(ENV['slow']).run

data/benchmarks/run-diffbench.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
-
-require 'slim'
-require 'context'
-require 'diffbench'
-
-content = File.read(File.dirname(__FILE__) + '/view.slim')
-engine = Slim::Engine.new
-template = Slim::Template.new { content }
-context = Context.new
-
-DiffBench.bm do
-  report("Parse") do
-    2000.times { engine.call(content) }
-  end
-  report("Render") do
-    100000.times { template.render(context) }
-  end
-end

data/benchmarks/view.erb

@@ -1,25 +0,0 @@
-<!DOCTYPE HTML>
-
-<html lang="en">
-  <head>
-    <title>Simple Benchmark</title>
-    <meta charset="utf-8">
-    <meta name="description" content="This is an example of a meta description.">
-  </head>
-  <body>
-    <h1><%= header %></h1>
-    <% unless item.empty? %>
-      <ul>
-      <% for i in item %>
-        <% if i[:current] %>
-          <li><strong><%= i[:name] %></strong></li>
-        <% else %>
-          <li><a href="<%= i[:url] %>"><%= i[:name] %></a></li>
-        <% end %>
-      <% end %>
-      </ul>
-    <% else %>
-      <p>The list is empty.</p>
-    <% end %>
-  </body>
-</html>

data/benchmarks/view.haml

@@ -1,20 +0,0 @@
-!!! html
-
-%html{ lang: "en" }
-  %head
-    %title Simple Benchmark
-    %meta{ charset: "utf-8" }
-    %meta{ name: "description", content: "This is an example of a meta description." }
-  %body
-    %h1= header
-    - unless item.empty?
-      %ul
-        - for i in item
-          - if i[:current]
-            %li
-              %strong= i[:name]
-          - else
-            %li
-              %a{:href => i[:url]}= i[:name]
-    - else
-      %p The list is empty.

data/benchmarks/view.slim

@@ -1,19 +0,0 @@
-doctype html
-html lang="en"
-  head
-    title Simple Benchmark
-    meta charset="utf-8"
-    meta name="description" content="This is an example of a meta description."
-  body
-    h1 == header
-    - unless item.empty?
-      ul
-        - for i in item
-          - if i[:current]
-            li
-              strong == i[:name]
-          - else
-            li
-              a href==i[:url] == i[:name]
-    - else
-      p The list is empty.