sinatra-contrib 1.4.2 → 1.4.4

data/spec/capture_spec.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-require 'backports'
 require 'slim'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::Capture do
   subject do
@@ -42,6 +41,10 @@ describe Sinatra::Capture do
     it "handles utf-8 encoding" do
       render(:erb, "utf_8").should == "UTF-8 –"
     end
+
+    it "handles ISO-8859-1 encoding" do
+      render(:erb, "iso_8859_1").should == "ISO-8859-1 -"
+    end if RUBY_VERSION >= '1.9'
   end
 end
 
@@ -91,3 +94,7 @@ Hello #{a.strip}
 @@ utf_8
 <% a = capture do %>–<% end %>
 UTF-8 <%= a %>
+
+@@ iso_8859_1
+<% a = capture do %>-<% end %>
+ISO-8859-1 <%= a.force_encoding("iso-8859-1") %>

data/spec/config_file_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::ConfigFile do
   def config_file(*args, &block)

data/spec/content_for_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::ContentFor do
   subject do

data/spec/cookies_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::Cookies do
   def cookie_route(*cookies, &block)
@@ -9,7 +8,7 @@ describe Sinatra::Cookies do
       result = instance_eval(&block)
       "ok"
     end
-    get '/'
+    get '/', {}, @headers || {}
     last_response.should be_ok
     body.should be == "ok"
     result
@@ -33,7 +32,7 @@ describe Sinatra::Cookies do
     it 'runs the block' do
       ran = false
       cookie_route { ran = true }
-      ran.should be_true
+      ran.should be true
     end
 
     it 'returns the block result' do
@@ -97,6 +96,14 @@ describe Sinatra::Cookies do
       end.should include('HttpOnly')
     end
 
+    it 'sets domain to nil if localhost' do
+      @headers = {'HTTP_HOST' => 'localhost'}
+      cookie_route do
+        cookies['foo'] = 'bar'
+        response['Set-Cookie']
+      end.should_not include("domain")
+    end
+
     it 'sets the domain' do
       cookie_route do
         cookies['foo'] = 'bar'
@@ -275,7 +282,7 @@ describe Sinatra::Cookies do
         cookies.each do |key, value|
           key.should   == 'foo'
           value.should == 'baz'
-          seen.should  == false
+          seen.should == false
           seen = true
         end
       end
@@ -435,7 +442,7 @@ describe Sinatra::Cookies do
       cookie_route do
         cookies['foo'] = 'bar'
         cookies.empty?
-      end.should be_false
+      end.should be false
     end
 
     it 'becomes true if response cookies are removed' do
@@ -443,14 +450,14 @@ describe Sinatra::Cookies do
         cookies['foo'] = 'bar'
         cookies.delete :foo
         cookies.empty?
-      end.should be_true
+      end.should be true
     end
 
     it 'becomes true if request cookies are removed' do
       cookie_route('foo=bar') do
         cookies.delete :foo
         cookies.empty?
-      end.should be_true
+      end.should be_truthy
     end
 
     it 'becomes true after clear' do
@@ -458,7 +465,7 @@ describe Sinatra::Cookies do
         cookies['foo'] = 'bar'
         cookies.clear
         cookies.empty?
-      end.should be_true
+      end.should be_truthy
     end
   end
 
@@ -595,19 +602,19 @@ describe Sinatra::Cookies do
 
   describe :key? do
     it 'checks request cookies' do
-      cookies('foo=bar').key?('foo').should be_true
+      cookies('foo=bar').key?('foo').should be true
     end
 
     it 'checks response cookies' do
       jar = cookies
       jar['foo'] = 'bar'
-      jar.key?(:foo).should be_true
+      jar.key?(:foo).should be true
     end
 
     it 'does not use deleted cookies' do
       jar = cookies('foo=bar')
       jar.delete :foo
-      jar.key?('foo').should be_false
+      jar.key?('foo').should be false
     end
   end
 
@@ -622,19 +629,19 @@ describe Sinatra::Cookies do
 
   describe :member? do
     it 'checks request cookies' do
-      cookies('foo=bar').member?('foo').should be_true
+      cookies('foo=bar').member?('foo').should be true
     end
 
     it 'checks response cookies' do
       jar = cookies
       jar['foo'] = 'bar'
-      jar.member?(:foo).should be_true
+      jar.member?(:foo).should be true
     end
 
     it 'does not use deleted cookies' do
       jar = cookies('foo=bar')
       jar.delete :foo
-      jar.member?('foo').should be_false
+      jar.member?('foo').should be false
     end
   end
 
@@ -776,19 +783,19 @@ describe Sinatra::Cookies do
 
   describe :value? do
     it 'checks request cookies' do
-      cookies('foo=bar').value?('bar').should be_true
+      cookies('foo=bar').value?('bar').should be true
     end
 
     it 'checks response cookies' do
       jar = cookies
       jar[:foo] = 'bar'
-      jar.value?('bar').should be_true
+      jar.value?('bar').should be true
     end
 
     it 'does not use deleted cookies' do
       jar = cookies('foo=bar')
       jar.delete :foo
-      jar.value?('bar').should_not be_true
+      jar.value?('bar').should be false
     end
   end
 

data/spec/custom_logger_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'sinatra/custom_logger'
+
+describe Sinatra::CustomLogger do
+  before do
+    rack_logger = @rack_logger = double
+    mock_app do
+      helpers Sinatra::CustomLogger
+
+      before do
+        env['rack.logger'] = rack_logger
+      end
+
+      get '/' do
+        logger.info 'Logged message'
+        'Response'
+      end
+    end
+  end
+
+  describe '#logger' do
+    it 'falls back to request.logger' do
+      expect(@rack_logger).to receive(:info).with('Logged message')
+      get '/'
+    end
+
+    context 'logger setting is set' do
+      before do
+        custom_logger = @custom_logger = double
+        @app.class_eval do
+          configure do
+            set :logger, custom_logger
+          end
+        end
+      end
+
+      it 'calls custom logger' do
+        expect(@custom_logger).to receive(:info).with('Logged message')
+        get '/'
+      end
+    end
+  end
+end

data/spec/decompile_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 RSpec::Matchers.define :decompile do |path|
   match do |app|

data/spec/extension_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::Extension do
   module ExampleExtension
@@ -24,7 +23,7 @@ describe Sinatra::Extension do
   before { mock_app { register ExampleExtension }}
 
   it('allows using set') { settings.foo.should == :bar }
-  it('implements configure') { settings.reload_stuff.should be_false }
+  it('implements configure') { settings.reload_stuff.should be false }
 
   it 'allows defing routes' do
     get('/').should be_ok

data/spec/json_spec.rb

@@ -1,8 +1,7 @@
-require 'backports'
 require 'multi_json'
 
-require_relative 'spec_helper'
-require_relative 'okjson'
+require 'spec_helper'
+require 'okjson'
 
 shared_examples_for "a json encoder" do |lib, const|
   before do

data/spec/link_header_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::LinkHeader do
   before do

data/spec/multi_route_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::MultiRoute do
 

data/spec/namespace_spec.rb

@@ -1,5 +1,4 @@
-require 'backports'
-require_relative 'spec_helper'
+require 'spec_helper'
 
 describe Sinatra::Namespace do
   verbs = [:get, :head, :post, :put, :delete, :options]
@@ -44,7 +43,7 @@ describe Sinatra::Namespace do
         it 'accepts the path as a regular expression' do
           namespace('/foo') { send(verb, /\/\d\d/) { 'bar' }}
           send(verb, '/foo/12').should be_ok
-          body.should == 'bar' unless verb == :head
+          body.should eq 'bar' unless verb == :head
           send(verb, '/foo/123').should_not be_ok
         end
       end
@@ -119,14 +118,14 @@ describe Sinatra::Namespace do
           ran = false
           namespace('/foo') { before { ran = true }}
           send(verb, '/foo')
-          ran.should be_true
+          ran.should be true
         end
 
         specify 'are not triggered for a different namespace' do
           ran = false
           namespace('/foo') { before { ran = true }}
           send(verb, '/fox')
-          ran.should be_false
+          ran.should be false
         end
       end
 
@@ -135,14 +134,14 @@ describe Sinatra::Namespace do
           ran = false
           namespace('/foo') { after { ran = true }}
           send(verb, '/foo')
-          ran.should be_true
+          ran.should be true
         end
 
         specify 'are not triggered for a different namespace' do
           ran = false
           namespace('/foo') { after { ran = true }}
           send(verb, '/fox')
-          ran.should be_false
+          ran.should be false
         end
       end
 
@@ -177,13 +176,13 @@ describe Sinatra::Namespace do
               send(verb, '/*') { 'ok' }
             end
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.org', 'HTTP_ACCEPT' => 'text/plain')
-            ran.should be_false
+            ran.should be false
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/html')
-            ran.should be_false
+            ran.should be false
             send(verb, '/bar', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-            ran.should be_false
+            ran.should be false
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-            ran.should be_true
+            ran.should be true
           end
 
           specify 'are accepted in the after-filter' do
@@ -193,13 +192,13 @@ describe Sinatra::Namespace do
               send(verb, '/*') { 'ok' }
             end
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.org', 'HTTP_ACCEPT' => 'text/plain')
-            ran.should be_false
+            ran.should be false
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/html')
-            ran.should be_false
+            ran.should be false
             send(verb, '/bar', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-            ran.should be_false
+            ran.should be false
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-            ran.should be_true
+            ran.should be true
           end
         end
 
@@ -232,9 +231,9 @@ describe Sinatra::Namespace do
               send(verb) { 'ok' }
             end
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.org')
-            ran.should be_false
+            ran.should be false
             send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com')
-            ran.should be_true
+            ran.should be true
           end
 
           specify 'are accepted in the route definition' do
@@ -253,11 +252,11 @@ describe Sinatra::Namespace do
                 send(verb) { 'ok' }
               end
               send(verb, '/', {}, 'HTTP_HOST' => 'example.org', 'HTTP_ACCEPT' => 'text/plain')
-              ran.should be_false
+              ran.should be false
               send(verb, '/', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/html')
-              ran.should be_false
+              ran.should be false
               send(verb, '/', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-              ran.should be_true
+              ran.should be true
             end
 
             specify 'are accepted in the filters' do
@@ -267,13 +266,13 @@ describe Sinatra::Namespace do
                 send(verb, '/*') { 'ok' }
               end
               send(verb, '/foo', {}, 'HTTP_HOST' => 'example.org', 'HTTP_ACCEPT' => 'text/plain')
-              ran.should be_false
+              ran.should be false
               send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/html')
-              ran.should be_false
+              ran.should be false
               send(verb, '/far', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-              ran.should be_false
+              ran.should be false
               send(verb, '/foo', {}, 'HTTP_HOST' => 'example.com', 'HTTP_ACCEPT' => 'text/plain')
-              ran.should be_true
+              ran.should be true
             end
           end
         end
@@ -479,24 +478,24 @@ describe Sinatra::Namespace do
           namespace('/de') do
             not_found { 'nicht gefunden' }
           end
-          send(verb, '/foo').status.should == 404
-          last_response.body.should_not    == 'nicht gefunden' unless verb == :head
-          get('/en/foo').status.should     == 404
-          last_response.body.should_not    == 'nicht gefunden' unless verb == :head
-          get('/de/foo').status.should     == 404
-          last_response.body.should        == 'nicht gefunden' unless verb == :head
+          send(verb, '/foo').status.should eq 404
+          last_response.body.should_not    eq 'nicht gefunden' unless verb == :head
+          get('/en/foo').status.should     eq 404
+          last_response.body.should_not    eq 'nicht gefunden' unless verb == :head
+          get('/de/foo').status.should     eq 404
+          last_response.body.should        eq 'nicht gefunden' unless verb == :head
         end
 
         it 'can be customized for specific error codes' do
           namespace('/de') do
             error(404) { 'nicht gefunden' }
           end
-          send(verb, '/foo').status.should == 404
-          last_response.body.should_not    == 'nicht gefunden' unless verb == :head
-          get('/en/foo').status.should     == 404
-          last_response.body.should_not    == 'nicht gefunden' unless verb == :head
-          get('/de/foo').status.should     == 404
-          last_response.body.should        == 'nicht gefunden' unless verb == :head
+          send(verb, '/foo').status.should eq 404
+          last_response.body.should_not    eq 'nicht gefunden' unless verb == :head
+          get('/en/foo').status.should     eq 404
+          last_response.body.should_not    eq 'nicht gefunden' unless verb == :head
+          get('/de/foo').status.should     eq 404
+          last_response.body.should        eq 'nicht gefunden' unless verb == :head
         end
 
         it 'falls back to the handler defined in the base app' do
@@ -508,12 +507,12 @@ describe Sinatra::Namespace do
               error(404) { 'nicht gefunden' }
             end
           end
-          send(verb, '/foo').status.should == 404
-          last_response.body.should        == 'not found...' unless verb == :head
-          get('/en/foo').status.should     == 404
-          last_response.body.should        == 'not found...' unless verb == :head
-          get('/de/foo').status.should     == 404
-          last_response.body.should        == 'nicht gefunden' unless verb == :head
+          send(verb, '/foo').status.should eq 404
+          last_response.body.should        eq 'not found...' unless verb == :head
+          get('/en/foo').status.should     eq 404
+          last_response.body.should        eq 'not found...' unless verb == :head
+          get('/de/foo').status.should     eq 404
+          last_response.body.should        eq 'nicht gefunden' unless verb == :head
         end
 
         it 'can be customized for specific Exception classes' do
@@ -543,10 +542,28 @@ describe Sinatra::Namespace do
               end
             end
           end
-          get('/en/foo').status.should     == 401
-          last_response.body.should        == 'auth failed' unless verb == :head
-          get('/de/foo').status.should     == 406
-          last_response.body.should        == 'methode nicht erlaubt' unless verb == :head
+          get('/en/foo').status.should     eq 401
+          last_response.body.should        eq 'auth failed' unless verb == :head
+          get('/de/foo').status.should     eq 406
+          last_response.body.should        eq 'methode nicht erlaubt' unless verb == :head
+        end
+
+        it "allows custom error handlers when namespace is declared as /en/:id. Issue #119" do
+          mock_app {
+            class CError < StandardError;
+            end
+
+            error { raise "should not come here" }
+
+            namespace('/en/:id') do
+              error(CError) { 201 }
+              get '/?' do
+                raise CError
+              end
+            end
+          }
+
+          get('/en/1').status.should == 201
         end
       end
 
@@ -561,8 +578,8 @@ describe Sinatra::Namespace do
               end
             end
 
-            send(verb, '/').body.should == 'hi'
-            send(verb, '/foo').body.should == 'hi'
+            send(verb, '/').body.should eq 'hi'
+            send(verb, '/foo').body.should eq 'hi'
           end
 
           specify 'can be nested' do
@@ -575,8 +592,8 @@ describe Sinatra::Namespace do
               end
             end
 
-            send(verb, '/').body.should == 'hi'
-            send(verb, '/foo').body.should == 'ho'
+            send(verb, '/').body.should eq 'hi'
+            send(verb, '/foo').body.should eq 'ho'
           end
 
           specify 'can use a custom views directory' do
@@ -589,8 +606,8 @@ describe Sinatra::Namespace do
               end
             end
 
-            send(verb, '/').body.should == "hi\n"
-            send(verb, '/foo').body.should == "ho\n"
+            send(verb, '/').body.should eq "hi\n"
+            send(verb, '/foo').body.should eq "ho\n"
           end
 
           specify 'default to the base app\'s layout' do
@@ -604,8 +621,8 @@ describe Sinatra::Namespace do
               end
             end
 
-            send(verb, '/').body.should == 'he said: hi'
-            send(verb, '/foo').body.should == 'he said: ho'
+            send(verb, '/').body.should eq 'he said: hi'
+            send(verb, '/foo').body.should eq 'he said: ho'
           end
 
           specify 'can define nested layouts' do
@@ -619,8 +636,8 @@ describe Sinatra::Namespace do
               end
             end
 
-            send(verb, '/').body.should == 'Hello World!'
-            send(verb, '/foo').body.should == 'Hi World!'
+            send(verb, '/').body.should eq 'Hello World!'
+            send(verb, '/foo').body.should eq 'Hi World!'
           end
         end
       end
@@ -634,7 +651,7 @@ describe Sinatra::Namespace do
               value = foo
             end
           end
-          value.should == 42
+          value.should eq 42
         end
 
         specify 'can be registered within a namespace' do
@@ -647,8 +664,8 @@ describe Sinatra::Namespace do
             end
             b = views
           end
-          a.should == 'CUSTOM!!!'
-          b.should_not == 'CUSTOM!!!'
+          a.should eq 'CUSTOM!!!'
+          b.should_not eq 'CUSTOM!!!'
         end
 
         specify 'trigger the route_added hook' do
@@ -664,7 +681,7 @@ describe Sinatra::Namespace do
             end
             get('/bar') { }
           end
-          route[1].should == '/foo'
+          route[1].should eq '/foo'
         end
 
         specify 'prevent app-global settings from being changed' do
@@ -673,4 +690,52 @@ describe Sinatra::Namespace do
       end
     end
   end
+
+  describe 'settings' do
+    it 'provides access to top-level settings' do
+      mock_app do
+        set :foo, 'ok'
+
+        namespace '/foo' do
+          get '/bar' do
+            settings.foo
+          end
+        end
+      end
+
+      get('/foo/bar').status.should == 200
+      last_response.body.should == 'ok'
+    end
+
+    it 'uses some repro' do
+      mock_app do
+        set :foo, 42
+
+        namespace '/foo' do
+          get '/bar' do
+            #settings.respond_to?(:foo).to_s
+            settings.foo.to_s
+          end
+        end
+      end
+
+      get('/foo/bar').status.should == 200
+      last_response.body.should == '42'
+    end
+
+    it 'allows checking setting existance with respond_to?' do
+      mock_app do
+        set :foo, 42
+
+        namespace '/foo' do
+          get '/bar' do
+            settings.respond_to?(:foo).to_s
+          end
+        end
+      end
+
+      get('/foo/bar').status.should == 200
+      last_response.body.should == 'true'
+    end
+  end
 end