Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Commits on Mar 20, 2011
@filp filp Added PT-PT README file based off the existing PT-BR one.
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
157df10
@rkh rkh bump version 6ab5067
@rkh rkh let rake thanks figure out commit ranges on its own 47dacdd
Commits on Mar 21, 2011
@rkh rkh let #uri and #redirect accept other schemas
Conflicts:

	CHANGES
c1c02ee
@rkh rkh do not use url alias internally 0e2f2bd
@rkh rkh fix encoding tests, #new no longer returns an instance of Sinatra::Base e97c3fb
Commits on Mar 25, 2011
@rkh rkh Improve handling of Accept header:
* allow wild cards
* respect preferences
* treat both text/xml and application/xml as xml
* treat both text/javascript and application/javascript as js

This impacts mainly the `provides` condition, but should improve the behavior
of any code using Request#accept and or Request#preferred_type.

Tests included.
Fixes #230.
9808369
@rkh rkh update changes cf47e56
@rkh rkh Handles `Content-Type` strings that already contain parameters correc…
…tly in

`content_type` (example: `content_type "text/plain; charset=utf-16"`).
abb5f3a
Commits on Mar 28, 2011
@rkh rkh change middleware default order b6b0414
@rkh rkh cache request object 82a7b8e
@rkh rkh use settings instead of self.class f3adfb6
Commits on Mar 29, 2011
@rkh rkh document Sinatra.new 29629ec
@rkh rkh regenerate gemspec c28578a
@gnandretta gnandretta document Sinatra.new in spanish readme
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
e016efd
Commits on Mar 30, 2011
@rkh rkh handle empty route patterns as expected without breaking rails 3 comp…
…atibility, fixes #231
f438be2
@rkh rkh typo f2b494b
Commits on Apr 08, 2011
@rkh rkh use proper links to images on error pages fe9a77d
@rkh rkh regenerate gemspec 85fc855
@rkh rkh 1.2.2 release a271e8e
Commits on Apr 13, 2011
@rkh rkh check JS availability for CoffeeScript tests properly caa0ec2
@rkh rkh add link to rubydoc.info, fixes #218 e29ba3e
@rkh rkh accept values pretending to be a Numeric (like ActiveSupport::Duratio…
…n), fixes #236

Conflicts:

	CHANGES
3c2d92c
@rkh rkh make time_for always raise an ArgumentError if something goes wrong
Conflicts:

	test/helpers_test.rb
f467587
@rkh rkh fix failing spec 420ff6c
@rkh rkh typo 904b280
@rkh rkh allow setting tilt version via env var 1c1fa17
@rkh rkh prepare for Tilt 1.3 (while remaining compatible with 1.2) 94bdb1c
@rkh rkh missing templates only raise Errno::ENOENT
plus that did not work anyways
9773e20
@rkh rkh update CHANGES bed6292
@vaudoc vaudoc Remove has_rdoc= method from gemspec
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
c3fa2f3
@rkh rkh update CHANGES f30a820
@rkh rkh 1.2.3 release 95d5205
Commits on Apr 17, 2011
@rkh rkh language 548e9db
@rkh rkh avoid nil.dup in Gemfile ea5f168
@rkh rkh disable session_secret for Sinatra::Application in development mode (…
…makes sessions usable out of the box with shotgun)
b50c707
@rkh rkh don't cache request object in env, fixes #239
Conflicts:

	CHANGES
4cdef85
@gnandretta gnandretta add link to rubydoc.info in spanish readme
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
696acf2
@rkh rkh detect whether a second argument was passed to #set correctly 5432f57
@rkh rkh make Sinatra::Delegator play nice with method_missing proxies, fixes …
…#245

Conflicts:

	lib/sinatra/base.rb
	test/delegator_test.rb
fafc797
@rkh rkh use respond_to? rather than arity checks to play nice with method_mis…
…sing proxies

Conflicts:

	lib/sinatra/base.rb
	test/delegator_test.rb
5fa4a15
@rkh rkh update CHANGES d2d0ac3
@rkh rkh env is accessable directly, no need to use request.env
Conflicts:

	README.ru.rdoc
a6659f4
@rkh rkh better test name 60dc8d4
@rkh rkh test and fix #call example
Conflicts:

	README.ru.rdoc
8467547
@rkh rkh set encoding for yard, fixes #244 fed7bea
@rkh rkh bump version 35cc045
Commits on Apr 18, 2011
@burningTyger burningTyger German Readme - rubydoc link for API
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
7aab4b1
Commits on Apr 20, 2011
@gnandretta gnandretta document static default value in spanish readme
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
5c66553
Commits on Apr 27, 2011
@zzak zzak add book and book-contrib to 'further reading'
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
5548b61
Matthew Sullivan Updated year to 2011 5f90f31
@rkh rkh Leave HEAD method logic to Rack::Head
Conflicts:

	lib/sinatra/base.rb
75fe6c5
@nusco nusco Removed corner case with HEAD method and Content-Length 5d13fab
@rkh rkh update changes 124777f
Commits on Apr 29, 2011
@remiprev remiprev Replace a single quotation mark with an apostrophe in 404 ff4d8e3
Commits on Apr 30, 2011
@rkh rkh special character in heredoc causes 1.9.2 to raise a SyntaxError 7b49463
@rkh rkh use define_method rather than eval for delegation e699635
@rkh rkh update changes 7693b8b
@rkh rkh 1.2.4 release a8d5ef8
@rkh rkh README markup fix
Conflicts:

	README.de.rdoc
	README.fr.rdoc
ab2a2ed
@rkh rkh restore 1.8.6 compatibility c562619
Commits on May 01, 2011
@rkh rkh fix broken delegation ad9b819
@rkh rkh remove delegation test for patch
screwed up git co + modify in a single commit, sorry
644432a
@rkh rkh 1.2.6 release 56019db
Commits on May 02, 2011
@rkh rkh improve mime_type example 88e934e
@baldowl baldowl README markup tweaks. 85311a6
@baldowl baldowl Tweaked :locals example. 399f8c0
@baldowl baldowl Fixed middleware example. 544e72a
@rkh rkh remove 0.9 related note from readme 53ac868
@rkh rkh 'admin' == params[:password] looks strange, swap order 6ec0229
Commits on May 03, 2011
@phiggins phiggins Fix link to Rack::Test docs. 482cd9e
@rkh rkh allow setting rack dependency with env var (for CI) 9ca16a8
@rkh rkh rack.sessions.options no longer contains :secret in 1.3 9f1e382
@rkh rkh more explicit pattern for generated code adba271
@rkh rkh do not load gemspec in Gemfile 649b6fb
@rkh rkh RedCloth has issues on 1.9.3 ff43387
@rkh rkh adjust gemfile for 1.8.6 8fb2d96
Commits on May 09, 2011
@rkh rkh Revert "rack.sessions.options no longer contains :secret in 1.3"
This issue has been fixed in Rack

This reverts commit 9f1e382.
a490030
Commits on May 10, 2011
@rkh rkh make the bundle install on macruby
Conflicts:

	Gemfile
4d2a3ce
Commits on May 12, 2011
@rkh rkh links to middleware listings 29c4e5d
@rkh rkh fix readme markup 1a7486a
Commits on May 13, 2011
@rkh rkh fix Response#finish 9348aa4
@rkh rkh small refactoring bf2abfc
Commits on May 17, 2011
@ishikawa ishikawa Added wildcard pattern with block parameters in README c44b5c6
@ishikawa ishikawa Added wildcard pattern with block parameters in README (ja) 40a4b58
@rkh rkh bump version e2d6ac2
@rkh rkh regenerate gemspec bf913de
Commits on May 19, 2011
@asquared asquared Print diagnostic messages to STDERR, not STDOUT
This permits Ruby scripts that use Sinatra to interface to other programs
via STDIN and STDOUT.
753601f
@rkh rkh prepare readme for 1.3 release 9a76c21
@rkh rkh add 1.2.7 to changes 2851423
@rkh rkh fix markup 2ef952c
Commits on May 20, 2011
@rkh rkh 1.8.6 does not support Symbol#to_proc
this went previously unnoticed since one of our optional dependencies takes the liberty of implementing it
30036c4
@rkh rkh update changes d5d3c78
@rkh rkh do not use git version in Gemfile if env vars for tilt or rack is not…
… set

Conflicts:

	Gemfile
15dca9c
Commits on May 29, 2011
@rkh rkh instance_eval in invoke no longer needed, now that we use the same lo…
…gic for filters and routes
d478324
@rkh rkh don't store date in gemspec, that way regenerating doesn't necessaril…
…y cause a new commit

Conflicts:

	sinatra.gemspec
7d2eacc
Commits on May 30, 2011
@timfel timfel Require test_helper in delegator_test.rb f6d81d7
Commits on Jun 01, 2011
@rkh rkh adjust readme examples so they work with 1.9.2 even if pwd is not on …
…the path
2145390
@rkh rkh depend on rake 0.8 dd21d96
@leereilly leereilly Corrected grammar; replaced 'heavily recommended' with 'highly recomm… 2c10307
Commits on Jun 04, 2011
@dekellum dekellum Use Templates.initialize to init @default_layout without warning 0a3a099
@rkh rkh call super in Template#initialize, too cde02d8
@rkh rkh less 2.0 is not supported atm 9e163f5
Commits on Jun 05, 2011
@gaku gaku Removed untranslated words and updated the Japanese translation. 98991d3
@rkh rkh also set charset for json bc89779
@rkh rkh whitespace 542c489
@rkh rkh call encode! directly after force_encoding to play
nice with the internal encoding
dd10b89
@rkh rkh do not downcase the server name 003e134
@rkh rkh update changes afd2117
@dekellum dekellum Init @range in StaticFile to avoid warning
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
87c57c2
Commits on Jun 09, 2011
@rkh rkh improve rake authors e3f7485
@rkh rkh clean up gitignore a288d7a
@timfel timfel add a test:core task to quickly run core tests (e.g non-template-engi…
…ne tests)
6b4501e
@timfel timfel add ci_reporter, so you may have nice junit reports on the CI b18cebe
@timfel timfel Make CI Reporter optional b727870
Commits on Jun 10, 2011
@rkh rkh allow StaticFile#close to be called multiple times 66fac5b
Commits on Jun 16, 2011
@rkh rkh silence logs in server_test.rb again 7c8826a
@rkh rkh allow using Module#public with arguments d443e6a
@rkh rkh set default commit range for rack authors 11993a7
Commits on Jun 17, 2011
@rkh rkh nokogiri no longer supports 1.8.6 4117d6e
@rkh rkh fix indentation 2772cca
Commits on Jul 21, 2011
@rkh rkh raise exception if port passed to -p is not a valid integer a4be4eb
@rkh rkh wording f374adf
@rkh rkh point out that the example is a config.ru in the README, fixes #313 5b74aae
@rkh rkh list of known issues 8f7624a
@gaku gaku Clean up nokogiri unit test.
- Used %(...) for readability.
- Removed unused local variable.
d2f84b1
@rkh rkh do not rely on to_ary, restores compatibility with Rails 3.1, fixes #…
…325 and #326
770cdcd
@rkh rkh dont run against nokogiri 1.5.0 on jruby 5dafb15
@rkh rkh add travis config 19f0695
@rkh rkh do not combine different tilt version with different rack versions of…
… travis for now
25040ab
Commits on Aug 21, 2011
@aledalgrande aledalgrande Added optional parameter info to the README 495d5e5
@lukejahnke lukejahnke rack's normalize_params can raise an exception which can result
in req.GET and req.POST being nil. This was not handled.
bbe70a6
@rkh rkh fix tests for slim 1.0 a22bd28
@rkh rkh run against 1.9.3 on travis 659a450
@yb66 yb66 added example for condition with array argument df866ad
@rkh rkh fix teapot example
Conflicts:

	README.ru.rdoc
696d895
@rkh rkh 205 no longer sends a body, as per RFC 2616 b5053f2
Commits on Aug 22, 2011
@rkh rkh update changes (1.2.7) 7e6bb6e
Commits on Aug 23, 2011
@Igneous Igneous fix readme: enable :session => enable :sessions
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
8197e2c
Commits on Sep 14, 2011
@rkh rkh fix tests to work with Slim 1.0.2 bb1241f
@rkh rkh remove KNOWN_ISSUES 60e3fa2
@rkh rkh add tests to check compatiblity with Rack::Lock, related to #352 190d973
@rkh rkh fix test for rack master (status 205 no longer is allowed to have a b…
…ody)
27206ab
Commits on Oct 01, 2011
@rkh rkh 1.2.7 release a25bff1
Commits on Oct 11, 2011
@timfel timfel stick to RDoc < 3.10 1b72c7c
@rkh rkh Merge pull request #384 from timfel/1.2.x
Stick to RDoc < 3.10
2165ac0
Commits on Oct 14, 2011
@nbaum nbaum Don't leave @default_layout set to false if rendering a template fails. 4384dda
@rkh rkh add release date a0736bf
@rkh rkh add CHANGES check to release task a6395a8
Commits on Oct 15, 2011
@rkh rkh fix CHANGES check 2b8dc06
@rkh rkh update changes
Conflicts:

	CHANGES
e913e53
@rkh rkh Merge branch '1.2.x' of github.com:sinatra/sinatra into 1.2.x 19bb478
Commits on Dec 30, 2011
@rkh rkh update version b7fb015
@rkh rkh Rack 1.4 returns Content-Length: 0 for HEAD requests c191a26
@rkh rkh update changes 828ec5f
@rkh rkh adjust tests for recent coffee script aa2d5f4
@rkh rkh 1.2.8 release ab140ae