[DRE-commits] [ruby-slim] 01/08: Merge tag 'upstream/3.0.6'

[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 2735843e561490c18197d869278a6060b8cdc565
Merge: 62a85a9 1c553f0
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Wed Sep 9 16:24:34 2015 +0200

    Merge tag 'upstream/3.0.6'
    
    Upstream version 3.0.6

 .gitignore                                      |    2 +
 .travis.yml                                     |   75 +-
 .yardopts                                       |    2 +-
 CHANGES                                         |  156 ++-
 Gemfile                                         |   35 +-
 LICENSE                                         |    2 +-
 README.jp.md                                    | 1205 +++++++++++++++++++++++
 README.md                                       |  858 ++++++++++------
 Rakefile                                        |   36 +-
 benchmarks/context.rb                           |    6 +-
 benchmarks/run-benchmarks.rb                    |   49 +-
 benchmarks/run-diffbench.rb                     |    0
 benchmarks/view.haml                            |    4 +-
 benchmarks/view.slim                            |    2 +-
 checksums.yaml.gz                               |  Bin 269 -> 0 bytes
 doc/include.md                                  |   20 +
 doc/jp/include.md                               |   20 +
 doc/jp/logic_less.md                            |  137 +++
 doc/jp/smart.md                                 |  102 ++
 doc/jp/translator.md                            |   28 +
 doc/logic_less.md                               |   14 +-
 doc/smart.md                                    |  103 ++
 lib/slim/code_attributes.rb                     |   12 +-
 lib/slim/command.rb                             |   70 +-
 lib/slim/controls.rb                            |   13 +-
 lib/slim/do_inserter.rb                         |    2 +-
 lib/slim/embedded.rb                            |   71 +-
 lib/slim/end_inserter.rb                        |   13 +-
 lib/slim/engine.rb                              |   44 +-
 lib/slim/erb_converter.rb                       |    2 +-
 lib/slim/filter.rb                              |    4 +-
 lib/slim/grammar.rb                             |    4 +-
 lib/slim/include.rb                             |   57 ++
 lib/slim/interpolation.rb                       |   24 +-
 lib/slim/logic_less.rb                          |    3 +-
 lib/slim/logic_less/filter.rb                   |    6 +-
 lib/slim/parser.rb                              |  174 ++--
 lib/slim/smart.rb                               |    8 +
 lib/slim/smart/escaper.rb                       |   42 +
 lib/slim/smart/filter.rb                        |   96 ++
 lib/slim/smart/parser.rb                        |   36 +
 lib/slim/splat/builder.rb                       |   60 +-
 lib/slim/splat/filter.rb                        |    7 +-
 lib/slim/template.rb                            |   10 +-
 lib/slim/translator.rb                          |   30 +-
 lib/slim/version.rb                             |    2 +-
 metadata.yml                                    |   57 +-
 slim.gemspec                                    |    5 +-
 test/core/helper.rb                             |   22 +-
 test/core/test_code_blocks.rb                   |   64 ++
 test/core/test_code_escaping.rb                 |   38 +-
 test/core/test_code_evaluation.rb               |   10 +-
 test/core/test_code_output.rb                   |    2 +-
 test/core/test_commands.rb                      |  223 +++++
 test/core/test_embedded_engines.rb              |   73 +-
 test/core/test_encoding.rb                      |    8 +-
 test/core/test_erb_converter.rb                 |   60 +-
 test/core/test_html_attributes.rb               |   27 +-
 test/core/test_html_structure.rb                |   73 +-
 test/core/test_parser_errors.rb                 |   44 +-
 test/core/test_pretty.rb                        |   73 +-
 test/core/test_ruby_errors.rb                   |   20 +-
 test/core/test_slim_template.rb                 |    4 +-
 test/core/test_tabs.rb                          |   10 +-
 test/core/test_thread_options.rb                |    8 +-
 test/core/test_unicode.rb                       |   24 +-
 test/include/files/recursive.slim               |    1 +
 test/include/files/slimfile.slim                |    3 +
 test/include/files/subdir/test.slim             |    1 +
 test/include/files/textfile                     |    1 +
 test/include/test_include.rb                    |   24 +
 test/literate/TESTS.md                          |  130 ++-
 test/literate/helper.rb                         |    4 +-
 test/logic_less/test_logic_less.rb              |   74 +-
 test/rails/app/controllers/slim_controller.rb   |    6 +-
 test/rails/app/views/slim/splat.html.slim       |    2 +
 test/rails/config/initializers/session_store.rb |    2 +-
 test/rails/config/routes.rb                     |    8 +-
 test/rails/test/helper.rb                       |   24 +
 test/rails/test/test_slim.rb                    |   50 +-
 test/smart/test_smart_text.rb                   |  296 ++++++
 test/translator/test_translator.rb              |   39 +-
 82 files changed, 4163 insertions(+), 993 deletions(-)

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