slim 1.0.1 → 1.0.2

data/.gitignore

@@ -13,6 +13,6 @@ doc
 coverage
 pkg
 
-test/integration/rails/dummy/log/
-test/integration/rails/dummy/tmp/
-test/integration/rails/dummy/db/*.sqlite3
+test/rails/log/
+test/rails/tmp/
+test/rails/db/*.sqlite3

data/.travis.yml

@@ -0,0 +1,17 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - jruby
+  - rbx-2.0
+env:
+  - "TASK=test"
+  - "TASK=test TEMPLE=master"
+  - "TASK=test:rails TEMPLE=master RAILS=master"
+  - "TASK=test:rails RAILS=3.0.10"
+script: "bundle exec rake test:ci"
+notifications:
+  email: false
+  irc:
+    - "irc.freenode.org#slim-lang"

data/CHANGES

@@ -1,5 +1,12 @@
 master
 
+1.0.2
+
+  * Support for Rails 3.1 streaming (Temple > 0.3.2 required)
+  * Switch to default format xhtml (supports all doctypes, including html5)
+  * Improve parsing of #{interpolation} in quoted attributes (issue #159)
+  * Use travis-ci for continous integration testing
+
 1.0.1
 
   * Only delimiting brackets must be balanced in ruby attributes

data/Gemfile

@@ -2,15 +2,15 @@ source :rubygems
 
 gemspec
 
-if path = ENV['SLIM_USE_TEMPLE']
-  if path == 'edge'
-    gem 'temple', :git => 'git://github.com/judofyr/temple.git'
-  else
-    gem 'temple', :path => path
-  end
+if ENV['TEMPLE'] == 'master'
+   gem 'temple', :git => 'git://github.com/judofyr/temple.git'
 end
 
-group :integration do
-  gem 'rails', '~> 3.0.3'
+if ENV['RAILS']
+  if ENV['RAILS'] == 'master'
+    gem 'rails', :git => 'git://github.com/rails/rails.git'
+  else
+    gem 'rails', "= #{ENV['RAILS']}"
+  end
   gem 'sqlite3-ruby'
-end
+end

data/README.md

@@ -155,7 +155,7 @@ Here's a quick example to demonstrate what a Slim template looks like:
 
   If you wrap the attributes, you can spread them across multiple lines:
 
-    h2[ id="tagline" 
+    h2[ id="tagline"
         class="small tagline"] = page_tagline
 
 ### Add content to a tag
@@ -290,8 +290,8 @@ Here's a quick example to demonstrate what a Slim template looks like:
 ## Benchmarks
 
   *The benchmarks are only to demonstrate that Slim's speed should not
-  be a determining factor in your template choice. Even if we don't 
-  agree, we'd prefer you to use any other reason for choosing another 
+  be a determining factor in your template choice. Even if we don't
+  agree, we'd prefer you to use any other reason for choosing another
   template language.*
 
     # Linux + Ruby 1.9.2, 1000 iterations
@@ -338,6 +338,20 @@ Here's a quick example to demonstrate what a Slim template looks like:
        Sinatra, Ramaze and Camping. (Rails still uses its own template
        compilation.)
 
+## Tests
+
+Slim provides an extensive test-suite based on minitest. You can run the tests
+with 'rake test' and the rails integration tests with 'rake test:rails'.
+
+Travis-CI is used for continous integration testing: http://travis-ci.org/#!/stonean/slim
+
+Slim is working well on the following ruby implementations:
+
+* Ruby 1.8.7
+* Ruby 1.9.2
+* Ruby EE
+* JRuby
+
 ## License
 
 This project is released under the MIT license.

data/Rakefile

@@ -6,28 +6,32 @@ end
 
 require 'rake/testtask'
 
-desc 'Run Slim benchmarks! (Default :iterations is 1000)'
-task :bench, :iterations, :slow do |t, args|
-  ruby("benchmarks/run.rb #{args[:slow]} #{args[:iterations]}")
+desc 'Run Slim benchmarks! (default parameters slow=false iterations=1000)'
+task :bench, :iterations, :slow do
+  ruby('benchmarks/run.rb')
 end
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib' << 'test'
-  t.pattern = 'test/slim/**/test_*.rb'
+Rake::TestTask.new('test') do |t|
+  t.libs << 'lib' << 'test/slim'
+  t.test_files = FileList['test/slim/test_*.rb']
   t.verbose = true
 end
 
-Rake::TestTask.new(:integration) do |t|
-  t.libs << 'lib' << 'test'
-  t.pattern = 'test/integration/**/test_*.rb'
+Rake::TestTask.new('test:rails') do |t|
+  t.libs << 'lib'
+  t.test_files = FileList['test/rails/test/test_*.rb']
   t.verbose = true
 end
 
+task 'test:ci' do |t|
+  Rake::Task[ENV['TASK']].execute
+end
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |t|
-    t.libs << 'lib' << 'test'
-    t.pattern = 'test/**/test_*.rb'
+    t.libs << 'lib' << 'test/slim'
+    t.test_files = FileList['test/slim/test_*.rb']
     t.verbose = true
   end
 rescue LoadError

data/benchmarks/run.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.join(File.dirname(__FILE__), 'src'))
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'), File.dirname(__FILE__))
 
 require 'slim'
 require 'complex_view'
@@ -17,9 +17,9 @@ class SlimBenchmarks
     @iterations = (iterations || 1000).to_i
     @benches    = []
 
-    tpl_erb  = File.read(File.dirname(__FILE__) + '/src/complex.erb')
-    tpl_haml = File.read(File.dirname(__FILE__) + '/src/complex.haml')
-    tpl_slim = File.read(File.dirname(__FILE__) + '/src/complex.slim')
+    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')
 
     view  = ComplexView.new
     eview = OpenStruct.new(:header => view.header, :item => view.item).instance_eval{ binding }
@@ -87,7 +87,7 @@ class SlimBenchmarks
     end
     puts "
 1. Uncached benchmark. Template is parsed every time.
-   Activate this benchmark with slow=1.
+   Activate this benchmark with 'rake bench slow=1'.
 
 2. Cached benchmark. Template is parsed before the benchmark.
    The ruby code generated by the template engine might be evaluated every time.
@@ -111,4 +111,4 @@ class SlimBenchmarks
   end
 end
 
-SlimBenchmarks.new(ARGV[0], ARGV[1]).run
+SlimBenchmarks.new(ENV['slow'], ENV['iterations']).run

data/lib/slim/compiler.rb

@@ -83,7 +83,7 @@ module Slim
             end
            ]]]]
       end
-      [:html, :attr, name,  [:escape, escape, value]]
+      [:html, :attr, name, [:escape, escape, value]]
     end
   end
 end

data/lib/slim/engine.rb

@@ -10,7 +10,6 @@ module Slim
     # This overwrites some temple default options.
     set_default_options :pretty => false,
                         :attr_wrapper => '"',
-                        :format => :html5,
                         :attr_delimiter => {'class' => ' '},
                         :generator => Temple::Generators::ArrayBuffer
 
@@ -21,19 +20,21 @@ module Slim
     # --------------------------------------------------------------------------------------------------------------------------------------------
     # String      | :file              | nil                           | Name of parsed file, set automatically by Slim::Template
     # Integer     | :tabsize           | 4                             | Number of whitespaces per tab (used by the parser)
-    # String      | :encoding          | utf-8                         | Set encoding of template
+    # String      | :encoding          | "utf-8"                       | Set encoding of template
+    # String      | :default_tag       | "div"                         | Default tag to be used if tag name is omitted
     # String list | :enable_engines    | All enabled                   | List of enabled embedded engines (whitelist)
     # String list | :disable_engines   | None disabled                 | List of disabled embedded engines (blacklist)
     # Boolean     | :sections          | false                         | Enable sections mode (logic-less)
     # String      | :dictionary        | "self"                        | Name of dictionary variable in sections mode
     # Symbol      | :dictionary_access | :wrapped                      | Access mode of dictionary variable (:wrapped, :symbol, :string)
-    # Boolean     | :disable_capture   | false (true in Rails)         | Disable capturing in blocks (blocks write to the default buffer then)
+    # Boolean     | :disable_capture   | false (true in Rails)         | Disable capturing in blocks (blocks write to the default buffer 
     # Boolean     | :disable_escape    | false                         | Disable automatic escaping of strings
     # Boolean     | :use_html_safe     | false (true in Rails)         | Use String#html_safe? from ActiveSupport (Works together with :disable_escape)
-    # Symbol      | :format            | :html5                        | HTML output format
+    # 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)
     # Boolean     | :pretty            | false                         | Pretty html indenting (This is slower!)
+    # Boolean     | :streaming         | false (true in Rails > 3.1)   | Enable output streaming
     # Class       | :generator         | ArrayBuffer/RailsOutputBuffer | Temple code generator (default generator generates array buffer)
     #
     # It is also possible to set all options supported by the generator (option :generator). The standard generators
@@ -52,17 +53,19 @@ module Slim
     # It is recommended to set the default settings only once in the code and avoid duplication. Only use
     # `set_default_options` when you have to override some default settings.
     #
-    use Slim::Parser, :file, :tabsize, :encoding
+    use Slim::Parser, :file, :tabsize, :encoding, :default_tag
     use Slim::EmbeddedEngine, :enable_engines, :disable_engines, :pretty
     use Slim::Interpolation
     use Slim::Sections, :sections, :dictionary, :dictionary_access
     use Slim::EndInserter
     use Slim::Compiler, :disable_capture, :attr_delimiter
-    use Temple::HTML::Pretty, :format, :attr_wrapper, :attr_delimiter, :pretty
+    use Temple::HTML::AttributeMerger, :attr_delimiter
+    use Temple::HTML::Pretty, :format, :attr_wrapper, :pretty
     filter :Escapable, :use_html_safe, :disable_escape
     filter :ControlFlow
     filter :MultiFlattener
-    filter :DynamicInliner
-    use(:Generator) {|exp| options[:generator].new(options).call(exp) }
+    wildcard(:Optimizer) { (options[:streaming] ? Temple::Filters::StaticMerger :
+                            Temple::Filters::DynamicInliner).new }
+    wildcard(:Generator) { options[:generator].new(options) }
   end
 end

data/lib/slim/parser.rb

@@ -5,7 +5,8 @@ module Slim
     include Temple::Mixins::Options
 
     set_default_options :tabsize  => 4,
-                        :encoding => 'utf-8'
+                        :encoding => 'utf-8',
+                        :default_tag => 'div'
 
     class SyntaxError < StandardError
       attr_reader :error, :file, :line, :lineno, :column
@@ -72,7 +73,6 @@ module Slim
 
     DELIMITER_REGEX = /\A[\(\[\{]/
     ATTR_NAME_REGEX = '\A\s*(\w[:\w-]*)'
-    QUOTED_VALUE_REGEX = /\A("[^"]*"|'[^']*')/
 
     if RUBY_VERSION > '1.9'
       CLASS_ID_REGEX = /\A(#|\.)([\w\u00c0-\uFFFF][\w:\u00c0-\uFFFF-]*)/
@@ -283,7 +283,7 @@ module Slim
 
     def parse_tag(tag)
       if tag == '#' || tag == '.'
-        tag = 'div'
+        tag = options[:default_tag]
       else
         @line.slice!(0, tag.size)
       end
@@ -343,10 +343,10 @@ module Slim
           name = $1
           if delimiter && $2 != '='
             attributes << [:slim, :attr, name, false, 'true']
-          elsif @line =~ QUOTED_VALUE_REGEX
+          elsif @line =~ /\A["']/
             # Value is quoted (static)
             @line = $'
-            attributes << [:html, :attr, name, [:slim, :interpolate, $1[1..-2]]]
+            attributes << [:html, :attr, name, [:slim, :interpolate, parse_quoted_attribute($&)]]
           else
             # Value is ruby code
             escape = @line[0] != ?=
@@ -380,11 +380,7 @@ module Slim
     end
 
     def parse_ruby_attribute(outer_delimiter)
-      # Delimiter count
-      count, delimiter, close_delimiter = 0, nil, nil
-
-      # Attribute value buffer
-      value = ''
+      value, count, delimiter, close_delimiter = '', 0, nil, nil
 
       # Attribute ends with space or attribute delimiter
       end_regex = /\A[\s#{Regexp.escape outer_delimiter.to_s}]/
@@ -414,6 +410,28 @@ module Slim
       value
     end
 
+    def parse_quoted_attribute(quote)
+      value, count = '', 0
+
+      until @line.empty? || (count == 0 && @line[0] == quote[0])
+        if count > 0
+          if @line[0] == ?{
+            count += 1
+          elsif @line[0] == ?}
+            count -= 1
+          end
+        elsif @line =~ /\A#\{/
+          value << @line.slice!(0)
+          count = 1
+        end
+        value << @line.slice!(0)
+      end
+
+      syntax_error!("Expected closing brace }") if count != 0
+      @line.slice!(0)
+      value
+    end
+
     # Helper for raising exceptions
     def syntax_error!(message, args = {})
       args[:orig_line] ||= @orig_line

data/lib/slim/template.rb

@@ -9,9 +9,11 @@ module Slim
     RailsTemplate = Temple::Templates::Rails(Slim::Engine,
                                              :register_as => :slim,
                                              # Use rails-specific generator. This is necessary
-                                             # to support block capturing. Disable the internal slim capturing.
-                                             # Rails takes care of the capturing by itself.
+                                             # to support block capturing and streaming.
                                              :generator => Temple::Generators::RailsOutputBuffer,
-                                             :disable_capture => true)
+                                             # Disable the internal slim capturing.
+                                             # Rails takes care of the capturing by itself.
+                                             :disable_capture => true,
+                                             :streaming => true)
   end
 end

data/lib/slim/version.rb

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

data/slim.gemspec

@@ -19,16 +19,19 @@ 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.0']) unless ENV['SLIM_USE_TEMPLE']
-  s.add_runtime_dependency('tilt', ['~> 1.2'])
+  s.add_runtime_dependency('temple', ['~> 0.3.3'])
+  s.add_runtime_dependency('tilt', ['~> 1.3.2'])
 
   s.add_development_dependency('rake', ['>= 0.8.7'])
   s.add_development_dependency('haml', ['>= 3.1.0'])
   s.add_development_dependency('sass', ['>= 3.1.0'])
   s.add_development_dependency('minitest', ['>= 0'])
-  s.add_development_dependency('rcov', ['>= 0'])
   s.add_development_dependency('rdiscount', ['>= 0'])
   s.add_development_dependency('liquid', ['>= 0'])
   s.add_development_dependency('yard', ['>= 0'])
   s.add_development_dependency('creole', ['>= 0'])
+
+  unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+    s.add_development_dependency('rcov', ['>= 0'])
+  end
 end

data/test/{integration/rails/dummy → rails}/app/models/child.rb

@@ -1,5 +1,3 @@
 class Child < ActiveRecord::Base
-  
   belongs_to :parent
-  
-end
+end

data/test/{integration/rails/dummy → rails}/app/models/parent.rb

@@ -1,6 +1,4 @@
 class Parent < ActiveRecord::Base
-  
   has_many :children
   accepts_nested_attributes_for :children, :allow_destroy => true
-  
-end
+end

data/test/{integration/rails/dummy → rails}/app/views/parents/_form.html.slim

@@ -5,4 +5,3 @@
   ul
     = f.fields_for :children do |c|
       li= c.text_field :name
-  = f.submit

data/test/{integration/rails/test_helper.rb → rails/test/helper.rb}

@@ -1,10 +1,10 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require File.expand_path("../../config/environment.rb", __FILE__)
 require "rails/test_help"
 
 Rails.backtrace_cleaner.remove_silencers!
 
 # Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
+ActiveRecord::Migrator.migrate File.expand_path("../../db/migrate/", __FILE__)

data/test/{integration/rails → rails/test}/test_slim_rails.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/test_helper')
+require File.expand_path('../helper', __FILE__)
 
 class TestSlimRails < ActionController::IntegrationTest
   test "normal view" do
@@ -54,7 +54,7 @@ class TestSlimRails < ActionController::IntegrationTest
       '<h2>Children</h2>'+
       '<ul><li><input id="parent_children_attributes_0_name" name="parent[children_attributes][0][name]" size="30" type="text" value="c1" /></li>'+
       '<input id="parent_children_attributes_0_id" name="parent[children_attributes][0][id]" type="hidden" value="1" /></ul>'+
-      '<input id="parent_submit" name="commit" type="submit" value="Update Parent" /></form>'
+      '</form>'
   end
 
   protected

data/test/{helper.rb → slim/helper.rb}

@@ -62,13 +62,13 @@ end
 class Env
   attr_reader :var
 
-  class HtmlSafeString < String
+  class ::HtmlSafeString < String
     def html_safe?
       true
     end
   end
 
-  class HtmlUnsafeString < String
+  class ::HtmlUnsafeString < String
     def html_safe?
       false
     end

data/test/slim/test_html_structure.rb

@@ -71,6 +71,15 @@ h1#title This is my title
     assert_html '<h1 id="title">This is my title</h1><div class="hello world" id="notice">Hello World from @env</div>', source
   end
 
+  def test_render_with_overwritten_default_tag
+    source = %q{
+#notice.hello.world
+  = hello_world
+}
+
+    assert_html '<section class="hello world" id="notice">Hello World from @env</section>', source, :default_tag => 'section'
+  end
+
   def test_render_with_text_block
     source = %q{
 p

data/test/slim/test_ruby_errors.rb

@@ -19,7 +19,17 @@ p = hello_world + \
   unknown_ruby_method
 }
 
-    assert_ruby_error NameError, "test.slim:4", source, :file => 'test.slim'
+    # FIXME: Remove this hack!
+    # This is actually a jruby issue. Jruby reports a wrong
+    # line number 1 in this case:
+    #
+    # test = 1+\
+    #    unknown_variable
+    if RUBY_PLATFORM == "java"
+      assert_ruby_error NameError, "test.slim:2", source, :file => 'test.slim'
+    else
+      assert_ruby_error NameError, "test.slim:4", source, :file => 'test.slim'
+    end
   end
 
   def test_broken_output_line2

data/test/slim/test_text_interpolation.rb

@@ -9,6 +9,14 @@ p id="a#{id_helper}b" = hello_world
     assert_html '<p id="anoticeb">Hello World from @env</p>', source
   end
 
+  def test_nested_interpolation_in_attribute
+    source = %q{
+p id="#{"abc#{1+1}" + "("}" = hello_world
+}
+
+    assert_html '<p id="abc2(">Hello World from @env</p>', source
+  end
+
   def test_interpolation_in_text
     source = %q{
 p

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slim
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,34 +11,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-07 00:00:00.000000000 -04:00
+date: 2011-08-26 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: temple
-  requirement: &2153659280 !ruby/object:Gem::Requirement
+  requirement: &2161719440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153659280
+  version_requirements: *2161719440
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2153658760 !ruby/object:Gem::Requirement
+  requirement: &2161718920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153658760
+  version_requirements: *2161718920
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153658280 !ruby/object:Gem::Requirement
+  requirement: &2161718440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *2153658280
+  version_requirements: *2161718440
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2153657800 !ruby/object:Gem::Requirement
+  requirement: &2161717960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153657800
+  version_requirements: *2161717960
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2153657320 !ruby/object:Gem::Requirement
+  requirement: &2152313300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *2153657320
+  version_requirements: *2152313300
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153656840 !ruby/object:Gem::Requirement
+  requirement: &2152312820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153656840
+  version_requirements: *2152312820
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2153656360 !ruby/object:Gem::Requirement
+  name: rdiscount
+  requirement: &2152312340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,10 +90,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153656360
+  version_requirements: *2152312340
 - !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: &2153655880 !ruby/object:Gem::Requirement
+  name: liquid
+  requirement: &2152311860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,10 +101,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153655880
+  version_requirements: *2152311860
 - !ruby/object:Gem::Dependency
-  name: liquid
-  requirement: &2153655400 !ruby/object:Gem::Requirement
+  name: yard
+  requirement: &2152311380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -112,10 +112,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153655400
+  version_requirements: *2152311380
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2153654920 !ruby/object:Gem::Requirement
+  name: creole
+  requirement: &2152310900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -123,10 +123,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153654920
+  version_requirements: *2152310900
 - !ruby/object:Gem::Dependency
-  name: creole
-  requirement: &2153654440 !ruby/object:Gem::Requirement
+  name: rcov
+  requirement: &2152310380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -134,7 +134,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153654440
+  version_requirements: *2152310380
 description: Slim is a template language whose goal is reduce the syntax to the essential
   parts without becoming cryptic.
 email:
@@ -149,17 +149,18 @@ extra_rdoc_files:
 files:
 - .gemtest
 - .gitignore
+- .travis.yml
 - .yardopts
 - CHANGES
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- benchmarks/complex.erb
+- benchmarks/complex.haml
+- benchmarks/complex.slim
+- benchmarks/complex_view.rb
 - benchmarks/run.rb
-- benchmarks/src/complex.erb
-- benchmarks/src/complex.haml
-- benchmarks/src/complex.slim
-- benchmarks/src/complex_view.rb
 - bin/slimrb
 - extra/slim-mode.el
 - extra/test.slim
@@ -178,47 +179,47 @@ files:
 - lib/slim/version.rb
 - lib/slim/wrapper.rb
 - slim.gemspec
-- test/helper.rb
-- test/integration/rails/dummy/Rakefile
-- test/integration/rails/dummy/app/controllers/application_controller.rb
-- test/integration/rails/dummy/app/controllers/parents_controller.rb
-- test/integration/rails/dummy/app/controllers/slim_controller.rb
-- test/integration/rails/dummy/app/helpers/application_helper.rb
-- test/integration/rails/dummy/app/models/child.rb
-- test/integration/rails/dummy/app/models/parent.rb
-- test/integration/rails/dummy/app/views/layouts/application.html.slim
-- test/integration/rails/dummy/app/views/parents/_form.html.slim
-- test/integration/rails/dummy/app/views/parents/edit.html.slim
-- test/integration/rails/dummy/app/views/parents/new.html.slim
-- test/integration/rails/dummy/app/views/parents/show.html.slim
-- test/integration/rails/dummy/app/views/slim/_partial.html.slim
-- test/integration/rails/dummy/app/views/slim/content_for.html.slim
-- test/integration/rails/dummy/app/views/slim/erb.html.erb
-- test/integration/rails/dummy/app/views/slim/integers.html.slim
-- test/integration/rails/dummy/app/views/slim/nil.html.slim
-- test/integration/rails/dummy/app/views/slim/no_layout.html.slim
-- test/integration/rails/dummy/app/views/slim/normal.html.slim
-- test/integration/rails/dummy/app/views/slim/partial.html.slim
-- test/integration/rails/dummy/app/views/slim/variables.html.slim
-- test/integration/rails/dummy/config.ru
-- test/integration/rails/dummy/config/application.rb
-- test/integration/rails/dummy/config/boot.rb
-- test/integration/rails/dummy/config/database.yml
-- test/integration/rails/dummy/config/environment.rb
-- test/integration/rails/dummy/config/environments/development.rb
-- test/integration/rails/dummy/config/environments/production.rb
-- test/integration/rails/dummy/config/environments/test.rb
-- test/integration/rails/dummy/config/initializers/backtrace_silencers.rb
-- test/integration/rails/dummy/config/initializers/inflections.rb
-- test/integration/rails/dummy/config/initializers/mime_types.rb
-- test/integration/rails/dummy/config/initializers/secret_token.rb
-- test/integration/rails/dummy/config/initializers/session_store.rb
-- test/integration/rails/dummy/config/locales/en.yml
-- test/integration/rails/dummy/config/routes.rb
-- test/integration/rails/dummy/db/migrate/20101220223037_parents_and_children.rb
-- test/integration/rails/dummy/script/rails
-- test/integration/rails/test_helper.rb
-- test/integration/rails/test_slim_rails.rb
+- test/rails/Rakefile
+- test/rails/app/controllers/application_controller.rb
+- test/rails/app/controllers/parents_controller.rb
+- test/rails/app/controllers/slim_controller.rb
+- test/rails/app/helpers/application_helper.rb
+- test/rails/app/models/child.rb
+- test/rails/app/models/parent.rb
+- test/rails/app/views/layouts/application.html.slim
+- test/rails/app/views/parents/_form.html.slim
+- test/rails/app/views/parents/edit.html.slim
+- test/rails/app/views/parents/new.html.slim
+- test/rails/app/views/parents/show.html.slim
+- test/rails/app/views/slim/_partial.html.slim
+- test/rails/app/views/slim/content_for.html.slim
+- test/rails/app/views/slim/erb.html.erb
+- test/rails/app/views/slim/integers.html.slim
+- test/rails/app/views/slim/nil.html.slim
+- test/rails/app/views/slim/no_layout.html.slim
+- test/rails/app/views/slim/normal.html.slim
+- test/rails/app/views/slim/partial.html.slim
+- test/rails/app/views/slim/variables.html.slim
+- test/rails/config.ru
+- test/rails/config/application.rb
+- test/rails/config/boot.rb
+- test/rails/config/database.yml
+- test/rails/config/environment.rb
+- test/rails/config/environments/development.rb
+- test/rails/config/environments/production.rb
+- test/rails/config/environments/test.rb
+- test/rails/config/initializers/backtrace_silencers.rb
+- test/rails/config/initializers/inflections.rb
+- test/rails/config/initializers/mime_types.rb
+- test/rails/config/initializers/secret_token.rb
+- test/rails/config/initializers/session_store.rb
+- test/rails/config/locales/en.yml
+- test/rails/config/routes.rb
+- test/rails/db/migrate/20101220223037_parents_and_children.rb
+- test/rails/script/rails
+- test/rails/test/helper.rb
+- test/rails/test/test_slim_rails.rb
+- test/slim/helper.rb
 - test/slim/test_chain_manipulation.rb
 - test/slim/test_code_blocks.rb
 - test/slim/test_code_escaping.rb