RubyGems - sinatra - Versions diffs - 1.4.8 → 2.0.0.beta1 - Mend

sinatra 1.4.8 → 2.0.0.beta1

Potentially problematic release.

This version of sinatra might be problematic. Click here for more details.

Files changed (124) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +77 -47
data/CONTRIBUTING.md +1 -1
data/Gemfile +37 -49
data/MAINTENANCE.md +42 -0
data/README.de.md +5 -5
data/README.es.md +5 -5
data/README.fr.md +9 -9
data/README.hu.md +3 -3
data/README.ja.md +19 -8
data/README.ko.md +8 -8
data/README.md +90 -61
data/README.pt-br.md +3 -3
data/README.pt-pt.md +2 -2
data/README.ru.md +42 -26
data/README.zh.md +8 -8
data/Rakefile +0 -6
data/SECURITY.md +35 -0
data/lib/sinatra/base.rb +113 -161
data/lib/sinatra/main.rb +1 -0
data/lib/sinatra/show_exceptions.rb +8 -8
data/lib/sinatra/version.rb +1 -1
data/sinatra.gemspec +7 -4
metadata +34 -168
data/lib/sinatra/ext.rb +0 -17
data/test/asciidoctor_test.rb +0 -72
data/test/base_test.rb +0 -167
data/test/builder_test.rb +0 -91
data/test/coffee_test.rb +0 -96
data/test/compile_test.rb +0 -183
data/test/contest.rb +0 -91
data/test/creole_test.rb +0 -65
data/test/delegator_test.rb +0 -160
data/test/encoding_test.rb +0 -20
data/test/erb_test.rb +0 -116
data/test/extensions_test.rb +0 -98
data/test/filter_test.rb +0 -487
data/test/haml_test.rb +0 -109
data/test/helper.rb +0 -132
data/test/helpers_test.rb +0 -1917
data/test/integration/app.rb +0 -79
data/test/integration_helper.rb +0 -236
data/test/integration_test.rb +0 -104
data/test/less_test.rb +0 -69
data/test/liquid_test.rb +0 -77
data/test/mapped_error_test.rb +0 -285
data/test/markaby_test.rb +0 -80
data/test/markdown_test.rb +0 -85
data/test/mediawiki_test.rb +0 -68
data/test/middleware_test.rb +0 -68
data/test/nokogiri_test.rb +0 -67
data/test/public/favicon.ico +0 -0
data/test/public/hello+world.txt +0 -1
data/test/rabl_test.rb +0 -89
data/test/rack_test.rb +0 -45
data/test/radius_test.rb +0 -59
data/test/rdoc_test.rb +0 -66
data/test/readme_test.rb +0 -130
data/test/request_test.rb +0 -100
data/test/response_test.rb +0 -63
data/test/result_test.rb +0 -76
data/test/route_added_hook_test.rb +0 -59
data/test/routing_test.rb +0 -1456
data/test/sass_test.rb +0 -115
data/test/scss_test.rb +0 -88
data/test/server_test.rb +0 -56
data/test/settings_test.rb +0 -582
data/test/sinatra_test.rb +0 -12
data/test/slim_test.rb +0 -102
data/test/static_test.rb +0 -266
data/test/streaming_test.rb +0 -149
data/test/stylus_test.rb +0 -90
data/test/templates_test.rb +0 -382
data/test/textile_test.rb +0 -65
data/test/views/a/in_a.str +0 -1
data/test/views/ascii.erb +0 -2
data/test/views/b/in_b.str +0 -1
data/test/views/calc.html.erb +0 -1
data/test/views/error.builder +0 -3
data/test/views/error.erb +0 -3
data/test/views/error.haml +0 -3
data/test/views/error.sass +0 -2
data/test/views/explicitly_nested.str +0 -1
data/test/views/foo/hello.test +0 -1
data/test/views/hello.asciidoc +0 -1
data/test/views/hello.builder +0 -1
data/test/views/hello.coffee +0 -1
data/test/views/hello.creole +0 -1
data/test/views/hello.erb +0 -1
data/test/views/hello.haml +0 -1
data/test/views/hello.less +0 -5
data/test/views/hello.liquid +0 -1
data/test/views/hello.mab +0 -1
data/test/views/hello.md +0 -1
data/test/views/hello.mediawiki +0 -1
data/test/views/hello.nokogiri +0 -1
data/test/views/hello.rabl +0 -2
data/test/views/hello.radius +0 -1
data/test/views/hello.rdoc +0 -1
data/test/views/hello.sass +0 -2
data/test/views/hello.scss +0 -3
data/test/views/hello.slim +0 -1
data/test/views/hello.str +0 -1
data/test/views/hello.styl +0 -2
data/test/views/hello.test +0 -1
data/test/views/hello.textile +0 -1
data/test/views/hello.wlang +0 -1
data/test/views/hello.yajl +0 -1
data/test/views/layout2.builder +0 -3
data/test/views/layout2.erb +0 -2
data/test/views/layout2.haml +0 -2
data/test/views/layout2.liquid +0 -2
data/test/views/layout2.mab +0 -2
data/test/views/layout2.nokogiri +0 -3
data/test/views/layout2.rabl +0 -3
data/test/views/layout2.radius +0 -2
data/test/views/layout2.slim +0 -3
data/test/views/layout2.str +0 -2
data/test/views/layout2.test +0 -1
data/test/views/layout2.wlang +0 -2
data/test/views/nested.str +0 -1
data/test/views/utf8.erb +0 -2
data/test/wlang_test.rb +0 -87
data/test/yajl_test.rb +0 -86

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49eaa57b3d06c8eb819329b3c57cd6401c5da1c2
-  data.tar.gz: d30fe1da78dade1d0b6c961feeef2dc1ef61e268
+  metadata.gz: 6f5689f763ce2840dc72a29cd2339a1775905529
+  data.tar.gz: 46b08ba7c86f6d3c5e1d1be2f53bfd883acd9f8e
 SHA512:
-  metadata.gz: 961cb8068ba88aeb8c6a5d801512ddf5c22e71f293545d11fc8514794a1928acbdf8d3ad03d79c4b6281b3999c11bedcc61ea6a95157add919b8a620c57904e0
-  data.tar.gz: 7a525a8d3fd006f267bd28cafad4aadd1c713acb8ab2c508ca2ceecb8bef3e6863fb9f70e68270027d3df1375dccb16e525ec382ce071c68fe997edd18eb53ba
+  metadata.gz: e77f515b4e66095fc41af209d3f61613606da2fb89de9b9c64faece3239e83d1c629f7d713bf8c2615774fca9e05b9f8b65c07b8b56d98ac6a8a9d1608f6a655
+  data.tar.gz: febf1888cf1c44d410dc625dc97e461c2be2faa8a5551be99c4afacc2294a79bedd6d05bf7236d1d39dbbc37305fbf5f05fb9e10189dc13254688c71829650a5

data/CHANGELOG.md CHANGED

@@ -1,4 +1,34 @@
-= 1.4.7 / 2016-01-24
+## 2.0.0 / 2016-08-22
+ * 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.
+## 1.4.7 / 2016-01-24
  * Add Ashley Williams, Trevor Bramble, and Kashyap Kondamudi to team Sinatra.
@@ -14,7 +44,7 @@
  * Add CONTRIBUTING guide. #987 (Katrina Owen)
-= 1.4.6 / 2015-03-23
+## 1.4.6 / 2015-03-23
  * Improve tests and documentation. (Darío Hereñú, Seiichi Yonezawa, kyoendo,
    John Voloski, Ferenc-, Renaud Martinet, Christian Haase, marocchino,
@@ -44,7 +74,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,
@@ -61,7 +91,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)
@@ -96,7 +126,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)
@@ -117,7 +147,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)
@@ -126,11 +156,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)
@@ -164,9 +194,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
@@ -251,7 +281,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:
@@ -261,7 +291,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)
@@ -269,7 +299,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)
@@ -286,7 +316,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)
@@ -313,7 +343,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)
@@ -340,7 +370,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)
@@ -348,7 +378,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.
@@ -475,7 +505,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.
@@ -489,14 +519,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:
@@ -529,16 +559,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
@@ -562,7 +592,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
@@ -571,7 +601,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
@@ -599,7 +629,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)
@@ -612,7 +642,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)
@@ -661,11 +691,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)
@@ -684,11 +714,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).
@@ -720,7 +750,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
@@ -826,7 +856,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
@@ -969,7 +999,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]
@@ -1050,12 +1080,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]
@@ -1125,7 +1155,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]
@@ -1134,7 +1164,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
@@ -1143,12 +1173,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
@@ -1241,7 +1271,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)
@@ -1259,7 +1289,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.
@@ -1269,11 +1299,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
@@ -1330,10 +1360,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 CHANGED

@@ -62,7 +62,7 @@ track patch requests.
   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-book.gittr.com/) has its own [Git
+* [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.

data/Gemfile CHANGED

@@ -10,62 +10,50 @@ RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
 source 'https://rubygems.org' unless ENV['QUICK']
 gemspec
-gem 'rake', '~> 10.0'
+gem 'rake'
+gem 'rack', github: 'rack/rack'
 gem 'rack-test', '>= 0.6.2'
 gem "minitest", "~> 5.0"
+gem "rack-protection", path: "rack-protection"
+gem "sinatra-contrib", path: "sinatra-contrib"
 if RUBY_ENGINE == 'jruby'
   gem 'nokogiri', '!= 1.5.0'
-  gem 'jruby-openssl'
   gem 'trinidad'
 end
-if RUBY_VERSION < '1.9.3'
-  gem 'activesupport', '~> 3.2'
-  gem 'i18n', '~> 0.6.0'
-else
-  gem 'activesupport', '~> 4.2'
-end
 if RUBY_ENGINE == "ruby"
-  if RUBY_VERSION > '1.9.2'
-    gem 'less', '~> 2.0'
-    gem 'therubyracer'
-    gem 'redcarpet'
-    gem 'wlang', '>= 2.0.1'
-    gem 'bluecloth'
-    gem 'rdiscount'
-    gem 'RedCloth'
-    gem 'puma'
-    gem 'net-http-server'
-    gem 'yajl-ruby'
-    gem 'thin'
-    gem 'slim', '~> 2.0'
-    gem 'coffee-script', '>= 2.0'
-    gem 'rdoc'
-    gem 'kramdown'
-    gem 'maruku'
-    gem 'creole'
-    gem 'wikicloth'
-    gem 'markaby'
-    gem 'radius'
-    gem 'asciidoctor'
-    gem 'liquid', '~> 3.0'
-    gem 'stylus'
-    gem 'rabl'
-    gem 'builder'
-    gem 'erubis'
-    gem 'haml', '>= 3.0'
-    gem 'sass'
-    if RUBY_VERSION < '2.1.0'
-      gem 'nokogiri', '~> 1.6.8'
-    else
-      gem 'nokogiri', '~> 1.7.0'
-    end
-  else
-    gem 'nokogiri', '~> 1.5.11'
-  end
+  gem 'less', '~> 2.0'
+  gem 'mini_racer'
+  gem 'redcarpet'
+  gem 'wlang', '>= 2.0.1'
+  gem 'bluecloth'
+  gem 'rdiscount'
+  gem 'RedCloth'
+  gem 'puma'
+  gem 'yajl-ruby'
+  gem 'nokogiri'
+  gem 'thin'
+  gem 'slim', '~> 2.0'
+  gem 'coffee-script', '>= 2.0'
+  gem 'rdoc'
+  gem 'kramdown'
+  gem 'maruku'
+  gem 'creole'
+  gem 'wikicloth'
+  gem 'markaby'
+  gem 'radius'
+  gem 'asciidoctor'
+  gem 'liquid'
+  gem 'stylus'
+  gem 'rabl'
+  gem 'builder'
+  gem 'erubis'
+  gem 'haml', '>= 3.0'
+  gem 'sass'
+  gem 'reel-rack'
+  gem 'celluloid', '~> 0.16.0'
 end
 if RUBY_ENGINE == "rbx"
@@ -74,6 +62,6 @@ if RUBY_ENGINE == "rbx"
   gem 'rubysl-test-unit'
 end
-platforms :ruby_18, :jruby do
-  gem 'json', '~> 1.8' unless RUBY_VERSION > '1.9' # is there a jruby but 1.8 only selector?
+platforms :jruby do
+  gem 'json'
 end