padrino-core 0.16.0.pre4 → 0.16.0

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
@@ -26,7 +26,7 @@ describe "Filters" do
     assert ok?
     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,7 +105,7 @@ 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.to_json
       end
@@ -116,7 +116,7 @@ describe "Filters" do
 
   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'
@@ -72,7 +72,7 @@ describe Padrino::Flash do
     end
 
     post :index do
-      params.each { |k,v| flash[k.to_sym] = v.to_s }
+      params.each { |k, v| flash[k.to_sym] = v.to_s }
       flash.next.to_json
     end
 
@@ -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,7 +106,7 @@ describe Padrino::Flash do
     end
 
     it 'should set a flash' do
-      post '/', :foo => :bar
+      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
+      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')

data/test/test_logger.rb

@@ -1,9 +1,9 @@
-#coding:utf-8
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+# coding:utf-8
+require_relative 'helper'
 require 'logger'
 require 'tempfile'
 
-describe "PadrinoLogger" do
+describe 'PadrinoLogger' do
   before do
     @save_config = Padrino::Logger::Config[:test].dup
     Padrino::Logger::Config[:test][:stream] = :null
@@ -15,9 +15,9 @@ describe "PadrinoLogger" do
     Padrino::Logger.setup!
   end
 
-  def setup_logger(options={})
+  def setup_logger(options = {})
     @log    = StringIO.new
-    @logger = Padrino::Logger.new(options.merge(:stream => @log))
+    @logger = Padrino::Logger.new(options.merge(stream: @log))
   end
 
   describe 'for logger functionality' do
@@ -63,27 +63,27 @@ describe "PadrinoLogger" do
     end
 
     it 'should log something' do
-      setup_logger(:log_level => :error)
-      @logger.error "You log this error?"
+      setup_logger(log_level: :error)
+      @logger.error 'You log this error?'
       assert_match(/You log this error?/, @log.string)
       @logger.debug "You don't log this error!"
       refute_match(/You don't log this error!/, @log.string)
-      @logger << "Yep this can be logged"
+      @logger << 'Yep this can be logged'
       assert_match(/Yep this can be logged/, @log.string)
     end
 
     it 'should respond to #write for Rack::CommonLogger' do
-      setup_logger(:log_level => :error)
-      @logger.error "Error message"
+      setup_logger(log_level: :error)
+      @logger.error 'Error message'
       assert_match(/Error message/, @log.string)
-      @logger << "logged anyways"
+      @logger << 'logged anyways'
       assert_match(/logged anyways/, @log.string)
-      @logger.write "log via alias"
+      @logger.write 'log via alias'
       assert_match(/log via alias/, @log.string)
     end
 
     it 'should not blow up on mixed or broken encodings' do
-      setup_logger(:log_level => :error, :auto_flush => false)
+      setup_logger(log_level: :error, auto_flush: false)
       binary_data = "\xD0".force_encoding('BINARY')
       utf8_data = 'фыв'
       @logger.error binary_data
@@ -95,7 +95,7 @@ describe "PadrinoLogger" do
 
     it 'should sanitize mixed or broken encodings if said so' do
       encoding = 'windows-1251'
-      setup_logger(:log_level => :error, :auto_flush => false, :sanitize_encoding => encoding)
+      setup_logger(log_level: :error, auto_flush: false, sanitize_encoding: encoding)
       @log.string.encode! encoding
       binary_data = "\xD0".force_encoding('BINARY')
       utf8_data = 'фыв'
@@ -108,71 +108,71 @@ describe "PadrinoLogger" do
     it 'should log an application' do
       mock_app do
         enable :logging
-        get("/"){ "Foo" }
+        get('/') { 'Foo' }
       end
-      get "/"
-      assert_equal "Foo", body
+      get '/'
+      assert_equal 'Foo', body
       assert_match(/GET/, Padrino.logger.log.string)
     end
 
     it 'should log an application\'s status code' do
       mock_app do
         enable :logging
-        get("/"){ "Foo" }
+        get('/') { 'Foo' }
       end
-      get "/"
+      get '/'
       assert_match(/\e\[1;9m200\e\[0m OK/, Padrino.logger.log.string)
     end
 
-    describe "static asset logging" do
+    describe 'static asset logging' do
       it 'should not log static assets by default' do
         mock_app do
           enable :logging
-          get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" }
+          get('/images/something.png') { env['sinatra.static_file'] = '/public/images/something.png'; 'Foo' }
         end
-        get "/images/something.png"
-        assert_equal "Foo", body
-        assert_match "", Padrino.logger.log.string
+        get '/images/something.png'
+        assert_equal 'Foo', body
+        assert_match '', Padrino.logger.log.string
       end
 
       it 'should allow turning on static assets logging' do
-        Padrino.logger.instance_eval{ @log_static = true }
+        Padrino.logger.instance_eval { @log_static = true }
         mock_app do
           enable :logging
-          get("/images/something.png"){ env["sinatra.static_file"] = '/public/images/something.png'; "Foo" }
+          get('/images/something.png') { env['sinatra.static_file'] = '/public/images/something.png'; 'Foo' }
         end
-        get "/images/something.png"
-        assert_equal "Foo", body
+        get '/images/something.png'
+        assert_equal 'Foo', body
         assert_match(/GET/, Padrino.logger.log.string)
-        Padrino.logger.instance_eval{ @log_static = false }
+        Padrino.logger.instance_eval { @log_static = false }
       end
     end
 
-    describe "health-check requests logging" do
+    describe 'health-check requests logging' do
       def access_to_mock_app
         mock_app do
           enable :logging
-          get("/"){ "Foo" }
+          get('/') { 'Foo' }
         end
-        get "/"
+        get '/'
       end
 
       it 'should output under debug level' do
-        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:debug] }
+        Padrino.logger.instance_eval { @level = Padrino::Logger::Levels[:debug] }
         access_to_mock_app
         assert_match(/\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string)
 
-        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:devel] }
+        Padrino.logger.instance_eval { @level = Padrino::Logger::Levels[:devel] }
         access_to_mock_app
         assert_match(/\e\[0;36m  DEBUG\e\[0m/, Padrino.logger.log.string)
       end
 
       it 'should not output over debug level' do
-        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:info] }
+        Padrino.logger.instance_eval { @level = Padrino::Logger::Levels[:info] }
         access_to_mock_app
         assert_equal '', Padrino.logger.log.string
 
-        Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:error] }
+        Padrino.logger.instance_eval { @level = Padrino::Logger::Levels[:error] }
         access_to_mock_app
         assert_equal '', Padrino.logger.log.string
       end
@@ -180,13 +180,15 @@ describe "PadrinoLogger" do
   end
 end
 
-describe "alternate logger" do
+describe 'alternate logger' do
   class FancyLogger
     attr_accessor :level, :log
+
     def initialize(buf)
       self.log = buf
       self.level = 0
     end
+
     def add(level, text)
       self.log << text
     end
@@ -205,7 +207,7 @@ describe "alternate logger" do
   end
 
   it 'should annotate the logger to support additional Padrino fancyness' do
-    Padrino.logger.debug("Debug message")
+    Padrino.logger.debug('Debug message')
     assert_match(/Debug message/, @log.string)
     Padrino.logger.exception(Exception.new('scary message'))
     assert_match(/Exception - scary message/, @log.string)
@@ -216,22 +218,20 @@ describe "alternate logger" do
 
     mock_app do
       enable :logging
-      get("/"){ "Foo" }
+      get('/') { 'Foo' }
     end
-    get "/"
+    get '/'
 
     assert_match(/\e\[1;9m200\e\[0m OK/, @log.string)
   end
 end
 
-describe "binary logger" do
+describe 'binary logger' do
   before do
     @save_logger = Padrino.logger
     @log = StringIO.new
     new_logger = Logger.new(@log)
-    new_logger.formatter = proc do |_, _, _, message|
-      "#{message.size}"
-    end
+    new_logger.formatter = proc { |_, _, _, message| message.size.to_s }
     capture_io { Padrino.logger = new_logger }
   end
 
@@ -240,12 +240,12 @@ describe "binary logger" do
   end
 
   it 'should not convert parameters to strings before formatting' do
-    logger.info({:a => 2})
-    assert_equal "1", @log.string
+    logger.info({ a: 2 })
+    assert_equal '1', @log.string
   end
 end
 
-describe "alternate logger: stdlib logger" do
+describe 'alternate logger: stdlib logger' do
   before do
     @log = StringIO.new
     @save_logger = Padrino.logger
@@ -259,7 +259,7 @@ describe "alternate logger: stdlib logger" do
   end
 
   it 'should annotate the logger to support additional Padrino fancyness' do
-    Padrino.logger.debug("Debug message")
+    Padrino.logger.debug('Debug message')
     assert_match(/Debug message/, @log.string)
   end
 
@@ -268,21 +268,21 @@ describe "alternate logger: stdlib logger" do
 
     mock_app do
       enable :logging
-      get("/"){ "Foo" }
+      get('/') { 'Foo' }
     end
-    get "/"
+    get '/'
 
     assert_match(/\e\[1;9m200\e\[0m OK/, @log.string)
   end
 end
 
-describe "options :colorize_logging" do
+describe 'options :colorize_logging' do
   def access_to_mock_app
     mock_app do
       enable :logging
-      get("/"){ "Foo" }
+      get('/') { 'Foo' }
     end
-    get "/"
+    get '/'
   end
 
   before do
@@ -321,46 +321,46 @@ describe "options :colorize_logging" do
   end
 end
 
-describe "options :source_location" do
+describe 'options :source_location' do
   before do
     Padrino::Logger::Config[:test][:source_location] = true
     Padrino::Logger.setup!
   end
 
-  def stub_root(base_path = File.expand_path("."), &block)
-    callable = proc{ |*args| File.join(base_path, *args) }
+  def stub_root(base_path = File.expand_path('.'), &block)
+    callable = proc { |*args| File.join(base_path, *args) }
     Padrino.stub(:root, callable, &block)
   end
 
   it 'should output source_location if :source_location is set to true' do
-    stub_root { Padrino.logger.debug("hello world") }
+    stub_root { Padrino.logger.debug('hello world') }
     assert_match(/hello world/, Padrino.logger.log.string)
   end
 
   it 'should output source_location if file path is relative' do
     stub_message = "test/test_logger.rb:269:in `test'"
-    Padrino::Logger.logger.stub(:caller, [stub_message]){ stub_root { Padrino.logger.debug("hello relative path") }}
-    assert_match(/\[test\/test_logger\.rb:269\] hello relative path/, Padrino.logger.log.string)
+    Padrino::Logger.logger.stub(:caller, [stub_message]) { stub_root { Padrino.logger.debug('hello relative path') } }
+    assert_match(%r{\[test/test_logger\.rb:269\] hello relative path}, Padrino.logger.log.string)
   end
 
   it 'should not output source_location if :source_location is set to false' do
     Padrino::Logger::Config[:test][:source_location] = false
     Padrino::Logger.setup!
-    stub_root { Padrino.logger.debug("hello world") }
+    stub_root { Padrino.logger.debug('hello world') }
     assert_match(/hello world/, Padrino.logger.log.string)
     refute_match(/\[.+?\] hello world/, Padrino.logger.log.string)
   end
 
   it 'should not output source_location unless file path is not started with Padrino.root' do
-    stub_root("/unknown/path/") { Padrino.logger.debug("hello boy") }
+    stub_root('/unknown/path/') { Padrino.logger.debug('hello boy') }
     assert_match(/hello boy/, Padrino.logger.log.string)
     refute_match(/\[.+?\] hello boy/, Padrino.logger.log.string)
   end
 
   it 'should not output source_location if source file path is started with Padrino.root + vendor' do
-    base_path = File.expand_path(File.dirname(__FILE__) + '/fixtures/')
-    stub_message = File.expand_path(File.dirname(__FILE__) + '/fixtures/vendor/logger.rb') + ":291:in `test'"
-    Padrino::Logger.logger.stub(:caller, [stub_message]) { stub_root(base_path) { Padrino.logger.debug("hello vendor") } }
+    base_path = File.expand_path("#{__dir__}/fixtures/")
+    stub_message = "#{File.expand_path("#{__dir__}/fixtures/vendor/logger.rb")}:291:in `test'"
+    Padrino::Logger.logger.stub(:caller, [stub_message]) { stub_root(base_path) { Padrino.logger.debug('hello vendor') } }
     assert_match(/hello vendor/, Padrino.logger.log.string)
     refute_match(/\[.+?\] hello vendor/, Padrino.logger.log.string)
   end