Remove wlang support
This commit is contained in:
parent
83d917649b
commit
f10111baa0
1
Gemfile
1
Gemfile
|
@ -24,7 +24,6 @@ gem "twitter-text", "1.14.7"
|
||||||
gem "activesupport", "~> 6.1"
|
gem "activesupport", "~> 6.1"
|
||||||
|
|
||||||
gem 'redcarpet', platforms: [ :ruby ]
|
gem 'redcarpet', platforms: [ :ruby ]
|
||||||
gem 'wlang', '>= 3.0.1'
|
|
||||||
gem 'rdiscount', platforms: [ :ruby ]
|
gem 'rdiscount', platforms: [ :ruby ]
|
||||||
gem 'puma'
|
gem 'puma'
|
||||||
gem 'yajl-ruby', platforms: [ :ruby ]
|
gem 'yajl-ruby', platforms: [ :ruby ]
|
||||||
|
|
|
@ -763,10 +763,6 @@ module Sinatra
|
||||||
render :mediawiki, template, options, locals
|
render :mediawiki, template, options, locals
|
||||||
end
|
end
|
||||||
|
|
||||||
def wlang(template, options = {}, locals = {}, &block)
|
|
||||||
render(:wlang, template, options, locals, &block)
|
|
||||||
end
|
|
||||||
|
|
||||||
def yajl(template, options = {}, locals = {})
|
def yajl(template, options = {}, locals = {})
|
||||||
options[:default_content_type] = :json
|
options[:default_content_type] = :json
|
||||||
render :yajl, template, options, locals
|
render :yajl, template, options, locals
|
||||||
|
|
|
@ -227,7 +227,7 @@ module Sinatra
|
||||||
ALLOWED_ENGINES = [
|
ALLOWED_ENGINES = [
|
||||||
:erb, :erubi, :haml, :hamlit, :builder, :nokogiri,
|
:erb, :erubi, :haml, :hamlit, :builder, :nokogiri,
|
||||||
:liquid, :markdown, :rdoc, :asciidoc, :radius, :markaby,
|
:liquid, :markdown, :rdoc, :asciidoc, :radius, :markaby,
|
||||||
:rabl, :slim, :creole, :mediawiki, :coffee, :yajl, :wlang
|
:rabl, :slim, :creole, :mediawiki, :coffee, :yajl
|
||||||
]
|
]
|
||||||
|
|
||||||
def self.prefixed(*names)
|
def self.prefixed(*names)
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Hello from wlang!
|
|
|
@ -1,2 +0,0 @@
|
||||||
WLang Layout!
|
|
||||||
+{yield}
|
|
|
@ -1,87 +0,0 @@
|
||||||
require File.expand_path('helper', __dir__)
|
|
||||||
|
|
||||||
begin
|
|
||||||
require 'wlang'
|
|
||||||
|
|
||||||
class WLangTest < Minitest::Test
|
|
||||||
def engine
|
|
||||||
Tilt::WLangTemplate
|
|
||||||
end
|
|
||||||
|
|
||||||
def wlang_app(&block)
|
|
||||||
mock_app {
|
|
||||||
set :views, __dir__ + '/views'
|
|
||||||
get '/', &block
|
|
||||||
}
|
|
||||||
get '/'
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'uses the correct engine' do
|
|
||||||
assert_equal engine, Tilt[:wlang]
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'renders .wlang files in views path' do
|
|
||||||
wlang_app { wlang :hello }
|
|
||||||
assert ok?
|
|
||||||
assert_equal "Hello from wlang!\n", body
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'renders in the app instance scope' do
|
|
||||||
mock_app do
|
|
||||||
helpers do
|
|
||||||
def who; "world"; end
|
|
||||||
end
|
|
||||||
get('/') { wlang 'Hello +{who}!' }
|
|
||||||
end
|
|
||||||
get '/'
|
|
||||||
assert ok?
|
|
||||||
assert_equal 'Hello world!', body
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'takes a :locals option' do
|
|
||||||
wlang_app do
|
|
||||||
locals = {:foo => 'Bar'}
|
|
||||||
wlang 'Hello ${foo}!', :locals => locals
|
|
||||||
end
|
|
||||||
assert ok?
|
|
||||||
assert_equal 'Hello Bar!', body
|
|
||||||
end
|
|
||||||
|
|
||||||
it "renders with inline layouts" do
|
|
||||||
mock_app do
|
|
||||||
layout { 'THIS. IS. +{yield.upcase}!' }
|
|
||||||
get('/') { wlang 'Sparta' }
|
|
||||||
end
|
|
||||||
get '/'
|
|
||||||
assert ok?
|
|
||||||
assert_equal 'THIS. IS. SPARTA!', body
|
|
||||||
end
|
|
||||||
|
|
||||||
it "renders with file layouts" do
|
|
||||||
wlang_app { wlang 'Hello World', :layout => :layout2 }
|
|
||||||
assert ok?
|
|
||||||
assert_body "WLang Layout!\nHello World"
|
|
||||||
end
|
|
||||||
|
|
||||||
it "can rendered truly nested layouts by accepting a layout and a block with the contents" do
|
|
||||||
mock_app do
|
|
||||||
template(:main_outer_layout) { "<h1>Title</h1>\n>{ yield }" }
|
|
||||||
template(:an_inner_layout) { "<h2>Subtitle</h2>\n>{ yield }" }
|
|
||||||
template(:a_page) { "<p>Contents.</p>\n" }
|
|
||||||
get('/') do
|
|
||||||
wlang :main_outer_layout, :layout => false do
|
|
||||||
wlang :an_inner_layout do
|
|
||||||
wlang :a_page
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
get '/'
|
|
||||||
assert ok?
|
|
||||||
assert_body "<h1>Title</h1>\n<h2>Subtitle</h2>\n<p>Contents.</p>\n"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
rescue LoadError
|
|
||||||
warn "#{$!}: skipping wlang tests"
|
|
||||||
end
|
|
Loading…
Reference in New Issue