Ruby 2: use __dir__ instead of File.dirname(__FILE__) (#1341)

sinatra · Mar 13, 2020 · 330d9b4 · 330d9b4
1 parent 3d11d9f
commit 330d9b4
Show file tree

Hide file tree

Showing 41 changed files with 76 additions and 76 deletions.
diff --git a/README.de.md b/README.de.md
@@ -434,7 +434,7 @@ Statische Dateien werden im `./public`-Ordner erwartet. Es ist möglich,
 einen anderen Ort zu definieren, indem man die `:public_folder`-Option setzt:
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 Zu beachten ist, dass der Ordnername `public` nicht Teil der URL ist.

diff --git a/README.es.md b/README.es.md
@@ -430,7 +430,7 @@ Los archivos estáticos son servidos desde el directorio público
 opción `:public_folder`:
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 Note que el nombre del directorio público no está incluido en la URL. Por

diff --git a/README.fr.md b/README.fr.md
@@ -400,7 +400,7 @@ end
 Les fichiers du dossier `./public` sont servis de façon statique. Vous pouvez spécifier un autre dossier avec le paramètre `:public_folder` :
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/statique'
+set :public_folder, __dir__ + '/statique'
 ```
 
 Notez que le nom du dossier public n'apparait pas dans l'URL. Le fichier

diff --git a/README.hu.md b/README.hu.md
@@ -120,7 +120,7 @@ A statikus fájlok kiszolgálása a `./public` könyvtárból
 történik, de természetesen más könyvtárat is megadhatsz erre a célra,
 mégpedig a :public_folder kapcsoló beállításával:
 
-  set :public_folder, File.dirname(__FILE__) + '/static'
+  set :public_folder, __dir__ + '/static'
 
 Fontos megjegyezni, hogy a nyilvános könyvtár neve nem szerepel az URL-ben.
 A ./public/css/style.css fájl az
@@ -131,7 +131,7 @@ A ./public/css/style.css fájl az
 A sablonfájlokat rendszerint a  `./views` könyvtárba helyezzük, de
 itt is lehetőség nyílik egyéb könyvtár használatára:
 
-  set :views, File.dirname(__FILE__) + '/templates'
+  set :views, __dir__ + '/templates'
 
 Nagyon fontos észben tartani, hogy a sablononkra mindig szimbólumokkal
 hivatkozunk, még akkor is, ha egyéb (ebben az esetben a
@@ -700,7 +700,7 @@ De hozzá is adhatod a <tt>sinatra/lib</tt> könyvtárat a <tt>LOAD_PATH</tt>-ho
 az alkalmazásodban:
 
 ```ruby
-  $LOAD_PATH.unshift File.dirname(__FILE__) + '/sinatra/lib'
+  $LOAD_PATH.unshift __dir__ + '/sinatra/lib'
   require 'rubygems'
   require 'sinatra'
 

diff --git a/README.ja.md b/README.ja.md
@@ -386,7 +386,7 @@ end
 `:public_folder`オプションを指定することで別の場所を指定することができます。
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 ノート: この静的ファイル用のディレクトリ名はURL中に含まれません。

diff --git a/README.ko.md b/README.ko.md
@@ -385,7 +385,7 @@ end
 변경하려면 `:public_folder` 옵션을 지정하면 됩니다.
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 public 디렉터리명은 URL에 포함되지 않는다는 점에 주의하세요.

diff --git a/README.md b/README.md
@@ -427,7 +427,7 @@ Static files are served from the `./public` directory. You can specify
 a different location by setting the `:public_folder` option:
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 Note that the public directory name is not included in the URL. A file

diff --git a/README.pt-br.md b/README.pt-br.md
@@ -444,7 +444,7 @@ Arquivos estáticos são disponibilizados a partir do diretório
 `:public_folder`
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/estatico'
+set :public_folder, __dir__ + '/estatico'
 ```
 
 Note que o nome do diretório público não é incluido na URL. Um arquivo

diff --git a/README.pt-pt.md b/README.pt-pt.md
@@ -121,7 +121,7 @@ Arquivos estáticos são disponibilizados a partir do directório
 `:public_folder`
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/estatico'
+set :public_folder, __dir__ + '/estatico'
 ```
 
 Note que o nome do directório público não é incluido no URL. Um arquivo
@@ -134,7 +134,7 @@ Templates presumem-se estar localizados sob o directório `./views`. Para
 utilizar um directório de views diferente:
 
 ```ruby
-set :views, File.dirname(__FILE__) + '/modelo'
+set :views, __dir__ + '/modelo'
 ```
 
 Uma coisa importante a ser lembrada é que você sempre tem as referências
@@ -757,7 +757,7 @@ Alternativamente, pode adicionar o directório do `sinatra/lib` no
 `LOAD_PATH` do seu aplicativo:
 
 ```ruby
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/sinatra/lib'
+$LOAD_PATH.unshift __dir__ + '/sinatra/lib'
 require 'rubygems'
 require 'sinatra'
 

diff --git a/README.ru.md b/README.ru.md
@@ -431,7 +431,7 @@ end
 месторасположение при помощи опции `:public_folder`:
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 Учтите, что имя директории со статическими файлами не включено в URL.

diff --git a/README.zh.md b/README.zh.md
@@ -393,7 +393,7 @@ end
 静态文件从 `./public` 目录提供服务。可以通过设置`:public_folder` 选项设定一个不同的位置：
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 请注意 public 目录名并没有包含在 URL 中。文件 `./public/css/style.css` 可以通过

diff --git a/lib/sinatra/base.rb b/lib/sinatra/base.rb
@@ -1864,7 +1864,7 @@ class << self
 
     configure :development do
       get '/__sinatra__/:image.png' do
-        filename = File.dirname(__FILE__) + "/images/#{params[:image].to_i}.png"
+        filename = __dir__ + "/images/#{params[:image].to_i}.png"
         content_type :png
         send_file filename
       end

diff --git a/test/asciidoctor_test.rb b/test/asciidoctor_test.rb
@@ -6,7 +6,7 @@
   class AsciidoctorTest < Minitest::Test
     def asciidoc_app(&block)
       mock_app do
-        set :views, File.dirname(__FILE__) + '/views'
+        set :views, __dir__ + '/views'
         get('/', &block)
       end
       get '/'

diff --git a/test/builder_test.rb b/test/builder_test.rb
@@ -6,7 +6,7 @@
 class BuilderTest < Minitest::Test
   def builder_app(options = {}, &block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       set options
       get('/', &block)
     end

diff --git a/test/coffee_test.rb b/test/coffee_test.rb
@@ -13,7 +13,7 @@
 class CoffeeTest < Minitest::Test
   def coffee_app(options = {}, &block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       set(options)
       get('/', &block)
     end

diff --git a/test/creole_test.rb b/test/creole_test.rb
@@ -6,7 +6,7 @@
 class CreoleTest < Minitest::Test
   def creole_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/encoding_test.rb b/test/encoding_test.rb
@@ -5,7 +5,7 @@
 class BaseTest < Minitest::Test
   setup do
     @base = Sinatra.new(Sinatra::Base)
-    @base.set :views, File.dirname(__FILE__) + "/views"
+    @base.set :views, __dir__ + "/views"
   end
 
   it 'allows unicode strings in ascii templates per default (1.9)' do

diff --git a/test/erb_test.rb b/test/erb_test.rb
@@ -12,7 +12,7 @@ def setup
 
   def erb_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/filter_test.rb b/test/filter_test.rb
@@ -123,7 +123,7 @@ class BeforeFilterTest < Minitest::Test
     mock_app do
       before { ran_filter = true }
       set :static, true
-      set :public_folder, File.dirname(__FILE__)
+      set :public_folder, __dir__
     end
     get "/#{File.basename(__FILE__)}"
     assert ok?
@@ -267,7 +267,7 @@ class AfterFilterTest < Minitest::Test
     mock_app do
       after { ran_filter = true }
       set :static, true
-      set :public_folder, File.dirname(__FILE__)
+      set :public_folder, __dir__
     end
     get "/#{File.basename(__FILE__)}"
     assert ok?

diff --git a/test/haml_test.rb b/test/haml_test.rb
@@ -6,7 +6,7 @@
 class HAMLTest < Minitest::Test
   def haml_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/helper.rb b/test/helper.rb
@@ -14,10 +14,10 @@
 
 require 'rack'
 
-testdir = File.dirname(__FILE__)
+testdir = __dir__
 $LOAD_PATH.unshift testdir unless $LOAD_PATH.include?(testdir)
 
-libdir = File.dirname(File.dirname(__FILE__)) + '/lib'
+libdir = File.dirname(__dir__) + '/lib'
 $LOAD_PATH.unshift libdir unless $LOAD_PATH.include?(libdir)
 
 require 'minitest'

diff --git a/test/helpers_test.rb b/test/helpers_test.rb
@@ -785,7 +785,7 @@ def attachment_app(filename=nil)
 
   describe 'send_file' do
     setup do
-      @file = File.dirname(__FILE__) + '/file.txt'
+      @file = __dir__ + '/file.txt'
       File.open(@file, 'wb') { |io| io.write('Hello World') }
     end
 
@@ -898,7 +898,7 @@ def send_file_app(opts={})
     end
 
     it "is able to send files with unknown mime type" do
-      @file = File.dirname(__FILE__) + '/file.foobar'
+      @file = __dir__ + '/file.foobar'
       File.open(@file, 'wb') { |io| io.write('Hello World') }
       send_file_app
       get '/file.txt'

diff --git a/test/less_test.rb b/test/less_test.rb
@@ -6,7 +6,7 @@
 class LessTest < Minitest::Test
   def less_app(options = {}, &block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       set options
       get('/', &block)
     end

diff --git a/test/liquid_test.rb b/test/liquid_test.rb
@@ -6,7 +6,7 @@
 class LiquidTest < Minitest::Test
   def liquid_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/markaby_test.rb b/test/markaby_test.rb
@@ -6,7 +6,7 @@
 class MarkabyTest < Minitest::Test
   def markaby_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/markdown_test.rb b/test/markdown_test.rb
@@ -3,7 +3,7 @@
 MarkdownTest = proc do
   def markdown_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/mediawiki_test.rb b/test/mediawiki_test.rb
@@ -6,7 +6,7 @@
   class MediaWikiTest < Minitest::Test
     def mediawiki_app(&block)
       mock_app do
-        set :views, File.dirname(__FILE__) + '/views'
+        set :views, __dir__ + '/views'
         get('/', &block)
       end
       get '/'

diff --git a/test/nokogiri_test.rb b/test/nokogiri_test.rb
@@ -6,7 +6,7 @@
 class NokogiriTest < Minitest::Test
   def nokogiri_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/rabl_test.rb b/test/rabl_test.rb
@@ -9,7 +9,7 @@
 class RablTest < Minitest::Test
   def rabl_app(&block)
     mock_app {
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get '/', &block
     }
     get '/'

diff --git a/test/radius_test.rb b/test/radius_test.rb
@@ -6,7 +6,7 @@
 class RadiusTest < Minitest::Test
   def radius_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/rdoc_test.rb b/test/rdoc_test.rb
@@ -7,7 +7,7 @@
 class RdocTest < Minitest::Test
   def rdoc_app(&block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       get('/', &block)
     end
     get '/'

diff --git a/test/sass_test.rb b/test/sass_test.rb
@@ -6,7 +6,7 @@
 class SassTest < Minitest::Test
   def sass_app(options = {}, &block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       set options
       get('/', &block)
     end

diff --git a/test/scss_test.rb b/test/scss_test.rb
@@ -6,7 +6,7 @@
 class ScssTest < Minitest::Test
   def scss_app(options = {}, &block)
     mock_app do
-      set :views, File.dirname(__FILE__) + '/views'
+      set :views, __dir__ + '/views'
       set options
       get('/', &block)
     end