padrino-core 0.12.0 → 0.12.1

data/test/test_filters.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe "Filters" do
-  should "filters by accept header" do
+  it 'should filters by accept header' do
     mock_app do
       get '/foo', :provides => [:xml, :js] do
         request.env['HTTP_ACCEPT']
@@ -30,7 +30,7 @@ describe "Filters" do
     assert_equal 406, status
   end
 
-  should "allow passing & halting in before filters" do
+  it 'should allow passing & halting in before filters' do
     mock_app do
       controller do
         before { env['QUERY_STRING'] == 'secret' or pass }
@@ -58,7 +58,7 @@ describe "Filters" do
     assert_equal "index", body
   end
 
-  should 'scope filters in the given controller' do
+  it 'should scope filters in the given controller' do
     mock_app do
       before { @global = 'global' }
       after { @global = nil }
@@ -88,7 +88,7 @@ describe "Filters" do
     assert_equal "global", body
   end
 
-  should 'be able to access params in a before filter' do
+  it 'should be able to access params in a before filter' do
     username_from_before_filter = nil
 
     mock_app do
@@ -103,7 +103,7 @@ describe "Filters" do
     assert_equal 'josh', username_from_before_filter
   end
 
-  should "be able to access params normally when a before filter is specified" do
+  it 'should be able to access params normally when a before filter is specified' do
     mock_app do
       before { }
       get :index do
@@ -114,7 +114,7 @@ describe "Filters" do
     assert_equal '{"test"=>"what"}', body
   end
 
-  should "be able to filter based on a path" do
+  it 'should be able to filter based on a path' do
     mock_app do
       before('/') { @test = "#{@test}before"}
       get :index do
@@ -130,7 +130,7 @@ describe "Filters" do
     assert_equal '', body
   end
 
-  should "be able to filter based on a symbol" do
+  it 'should be able to filter based on a symbol' do
     mock_app do
       before(:index) { @test = 'before'}
       get :index do
@@ -146,7 +146,7 @@ describe "Filters" do
     assert_equal '', body
   end
 
-  should "be able to filter based on a symbol for a controller" 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'}
@@ -167,7 +167,7 @@ describe "Filters" do
     assert_equal 'bar response', body
   end
 
-  should "be able to filter based on a symbol or path" do
+  it 'should be able to filter based on a symbol or path' do
     mock_app do
       before(:index, '/main') { @test = 'before'}
       get :index do
@@ -183,7 +183,7 @@ describe "Filters" do
     assert_equal 'before', body
   end
 
-  should "be able to filter based on a symbol or regexp" do
+  it 'should be able to filter based on a symbol or regexp' do
     mock_app do
       before(:index, /main/) { @test = 'before'}
       get :index do
@@ -204,7 +204,7 @@ describe "Filters" do
     assert_equal '', body
   end
 
-  should "be able to filter excluding based on a symbol" do
+  it 'should be able to filter excluding based on a symbol' do
     mock_app do
       before(:except => :index) { @test = 'before'}
       get :index do
@@ -220,7 +220,31 @@ describe "Filters" do
     assert_equal 'before', body
   end
 
-  should "be able to filter based on a request param" 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'}
+        get :test1 do
+          "#{@long} #{@short} normal"
+        end
+        get :test2 do
+          "#{@long} #{@short} normal"
+        end
+        get :test3 do
+          "#{@long} #{@short} normal"
+        end
+      end
+    end
+    get '/test/nested/test1'
+    assert_equal '  normal', body
+    get '/test/nested/test2'
+    assert_equal ' short normal', body
+    get '/test/nested/test3'
+    assert_equal 'long short normal', body
+  end
+
+  it 'should be able to filter based on a request param' do
     mock_app do
       before(:agent => /IE/) { @test = 'before'}
       get :index do
@@ -233,7 +257,7 @@ describe "Filters" do
     assert_equal 'before', body
   end
 
-  should "be able to filter based on a symbol or path in multiple controller" do
+  it 'should be able to filter based on a symbol or path in multiple controller' do
     mock_app do
       controllers :foo do
         before(:index, '/foo/main') { @test = 'before' }
@@ -264,7 +288,7 @@ describe "Filters" do
     assert_equal 'also before', body
   end
 
-  should "call before filters even if there was no match" do
+  it 'should call before filters even if there was no match' do
     test = nil
     mock_app do
       before(:index, '/foo') { test = 'before' }
@@ -276,7 +300,7 @@ describe "Filters" do
     assert_equal 'before', test
   end
 
-  should "call before filters only once" do
+  it 'should call before filters only once' do
     once = ''
     mock_app do
       error 500 do
@@ -294,7 +318,7 @@ describe "Filters" do
     assert_equal 'before', once
   end
 
-  should 'catch exceptions in before filters' do
+  it 'should catch exceptions in before filters' do
     doodle = nil
     mock_app do
       after do
@@ -316,7 +340,7 @@ describe "Filters" do
     assert_equal nil, doodle
   end
 
-  should 'catch exceptions in after filters if no exceptions caught before' do
+  it 'should catch exceptions in after filters if no exceptions caught before' do
     doodle = ''
     mock_app do
       after do

data/test/test_flash.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
 describe Padrino::Flash do
-  context 'storage' do
+  describe 'storage' do
     before do
       @storage = Padrino::Flash::Storage.new(
         :success => 'Success msg',
@@ -13,53 +13,53 @@ describe Padrino::Flash do
       @storage[:two] = 'Two msg'
     end
 
-    should 'acts like hash' do
+    it 'should acts like hash' do
       assert_respond_to @storage, :[]
     end
 
-    should 'know its size' do
+    it 'should know its size' do
       assert_equal 4, @storage.length
       assert_equal @storage.length, @storage.size
     end
 
-    should 'sweep its content' do
+    it 'should sweep its content' do
       assert_equal 2, @storage.sweep.size
       assert_empty @storage.sweep
     end
 
-    should 'discard everything' do
+    it 'should discard everything' do
       assert_empty @storage.discard.sweep
     end
 
-    should 'discard specified key' do
+    it 'should discard specified key' do
       assert_equal 1, @storage.discard(:one).sweep.size
     end
 
-    should 'keep everything' do
+    it 'should keep everything' do
       assert_equal 2, @storage.sweep.keep.sweep.size
     end
 
-    should 'keep only specified key' do
+    it 'should keep only specified key' do
       assert_equal 1, @storage.sweep.keep(:one).sweep.size
     end
 
-    should 'not know the values you set right away' do
+    it 'should not know the values you set right away' do
       @storage[:foo] = 'bar'
       assert_nil @storage[:foo]
     end
 
-    should 'knows the values you set next time' do
+    it 'should knows the values you set next time' do
       @storage[:foo] = 'bar'
       @storage.sweep
       assert_equal 'bar', @storage[:foo]
     end
 
-    should 'set values for now' do
+    it 'should set values for now' do
       @storage.now[:foo] = 'bar'
       assert_equal 'bar', @storage[:foo]
     end
 
-    should 'forgets values you set only for now next time' do
+    it 'should forgets values you set only for now next time' do
       @storage.now[:foo] = 'bar'
       @storage.sweep
       assert_nil @storage[:foo]
@@ -97,42 +97,42 @@ describe Padrino::Flash do
     end
   end
 
-  context 'padrino application without sessions' do
+  describe 'padrino application without sessions' do
     before { mock_app(&routes) }
 
-    should 'show nothing' do
+    it 'should show nothing' do
       get '/'
       assert_equal '{}', body
     end
 
-    should 'set a flash' do
+    it 'should set a flash' do
       post '/', :foo => :bar
       assert_equal '{:foo=>"bar"}', body
     end
   end
 
-  context 'padrino application with sessions' do
+  describe 'padrino application with sessions' do
     before do
       mock_app { enable :sessions; class_eval(&routes) }
     end
 
-    should 'be sure have sessions enabled' do
+    it 'should be sure have sessions enabled' do
       assert @app.sessions
       get '/session'
       assert_equal 'true', body
     end
 
-    should 'show nothing' do
+    it 'should show nothing' do
       get '/'
       assert_equal '{}', body
     end
 
-    should 'set a flash' do
+    it 'should set a flash' do
       post '/', :foo => :bar
       assert_equal '{:foo=>"bar"}', body
     end
 
-    should 'get a flash' do
+    it 'should get a flash' do
       post '/', :foo => :bar
       get  '/', :key => :foo
       assert_equal 'bar', body
@@ -140,26 +140,26 @@ describe Padrino::Flash do
       assert_equal '{}', body
     end
 
-    should 'follow redirects with flash' do
+    it 'should follow redirects with flash' do
       get '/redirect'
       follow_redirect!
       assert_equal 'redirected!', body
       assert 301, status
     end
 
-    should 'set success' do
+    it 'should set success' do
       get '/success'
       get '/', :key => :success
       assert_equal 'Yup', body
     end
 
-    should 'set error' do
+    it 'should set error' do
       get '/error'
       get '/', :key => :error
       assert_equal 'Arg', body
     end
 
-    should 'set notice' do
+    it 'should set notice' do
       get '/notice'
       get '/', :key => :notice
       assert_equal 'Mmm', body

data/test/test_locale.rb

@@ -4,7 +4,7 @@ describe "Locales" do
   Dir[File.expand_path("../../lib/padrino-core/locale/*.yml", __FILE__)].each do |file|
     base_original = YAML.load_file(file)
     name = File.basename(file, '.yml')
-    should "should have correct locale for #{name}" do
+    it "should should have correct locale for #{name}" do
       base = base_original[name]['date']['formats']
       assert base['default'].present?
       assert base['short'].present?

data/test/test_logger.rb

@@ -1,5 +1,4 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
-require 'lumberjack'
 require 'logger'
 
 describe "PadrinoLogger" do
@@ -14,21 +13,21 @@ describe "PadrinoLogger" do
     @logger = Padrino::Logger.new(options.merge(:stream => @log))
   end
 
-  context 'for logger functionality' do
+  describe 'for logger functionality' do
 
-    context 'check stream config' do
+    describe 'check stream config' do
 
-      should 'use stdout if stream is nil' do
+      it 'should use stdout if stream is nil' do
         Padrino::Logger::Config[:test][:stream] = nil
         Padrino::Logger.setup!
         assert_equal $stdout, Padrino.logger.log
       end
 
-      should 'use StringIO as default for test' do
+      it 'should use StringIO as default for test' do
         assert_instance_of StringIO, Padrino.logger.log
       end
 
-      should 'use a custom stream' do
+      it 'should use a custom stream' do
         my_stream = StringIO.new
         Padrino::Logger::Config[:test][:stream] = my_stream
         Padrino::Logger.setup!
@@ -36,17 +35,17 @@ describe "PadrinoLogger" do
       end
     end
 
-    should 'log something' do
+    it 'should log something' do
       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!"
-      assert_no_match(/You don't log this error!/, @log.string)
+      refute_match(/You don't log this error!/, @log.string)
       @logger << "Yep this can be logged"
       assert_match(/Yep this can be logged/, @log.string)
     end
 
-    should 'respond to #write for Rack::CommonLogger' do
+    it 'should respond to #write for Rack::CommonLogger' do
       setup_logger(:log_level => :error)
       @logger.error "Error message"
       assert_match /Error message/, @log.string
@@ -56,7 +55,7 @@ describe "PadrinoLogger" do
       assert_match /log via alias/, @log.string
     end
 
-    should 'log an application' do
+    it 'should log an application' do
       mock_app do
         enable :logging
         get("/"){ "Foo" }
@@ -66,7 +65,7 @@ describe "PadrinoLogger" do
       assert_match /GET/, Padrino.logger.log.string
     end
 
-    should 'log an application\'s status code' do
+    it 'should log an application\'s status code' do
       mock_app do
         enable :logging
         get("/"){ "Foo" }
@@ -75,8 +74,8 @@ describe "PadrinoLogger" do
       assert_match /\e\[1m200\e\[0m OK/, Padrino.logger.log.string
     end
 
-    context "static asset logging" do
-      should 'not log static assets by default' 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" }
@@ -86,7 +85,7 @@ describe "PadrinoLogger" do
         assert_match "", Padrino.logger.log.string
       end
 
-      should 'allow turning on static assets logging' do
+      it 'should allow turning on static assets logging' do
         Padrino.logger.instance_eval{ @log_static = true }
         mock_app do
           enable :logging
@@ -99,7 +98,7 @@ describe "PadrinoLogger" do
       end
     end
 
-    context "health-check requests logging" do
+    describe "health-check requests logging" do
       def access_to_mock_app
         mock_app do
           enable :logging
@@ -108,7 +107,7 @@ describe "PadrinoLogger" do
         get "/"
       end
 
-      should 'output under debug level' do
+      it 'should output under debug level' do
         Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:debug] }
         access_to_mock_app
         assert_match /\e\[36m  DEBUG\e\[0m/, Padrino.logger.log.string
@@ -117,7 +116,7 @@ describe "PadrinoLogger" do
         access_to_mock_app
         assert_match /\e\[36m  DEBUG\e\[0m/, Padrino.logger.log.string
       end
-      should 'not output over debug level' do
+      it 'should not output over debug level' do
         Padrino.logger.instance_eval{ @level = Padrino::Logger::Levels[:info] }
         access_to_mock_app
         assert_equal '', Padrino.logger.log.string
@@ -130,19 +129,32 @@ describe "PadrinoLogger" do
   end
 end
 
-describe "alternate logger: Lumberjack" 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
+  end
+
   def setup_logger
     @log = StringIO.new
-    Padrino.logger = Lumberjack::Logger.new(@log, :level => :debug)
+    Padrino.logger = FancyLogger.new(@log)
   end
 
-  should "annotate the logger to support additional Padrino fancyness" do
+  it 'should annotate the logger to support additional Padrino fancyness' do
     setup_logger
     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)
   end
 
-  should "colorize log output after colorize! is called" do
+  it 'should colorize log output after colorize! is called' do
     setup_logger
     Padrino.logger.colorize!
 
@@ -162,13 +174,13 @@ describe "alternate logger: stdlib logger" do
     Padrino.logger = Logger.new(@log)
   end
 
-  should "annotate the logger to support additional Padrino fancyness" do
+  it 'should annotate the logger to support additional Padrino fancyness' do
     setup_logger
     Padrino.logger.debug("Debug message")
     assert_match(/Debug message/, @log.string)
   end
 
-  should "colorize log output after colorize! is called" do
+  it 'should colorize log output after colorize! is called' do
     setup_logger
     Padrino.logger.colorize!
 
@@ -190,16 +202,16 @@ describe "options :colorize_logging" do
     end
     get "/"
   end
-  context 'default' do
-    should 'use colorize logging' do
+  describe 'default' do
+    it 'should use colorize logging' do
       Padrino::Logger.setup!
 
       access_to_mock_app
       assert_match /\e\[1m200\e\[0m OK/, Padrino.logger.log.string
     end
   end
-  context 'set value is false' do
-    should 'not use colorize logging' do
+  describe 'set value is false' do
+    it 'should not use colorize logging' do
       Padrino::Logger::Config[:test][:colorize_logging] = false
       Padrino::Logger.setup!