Add pandoc support #1533
Merged
Add pandoc support #1533
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
namusyaka
requested changes
Jun 23, 2019
lib/sinatra/base.rb
Outdated
| @@ -722,6 +722,7 @@ def liquid(template, options = {}, locals = {}, &block) | |||
| end | |||
|
|
|||
| def markdown(template, options = {}, locals = {}) | |||
| options[:default_outvar] = false | |||
There was a problem hiding this comment.
default_outvar makes me confusing a bit. How about exclude_outvar ?
lib/sinatra/base.rb
Outdated
| @@ -825,10 +826,11 @@ def render(engine, data, options = {}, locals = {}, &block) | |||
| content_type = options.delete(:content_type) || content_type | |||
| layout_engine = options.delete(:layout_engine) || engine | |||
| scope = options.delete(:scope) || self | |||
| default_outvar = options.delete(:default_outvar) != false | |||
There was a problem hiding this comment.
I don't like this expression. I would like to use the value directly.
Here I try to fix an another warning from tests. ``` cannot load such file -- pandoc-ruby: skipping markdown tests with Tilt::PandocTemplate ``` `pandoc-ruby` is not defined in Gemfile, so I add it there. This gem has a prerequisite dependency `pandoc` application that can be installed via homebrew. That's why I update travis.yml to make it available during a test run. The final step to make it work is to exclude `outvar` from the option's list provided to the template. When `pandoc` application is called with unsupported parameters it stops the execution and returns an error.
|
@namusyaka, I've made changes according to your suggestion. |
namusyaka
approved these changes
Aug 17, 2019
There was a problem hiding this comment.
Sorry for the late response. But LGTM.
While reviewing this, I found a bug around bluecloth. So I sent a patch for it: ged/bluecloth#1
However, we don't need to wait the progress for the patch. Our next patch version will contain this change.
Thanks so much for your contribution.
netbsd-srcmastr
pushed a commit
to NetBSD/pkgsrc
that referenced
this pull request
Mar 20, 2020
Update ruby-sinatra to 2.0.8.1. ## 2.0.8.1 / 2020-01-02 * Allow multiple hashes to be passed in `merge` and `merge!` for `Sinatra::IndifferentHash` [#1572](sinatra/sinatra#1572) by Shota Iguchi ## 2.0.8 / 2020-01-01 * Lookup Tilt class for template engine without loading files [#1558](sinatra/sinatra#1558). Fixes [#1172](sinatra/sinatra#1172) by Jordan Owens * Add request info in NotFound exception [#1566](sinatra/sinatra#1566) by Stefan Sundin * Add `.yaml` support in `Sinatra::Contrib::ConfigFile` [#1564](sinatra/sinatra#1564). Fixes [#1563](sinatra/sinatra#1563) by Emerson Manabu Araki * Remove only routing parameters from @params hash [#1569](sinatra/sinatra#1569). Fixes [#1567](sinatra/sinatra#1567) by Jordan Owens, Horacio * Support `capture` and `content_for` with Hamlit [#1580](sinatra/sinatra#1580) by Takashi Kokubun * Eliminate warnings of keyword parameter for Ruby 2.7.0 [#1581](sinatra/sinatra#1581) by Osamtimizer ## 2.0.7 / 2019-08-22 * Fix a regression [#1560](sinatra/sinatra#1560) by Kunpei Sakai ## 2.0.6 / 2019-08-21 * Fix an issue setting environment from command line option [#1547](sinatra/sinatra#1547), [#1554](sinatra/sinatra#1554) by Jordan Owens, Kunpei Sakai * Support pandoc as a new markdown renderer [#1533](sinatra/sinatra#1533) by Vasiliy * Remove outdated code for tilt 1.x [#1532](sinatra/sinatra#1532) by Vasiliy * Remove an extra logic for `force_encoding` [#1527](sinatra/sinatra#1527) by Jordan Owens * Avoid multiple errors even if `params` contains special values [#1526](sinatra/sinatra#1527) by Kunpei Sakai * Support `bundler/inline` with `require 'sinatra'` integration [#1520](sinatra/sinatra#1520) by Kunpei Sakai * Avoid `TypeError` when params contain a key without a value on Ruby < 2.4 [#1516](sinatra/sinatra#1516) by Samuel Giddins * Improve development support and documentation and source code by Olle Jonsson, Basavanagowda Kanur, Yuki MINAMIYA
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Here I try to fix an another warning from tests.
pandoc-rubyis not defined in Gemfile, so I add it there. This gem has a prerequisite dependencypandoc(a CLI application) that can be installed via apt. That's why I update travis.yml to make it available during a test run.The final step to make it work is to exclude
outvarfrom the option's list provided to the template. Whenpandocapplication is called with unsupported parameters it stops the execution and returns an error.I'm not really sure why
outvarparameter is defined by default and what it supposed to do. It seems that it was used before by several templates engines, but looks like it is not supported by all of them. I managed to find a old commit that introduces it f8e0a34.I've added a setting to exclude and disable it for markdown engines, but I have doubts if it is a safe option. What do you think?