padrino-core 0.16.0.pre4 → 0.16.0

data/test/test_params_protection.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Padrino::ParamsProtection" do
+describe 'Padrino::ParamsProtection' do
   before do
     @teri = { 'name' => 'Teri Bauer', 'position' => 'baby' }
     @kim = { 'name' => 'Kim Bauer', 'position' => 'daughter', 'child' => @teri }
@@ -12,36 +12,36 @@ describe "Padrino::ParamsProtection" do
   it 'should drop all parameters except allowed ones' do
     result = nil
     mock_app do
-      post :basic, :params => [ :name ] do
+      post :basic, params: [:name] do
         result = params
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post "/basic?#{@jack_query}"
     assert_equal({ 'name' => @jack['name'] }, result)
   end
 
   it 'should preserve original params' do
     result = nil
     mock_app do
-      post :basic, :params => [ :name ] do
+      post :basic, params: [:name] do
         result = original_params
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post "/basic?#{@jack_query}"
     assert_equal(@jack, result)
   end
 
   it 'should work with recursive data' do
     result = nil
     mock_app do
-      post :basic, :params => [ :name, {:child => [ :name, {:child => [ :name ]} ]} ] do
+      post :basic, params: [:name, { child: [:name, { child: [:name] }] }] do
         result = [params, original_params]
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post "/basic?#{@jack_query}"
     assert_equal(
       [
         { 'name' => @jack['name'], 'child' => { 'name' => @kim['name'], 'child' => { 'name' => @teri['name'] } } },
@@ -54,93 +54,93 @@ describe "Padrino::ParamsProtection" do
   it 'should be able to process the data' do
     result = nil
     mock_app do
-      post :basic, :params => [ :name, {:position => proc{ |v| 'anti-'+v }} ] do
+      post :basic, params: [:name, { position: proc { |v| "anti-#{v}" } }] do
         result = params
         ''
       end
     end
-    post '/basic?' + @jack_query
+    post "/basic?#{@jack_query}"
     assert_equal({ 'name' => @jack['name'], 'position' => 'anti-terrorist' }, result)
   end
 
   it 'should pass :with parameters' do
     result = nil
     mock_app do
-      post :basic, :with => [:id, :tag], :params => [ :name ] do
+      post :basic, with: %i[id tag], params: [:name] do
         result = params
         ''
       end
     end
-    post '/basic/24/42?' + @jack_query
+    post "/basic/24/42?#{@jack_query}"
     assert_equal({ 'name' => @jack['name'], 'id' => '24', 'tag' => '42' }, result)
   end
 
   it 'should not fail if :with is not an Array' do
     result = nil
     mock_app do
-      post :basic, :with => :id, :params => [ :id ] do
+      post :basic, with: :id, params: [:id] do
         result = params
         ''
       end
     end
-    post '/basic/24?' + @jack_query
+    post "/basic/24?#{@jack_query}"
     assert_equal({ 'id' => '24' }, result)
   end
 
   it 'should understand true or false values' do
     result = nil
     mock_app do
-      get :hide, :with => [ :id ], :params => false do
+      get :hide, with: [:id], params: false do
         result = params
         ''
       end
-      get :show, :with => [ :id ], :params => true do
+      get :show, with: [:id], params: true do
         result = params
         ''
       end
     end
-    get '/hide/1?' + @jack_query
-    assert_equal({"id"=>"1"}, result)
-    get '/show/1?' + @jack_query
-    assert_equal({"id"=>"1"}.merge(@jack), result)
+    get "/hide/1?#{@jack_query}"
+    assert_equal({ 'id' => '1' }, result)
+    get "/show/1?#{@jack_query}"
+    assert_equal({ 'id' => '1' }.merge(@jack), result)
   end
 
   it 'should be configurable with controller options' do
     result = nil
     mock_app do
-      controller :persons, :params => [ :name ] do
-        post :create, :params => [ :name, :position ] do
+      controller :persons, params: [:name] do
+        post :create, params: %i[name position] do
           result = params
           ''
         end
-        post :update, :with => [ :id ] do
+        post :update, with: [:id] do
           result = params
           ''
         end
-        post :delete, :params => true do
+        post :delete, params: true do
           result = params
           ''
         end
-        post :destroy, :with => [ :id ], :params => false do
+        post :destroy, with: [:id], params: false do
           result = params
           ''
         end
       end
-      controller :noparam, :params => false do
+      controller :noparam, params: false do
         get :index do
           result = params
           ''
         end
       end
     end
-    post '/persons/create?' + @jack_query
+    post "/persons/create?#{@jack_query}"
     assert_equal({ 'name' => @jack['name'], 'position' => 'terrorist' }, result)
     post '/persons/update/1?name=Chloe+O\'Brian&position=hacker'
     assert_equal({ 'id' => '1', 'name' => 'Chloe O\'Brian' }, result)
-    post '/persons/delete?' + @jack_query
+    post "/persons/delete?#{@jack_query}"
     assert_equal(@jack, result)
-    post '/persons/destroy/1?' + @jack_query
-    assert_equal({"id"=>"1"}, result)
+    post "/persons/destroy/1?#{@jack_query}"
+    assert_equal({ 'id' => '1' }, result)
     get '/noparam?a=1;b=2'
     assert_empty(result)
   end
@@ -148,43 +148,43 @@ describe "Padrino::ParamsProtection" do
   it 'should successfully filter hashes' do
     result = nil
     mock_app do
-      post :family, :params => [ :persons => [ :name ] ] do
+      post :family, params: [persons: [:name]] do
         result = params
         ''
       end
     end
-    post '/family?' + Padrino::Utils.build_uri_query(@family)
-    assert_equal({"persons" => {"3" => {"name" => @jack["name"]}, "2" => {"name" => @kim["name"]}, "1" => {"name" => @teri["name"]}}}, result)
+    post "/family?#{Padrino::Utils.build_uri_query(@family)}"
+    assert_equal({ 'persons' => { '3' => { 'name' => @jack['name'] }, '2' => { 'name' => @kim['name'] }, '1' => { 'name' => @teri['name'] } } }, result)
   end
 
   it 'should pass arrays' do
     result = nil
     mock_app do
-      post :family, :params => [ :names => [] ] do
+      post :family, params: [names: []] do
         result = params
         ''
       end
     end
-    post '/family?' + Padrino::Utils.build_uri_query(:names => %w[Jack Kim Teri])
-    assert_equal({"names" => %w[Jack Kim Teri]}, result)
+    post "/family?#{Padrino::Utils.build_uri_query(names: %w[Jack Kim Teri])}"
+    assert_equal({ 'names' => %w[Jack Kim Teri] }, result)
   end
 
   it 'should tolerate weird inflections' do
     result = nil
     mock_app do
-      post :i, :params => [ :gotta => [ :what ] ] do
+      post :i, params: [gotta: [:what]] do
         result = params
         ''
       end
     end
-    post '/i?' + Padrino::Utils.build_uri_query(:gotta => { :what => 'go', :who => 'self' })
-    assert_equal({"gotta" => {"what" => "go"}}, result)
+    post "/i?#{Padrino::Utils.build_uri_query(gotta: { what: 'go', who: 'self' })}"
+    assert_equal({ 'gotta' => { 'what' => 'go' } }, result)
   end
 
   it 'should drop the key if the data type does not match route configuration' do
     result = nil
     mock_app do
-      post :i, :params => [ :gotta => [ :what ] ] do
+      post :i, params: [gotta: [:what]] do
         result = params
         ''
       end

data/test/test_reloader_complex.rb

@@ -1,18 +1,17 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/complex')
-
-describe "ComplexReloader" do
+require_relative 'helper'
+require_relative 'fixtures/apps/complex'
 
+describe 'ComplexReloader' do
   describe 'for complex reload functionality' do
     before do
       Padrino.clear!
-      Padrino.mount("complex_1_demo").to("/complex_1_demo")
-      Padrino.mount("complex_2_demo").to("/complex_2_demo")
+      Padrino.mount('complex_1_demo').to('/complex_1_demo')
+      Padrino.mount('complex_2_demo').to('/complex_2_demo')
     end
 
     it 'should correctly instantiate Complex(1-2)Demo fixture' do
-      assert_equal ["/complex_1_demo", "/complex_2_demo"], Padrino.mounted_apps.map(&:uri_root)
-      assert_equal ["complex_1_demo", "complex_2_demo"], Padrino.mounted_apps.map(&:name)
+      assert_equal ['/complex_1_demo', '/complex_2_demo'], Padrino.mounted_apps.map(&:uri_root)
+      assert_equal %w[complex_1_demo complex_2_demo], Padrino.mounted_apps.map(&:name)
       assert Complex1Demo.reload?
       assert Complex2Demo.reload?
       assert_match %r{fixtures/apps/complex.rb}, Complex1Demo.app_file
@@ -23,51 +22,52 @@ describe "ComplexReloader" do
       assert_match %r{fixtures/apps/complex.rb}, Complex1Demo.app_file
       @app = Padrino.application
 
-      get "/"
+      get '/'
       assert_equal 404, status
 
-      get "/complex_1_demo"
+      get '/complex_1_demo'
       assert_equal "Given random #{LibDemo.give_me_a_random}", body
 
-      get "/complex_2_demo"
+      get '/complex_2_demo'
       assert_equal 200, status
 
-      get "/complex_1_demo/old"
+      get '/complex_1_demo/old'
       assert_equal 200, status
 
-      get "/complex_2_demo/old"
+      get '/complex_2_demo/old'
       assert_equal 200, status
 
-      get "/complex_2_demo/var/destroy"
+      get '/complex_2_demo/var/destroy'
       assert_equal '{}', body
 
       new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(Complex1Demo.app_file)
       new_buffer = buffer.sub(/The magick number is: \d+!/, new_phrase)
-      new_buffer.sub!(/get\(:destroy\)/, 'get(:destroy, :with => :id)')
+      new_buffer.sub!(/get\(:destroy\)/, 'get(:destroy, with: :id)')
+
       begin
-        File.open(Complex1Demo.app_file, "w") { |f| f.write(new_buffer) }
-        Time.stub(:now, Time.now + 2) { get "/complex_2_demo" }
+        File.open(Complex1Demo.app_file, 'w') { |f| f.write(new_buffer) }
+        Time.stub(:now, Time.now + 2) { get '/complex_2_demo' }
         assert_equal new_phrase, body
 
         # Re-Check that we didn't forget any route
-        get "/complex_1_demo"
+        get '/complex_1_demo'
         assert_equal "Given random #{LibDemo.give_me_a_random}", body
 
-        get "/complex_2_demo"
+        get '/complex_2_demo'
         assert_equal 200, status
 
-        get "/complex_1_demo/old"
+        get '/complex_1_demo/old'
         assert_equal 200, status
 
-        get "/complex_2_demo/old"
+        get '/complex_2_demo/old'
         assert_equal 200, status
 
-        get "/complex_2_demo/var/destroy/variable"
+        get '/complex_2_demo/var/destroy/variable'
         assert_equal '{"id":"variable"}', body
       ensure
         # Now we need to prevent to commit a new changed file so we revert it
-        File.open(Complex1Demo.app_file, "w") { |f| f.write(buffer) }
+        File.open(Complex1Demo.app_file, 'w') { |f| f.write(buffer) }
       end
     end
   end

data/test/test_reloader_external.rb

@@ -1,21 +1,21 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/reloadable_apps/main/app')
+require_relative 'helper'
+require_relative 'fixtures/reloadable_apps/main/app'
 
-describe "ExternalReloader" do
-  describe "for external app" do
+describe 'ExternalReloader' do
+  describe 'for external app' do
     before do
       Padrino.clear!
-      Padrino.mount("ReloadableApp::External").to("/reloadable/external")
-      Padrino.mount("ReloadableApp::Main").to("/reloadable")
+      Padrino.mount('ReloadableApp::External').to('/reloadable/external')
+      Padrino.mount('ReloadableApp::Main').to('/reloadable')
       Padrino.load!
     end
 
-    it "should avoid reloading the file if its path is not started with Padrino.root" do
+    it 'should avoid reloading the file if its path is not started with Padrino.root' do
       @app = Padrino.application
-      Padrino.stub(:root, File.expand_path(File.dirname(__FILE__) + '/fixtures/reloadable_apps/main')) do
-        get "/reloadable/external/base"
+      Padrino.stub(:root, File.expand_path("#{__dir__}/fixtures/reloadable_apps/main")) do
+        get '/reloadable/external/base'
       end
-      assert_equal "Hello External App", body
+      assert_equal 'Hello External App', body
     end
   end
 end

data/test/test_reloader_simple.rb

@@ -1,20 +1,20 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-require File.expand_path(File.dirname(__FILE__) + '/fixtures/apps/simple')
-
-describe "SimpleReloader" do
+require_relative 'helper'
+require_relative 'fixtures/apps/simple'
 
+describe 'SimpleReloader' do
   describe 'for simple reset functionality' do
-
     it 'should reset routes' do
       mock_app do
         (1..10).each do |i|
           get("/#{i}") { "Foo #{i}" }
         end
       end
+
       (1..10).each do |i|
         get "/#{i}"
         assert_equal "Foo #{i}", body
       end
+
       @app.reset_routes!
       (1..10).each do |i|
         get "/#{i}"
@@ -25,72 +25,75 @@ describe "SimpleReloader" do
     it 'should keep sinatra routes on development' do
       mock_app do
         set :environment, :development
-        get("/"){ "ok" }
+        get('/') { 'ok' }
       end
+
       assert_equal :development, @app.environment
-      get "/"
+      get '/'
       assert_equal 200, status
-      get "/__sinatra__/404.png"
+      get '/__sinatra__/404.png'
       assert_equal 200, status
-      assert_match(/image\/png/, response["Content-Type"])
+      assert_match(%r{image/png}, response['Content-Type'])
       @app.reset_routes!
-      get "/"
+      get '/'
       assert_equal 404, status
-      get "/__sinatra__/404.png"
+      get '/__sinatra__/404.png'
       assert_equal 200, status
-      assert_match(/image\/png/, response["Content-Type"])
+      assert_match(%r{image/png}, response['Content-Type'])
     end
   end
 
   describe 'for simple reload functionality' do
     before do
       Padrino.clear!
-      Padrino.mount("simple_demo").to("/")
+      Padrino.mount('simple_demo').to('/')
       Padrino.reload!
     end
 
     it 'should correctly instantiate SimpleDemo fixture' do
-      assert_equal ["simple_demo"], Padrino.mounted_apps.map(&:name)
+      assert_equal ['simple_demo'], Padrino.mounted_apps.map(&:name)
       assert SimpleDemo.reload?
       assert_match %r{fixtures/apps/simple.rb}, SimpleDemo.app_file
     end
 
     it 'should correctly reload SimpleDemo fixture' do
       @app = SimpleDemo
-      get "/"
+      get '/'
       assert ok?
       new_phrase = "The magick number is: #{rand(2**255)}!"
       buffer     = File.read(SimpleDemo.app_file)
       new_buffer = buffer.sub(/The magick number is: \d+!/, new_phrase)
+
       begin
-        File.open(SimpleDemo.app_file, "w") { |f| f.write(new_buffer) }
-        Time.stub(:now, Time.now + 2) { get "/" }
+        File.open(SimpleDemo.app_file, 'w') { |f| f.write(new_buffer) }
+        Time.stub(:now, Time.now + 2) { get '/' }
         assert_equal new_phrase, body
       ensure
-        File.open(SimpleDemo.app_file, "w") { |f| f.write(buffer) }
+        File.open(SimpleDemo.app_file, 'w') { |f| f.write(buffer) }
         Padrino.reload!
       end
     end
 
     it 'should correctly reset SimpleDemo fixture' do
       @app = SimpleDemo
-      get "/"
+      get '/'
       @app.reload!
-      get "/rand"
+      get '/rand'
       assert ok?
       last_body = body
       assert_equal 1, @app.filters[:before].size
-      assert_equal 0, @app.errors.reject{ |key, _| [404, Sinatra::NotFound].include? key }.size
+      assert_equal 0, @app.errors.reject { |key, _| [404, Sinatra::NotFound].include? key }.size
       assert_equal 2, @app.filters[:after].size # app + content-type + padrino-flash
       assert_equal 0, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" + GET+HEAD of "/rand" = 4
       assert_equal 4, @app.extensions.size # [Padrino::ApplicationSetup, Padrino::ParamsProtection, Padrino::Routing, Padrino::Flash]
       assert_equal 0, @app.templates.size
+
       @app.reload!
-      get "/rand"
+      get '/rand'
       refute_equal last_body, body
       assert_equal 1, @app.filters[:before].size
-      assert_equal 0, @app.errors.reject{ |key, _| [404, Sinatra::NotFound].include? key }.size
+      assert_equal 0, @app.errors.reject { |key, _| [404, Sinatra::NotFound].include? key }.size
       assert_equal 2, @app.filters[:after].size
       assert_equal 0, @app.middleware.size
       assert_equal 4, @app.routes.size # GET+HEAD of "/" = 2

data/test/test_reloader_storage.rb

@@ -1,7 +1,7 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
+require_relative 'helper'
 
-describe "Padrino::Reloader::Storage" do
-  describe "#classes" do
+describe 'Padrino::Reloader::Storage' do
+  describe '#classes' do
     it 'should take an snapshot of the current loaded classes' do
       snapshot = Padrino::Reloader::Storage.send(:object_classes)
       assert_equal snapshot.include?(Padrino::Logger), true
@@ -9,25 +9,22 @@ describe "Padrino::Reloader::Storage" do
 
     it 'should return a Set object' do
       snapshot = Padrino::Reloader::Storage.send(:object_classes)
-      assert_equal snapshot.kind_of?(Set), true
+      assert_equal snapshot.is_a?(Set), true
     end
 
     it 'should be able to process a the class name given a block' do
       klasses = Padrino::Reloader::Storage.send(:object_classes) do |klass|
         next unless klass.respond_to?(:name) # fix JRuby < 1.7.22
-        if klass.name =~ /^Padrino::/
-          klass
-        end
+
+        klass if klass.name =~ /^Padrino::/
       end
 
       assert_equal (klasses.size > 1), true
-      klasses.each do |klass|
-        assert_match(/^Padrino::/, klass.to_s)
-      end
+      klasses.each { |klass| assert_match(/^Padrino::/, klass.to_s) }
     end
   end
 
-  describe "#new_classes" do
+  describe '#new_classes' do
     before do
       @snapshot = Padrino::Reloader::Storage.send(:object_classes)
     end
@@ -46,7 +43,7 @@ describe "Padrino::Reloader::Storage" do
 
     it 'should return a Set object' do
       new_classes = Padrino::Reloader::Storage.send(:new_classes, @snapshot)
-      assert_equal new_classes.kind_of?(Set), true
+      assert_equal new_classes.is_a?(Set), true
     end
   end
 end