slim 1.0.4 → 1.1.0

data/.travis.yml

@@ -9,8 +9,8 @@ env:
   - "TASK=test"
   - "TASK=test TEMPLE=master"
   - "TASK=test:rails RAILS=master"
-  - "TASK=test:rails RAILS=3.0.10"
-  - "TASK=test:rails RAILS=3.1.0"
+  - "TASK=test:rails RAILS=3.0.11"
+  - "TASK=test:rails RAILS=3.1.3"
 script: "bundle exec rake test:ci"
 notifications:
   email: false

data/CHANGES

@@ -1,5 +1,12 @@
 master
 
+1.1.0
+
+  * Support for special characters in class/id shortcut removed
+  * Do not allow : in class/id shortcut
+  * Add support for block expansion syntax
+  * Support options :indent, :sort_attrs
+  * Require temple 0.3.5
 
 1.0.4
 

data/README.md

@@ -208,6 +208,20 @@ Here's a quick example to demonstrate what a Slim template looks like:
       div class="content"
         = show_content
 
+### Inline tags
+
+  Sometimes you may want to be a little more compact and inline the tags.
+
+    ul
+      li.first: a href="/a" A link
+      li: a href="/b" B link
+
+  For readability, don't forget you can wrap the attributes.
+
+    ul
+      li.first: a[href="/a"] A link
+      li: a[href="/b"] B link
+
 ### Set an attribute's value with a method
 
   * Alternative 1: Use parentheses (), {}, []. The code in the parentheses will be evaluated.

data/Rakefile

@@ -1,14 +1,14 @@
 begin
   require 'bundler'
   Bundler::GemHelper.install_tasks
-rescue Exception => e
+rescue Exception
 end
 
 require 'rake/testtask'
 
 desc 'Run Slim benchmarks! (default parameters slow=false iterations=1000)'
 task :bench, :iterations, :slow do
-  ruby('benchmarks/run.rb')
+  ruby('benchmarks/run-benchmarks.rb')
 end
 
 Rake::TestTask.new('test') do |t|
@@ -36,7 +36,7 @@ begin
   end
 rescue LoadError
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install rcov"
+    abort 'RCov is not available. In order to run rcov, you must: gem install rcov'
   end
 end
 
@@ -47,7 +47,7 @@ begin
   end
 rescue LoadError
   task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
   end
 end
 

data/benchmarks/context.rb

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,10 @@
+#!/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

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

data/benchmarks/{run.rb → run-benchmarks.rb}

@@ -3,26 +3,24 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
 
 require 'slim'
-require 'complex_view'
+require 'context'
 
 require 'benchmark'
-require 'ostruct'
 require 'erubis'
 require 'erb'
 require 'haml'
-require 'tilt'
 
 class SlimBenchmarks
   def initialize(slow, iterations)
     @iterations = (iterations || 1000).to_i
     @benches    = []
 
-    tpl_erb  = File.read(File.dirname(__FILE__) + '/complex.erb')
-    tpl_haml = File.read(File.dirname(__FILE__) + '/complex.haml')
-    tpl_slim = File.read(File.dirname(__FILE__) + '/complex.slim')
+    tpl_erb  = File.read(File.dirname(__FILE__) + '/view.erb')
+    tpl_haml = File.read(File.dirname(__FILE__) + '/view.haml')
+    tpl_slim = File.read(File.dirname(__FILE__) + '/view.slim')
 
-    view  = ComplexView.new
-    eview = OpenStruct.new(:header => view.header, :item => view.item).instance_eval{ binding }
+    context  = Context.new
+    context_binding = context.instance_eval { binding }
 
     erb         = ERB.new(tpl_erb)
     erubis      = Erubis::Eruby.new(tpl_erb)
@@ -37,9 +35,9 @@ class SlimBenchmarks
     tilt_haml_ugly = Tilt::HamlTemplate.new(:format => :html5, :ugly => true){ tpl_haml }
     tilt_slim      = Slim::Template.new { tpl_slim }
 
-    haml.def_method(view, :run_haml)
-    haml_ugly.def_method(view, :run_haml_ugly)
-    view.instance_eval %{
+    haml.def_method(context, :run_haml)
+    haml_ugly.def_method(context, :run_haml_ugly)
+    context.instance_eval %{
       def run_erb; #{erb.src}; end
       def run_erubis; #{erubis.src}; end
       def run_fast_erubis; #{fast_erubis.src}; end
@@ -47,33 +45,33 @@ class SlimBenchmarks
     }
 
     if slow
-      bench('(1) erb')         { ERB.new(tpl_erb).result(eview) }
-      bench('(1) erubis')      { Erubis::Eruby.new(tpl_erb).result(eview) }
-      bench('(1) fast erubis') { Erubis::Eruby.new(tpl_erb).result(eview) }
-      bench('(1) slim')        { Slim::Template.new { tpl_slim }.render(view) }
-      bench('(1) haml')        { Haml::Engine.new(tpl_haml, :format => :html5).render(view) }
-      bench('(1) haml ugly')   { Haml::Engine.new(tpl_haml, :format => :html5, :ugly => true).render(view) }
+      bench('(1) erb')         { ERB.new(tpl_erb).result(context_binding) }
+      bench('(1) erubis')      { Erubis::Eruby.new(tpl_erb).result(context_binding) }
+      bench('(1) fast erubis') { Erubis::Eruby.new(tpl_erb).result(context_binding) }
+      bench('(1) slim')        { Slim::Template.new { tpl_slim }.render(context) }
+      bench('(1) haml')        { Haml::Engine.new(tpl_haml, :format => :html5).render(context) }
+      bench('(1) haml ugly')   { Haml::Engine.new(tpl_haml, :format => :html5, :ugly => true).render(context) }
     end
 
-    bench('(2) erb')         { erb.result(eview) }
-    bench('(2) erubis')      { erubis.result(eview) }
-    bench('(2) fast erubis') { fast_erubis.result(eview) }
-    bench('(2) slim')        { slim.render(view) }
-    bench('(2) haml')        { haml.render(view) }
-    bench('(2) haml ugly')   { haml_ugly.render(view) }
-
-    bench('(3) erb')         { view.run_erb }
-    bench('(3) erubis')      { view.run_erubis }
-    bench('(3) fast erubis') { view.run_fast_erubis }
-    bench('(3) slim')        { view.run_slim }
-    bench('(3) haml')        { view.run_haml }
-    bench('(3) haml ugly')   { view.run_haml_ugly }
-
-    bench('(4) erb')       { tilt_erb.render(view) }
-    bench('(4) erubis')    { tilt_erubis.render(view) }
-    bench('(4) slim')      { tilt_slim.render(view) }
-    bench('(4) haml')      { tilt_haml.render(view) }
-    bench('(4) haml ugly') { tilt_haml_ugly.render(view) }
+    bench('(2) erb')         { erb.result(context_binding) }
+    bench('(2) erubis')      { erubis.result(context_binding) }
+    bench('(2) fast erubis') { fast_erubis.result(context_binding) }
+    bench('(2) slim')        { slim.render(context) }
+    bench('(2) haml')        { haml.render(context) }
+    bench('(2) haml ugly')   { haml_ugly.render(context) }
+
+    bench('(3) erb')         { context.run_erb }
+    bench('(3) erubis')      { context.run_erubis }
+    bench('(3) fast erubis') { context.run_fast_erubis }
+    bench('(3) slim')        { context.run_slim }
+    bench('(3) haml')        { context.run_haml }
+    bench('(3) haml ugly')   { context.run_haml_ugly }
+
+    bench('(4) erb')       { tilt_erb.render(context) }
+    bench('(4) erubis')    { tilt_erubis.render(context) }
+    bench('(4) slim')      { tilt_slim.render(context) }
+    bench('(4) haml')      { tilt_haml.render(context) }
+    bench('(4) haml ugly') { tilt_haml_ugly.render(context) }
   end
 
   def run

data/lib/slim/embedded_engine.rb

@@ -153,7 +153,7 @@ module Slim
     # ERB engine (uses the Temple ERB implementation)
     class ERBEngine < EmbeddedEngine
       def on_slim_embedded(engine, body)
-        Temple::ERB::Parser.new.call(CollectText.new.call(body))
+        [:multi, [:newline], Temple::ERB::Parser.new.call(CollectText.new.call(body))]
       end
     end
 
@@ -169,7 +169,7 @@ module Slim
     # Embeds ruby code
     class RubyEngine < EmbeddedEngine
       def on_slim_embedded(engine, body)
-        [:code, CollectText.new.call(body) + "\n"]
+        [:multi, [:newline], [:code, CollectText.new.call(body)]]
       end
     end
 

data/lib/slim/engine.rb

@@ -33,7 +33,9 @@ module Slim
     # Symbol      | :format            | :xhtml                        | HTML output format
     # String      | :attr_wrapper      | '"'                           | Character to wrap attributes in html (can be ' or ")
     # Hash        | :attr_delimiter    | {'class' => ' '}              | Joining character used if multiple html attributes are supplied (e.g. id1_id2)
+    # Symbol      | :sort_attrs        | true                          | Sort attributes by name
     # Boolean     | :pretty            | false                         | Pretty html indenting (This is slower!)
+    # String      | :indent            | '  '                          | Indentation string
     # Boolean     | :streaming         | false (true in Rails > 3.1)   | Enable output streaming
     # Class       | :generator         | ArrayBuffer/RailsOutputBuffer | Temple code generator (default generator generates array buffer)
     #
@@ -59,13 +61,13 @@ module Slim
     use Slim::Sections, :sections, :dictionary, :dictionary_access
     use Slim::EndInserter
     use Slim::Compiler, :disable_capture, :attr_delimiter
-    use Temple::HTML::AttributeMerger, :attr_delimiter
-    use Temple::HTML::Pretty, :format, :attr_wrapper, :pretty
+    use Temple::HTML::AttributeMerger, :attr_delimiter, :sort_attrs
+    use Temple::HTML::Pretty, :format, :attr_wrapper, :pretty, :indent
     filter :Escapable, :use_html_safe, :disable_escape
     filter :ControlFlow
     filter :MultiFlattener
-    wildcard(:Optimizer) { (options[:streaming] ? Temple::Filters::StaticMerger :
-                            Temple::Filters::DynamicInliner).new }
-    wildcard(:Generator) { options[:generator].new(options) }
+    use(:Optimizer) { (options[:streaming] ? Temple::Filters::StaticMerger :
+                       Temple::Filters::DynamicInliner).new }
+    use(:Generator) { options[:generator].new(options) }
   end
 end

data/lib/slim/parser.rb

@@ -42,7 +42,7 @@ module Slim
     def call(str)
       # Set string encoding if option is set
       if options[:encoding] && str.respond_to?(:encoding)
-        old = str.encoding
+        old_enc = str.encoding
         str = str.dup if str.frozen?
         str.force_encoding(options[:encoding])
         # Fall back to old encoding if new encoding is invalid
@@ -73,12 +73,8 @@ module Slim
 
     DELIMITER_REGEX = /\A[\(\[\{]/
     ATTR_NAME_REGEX = '\A\s*(\w[:\w-]*)'
-
-    if RUBY_VERSION > '1.9'
-      CLASS_ID_REGEX = /\A(#|\.)([\w\u00c0-\uFFFF][\w:\u00c0-\uFFFF-]*)/
-    else
-      CLASS_ID_REGEX = /\A(#|\.)(\w[\w:-]*)/
-    end
+    CLASS_ID_REGEX = /\A(#|\.)(\w[\w-]*\w|\w+)/
+    TAG_REGEX = /\A([#\.]|\w[\w:-]*\w|\w+)/
 
     def reset(lines = nil, stacks = nil)
       # Since you can indent however you like in Slim, we need to keep a list
@@ -175,11 +171,7 @@ module Slim
         # Found a comment block.
         if @line =~ %r{\A/!( ?)(.*)\Z}
           # HTML comment
-          block = [:multi]
-          @stacks.last <<  [:html, :comment, block]
-          @stacks << block
-          @stacks.last << [:slim, :interpolate, $2] unless $2.empty?
-          parse_text_block($2.empty? ? nil : @indents.last + $1.size + 2)
+          @stacks.last << [:html, :comment, parse_text_block($2, @indents.last + $1.size + 2)]
         elsif @line =~ %r{\A/\[\s*(.*?)\s*\]\s*\Z}
           # HTML conditional comment
           block = [:multi]
@@ -192,8 +184,7 @@ module Slim
       when /\A([\|'])( ?)(.*)\Z/
         # Found a text block.
         trailing_ws = $1 == "'"
-        @stacks.last << [:slim, :interpolate, $3] unless $3.empty?
-        parse_text_block($3.empty? ? nil : @indents.last + $2.size + 1)
+        @stacks.last << parse_text_block($3, @indents.last + $2.size + 1)
         @stacks.last << [:static, ' '] if trailing_ws
       when /\A-/
         # Found a code block.
@@ -213,15 +204,11 @@ module Slim
         @stacks << block
       when /\A(\w+):\s*\Z/
         # Embedded template detected. It is treated as block.
-        block = [:multi]
-        @stacks.last << [:newline] << [:slim, :embedded, $1, block]
-        @stacks << block
-        parse_text_block
-        return # Don't append newline, this has already been done before
+        @stacks.last << [:slim, :embedded, $1, parse_text_block]
       when /\Adoctype\s+/i
         # Found doctype declaration
         @stacks.last << [:html, :doctype, $'.strip]
-      when /\A([#\.]|\w[:\w-]*)/
+      when TAG_REGEX
         # Found a HTML tag.
         parse_tag($&)
       else
@@ -237,19 +224,26 @@ module Slim
       end
     end
 
-    def parse_text_block(text_indent = nil)
+    def parse_text_block(first_line = nil, text_indent = nil)
+      result = [:multi]
+      if !first_line || first_line.empty?
+        text_indent = nil
+      else
+        result << [:slim, :interpolate, first_line]
+      end
+
       empty_lines = 0
       until @lines.empty?
         if @lines.first =~ /\A\s*\Z/
           next_line
-          @stacks.last << [:newline]
+          result << [:newline]
           empty_lines += 1 if text_indent
         else
           indent = get_indent(@lines.first)
           break if indent <= @indents.last
 
           if empty_lines > 0
-            @stacks.last << [:slim, :interpolate, "\n" * empty_lines]
+            result << [:slim, :interpolate, "\n" * empty_lines]
             empty_lines = 0
           end
 
@@ -261,13 +255,14 @@ module Slim
           offset = text_indent ? indent - text_indent : 0
           syntax_error!('Unexpected text indentation') if offset < 0
 
-          @stacks.last << [:slim, :interpolate, (text_indent ? "\n" : '') + (' ' * offset) + @line] << [:newline]
+          result << [:newline] << [:slim, :interpolate, (text_indent ? "\n" : '') + (' ' * offset) + @line]
 
           # The indentation of first line of the text block
           # determines the text base indentation.
           text_indent ||= indent
         end
       end
+      result
     end
 
     def parse_broken_line
@@ -290,6 +285,16 @@ module Slim
       @stacks.last << tag
 
       case @line
+      when /\A\s*:\s*/
+        # Block expansion
+        @line = $'
+        (@line =~ TAG_REGEX) || syntax_error!('Expected tag')
+        content = [:multi]
+        tag << content
+        i = @stacks.size
+        @stacks << content
+        parse_tag($1)
+        @stacks.delete_at(i)
       when /\A\s*=(=?)('?)/
         # Handle output code
         block = [:multi]
@@ -307,10 +312,7 @@ module Slim
         @stacks << content
       when /\A( ?)(.*)\Z/
         # Text content
-        content = [:multi, [:slim, :interpolate, $2]]
-        tag << content
-        @stacks << content
-        parse_text_block(@orig_line.size - @line.size + $1.size)
+        tag << parse_text_block($2, @orig_line.size - @line.size + $1.size)
       end
     end
 

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -19,15 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w(lib)
 
-  s.add_runtime_dependency('temple', ['~> 0.3.4'])
+  s.add_runtime_dependency('temple', ['~> 0.3.5'])
   s.add_runtime_dependency('tilt', ['~> 1.3.2'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])
   s.add_development_dependency('sass', ['>= 3.1.0'])
   s.add_development_dependency('minitest', ['>= 0'])
   s.add_development_dependency('kramdown', ['>= 0'])
-  s.add_development_dependency('yard', ['>= 0'])
   s.add_development_dependency('creole', ['>= 0'])
   s.add_development_dependency('builder', ['>= 0'])
-  #s.add_development_dependency('rcov', ['>= 0'])
 end

data/test/slim/test_encoding.rb

@@ -0,0 +1,9 @@
+require 'helper'
+
+class TestSlimEncoding < TestSlim
+  def test_binary
+    source = "| \xFF\xFF"
+    result = "\xFF\xFF"
+    assert_html result, source
+  end
+end

data/test/slim/test_html_structure.rb

@@ -435,4 +435,28 @@ data-info="myinfo">
     end
   end
 
+  def test_block_expansion_support
+    source = %q{
+ul
+  li.first: a href='a' foo
+  li:       a href='b' bar
+  li.last:  a href='c' baz
+}
+    assert_html %{<ul><li class=\"first\"><a href=\"a\">foo</a></li><li><a href=\"b\">bar</a></li><li class=\"last\"><a href=\"c\">baz</a></li></ul>}, source
+  end
+
+  def test_block_expansion_class_attributes
+    source = %q{
+.a: .b: #c d
+}
+    assert_html %{<div class="a"><div class="b"><div id="c">d</div></div></div>}, source
+  end
+
+  def test_block_expansion_nesting
+    source = %q{
+html: body: .content
+  | Text
+}
+    assert_html %{<html><body><div class=\"content\">Text</div></body></html>}, source
+  end
 end

data/test/slim/test_parser_errors.rb

@@ -104,4 +104,24 @@ p
 
     assert_syntax_error "Invalid empty attribute\n  (__TEMPLATE__), Line 3\n    img src=\n            ^\n", source
   end
+
+  def test_missing_tag_in_block_expansion
+    source = %{
+html: body:
+}
+
+    assert_syntax_error "Expected tag\n  (__TEMPLATE__), Line 2\n    html: body:\n               ^\n", source
+  end
+
+  def test_invalid_tag_in_block_expansion
+    source = %{
+html: body: /comment
+}
+    assert_syntax_error "Expected tag\n  (__TEMPLATE__), Line 2\n    html: body: /comment\n                ^\n", source
+
+    source = %{
+html: body:/comment
+}
+    assert_syntax_error "Expected tag\n  (__TEMPLATE__), Line 2\n    html: body:/comment\n               ^\n", source
+  end
 end

data/test/slim/test_ruby_errors.rb

@@ -94,6 +94,22 @@ p Text line 1
     assert_ruby_error NameError,"(__TEMPLATE__):4", source
   end
 
+  def test_embedded_erb
+    source = %q{
+erb:
+  <%= 123 %>
+  Hello from ERB!
+  <%#
+    comment block
+  %>
+  <% if true %>
+  Text
+  <% end %>
+= unknown_ruby_method
+}
+    assert_ruby_error NameError,"(__TEMPLATE__):11", source
+  end
+
   def test_embedded_ruby1
     source = %q{
 ruby:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000 Z
+date: 2012-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &2160332500 !ruby/object:Gem::Requirement
+  requirement: &2152139880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.4
+        version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *2160332500
+  version_requirements: *2152139880
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2160331940 !ruby/object:Gem::Requirement
+  requirement: &2152135380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2160331940
+  version_requirements: *2152135380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160331240 !ruby/object:Gem::Requirement
+  requirement: &2152133280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2160331240
+  version_requirements: *2152133280
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2160330540 !ruby/object:Gem::Requirement
+  requirement: &2152132380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2160330540
+  version_requirements: *2152132380
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2160329940 !ruby/object:Gem::Requirement
+  requirement: &2152131200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160329940
+  version_requirements: *2152131200
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &2160329440 !ruby/object:Gem::Requirement
+  requirement: &2152129720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,21 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160329440
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2160328920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2160328920
+  version_requirements: *2152129720
 - !ruby/object:Gem::Dependency
   name: creole
-  requirement: &2160328340 !ruby/object:Gem::Requirement
+  requirement: &2152128100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +89,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160328340
+  version_requirements: *2152128100
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2160327860 !ruby/object:Gem::Requirement
+  requirement: &2152125140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160327860
+  version_requirements: *2152125140
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -133,11 +122,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- benchmarks/complex.erb
-- benchmarks/complex.haml
-- benchmarks/complex.slim
-- benchmarks/complex_view.rb
-- benchmarks/run.rb
+- benchmarks/context.rb
+- benchmarks/profile-parser.rb
+- benchmarks/profile-render.rb
+- benchmarks/run-benchmarks.rb
+- benchmarks/view.erb
+- benchmarks/view.haml
+- benchmarks/view.slim
 - bin/slimrb
 - extra/slim-mode.el
 - extra/test.slim
@@ -204,6 +195,7 @@ files:
 - test/slim/test_code_output.rb
 - test/slim/test_code_structure.rb
 - test/slim/test_embedded_engines.rb
+- test/slim/test_encoding.rb
 - test/slim/test_html_escaping.rb
 - test/slim/test_html_structure.rb
 - test/slim/test_parser_errors.rb
@@ -239,3 +231,4 @@ signing_key:
 specification_version: 3
 summary: Slim is a template language.
 test_files: []
+has_rdoc: 

data/benchmarks/complex_view.rb

@@ -1,15 +0,0 @@
-require 'tilt'
-
-class ComplexView
-  def header
-    "Colors"
-  end
-
-  def item
-    items = []
-    items << { :name => 'red', :current => true, :url => '#red' }
-    items << { :name => 'green', :current => false, :url => '#green' }
-    items << { :name => 'blue', :current => false, :url => '#blue' }
-    items
-  end
-end