padrino-core 0.16.0.pre4 → 0.16.0

data/test/test_core.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Core" do
+describe 'Core' do
   def setup
     Padrino.clear!
   end
@@ -19,7 +19,7 @@ describe "Core" do
 
     it 'should validate global helpers' do
       assert_equal :test, Padrino.env
-      assert_match(/\/test/, Padrino.root)
+      assert_match(%r{/test}, Padrino.root)
       assert Padrino.version
     end
 
@@ -38,25 +38,25 @@ describe "Core" do
     end
 
     it 'should add middlewares in front if specified' do
-      test = Class.new {
+      test = Class.new do
         def initialize(app)
           @app = app
         end
 
         def call(env)
           status, headers, body = @app.call(env)
-          headers["Middleware-Called"] = "yes"
+          headers['Middleware-Called'] = 'yes'
           [status, headers, body]
         end
-      }
+      end
 
       class Foo < Padrino::Application; end
 
       Padrino.use(test)
-      Padrino.mount(Foo).to("/")
+      Padrino.mount(Foo).to('/')
 
-      res = Rack::MockRequest.new(Padrino.application).get("/")
-      assert_equal "yes", res["Middleware-Called"]
+      res = Rack::MockRequest.new(Padrino.application).get('/')
+      assert_equal 'yes', res['Middleware-Called']
     end
 
     it 'should properly set default options' do
@@ -75,13 +75,13 @@ describe "Core" do
     it 'should return a friendly 500' do
       mock_app do
         enable :show_exceptions
-        get(:index){ raise StandardError }
+        get(:index) { raise StandardError }
       end
 
-      get "/"
+      get '/'
       assert_equal 500, status
-      assert_includes body, "StandardError"
-      assert_includes body, "<code>show_exceptions</code> setting"
+      assert_includes body, 'StandardError'
+      assert_includes body, '<code>show_exceptions</code> setting'
     end
   end
 end

data/test/test_csrf_protection.rb

@@ -1,206 +1,210 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Application" do
+describe 'Application' do
   before { Padrino.clear! }
 
   describe 'CSRF protection' do
-    describe "with CSRF protection on" do
+    describe 'with CSRF protection on' do
       before do
-        @token = begin
-                   Rack::Protection::AuthenticityToken.random_token
-                 rescue StandardError
-                   "a_token"
-                 end
+        @token =
+          begin
+            Rack::Protection::AuthenticityToken.random_token
+          rescue StandardError
+            'a_token'
+          end
+
         mock_app do
           enable :sessions
           enable :protect_from_csrf
-          post('/'){ 'HI' }
+          post('/') { 'HI' }
         end
       end
 
       it 'should not allow requests without tokens' do
-        post "/"
+        post '/'
         assert_equal 403, status
       end
 
       it 'should allow requests with correct tokens' do
-        post "/", {"authenticity_token" => @token}, 'rack.session' => {:csrf => @token}
+        post '/', { 'authenticity_token' => @token }, 'rack.session' => { csrf: @token }
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect tokens' do
-        post "/", {"authenticity_token" => "b"}, 'rack.session' => {:csrf => @token}
+        post '/', { 'authenticity_token' => 'b' }, 'rack.session' => { csrf: @token }
         assert_equal 403, status
       end
 
       it 'should allow requests with correct X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => @token
+        post '/', {}, 'rack.session' => { csrf: @token }, 'HTTP_X_CSRF_TOKEN' => @token
         assert_equal 200, status
       end
 
       it 'should not allow requests with incorrect X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => @token}, 'HTTP_X_CSRF_TOKEN' => "b"
+        post '/', {}, 'rack.session' => { csrf: @token }, 'HTTP_X_CSRF_TOKEN' => 'b'
         assert_equal 403, status
       end
     end
 
-    describe "without CSRF protection on" do
+    describe 'without CSRF protection on' do
       before do
         mock_app do
           enable :sessions
           disable :protect_from_csrf
-          post('/'){ 'HI' }
+          post('/') { 'HI' }
         end
       end
 
       it 'should allows requests without tokens' do
-        post "/"
+        post '/'
         assert_equal 200, status
       end
 
       it 'should allow requests with correct tokens' do
-        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "a"}
+        post '/', { 'authenticity_token' => 'a' }, 'rack.session' => { csrf: 'a' }
         assert_equal 200, status
       end
 
       it 'should allow requests with incorrect tokens' do
-        post "/", {"authenticity_token" => "a"}, 'rack.session' => {:csrf => "b"}
+        post '/', { 'authenticity_token' => 'a' }, 'rack.session' => { csrf: 'b' }
         assert_equal 200, status
       end
 
       it 'should allow requests with correct X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "a"
+        post '/', {}, 'rack.session' => { csrf: 'a' }, 'HTTP_X_CSRF_TOKEN' => 'a'
         assert_equal 200, status
       end
 
       it 'should allow requests with incorrect X-CSRF-TOKEN' do
-        post "/", {}, 'rack.session' => {:csrf => "a"}, 'HTTP_X_CSRF_TOKEN' => "b"
+        post '/', {}, 'rack.session' => { csrf: 'a' }, 'HTTP_X_CSRF_TOKEN' => 'b'
         assert_equal 200, status
       end
     end
 
-    describe "with optional CSRF protection" do
+    describe 'with optional CSRF protection' do
       before do
         mock_app do
           enable :sessions
           enable :protect_from_csrf
           enable :allow_disabled_csrf
           post('/on') { 'HI' }
-          post('/off', :csrf_protection => false) { 'HI' }
+          post('/off', csrf_protection: false) { 'HI' }
         end
       end
 
       it 'should allow access to routes with csrf_protection off' do
-        post "/off"
+        post '/off'
         assert_equal 200, status
       end
 
       it 'should not allow access to routes with csrf_protection on' do
-        post "/on"
+        post '/on'
         assert_equal 403, status
         assert_equal 'Forbidden', body
       end
     end
 
-    describe "with :except option that is using Proc" do
+    describe 'with :except option that is using Proc' do
       before do
         mock_app do
           enable :sessions
-          set :protect_from_csrf, :except => proc{|env| ["/", "/foo"].any?{|path| path == env['PATH_INFO'] }}
-          post("/") { "Hello" }
-          post("/foo") { "Hello, foo" }
-          post("/bar") { "Hello, bar" }
+          set :protect_from_csrf, except: proc { |env| ['/', '/foo'].any? { |path| path == env['PATH_INFO'] } }
+          post('/') { 'Hello' }
+          post('/foo') { 'Hello, foo' }
+          post('/bar') { 'Hello, bar' }
         end
       end
 
       it 'should allow ignoring CSRF protection on specific routes' do
-        post "/"
+        post '/'
         assert_equal 200, status
-        post "/foo"
+        post '/foo'
         assert_equal 200, status
-        post "/bar"
+        post '/bar'
         assert_equal 403, status
       end
     end
 
-    describe "with :except option that is using String and Regexp" do
+    describe 'with :except option that is using String and Regexp' do
       before do
         mock_app do
           enable :sessions
-          set :protect_from_csrf, :except => ["/a", %r{^/a.c$}]
-          post("/a") { "a" }
-          post("/abc") { "abc" }
-          post("/foo") { "foo" }
+          set :protect_from_csrf, except: ['/a', %r{^/a.c$}]
+          post('/a') { 'a' }
+          post('/abc') { 'abc' }
+          post('/foo') { 'foo' }
         end
       end
 
       it 'should allow ignoring CSRF protection on specific routes' do
-        post "/a"
+        post '/a'
         assert_equal 200, status
-        post "/abc"
+        post '/abc'
         assert_equal 200, status
-        post "/foo"
+        post '/foo'
         assert_equal 403, status
       end
     end
 
-    describe "with custom protection options" do
+    describe 'with custom protection options' do
       before do
-        @token = begin
-                   Rack::Protection::AuthenticityToken.random_token
-                 rescue StandardError
-                   "a_token"
-                 end
+        @token =
+          begin
+            Rack::Protection::AuthenticityToken.random_token
+          rescue StandardError
+            'a_token'
+          end
+
         mock_app do
           enable :sessions
-          set :protect_from_csrf, :authenticity_param => 'foobar', :message => 'sucker!'
-          post("/a") { "a" }
+          set :protect_from_csrf, authenticity_param: 'foobar', message: 'sucker!'
+          post('/a') { 'a' }
         end
       end
 
       it 'should allow configuring protection options' do
-        post "/a", {"foobar" => @token}, 'rack.session' => {:csrf => @token}
+        post '/a', { 'foobar' => @token }, 'rack.session' => { csrf: @token }
         assert_equal 200, status
       end
 
       it 'should allow configuring message' do
-        post "/a"
+        post '/a'
         assert_equal 403, status
         assert_equal 'sucker!', body
       end
     end
 
-    describe "with middleware" do
+    describe 'with middleware' do
       before do
         class Middleware < Sinatra::Base
-          post("/middleware") { "Hello, middleware" }
-          post("/dummy") { "Hello, dummy" }
+          post('/middleware') { 'Hello, middleware' }
+          post('/dummy') { 'Hello, dummy' }
         end
         mock_app do
           enable :sessions
-          set :protect_from_csrf, :except => proc{|env| ["/", "/middleware"].any?{|path| path == env['PATH_INFO'] }}
+          set :protect_from_csrf, except: proc { |env| ['/', '/middleware'].any? { |path| path == env['PATH_INFO'] } }
           use Middleware
-          post("/") { "Hello" }
+          post('/') { 'Hello' }
         end
       end
 
       it 'should allow ignoring CSRF protection on specific routes of middleware' do
-        post "/"
+        post '/'
         assert_equal 200, status
-        post "/middleware"
+        post '/middleware'
         assert_equal 200, status
-        post "/dummy"
+        post '/dummy'
         assert_equal 403, status
       end
     end
 
-    describe "with standard report layout" do
+    describe 'with standard report layout' do
       before do
         mock_app do
           enable :sessions
-          set :protect_from_csrf, :message => 'sucker!'
+          set :protect_from_csrf, message: 'sucker!'
           enable :report_csrf_failure
-          post("/a") { "a" }
+          post('/a') { 'a' }
           error 403 do
             halt 406, 'please, do not hack'
           end
@@ -208,7 +212,7 @@ describe "Application" do
       end
 
       it 'should allow configuring protection options' do
-        post "/a"
+        post '/a'
         assert_equal 406, status
         assert_equal 'please, do not hack', body
       end

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