padrino-core 0.16.0.pre4 → 0.16.0

data/test/fixtures/apps/complex.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 module LibDemo
   def self.give_me_a_random
@@ -8,22 +8,22 @@ end
 
 class Complex1Demo < Padrino::Application
   set :reload, true
-  get("/old"){ "Old Sinatra Way" }
+  get('/old') { 'Old Sinatra Way' }
 end
 
 class Complex2Demo < Padrino::Application
   set :reload, true
-  get("/old"){ "Old Sinatra Way" }
+  get('/old') { 'Old Sinatra Way' }
 
   controllers :var do
-    get(:destroy){ params.to_json }
+    get(:destroy) { params.to_json }
   end
 
-  get("/"){ "The magick number is: 12!" } # Change only the number!!!
+  get('/') { 'The magick number is: 12!' } # Change only the number!!!
 end
 
 Complex1Demo.controllers do
-  get("/"){ "Given random #{LibDemo.give_me_a_random}" }
+  get('/') { "Given random #{LibDemo.give_me_a_random}" }
 end
 
 Complex2Demo.controllers do

data/test/fixtures/apps/concerned/app.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class SystemConcernedClassDemo < Padrino::Application
   set :reload, true

data/test/fixtures/apps/custom_dependencies/custom_dependencies.rb

@@ -1,11 +1,11 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class CustomDependencies < Padrino::Application
   set :reload, true
 end
 
 CustomDependencies.controllers do
-  get "/" do
-    "foo"
+  get '/' do
+    'foo'
   end
 end

data/test/fixtures/apps/demo_app.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 module Demo
   class App < Padrino::Application

data/test/fixtures/apps/demo_demo.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 module Demo
   class Demo < Padrino::Application

data/test/fixtures/apps/demo_project/api/app.rb

@@ -1,7 +1,7 @@
 module DemoProject
   class API
     def self.call(_)
-      [200, {}, ["api app"]]
+      [200, {}, ['api app']]
     end
   end
 end

data/test/fixtures/apps/demo_project/app.rb

@@ -1,7 +1,7 @@
 module DemoProject
   class App < Padrino::Application
     get :index do
-      "padrino app"
+      'padrino app'
     end
   end
 end

data/test/fixtures/apps/helpers/class_methods_helpers.rb

@@ -1,4 +1,5 @@
 begin
   require '/tmp/padrino_class_demo'
 rescue LoadError
+  # do nothing
 end

data/test/fixtures/apps/helpers/instance_methods_helpers.rb

@@ -1,4 +1,5 @@
 begin
   require '/tmp/padrino_instance_demo'
 rescue LoadError
+  # do nothing
 end

data/test/fixtures/apps/helpers/system_helpers.rb

@@ -5,4 +5,3 @@ SystemDemo.helpers do
     Resolv.name
   end
 end
-

data/test/fixtures/apps/lib/myklass/mysubklass.rb

@@ -1,4 +1,4 @@
 class MyKlass
-    class MySubKlass
-    end
+  class MySubKlass
+  end
 end

data/test/fixtures/apps/mountable_apps/rack_apps.rb

@@ -1,10 +1,9 @@
-
 class RackApp
   def self.call(env)
     if env['PATH_INFO'] == '/404'
-      [404, {}, ["not found ;("]]
+      [404, {}, ['not found ;(']]
     else
-      [200, {}, ["hello rack app"]]
+      [200, {}, ['hello rack app']]
     end
   end
 
@@ -13,11 +12,12 @@ class RackApp
   end
 end
 
-RackApp2 = ->(_){ [200, {}, ["hello rack app2"]] }
+RackApp2 = ->(_) { [200, {}, ['hello rack app2']] }
 
 class SinatraApp < Sinatra::Base
-  set :public_folder, File.dirname(__FILE__)
-  get "/" do
-    "hello sinatra app"
+  set :public_folder, __dir__
+
+  get '/' do
+    'hello sinatra app'
   end
 end

data/test/fixtures/apps/precompiled_app.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 Padrino.configure_apps do
   set :precompile_routes, true
@@ -6,14 +6,15 @@ end
 
 module PrecompiledApp
   class App < Padrino::Application
-    10.times{|n| get("/#{n}"){} }
+    10.times { |n| get("/#{n}") {} }
   end
+
   class SubApp < Padrino::Application
-    10.times{|n| get("/#{n}"){} }
+    10.times { |n| get("/#{n}") {} }
   end
 end
 
-Padrino.mount("PrecompiledApp::SubApp").to("/subapp")
-Padrino.mount("PrecompiledApp::App").to("/")
+Padrino.mount('PrecompiledApp::SubApp').to('/subapp')
+Padrino.mount('PrecompiledApp::App').to('/')
 
 Padrino.load!

data/test/fixtures/apps/simple.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 # Remove this comment if you want do some like this: ruby RACK_ENV=test app.rb
 #
 # require 'padrino-core'
@@ -8,16 +8,16 @@ class SimpleDemo < Padrino::Application
   set :reload, true
   before { true }
   after  { true }
-  error(404) { "404" }
+  error(404) { '404' }
 end
 
 SimpleDemo.controllers do
-  get "/" do
+  get '/' do
     'The magick number is: 2767356926488785838763860464013972991031534522105386787489885890443740254365!' # Change only the number!!!
   end
 
-  get "/rand" do
-    rand(2 ** 256).to_s
+  get '/rand' do
+    rand(2**256).to_s
   end
 end
 

data/test/fixtures/apps/static.rb

@@ -1,9 +1,9 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class StaticDemo < Padrino::Application
   disable :reload
   def self.reload!
-    fail 'reload! called'
+    raise 'reload! called'
   end
 end
 

data/test/fixtures/apps/stealthy/app.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class SystemStealthyClassDemo < Padrino::Application
   set :reload, true

data/test/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb

@@ -1,6 +1,6 @@
 class Boo
   def self.class_method
-    "BooClass"
+    'BooClass'
   end
 end
 

data/test/fixtures/apps/system.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class SystemDemo < Padrino::Application
   set :reload, true

data/test/fixtures/apps/system_class_methods_demo.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class SystemClassMethodsDemo < Padrino::Application
   set :reload, true

data/test/fixtures/apps/system_instance_methods_demo.rb

@@ -1,4 +1,4 @@
-PADRINO_ROOT = File.dirname(__FILE__) unless defined? PADRINO_ROOT
+PADRINO_ROOT = __dir__ unless defined? PADRINO_ROOT
 
 class SystemInstanceMethodsDemo < Padrino::Application
   set :reload, true

data/test/fixtures/dependencies/a.rb

@@ -6,4 +6,4 @@
 # But here we need some of b.rb
 A_result = [B, C]
 
-A = "A"
+A = 'A'

data/test/fixtures/dependencies/b.rb

@@ -1,4 +1,4 @@
 # But here we need some of c.rb and a.rb
 B_result = C
 
-B = "B"
+B = 'B'

data/test/fixtures/dependencies/c.rb

@@ -1 +1 @@
-C = "C"
+C = 'C'

data/test/fixtures/dependencies/circular/e.rb

@@ -4,8 +4,9 @@ class E
   end
 
   def self.inherited(subclass)
+    super
     subclass.fields.replace fields.dup
   end
 
-  fields << "name"
+  fields << 'name'
 end

data/test/fixtures/dependencies/d.rb

@@ -1,4 +1,4 @@
 D  = 0 unless defined?(D)
 D += 1
 
-raise "SomeThing"
+raise 'SomeThing'

data/test/fixtures/dependencies/linear/i.rb

@@ -1 +1 @@
-fail
+raise

data/test/fixtures/dependencies/nested/l.rb

@@ -1,4 +1,4 @@
 Padrino.require_dependencies(
-  Padrino.root("fixtures/dependencies/nested/m.rb"),
-  Padrino.root("fixtures/dependencies/nested/n.rb")
+  Padrino.root('fixtures/dependencies/nested/m.rb'),
+  Padrino.root('fixtures/dependencies/nested/n.rb')
 )

data/test/fixtures/dependencies/nested/m.rb

@@ -1,5 +1,5 @@
 class M
   def self.hello
-    "hello"
+    'hello'
   end
 end

data/test/fixtures/dependencies/nested/qqq.rb

@@ -1,4 +1,4 @@
 Padrino.require_dependencies(
-  Padrino.root("fixtures/dependencies/nested/rrr.rb"),
-  Padrino.root("fixtures/dependencies/nested/sss.rb")
+  Padrino.root('fixtures/dependencies/nested/rrr.rb'),
+  Padrino.root('fixtures/dependencies/nested/sss.rb')
 )

data/test/fixtures/dependencies/nested/rrr.rb

@@ -1,5 +1,5 @@
 class RRR
   def self.hello
-    "hello"
+    'hello'
   end
 end

data/test/fixtures/dependencies/nested/sss.rb

@@ -1,6 +1,6 @@
 class RollbackTarget
   def self.hello
-    "hello"
+    'hello'
   end
 end
 

data/test/fixtures/reloadable_apps/external/app/app.rb

@@ -1,4 +1,3 @@
-
 module ReloadableApp
   class External < Padrino::Application
     set :reload, true

data/test/fixtures/reloadable_apps/external/app/controllers/base.rb

@@ -1,6 +1,5 @@
-
 ReloadableApp::External.controller :base do
   get :index do
-    "Hello External App"
+    'Hello External App'
   end
 end

data/test/fixtures/reloadable_apps/main/app.rb

@@ -1,10 +1,10 @@
-require File.expand_path(File.dirname(__FILE__) + '/../external/app/app')
+require_relative '../external/app/app'
 
 module ReloadableApp
   class Main < Padrino::Application
     set :reload, true
     get :index do
-      "hey"
+      'hey'
     end
   end
 end

data/test/helper.rb

@@ -1,5 +1,5 @@
 ENV['RACK_ENV'] = 'test'
-PADRINO_ROOT = File.dirname(__FILE__) unless defined?(PADRINO_ROOT)
+PADRINO_ROOT = __dir__ unless defined?(PADRINO_ROOT)
 
 require 'minitest/autorun'
 require 'minitest/pride'
@@ -19,7 +19,7 @@ class Minitest::Spec
   # Sets up a Sinatra::Base subclass defined with the block
   # given. Used in setup or individual spec methods to establish
   # the application.
-  def mock_app(base=Padrino::Application, &block)
+  def mock_app(base = Padrino::Application, &block)
     @app = Sinatra.new(base, &block)
   end
 

data/test/test_application.rb

@@ -1,61 +1,60 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
 class PadrinoPristine < Padrino::Application; end
 class PadrinoTestApp  < Padrino::Application; end
 class PadrinoTestApp2 < Padrino::Application; end
 
-describe "Application" do
+describe 'Application' do
   before { Padrino.clear! }
 
   describe 'for application functionality' do
-
     it 'should check default options' do
       assert File.identical?(__FILE__, PadrinoPristine.app_file)
       assert_equal :padrino_pristine, PadrinoPristine.app_name
       assert_equal :test, PadrinoPristine.environment
       assert_equal Padrino.root('views'), PadrinoPristine.views
-      assert  PadrinoPristine.raise_errors
-      assert !PadrinoPristine.logging
-      assert !PadrinoPristine.sessions
-      assert !PadrinoPristine.dump_errors
-      assert !PadrinoPristine.show_exceptions
-      assert  PadrinoPristine.raise_errors
-      assert !Padrino.configure_apps
+      assert PadrinoPristine.raise_errors
+      refute PadrinoPristine.logging
+      refute PadrinoPristine.sessions
+      refute PadrinoPristine.dump_errors
+      refute PadrinoPristine.show_exceptions
+      assert PadrinoPristine.raise_errors
+      refute Padrino.configure_apps
     end
 
     it 'should check padrino specific options' do
-      assert !PadrinoPristine.instance_variable_get(:@_configured)
+      refute PadrinoPristine.instance_variable_get(:@_configured)
       PadrinoPristine.send(:setup_application!)
       assert_equal :padrino_pristine, PadrinoPristine.app_name
       assert_equal 'StandardFormBuilder', PadrinoPristine.default_builder
-      assert  PadrinoPristine.instance_variable_get(:@_configured)
-      assert !PadrinoPristine.reload?
+      assert PadrinoPristine.instance_variable_get(:@_configured)
+      refute PadrinoPristine.reload?
     end
 
     it 'should set global project settings' do
-      Padrino.configure_apps { enable :sessions; set :foo, "bar" }
+      Padrino.configure_apps { enable :sessions; set :foo, 'bar' }
       PadrinoTestApp.send(:default_configuration!)
       PadrinoTestApp2.send(:default_configuration!)
-      assert PadrinoTestApp.sessions, "should have sessions enabled"
-      assert_equal "bar", PadrinoTestApp.settings.foo, "should have foo assigned"
+      assert PadrinoTestApp.sessions, 'should have sessions enabled'
+      assert_equal 'bar', PadrinoTestApp.settings.foo, 'should have foo assigned'
       assert_equal PadrinoTestApp.session_secret, PadrinoTestApp2.session_secret
     end
 
     it 'should be able to configure_apps multiple times' do
-      Padrino.configure_apps { set :foo1, "bar" }
-      Padrino.configure_apps { set :foo1, "bam" }
-      Padrino.configure_apps { set :foo2, "baz" }
+      Padrino.configure_apps { set :foo1, 'bar' }
+      Padrino.configure_apps { set :foo1, 'bam' }
+      Padrino.configure_apps { set :foo2, 'baz' }
       PadrinoTestApp.send(:default_configuration!)
-      assert_equal "bam", PadrinoTestApp.settings.foo1, "should have foo1 assigned to bam"
-      assert_equal "baz", PadrinoTestApp.settings.foo2, "should have foo2 assigned to baz"
+      assert_equal 'bam', PadrinoTestApp.settings.foo1, 'should have foo1 assigned to bam'
+      assert_equal 'baz', PadrinoTestApp.settings.foo2, 'should have foo2 assigned to baz'
     end
 
     it 'should have shared sessions accessible in project' do
       Padrino.configure_apps { enable :sessions; set :session_secret, PadrinoTestApp2.session_secret }
-      Padrino.mount("PadrinoTestApp").to("/write")
-      Padrino.mount("PadrinoTestApp2").to("/read")
+      Padrino.mount('PadrinoTestApp').to('/write')
+      Padrino.mount('PadrinoTestApp2').to('/read')
       PadrinoTestApp.send :default_configuration!
-      PadrinoTestApp.get('/') { session[:foo] = "shared" }
+      PadrinoTestApp.get('/') { session[:foo] = 'shared' }
       PadrinoTestApp2.send(:default_configuration!)
       PadrinoTestApp2.get('/') { session[:foo] }
       @app = Padrino.application
@@ -73,10 +72,10 @@ describe "Application" do
 
     it 'should able to set custome session management' do
       class PadrinoTestApp3 < Padrino::Application
-        set :sessions, :use => Rack::Session::Pool
+        set :sessions, use: Rack::Session::Pool
       end
-      Padrino.mount("PadrinoTestApp3").to("/")
-      PadrinoTestApp3.get('/write') { session[:foo] = "pool" }
+      Padrino.mount('PadrinoTestApp3').to('/')
+      PadrinoTestApp3.get('/write') { session[:foo] = 'pool' }
       PadrinoTestApp3.get('/read') { session[:foo] }
       @app = Padrino.application
       get '/write'
@@ -88,12 +87,14 @@ describe "Application" do
       class PadrinoTestApp4 < Padrino::Application
         enable :sessions
       end
+
       class PadrinoTestApp5 < Padrino::Application
-        set :sessions, :use => Rack::Session::Pool
+        set :sessions, use: Rack::Session::Pool
       end
-      Padrino.mount("PadrinoTestApp4").to("/write")
-      Padrino.mount("PadrinoTestApp5").to("/read")
-      PadrinoTestApp4.get('/') { session[:foo] = "cookie" }
+
+      Padrino.mount('PadrinoTestApp4').to('/write')
+      Padrino.mount('PadrinoTestApp5').to('/read')
+      PadrinoTestApp4.get('/') { session[:foo] = 'cookie' }
       PadrinoTestApp5.get('/') { session[:foo] }
       @app = Padrino.application
       get '/write'
@@ -106,8 +107,8 @@ describe "Application" do
       mock_app do
         provides :xml
 
-        get("/foo"){ "Foo in #{content_type.inspect}" }
-        get("/bar"){ "Foo in #{content_type.inspect}" }
+        get('/foo') { "Foo in #{content_type.inspect}" }
+        get('/bar') { "Foo in #{content_type.inspect}" }
       end
 
       get '/foo', {}, { 'HTTP_ACCEPT' => 'application/xml' }
@@ -116,61 +117,59 @@ describe "Application" do
       assert_equal 'Foo in :xml', body
 
       get '/bar', {}, { 'HTTP_ACCEPT' => 'application/xml' }
-      assert_equal "Foo in nil", body
+      assert_equal 'Foo in nil', body
     end
 
     it 'should resolve views and layouts paths' do
-      assert_equal Padrino.root('views')+'/users/index', PadrinoPristine.view_path('users/index')
-      assert_equal Padrino.root('views')+'/layouts/app', PadrinoPristine.layout_path(:app)
+      assert_equal "#{Padrino.root('views')}/users/index", PadrinoPristine.view_path('users/index')
+      assert_equal "#{Padrino.root('views')}/layouts/app", PadrinoPristine.layout_path(:app)
     end
 
-    describe "errors" do
+    describe 'errors' do
       it 'should have not mapped errors on development' do
-        mock_app { get('/'){ 'HI' } }
-        get "/"
+        mock_app { get('/') { 'HI' } }
+        get '/'
         assert_empty @app.errors
       end
 
       it 'should have mapped errors on production' do
-        mock_app { set :environment, :production; get('/'){ 'HI' } }
-        get "/"
+        mock_app { set :environment, :production; get('/') { 'HI' } }
+        get '/'
         assert_equal 1, @app.errors.size
       end
 
       it 'should overide errors' do
         mock_app do
           set :environment, :production
-          get('/'){ raise }
-          error(::Exception){ 'custom error' }
+          get('/') { raise }
+          error(::Exception) { 'custom error' }
         end
-        get "/"
+        get '/'
         assert_equal 1, @app.errors.size
         assert_equal 'custom error', body
       end
 
+      # see naming collision in issue #1814
       it 'should pass Routing#parent to Module#parent' do
-        # see naming collision in issue #1814
-        
-          ConstTest = Class.new(Padrino::Application)
-          class Module
-            def parent
-              :dirty
-            end
+        ConstTest = Class.new(Padrino::Application)
+        class Module
+          def parent
+            :dirty
           end
-          assert_equal :dirty, ConstTest.parent
-        ensure
-          Module.instance_eval{ undef :parent }
-        
+        end
+        assert_equal :dirty, ConstTest.parent
+      ensure
+        Module.instance_eval { undef :parent }
       end
     end
 
-    describe "pre-compile routes" do
-      it "should compile routes before first request if enabled the :precompile_routes option" do
-        require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/precompiled_app')
+    describe 'pre-compile routes' do
+      it 'should compile routes before first request if enabled the :precompile_routes option' do
+        require File.expand_path("#{__dir__}/fixtures/apps/precompiled_app")
         assert_instance_of Padrino::PathRouter::Compiler, PrecompiledApp::App.compiled_router.engine
         assert_instance_of Padrino::PathRouter::Compiler, PrecompiledApp::SubApp.compiled_router.engine
-        assert_equal true, PrecompiledApp::App.compiled_router.engine.compiled?
-        assert_equal true, PrecompiledApp::SubApp.compiled_router.engine.compiled?
+        assert PrecompiledApp::App.compiled_router.engine.compiled?
+        assert PrecompiledApp::SubApp.compiled_router.engine.compiled?
         assert_equal 20, PrecompiledApp::App.compiled_router.engine.routes.length
         assert_equal 20, PrecompiledApp::SubApp.compiled_router.engine.routes.length
       end

data/test/test_configuration.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "PadrinoConfiguration" do
+describe 'PadrinoConfiguration' do
   it 'should be able to store values' do
     Padrino.config.val1 = 12_345
     assert_equal 12_345, Padrino.config.val1