padrino-core 0.16.0.pre4 → 0.16.0

data/test/test_reloader_system.rb

@@ -1,10 +1,10 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/kiq')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/static')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/custom_dependencies/custom_dependencies')
+require_relative 'helper'
+require_relative 'fixtures/apps/kiq'
+require_relative 'fixtures/apps/system'
+require_relative 'fixtures/apps/static'
+require_relative 'fixtures/apps/custom_dependencies/custom_dependencies'
 
-describe "SystemReloader" do
+describe 'SystemReloader' do
   describe 'for wierd and difficult reload events' do
     before do
       @app = SystemDemo
@@ -18,9 +18,9 @@ describe "SystemReloader" do
     end
 
     it 'should reload children on parent change' do
-      Padrino.mount(SystemDemo).to("/")
+      Padrino.mount(SystemDemo).to('/')
       assert_equal Child.new.family, 'Danes'
-      parent_file = File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/models/parent.rb')
+      parent_file = File.expand_path("#{__dir__}/fixtures/apps/models/parent.rb")
       new_class = <<-DOC
         class Parent
           def family
@@ -36,24 +36,24 @@ describe "SystemReloader" do
         Padrino::Reloader.reload!
         assert_equal 'Danes', Parent.new.family
         assert_equal 'Danes', Child.new.family
-        File.open(parent_file, "w") { |f| f.write(new_class) }
+        File.open(parent_file, 'w') { |f| f.write(new_class) }
         Padrino::Reloader.reload!
         assert_equal 'Dancy', Parent.new.family
         assert_equal 'Shmancy', Parent.new.shmamily
         assert_equal 'Dancy', Child.new.family
         assert_equal 'Shmancy', Child.new.shmamily
       ensure
-        File.open(parent_file, "w") { |f| f.write(backup) }
+        File.open(parent_file, 'w') { |f| f.write(backup) }
       end
     end
 
     it 'should not fail horribly on reload event with non-padrino apps' do
-      Padrino.mount("kiq").to("/")
+      Padrino.mount('kiq').to('/')
       Padrino.reload!
     end
 
     it 'should not reload apps with disabled reload' do
-      Padrino.mount(StaticDemo).to("/")
+      Padrino.mount(StaticDemo).to('/')
       Padrino.reload!
     end
   end
@@ -68,15 +68,15 @@ describe "SystemReloader" do
       DOC
       tmp_file = '/tmp/padrino_class_demo.rb'
       begin
-        File.open(tmp_file, "w") { |f| f.write(new_class) }
+        File.open(tmp_file, 'w') { |f| f.write(new_class) }
         Padrino.clear!
-        require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system_class_methods_demo.rb')
+        require File.expand_path("#{__dir__}/fixtures/apps/system_class_methods_demo.rb")
         @app = SystemClassMethodsDemo
-        Padrino.mount(SystemClassMethodsDemo).to("/")
+        Padrino.mount(SystemClassMethodsDemo).to('/')
         get '/'
         assert defined?(SingletonClassTest), 'SingletonClassTest undefined'
         assert_includes SingletonClassTest.singleton_methods, :external_test
-        FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/helpers/class_methods_helpers.rb')
+        FileUtils.touch File.expand_path("#{__dir__}/fixtures/apps/helpers/class_methods_helpers.rb")
         Padrino.reload!
         assert defined?(SingletonClassTest), 'SingletonClassTest undefined'
         assert_includes SingletonClassTest.singleton_methods, :external_test
@@ -94,15 +94,15 @@ describe "SystemReloader" do
       DOC
       tmp_file = '/tmp/padrino_instance_demo.rb'
       begin
-        File.open(tmp_file, "w") { |f| f.write(new_class) }
+        File.open(tmp_file, 'w') { |f| f.write(new_class) }
         Padrino.clear!
-        require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/system_instance_methods_demo.rb')
+        require File.expand_path("#{__dir__}/fixtures/apps/system_instance_methods_demo.rb")
         @app = SystemInstanceMethodsDemo
-        Padrino.mount(SystemInstanceMethodsDemo).to("/")
+        Padrino.mount(SystemInstanceMethodsDemo).to('/')
         get '/'
         assert defined?(InstanceTest), 'InstanceTest undefined'
         assert_includes InstanceTest.new.methods, :instance_test
-        FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/helpers/instance_methods_helpers.rb')
+        FileUtils.touch File.expand_path("#{__dir__}/fixtures/apps/helpers/instance_methods_helpers.rb")
         Padrino.reload!
         assert defined?(InstanceTest), 'InstanceTest undefined'
         assert_includes InstanceTest.new.methods, :instance_test
@@ -113,24 +113,24 @@ describe "SystemReloader" do
 
     it 'should not fail with superclass mismatch when reloading descendant classes with no instances' do
       Padrino.clear!
-      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/stealthy/app.rb')
+      require File.expand_path("#{__dir__}/fixtures/apps/stealthy/app.rb")
       @app = SystemStealthyClassDemo
-      Padrino.mount(SystemStealthyClassDemo).to("/")
+      Padrino.mount(SystemStealthyClassDemo).to('/')
       get '/'
-      FileUtils.touch File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb')
+      FileUtils.touch File.expand_path("#{__dir__}/fixtures/apps/stealthy/helpers/stealthy_class_helpers.rb")
       Padrino.reload!
     end
   end
 
   describe 'reloading custom dependencies' do
-    let(:custom_dependency_path) { File.dirname(__FILE__) + '/fixtures/apps/custom_dependencies/my_dependencies' }
+    let(:custom_dependency_path) { "#{__dir__}/fixtures/apps/custom_dependencies/my_dependencies" }
     let(:custom_dependency) { File.join(custom_dependency_path, 'my_dependency.rb') }
 
     before do
       @app = CustomDependencies
       Padrino.clear!
-      Padrino.mount(CustomDependencies).to("/")
-      Padrino.dependency_paths << custom_dependency_path + '/*.rb'
+      Padrino.mount(CustomDependencies).to('/')
+      Padrino.dependency_paths << "#{custom_dependency_path}/*.rb"
       Padrino.load!
       get '/'
     end
@@ -145,13 +145,13 @@ describe "SystemReloader" do
     it 'should remove constants of misdesigned modules' do
       skip
       Padrino.clear!
-      require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/concerned/app.rb')
+      require File.expand_path("#{__dir__}/fixtures/apps/concerned/app.rb")
       @app = SystemConcernedClassDemo
-      Padrino.mount(SystemConcernedClassDemo).to("/")
+      Padrino.mount(SystemConcernedClassDemo).to('/')
       get '/'
 
       original_value = BadModule.instance_variable_get(:@happy_global_variable)
-      FileUtils.touch File.dirname(__FILE__) + '/fixtures/apps/concerned/models/mixins/badmodule.rb'
+      FileUtils.touch "#{__dir__}/fixtures/apps/concerned/models/mixins/badmodule.rb"
       Padrino.reload!
       assert_equal original_value, BadModule.instance_variable_get(:@happy_global_variable)
     end

data/test/test_restful_routing.rb

@@ -1,33 +1,33 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Routing" do
+describe 'Routing' do
   it 'should perform restul routing' do
     mock_app do
-      controller :parent => :parents do
-        get :index, :with => :asset_id do
-          "#{url_for(:index, params[:parent_id], :asset_id => params[:asset_id])} get"
+      controller parent: :parents do
+        get :index, with: :asset_id do
+          "#{url_for(:index, params[:parent_id], asset_id: params[:asset_id])} get"
         end
 
-        put :index, :with => :asset_id do
-          "#{url_for(:index, params[:parent_id], :asset_id => params[:asset_id])} put"
+        put :index, with: :asset_id do
+          "#{url_for(:index, params[:parent_id], asset_id: params[:asset_id])} put"
         end
 
-        post :index, :with => :asset_id do
-          "#{url_for(:index, :parent_id => params[:parent_id], :asset_id => params[:asset_id])} post"
+        post :index, with: :asset_id do
+          "#{url_for(:index, parent_id: params[:parent_id], asset_id: params[:asset_id])} post"
         end
 
-        delete :index, :with => :asset_id do
-          "#{url_for(:index, params[:parent_id], :asset_id => params[:asset_id])} delete"
+        delete :index, with: :asset_id do
+          "#{url_for(:index, params[:parent_id], asset_id: params[:asset_id])} delete"
         end
       end
     end
-    get "/parents/1/hi"
-    assert_equal "/parents/1/hi get", body
-    put "/parents/1/hi"
-    assert_equal "/parents/1/hi put", body
-    post "/parents/1/hi"
-    assert_equal "/parents/1/hi post", body
-    delete "/parents/1/hi"
-    assert_equal "/parents/1/hi delete", body
+    get '/parents/1/hi'
+    assert_equal '/parents/1/hi get', body
+    put '/parents/1/hi'
+    assert_equal '/parents/1/hi put', body
+    post '/parents/1/hi'
+    assert_equal '/parents/1/hi post', body
+    delete '/parents/1/hi'
+    assert_equal '/parents/1/hi delete', body
   end
 end

data/test/test_router.rb

@@ -1,8 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/simple')
-
-describe "Router" do
+require_relative 'helper'
+require_relative 'fixtures/apps/simple'
 
+describe 'Router' do
   def setup
     Padrino.clear!
   end
@@ -13,269 +12,251 @@ describe "Router" do
         'X-ScriptName' => env['SCRIPT_NAME'],
         'X-PathInfo' => env['PATH_INFO'],
         'Content-Type' => 'text/plain'
-      }, [""]]
+      }, ['']]
     }
     map = Padrino::Router.new(
-      { :path => '/bar',     :to => app },
-      { :path => '/foo/bar', :to => app },
-      { :path => '/foo',     :to => app }
+      { path: '/bar',     to: app },
+      { path: '/foo/bar', to: app },
+      { path: '/foo',     to: app }
     )
 
-    res = Rack::MockRequest.new(map).get("/")
+    res = Rack::MockRequest.new(map).get('/')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(map).get("/qux")
+    res = Rack::MockRequest.new(map).get('/qux')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(map).get("/foo")
+    res = Rack::MockRequest.new(map).get('/foo')
     assert res.ok?
-    assert_equal "/foo", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert_equal '/foo', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/foo/")
+    res = Rack::MockRequest.new(map).get('/foo/')
     assert res.ok?
-    assert_equal "/foo", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert_equal '/foo', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/foo/bar")
+    res = Rack::MockRequest.new(map).get('/foo/bar')
     assert res.ok?
-    assert_equal "/foo/bar", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert_equal '/foo/bar', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/foo/bar/")
+    res = Rack::MockRequest.new(map).get('/foo/bar/')
     assert res.ok?
-    assert_equal "/foo/bar", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert_equal '/foo/bar', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/foo///bar//quux")
+    res = Rack::MockRequest.new(map).get('/foo///bar//quux')
     assert_equal 200, res.status
     assert res.ok?
-    assert_equal "/foo/bar", res["X-ScriptName"]
-    assert_equal "//quux", res["X-PathInfo"]
+    assert_equal '/foo/bar', res['X-ScriptName']
+    assert_equal '//quux', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/foo/quux", "SCRIPT_NAME" => "/bleh")
+    res = Rack::MockRequest.new(map).get('/foo/quux', 'SCRIPT_NAME' => '/bleh')
     assert res.ok?
-    assert_equal "/bleh/foo", res["X-ScriptName"]
-    assert_equal "/quux", res["X-PathInfo"]
+    assert_equal '/bleh/foo', res['X-ScriptName']
+    assert_equal '/quux', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/bar", 'HTTP_HOST' => 'foo.org')
+    res = Rack::MockRequest.new(map).get('/bar', 'HTTP_HOST' => 'foo.org')
     assert res.ok?
-    assert_equal "/bar", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert_equal '/bar', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/bar/", 'HTTP_HOST' => 'foo.org')
+    res = Rack::MockRequest.new(map).get('/bar/', 'HTTP_HOST' => 'foo.org')
     assert res.ok?
-    assert_equal "/bar", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert_equal '/bar', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
   end
 
   it 'should dispatch requests to cascade mounted apps' do
     app = lambda { |env|
-      scary = !!env['PATH_INFO'].match(/scary/)
+      scary = env['PATH_INFO'].match?(/scary/)
       [scary ? 404 : 200, {
         'X-ScriptName' => env['SCRIPT_NAME'],
         'X-PathInfo' => env['PATH_INFO'],
         'Content-Type' => 'text/plain'
-      }, [""]]
+      }, ['']]
     }
     api = lambda { |env|
-      spooky = !!env['QUERY_STRING'].match(/spooky/)
+      spooky = env['QUERY_STRING'].match?(/spooky/)
       [spooky ? 200 : 404, {
         'X-API' => spooky,
         'X-ScriptName' => env['SCRIPT_NAME'],
         'X-PathInfo' => env['PATH_INFO'],
         'Content-Type' => 'application/json'
-      }, [""]]
+      }, ['']]
     }
     map = Padrino::Router.new(
-      { :path => '/bar',     :to => api },
-      { :path => '/bar',     :to => app }
+      { path: '/bar',     to: api },
+      { path: '/bar',     to: app }
     )
 
-    res = Rack::MockRequest.new(map).get("/werewolf")
+    res = Rack::MockRequest.new(map).get('/werewolf')
     assert_equal 404, res.status
-    refute_includes res, "X-API"
-    refute_includes res, "X-ScriptName"
-    refute_includes res, "X-PathInfo"
+    refute_includes res, 'X-API'
+    refute_includes res, 'X-ScriptName'
+    refute_includes res, 'X-PathInfo'
 
-    res = Rack::MockRequest.new(map).get("/bar/mitzvah")
+    res = Rack::MockRequest.new(map).get('/bar/mitzvah')
     assert res.ok?
-    refute_includes res, "X-API"
-    assert_equal 'text/plain', res["Content-Type"]
-    assert_equal "/bar", res["X-ScriptName"]
-    assert_equal "/mitzvah", res["X-PathInfo"]
+    refute_includes res, 'X-API'
+    assert_equal 'text/plain', res['Content-Type']
+    assert_equal '/bar', res['X-ScriptName']
+    assert_equal '/mitzvah', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/bar?spooky")
+    res = Rack::MockRequest.new(map).get('/bar?spooky')
     assert res.ok?
-    assert_equal true, res["X-API"]
-    assert_equal 'application/json', res["Content-Type"]
-    assert_equal "/bar", res["X-ScriptName"]
-    assert_equal "/", res["X-PathInfo"]
+    assert res['X-API']
+    assert_equal 'application/json', res['Content-Type']
+    assert_equal '/bar', res['X-ScriptName']
+    assert_equal '/', res['X-PathInfo']
 
-    res = Rack::MockRequest.new(map).get("/bar/scary")
+    res = Rack::MockRequest.new(map).get('/bar/scary')
     assert_equal 404, res.status
-    refute_includes res, "X-API"
-    assert_equal 'text/plain', res["Content-Type"]
-    assert_equal "/bar", res["X-ScriptName"]
-    assert_equal "/scary", res["X-PathInfo"]
+    refute_includes res, 'X-API'
+    assert_equal 'text/plain', res['Content-Type']
+    assert_equal '/bar', res['X-ScriptName']
+    assert_equal '/scary', res['X-PathInfo']
   end
 
   it 'should dispatch requests to cascade mounted apps and not cascade ok statuses' do
-
     api = mock_app do
-      get 'scary' do
-        "1"
-      end
+      get('scary') { '1' }
       set :cascade, true
     end
 
     app = mock_app do
-      get 'scary' do
-        "2"
-      end
+      get('scary') { '2' }
       set :cascade, false
     end
 
     app2 = mock_app do
-      get 'terrifying' do
-        ""
-      end
+      get('terrifying') { '' }
     end
 
     map = Padrino::Router.new(
-        { :path => '/bar',     :to => api },
-        { :path => '/bar',   :to => app  },
-        { :path => '/bar',     :to => app2 }
+      { path: '/bar', to: api },
+      { path: '/bar', to: app  },
+      { path: '/bar', to: app2 }
     )
 
-    res = Rack::MockRequest.new(map).get("/bar/scary")
+    res = Rack::MockRequest.new(map).get('/bar/scary')
     assert res.ok?
-    #asserting that on ok we're good to go
-    assert_equal "1", res.body
-
-    res = Rack::MockRequest.new(map).get("/bar/terrifying")
-    assert !res.ok?
+    # asserting that on ok we're good to go
+    assert_equal '1', res.body
 
+    res = Rack::MockRequest.new(map).get('/bar/terrifying')
+    refute res.ok?
   end
 
   it 'should dispatch requests to cascade mounted apps until it sees a cascade == false or []g' do
     app = mock_app do
-      get 'scary' do
-        ""
-      end
+      get('scary') { '' }
       set :cascade, []
     end
 
     app2 = mock_app do
-      get 'terrifying' do
-        ""
-      end
+      get('terrifying') { '' }
     end
 
     map = Padrino::Router.new(
-        { :path => '/bar',   :to => app  },
-        { :path => '/bar',     :to => app2 }
+      { path: '/bar', to: app },
+      { path: '/bar', to: app2 }
     )
 
-    request_case = lambda {
-      Rack::MockRequest.new(map).get("/bar/terrifying")
-    }
+    request_case = -> { Rack::MockRequest.new(map).get('/bar/terrifying') }
 
     app.cascade = false
-    assert !request_case.call.ok?
+    refute request_case.call.ok?
 
     app.cascade = true
     assert request_case.call.ok?
   end
 
   it 'should dispatches hosts correctly' do
+    app = lambda do |position, env|
+      headers = {
+        'Content-Type' => 'text/plain',
+        'X-Host' => env['HTTP_HOST'] || env['SERVER_NAME'],
+        'X-Position' => position
+      }
+
+      [200, headers, ['']]
+    end.curry
+
     map = Padrino::Router.new(
-     { :host => "foo.org", :to => lambda { |env|
-       [200,
-        { "Content-Type" => "text/plain",
-          "X-Position" => "foo.org",
-          "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
-        }, [""]]}},
-     { :host => "subdomain.foo.org", :to => lambda { |env|
-       [200,
-        { "Content-Type" => "text/plain",
-          "X-Position" => "subdomain.foo.org",
-          "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
-        }, [""]]}},
-     { :host => /.*\.bar.org/, :to => lambda { |env|
-       [200,
-        { "Content-Type" => "text/plain",
-          "X-Position" => "bar.org",
-          "X-Host" => env["HTTP_HOST"] || env["SERVER_NAME"],
-        }, [""]]}}
-     )
-
-     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "bar.org")
-     assert res.not_found?
-
-     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "at.bar.org")
-     assert res.ok?
-     assert_equal "bar.org", res["X-Position"]
-
-     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "foo.org")
-     assert res.ok?
-     assert_equal "foo.org", res["X-Position"]
-
-     res = Rack::MockRequest.new(map).get("/", "HTTP_HOST" => "subdomain.foo.org", "SERVER_NAME" => "foo.org")
-     assert res.ok?
-     assert_equal "subdomain.foo.org", res["X-Position"]
+      { host: 'foo.org',           to: app['foo.org'] },
+      { host: 'subdomain.foo.org', to: app['subdomain.foo.org'] },
+      { host: /.*\.bar.org/,       to: app['bar.org'] }
+    )
+
+    res = Rack::MockRequest.new(map).get('/', 'HTTP_HOST' => 'bar.org')
+    assert res.not_found?
+
+    res = Rack::MockRequest.new(map).get('/', 'HTTP_HOST' => 'at.bar.org')
+    assert res.ok?
+    assert_equal 'bar.org', res['X-Position']
+
+    res = Rack::MockRequest.new(map).get('/', 'HTTP_HOST' => 'foo.org')
+    assert res.ok?
+    assert_equal 'foo.org', res['X-Position']
+
+    res = Rack::MockRequest.new(map).get('/', 'HTTP_HOST' => 'subdomain.foo.org', 'SERVER_NAME' => 'foo.org')
+    assert res.ok?
+    assert_equal 'subdomain.foo.org', res['X-Position']
   end
 
   it 'should works with padrino core applications' do
-    Padrino.mount("simple_demo").host("padrino.org")
-    assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
-    assert_equal ["padrino.org"], Padrino.mounted_apps.map(&:app_host)
+    Padrino.mount('simple_demo').host('padrino.org')
+    assert_equal ['simple_demo'], Padrino.mounted_apps.map(&:name)
+    assert_equal ['padrino.org'], Padrino.mounted_apps.map(&:app_host)
 
-    res = Rack::MockRequest.new(Padrino.application).get("/")
+    res = Rack::MockRequest.new(Padrino.application).get('/')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/", "HTTP_HOST" => "bar.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/', 'HTTP_HOST' => 'bar.org')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/", "HTTP_HOST" => "padrino.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/', 'HTTP_HOST' => 'padrino.org')
     assert res.ok?
   end
 
   it 'should works with padrino applications' do
-    Padrino.mount("simple_demo").to("/foo").host(/.*\.padrino.org/)
+    Padrino.mount('simple_demo').to('/foo').host(/.*\.padrino.org/)
 
-    res = Rack::MockRequest.new(Padrino.application).get("/")
+    res = Rack::MockRequest.new(Padrino.application).get('/')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/", "HTTP_HOST" => "bar.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/', 'HTTP_HOST' => 'bar.org')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/", "HTTP_HOST" => "padrino.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/', 'HTTP_HOST' => 'padrino.org')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/none", "HTTP_HOST" => "foo.padrino.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/none', 'HTTP_HOST' => 'foo.padrino.org')
     assert res.not_found?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/foo", "HTTP_HOST" => "bar.padrino.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/foo', 'HTTP_HOST' => 'bar.padrino.org')
     assert res.ok?
 
-    res = Rack::MockRequest.new(Padrino.application).get("/foo/", "HTTP_HOST" => "bar.padrino.org")
+    res = Rack::MockRequest.new(Padrino.application).get('/foo/', 'HTTP_HOST' => 'bar.padrino.org')
     assert res.ok?
   end
 
   it 'should keep the same environment object' do
-    app = lambda { |env|
+    app = lambda do |env|
       env['path'] = env['PATH_INFO']
-      [200, {'Content-Type' => 'text/plain'}, [""]]
-    }
+      [200, { 'Content-Type' => 'text/plain' }, ['']]
+    end
+
     map = Padrino::Router.new(
-      { :path => '/bar',     :to => app },
-      { :path => '/foo/bar', :to => app },
-      { :path => '/foo',     :to => app }
+      { path: '/bar',     to: app },
+      { path: '/foo/bar', to: app },
+      { path: '/foo',     to: app }
     )
 
-    env = Rack::MockRequest.env_for("/bar/foo")
+    env = Rack::MockRequest.env_for('/bar/foo')
     map.call(env)
-    assert_equal "/foo", env["path"]
+    assert_equal '/foo', env['path']
   end
 end