Sinatra 1.4.0 #645

Closed
wants to merge 498 commits into
from
rkh and others added some commits Jul 18, 2012
@rkh rkh Merge pull request #550 from etehtsea/trailing-whitespaces
Remove trailing whitespaces
69c0d0a
@vast vast README.ru: don't encourage disabling rack-protection 901bb4e
@rkh rkh Merge pull request #552 from vast/ru-readme-sync
README.ru: don't encourage disabling rack-protection
91bce0b
@rkh rkh switch the jdk 3128206
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 4d40a5e
@neektza neektza Update lib/sinatra/base.rb
Spelling.
cb6c4c6
@rkh rkh use $PORT if set d3de670
@rkh rkh Merge pull request #554 from neektza/master
Just a tiny spelling fix.
7e8920f
Michael Klishin Disable invokedynamic for now
@rkh knows what this is about. JRuby folks agree this is a good idea for
now.
01bbd46
@rkh rkh Merge pull request #555 from michaelklishin/patch-1
Disable invokedynamic for now
84110e2
@rkh rkh switch back to default jdk 6fed1d7
@rogeriozambon rogeriozambon Some changes and corrections in PT-BR documentation 199dbe0
@rkh rkh Merge pull request #557 from rogeriozambon/master
Some changes and corrections in PT-BR documentation.
f3007c0
@burningTyger burningTyger update German README 1746084
@burningTyger burningTyger typo in README 8a216bc
@rkh rkh Merge pull request #558 from burningTyger/master
README update and typo
d1e72d3
@timfel timfel MagLev doesn't #expand __FILE__ like it should 37e7d43
@rkh rkh Merge pull request #561 from timfel/fix-settings-test-maglev
MagLev doesn't #expand __FILE__ like it should
08be86a
@timfel timfel omit wlang and rabl when running on MagLev 89ed0fd
@rkh rkh Merge pull request #562 from timfel/master
Omit wlang and rabl when running on MagLev
f383fac
@rkh rkh update changes 49857fb
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 5b59546
@rkh rkh update AUTHORS 4184074
@svenfuchs

nice :)

kgrz and others added some commits Sep 4, 2012
@kgrz kgrz Issue #542
#542. request["SOME_HEADER"]
is a little confusing since the [] operator on request object is a 
shortcut to the params hash. And thus, request["key"] is same as 
params["key"]. Updated the same thing.
6ec1aa4
@rkh rkh Merge pull request #569 from kgrz/patch-2
Fixes #542
ddbba34
@Wolg Wolg Update Russian README d54bee2
@Wolg Wolg Typo in README 469e3f8
@rkh rkh Merge pull request #571 from Wolg/docs-fixes
Russian README update and typo
0ce805a
@ferrous26 ferrous26 Fix typo "controll_tower" to "control_tower"
The typo was preventing automatic selection of ControlTower
when it was available.
a191e15
@rkh rkh Merge pull request #572 from ferrous26/patch-1
Fix typo "controll_tower" to "control_tower"
19e8a29
@zzak zzak update sinatra ci server url 18fc8f9
@rkh rkh Merge pull request #573 from zzak/master
update sinatra ci server url
ecf0e9b
@rkh rkh do not use hash-bang in travis ci urls 49a4154
@zzak zzak Templates: render should fall back to engine layout #563 d8f1d8e
@rkh rkh Merge pull request #574 from zzak/fallback_to_engine_layout
Templates: render should fall back to engine layout sinatra/sinatra#563
2847673
@rkh rkh allow engine specific layout to be true, too 1e0a647
@acco acco Add a note for tests with modular setup 48a386c
@acco acco fix indentation 39ce567
@rkh rkh also delegate register 38f7124
@rkh rkh typo cdd4618
@splattael splattael Fix 2 broken links in all READMEs. 1d5f8bd
@modrachel modrachel Adding link to wikipedia DSL article.
Signed-off-by: Dan Buch <d.buch@modcloth.com>
0202557
@rkh rkh reduce build matrix, depend on newer rack abf87d7
@rkh rkh don't run wlang on rbx in 1.9 mode 3f23182
@rkh rkh fix test name generation for tilt master 8d6b69c
@rkh rkh also add file name to inline send_file 461dafa
@rkh rkh adjust response tests for edge rack 7e53bee
@blambeau

I'll try to fix wlang for that. I think it's related to a citrus bug in rbx. I'll investigate.

Sinatra member

Sweet!

rkh and others added some commits Dec 13, 2012
@rkh rkh add notes about rackup, fixes #313 49eac3a
@rkh rkh Merge pull request #590 from splattael/patch-1
Fix 2 broken links in all READMEs
e7607a4
@rkh rkh Merge pull request #579 from acco/master
Add a note for tests with modular setup
c40fc9f
@rkh rkh Merge pull request #535 from yeban/stream_closed
add closed? method on Stream object to inspect the object's open/close state
d2e8563
@rkh rkh Merge pull request #592 from modclothpair/intro-dsl-link
Adding link to wikipedia DSL article.
a71b044
@msysyamamoto msysyamamoto Fix typo "whitout" to "without". 13a6a9d
@rkh rkh Merge pull request #597 from ymmtmsys/fix_typo
Typo in AUTHORS
a8de3f2
@yeban yeban README: use long polling to exemplify streaming API.
[Long polling][1] is a simple, practical use case of `stream` helper with the
optional `keep_open` parameter.  Let's use it to exemplify streaming API, so it
is easier to understand and use.

[1]: http://en.wikipedia.org/wiki/Push_technology#Long_polling

Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
d4ae7f0
@yeban yeban Fix a typo in Stream class's documentation.
Signed-off-by: Anurag Priyam <anurag08priyam@gmail.com>
248e0ea
@rkh rkh Merge pull request #599 from yeban/update_stream_documentation
Update stream documentation
08373e8
@raggi raggi Update Sinatra::Response#finish for Rack 1.5 aea6649
@rkh rkh Merge pull request #603 from raggi/rack-1.4
Update Sinatra::Response#finish for Rack 1.5
3d0cef2
@foca foca Allow URI objects as redirect targets 84dcea3
@rkh rkh Merge pull request #605 from foca/master
Allow URI objects as redirect targets
9984d0d
@sonots sonots dup 6cbff56
@zaki zaki [FIX] Make route parsing regex more robust
- fixes sinatra/sinatra/#611
- adds support for case-insensitive URL encoding
f079ce1
@rkh rkh Merge pull request #613 from sonots/no_destructive_halt
Fix halt(invoke) breaks its argument
eed4f71
@zaki zaki [FIX] Support ruby 1.8 in routing regex d983c72
@kgrz kgrz Changed the README from .rdoc to .md
Did this manually so I think I got most of the conversion right.

Fixes #607

Squashed commit of the following:

commit e0cbf22
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Sun Jan 20 06:16:26 2013 +0530

    Removed the <li> tag for the markdown template list

commit f999620
Merge: 95ab367 eed4f71
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Sun Jan 20 06:06:39 2013 +0530

    Merge branch 'master' of git://github.com/sinatra/sinatra

commit 95ab367
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Fri Jan 11 07:53:31 2013 +0530

    Fixed a typo

commit 90a3350
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Fri Jan 11 07:44:22 2013 +0530

    <pre> tags break the whole layout. Replacing them with <tt> tags

commit e47cfff
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Fri Jan 11 07:18:10 2013 +0530

    <pre> tags break the whole layout. Testing out <tt> tags

commit 40f59da
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Fri Jan 11 06:59:02 2013 +0530

    Added the html definition lists

commit 63a18c4
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Fri Jan 11 03:39:57 2013 +0530

    Testing out some HTML in Markdown

commit 8d9442b
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Thu Jan 10 01:14:16 2013 +0530

    Trying out code blocks instead of Rdoc tables

commit 766c80f
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Thu Jan 10 00:40:48 2013 +0530

    Fixed some more errors.

commit 2e9dc82
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Thu Jan 10 00:39:25 2013 +0530

    Fixed some more errors.

commit f12333b
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Thu Jan 10 00:33:47 2013 +0530

    Fixed a typo and finished the conversion.

commit 7283064
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Thu Jan 10 00:31:52 2013 +0530

    First walkthrough done.

commit a43f41f
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 22:32:34 2013 +0530

    First walkthrough done.

commit eb73fe0
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 22:24:59 2013 +0530

    testing blockquote

commit 3cb91c4
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 22:19:21 2013 +0530

    testing blockquote

commit ae91193
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 21:49:19 2013 +0530

    testing blockquote

commit 64a659c
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 21:48:02 2013 +0530

    testing blockquote

commit 8d718ef
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 21:42:17 2013 +0530

    testing blockquote

commit 0b16fc5
Author: Kashyap <kashyap.kmbc@gmail.com>
Date:   Wed Jan 9 21:37:55 2013 +0530

    rdoc to md conversion in progress

Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
459369e
@robin850 robin850 Rewrite the french README in Markdown 8007519
@rkh rkh Merge pull request #616 from robin850/master
Rewrite the french README in Markdown
3f97416
@rkh rkh Merge pull request #614 from zaki/fix-routing-regex
Fix routing regex
5a346b7
@rkh rkh default response content type to html even with newest rack 8a5895c
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 590a90b
@rkh rkh unloadable library might raise NameError in tilt master a099dff
@rkh rkh do not call super in Response#finish to avoid infinite loop or body p…
…roxy
a43f570
@rkh rkh make sure we support escaped new lines, closes #568 8dcb3f6
@rkh rkh disable wlang on rbx in 1.8 mode, too 5e49f33
@rkh rkh rbx-19mode is segfaulting on travis 3a27c08
@rkh rkh rubinius is segfaulting 1c7a06e
@burningTyger burningTyger convert README.de to markdown fe258f2
@burningTyger burningTyger fix broken links in README.md 5998744
@burningTyger burningTyger remove 1.8 -rubygems cli argument from READMEs 07ffaf7
@rkh rkh Merge pull request #624 from burningTyger/md
German README converted to MD, some links fixed and -rubygems removed.
140560d
@burningTyger burningTyger remove German rdoc README
It was replaced with a markdown version of it in fe258f2
d290e43
@rkh rkh Merge pull request #625 from burningTyger/master
remove old German rdoc readme
bac3f4f
@pvande pvande Bringing Accept header parsing in line with the spec. 43de6d2
@pvande pvande Ensuring that generated Content-Type headers properly escape params. 7721545
@pvande pvande Exposing Accept header parameters. b7c615c
@pvande pvande Simplifying regular expression to silence warnings. 61e4a87
@richo richo Explicitly set falsy values for :template should not render a template acf57eb
@mcfiredrill mcfiredrill code typo in streaming example in README 98cd315
@rkh rkh Merge pull request #629 from mcfiredrill/streaming-code-readme-typo
code typo in streaming example in README
189bce4
@mcfiredrill mcfiredrill chat example: .live is removed in latest jquery, use .submit 74b3012
@vast vast convert README.ru.rdoc to README.ru.md 7182ea3
@vast vast fix code blocks in README.ru.md 75c1378
@postmodern postmodern Default host to localhost when in development mode.
* Running Rack apps on 0.0.0.0 in development mode will allow malicious
  users on the local network (ex: Coffee Shop) to abuse or potentially
  exploit the app. Safer to default host to localhost when in development
  mode.
0f9a959
@akicho8 akicho8 Update README.jp.rdoc c8c6401
@vast vast typos in README.ru.md b940891
@rkh rkh Merge pull request #635 from akicho8/patch-1
Update README.jp.rdoc
41c3f40
@rkh rkh Merge pull request #636 from vast/readme-ru-md
Convert README.ru.rdoc to markdown
cafaf90
@rkh
Sinatra member

Also: need to check contrib compatibility.

@rkh
Sinatra member

<3

kgrz and others added some commits Feb 27, 2013
@kgrz kgrz Added a div tag around the ToC that makes it easy to hide in sinatra'…
…s website intro.html
7c93bb6
@rkh rkh Merge pull request #650 from kgrz/master
Adding a div tag around the ToC in english Readme
6737bb2
@rkh rkh Update README.md 9ff9340
@rkh rkh Update README.md 9a15667
@rkh rkh bump dependency versions 740e47f
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 3756e10
@gcapizzi gcapizzi Convert spanish README to Markdown 4e73e01
Neil West changed Hungarian README to markdown. 02eaaa5
Neil West removing the original README.hu.rdoc file
after creating the markdown version.
b9ece69
@rkh rkh Merge pull request #652 from nonzer0/readme-hungarian-to-markdown
Readme hungarian to markdown
d866259
@rkh rkh Merge pull request #651 from gcapizzi/spanish_readme_md
Convert spanish README to Markdown
2934b65
@rkh rkh less 1.x is no longer supported by tilt 999ce5e
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 1fdbd11
@gcapizzi gcapizzi Convert brasilian portuguese README to Markdown 30f2189
@rkh rkh Merge pull request #655 from gcapizzi/brasilian_readme_md
Convert brasilian portuguese README to Markdown
754e6aa
@rkh rkh remove obsolete README.pt-br.rdoc 10cab5f
@yb66 yb66 First convert. abf2c65
@yb66 yb66 Change extension. 783c8b7
@yb66 yb66 Removed bit of unneeded RDoc stuff at bottom. 5924655
@gcapizzi gcapizzi Convert european portuguese README to Markdown 68404ae
@gcapizzi gcapizzi Remove obsolete portuguese RDoc README 2077ad4
@rkh rkh Merge pull request #657 from gcapizzi/portuguese_readme_md
Convert european portuguese README to Markdown
d27b616
@rkh rkh Merge pull request #656 from yb66/convert-jp-rdoc-to-md
Convert jp rdoc to md
f8c0385
@patriciomacadden patriciomacadden Use `headers` instead of `header`, since in `Rack::Response` `headers…
…` is an alias for `header` and `headers` is widely used in Sinatra. It's confusing that in `Sinatra::Response#finish` both `headers` and `header`.
9ce004f
@bkabrda bkabrda Fix test failures with RDoc 4 broken by commit rdoc/rdoc@7f0033d 11f90fd
@rkh rkh Merge pull request #659 from patriciomacadden/header-headers
Use `headers` method instead of `header` method in `Sinatra::Response`
08effab
@gcapizzi gcapizzi Convert Chinese README to Markdown 5556dfc
@rkh rkh Merge pull request #661 from gcapizzi/chinese_readme_md
Convert Chinese README to Markdown
2b9cf93
@rkh rkh Merge pull request #660 from bkabrda/master
Fix tests with RDoc 4
5540c80
@rkh rkh test pass with rdoc 4 now 9f1cdab
@rkh rkh Revert "test pass with rdoc 4 now"
This reverts commit 9f1cdab.
aac16b7
@rkh rkh use rdoc 3.x on 1.8 d7273e2
@patriciomacadden patriciomacadden fix gemfile source. 8f19104
@loveky loveky move the form tag before script tag
currently this demo is not working, this is because when $("form") bind "submit" event, the form tag is not in DOM yet. Need to move form before the binding.
bfabbe7
@rkh rkh Merge pull request #662 from patriciomacadden/gemfile-source
Fix Gemfile source
22056c5
@rkh rkh Merge pull request #663 from loveky/master
examples/chat.rb is not working
6017973
@patriciomacadden patriciomacadden Silence Rack::Session::Cookie warnings 955b33a
@rkh rkh Merge pull request #665 from patriciomacadden/silence_cookie_warning
Silence Rack::Session::Cookie warnings when running the tests
b70a68a
@rkh rkh update changes be1df62
@rkh rkh add support for LINK and UNLINK requests 82009d4
@rkh rkh fix rake thanks cf628dd
@patriciomacadden patriciomacadden add therubyracer gem to Gemfile. ba29af0
@patriciomacadden patriciomacadden seems like therubyracer does not work on jruby and rubinius f8e6c87
@rkh rkh Merge pull request #666 from patriciomacadden/gemfile-therubyracer
Add therubyracer gem to Gemfile
a9fd92f
@patriciomacadden patriciomacadden add redcarpet gem to Gemfile 94573ae
@patriciomacadden patriciomacadden add bluecloth to Gemfile 8ce6494
@rkh rkh Merge pull request #668 from patriciomacadden/gemfile-bluecloth
Add bluecloth to Gemfile
b6258c3
@burningTyger burningTyger README some small fixes 9e1dfdd
@burningTyger burningTyger update German Readme 3fecf44
@rkh rkh Merge pull request #669 from burningTyger/master
update German Readme and some small English Readme fixes
020ba9f
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra
Conflicts:
	Gemfile
9543429
@rkh rkh server can have different defaults now 5c60c8b
@rkh rkh update Requirement section 97908b6
@rkh rkh fix markup c7e6e50
@rkh rkh fix section hierarchy in readme 52d29c8
@rkh rkh update list of http methods 2a4811b
@rkh rkh make AcceptEntry behave like string a045a3f
@burningTyger

Has [] been dropped now or is it available via Rack?

Sinatra member

[] has not been tested nor documented, nor has it been part of a release yet. With this commit, [] will behave like Stinrg#[]. Note that this is params on the AcceptEntry, not on Request.

Sinatra member

ah, ok. Should've checked more carefully. Assumed it was on Request.

rkh and others added some commits Mar 10, 2013
@rkh rkh fix test for Ruby 2.0 84a0da3
@rkh rkh avoid test name collision 3223f19
@rkh rkh avoid to_enum warning on 2.0 397dbc7
@rkh rkh use render_app instead of mock_app in test 8fa3c5c
@rkh rkh make use mime_type returns a string or nil f1538bf
@patriciomacadden patriciomacadden Fix integration tests for Net HTTP Server. d4d6fbc
@patriciomacadden patriciomacadden net-http-server logs to $stderr! ead974d
@erikj erikj correcting spelling
s/plus sing/plus sign/
271d204
@rkh rkh Merge pull request #672 from erikj/master
correcting spelling
bf66797
@patriciomacadden patriciomacadden net-http-server is not a dependency when RUBY_VERSION == 1.8.7 || RUB…
…Y_ENGINE =~ /jruby|rbx/
dbfa507
@rkh rkh Merge pull request #671 from patriciomacadden/fix-integration-tests
Fix integration tests for Net HTTP Server.
9fbb92f
@kgrz kgrz changed fenced code blocks style to ensure proper parsing downstream …
…at sinatra.github.com

chinese fixes
b5d5fe8
@rkh rkh Merge pull request #674 from kgrz/master
Chinese, Korean, Russian Markdown fixes
13f8796
@nesquena nesquena Adds failing test for after filters 6f315b6
@nesquena nesquena Fixes #673 and adds additional test for before filter 854c32c
@rkh rkh Merge pull request #678 from nesquena/fix_exception_handling_for_filters
Fix exception handling for filters
54d6ba0
@patriciomacadden patriciomacadden fix HEADER_VALUE_WITH_PARAMS regex and added a test case for this regex. 05c16d5
@patriciomacadden patriciomacadden add support for mime types with dots, hyphens and plus signs. 939eae4
@rkh rkh Merge pull request #679 from patriciomacadden/provides
Fix HEADER_VALUE_WITH_PARAMS regex and added a test case for this regex.
8874666
@vipulnsward vipulnsward Cleanup unused variables ef2c389
@vipulnsward vipulnsward Just some typos, here and there! 4fa3d9a
@rkh rkh Merge pull request #681 from vipulnsward/cleanup_typos
Just some typos, here and there!
1df2037
@rkh rkh update changes 3735c2a
@rkh rkh fix headings in German readme 4ed68f6
@rkh rkh add toc to german readme cf466f5
@rkh rkh fix headings in russian readme, I hope d0a5ad3
@vipulnsward vipulnsward Use |_| instead of vars; fix typo ce4ad87
@rkh rkh Merge pull request #680 from vipulnsward/cleanup_tests
Cleanup unused variables
623adfd
@rkh rkh add 1.2.9 changes 2963213
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 652d340
@rkh rkh add 1.3.6 changes b15039e
@rkh rkh set release date 1f8854f
@rkh rkh 1.4.0 release db50598
@rkh rkh closed this Mar 15, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment