[DRE-commits] [ruby-slim] 01/07: Merge tag 'upstream/2.0.0'

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository ruby-slim.

commit 255edad2ecd74971e952657ae565b6e0d52cdf89
Merge: 2a0c8be d3acf64
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Jun 12 10:14:14 2013 +0200

    Merge tag 'upstream/2.0.0'
    
    Upstream version 2.0.0

 .gitignore                                         |   10 +-
 .travis.yml                                        |   25 +-
 CHANGES                                            |   63 +++--
 Gemfile                                            |   21 +-
 README.md                                          |  251 +++++++-------------
 Rakefile                                           |   21 +-
 benchmarks/run-benchmarks.rb                       |   46 +---
 checksums.yaml.gz                                  |  Bin 0 -> 268 bytes
 doc/logic_less.md                                  |  140 +++++++++++
 doc/translator.md                                  |   31 +++
 lib/slim.rb                                        |    1 +
 lib/slim/command.rb                                |   33 ++-
 lib/slim/do_inserter.rb                            |   33 +++
 lib/slim/embedded.rb                               |    1 +
 lib/slim/end_inserter.rb                           |    4 +-
 lib/slim/engine.rb                                 |    6 +-
 lib/slim/erb_converter.rb                          |   14 ++
 lib/slim/filter.rb                                 |    4 +-
 lib/slim/logic_less/context.rb                     |    8 +
 lib/slim/logic_less/filter.rb                      |    9 +-
 lib/slim/parser.rb                                 |   78 +++---
 lib/slim/splat/filter.rb                           |    2 +-
 lib/slim/template.rb                               |    4 +-
 lib/slim/translator.rb                             |    6 +-
 lib/slim/version.rb                                |    2 +-
 metadata.yml                                       |   51 ++--
 slim.gemspec                                       |    4 +-
 test/core/helper.rb                                |   35 +--
 test/core/test_code_blocks.rb                      |   51 ++++
 test/core/test_code_escaping.rb                    |   66 ++++-
 test/core/test_code_structure.rb                   |   42 ++++
 test/core/test_embedded_engines.rb                 |   37 ++-
 test/core/test_encoding.rb                         |    9 +-
 test/core/test_erb_converter.rb                    |   67 ++++++
 test/core/test_ruby_errors.rb                      |    4 +-
 test/literate/TESTS.md                             |  181 +++++++++++++-
 test/logic_less/test_logic_less.rb                 |   17 ++
 .../app/controllers/application_controller.rb      |    1 -
 test/rails/app/controllers/entries_controller.rb   |    5 +
 test/rails/app/controllers/parents_controller.rb   |   85 -------
 test/rails/app/controllers/slim_controller.rb      |    3 +
 test/rails/app/models/child.rb                     |    3 -
 test/rails/app/models/entry.rb                     |   16 ++
 test/rails/app/models/parent.rb                    |    4 -
 test/rails/app/views/entries/edit.html.slim        |    3 +
 test/rails/app/views/parents/_form.html.slim       |    8 -
 test/rails/app/views/parents/edit.html.slim        |    2 -
 test/rails/app/views/parents/new.html.slim         |    2 -
 test/rails/app/views/parents/show.html.slim        |    5 -
 test/rails/app/views/slim/form_for.html.slim       |    2 +
 test/rails/app/views/slim/xml.slim                 |    1 +
 test/rails/config/application.rb                   |    4 +-
 test/rails/config/database.yml                     |    4 -
 test/rails/config/environments/test.rb             |    2 +-
 test/rails/config/routes.rb                        |    2 +-
 .../migrate/20101220223037_parents_and_children.rb |   17 --
 test/rails/test/helper.rb                          |    3 -
 test/rails/test/test_slim.rb                       |   21 +-
 test/translator/test_translator.rb                 |   15 +-
 59 files changed, 1038 insertions(+), 547 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-slim.git