87f8cd3937973090b84876996cc7e430bd5d744b Adam Wiggins adam@heroku.com http://github.com/adamwiggins/sinatra/commit/f43810597503a048fbe6b0dd20cec86e53f55906 f43810597503a048fbe6b0dd20cec86e53f55906 2008-06-23T13:47:47-07:00 2008-06-08T04:02:28-07:00 convert tabs to spaces on the exception template d389afa3120089c81dc645997c9a592d4e261933 Adam Wiggins adam@heroku.com cb8441e0cbd9c2f6816d79434f29c243e720831d bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/87f8cd3937973090b84876996cc7e430bd5d744b 87f8cd3937973090b84876996cc7e430bd5d744b 2008-06-22T17:48:31-07:00 2008-06-22T17:48:31-07:00 converting env from command-line to symbol. [cypher] This fixes the problem when running an app with -e development bd066a633f34d5b38f8eeccc556a429f29b24029 bmizerany blake.mizerany@gmail.com 4ea9c9ff0b60a8c7721c2a98d778b52a0e9b1faf 47a48df6dff8a2c8c40b6b641d23b8dd6e0f3a9a Ryan Tomayko rtomayko@gmail.com http://github.com/adamwiggins/sinatra/commit/cb8441e0cbd9c2f6816d79434f29c243e720831d cb8441e0cbd9c2f6816d79434f29c243e720831d 2008-06-22T15:53:23-07:00 2008-06-22T15:53:23-07:00 Merge commit 'cschneid/app_file_option' into pu cd1e2ad716c4c0ac2f0b0d72c96fea5b3bbd2d60 Ryan Tomayko rtomayko@gmail.com c705cfde8a9244c168b78d17e2a87e00aa01bf76 b404b0a78e26bb9ccddfe655ba45072e97c6db7d Ryan Tomayko rtomayko@gmail.com http://github.com/adamwiggins/sinatra/commit/4ea9c9ff0b60a8c7721c2a98d778b52a0e9b1faf 4ea9c9ff0b60a8c7721c2a98d778b52a0e9b1faf 2008-06-22T15:37:59-07:00 2008-06-22T15:37:59-07:00 Merge commit 'cschneid/master' into pu d33f7b819fb67c821b38aa733a197a1d10e43408 Ryan Tomayko rtomayko@gmail.com ea3239c88f8a85f82cc891589bc6ad1c339719e8 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/b404b0a78e26bb9ccddfe655ba45072e97c6db7d b404b0a78e26bb9ccddfe655ba45072e97c6db7d 2008-06-07T22:24:32-07:00 2008-06-07T22:18:07-07:00 Small tweak to server method to fall back on exactly what the user sets via 'set :server, handler' if Rack::Handler::Thing doesn't exist. This lets special capitalziation cases like FastCGI, CGI, and WEBrick be handled easily. 4355a98512fdeb5eb4b5421ba9c574e99b70992a Chris Schneider chris@christopher-schneider.com ea3239c88f8a85f82cc891589bc6ad1c339719e8 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/c705cfde8a9244c168b78d17e2a87e00aa01bf76 c705cfde8a9244c168b78d17e2a87e00aa01bf76 2008-06-04T16:06:08-07:00 2008-06-04T16:06:08-07:00 Add a host option to define the ip to bind to, defaults 0.0.0.0, which is code for 'all of them' 5e51803eccd69f0678cb52105744c8400df80b38 Chris Schneider chris@christopher-schneider.com 6785a05d5388052981863246756711ba447b3485 dc6e32a5cea29e9055463f6eff84f2b829a19c1c bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/ea3239c88f8a85f82cc891589bc6ad1c339719e8 ea3239c88f8a85f82cc891589bc6ad1c339719e8 2008-05-27T19:41:15-07:00 2008-05-27T19:41:15-07:00 Merge branch 'erb_locals' of git://github.com/cschneid/sinatra into cschneid/erb_locals 5da183f1d21dd7ed5ff8842707ff4193bd612dec bmizerany blake.mizerany@gmail.com 07f254733192d114d59143b997ee51a4ca003a48 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/dc6e32a5cea29e9055463f6eff84f2b829a19c1c dc6e32a5cea29e9055463f6eff84f2b829a19c1c 2008-05-27T19:37:16-07:00 2008-05-27T19:09:45-07:00 Add :locals option for erb. General approach and some of the code was borrowed from rails (compilable.rb) 1c063b35a5cdc7c30bf0d373d59fa2a05ac078d9 Chris Schneider chris@christopher-schneider.com f2733e8785b8b943f4114d4a8ff25b5ef632a1ff c2827e3331dd08d890e52a9431810d43d8ad03d2 bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/6785a05d5388052981863246756711ba447b3485 6785a05d5388052981863246756711ba447b3485 2008-05-27T19:25:29-07:00 2008-05-27T19:25:29-07:00 Merge branch 'master' of git://github.com/cschneid/sinatra into cschneid/master 5da183f1d21dd7ed5ff8842707ff4193bd612dec bmizerany blake.mizerany@gmail.com 07f254733192d114d59143b997ee51a4ca003a48 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/f2733e8785b8b943f4114d4a8ff25b5ef632a1ff f2733e8785b8b943f4114d4a8ff25b5ef632a1ff 2008-05-27T19:16:23-07:00 2008-05-27T19:09:45-07:00 Add :locals option for erb. General approach and some of the code was borrowed from rails (compilable.rb) 1c063b35a5cdc7c30bf0d373d59fa2a05ac078d9 bmizerany blake.mizerany@gmail.com 1ba1ceb7f6af5564bcfcf12d04d274c3030e2f32 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/c2827e3331dd08d890e52a9431810d43d8ad03d2 c2827e3331dd08d890e52a9431810d43d8ad03d2 2008-05-27T19:12:20-07:00 2008-05-27T19:09:45-07:00 Add :locals option for erb. General approach and some of the code was borrowed from rails (compilable.rb) 5da183f1d21dd7ed5ff8842707ff4193bd612dec Chris Schneider chris@christopher-schneider.com 9022ab566bb20659ddf91b457f93459c9f9da15b bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/1ba1ceb7f6af5564bcfcf12d04d274c3030e2f32 1ba1ceb7f6af5564bcfcf12d04d274c3030e2f32 2008-05-27T19:12:20-07:00 2008-05-20T15:08:55-07:00 added 'set' to FORWARD_METHODS c8881a2e58a7e60ee339aa4077ae61dfde8b4bdd Chris Schneider chris@christopher-schneider.com 07f254733192d114d59143b997ee51a4ca003a48 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/47a48df6dff8a2c8c40b6b641d23b8dd6e0f3a9a 47a48df6dff8a2c8c40b6b641d23b8dd6e0f3a9a 2008-05-20T20:21:42-07:00 2008-05-20T20:21:42-07:00 Add a new option (:app_file) to determine the file to reload when in development mode. Default is $0. This is for situations where $0 isn't the Sinatra application 3f44032df2979d4ff9e35f7479f01229314afdf8 Chris Schneider chris@christopher-schneider.com bcdf496da28b048ad2229285f73da6b8dc410caa 7526dacf33d4411d7f0e98bceeadc91b46dc56bb bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/07f254733192d114d59143b997ee51a4ca003a48 07f254733192d114d59143b997ee51a4ca003a48 2008-05-20T15:11:47-07:00 2008-05-20T15:11:47-07:00 Merge branch 'master' of git://github.com/cypher/sinatra into cypher/master c3ab771020e47c5d0165257e66ffc60148380ba7 bmizerany blake.mizerany@gmail.com d2cfe06c3b177a351f5f16d186620ab2995759c9 bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/bcdf496da28b048ad2229285f73da6b8dc410caa bcdf496da28b048ad2229285f73da6b8dc410caa 2008-05-20T15:08:55-07:00 2008-05-20T15:08:55-07:00 added 'set' to FORWARD_METHODS d9a58d0cf320abf8cb67159418ba9282daeeada0 bmizerany blake.mizerany@gmail.com 9ddc905cefcec3e39c96b7c9d9e5916d9cfc923b 418db1ed7cecab3c8f07270c419cef89dc942cde Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/9022ab566bb20659ddf91b457f93459c9f9da15b 9022ab566bb20659ddf91b457f93459c9f9da15b 2008-05-20T15:07:57-07:00 2008-05-20T15:07:57-07:00 Merge commit 'rtomayko/master' 3d3c30b78955c69fecc243b555fed3c051a5902a Chris Schneider chris@christopher-schneider.com 1753aa97606e267634f550f6bc9e11ff0d80044d 7526dacf33d4411d7f0e98bceeadc91b46dc56bb Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/9ddc905cefcec3e39c96b7c9d9e5916d9cfc923b 9ddc905cefcec3e39c96b7c9d9e5916d9cfc923b 2008-05-20T15:05:27-07:00 2008-05-20T15:05:27-07:00 Merge commit 'cypher/master' 9941026ce63d033a0057a6a924a96b4ef475d99a Chris Schneider chris@christopher-schneider.com 174d9c8a25b80eef9b92dd4054579ed5788e81e1 d2cfe06c3b177a351f5f16d186620ab2995759c9 Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/1753aa97606e267634f550f6bc9e11ff0d80044d 1753aa97606e267634f550f6bc9e11ff0d80044d 2008-05-20T15:00:08-07:00 2008-05-20T15:00:08-07:00 Merge from bmizerany e89eac5b97bad3fd197c9819086accd060c41ff5 Chris Schneider chris@christopher-schneider.com b73450982a48eb0bff302d413f036ff911379c9e Markus Prinz markus.prinz@nuclearsquid.com http://github.com/adamwiggins/sinatra/commit/7526dacf33d4411d7f0e98bceeadc91b46dc56bb 7526dacf33d4411d7f0e98bceeadc91b46dc56bb 2008-05-20T12:01:52-07:00 2008-05-20T12:01:52-07:00 Simplify the Sinatra.server method Removes the case from Sinatra.server, since we can rely on eval anyway, if we properly convert the handler name. Also, eval might be evil, but the non-eval version is longer, unglier, and harder to understand. 5b2dc80a30aaa97bdbabc222893d3c8ae5c03365 Markus Prinz markus.prinz@nuclearsquid.com a766406d168db2714f7ab7b0bf7adaf7043943ff Ryan Tomayko rtomayko@gmail.com http://github.com/adamwiggins/sinatra/commit/418db1ed7cecab3c8f07270c419cef89dc942cde 418db1ed7cecab3c8f07270c419cef89dc942cde 2008-05-19T14:31:26-07:00 2008-05-19T11:06:58-07:00 minor rdoc formatting fixes c7ccd21be40cb27ab2b1768f1622662528f8916e Ryan Tomayko rtomayko@gmail.com d2cfe06c3b177a351f5f16d186620ab2995759c9 Ryan Tomayko rtomayko@gmail.com http://github.com/adamwiggins/sinatra/commit/a766406d168db2714f7ab7b0bf7adaf7043943ff a766406d168db2714f7ab7b0bf7adaf7043943ff 2008-05-19T14:26:10-07:00 2008-05-19T14:25:09-07:00 add doc on using Rack middleware to README 290d38f55c12ff20116c79b7dcd751a7462666f3 Ryan Tomayko rtomayko@gmail.com 1037fcbe71c76c58af859d0db1eca5f5b5401f90 d2cfe06c3b177a351f5f16d186620ab2995759c9 Markus Prinz markus.prinz@nuclearsquid.com http://github.com/adamwiggins/sinatra/commit/b73450982a48eb0bff302d413f036ff911379c9e b73450982a48eb0bff302d413f036ff911379c9e 2008-05-19T00:20:44-07:00 2008-05-19T00:20:44-07:00 Merge commit 'bmizerany/master' 5a1275c09fd5087f0789a6436ae23ce7c2d4ffd7 Markus Prinz markus.prinz@nuclearsquid.com ce673fa4d9e724b017290e85f3da40cfddf068a2 bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/d2cfe06c3b177a351f5f16d186620ab2995759c9 d2cfe06c3b177a351f5f16d186620ab2995759c9 2008-05-18T16:01:16-07:00 2008-05-18T16:01:16-07:00 ignore test file 75b38540d8acb317d0c41653804b12e20ddacd7c bmizerany blake.mizerany@gmail.com 08b1452a3762a1e7f443352c78f6e3d373cea1d4 bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/ce673fa4d9e724b017290e85f3da40cfddf068a2 ce673fa4d9e724b017290e85f3da40cfddf068a2 2008-05-18T16:00:23-07:00 2008-05-18T14:53:19-07:00 Fixes problem in development where reloading overrides custom errors 4e244dbf2afdfec2fcb84e9c171a8b84ac1bb2eb bmizerany blake.mizerany@gmail.com f71330e6598bba00bb26735a6077cda00f3f7ef4 bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/08b1452a3762a1e7f443352c78f6e3d373cea1d4 08b1452a3762a1e7f443352c78f6e3d373cea1d4 2008-05-18T15:58:57-07:00 2008-05-07T18:51:02-07:00 getting ready for 0.2.3 4522245c1f000fef56e5962108823a3cc39232ac bmizerany blake.mizerany@gmail.com c1aa6663a55cf10e38f548f48743837e88581b2b bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/f71330e6598bba00bb26735a6077cda00f3f7ef4 f71330e6598bba00bb26735a6077cda00f3f7ef4 2008-05-18T15:58:57-07:00 2008-05-07T14:18:43-07:00 quick doc fix 4d419d8ad19593841955043b8d31a300552914e8 bmizerany blake.mizerany@gmail.com b6cf6f7e2f3478eee266f7f5eca8bfccd224977a 5e56613a3256ed8485e7063280ec9410e7151197 Markus Prinz markus.prinz@nuclearsquid.com http://github.com/adamwiggins/sinatra/commit/1037fcbe71c76c58af859d0db1eca5f5b5401f90 1037fcbe71c76c58af859d0db1eca5f5b5401f90 2008-05-18T15:10:44-07:00 2008-05-18T15:10:44-07:00 Merge branch 'master' of git@github.com:cypher/sinatra 3a8fc40b238edb5cf344fabc28a504fcb09a7178 Markus Prinz markus.prinz@nuclearsquid.com d2e256a957c6f3ddb65a004c5759f54e74240272 bmizerany blake.mizerany@gmail.com http://github.com/adamwiggins/sinatra/commit/b6cf6f7e2f3478eee266f7f5eca8bfccd224977a b6cf6f7e2f3478eee266f7f5eca8bfccd224977a 2008-05-18T14:53:19-07:00 2008-05-18T14:53:19-07:00 Fixes problem in development where reloading overrides custom errors 3a8fc40b238edb5cf344fabc28a504fcb09a7178 bmizerany blake.mizerany@gmail.com 3588b55bc17f1e8ab359241aa5a532dd25cc869b Chris Schneider chris@christopher-schneider.com http://github.com/adamwiggins/sinatra/commit/174d9c8a25b80eef9b92dd4054579ed5788e81e1 174d9c8a25b80eef9b92dd4054579ed5788e81e1 2008-05-18T10:30:46-07:00 2008-05-18T10:18:42-07:00 Kernel.load $0 breaks when $0 is not the file with sinatra routes, add an :app_file option to define which file to reload eff1649540cee477ebd44f22e692f24f85660efe Chris Schneider chris@christopher-schneider.com eb6f93f09e870622c47bc58918dc4915b17c2487 3588b55bc17f1e8ab359241aa5a532dd25cc869b Markus Prinz markus.prinz@nuclearsquid.com http://github.com/adamwiggins/sinatra/commit/5e56613a3256ed8485e7063280ec9410e7151197 5e56613a3256ed8485e7063280ec9410e7151197 2008-05-13T10:48:11-07:00 2008-05-13T10:48:11-07:00 Merge commit 'source/master' a75a8a2ee14ccd3004367c04e57447b5ec6dd1df Markus Prinz markus.prinz@nuclearsquid.com