Merge branch 'master' into encrypted-session-cookies

.github/workflows/test.yml

@@ -0,0 +1,45 @@
+name: Testing
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+
+jobs:
+  test:
+    name: Test with Ruby-${{ matrix.ruby }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.6, 2.7, '3.0', 3.1, 'jruby-9.3']
+    steps:
+    - uses: actions/checkout@v3
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Install dependencies
+      run: sudo apt-get install -y pandoc nodejs pkg-config libxml2-dev libxslt-dev
+    - name: Run sinatra tests
+      run: bundle exec rake
+    - name: Run sinatra-contrib tests
+      working-directory: sinatra-contrib
+      run: |
+        bundle install --jobs=3 --retry=3
+        bundle exec rake
+    - name: Run rack-protection tests
+      working-directory: rack-protection
+      run: |
+        bundle install --jobs=3 --retry=3
+        bundle exec rake
+    - uses: 8398a7/action-slack@v3
+      with:
+        status: ${{ job.status }}
+        fields: repo,message,commit,author,ref,job,took # selectable (default: repo,message)
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} # required
+        MATRIX_CONTEXT: ${{ toJson(matrix) }} # required
+      if: failure() && env.SLACK_WEBHOOK_URL

.gitignore

@@ -3,9 +3,8 @@
 .DS_STORE
 *.swp
 *.rbc
-*.sass-cache
 /pkg
-/doc/api
 /Gemfile.lock
 /coverage
 .yardoc
+/doc

AUTHORS.md

@@ -7,6 +7,7 @@ Sinatra was designed and developed by Blake Mizerany in California.
 * **Kashyap Kondamudi**
 * **Ashley Williams**
 * **Trevor Bramble**
+* **Kunpei Sakai**
 
 ### Alumni
 

CONTRIBUTING.md

@@ -36,13 +36,7 @@ can be applied as quickly as possible:
    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
+4. **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/).
@@ -98,3 +92,9 @@ fine).
 
 [ghi]: http://github.com/sinatra/sinatra/issues
 [ml]: http://groups.google.com/group/sinatrarb/topics "Sinatra Mailing List"
+
+* ["Help Wanted"](https://github.com/sinatra/sinatra/labels/help%20wanted):  Anyone willing to pitch in is open to contribute to this ticket as they see fit (will try to add context / summarize or ask for requirements)
+
+* ["Good First Issue"](https://github.com/sinatra/sinatra/labels/good%20first%20issue): Potential first time contributors should start here
+
+* ["Wishlist"](https://github.com/sinatra/sinatra/labels/Wishlist): All the things I wish we had but have no time for

Gemfile

@@ -6,67 +6,47 @@
 #
 # If you have issues with a gem: `bundle install --without-coffee-script`.
 
-RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
-source 'https://rubygems.org' unless ENV['QUICK']
+source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'rack', git: 'https://github.com/rack/rack.git'
-gem 'rack-test', '>= 0.6.2'
+gem 'rack'
+gem 'rack-test', '>= 0.6.2', '< 2'
 gem "minitest", "~> 5.0"
 gem 'yard'
 
 gem "rack-protection", path: "rack-protection"
 gem "sinatra-contrib", path: "sinatra-contrib"
 
-gem "twitter-text", "1.14.0"
-
-if RUBY_ENGINE == 'jruby'
-  gem 'nokogiri', '!= 1.5.0'
-  gem 'trinidad'
-end
-
-if RUBY_ENGINE == "ruby"
-  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'
-  gem 'simplecov', require: false
-end
-
-if RUBY_ENGINE == "rbx"
-  gem 'json'
-  gem 'rubysl'
-  gem 'rubysl-test-unit'
-  gem 'erubi'
-end
-
-platforms :jruby do
-  gem 'json'
-end
+gem "twitter-text", "1.14.7"
+
+
+gem "activesupport", "~> 6.1"
+
+gem 'redcarpet', platforms: [ :ruby ]
+gem 'rdiscount', platforms: [ :ruby ]
+gem 'puma'
+gem 'yajl-ruby', platforms: [ :ruby ]
+gem 'nokogiri', '> 1.5.0'
+gem 'rainbows', platforms: [ :ruby ]
+gem 'eventmachine'
+gem 'slim', '~> 4'
+gem 'coffee-script', '>= 2.0'
+gem 'rdoc'
+gem 'kramdown'
+gem 'creole'
+gem 'wikicloth'
+gem 'markaby'
+gem 'radius'
+gem 'asciidoctor'
+gem 'liquid'
+gem 'rabl'
+gem 'builder'
+gem 'erubi'
+gem 'haml', '~> 5'
+gem 'celluloid', '~> 0.16.0'
+gem 'commonmarker', '~> 0.20.0', platforms: [ :ruby ]
+gem 'pandoc-ruby', '~> 2.0.2'
+gem 'simplecov', require: false
+
+gem 'json', platforms: [ :jruby, :mri ]

MAINTENANCE.md

@@ -2,15 +2,9 @@
 
 ## Versions
 
-### Unstable release
+### Releases
 
-The next major version of Sinatra will be released from the master branch.
-
-* Current proposed major release: 2.0.0
-
-### Stable release
-
-The current stable version of Sinatra is 1.4 series, and released from the stable branch.
+The next major version of Sinatra will be released from the master branch. Each version will be tagged so it will be possible to branch of should there be a need for bug fixes and other updates.
 
 ## Issues
 
@@ -22,21 +16,14 @@ New features will only be added to the master branch and will not be made availa
 
 Only the latest release series will receive bug fixes. When enough bugs are fixed and its deemed worthy to release a new gem, this is the branch it happens from.
 
-* Current release series: 1.4.x
-
 ### Security issues
 
 The current release series will receive patches and new versions in case of a security issue.
 
-* Current release series: 1.4.x
-
 ### Severe security issues
 
 For severe security issues we will provide new versions as above, and also the last major release series will receive patches and new versions. The classification of the security issue is judged by the core team.
 
-* Current release series: 1.4.x
-* Next most recent release series: 1.3.x
-
 ### Unsupported Release Series
 
 When a release series is no longer supported, it’s your own responsibility to deal with bugs and security issues. We may provide back-ports of the fixes and publish them to git, however there will be no new versions released. If you are not comfortable maintaining your own versions, you should upgrade to a supported version.