refactor: use __dir__ in File.expand_path

__dir__ is nice, and available.

README.malayalam.md

@@ -404,7 +404,7 @@ end
 
 
 ```ruby
-set :public_folder, File.dirname(__FILE__) + '/static'
+set :public_folder, __dir__ + '/static'
 ```
 
 URL ഇളിൽ ഡയറക്ടറി പാത ഉണ്ടാകില്ല .  A file

Rakefile

@@ -9,7 +9,7 @@ task :spec => :test
 CLEAN.include "**/*.rbc"
 
 def source_version
-  @source_version ||= File.read(File.expand_path("../VERSION", __FILE__)).strip
+  @source_version ||= File.read(File.expand_path("VERSION", __dir__)).strip
 end
 
 def prev_feature

rack-protection/Rakefile

@@ -1,5 +1,5 @@
 # encoding: utf-8
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 begin
   require 'bundler'

rack-protection/rack-protection.gemspec

@@ -1,4 +1,4 @@
-version = File.read(File.expand_path("../../VERSION", __FILE__)).strip
+version = File.read(File.expand_path("../VERSION", __dir__)).strip
 
 Gem::Specification.new do |s|
   # general infos

rack-protection/spec/spec_helper.rb

@@ -2,7 +2,7 @@ require 'rack/protection'
 require 'rack/test'
 require 'rack'
 
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

sinatra-contrib/Rakefile

@@ -1,4 +1,4 @@
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 require 'open-uri'
 require 'yaml'
 require 'sinatra/contrib/version'

sinatra-contrib/lib/sinatra/runner.rb

@@ -28,7 +28,7 @@ module Sinatra
   #
   #   class Runner < Sinatra::Runner
   #     def app_file
-  #       File.expand_path("../server.rb", __FILE__)
+  #       File.expand_path("server.rb", __dir__)
   #     end
   #   end
   #
@@ -49,7 +49,7 @@ module Sinatra
   # For an example, check https://github.com/apotonick/roar/blob/master/test/integration/runner.rb
   class Runner
     def app_file
-      File.expand_path("../server.rb", __FILE__)
+      File.expand_path("server.rb", __dir__)
     end
 
     def run

sinatra-contrib/sinatra-contrib.gemspec

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-version = File.read(File.expand_path("../../VERSION", __FILE__)).strip
+version = File.read(File.expand_path("../VERSION", __dir__)).strip
 
 Gem::Specification.new do |s|
   s.name        = "sinatra-contrib"

sinatra-contrib/spec/config_file_spec.rb

@@ -4,7 +4,7 @@ describe Sinatra::ConfigFile do
   def config_file(*args, &block)
     mock_app do
       register Sinatra::ConfigFile
-      set :root, File.expand_path('../config_file', __FILE__)
+      set :root, File.expand_path('config_file', __dir__)
       instance_eval(&block) if block
       config_file(*args)
     end

sinatra-contrib/spec/content_for_spec.rb

@@ -4,7 +4,7 @@ describe Sinatra::ContentFor do
   subject do
     Sinatra.new do
       helpers Sinatra::ContentFor
-      set :views, File.expand_path("../content_for", __FILE__)
+      set :views, File.expand_path("content_for", __dir__)
     end.new!
   end
 
@@ -215,7 +215,7 @@ describe Sinatra::ContentFor do
             mock_app do
               helpers Sinatra::ContentFor
               set inner, :layout_engine => outer
-              set :views, File.expand_path("../content_for", __FILE__)
+              set :views, File.expand_path("content_for", __dir__)
               get('/:view') { render(inner, params[:view].to_sym) }
               get('/:layout/:view') do
                 render inner, params[:view].to_sym, :layout => params[:layout].to_sym

sinatra-contrib/spec/namespace_spec.rb

@@ -661,10 +661,10 @@ describe Sinatra::Namespace do
 
           specify 'can use a custom views directory' do
             mock_app do
-              set :views, File.expand_path('../namespace', __FILE__)
+              set :views, File.expand_path('namespace', __dir__)
               send(verb, '/') { erb :foo }
               namespace('/foo') do
-                set :views, File.expand_path('../namespace/nested', __FILE__)
+                set :views, File.expand_path('namespace/nested', __dir__)
                 send(verb) { erb :foo }
               end
             end

sinatra-contrib/spec/reloader_spec.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 describe Sinatra::Reloader do
   # Returns the temporary directory.
   def tmp_dir
-    File.expand_path('../../tmp', __FILE__)
+    File.expand_path('../tmp', __dir__)
   end
 
   # Returns the path of the Sinatra application file created by
@@ -48,7 +48,7 @@ describe Sinatra::Reloader do
     options[:parent] ||= 'Sinatra::Base'
 
     update_file(app_file_path) do |f|
-      template_path = File.expand_path('../reloader/app.rb.erb', __FILE__)
+      template_path = File.expand_path('reloader/app.rb.erb', __dir__)
       template = Tilt.new(template_path, nil, :trim => '<>')
       f.write template.render(Object.new, options)
     end

sinatra.gemspec

@@ -1,4 +1,4 @@
-version = File.read(File.expand_path("../VERSION", __FILE__)).strip
+version = File.read(File.expand_path("VERSION", __dir__)).strip
 
 Gem::Specification.new 'sinatra', version do |s|
   s.description       = "Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort."

test/asciidoctor_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
   require 'asciidoctor'

test/base_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class BaseTest < Minitest::Test
   describe 'Sinatra::Base subclasses' do

test/builder_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'builder'

test/coffee_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'coffee-script'

test/compile_test.rb

@@ -1,5 +1,5 @@
 # I like coding: UTF-8
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class CompileTest < Minitest::Test
   def self.parses pattern, example, expected_params, mtype = :sinatra, mopts = {}

test/creole_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'creole'

test/delegator_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class DelegatorTest < Minitest::Test
   class Mirror

test/encoding_test.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 require 'erb'
 
 class BaseTest < Minitest::Test

test/erb_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class ERBTest < Minitest::Test
   def engine

test/extensions_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class ExtensionsTest < Minitest::Test
   module FooExtensions

test/filter_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class BeforeFilterTest < Minitest::Test
   it "executes filters in the order defined" do

test/haml_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'haml'

test/helpers_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 require 'date'
 require 'json'
 

test/integration/app.rb

@@ -47,7 +47,7 @@ get '/send' do
 end
 
 get '/send_file' do
-  file = File.expand_path '../../views/a/in_a.str', __FILE__
+  file = File.expand_path '../views/a/in_a.str', __dir__
   send_file file
 end
 

test/integration_async_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../integration_helper', __FILE__)
+require File.expand_path('integration_helper', __dir__)
 
 module IntegrationAsyncHelper
   def it(message, &block)

test/integration_async_test.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../helper', __FILE__)
-require File.expand_path('../integration_async_helper', __FILE__)
+require File.expand_path('helper', __dir__)
+require File.expand_path('integration_async_helper', __dir__)
 
 # These tests are like integration_test, but they test asynchronous streaming.
 class IntegrationAsyncTest < Minitest::Test

test/integration_helper.rb

@@ -22,7 +22,7 @@ module IntegrationHelper
     end
 
     def app_file
-      File.expand_path('../integration/app.rb', __FILE__)
+      File.expand_path('integration/app.rb', __dir__)
     end
 
     def environment
@@ -62,7 +62,7 @@ module IntegrationHelper
           cmd << File.expand_path(file, dir).inspect
         end
         cmd << "-w" unless net_http_server?
-        cmd << "-I" << File.expand_path('../../lib', __FILE__).inspect
+        cmd << "-I" << File.expand_path('../lib', __dir__).inspect
         cmd << app_file.inspect << '-s' << server << '-o' << '127.0.0.1' << '-p' << port
         cmd << "-e" << environment.to_s << '2>&1'
         cmd.join " "
@@ -112,7 +112,7 @@ module IntegrationHelper
         # Create a new container, set load paths and env
         # SINGLETHREAD means create a new runtime
         vm = org.jruby.embed.ScriptingContainer.new(org.jruby.embed.LocalContextScope::SINGLETHREAD)
-        vm.load_paths = [File.expand_path('../../lib', __FILE__)]
+        vm.load_paths = [File.expand_path('../lib', __dir__)]
         vm.environment = ENV.merge('APP_ENV' => environment.to_s)
 
         # This ensures processing of RUBYOPT which activates Bundler

test/integration_test.rb

@@ -1,5 +1,5 @@
-require File.expand_path('../helper', __FILE__)
-require File.expand_path('../integration_helper', __FILE__)
+require File.expand_path('helper', __dir__)
+require File.expand_path('integration_helper', __dir__)
 
 # These tests start a real server and talk to it over TCP.
 # Every test runs with every detected server.

test/liquid_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'liquid'

test/mapped_error_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class FooError < RuntimeError
 end

test/markaby_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'markaby'

test/markdown_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 MarkdownTest = proc do
   def markdown_app(&block)

test/mediawiki_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
   require 'wikicloth'

test/middleware_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class MiddlewareTest < Minitest::Test
   setup do

test/nokogiri_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'nokogiri'

test/rabl_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'rabl'

test/rack_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 require 'rack'
 
 class RackTest < Minitest::Test

test/radius_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'radius'

test/rdoc_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'rdoc'

test/readme_test.rb

@@ -1,5 +1,5 @@
 # Tests to check if all the README examples work.
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class ReadmeTest < Minitest::Test
   example do

test/request_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 require 'stringio'
 
 class RequestTest < Minitest::Test

test/response_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class ResponseTest < Minitest::Test
   setup { @response = Sinatra::Response.new([], 200, { 'Content-Type' => 'text/html' }) }

test/result_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class ThirdPartyError < RuntimeError
   def http_status; 400 end

test/route_added_hook_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 module RouteAddedTest
   @routes, @procs = [], []

test/routing_test.rb

@@ -1,5 +1,5 @@
 # I like coding: UTF-8
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 # Helper method for easy route pattern matching testing
 def route_def(pattern)

test/sass_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'sass'

test/scss_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'sass'

test/server_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 require 'stringio'
 
 module Rack::Handler

test/settings_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class SettingsTest < Minitest::Test
   setup do

test/sinatra_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class SinatraTest < Minitest::Test
   it 'creates a new Sinatra::Base subclass on new' do

test/slim_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'slim'

test/static_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class StaticTest < Minitest::Test
   setup do

test/streaming_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 class StreamingTest < Minitest::Test
   Stream = Sinatra::Helpers::Stream

test/templates_test.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 File.delete(__dir__ + '/views/layout.test') rescue nil
 
 class TestTemplate < Tilt::Template

test/textile_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'redcloth'

test/wlang_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'wlang'

test/yajl_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../helper', __FILE__)
+require File.expand_path('helper', __dir__)
 
 begin
 require 'yajl'