sinatra 1.4.6 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab40363a01800a6eca6fbfd31a92a7bc82eb6324
-  data.tar.gz: 8eb57d7e6f169ce4a8671fb1211c65516ddb21ec
+  metadata.gz: fcc61f758e37e82a6ba459dd28ac0427d1e293aa
+  data.tar.gz: 89da52018e78be121896892c8f1bd2786048c191
 SHA512:
-  metadata.gz: 058b79bc51a5b1e85a9343cfa5552a0f646ebd429721b89101b2b245c491dabe157c0719d82fc85f74193d094d61c62e9b91c0e401dd4dcef5c92292b021e5be
-  data.tar.gz: 05ff1ebc8d85c01b95b17347717e7d0a9da61f3205b36588b9d4228d3373c036549dd0e86c6961a37ce6a70c8bf3f7cb23fceb0d49b5c83cf445a2eb7d206e06
+  metadata.gz: eedfb95c98ca07e7522e60437f6e7a373b569124bf513a456f9ffc679af95b58e1c0368d08ea76085ae7ea9315947dcf956ba4d07c752ad111533a24a65d7b9e
+  data.tar.gz: 298a3ccc3bc242b195c8788efc65e94f45274634f5e04cc7f679fd407fa9c0cff2844de338d08369f8e11452da84293a9fe12c4fdbe898c5eeeef6258cbf725a

data/AUTHORS.md

@@ -4,13 +4,16 @@ Sinatra was designed and developed by Blake Mizerany in California.
 
 * **Konstantin Haase** (maintainer)
 * **Zachary Scott**
-* **Katrina Owen**
+* **Kashyap Kondamudi**
+* **Ashley Williams**
+* **Trevor Bramble**
 
 ### Alumni
 
 * **Blake Mizerany** (creator)
 * **Ryan Tomayko**
 * **Simon Rozet**
+* **Katrina Owen**
 
 ### Thanks
 
@@ -74,4 +77,4 @@ Sinatra would not be possible:
 And last but not least:
 
 * [Frank Sinatra](http://www.sinatra.com/) (chairman of the board) for having so much class he
-  deserves a web-framework named after him.
+  deserves a web-framework named after him.

data/{CHANGES → CHANGELOG.md}

@@ -1,4 +1,84 @@
-= 1.4.6 / 2015-03-2x
+## 2.0.0 / 2017-04-10
+
+ * Use Mustermann for patterns #1086 by Konstantin Haase
+
+ * Server now provides `-q` flag for quiet mode, which disables start/stop messages #1153 by Vasiliy.
+
+ * Session middleware can now be specified with `:session_store` setting #1161 by Jordan Owens.
+
+ * `APP_ENV` is now preferred and recommended over `RACK_ENV` for setting environment #984 by Damien Mathieu.
+
+ * Add Reel support #793 by Patricio Mac Adden.
+
+ * Make route params available during error handling #895 by Jeremy Evans.
+
+ * Unify `not_found` and `error` 404 behavior #896 by Jeremy Evans.
+
+ * Enable Ruby 2.3 `frozen_string_literal` feature #1076 by Vladimir Kochnev.
+
+ * Add Sinatra::ShowExceptions::TEMPLATE and patched Rack::ShowExceptions to prefer Sinatra template by Zachary Scott.
+
+ * Sinatra::Runner is used internally for integration tests #840 by Nick Sutterer.
+
+ * Fix case-sensitivity issue in `uri` method #889 by rennex.
+
+ * Use `Rack::Utils.status_code` to allow `status` helper to use symbol as well as numeric codes #968 by Tobias H. Michaelsen.
+
+ * Improved error handling for invalid params through Rack #1070 by Jordan Owens.
+
+ * Ensure template is cached only once #1021 by Patrik Rak.
+
+ * Rack middleware is initialized at server runtime rather than after receiving first request #1205 by Itamar Turner-Trauring.
+
+ * Improve Session Secret documentation to encourage better security practices #1218 by Glenn Rempe
+
+ * Exposed global and per-route options for Mustermann route parsing #1233 by Mike Pastore
+
+ * Use same `session_secret` for classic and modular apps in development #1245 by Marcus Stollsteimer
+
+ * Make authenticity token length a fixed value of 32 #1181 by Jordan Owens
+
+ * Modernize Rack::Protection::ContentSecurityPolicy with CSP Level 2 and 3 Directives #1202 by Glenn Rempe
+
+ * Adds preload option to Rack:Protection:StrictTransport #1209 by Ed Robinson
+
+ * Improve BadRequest logic. Raise and handle exceptions if status is 400 #1212 by Mike Pastore
+
+ * Make Rack::Test a development dependency #1232 by Mike Pastore
+
+ * Capture exception messages of raised NotFound and BadRequest #1210 by Mike Pastore
+
+ * Add explicit set method to contrib/cookies to override cookie settings #1240 by Andrew Allen
+
+ * Avoid executing filters even if prefix matches with other namespace #1253 by namusyaka
+
+ * Make `#has_key?` also indifferent in access, can accept String or Symbol #1262 by John Hope
+
+ * Add `allow_if` option to bypass json csrf protection #1265 by Jordan Owens
+
+ * rack-protection: Bundle StrictTransport, CookieTossing, and CSP #1267 by Mike Pastore
+
+ * Add `:strict_paths` option for managing trailing slashes #1273 by namusyaka
+
+ * Add full IndifferentHash implementation to params #1279 by Mike Pastore
+
+## 1.4.7 / 2016-01-24
+
+ * Add Ashley Williams, Trevor Bramble, and Kashyap Kondamudi to team Sinatra.
+
+ * Correctly handle encoded colons in routes. (Jeremy Evans)
+
+ * Rename CHANGES to CHANGELOG.md and update Rakefile. #1043 (Eliza Sorensen)
+
+ * Improve documentation. #941, #1069, #1075, #1025, #1052 (Many great folks)
+
+ * Introduce `Sinatra::Ext` to workaround Rack 1.6 bug to fix Ruby 1.8.7
+   support. #1080 (Zachary Scott)
+
+ * Add CONTRIBUTING guide. #987 (Katrina Owen)
+
+
+## 1.4.6 / 2015-03-23
 
  * Improve tests and documentation. (Darío Hereñú, Seiichi Yonezawa, kyoendo,
    John Voloski, Ferenc-, Renaud Martinet, Christian Haase, marocchino,
@@ -28,7 +108,7 @@
  * Upgrade test suite to Minitest version 5 and fix Ruby 2.2 compatibility.
    (Vipul A M)
 
-= 1.4.5 / 2014-04-08
+## 1.4.5 / 2014-04-08
 
  * Improve tests and documentation. (Seiichi Yonezawa, Mike Gehard, Andrew
    Deitrick, Matthew Nicholas Bradley, GoGo tanaka, Carlos Lazo, Shim Tw,
@@ -45,7 +125,7 @@
 
  * Fix bug in request.accept? that might trigger a NoMethodError. (sbonami)
 
-= 1.4.4 / 2013-10-21
+## 1.4.4 / 2013-10-21
 
  * Allow setting layout to false specifically for a single rendering engine.
    (Matt Wildig)
@@ -80,7 +160,7 @@
 
  * Reduce file size of dev mode images for 404 and 500 pages. (Francis Go)
 
-= 1.4.3 / 2013-06-07
+## 1.4.3 / 2013-06-07
 
  * Running a Sinatra file directly or via `run!` it will now ignore an
    empty $PORT env variable. (noxqsgit)
@@ -101,7 +181,7 @@
 
  * Request#accept? now returns true instead of a truthy value. (Alan Harris)
 
-= 1.4.2 / 2013-03-21
+## 1.4.2 / 2013-03-21
 
  * Fix parsing error for case where both the pattern and the captured part
    contain a dot. (Florian Hanke, Konstantin Haase)
@@ -110,11 +190,11 @@
 
  * Improve documentation. (Patricio Mac Adden, Joe Bottigliero)
 
-= 1.4.1 / 2013-03-15
+## 1.4.1 / 2013-03-15
 
  * Make delegated methods available in config.ru (Konstantin Haase)
 
-= 1.4.0 / 2013-03-15
+## 1.4.0 / 2013-03-15
 
  * Add support for LINK and UNLINK requests. (Konstantin Haase)
 
@@ -148,9 +228,9 @@
    halt in a before filter or route. (Konstantin Haase)
 
  * Sinatra::Base.new now returns a Sinatra::Wrapper instance, exposing
-   #settings and #helpers, yet going through the middleware stack on #call.
-   It also implements a nice #inspect, so it plays nice with Rails' `rake
-   routes`. (Konstantin Haase)
+   `#settings` and `#helpers`, yet going through the middleware stack on
+   `#call`.  It also implements a nice `#inspect`, so it plays nice with
+   Rails' `rake routes`. (Konstantin Haase)
 
  * In addition to WebRick, Thin and Mongrel, Sinatra will now automatically pick
    up Puma, Trinidad, ControlTower or Net::HTTP::Server when installed. The
@@ -235,7 +315,7 @@
  * Exceptions in `after` filter are now handled like any other exception.
    (Nathan Esquenazi)
 
-= 1.3.6 (backport release) / 2013-03-15
+## 1.3.6 (backport release) / 2013-03-15
 
 Backported from 1.4.0:
 
@@ -245,7 +325,7 @@ Backported from 1.4.0:
 
  * No longer override `define_singleton_method`. (Konstantin Haase)
 
-= 1.3.5 / 2013-02-25
+## 1.3.5 / 2013-02-25
 
  * Fix for RubyGems 2.0 (Uchio KONDO)
 
@@ -253,7 +333,7 @@ Backported from 1.4.0:
 
  * No longer override `define_singleton_method`. (Konstantin Haase)
 
-= 1.3.4 / 2013-01-26
+## 1.3.4 / 2013-01-26
 
  * Improve documentation. (Kashyap, Stanislav Chistenko, Konstantin Haase,
    ymmtmsys, Anurag Priyam)
@@ -270,7 +350,7 @@ Backported from 1.4.0:
  * Status, headers and body will be set correctly in an after filter when using
    halt in a before filter or route. (Konstantin Haase)
 
-= 1.3.3 / 2012-08-19
+## 1.3.3 / 2012-08-19
 
  * Improved documentation. (burningTyger, Konstantin Haase, Gabriel Andretta,
    Anurag Priyam, michelc)
@@ -297,7 +377,7 @@ Backported from 1.4.0:
  * When protecting against CSRF attacks, drop the session instead of refusing
    the request. (Konstantin Haase)
 
-= 1.3.2 / 2011-12-30
+## 1.3.2 / 2011-12-30
 
  * Don't automatically add `Rack::CommonLogger` if `Rack::Server` is adding it,
    too. (Konstantin Haase)
@@ -324,7 +404,7 @@ Backported from 1.4.0:
 
  * Improved MagLev support. (Tim Felgentreff)
 
-= 1.3.1 / 2011-10-05
+## 1.3.1 / 2011-10-05
 
  * Support adding more than one callback to the stream object. (Konstantin
    Haase)
@@ -332,7 +412,7 @@ Backported from 1.4.0:
  * Fix for infinite loop when streaming on 1.9.2 with Thin from a modular
    application (Konstantin Haase)
 
-= 1.3.0 / 2011-09-30
+## 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.
@@ -459,7 +539,7 @@ Backported from 1.4.0:
  * Fix handling of broken query params when displaying exceptions. (Luke
    Jahnke)
 
-= 1.2.9 (backports release) / 2013-03-15
+## 1.2.9 (backports release) / 2013-03-15
 
 IMPORTANT: THIS IS THE LAST 1.2.x RELEASE, PLEASE UPGRADE.
 
@@ -473,14 +553,14 @@ IMPORTANT: THIS IS THE LAST 1.2.x RELEASE, PLEASE UPGRADE.
 
  * Add backports library so we can still run on Ruby 1.8.6. (Konstantin Haase)
 
-= 1.2.8 (backports release) / 2011-12-30
+## 1.2.8 (backports release) / 2011-12-30
 
 Backported from 1.3.2:
 
 * Fix bug where rendering a second template in the same request after the
   first one raised an exception skipped the default layout (Nathan Baum)
 
-= 1.2.7 (backports release) / 2011-09-30
+## 1.2.7 (backports release) / 2011-09-30
 
 Custom changes:
 
@@ -513,16 +593,16 @@ Backported from 1.3.0:
  * Fix handling of broken query params when displaying exceptions. (Luke
    Jahnke)
 
-= 1.2.6 / 2011-05-01
+## 1.2.6 / 2011-05-01
 
  * Fix broken delegation, backport delegation tests from Sinatra 1.3.
    (Konstantin Haase)
 
-= 1.2.5 / 2011-04-30
+## 1.2.5 / 2011-04-30
 
  * Restore compatibility with Ruby 1.8.6. (Konstantin Haase)
 
-= 1.2.4 / 2011-04-30
+## 1.2.4 / 2011-04-30
 
  * Sinatra::Application (classic style) does not use a session secret in
    development mode, so sessions are not invalidated after every request when
@@ -546,7 +626,7 @@ Backported from 1.3.0:
  * Remove HEAD request logic and let Rack::Head handle it instead. (Paolo
    "Nusco" Perrotta)
 
-= 1.2.3 / 2011-04-13
+## 1.2.3 / 2011-04-13
 
  * This release is compatible with Tilt 1.3, it will still work with Tilt 1.2.2,
    however, if you want to use a newer Tilt version, you have to upgrade to at
@@ -555,7 +635,7 @@ Backported from 1.3.0:
  * Helpers dealing with time, like `expires`, handle objects that pretend to be
    numbers, like `ActiveSupport::Duration`, better. (Konstantin Haase)
 
-= 1.2.2 / 2011-04-08
+## 1.2.2 / 2011-04-08
 
  * The `:provides => :js` condition now matches both `application/javascript`
    and `text/javascript`. The `:provides => :xml` condition now matches both
@@ -583,7 +663,7 @@ Backported from 1.3.0:
  * In development environment, when running under a nested path, the image URIs
    on the error pages are set properly. (Konstantin Haase)
 
-= 1.2.1 / 2011-03-17
+## 1.2.1 / 2011-03-17
 
  * Use a generated session secret when using `enable :sessions`. (Konstantin
    Haase)
@@ -596,7 +676,7 @@ Backported from 1.3.0:
  * README translations improved (Gabriel Andretta, burningTyger, Sylvain Desvé,
    Gregor Schmidt)
 
-= 1.2.0 / 2011-03-03
+## 1.2.0 / 2011-03-03
 
  * Added `slim` rendering method for rendering Slim templates. (Steve
    Hodgkiss)
@@ -645,11 +725,11 @@ Backported from 1.3.0:
  * Sinatra now ships with a Gemfile for development dependencies, since it eases
    supporting different platforms, like JRuby. (Konstantin Haase)
 
-= 1.1.4 (backports release) / 2011-04-13
+## 1.1.4 (backports release) / 2011-04-13
 
  * Compatible with Tilt 1.3. (Konstantin Haase)
 
-= 1.1.3 / 2011-02-20
+## 1.1.3 / 2011-02-20
 
  * Fixed issues with `user_agent` condition if the user agent header is missing.
    (Konstantin Haase)
@@ -668,11 +748,11 @@ Backported from 1.3.0:
    a rendering engine - it was not possible to register ".html.erb" without
    tricks. (Konstantin Haase)
 
-= 1.1.2 / 2010-10-25
+## 1.1.2 / 2010-10-25
 
 Like 1.1.1, but with proper CHANGES file.
 
-= 1.1.1 / 2010-10-25
+## 1.1.1 / 2010-10-25
 
  * README has been translated to Russian (Nickolay Schwarz, Vasily Polovnyov)
    and Portuguese (Luciano Sousa).
@@ -704,7 +784,7 @@ Like 1.1.1, but with proper CHANGES file.
    honor default_encoding and URLs support unicode characters. (Konstantin
    Haase)
 
-= 1.1.0 / 2010-10-24
+## 1.1.0 / 2010-10-24
 
  * Before and after filters now support pattern matching, including the
    ability to use captures: "before('/user/:name') { |name| ... }". This
@@ -810,7 +890,7 @@ Like 1.1.1, but with proper CHANGES file.
  * Sinatra now depends on Rack 1.1 or higher. Rack 1.0 is no longer supported.
    (Konstantin Haase)
 
-= 1.0 / 2010-03-23
+## 1.0 / 2010-03-23
 
  * It's now possible to register blocks to run after each request using
    after filters. After filters run at the end of each request, after
@@ -953,7 +1033,7 @@ the 1.0 release:
  * The `:methodoverride' option to enable/disable the POST _method hack is
    obsolete; use `:method_override` instead.
 
-= 0.9.2 / 2009-05-18
+## 0.9.2 / 2009-05-18
 
  * This version is compatible with Rack 1.0. [Rein Henrichs]
 
@@ -1034,12 +1114,12 @@ the 1.0 release:
  * Fix in-file templates __END__ detection when __END__ exists with
    other stuff on a line [Yoji Shidara]
 
-= 0.9.1.1 / 2009-03-09
+## 0.9.1.1 / 2009-03-09
 
  * Fix directory traversal vulnerability in default static files
    route. See [#177] for more info.
 
-= 0.9.1 / 2009-03-01
+## 0.9.1 / 2009-03-01
 
  * Sinatra now runs under Ruby 1.9.1 [#61]
 
@@ -1109,7 +1189,7 @@ the 1.0 release:
  * Fixed that "." in route patterns erroneously matched any character
    instead of a literal ".". [#124]
 
-= 0.9.0.4 / 2009-01-25
+## 0.9.0.4 / 2009-01-25
 
  * Using halt with more than 1 args causes ArgumentError [#131]
  * using halt in a before filter doesn't modify response [#127]
@@ -1118,7 +1198,7 @@ the 1.0 release:
  * Preserve non-nested params in nested params hash [#117]
  * Fix backtrace dump with Rack::Lint [#116]
 
-= 0.9.0.3 / 2009-01-21
+## 0.9.0.3 / 2009-01-21
 
  * Fall back on mongrel then webrick when thin not found. [#75]
  * Use :environment instead of :env in test helpers to
@@ -1127,12 +1207,12 @@ the 1.0 release:
  * Fix app_file detection on windows [#118]
  * Fix static files with Rack::Lint in pipeline [#121]
 
-= 0.9.0.2 / 2009-01-18
+## 0.9.0.2 / 2009-01-18
 
  * Halting a before block should stop processing of routes [#85]
  * Fix redirect/halt in before filters [#85]
 
-= 0.9.0 / 2009-01-18
+## 0.9.0 / 2009-01-18
 
  * Works with and requires Rack >= 0.9.1
 
@@ -1225,7 +1305,7 @@ the 1.0 release:
    subclass of Sinatra::Base; each request is processed within an
    instance.
 
-= 0.3.3 / 2009-01-06
+## 0.3.3 / 2009-01-06
 
  * Pin to Rack 0.4.0 (this is the last release on Rack 0.4)
 
@@ -1243,7 +1323,7 @@ the 1.0 release:
  * BUG: Sinatra detects the app file and root path when run under
    thin/passenger.
 
-= 0.3.2
+## 0.3.2
 
  * BUG: Static and send_file read entire file into String before
    sending. Updated to stream with 8K chunks instead.
@@ -1253,11 +1333,11 @@ the 1.0 release:
 
  * Various minor doc fixes.
 
-= 0.3.1
+## 0.3.1
 
  * Unbreak optional path parameters [jeremyevans]
 
-= 0.3.0
+## 0.3.0
 
  * Add sinatra.gemspec w/ support for github gem builds. Forks can now
    enable the build gem option in github to get free username-sinatra.gem
@@ -1314,10 +1394,10 @@ the 1.0 release:
 
  * Fix for escaped paths not resolving static files [Matthew Walker]
 
-= 0.2.1
+## 0.2.1
 
  * File upload fix and minor tweaks.
 
-= 0.2.0
+## 0.2.0
 
  * Initial gem release of 0.2 codebase.

data/CONTRIBUTING.md

@@ -0,0 +1,100 @@
+# Contribute
+
+Want to show Sinatra some love? Help out by contributing!
+
+## Found a bug?
+
+Log it in our [issue tracker][ghi] or send a note to the [mailing list][ml].
+Be sure to include all relevant information, like the versions of Sinatra and
+Ruby you're using. A [gist](http://gist.github.com/) of the code that caused
+the issue as well as any error messages are also very helpful.
+
+## Need help?
+
+The [Sinatra mailing list][ml] has over 900 subscribers, many of which are happy
+to help out newbies or talk about potential feature additions. You can also
+drop by the [#sinatra](irc://chat.freenode.net/#sinatra) channel on
+[irc.freenode.net](http://freenode.net).
+
+## Have a patch?
+
+Bugs and feature requests that include patches are much more likely to
+get attention. Here are some guidelines that will help ensure your patch
+can be applied as quickly as possible:
+
+1. **Use [Git](http://git-scm.com) and [GitHub](http://github.com):**
+   The easiest way to get setup is to fork the
+   [sinatra/sinatra repo](http://github.com/sinatra/sinatra/).
+   Or, the [sinatra.github.com repo](http://github.com/sinatra/sinatra.github.com/),
+   if the patch is doc related.
+
+2. **Write unit tests:** If you add or modify functionality, it must
+   include unit tests. If you don't write tests, we have to, and this
+   can hold up acceptance of the patch.
+
+3. **Mind the `README`:** If the patch adds or modifies a major feature,
+   modify the `README.md` file to reflect that. Again, if you don't
+   update the `README`, we have to, and this holds up acceptance.
+
+4. **Update the change log (`CHANGELOG.md`):** The change log helps give an
+   overview of the changes that go into each release, and gives credit
+   where credit is due. We make sure that the change log is up to date
+   before each release, and we always appreciate it when people make
+   it easier to get the release out the door.
+
+5. **Push it:** Once you're ready, push your changes to a topic branch
+   and add a note to the ticket with the URL to your branch. Or, say
+   something like, "you can find the patch on johndoe/foobranch". We also
+   gladly accept GitHub [pull requests](http://help.github.com/pull-requests/).
+
+__NOTE:__ _We will take whatever we can get._ If you prefer to attach diffs in
+emails to the mailing list, that's fine; but do know that _someone_ will need
+to take the diff through the process described above and this can hold things
+up considerably.
+
+## Want to write docs?
+
+The process for contributing to Sinatra's website, documentation or the book
+is the same as contributing code. We use Git for versions control and GitHub to
+track patch requests.
+
+* [The sinatra.github.com repo](http://github.com/sinatra/sinatra.github.com/)
+  is where the website sources are managed. There are almost always people in
+  `#sinatra` that are happy to discuss, apply, and publish website patches.
+
+* [The Book](http://sinatra-org-book.herokuapp.com/) has its own [Git
+  repository](http://github.com/sinatra/sinatra-book/) and build process but is
+  managed the same as the website and project codebase.
+
+* [Sinatra Recipes](http://recipes.sinatrarb.com/) is a community
+  project where anyone is free to contribute ideas, recipes and tutorials. Which
+  also has its own [Git repository](http://github.com/sinatra/sinatra-recipes).
+
+* [The Introduction](http://www.sinatrarb.com/intro.html) is generated from
+  Sinatra's [README file](http://github.com/sinatra/sinatra/blob/master/README.md).
+
+* If you want to help translating the documentation, the README is already
+  available in
+  [Japanese](http://github.com/sinatra/sinatra/blob/master/README.ja.md),
+  [German](http://github.com/sinatra/sinatra/blob/master/README.de.md),
+  [Chinese](https://github.com/sinatra/sinatra/blob/master/README.zh.md),
+  [Russian](https://github.com/sinatra/sinatra/blob/master/README.ru.md),
+  [European](https://github.com/sinatra/sinatra/blob/master/README.pt-pt.md) and
+  [Brazilian](https://github.com/sinatra/sinatra/blob/master/README.pt-br.md)
+  Portuguese,
+  [French](https://github.com/sinatra/sinatra/blob/master/README.fr.md),
+  [Spanish](https://github.com/sinatra/sinatra/blob/master/README.es.md),
+  [Korean](https://github.com/sinatra/sinatra/blob/master/README.ko.md), and
+  [Hungarian](https://github.com/sinatra/sinatra/blob/master/README.hu.md).
+  The translations tend to fall behind the English version. Translations into
+  other languages would also be appreciated.
+
+## Looking for something to do?
+
+If you'd like to help out but aren't sure how, pick something that looks
+interesting from the [issues][ghi] list and hack on. Make sure to leave a
+comment on the ticket noting that you're investigating (a simple "Taking…" is
+fine).
+
+[ghi]: http://github.com/sinatra/sinatra/issues
+[ml]: http://groups.google.com/group/sinatrarb/topics "Sinatra Mailing List"

data/Gemfile

@@ -11,38 +11,30 @@ source 'https://rubygems.org' unless ENV['QUICK']
 gemspec
 
 gem 'rake'
+gem 'rack', git: 'https://github.com/rack/rack.git'
 gem 'rack-test', '>= 0.6.2'
 gem "minitest", "~> 5.0"
+gem 'yard'
 
-# Allows stuff like `tilt=1.2.2 bundle install` or `tilt=master ...`.
-# Used by the CI.
-repos  = {'tilt' => "rtomayko/tilt", 'rack' => "rack/rack"}
+gem "rack-protection", path: "rack-protection"
+gem "sinatra-contrib", path: "sinatra-contrib"
 
-%w[tilt rack].each do |lib|
-  dep = case ENV[lib]
-        when 'stable', nil then nil
-        when /(\d+\.)+\d+/ then "~> " + ENV[lib].sub("#{lib}-", '')
-        else {:github => repos[lib], :branch => dep}
-        end
-  gem lib, dep
-end
+gem "twitter-text", "1.14.0"
 
 if RUBY_ENGINE == 'jruby'
   gem 'nokogiri', '!= 1.5.0'
-  gem 'jruby-openssl'
   gem 'trinidad'
 end
 
-if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
+if RUBY_ENGINE == "ruby"
   gem 'less', '~> 2.0'
-  gem 'therubyracer'
+  gem 'mini_racer'
   gem 'redcarpet'
   gem 'wlang', '>= 2.0.1'
   gem 'bluecloth'
   gem 'rdiscount'
   gem 'RedCloth'
   gem 'puma'
-  gem 'net-http-server'
   gem 'yajl-ruby'
   gem 'nokogiri'
   gem 'thin'
@@ -63,6 +55,9 @@ if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9.2'
   gem 'erubis'
   gem 'haml', '>= 3.0'
   gem 'sass'
+  gem 'reel-rack'
+  gem 'celluloid', '~> 0.16.0'
+  gem 'simplecov', require: false
 end
 
 if RUBY_ENGINE == "rbx"
@@ -71,6 +66,6 @@ if RUBY_ENGINE == "rbx"
   gem 'rubysl-test-unit'
 end
 
-platforms :ruby_18, :jruby do
-  gem 'json' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
+platforms :jruby do
+  gem 'json'
 end

data/LICENSE

@@ -1,5 +1,8 @@
+The MIT License (MIT)
+
 Copyright (c) 2007, 2008, 2009 Blake Mizerany
-Copyright (c) 2010, 2011, 2012, 2013, 2014 Konstantin Haase
+Copyright (c) 2010-2017 Konstantin Haase
+Copyright (c) 2015-2017 Zachary Scott
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation
@@ -20,4 +23,4 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
 HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
+OTHER DEALINGS IN THE SOFTWARE.