sinatra 1.4.4 → 1.4.5

data/lib/sinatra/version.rb

@@ -1,3 +1,3 @@
 module Sinatra
-  VERSION = '1.4.4'
+  VERSION = '1.4.5'
 end

data/sinatra.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new 'sinatra', Sinatra::VERSION do |s|
   s.authors           = ["Blake Mizerany", "Ryan Tomayko", "Simon Rozet", "Konstantin Haase"]
   s.email             = "sinatrarb@googlegroups.com"
   s.homepage          = "http://www.sinatrarb.com/"
+  s.license           = 'MIT'
   s.files             = `git ls-files`.split("\n") - %w[.gitignore .travis.yml]
   s.test_files        = s.files.select { |p| p =~ /^test\/.*_test.rb/ }
   s.extra_rdoc_files  = s.files.select { |p| p =~ /^README/ } << 'LICENSE'

data/test/asciidoctor_test.rb

@@ -0,0 +1,72 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+  require 'asciidoctor'
+
+  class AsciidoctorTest < Test::Unit::TestCase
+    def asciidoc_app(&block)
+      mock_app do
+        set :views, File.dirname(__FILE__) + '/views'
+        get('/', &block)
+      end
+      get '/'
+    end
+
+    it 'renders inline AsciiDoc strings' do
+      asciidoc_app { asciidoc '== Hiya' }
+      assert ok?
+      assert_match %r{<h2.*?>Hiya</h2>}, body
+    end
+
+    it 'uses the correct engine' do
+      engine = Tilt::AsciidoctorTemplate
+      assert_equal engine, Tilt[:ad]
+      assert_equal engine, Tilt[:adoc]
+      assert_equal engine, Tilt[:asciidoc]
+    end
+
+    it 'renders .asciidoc files in views path' do
+      asciidoc_app { asciidoc :hello }
+      assert ok?
+      assert_match %r{<h2.*?>Hello from AsciiDoc</h2>}, body
+    end
+
+    it 'raises error if template not found' do
+      mock_app { get('/') { asciidoc :no_such_template } }
+      assert_raise(Errno::ENOENT) { get('/') }
+    end
+
+    it 'renders with inline layouts' do
+      mock_app do
+        layout { 'THIS. IS. #{yield.upcase}!' }
+        get('/') { asciidoc 'Sparta', :layout_engine => :str }
+      end
+      get '/'
+      assert ok?
+      assert_include body, 'THIS. IS.'
+      assert_include body, '<P>SPARTA</P>'
+    end
+
+    it 'renders with file layouts' do
+      asciidoc_app do
+        asciidoc 'Hello World', :layout => :layout2, :layout_engine => :erb
+      end
+      assert ok?
+      assert_include body, 'ERB Layout!'
+      assert_include body, '<p>Hello World</p>'
+    end
+
+    it 'can be used in a nested fashion for partials and whatnot' do
+      mock_app do
+        template(:inner) { 'hi' }
+        template(:outer) { '<outer><%= asciidoc :inner %></outer>' }
+        get('/') { erb :outer }
+      end
+      get '/'
+      assert ok?
+      assert_match %r{<outer>.*<p.*?>hi</p>.*</outer>}m, body
+    end
+  end
+rescue LoadError
+  warn "#{$!.to_s}: skipping asciidoc tests"
+end

data/test/helpers_test.rb

@@ -334,13 +334,13 @@ class HelpersTest < Test::Unit::TestCase
     it 'should not reset the content-type to html for error handlers' do
       mock_app do
         disable :raise_errors
-        before    { content_type "application/json;charset=utf-8" }
+        before    { content_type "application/json" }
         not_found { JSON.dump("error" => "Not Found") }
       end
 
       get '/'
       assert_equal 404, status
-      assert_equal 'application/json;charset=utf-8', response.content_type
+      assert_equal 'application/json', response.content_type
     end
 
     it 'should not invoke error handler when halting with 500 inside an error handler' do
@@ -665,7 +665,7 @@ class HelpersTest < Test::Unit::TestCase
           assert_equal content_type(:xml),    'application/xml;charset=utf-8'
           assert_equal content_type(:xhtml),  'application/xhtml+xml;charset=utf-8'
           assert_equal content_type(:js),     'application/javascript;charset=utf-8'
-          assert_equal content_type(:json),   'application/json;charset=utf-8'
+          assert_equal content_type(:json),   'application/json'
           assert_equal content_type(:bar),    'application/bar'
           assert_equal content_type(:png),    'image/png'
           assert_equal content_type(:baz),    'application/baz;charset=utf-8'

data/test/mediawiki_test.rb

@@ -0,0 +1,68 @@
+require File.expand_path('../helper', __FILE__)
+
+begin
+  require 'wikicloth'
+
+  class MediaWikiTest < Test::Unit::TestCase
+    def mediawiki_app(&block)
+      mock_app do
+        set :views, File.dirname(__FILE__) + '/views'
+        get('/', &block)
+      end
+      get '/'
+    end
+
+    it 'supports both .mw and .mediawiki extensions' do
+      assert_equal Tilt[:mw], Tilt[:mediawiki]
+    end
+
+    it 'renders inline mediawiki strings' do
+      mediawiki_app { mediawiki "''Hiya''" }
+      assert ok?
+      assert_include body, '<i>Hiya</i>'
+    end
+
+    it 'renders .mediawiki files in views path' do
+      mediawiki_app { mediawiki :hello }
+      assert ok?
+      assert_include body, "<i>Hello from MediaWiki</i>"
+    end
+
+    it 'raises error if template not found' do
+      mock_app { get('/') { mediawiki :no_such_template } }
+      assert_raise(Errno::ENOENT) { get('/') }
+    end
+
+    it 'renders with inline layouts' do
+      mock_app do
+        layout { 'THIS. IS. #{yield.upcase}!' }
+        get('/') { mediawiki 'Sparta', :layout_engine => :str }
+      end
+      get '/'
+      assert ok?
+      assert_like 'THIS. IS. <P>SPARTA</P>!', body
+    end
+
+    it 'renders with file layouts' do
+      mediawiki_app do
+        mediawiki 'Hello World', :layout => :layout2, :layout_engine => :erb
+      end
+      assert ok?
+      assert_body "ERB Layout!\n<p>Hello World</p>"
+    end
+
+    it 'can be used in a nested fashion for partials and whatnot' do
+      mock_app do
+        template(:inner) { "hi" }
+        template(:outer) { "<outer><%= mediawiki :inner %></outer>" }
+        get('/') { erb :outer }
+      end
+
+      get '/'
+      assert ok?
+      assert_like '<outer><p>hi</p></outer>', body
+    end
+  end
+rescue LoadError
+  warn "#{$!.to_s}: skipping mediawiki tests"
+end

data/test/request_test.rb

@@ -89,4 +89,9 @@ class RequestTest < Test::Unit::TestCase
     assert request.accept?('text/html')
     assert_equal '*/*', request.preferred_type.to_s
   end
+
+  it 'will not accept types not specified in HTTP_ACCEPT when HTTP_ACCEPT is provided' do
+    request = Sinatra::Request.new 'HTTP_ACCEPT' => 'application/json'
+    assert !request.accept?('text/html')
+  end
 end

data/test/routing_test.rb

@@ -90,7 +90,10 @@ class RoutingTest < Test::Unit::TestCase
   end
 
   it "it handles encoded slashes correctly" do
-    mock_app { get("/:a") { |a| a } }
+    mock_app {
+      set :protection, :except => :path_traversal
+      get("/:a") { |a| a }
+    }
     get '/foo%2Fbar'
     assert_equal 200, status
     assert_body "foo/bar"

data/test/sass_test.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
 begin
-raise LoadError, 'sass not supported on Ruby 2.0' if RUBY_VERSION >= '2.0'
 require 'sass'
 
 class SassTest < Test::Unit::TestCase

data/test/scss_test.rb

@@ -1,7 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
 begin
-raise LoadError, 'sass not supported on Ruby 2.0' if RUBY_VERSION >= '2.0'
 require 'sass'
 
 class ScssTest < Test::Unit::TestCase

data/test/static_test.rb

@@ -18,7 +18,7 @@ class StaticTest < Test::Unit::TestCase
 
   it 'produces a body that can be iterated over multiple times' do
     env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    status, headers, body = @app.call(env)
+    _, _, body = @app.call(env)
     buf1, buf2 = [], []
     body.each { |part| buf1 << part }
     body.each { |part| buf2 << part }
@@ -28,7 +28,7 @@ class StaticTest < Test::Unit::TestCase
 
   it 'sets the sinatra.static_file env variable if served' do
     env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    status, headers, body = @app.call(env)
+    @app.call(env)
     assert_equal File.expand_path(__FILE__), env['sinatra.static_file']
   end
 
@@ -192,7 +192,7 @@ class StaticTest < Test::Unit::TestCase
 
   it 'does not include static cache control headers by default' do
     env = Rack::MockRequest.env_for("/#{File.basename(__FILE__)}")
-    status, headers, body = @app.call(env)
+    _, headers, _ = @app.call(env)
     assert !headers.has_key?('Cache-Control')
   end
 
@@ -216,4 +216,21 @@ class StaticTest < Test::Unit::TestCase
     )
   end
 
-end
+  it 'renders static assets with custom status via options' do
+    mock_app do
+      set :static, true
+      set :public_folder, File.dirname(__FILE__)
+
+      post '/*' do
+        static!(:status => params[:status])
+      end
+    end
+
+    post "/#{File.basename(__FILE__)}?status=422"
+    assert_equal response.status, 422
+    assert_equal File.read(__FILE__), body
+    assert_equal File.size(__FILE__).to_s, response['Content-Length']
+    assert response.headers.include?('Last-Modified')
+  end
+
+end

data/test/views/hello.asciidoc

@@ -0,0 +1 @@
+== Hello from AsciiDoc

data/test/views/hello.mediawiki

@@ -0,0 +1 @@
+''Hello from MediaWiki''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Blake Mizerany
@@ -11,54 +11,54 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.4
 - !ruby/object:Gem::Dependency
   name: rack-protection
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 description: Sinatra is a DSL for quickly creating web applications in Ruby with minimal
@@ -71,7 +71,7 @@ extra_rdoc_files:
 - README.es.md
 - README.fr.md
 - README.hu.md
-- README.jp.md
+- README.ja.md
 - README.ko.md
 - README.md
 - README.pt-br.md
@@ -80,7 +80,7 @@ extra_rdoc_files:
 - README.zh.md
 - LICENSE
 files:
-- .yardopts
+- ".yardopts"
 - AUTHORS
 - CHANGES
 - Gemfile
@@ -89,7 +89,7 @@ files:
 - README.es.md
 - README.fr.md
 - README.hu.md
-- README.jp.md
+- README.ja.md
 - README.ko.md
 - README.md
 - README.pt-br.md
@@ -108,6 +108,7 @@ files:
 - lib/sinatra/show_exceptions.rb
 - lib/sinatra/version.rb
 - sinatra.gemspec
+- test/asciidoctor_test.rb
 - test/base_test.rb
 - test/builder_test.rb
 - test/coffee_test.rb
@@ -130,6 +131,7 @@ files:
 - test/mapped_error_test.rb
 - test/markaby_test.rb
 - test/markdown_test.rb
+- test/mediawiki_test.rb
 - test/middleware_test.rb
 - test/nokogiri_test.rb
 - test/public/favicon.ico
@@ -164,6 +166,7 @@ files:
 - test/views/error.sass
 - test/views/explicitly_nested.str
 - test/views/foo/hello.test
+- test/views/hello.asciidoc
 - test/views/hello.builder
 - test/views/hello.coffee
 - test/views/hello.creole
@@ -173,6 +176,7 @@ files:
 - test/views/hello.liquid
 - test/views/hello.mab
 - test/views/hello.md
+- test/views/hello.mediawiki
 - test/views/hello.nokogiri
 - test/views/hello.rabl
 - test/views/hello.radius
@@ -203,36 +207,38 @@ files:
 - test/wlang_test.rb
 - test/yajl_test.rb
 homepage: http://www.sinatrarb.com/
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
-- --title
+- "--line-numbers"
+- "--inline-source"
+- "--title"
 - Sinatra
-- --main
+- "--main"
 - README.rdoc
-- --encoding=UTF-8
+- "--encoding=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Classy web-development dressed in a DSL
 test_files:
+- test/asciidoctor_test.rb
 - test/base_test.rb
 - test/builder_test.rb
 - test/coffee_test.rb
@@ -251,6 +257,7 @@ test_files:
 - test/mapped_error_test.rb
 - test/markaby_test.rb
 - test/markdown_test.rb
+- test/mediawiki_test.rb
 - test/middleware_test.rb
 - test/nokogiri_test.rb
 - test/rabl_test.rb