ea4d402c869106a543f95ccd36c459b505d0d26d Avdi Grimm avdi@avdi.org http://github.com/avdi/sinatra/commit/d67be5ed606a37c0b247b888842e62c6c0a8d5ce d67be5ed606a37c0b247b888842e62c6c0a8d5ce 2008-05-28T21:46:44-07:00 2008-05-28T21:46:44-07:00 Added RSpec integration, and reverted spec.rb to support test-spec integration a93242fee040f7dfb83d8647a8ed009a33d2e565 Avdi Grimm avdi@avdi.org c087322d2e6bdf21c2b52e4fdf98b48ec0b3d0aa Avdi Grimm avdi@avdi.org http://github.com/avdi/sinatra/commit/ea4d402c869106a543f95ccd36c459b505d0d26d ea4d402c869106a543f95ccd36c459b505d0d26d 2008-05-26T20:06:29-07:00 2008-05-26T20:06:29-07:00 Added Markaby support. Warning: only works with SVN version of Markaby. Older Markabys have a naming collision with EventContext#builder. c9759b28b429683ef0f109f008c8f55e201aba91 Avdi Grimm avdi@avdi.org 07f254733192d114d59143b997ee51a4ca003a48 Avdi Grimm avdi@avdi.org http://github.com/avdi/sinatra/commit/c087322d2e6bdf21c2b52e4fdf98b48ec0b3d0aa c087322d2e6bdf21c2b52e4fdf98b48ec0b3d0aa 2008-05-26T19:58:23-07:00 2008-05-26T19:58:23-07:00 Updated RSpec integration to work with RSPec 1.1.3 d67f7ff8b96e0294aa1efc36b522f1e91390087c Avdi Grimm avdi@avdi.org bcdf496da28b048ad2229285f73da6b8dc410caa 7526dacf33d4411d7f0e98bceeadc91b46dc56bb bmizerany blake.mizerany@gmail.com http://github.com/avdi/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/avdi/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 b73450982a48eb0bff302d413f036ff911379c9e Markus Prinz markus.prinz@nuclearsquid.com http://github.com/avdi/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 1037fcbe71c76c58af859d0db1eca5f5b5401f90 d2cfe06c3b177a351f5f16d186620ab2995759c9 Markus Prinz markus.prinz@nuclearsquid.com http://github.com/avdi/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/avdi/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/avdi/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/avdi/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/avdi/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/avdi/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/avdi/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 eb6f93f09e870622c47bc58918dc4915b17c2487 3588b55bc17f1e8ab359241aa5a532dd25cc869b Markus Prinz markus.prinz@nuclearsquid.com http://github.com/avdi/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 3588b55bc17f1e8ab359241aa5a532dd25cc869b bmizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/d2e256a957c6f3ddb65a004c5759f54e74240272 d2e256a957c6f3ddb65a004c5759f54e74240272 2008-05-07T18:51:02-07:00 2008-05-07T18:51:02-07:00 getting ready for 0.2.3 c87a4bc45cc46ed749ca2058a6c53e5d2a1b0983 bmizerany blake.mizerany@gmail.com 9c85e99c995c742671ba970defac59e3dfcb7bb5 bmizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/3588b55bc17f1e8ab359241aa5a532dd25cc869b 3588b55bc17f1e8ab359241aa5a532dd25cc869b 2008-05-07T14:18:43-07:00 2008-05-07T14:18:43-07:00 quick doc fix a75a8a2ee14ccd3004367c04e57447b5ec6dd1df bmizerany blake.mizerany@gmail.com 64a2dee4f035aa876b40d826741004e9c0965c73 Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/c1aa6663a55cf10e38f548f48743837e88581b2b c1aa6663a55cf10e38f548f48743837e88581b2b 2008-04-27T22:02:55-07:00 2008-04-15T03:55:22-07:00 Rack pipelines leading to app; 'use' DSL method. Moved Rack middleware management into Sinatra::Application and enabled support for assembling custom Rack middleware pipelines before an app. require 'sinatra' use Rack::Lint use Rack::Authentication get '/' do "Hello, World" end Assuming a default set of options, this would result in the following pipeline leading to the application: CommonLogger -> Lint -> Authentication -> Application (The Rack::CommonLogger middleware is created automatically when the :logging option is enabled.) Also worth noting is that the pipeline leading to the application is reassembled on each request during reload in :development mode. cd1618a532b60bb2d53368843f6bffb15863d059 Ryan Tomayko rtomayko@gmail.com a54d7cc321cb81308d23f68084bcb406d2e27c46 Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/64a2dee4f035aa876b40d826741004e9c0965c73 64a2dee4f035aa876b40d826741004e9c0965c73 2008-04-27T21:03:44-07:00 2008-04-16T21:06:25-07:00 Add enable/disable methods to Application These methods take multiple option name arguments and set their values to true (enable) or false (disable). Purely sugar. 6dca7e151ba800f4aa7134ea4c015a97cbe50fa1 Ryan Tomayko rtomayko@gmail.com fd0150da29d097fe1b4efc9f398c60caa4b380b2 Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/a54d7cc321cb81308d23f68084bcb406d2e27c46 a54d7cc321cb81308d23f68084bcb406d2e27c46 2008-04-27T21:00:29-07:00 2008-04-15T19:57:25-07:00 Move Environment.setup! into Application; simplify reload Merges Application#load_default_events! and Environment#setup! into a single Application#load_default_configuration! method. This method is called during Application#initialize and Application#reload! before the app code is executed. a9a4bb367b13f1b74ba25c2a7558019008dbc53f Ryan Tomayko rtomayko@gmail.com 2413987830ca004ba2da9be48b199cb82a654146 Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/fd0150da29d097fe1b4efc9f398c60caa4b380b2 fd0150da29d097fe1b4efc9f398c60caa4b380b2 2008-04-27T20:59:58-07:00 2008-04-15T01:25:09-07:00 Move set_option(s) to Application, export to (main) Move top-level set_option/set_options to Sinatra::Application#set and plumb in delegates from (main). NOTE: options set via these methods are no longer set in the default_options Hash but directly on the current application's options object. dde4d5a11a9e2b4f148a6008251a595acdbc4202 Ryan Tomayko rtomayko@gmail.com 38588af109a9ad0cfc422ae6e2cce3593445f07f Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/2413987830ca004ba2da9be48b199cb82a654146 2413987830ca004ba2da9be48b199cb82a654146 2008-04-27T20:59:38-07:00 2008-04-15T00:42:33-07:00 Finish Sinatra::Application API documentation No changes to code were made here. Remaining Sinatra::Application methods are documented and some things were shifted around so that configuration/option related methods, event related methods, and call related methods are grouped together. cde46cbb73d9e9d21ab52be3aecbed897a18f223 Ryan Tomayko rtomayko@gmail.com da3439af026a76d008d7cd49206cb1081da7b316 Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/38588af109a9ad0cfc422ae6e2cce3593445f07f 38588af109a9ad0cfc422ae6e2cce3593445f07f 2008-04-27T20:55:28-07:00 2008-04-14T16:59:31-07:00 Refactor options / configures into Sinatra::Application This is a grab-bag of minor configuration related refactorings: * Moved the top-level #configures into Sinatra::Application and delegate from top-level to the default application. * Modified default options loading to parse command line arguments the first time Application::default_options is accessed only. * Removed the ability to reload default_options by setting an application's options to nil. We can add this back in fairly easily but it seems to lead to the bad practice of modifying default_options and then reloading instead of modifying the application options directly. 56dd015b0576afb4be46f1a37ebc75c1e99619cf Ryan Tomayko rtomayko@gmail.com 9c85e99c995c742671ba970defac59e3dfcb7bb5 Ryan Tomayko rtomayko@gmail.com http://github.com/avdi/sinatra/commit/da3439af026a76d008d7cd49206cb1081da7b316 da3439af026a76d008d7cd49206cb1081da7b316 2008-04-27T20:54:43-07:00 2008-04-14T13:34:10-07:00 Sinatra::Application as a sandbox for the DSL Moves DSL methods previously defined on (main) to Sinatra::Application and begins documenting them. This unifies a bunch of method names and will allow individual Application instances to be used as a sandbox for DSL execution. The Sinatra::Application::FORWARD_METHODS array is a list of method names that should be available at the top-level. A constant was created so that its easy to tell what methods are available from top-level when reading the API documentation. When one of the methods is invoked on (main), the message is forwarded to the default application (Sinatra::application). This is in preparation for some configuration related changes and multi-app support. 4640b2c8e666747d6b72cc4047e2bae626a50397 Ryan Tomayko rtomayko@gmail.com 1987e55049132d35377c16a41f5c66d9f469bb95 Victor Hugo Borja vic.borja@gmail.com http://github.com/avdi/sinatra/commit/9c85e99c995c742671ba970defac59e3dfcb7bb5 9c85e99c995c742671ba970defac59e3dfcb7bb5 2008-04-27T20:30:40-07:00 2008-04-24T19:24:31-07:00 Specs, documentation and fixes for splat'n routes 5d00d766c3728455f50208549591e93855b87874 Blake Mizerany blakemizerany@blake.local d16ee6533b01cda980a6311019d6f13efe109e6b Blake Mizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/1987e55049132d35377c16a41f5c66d9f469bb95 1987e55049132d35377c16a41f5c66d9f469bb95 2008-04-27T18:05:42-07:00 2008-04-26T20:03:12-07:00 New standard: use_in_file_templates uses @@ mytemplate for lookup i.e. no more: ## index is now: @@ index This is is to help confusion when using Haml and looks better in pastie ;) d7518149600a50e75de486f04e40bf80e400d599 Blake Mizerany blake.mizerany@gmail.com 9c875ffda0d9d12bd54f83606b30601b1b9b6bf7 Blake Mizerany blakemizerany@blake.local http://github.com/avdi/sinatra/commit/d16ee6533b01cda980a6311019d6f13efe109e6b d16ee6533b01cda980a6311019d6f13efe109e6b 2008-04-26T17:56:50-07:00 2008-04-26T15:09:40-07:00 fixed escaped paths not resolving static files [Matthew Walker] Signed-off-by: Blake Mizerany <blakemizerany@blake.local> 4ca74524d7f11697859b4682b8dbbc97ef5c6c18 Blake Mizerany blakemizerany@blake.local f80203adb6bc5756bdcf2388c937891c756db5a6 Blake Mizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/9c875ffda0d9d12bd54f83606b30601b1b9b6bf7 9c875ffda0d9d12bd54f83606b30601b1b9b6bf7 2008-04-20T18:03:41-07:00 2008-04-20T18:03:41-07:00 Session testing made easy Just say: get '/foo' do session[:bar] # => 'baz' end get_it '/foo', :session => session(:bar => 'baz') e3a98979546ea1bee9bf8a4dbebbc04bd3db7875 Blake Mizerany blake.mizerany@gmail.com 3a38dc3491cdb42ef6074b396a6b8d4977e417b8 Blake Mizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/f80203adb6bc5756bdcf2388c937891c756db5a6 f80203adb6bc5756bdcf2388c937891c756db5a6 2008-04-19T14:07:12-07:00 2008-04-19T14:07:12-07:00 Let's keep default_options renderer agnostic b3a01b80b7bd5aaed00cacb6f7f18ab43a6cb9e6 Blake Mizerany blake.mizerany@gmail.com 40acdeebb74a3af34a73b8deb4c7b4ae830d1681 23999054c6242357a5a2c982301b96ec36bf2a7b Blake Mizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/3a38dc3491cdb42ef6074b396a6b8d4977e417b8 3a38dc3491cdb42ef6074b396a6b8d4977e417b8 2008-04-19T14:05:14-07:00 2008-04-19T14:05:14-07:00 Merge branch 'master' of git://github.com/sr/sinatra into sr/master 461ce9f4a8f281a3c91a3491c1c5b723982ab3b6 Blake Mizerany blake.mizerany@gmail.com 5b3440e251a66abf6776a4d5259b579d828a3b4a Blake Mizerany blake.mizerany@gmail.com http://github.com/avdi/sinatra/commit/40acdeebb74a3af34a73b8deb4c7b4ae830d1681 40acdeebb74a3af34a73b8deb4c7b4ae830d1681 2008-04-19T13:56:40-07:00 2008-04-19T13:56:40-07:00 don't ignore rack cedc34f30ffd8ef2bf9188a8ec79e75fa571e5bd Blake Mizerany blake.mizerany@gmail.com