Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3837 commits
Select commit Hold shift + click to select a range
2e980f3
Fix memory leaks for proc template (#1719)
gassyfeve Aug 31, 2021
d6ba201
Remove ruby head from build
jkowens Oct 4, 2021
a6554e3
chore: Drop boilerplate comments
olleolleolle Oct 20, 2021
e69b6b9
Merge pull request #1728 from olleolleolle/patch-4
jkowens Nov 2, 2021
5950596
Modify 'Using Sessions' section in README.ja.md to reflect original R…
shu-i-chi Dec 9, 2021
d1597ab
Update changelog since last release
Dec 21, 2021
df65a73
Handle EOFError raised by Rack
tamazon Jan 30, 2022
c29749d
lock rack version to 2.0 for now
tamazon Feb 1, 2022
59d8b26
Merge pull request #1733 from epergo/ep/update-changelog
jkowens Feb 2, 2022
f6cee1c
Merge pull request #1743 from tamazon/fix_EOFError
jkowens Feb 2, 2022
759a8eb
Block invalid requests instead of raising error
jkowens Feb 2, 2022
44ce685
Bump version to 2.2.0
jkowens Feb 2, 2022
9dede30
Drop support for Stylus (#1697)
epergo Oct 3, 2021
9a924aa
Set 2.6 as minimum ruby version for Sinatra 3 (#1699)
epergo Oct 4, 2021
bda8c29
Internal Sinatra errors now extend Sinatra::Error
jkowens Feb 1, 2019
26745b0
Remove references to legacy ruby platforms
Dec 28, 2020
d1af2f1
break: Drop "Less" templating support
olleolleolle Aug 27, 2021
fb64f4f
docs: Remove Less mentions from READMEs
olleolleolle Aug 27, 2021
ab29667
Use Kernel#caller_locations (2.x) (#1491)
julik Oct 6, 2021
5459750
fix: Drop reel integration
olleolleolle Oct 20, 2021
1559a20
refactor: use __dir__ in File.expand_path
olleolleolle Oct 18, 2021
60e2219
chore(ci): add ruby 3.1
johanneswuerbach Jan 4, 2022
b0fa4be
fix(sinatra-contrib): config file loading with ruby 3.1
johanneswuerbach Jan 4, 2022
1f8276b
Unlock rack version
jkowens Feb 2, 2022
c7e851f
Bump version to 3.0.0
jkowens Feb 2, 2022
2c9be5d
Run tests for gems in different steps
epergo Feb 5, 2022
5aed35f
Clean up gemfiles
epergo Feb 5, 2022
c922ffe
Use same rake task and config for tests in sinatra-contrib and rack-p…
epergo Feb 5, 2022
5f95f55
Disable monkey patch in RSpec for sinatra-contrib
epergo Feb 5, 2022
d53ff94
Disable monkey patch for rack-protection
epergo Feb 5, 2022
879939f
Merge pull request #1745 from epergo/ep/github-actions
jkowens Feb 5, 2022
7ae1027
Merge pull request #1731 from shu-i-chi/modify-readme_ja_md/using-ses…
jkowens Feb 5, 2022
a83c570
Merge pull request #1708 from patrickgramatowski/Add_polish_documenta…
jkowens Feb 5, 2022
d6439c1
Merge pull request #1650 from decoch/master
jkowens Feb 5, 2022
a91f10b
Add CHANGELOG for v3.0.0 (Unreleased)
olleolleolle Feb 10, 2022
883cb13
update status badge [ci skip]
namusyaka Feb 13, 2022
e9b3d3f
Merge pull request #1676 from jkowens/fix-1666
namusyaka Feb 13, 2022
3ed9fb8
Merge pull request #1747 from olleolleolle/changelog-3-0-0
jkowens Feb 13, 2022
b8ac5c3
Add 2.2.0 release date to CHANGELOG.md
simi Feb 16, 2022
9fd888d
Merge pull request #1748 from simi/patch-1
jkowens Feb 16, 2022
876149d
Update CHANGELOG.md
jkowens Feb 16, 2022
e814c6f
Use `ruby2_keywords` for delegation
dentarg Feb 16, 2022
b8e1138
CHANGELOG v2.2.0: group documentation changes
olleolleolle Feb 17, 2022
adab0bc
Merge pull request #1752 from olleolleolle/patch-4
jkowens Feb 18, 2022
7b88bc6
CI: Use working-directory directive
olleolleolle Feb 18, 2022
ea6c216
Merge pull request #1753 from olleolleolle/patch-4
jkowens Feb 19, 2022
51ff33a
Merge pull request #1750 from dentarg/fix-delegation
jkowens Feb 21, 2022
362de0b
CI: let's roll tests with JRuby
kares Feb 21, 2022
fab11ea
avoid threaded setup for test server
kares Feb 21, 2022
14f1739
Test: house-keeping - remove JRubyServer
kares Feb 21, 2022
de98d50
TODOed! :yay:
kares Feb 21, 2022
c606713
Merge pull request #1755 from kares/jruby
jkowens Feb 21, 2022
b2bb9c2
Drop Rubinius section from Gemfile
olleolleolle Feb 24, 2022
8a170a5
Merge pull request #1756 from olleolleolle/remove-rubinius
jkowens Feb 24, 2022
e168cb5
Use Bundler "platforms" in Gemfile
olleolleolle Feb 24, 2022
9ff3e96
Merge pull request #1757 from olleolleolle/gemfile-with-platforms
jkowens Feb 24, 2022
a29459f
Gemfile: Use :ruby to denote platform-with-C-exts
olleolleolle Feb 24, 2022
94fed10
Use ActiveSupport 6.1 in Gemfile
olleolleolle Feb 24, 2022
fe02d31
Fix active_support compat for RablTest
olleolleolle Feb 24, 2022
0309bbb
Merge pull request #1758 from olleolleolle/gemfile-platforms-more-car…
jkowens Feb 24, 2022
440b59e
Turn off ENV vars that disrupt Truffleruby in test
olleolleolle Feb 25, 2022
4034962
Merge pull request #1760 from olleolleolle/rakefile-avoid-truffleruby…
jkowens Feb 26, 2022
e1eaa93
Remove support for erubis
epergo Feb 26, 2022
11d8457
Update CHANGELOG
epergo Feb 26, 2022
b8baad8
Merge pull request #1761 from epergo/ep/remove-support-erubis
jkowens Feb 27, 2022
baa76e9
Remove bluecloth
epergo Feb 27, 2022
3538518
Remove maruku
epergo Feb 27, 2022
c112b96
Update haml and slim dependencies in tests
epergo Feb 27, 2022
f68f864
Merge pull request #1763 from epergo/ep/upgrade-haml-slim-dependencies
jkowens Feb 28, 2022
ae70708
Merge pull request #1762 from epergo/ep/remote-unsupported-markdown
jkowens Feb 28, 2022
0fb4d4e
Avoid adding project directory to the load path
bjfish Mar 1, 2022
6bfea80
Merge pull request #1765 from bjfish/update-load-path
jkowens Mar 1, 2022
1577730
Update "Getting Started" docs
bnadlerjr Mar 1, 2022
cf354f2
Merge pull request #1764 from bnadlerjr/fix-install-docs
jkowens Mar 3, 2022
d6f1b41
Remove redcloth/textile
epergo Mar 4, 2022
9b28519
Update READMEs
epergo Mar 4, 2022
24a8e09
Update CHANGELOG
epergo Mar 4, 2022
2b5d1b4
Merge pull request #1766 from epergo/ep/remove-redcloth
jkowens Mar 5, 2022
ccb3273
Delete sass
epergo Mar 11, 2022
2ee5186
Remove SASS references from READMEs
epergo Mar 11, 2022
6498eba
Update CHANGELOG
epergo Mar 11, 2022
77e669c
#1667 - Custom Route Matchers documentation updated to fix or remove …
bolpin Mar 12, 2022
b4f61f5
Merge pull request #1768 from epergo/ep/remove-sass
jkowens Mar 15, 2022
05cbf6a
CI: Use actions/checkout@v3
olleolleolle May 10, 2022
83d9176
Merge pull request #1779 from olleolleolle/patch-4
jkowens May 12, 2022
f10111b
Remove wlang support
epergo May 16, 2022
5c355a1
Update READMEs
epergo May 16, 2022
6ad42fc
Update changelog
epergo May 16, 2022
074d2ce
authenticity token: removed reference of compatibility with rack_csrf
HoneyryderChuck May 16, 2022
e3459c0
Removed omniauth reference
HoneyryderChuck May 20, 2022
3919090
fixed module name
HoneyryderChuck May 20, 2022
029e27d
Merge pull request #1781 from HoneyryderChuck/patch-1
jkowens May 20, 2022
4b3d99c
Do not leak path when not found.
raxoft Jun 14, 2022
118b429
Merge pull request #1787 from raxoft/fix-not-found
jkowens Jun 15, 2022
61ab5b4
Make sure the token is a string.
raxoft Jul 13, 2022
3e4c081
Update rack-protection/lib/rack/protection/authenticity_token.rb
raxoft Jul 13, 2022
d61c8a8
Pin rack-test < 2.0
jkowens Jul 15, 2022
f628b08
Merge pull request #1788 from raxoft/patch-2
jkowens Jul 15, 2022
374ecae
Merge pull request #1780 from epergo/ep/remove-wlang
jkowens Jul 15, 2022
6d217ab
Merge branch 'master' into encrypted-session-cookies
jkowens Jul 15, 2022
e617fab
Merge pull request #1324 from mjc-gh/encrypted-session-cookies
jkowens Jul 15, 2022
84bb041
Update CHANGELOG.md
jkowens Jul 15, 2022
b970a2c
Remove Coffescript
epergo Jul 16, 2022
9599f11
Update documentation, coffeescript removal
epergo Jul 15, 2022
11f1358
Update changelog
epergo Jul 15, 2022
0f21312
Remove coffee test view
epergo Jul 15, 2022
9102d9b
Merge pull request #1790 from epergo/ep/remove-coffeescript
jkowens Jul 16, 2022
c2b1e55
Remove MediaWiki
epergo Jul 15, 2022
26f7df5
Update Readme docs
epergo Jul 15, 2022
42cd04e
Remove wikicloth and twitter-text gems
epergo Jul 15, 2022
9aad381
Update changelog
epergo Jul 16, 2022
c47b1ec
Merge pull request #1791 from epergo/ep/remove-mediawiki
jkowens Jul 17, 2022
7d1bb97
Remove creole
epergo Jul 17, 2022
901448d
Update Readmes with creole removal
epergo Jul 17, 2022
b2660ac
Update Changelog
epergo Jul 17, 2022
280e40b
add falcon into server list
horaciob Jan 8, 2021
00c97a7
Merge pull request #1792 from epergo/ep/remove-creole
jkowens Jul 17, 2022
e542dda
Remove Radius support
epergo Jul 17, 2022
8f1ec07
Update Readmes with Radius removal
epergo Jul 17, 2022
0c2eab0
Update Changelog
epergo Jul 17, 2022
fb6f2da
Merge pull request #1793 from epergo/ep/remove-radius
jkowens Jul 17, 2022
dbc1111
Add specs for rendering string templates
jkowens Jul 17, 2022
c149c2a
Remove broken semver badge
jkowens Jul 17, 2022
1a3c736
Allow max-age value to be specified separately from expires
jkowens Jul 17, 2022
04d258e
Set minimum rack version to 2.2.4
jkowens Jul 18, 2022
2cdc2cd
Merge pull request #1769 from bolpin/1667-fix-readme-example-code-errors
jkowens Jul 18, 2022
807740b
Update mustermann to ~> 2.0
jkowens Jul 18, 2022
cb73617
Merge pull request #1794 from ioquatix/falcon-integration
jkowens Jul 19, 2022
be6b8d8
Run CI job against `rack` main branch
dentarg Jul 19, 2022
f0632d3
Merge pull request #1795 from dentarg/ci/rack-edge
jkowens Jul 19, 2022
3b7ce42
Timeout CI after 5 minutes
dentarg Feb 16, 2022
59485f1
Add JRuby (head) and TruffleRuby to CI matrix
dentarg Feb 26, 2022
d682b00
Timeout CI after 15 minutes
dentarg Apr 19, 2022
a09c591
setup-ruby may fail as it runs `bundle install`
dentarg Jul 19, 2022
1df3e9b
Be explict about rack version
dentarg Jul 19, 2022
98e5006
Merge pull request #1751 from dentarg/add-jvm-rubies-to-ci
jkowens Jul 19, 2022
df1633e
rainbows only works on CRuby and non-windows as it uses #fork
eregon Jul 20, 2022
f1ee0a3
Fix check for whether falcon is included
eregon Jul 20, 2022
6ebc0bf
Workaround for https://github.com/rubygems/rubygems/issues/5691
eregon Jul 20, 2022
10dffd3
Remove allow-failure for truffleruby* since it now passes all tests
eregon Jul 20, 2022
72e5b33
Merge pull request #1800 from eregon/fixes-for-truffleruby
jkowens Jul 20, 2022
911663b
Update CHANGELOG.md
jkowens Jul 23, 2022
5515159
Update mustermann to ~> 3.0
jkowens Jul 24, 2022
3b07dda
Update CHANGELOG.md
jkowens Jul 24, 2022
7b599af
Use latest version of rack-test
epergo Jul 25, 2022
9ab6a9f
Merge pull request #1801 from epergo/ep/update-rack-test
jkowens Jul 25, 2022
ed34907
Improve `after_reload` issues (#1692)
lilole Jul 26, 2022
e48eac3
Remove deprecated methods and options
jkowens Jul 26, 2022
1194bd8
Remove workaround
eregon Jul 26, 2022
0bea528
Merge pull request #1803 from eregon/patch-1
jkowens Jul 26, 2022
4225d00
Fix warnings in test suite output
jkowens Jul 27, 2022
9d91e2b
Merge pull request #1802 from sinatra/remove-deprecated-code
jkowens Jul 27, 2022
9a85bbf
Merge pull request #1644 from hemershon/master
jkowens Jul 28, 2022
8ae87a8
Setup Rubocop (#1537)
304 Jul 31, 2022
3d3dbb2
Remove reference to compass
jkowens Aug 2, 2022
a1722ca
Resolve security warnings for dependencies
jkowens Aug 2, 2022
bc8d0c8
Merge pull request #1804 from sinatra/fix-dependabot-warnings
jkowens Aug 2, 2022
6814f2a
Deprecate Sinatra Reloader
jkowens Aug 2, 2022
eba3698
Update documentation for Rack::Protection::EscapedParams
presidentbeef Aug 3, 2022
bf24038
Merge pull request #1806 from presidentbeef/patch-1
jkowens Aug 3, 2022
c1478d2
Remove readme files for languages other than English
jkowens Aug 3, 2022
29c2792
Merge pull request #1805 from sinatra/deprecate-sinatra-reloader
jkowens Aug 4, 2022
1db269d
Merge pull request #1807 from sinatra/single-readme
jkowens Aug 4, 2022
68f0e5f
Upgrade hamlit version to 3
epergo Aug 8, 2022
8d6a477
Allow hamlit versions greater than 3
epergo Aug 8, 2022
c151864
Merge pull request #1809 from epergo/ep/fix-hamlit-version
jkowens Aug 8, 2022
30f6325
Pin jar-dependencies to 0.4.1
jkowens Aug 8, 2022
815b69f
Merge pull request #1810 from sinatra/fix-ci-bundler
jkowens Aug 9, 2022
82b3cf6
fix: add back a rack-protection.rb file
olleolleolle Sep 26, 2022
bef504b
CI: Rename rack default branch to 'main'
olleolleolle Sep 26, 2022
7961146
Gemfile: use 'main' as rack/rack default branch
olleolleolle Sep 26, 2022
dacd07d
Gemfile in rack-protection: rack/rack uses 'main'
olleolleolle Sep 26, 2022
b228740
fix: refer to rack/protection directly
olleolleolle Sep 26, 2022
860bac4
Pin haml dev dependency to version 5
jkowens Sep 26, 2022
2619255
Merge pull request #1814 from olleolleolle/patch-4
jkowens Sep 26, 2022
e521b60
Merge pull request #1815 from olleolleolle/patch-5
jkowens Sep 26, 2022
21db005
Rename warn method to warn_for_deprecation
jkowens Sep 26, 2022
6ad41b1
Merge pull request #1818 from jkowens/fix-boot-message
jkowens Sep 26, 2022
3989e2a
CHANGELOG: mark the 3.0.0 release date
olleolleolle Sep 26, 2022
55f423f
Merge pull request #1819 from olleolleolle/patch-4
jkowens Sep 26, 2022
2b659be
3.0.1 release
jkowens Sep 26, 2022
684a1c0
Support Haml 6
jkowens Sep 26, 2022
b8529e2
Merge pull request #1820 from sinatra/haml-6
jkowens Sep 27, 2022
ceb49f0
3.0.2 release
jkowens Oct 1, 2022
441c06a
fix ReDoS
ooooooo-q Oct 8, 2022
0744f26
Inline Templates: need to use `!=` with Haml 6
dentarg Oct 8, 2022
b88c232
Merge pull request #1825 from dentarg/readme/haml-6-fix
jkowens Oct 9, 2022
8ff496b
Merge pull request #1823 from ooooooo-q/fix/redos
jkowens Oct 9, 2022
87dc6af
Update CI URL in README
felixonmars Oct 21, 2022
885756b
Pin Puma to v5 until streaming specs are updated
jkowens Oct 28, 2022
edaca03
Merge pull request #1829 from felixonmars/patch-1
jkowens Oct 28, 2022
82b1d76
CI: Test with Puma 6 but allow it to fail
dentarg Nov 8, 2022
9b5fcd0
CI: include Puma in job name
dentarg Nov 8, 2022
88844e4
CI: shorter job name
dentarg Nov 8, 2022
e328d08
CI: fix typo in job name variable
dentarg Nov 8, 2022
44ff149
Merge pull request #1835 from dentarg/puma-edge-job
jkowens Nov 8, 2022
cafaab9
3.0.3 release
jkowens Nov 11, 2022
42e3eed
Don't run integration specs on falcon against TruffleRuby
andrykonchin Nov 14, 2022
c90f203
Merge pull request #1839 from andrykonchin/ak/skip-falcon-in-specs
jkowens Nov 15, 2022
ea8fc94
escape filename in the Content-Disposition header
namusyaka Nov 23, 2022
bbc1d47
Merge pull request #1841 from sinatra/filename-escaping
jkowens Nov 25, 2022
eca7b54
3.0.4 release
jkowens Nov 25, 2022
d645a2f
Update changelog
jkowens Nov 25, 2022
39ed78f
fix Tilt.register argument order in readme
mharris-figma Nov 30, 2022
4162502
Merge pull request #1842 from mharris-figma/master
jkowens Nov 30, 2022
20cd090
build: harden test.yml permissions
sashashura Dec 8, 2022
5e1e9c0
Install `libyaml-dev` in CI
dentarg Dec 12, 2022
8996f09
Merge pull request #1845 from dentarg/install-libyaml-dev
jkowens Dec 14, 2022
e633936
Add Zeitwerk to CALLERS_TO_IGNORE (#1831)
DawidJanczak Dec 14, 2022
d3357cb
Merge pull request #1843 from sashashura/patch-1
jkowens Dec 14, 2022
0b2c3a7
Allow CALLERS_TO_IGNORE to be overridden
jkowens Dec 15, 2022
186106d
3.0.5 release
jkowens Dec 16, 2022
d964c0d
rack-protection gemspec: Use https URL to homepage
olleolleolle Dec 22, 2022
a81af47
Merge pull request #1849 from olleolleolle/patch-4
jkowens Dec 22, 2022
2ccd0dc
Allow running with Rack 3. (#1811)
ioquatix Dec 23, 2022
c5b8872
Tests against Haml 6
terceiro Dec 24, 2022
69ad250
Merge pull request #1851 from terceiro/test-haml-6
jkowens Dec 24, 2022
b17b050
Skip falcon only for TruffleRuby
andrykonchin Dec 26, 2022
689dde8
Merge pull request #1852 from andrykonchin/ak/fix-skipping-falcon-in-…
jkowens Dec 26, 2022
e2a7e41
CI: add jobs for Rack 2, Puma 5 and Ruby 3.2
dentarg Dec 28, 2022
3977c07
Merge pull request #1854 from dentarg/ci/ruby-3.2-and-puma-5
jkowens Dec 28, 2022
f9fa73d
Revert "Allow running with Rack 3. (#1811)"
dentarg Dec 28, 2022
9b6ba81
Merge pull request #1855 from dentarg/revert-rack3
jkowens Dec 28, 2022
99c1e00
Create CODE_OF_CONDUCT.md
zzak Jan 20, 2023
740b71f
Link to discord
zzak Jan 21, 2023
4a1f8f3
Merge pull request #1860 from sinatra/add-code-of-conduct-1
zzak Jan 21, 2023
b9f64fc
Merge pull request #1861 from sinatra/zzak-patch-1
zzak Jan 21, 2023
5baa1c8
Fix broken spec
jkowens Jan 23, 2023
30982da
Require an approval from a maintainer before merge
zzak Jan 28, 2023
9e1a5fb
Merge pull request #1865 from sinatra/zzak-patch-1
zzak Jan 28, 2023
b9064b9
Add a tab?
zzak Jan 28, 2023
3a8fe89
CI: allow truffleruby-head to fail
dentarg Feb 10, 2023
fdc1757
Add JRuby 9.4 to CI matrix
dentarg Feb 10, 2023
53a4387
CI: allow JRuby 9.4 to fail
dentarg Feb 10, 2023
1cd973f
CI: allow JRuby 9.3 to fail
dentarg Feb 10, 2023
386a479
CI: add ruby-head to matrix (allowed to fail)
dentarg Feb 10, 2023
baa6bf7
Add support to keep open streaming connections with Puma (#1858)
jkowens Feb 10, 2023
f10e571
Minor cleaning setting up tests (#1875)
epergo Feb 12, 2023
e19cad1
Start servers for async tests before running tests (#1876)
dentarg Feb 12, 2023
e1c9036
`Rack::File` -> `Rack::Files` (#1877)
dentarg Feb 15, 2023
0a424f0
CI: handle dependencies the same way, add Tilt to the matrix (#1881)
dentarg Feb 22, 2023
50b8398
CI: Fix up integration stream test for Puma (#1887)
MSP-Greg Feb 22, 2023
892cbeb
Avoid crash in `uri` helper on Integer input (#1890)
dentarg Feb 26, 2023
055087c
Rescue `RuntimeError` when trying to use `SecureRandom` (#1888)
stefansundin Feb 26, 2023
4fc73c3
Update CHANGELOG: Dec 22, 2022 to Feb 26, 2023 (#1891)
dentarg Feb 26, 2023
eef3ba4
CI: Use slim HEAD branch (#1895)
dentarg Mar 5, 2023
65d0ec5
Update broken links in docs (#1897)
dentarg Mar 5, 2023
0c926e6
CI: Use latest liquid release for sinatra-contrib (#1896)
dentarg Mar 5, 2023
89dd6f2
CI: remove redundant Puma job (#1898)
dentarg Mar 5, 2023
c0ee2c3
Rename `master` branch to `main` (#1894)
dentarg Mar 5, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @sinatra/team-sinatra
106 changes: 106 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
name: Testing

on:
push:
branches:
- '**'
pull_request:

permissions:
contents: read # to fetch code (actions/checkout)

jobs:
test:
name: ${{ matrix.ruby }} (Rack ${{ matrix.rack }}, Puma ${{ matrix.puma }}, Tilt ${{ matrix.tilt }})
permissions:
contents: read # to fetch code (actions/checkout)
actions: read # to list jobs for workflow run (8398a7/action-slack)
runs-on: ubuntu-latest
timeout-minutes: 15
strategy:
fail-fast: false
matrix:
puma:
- stable
rack:
- '~> 2'
tilt:
- stable
# 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, 3.2, truffleruby]
include:
# Puma
- { ruby: 3.1, rack: '~> 2', puma: '~> 5', tilt: stable }
- { ruby: 3.2, rack: '~> 2', puma: head, tilt: stable, allow-failure: true }
# Tilt
- { ruby: 3.2, rack: '~> 2', puma: stable, tilt: head, allow-failure: true }
# Due to flaky tests, see https://github.com/sinatra/sinatra/pull/1870
- { ruby: jruby-9.3, rack: '~> 2', puma: stable, tilt: stable, allow-failure: true }
# Due to https://github.com/jruby/jruby/issues/7647
- { ruby: jruby-9.4, rack: '~> 2', puma: stable, tilt: stable, allow-failure: true }
# Never fail our build due to problems with head
- { ruby: ruby-head, rack: '~> 2', puma: stable, tilt: stable, allow-failure: true }
- { ruby: jruby-head, rack: '~> 2', puma: stable, tilt: stable, allow-failure: true }
- { ruby: truffleruby-head, rack: '~> 2', puma: stable, tilt: stable, allow-failure: true }
env:
rack: ${{ matrix.rack }}
puma: ${{ matrix.puma }}
tilt: ${{ matrix.tilt }}
steps:
- name: Install dependencies
run: |
sudo apt-get install --yes \
pandoc \
nodejs \
pkg-config \
libxml2-dev \
libxslt-dev \
libyaml-dev

- uses: actions/checkout@v3

- uses: ruby/setup-ruby@v1
continue-on-error: ${{ matrix.allow-failure || false }}
id: setup-ruby
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true

- name: Run sinatra tests
continue-on-error: ${{ matrix.allow-failure || false }}
id: tests
run: bundle exec rake

- name: Run sinatra-contrib tests
continue-on-error: ${{ matrix.allow-failure || false }}
id: contrib-tests
working-directory: sinatra-contrib
run: |
bundle install --jobs=3 --retry=3
bundle exec rake

- name: Run rack-protection tests
continue-on-error: ${{ matrix.allow-failure || false }}
id: 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
# because continue-on-error marks the steps as pass even if they fail
- name: "setup-ruby (bundle install) outcome: ${{ steps.setup-ruby.outcome }}"
run: ""
- name: "sinatra tests outcome: ${{ steps.tests.outcome }}"
run: ""
- name: "sinatra-contrib tests outcome: ${{ steps.contrib-tests.outcome }}"
run: ""
- name: "rack-protection tests outcome: ${{ steps.protection-tests.outcome }}"
run: ""
19 changes: 11 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
*.log
.DS_Store
# please add general patterns to your global ignore list
# see https://github.com/github/gitignore#readme
.DS_STORE
*.swp
*.rbc
/pkg
/book
/doc/api
/doc/*.html
.#*
\#*
.emacs*
/Gemfile.lock
/coverage
.yardoc
/doc
.bundle
vendor
150 changes: 150 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,150 @@
# The behavior of RuboCop can be controlled via the .rubocop.yml
# configuration file. It makes it possible to enable/disable
# certain cops (checks) and to alter their behavior if they accept
# any parameters. The file can be placed either in your home
# directory or in some project directory.
#
# RuboCop will start looking for the configuration file in the directory
# where the inspected file is and continue its way up to the root directory.
#
# See https://github.com/rubocop-hq/rubocop/blob/master/manual/configuration.md
AllCops:
TargetRubyVersion: 2.6
SuggestExtensions: false
NewCops: enable
Exclude:
- 'test/**/*'
- 'rack-protection/**/*'
- 'sinatra-contrib/**/*'
- vendor/bundle/**/*

Layout/ExtraSpacing:
AllowForAlignment: true
AllowBeforeTrailingComments: true

# Temporary disable cops because warnings are fixed
Style/SingleLineMethods:
Enabled: false

Style/MutableConstant:
Enabled: false

Lint/AmbiguousBlockAssociation:
Enabled: false

Style/CaseEquality:
Enabled: false

Style/PerlBackrefs:
Enabled: false

Style/Documentation:
Enabled: false

Lint/IneffectiveAccessModifier:
Enabled: false

Lint/RescueException:
Enabled: false

Style/SpecialGlobalVars:
Enabled: false

Bundler/DuplicatedGem:
Enabled: false

Layout/HeredocIndentation:
Enabled: false

Style/FormatStringToken:
Enabled: false

Lint/UselessAccessModifier:
Enabled: false

Style/ClassVars:
Enabled: false

Lint/UselessAssignment:
Enabled: false

Style/EmptyLiteral:
Enabled: false

Layout/LineLength:
Enabled: false

Metrics/MethodLength:
Enabled: false

Metrics/AbcSize:
Enabled: false

Metrics/CyclomaticComplexity:
Enabled: false

Metrics/PerceivedComplexity:
Enabled: false

Lint/SuppressedException:
Enabled: false

Metrics/ClassLength:
Enabled: false

Metrics/BlockLength:
Enabled: false

Metrics/ModuleLength:
Enabled: false

Lint/AmbiguousRegexpLiteral:
Enabled: false

Style/AccessModifierDeclarations:
Enabled: false

Style/ClassAndModuleChildren:
Enabled: false

Style/EvalWithLocation:
Enabled: false

Lint/MissingSuper:
Enabled: false

Style/MissingRespondToMissing:
Enabled: false

Style/MixinUsage:
Enabled: false

Style/MultilineTernaryOperator:
Enabled: false

Style/StructInheritance:
Enabled: false

Style/SymbolProc:
Enabled: false

Style/IfUnlessModifier:
Enabled: false

Style/OptionalBooleanParameter:
Enabled: false

Style/DocumentDynamicEvalDefinition:
Enabled: false

Lint/ToEnumArguments:
Enabled: false

Naming/MethodParameterName:
Enabled: false

Naming/AccessorMethodName:
Enabled: false

Style/SlicingWithRange:
Enabled: false
5 changes: 5 additions & 0 deletions .yardopts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
--readme README.md
--title 'Sinatra API Documentation'
--charset utf-8
--markup markdown
'lib/**/*.rb' - '*.md'
43 changes: 0 additions & 43 deletions AUTHORS

This file was deleted.

Loading