Update ruby-sinatra package to 1.3.1.

= 1.3.1 / Not Yet Released

 * Support adding more than one callback to the stream object. (Konstantin
   Haase)

= 1.3.0 / 2011-09-30

 * Added `stream` helper method for easily creating streaming APIs, Server
   Sent Events or even WebSockets. See README for more on that topic.
   (Konstantin Haase)

 * If a HTTP 1.1 client is redirected from a different verb than GET, use 303
   instead of 302 by default. You may still pass 302 explicitly. Fixes AJAX
   redirects in Internet Explorer 9 (to be fair, everyone else is doing it
   wrong and IE is behaving correct). (Konstantin Haase)

 * Added support for HTTP PATCH requests. (Konstantin Haase)

 * Use rack-protection to defend against common opportunistic attacks.
   (Josh Lane, Jacob Burkhart, Konstantin Haase)

 * Support for Creole templates, Creole is a standardized wiki markup,
   supported by many wiki implementations. (Konstanin Haase)

 * The `erubis` method has been deprecated. If Erubis is available, Sinatra
   will automatically use it for rendering ERB templates. `require 'erb'`
   explicitly to prevent that behavior. (Magnus Holm, Ryan Tomayko, Konstantin
   Haase)

 * Patterns now match against the escaped URLs rather than the unescaped
   version. This makes Sinatra confirm with RFC 2396 section 2.2 and RFC 2616
   section 3.2.3 (escaped reserved characters should not be treated like the
   unescaped version), meaning that "/:name" will also match `/foo%2Fbar`, but
   not `/foo/bar`. To avoid incompatibility, pattern matching has been
   adjusted. Moreover, since we do no longer need to keep an unescaped version
   of path_info around, we handle all changes to `env['PATH_INFO']` correctly.
   (Konstantin Haase)

 * `settings.app_file` now defaults to the file subclassing `Sinatra::Base` in
   modular applications. (Konstantin Haase)

 * Set up `Rack::Logger` or `Rack::NullLogger` depending on whether logging
   was enabled or not. Also, expose that logger with the `logger` helper
   method. (Konstantin Haase)

 * The sessions setting may be an options hash now. (Konstantin Haase)

 * Important: Ruby 1.8.6 support has been dropped. This version also depends
   on at least Rack 1.3.0. This means that it is incompatible with Rails prior
   to 3.1.0. Please use 1.2.x if you require an earlier version of Ruby or
   Rack, which we will continue to supply with bug fixes. (Konstantin Haase)

 * Renamed `:public` to `:public_folder` to avoid overriding Ruby's built-in
   `public` method/keyword. `set(:public, ...)` is still possible but shows a
   warning. (Konstantin Haase)

 * It is now possible to use a different target class for the top level DSL
   (aka classic style) than `Sinatra::Application` by setting
   `Delegator.target`. This was mainly introduced to ease testing. (Konstantin
   Haase)

 * Error handlers defined for an error class will now also handle subclasses
   of that class, unless more specific error handlers exist. (Konstantin
   Haase)

 * Error handling respects Exception#code, again. (Konstantin Haase)

 * Changing a setting will merge hashes: `set(:x, :a => 1); set(:x :b => 2)`
   will result in `{:a => 1, :b => 2}`. Use `set(:x, {:a => 1}, true)` to
   avoid this behavior. (Konstantin Haase)

 * Added `request.accept?` and `request.preferred_type` to ease dealing with
   `Accept` headers. (Konstantin Haase)

 * Added `:static_cache_control` setting to automatically set cache control
   headers to static files. (Kenichi Nakamura)

 * Added `informal?`, `success?`, `redirect?`, `client_error?`,
   `server_error?` and `not_found?` helper methods to ease dealing with status
   codes. (Konstantin Haase)

 * Uses SecureRandom to generate default session secret. (Konstantin Haase)

 * The `attachment` helper will set Content-Type (if it hasn't been set yet)
   depending on the supplied file name. (Vasiliy Ermolovich)

 * Conditional requests on `etag` helper now work properly for unsafe HTTP
   methods. (Matthew Schinckel, Konstantin Haase)

 * The `last_modified` helper does not stop execution and change the status code
   if the status code is something different than 200. (Konstantin Haase)

 * Added support for If-Unmodified-Since header. (Konstantin Haase)

 * `Sinatra::Base.run!` now prints to stderr rather than stdout. (Andrew
   Armenia)

 * `Sinatra::Base.run!` takes a block allowing access to the Rack handler.
   (David Waite)

 * Automatic `app_file` detection now works in directories containing brackets
   (Konstantin Haase)

 * Exception objects are now passed to error handlers. (Konstantin Haase)

 * Improved documentation. (Emanuele Vicentini, Peter Higgins, Takanori
   Ishikawa, Konstantin Haase)

 * Also specify charset in Content-Type header for JSON. (Konstantin Haase)

 * Rack handler names will not be converted to lower case internally, this
   allows you to run Sinatra with custom Rack handlers, like Kirk or Mongrel2.
   Example: `ruby app.rb -s Mongrel2` (Konstantin Haase)

 * Ignore `to_ary` on response bodies. Fixes compatibility to Rails 3.1.
   (Konstantin Haase)

 * Middleware setup is now distributed across multiple methods, allowing
   Sinatra extensions to easily hook into the setup process. (Konstantin
   Haase)

 * Internal refactoring and minor performance improvements. (Konstantin Haase)

 * Move Sinatra::VERSION to separate file, so it can be checked without
   loading Sinatra. (Konstantin Haase)

 * Command line options now complain if value passed to `-p` is not a valid
   integer. (Konstantin Haase)

 * Fix handling of broken query params when displaying exceptions. (Luke
   Jahnke)

3 files changed, 16 insertions, 14 deletions

diff --git a/www/ruby-sinatra/Makefile b/www/ruby-sinatra/Makefile
index 87b344c56e7..4edd9288213 100644
--- a/www/ruby-sinatra/Makefile
+++ b/www/ruby-sinatra/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2011/10/03 14:30:20 obache Exp $
+# $NetBSD: Makefile,v 1.4 2011/12/16 15:36:19 taca Exp $
 
-DISTNAME=	sinatra-1.2.7
+DISTNAME=	sinatra-1.3.1
 CATEGORIES=	www
 
 MAINTAINER=	obache@NetBSD.org
@@ -8,8 +8,9 @@ HOMEPAGE=	http://www.sinatrarb.com/
 COMMENT=	Classy web-development dressed in a DSL
 LICENSE=	mit
 
-DEPENDS+=	${RUBY_PKGPREFIX}-rack>=1.1:../../www/ruby-rack11
-DEPENDS+=	${RUBY_PKGPREFIX}-tilt>=1.2.2:../../textproc/ruby-tilt
+DEPENDS+=	${RUBY_PKGPREFIX}-rack>=1.3<2:../../www/ruby-rack
+DEPENDS+=	${RUBY_PKGPREFIX}-rack-protection>=1.1<2:../../www/ruby-rack-protection
+DEPENDS+=	${RUBY_PKGPREFIX}-tilt>=1.3<2:../../textproc/ruby-tilt
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/www/ruby-sinatra/PLIST b/www/ruby-sinatra/PLIST
index 5893257c21e..50ee863042f 100644
--- a/www/ruby-sinatra/PLIST
+++ b/www/ruby-sinatra/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2011/10/03 14:30:20 obache Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/12/16 15:36:19 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/.yardopts
 ${GEM_LIBDIR}/AUTHORS
 ${GEM_LIBDIR}/CHANGES
 ${GEM_LIBDIR}/Gemfile
@@ -21,19 +22,19 @@ ${GEM_LIBDIR}/lib/sinatra/images/404.png
 ${GEM_LIBDIR}/lib/sinatra/images/500.png
 ${GEM_LIBDIR}/lib/sinatra/main.rb
 ${GEM_LIBDIR}/lib/sinatra/showexceptions.rb
+${GEM_LIBDIR}/lib/sinatra/version.rb
 ${GEM_LIBDIR}/sinatra.gemspec
 ${GEM_LIBDIR}/test/base_test.rb
 ${GEM_LIBDIR}/test/builder_test.rb
 ${GEM_LIBDIR}/test/coffee_test.rb
 ${GEM_LIBDIR}/test/contest.rb
+${GEM_LIBDIR}/test/creole_test.rb
 ${GEM_LIBDIR}/test/delegator_test.rb
 ${GEM_LIBDIR}/test/encoding_test.rb
 ${GEM_LIBDIR}/test/erb_test.rb
-${GEM_LIBDIR}/test/erubis_test.rb
 ${GEM_LIBDIR}/test/extensions_test.rb
 ${GEM_LIBDIR}/test/filter_test.rb
 ${GEM_LIBDIR}/test/haml_test.rb
-${GEM_LIBDIR}/test/hello.mab
 ${GEM_LIBDIR}/test/helper.rb
 ${GEM_LIBDIR}/test/helpers_test.rb
 ${GEM_LIBDIR}/test/less_test.rb
@@ -47,6 +48,7 @@ ${GEM_LIBDIR}/test/public/favicon.ico
 ${GEM_LIBDIR}/test/rack_test.rb
 ${GEM_LIBDIR}/test/radius_test.rb
 ${GEM_LIBDIR}/test/rdoc_test.rb
+${GEM_LIBDIR}/test/readme_test.rb
 ${GEM_LIBDIR}/test/request_test.rb
 ${GEM_LIBDIR}/test/response_test.rb
 ${GEM_LIBDIR}/test/result_test.rb
@@ -59,6 +61,7 @@ ${GEM_LIBDIR}/test/settings_test.rb
 ${GEM_LIBDIR}/test/sinatra_test.rb
 ${GEM_LIBDIR}/test/slim_test.rb
 ${GEM_LIBDIR}/test/static_test.rb
+${GEM_LIBDIR}/test/streaming_test.rb
 ${GEM_LIBDIR}/test/templates_test.rb
 ${GEM_LIBDIR}/test/textile_test.rb
 ${GEM_LIBDIR}/test/views/a/in_a.str
@@ -67,15 +70,14 @@ ${GEM_LIBDIR}/test/views/b/in_b.str
 ${GEM_LIBDIR}/test/views/calc.html.erb
 ${GEM_LIBDIR}/test/views/error.builder
 ${GEM_LIBDIR}/test/views/error.erb
-${GEM_LIBDIR}/test/views/error.erubis
 ${GEM_LIBDIR}/test/views/error.haml
 ${GEM_LIBDIR}/test/views/error.sass
 ${GEM_LIBDIR}/test/views/explicitly_nested.str
 ${GEM_LIBDIR}/test/views/foo/hello.test
 ${GEM_LIBDIR}/test/views/hello.builder
 ${GEM_LIBDIR}/test/views/hello.coffee
+${GEM_LIBDIR}/test/views/hello.creole
 ${GEM_LIBDIR}/test/views/hello.erb
-${GEM_LIBDIR}/test/views/hello.erubis
 ${GEM_LIBDIR}/test/views/hello.haml
 ${GEM_LIBDIR}/test/views/hello.less
 ${GEM_LIBDIR}/test/views/hello.liquid
@@ -92,7 +94,6 @@ ${GEM_LIBDIR}/test/views/hello.test
 ${GEM_LIBDIR}/test/views/hello.textile
 ${GEM_LIBDIR}/test/views/layout2.builder
 ${GEM_LIBDIR}/test/views/layout2.erb
-${GEM_LIBDIR}/test/views/layout2.erubis
 ${GEM_LIBDIR}/test/views/layout2.haml
 ${GEM_LIBDIR}/test/views/layout2.liquid
 ${GEM_LIBDIR}/test/views/layout2.mab
diff --git a/www/ruby-sinatra/distinfo b/www/ruby-sinatra/distinfo
index ff28ccea6c9..d1aa7a23468 100644
--- a/www/ruby-sinatra/distinfo
+++ b/www/ruby-sinatra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/10/03 14:30:20 obache Exp $
+$NetBSD: distinfo,v 1.3 2011/12/16 15:36:19 taca Exp $
 
-SHA1 (sinatra-1.2.7.gem) = f03713e7be0a271dbd049fd93cc09cd3662185ed
-RMD160 (sinatra-1.2.7.gem) = 9c183f2d60a1892bb22b0f4380bc311fdc2ba157
-Size (sinatra-1.2.7.gem) = 246784 bytes
+SHA1 (sinatra-1.3.1.gem) = 8d49048bafaaf0989908b384589955d6e6c33730
+RMD160 (sinatra-1.3.1.gem) = 5137f227e16d22fa6988b59edf000e21ec7a809c
+Size (sinatra-1.3.1.gem) = 273408 bytes