sinatra · namusyaka · Dec 8, 2018 · Nov 4, 2018 · Nov 4, 2018 · Nov 6, 2018
diff --git a/Gemfile b/Gemfile
@@ -53,6 +53,7 @@ if RUBY_ENGINE == "ruby"
   gem 'stylus'
   gem 'rabl'
   gem 'builder'
+  gem 'erubi'
   gem 'erubis'
   gem 'haml', '>= 3.0'
   gem 'sass'

diff --git a/README.ja.md b/README.ja.md
@@ -551,13 +551,14 @@ get('/') { markdown :index }
   <tr>
     <td>依存</td>
     <td>
-      <a href="http://www.kuwata-lab.com/erubis/" title="erubis">erubis</a>
+      <a href="https://github.com/jeremyevans/erubi" title="erubi">erubi</a>
+      または <a href="http://www.kuwata-lab.com/erubis/" title="erubis">erubis</a>
       または erb (Rubyに同梱)
     </td>
   </tr>
   <tr>
     <td>ファイル拡張子</td>
-    <td><tt>.erb</tt>, <tt>.rhtml</tt> or <tt>.erubis</tt> (Erubisだけ)</td>
+    <td><tt>.erb</tt>, <tt>.rhtml</tt> または <tt>.erubi</tt> (Erubiだけ) または<tt>.erubis</tt> (Erubisだけ)</td>
   </tr>
   <tr>
     <td>例</td>

diff --git a/README.md b/README.md
@@ -611,13 +611,15 @@ get('/') { markdown :index }
   <tr>
     <td>Dependency</td>
     <td>
-      <a href="http://www.kuwata-lab.com/erubis/" title="erubis">erubis</a>
+      <a href="https://github.com/jeremyevans/erubi" title="erubi">erubi</a>
+      or <a href="http://www.kuwata-lab.com/erubis/" title="erubis">erubis</a>
       or erb (included in Ruby)
     </td>
   </tr>
   <tr>
     <td>File Extensions</td>
-    <td><tt>.erb</tt>, <tt>.rhtml</tt> or <tt>.erubis</tt> (Erubis only)</td>
+    <td><tt>.erb</tt>, <tt>.rhtml</tt> or <tt>.erubi</tt> (Erubi only)
+ or <tt>.erubis</tt> (Erubis only)</td>
   </tr>
   <tr>
     <td>Example</td>

diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -682,6 +682,10 @@ def erb(template, options = {}, locals = {}, &block)
       render(:erb, template, options, locals, &block)
     end
 
+    def erubi(template, options = {}, locals = {}, &block)
+      render(:erubi, template, options, locals, &block)
+    end
+
     def erubis(template, options = {}, locals = {})
       warn "Sinatra::Templates#erubis is deprecated and will be removed, use #erb instead.\n" \
         "If you have Erubis installed, it will be used automatically."

diff --git a/sinatra-contrib/lib/sinatra/capture.rb b/sinatra-contrib/lib/sinatra/capture.rb
@@ -86,6 +86,7 @@ module Capture
 
     DUMMIES = {
       :haml   => "!= capture_haml(*args, &block)",
+      :erubi  => "<% @capture = yield(*args) %>",
       :erubis => "<% @capture = yield(*args) %>",
       :slim   => "== yield(*args)"
     }

diff --git a/sinatra-contrib/lib/sinatra/content_for.rb b/sinatra-contrib/lib/sinatra/content_for.rb
@@ -9,7 +9,7 @@ module Sinatra
   # blocks inside views to be rendered later during the request. The most
   # common use is to populate different parts of your layout from your view.
   #
-  # The currently supported engines are: Erb, Erubis, Haml and Slim.
+  # The currently supported engines are: Erb, Erubi, Erubis, Haml and Slim.
   #
   # == Usage
   #

diff --git a/sinatra-contrib/lib/sinatra/engine_tracking.rb b/sinatra-contrib/lib/sinatra/engine_tracking.rb
@@ -11,6 +11,15 @@ def erb?
       @current_engine == :erb
     end
 
+    # Returns true if the current engine is `:erubi`, or `Tilt[:erb]` is set
+    # to Tilt::ErubisTemplate.
+    #
+    # @return [Boolean] Returns true if current engine is `:erubi`.
+    def erubi?
+      @current_engine == :erubi or
+      erb? && Tilt[:erb] == Tilt::ErubiTemplate
+    end
+
     # Returns true if the current engine is `:erubis`, or `Tilt[:erb]` is set
     # to Tilt::ErubisTemplate.
     #

diff --git a/sinatra-contrib/lib/sinatra/respond_with.rb b/sinatra-contrib/lib/sinatra/respond_with.rb
@@ -245,7 +245,7 @@ def self.engines
         :css  => [:less,  :sass, :scss],
         :xml  => [:builder, :nokogiri],
         :js   => [:coffee],
-        :html => [:erb, :erubis, :haml, :slim, :liquid, :radius, :mab,
+        :html => [:erb, :erubi, :erubis, :haml, :slim, :liquid, :radius, :mab,
           :markdown, :textile, :rdoc],
         :all =>  (Sinatra::Templates.instance_methods.map(&:to_sym) +
           [:mab] - [:find_template, :markaby]),

diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec
@@ -45,6 +45,7 @@ EOF
 
   s.add_development_dependency "rspec", "~> 3.4"
   s.add_development_dependency "haml"
+  s.add_development_dependency "erubi"
   s.add_development_dependency "erubis"
   s.add_development_dependency "slim"
   s.add_development_dependency "less"

diff --git a/sinatra-contrib/spec/capture_spec.rb b/sinatra-contrib/spec/capture_spec.rb
@@ -19,7 +19,10 @@ def render(engine, template)
   end
 
   shared_examples_for "a template language" do |engine|
-    lang = engine == :erubis ? :erb : engine
+    lang = engine
+    if engine == :erubi || engine == :erubis
+      lang = :erb
+    end
     require "#{engine}"
 
     it "captures content" do
@@ -33,6 +36,7 @@ def render(engine, template)
 
   describe('haml')   { it_behaves_like "a template language", :haml   }
   describe('slim')   { it_behaves_like "a template language", :slim   }
+  describe('erubi')  { it_behaves_like "a template language", :erubi  }
   describe('erubis') { it_behaves_like "a template language", :erubis }
 
   describe 'erb' do

diff --git a/sinatra-contrib/spec/content_for_spec.rb b/sinatra-contrib/spec/content_for_spec.rb
@@ -73,7 +73,7 @@ def render(engine, template)
   end
 
   # TODO: liquid radius markaby builder nokogiri
-  engines = %w[erb erubis haml slim]
+  engines = %w[erb erubi erubis haml slim]
 
   engines.each do |inner|
     describe inner.capitalize do

diff --git a/test/erb_test.rb b/test/erb_test.rb
@@ -105,6 +105,14 @@ def is; "IS." end
   end
 end
 
+begin
+  require 'erubi'
+  class ErubiTest < ERBTest
+    def engine; Tilt::ErubiTemplate end
+  end
+rescue LoadError
+  warn "#{$!}: skipping erubi tests"
+end
 
 begin
   require 'erubis'