padrino-core 0.16.0.pre3 → 0.16.0

data/test/test_dependencies.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Dependencies" do
+describe 'Dependencies' do
   describe 'when we require a dependency that have another dependency' do
     before do
       @log_level = Padrino::Logger::Config[:test]
       @io = StringIO.new
-      Padrino::Logger::Config[:test] = { :log_level => :error, :stream => @io }
+      Padrino::Logger::Config[:test] = { log_level: :error, stream: @io }
       Padrino::Logger.setup!
     end
 
@@ -18,10 +18,10 @@ describe "Dependencies" do
       capture_io do
         assert_raises(RuntimeError) do
           Padrino.require_dependencies(
-            Padrino.root("fixtures/dependencies/a.rb"),
-            Padrino.root("fixtures/dependencies/b.rb"),
-            Padrino.root("fixtures/dependencies/c.rb"),
-            Padrino.root("fixtures/dependencies/d.rb")
+            Padrino.root('fixtures/dependencies/a.rb'),
+            Padrino.root('fixtures/dependencies/b.rb'),
+            Padrino.root('fixtures/dependencies/c.rb'),
+            Padrino.root('fixtures/dependencies/d.rb')
           )
         end
       end
@@ -32,35 +32,35 @@ describe "Dependencies" do
     it 'should resolve dependency problems' do
       capture_io do
         Padrino.require_dependencies(
-          Padrino.root("fixtures/dependencies/a.rb"),
-          Padrino.root("fixtures/dependencies/b.rb"),
-          Padrino.root("fixtures/dependencies/c.rb")
+          Padrino.root('fixtures/dependencies/a.rb'),
+          Padrino.root('fixtures/dependencies/b.rb'),
+          Padrino.root('fixtures/dependencies/c.rb')
         )
       end
-      assert_equal ["B", "C"], A_result
-      assert_equal "C", B_result
-      assert_equal "", @io.string
+      assert_equal %w[B C], A_result
+      assert_equal 'C', B_result
+      assert_equal '', @io.string
     end
 
     it 'should remove partially loaded constants' do
       capture_io do
         Padrino.require_dependencies(
-          Padrino.root("fixtures/dependencies/circular/e.rb"),
-          Padrino.root("fixtures/dependencies/circular/f.rb"),
-          Padrino.root("fixtures/dependencies/circular/g.rb")
+          Padrino.root('fixtures/dependencies/circular/e.rb'),
+          Padrino.root('fixtures/dependencies/circular/f.rb'),
+          Padrino.root('fixtures/dependencies/circular/g.rb')
         )
       end
-      assert_equal ["name"], F.fields
-      assert_equal "", @io.string
+      assert_equal ['name'], F.fields
+      assert_equal '', @io.string
     end
 
     it 'should not silence LoadError raised in dependencies excluded from reloading' do
       capture_io do
         assert_raises(LoadError) do
-          Padrino::Reloader.exclude << Padrino.root("fixtures/dependencies/linear/h.rb")
+          Padrino::Reloader.exclude << Padrino.root('fixtures/dependencies/linear/h.rb')
           Padrino.require_dependencies(
-            Padrino.root("fixtures/dependencies/linear/h.rb"),
-            Padrino.root("fixtures/dependencies/linear/i.rb")
+            Padrino.root('fixtures/dependencies/linear/h.rb'),
+            Padrino.root('fixtures/dependencies/linear/i.rb')
           )
         end
       end
@@ -69,20 +69,19 @@ describe "Dependencies" do
     it 'should not remove constants that are newly commited in nested require_dependencies' do
       capture_io do
         Padrino.require_dependencies(
-          Padrino.root("fixtures/dependencies/nested/j.rb"),
-          Padrino.root("fixtures/dependencies/nested/k.rb"),
-          Padrino.root("fixtures/dependencies/nested/l.rb")
+          Padrino.root('fixtures/dependencies/nested/j.rb'),
+          Padrino.root('fixtures/dependencies/nested/k.rb'),
+          Padrino.root('fixtures/dependencies/nested/l.rb')
         )
       end
-      assert_equal "hello", M.hello
+      assert_equal 'hello', M.hello
     end
 
-
-    describe "change log level for :devel" do
+    describe 'change log level for :devel' do
       before do
         @log_level_devel = Padrino::Logger::Config[:test]
         @io = StringIO.new
-        Padrino::Logger::Config[:test] = { :log_level => :devel, :stream => @io }
+        Padrino::Logger::Config[:test] = { log_level: :devel, stream: @io }
         Padrino::Logger.setup!
       end
 
@@ -94,14 +93,14 @@ describe "Dependencies" do
       it 'should resolve interdependence by out/in side nested require_dependencies' do
         capture_io do
           Padrino.require_dependencies(
-            Padrino.root("fixtures/dependencies/nested/ooo.rb"),
-            Padrino.root("fixtures/dependencies/nested/ppp.rb"),
-            Padrino.root("fixtures/dependencies/nested/qqq.rb")
+            Padrino.root('fixtures/dependencies/nested/ooo.rb'),
+            Padrino.root('fixtures/dependencies/nested/ppp.rb'),
+            Padrino.root('fixtures/dependencies/nested/qqq.rb')
           )
         end
-        assert_equal "hello", RRR.hello
-        assert_equal "hello", OOO.hello
-        assert_equal "hello", RollbackTarget.hello
+        assert_equal 'hello', RRR.hello
+        assert_equal 'hello', OOO.hello
+        assert_equal 'hello', RollbackTarget.hello
         assert_match(/Removed constant RollbackTarget from Object/, @io.string)
       end
     end

data/test/test_filters.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Filters" do
+describe 'Filters' do
   it 'should filters by accept header' do
     mock_app do
-      get '/foo', :provides => [:xml, :js] do
+      get '/foo', provides: %i[xml js] do
         request.env['HTTP_ACCEPT']
       end
     end
@@ -17,16 +17,16 @@ describe "Filters" do
     assert ok?
     assert_equal 'application/xml;charset=utf-8', response.headers['Content-Type']
 
-    get '/foo', {}, { 'HTTP_ACCEPT' => 'application/javascript' }
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'text/javascript' }
     assert ok?
-    assert_equal 'application/javascript', body
-    assert_equal 'application/javascript;charset=utf-8', response.headers['Content-Type']
+    assert_equal 'text/javascript', body
+    assert_equal 'text/javascript;charset=utf-8', response.headers['Content-Type']
 
     get '/foo.js'
     assert ok?
-    assert_equal 'application/javascript;charset=utf-8', response.headers['Content-Type']
+    assert_equal 'text/javascript;charset=utf-8', response.headers['Content-Type']
 
-    get '/foo', {}, { "HTTP_ACCEPT" => 'text/html' }
+    get '/foo', {}, { 'HTTP_ACCEPT' => 'text/html' }
     assert_equal 406, status
   end
 
@@ -35,27 +35,27 @@ describe "Filters" do
       controller do
         before { env['QUERY_STRING'] == 'secret' or pass }
         get :index do
-          "secret index"
+          'secret index'
         end
       end
 
       controller do
         before { env['QUERY_STRING'] == 'halt' and halt 401, 'go away!' }
         get :index do
-          "index"
+          'index'
         end
       end
     end
 
-    get "/?secret"
-    assert_equal "secret index", body
+    get '/?secret'
+    assert_equal 'secret index', body
 
-    get "/?halt"
-    assert_equal "go away!", body
+    get '/?halt'
+    assert_equal 'go away!', body
     assert_equal 401, status
 
-    get "/"
-    assert_equal "index", body
+    get '/'
+    assert_equal 'index', body
   end
 
   it 'should scope filters in the given controller' do
@@ -66,26 +66,26 @@ describe "Filters" do
       controller :foo do
         before { @foo = :foo }
         after { @foo = nil }
-        get("/") { [@foo, @bar, @global].compact.join(" ") }
+        get('/') { [@foo, @bar, @global].compact.join(' ') }
       end
 
-      get("/") { [@foo, @bar, @global].compact.join(" ") }
+      get('/') { [@foo, @bar, @global].compact.join(' ') }
 
       controller :bar do
         before { @bar = :bar }
         after { @bar = nil }
-        get("/") { [@foo, @bar, @global].compact.join(" ") }
+        get('/') { [@foo, @bar, @global].compact.join(' ') }
       end
     end
 
-    get "/bar"
-    assert_equal "bar global", body
+    get '/bar'
+    assert_equal 'bar global', body
 
-    get "/foo"
-    assert_equal "foo global", body
+    get '/foo'
+    assert_equal 'foo global', body
 
-    get "/"
-    assert_equal "global", body
+    get '/'
+    assert_equal 'global', body
   end
 
   it 'should be able to access params in a before filter' do
@@ -96,7 +96,7 @@ describe "Filters" do
         username_from_before_filter = params[:username]
       end
 
-      get :users, :with => :username do
+      get :users, with: :username do
       end
     end
     get '/users/josh'
@@ -105,18 +105,18 @@ describe "Filters" do
 
   it 'should be able to access params normally when a before filter is specified' do
     mock_app do
-      before { }
+      before {}
       get :index do
-        params.inspect
+        params.to_json
       end
     end
     get '/?test=what'
-    assert_equal '{"test"=>"what"}', body
+    assert_equal '{"test":"what"}', body
   end
 
   it 'should be able to filter based on a path' do
     mock_app do
-      before('/') { @test = "#{@test}before"}
+      before('/') { @test = "#{@test}before" }
       get :index do
         @test
       end
@@ -132,7 +132,7 @@ describe "Filters" do
 
   it 'should be able to filter based on a symbol' do
     mock_app do
-      before(:index) { @test = 'before'}
+      before(:index) { @test = 'before' }
       get :index do
         @test
       end
@@ -149,27 +149,26 @@ describe "Filters" do
   it 'should be able to filter based on a symbol for a controller' do
     mock_app do
       controller :foo do
-        before(:test) { @test = 'foo'}
-        get :test do
-          @test.to_s + " response"
-        end
+        before(:test) { @test = 'foo' }
+        get(:test) { "#{@test} response" }
       end
+
       controller :bar do
-        before(:test) { @test = 'bar'}
-        get :test do
-          @test.to_s + " response"
-        end
+        before(:test) { @test = 'bar' }
+        get(:test) { "#{@test} response" }
       end
     end
+
     get '/foo/test'
     assert_equal 'foo response', body
+
     get '/bar/test'
     assert_equal 'bar response', body
   end
 
   it 'should be able to filter based on a symbol or path' do
     mock_app do
-      before(:index, '/main') { @test = 'before'}
+      before(:index, '/main') { @test = 'before' }
       get :index do
         @test
       end
@@ -185,7 +184,7 @@ describe "Filters" do
 
   it 'should be able to filter based on a symbol or regexp' do
     mock_app do
-      before(:index, /main/) { @test = 'before'}
+      before(:index, /main/) { @test = 'before' }
       get :index do
         @test
       end
@@ -206,7 +205,7 @@ describe "Filters" do
 
   it 'should be able to filter excluding based on a symbol' do
     mock_app do
-      before(:except => :index) { @test = 'before'}
+      before(except: :index) { @test = 'before' }
       get :index do
         @test
       end
@@ -223,8 +222,8 @@ describe "Filters" do
   it 'should be able to filter excluding based on a symbol when specify the multiple routes and use nested controller' do
     mock_app do
       controller :test, :nested do
-        before(:except => [:test1, :test2]) { @long = 'long'}
-        before(:except => [:test1]) { @short = 'short'}
+        before(except: %i[test1 test2]) { @long = 'long' }
+        before(except: [:test1]) { @short = 'short' }
         get :test1 do
           "#{@long} #{@short} normal"
         end
@@ -246,14 +245,14 @@ describe "Filters" do
 
   it 'should be able to filter based on a request param' do
     mock_app do
-      before(:agent => /IE/) { @test = 'before'}
+      before(agent: /IE/) { @test = 'before' }
       get :index do
         @test
       end
     end
     get '/'
     assert_equal '', body
-    get "/", {}, {'HTTP_USER_AGENT' => 'This is IE'}
+    get '/', {}, { 'HTTP_USER_AGENT' => 'This is IE' }
     assert_equal 'before', body
   end
 
@@ -343,7 +342,7 @@ describe "Filters" do
         doodle = 'Been after'
       end
       before do
-        raise StandardError, "before"
+        raise StandardError, 'before'
       end
       get :index do
         doodle = 'Been now'
@@ -363,11 +362,11 @@ describe "Filters" do
     mock_app do
       after do
         doodle += ' and after'
-        raise StandardError, "after"
+        raise StandardError, 'after'
       end
       get :foo do
         doodle = 'Been now'
-        raise StandardError, "now"
+        raise StandardError, 'now'
       end
       get :index do
         doodle = 'Been now'
@@ -389,12 +388,12 @@ describe "Filters" do
 
   it 'should trigger filters if superclass responds to :filters' do
     class FilterApp < Padrino::Application
-      before { @foo = "foo" }
+      before { @foo = 'foo' }
     end
     mock_app FilterApp do
-      get("/") { @foo }
+      get('/') { @foo }
     end
-    get "/"
-    assert_equal "foo", body
+    get '/'
+    assert_equal 'foo', body
   end
 end

data/test/test_flash.rb

@@ -1,13 +1,13 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
 describe Padrino::Flash do
   describe 'storage' do
     before do
       @storage = Padrino::Flash::Storage.new(
-        :success => 'Success msg',
-        :error   => 'Error msg',
-        :notice  => 'Notice msg',
-        :custom  => 'Custom msg'
+        success: 'Success msg',
+        error: 'Error msg',
+        notice: 'Notice msg',
+        custom: 'Custom msg'
       )
       @storage[:one] = 'One msg'
       @storage[:two] = 'Two msg'
@@ -68,12 +68,12 @@ describe Padrino::Flash do
 
   routes = proc do
     get :index do
-      params[:key] ? flash[params[:key].to_sym].to_s : flash.now.inspect
+      params[:key] ? flash[params[:key].to_sym].to_s : flash.now.to_json
     end
 
     post :index do
-      params.each { |k,v| flash[k.to_sym] = v.to_s }
-      flash.next.inspect
+      params.each { |k, v| flash[k.to_sym] = v.to_s }
+      flash.next.to_json
     end
 
     get :session do
@@ -81,7 +81,7 @@ describe Padrino::Flash do
     end
 
     get :redirect do
-      redirect url(:index, :key => :foo), 301, :foo => 'redirected!'
+      redirect url(:index, key: :foo), 301, foo: 'redirected!'
     end
 
     get :success do
@@ -106,8 +106,8 @@ describe Padrino::Flash do
     end
 
     it 'should set a flash' do
-      post '/', :foo => :bar
-      assert_equal '{:foo=>"bar"}', body
+      post '/', foo: :bar
+      assert_equal '{"foo":"bar"}', body
     end
   end
 
@@ -128,13 +128,13 @@ describe Padrino::Flash do
     end
 
     it 'should set a flash' do
-      post '/', :foo => :bar
-      assert_equal '{:foo=>"bar"}', body
+      post '/', foo: :bar
+      assert_equal '{"foo":"bar"}', body
     end
 
     it 'should get a flash' do
-      post '/', :foo => :bar
-      get  '/', :key => :foo
+      post '/', foo: :bar
+      get  '/', key: :foo
       assert_equal 'bar', body
       post '/'
       assert_equal '{}', body
@@ -149,19 +149,19 @@ describe Padrino::Flash do
 
     it 'should set success' do
       get '/success'
-      get '/', :key => :success
+      get '/', key: :success
       assert_equal 'Yup', body
     end
 
     it 'should set error' do
       get '/error'
-      get '/', :key => :error
+      get '/', key: :error
       assert_equal 'Arg', body
     end
 
     it 'should set notice' do
       get '/notice'
-      get '/', :key => :notice
+      get '/', key: :notice
       assert_equal 'Mmm', body
     end
   end

data/test/test_locale.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Locales" do
+describe 'Locales' do
   Dir[File.expand_path('../lib/padrino-core/locale/*.yml', __dir__)].each do |file|
     base_original = YAML.load_file(file)
     name = File.basename(file, '.yml')