b38a93c8abf4a65211596e9543bf1354a06bc4e0 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/e5c1f9dccd589a0db157cc484892d217f9464417 e5c1f9dccd589a0db157cc484892d217f9464417 2008-09-08T05:27:29-07:00 2008-09-08T05:27:29-07:00 Merge in simple conditional get support at controller level. Use #etag=, #last-modified= and #request_fresh? to possibly cut off DB queries and return a 304 response if request is fresh. Merges: PUBLIC_CHANGELOG lib/merb-core.rb lib/merb-core/controller/merb_controller.rb lib/merb-core/dispatch/session.rb lib/merb-core/dispatch/session/cookie.rb lib/merb-core/dispatch/session/memcached.rb lib/merb-core/dispatch/session/store_container.rb 57afcecfac7ff760fc8c4a7c2fa0da7a01613284 Michael S. Klishin michael@novemberain.com 2369da6c785948026e4c90a1e53ad2f485ee8c21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b38a93c8abf4a65211596e9543bf1354a06bc4e0 b38a93c8abf4a65211596e9543bf1354a06bc4e0 2008-09-07T10:00:41-07:00 2008-09-07T10:00:41-07:00 Merged in new bundling (aka freezer) branch 452b368f04956c0cabf318f8ab77612f5534b8c2 Fabien Franzen info@atelierfabien.be 3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/2369da6c785948026e4c90a1e53ad2f485ee8c21 2369da6c785948026e4c90a1e53ad2f485ee8c21 2008-09-07T09:41:29-07:00 2008-09-07T09:41:29-07:00 Merged in new-sessions branch 152b17c6ff74bb11542e5068873e4e8e28224944 Fabien Franzen info@atelierfabien.be dede45e06d205ba40590f065b169d31a5b3ef828 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 2008-09-06T04:36:50-07:00 2008-09-06T04:20:00-07:00 Simplify one more clever line. b0279a802d09d7284e6162dce3de5d488ddd0bfd Michael S. Klishin michael@novemberain.com f01ebdb6d77e716f996dea7663b2f6aa346e424b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/dede45e06d205ba40590f065b169d31a5b3ef828 dede45e06d205ba40590f065b169d31a5b3ef828 2008-09-06T04:36:50-07:00 2008-09-06T04:15:30-07:00 Trenary operator is always hard to read. ec45b147e25fb0e32240c532b34271d2f423137b Michael S. Klishin michael@novemberain.com db2758f6e4723e3b73fcf9a251da48e935bb22c1 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/f01ebdb6d77e716f996dea7663b2f6aa346e424b f01ebdb6d77e716f996dea7663b2f6aa346e424b 2008-09-06T04:26:18-07:00 2008-09-06T04:26:18-07:00 Added PUBLIC_CHANGELOG note on Language::English::Inflector => English::Inflect 9b33c66c6f0e612e332ea2caf5400331190d989e Fabien Franzen info@atelierfabien.be a59cf4cbaf958d5a1be95db57c31a54371e69daf Lori Holden email+git@loriholden.com http://github.com/wycats/merb-core/commit/db2758f6e4723e3b73fcf9a251da48e935bb22c1 db2758f6e4723e3b73fcf9a251da48e935bb22c1 2008-09-06T02:15:39-07:00 2008-09-05T21:14:19-07:00 Filters with procs created via class methods have identical signatures regardless if they handle content differently or not. So modified add_filter to just append procs to the filter list. 18d13e611efdae35c411f2257af258a77f816fed Michael S. Klishin michael@novemberain.com 434bb664f6007fbf5b07b42c250f345162840eeb Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/a59cf4cbaf958d5a1be95db57c31a54371e69daf a59cf4cbaf958d5a1be95db57c31a54371e69daf 2008-09-06T02:06:22-07:00 2008-09-06T02:06:22-07:00 Consolidating raw Rakefile commands to merb-core/tasks/merb_rake_helper.rb 4b29a8c101975c0e3c53c7f99260c1aeda896a82 Fabien Franzen info@atelierfabien.be 7cf3c28e0bf88b5afc346bf032e47cc3c453c666 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/434bb664f6007fbf5b07b42c250f345162840eeb 434bb664f6007fbf5b07b42c250f345162840eeb 2008-09-05T16:44:14-07:00 2008-09-05T16:44:14-07:00 Update contributors list. 3b3f7e1a97d748ff1ca7ba09c6dd2f2a3a74d77b Michael S. Klishin michael@novemberain.com 8fa8bf7c247d90fac4f625cb586314ca5dafe7b3 Bryan Ray bryansray@gmail.com http://github.com/wycats/merb-core/commit/7cf3c28e0bf88b5afc346bf032e47cc3c453c666 7cf3c28e0bf88b5afc346bf032e47cc3c453c666 2008-09-05T15:36:11-07:00 2008-08-31T23:02:31-07:00 Ticket #461 - This simply adds output for what host and port the adapter has started on. Signed-off-by: Michael S. Klishin <michael@novemberain.com> a0917d635ded150fcb45cbd23ab677c88f72b66d Michael S. Klishin michael@novemberain.com e3adeb0a025b34b1d25b4ba10f8e18ccfb4208f4 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/8fa8bf7c247d90fac4f625cb586314ca5dafe7b3 8fa8bf7c247d90fac4f625cb586314ca5dafe7b3 2008-09-05T09:01:14-07:00 2008-09-05T09:01:14-07:00 More Language::English::Inflect to English::Inflect changes - getting ready for Extlib move soon 30886a302e2ef534ae4982a0f6b7324036018804 Fabien Franzen info@atelierfabien.be 677ca4a1678cf25c929018530e4ec5fd243ce2db Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/e3adeb0a025b34b1d25b4ba10f8e18ccfb4208f4 e3adeb0a025b34b1d25b4ba10f8e18ccfb4208f4 2008-09-05T08:13:07-07:00 2008-09-05T08:13:07-07:00 Language::English::Inflect => English::Inflect name changes ddc663b0a094434eb369f7135ffab97f240678aa Fabien Franzen info@atelierfabien.be 966cf5e84754769df6d04f14512fc68ced327c41 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/677ca4a1678cf25c929018530e4ec5fd243ce2db 677ca4a1678cf25c929018530e4ec5fd243ce2db 2008-09-04T06:36:32-07:00 2008-09-04T06:36:32-07:00 Use frozen strings where possible. 9309205349233ba3cd9c11e6044a6c3c2c015f10 Michael S. Klishin michael@novemberain.com 9336e62851dfbd847f86673badf6d8ef21da43c3 Bryan Ray bryansray@gmail.com http://github.com/wycats/merb-core/commit/966cf5e84754769df6d04f14512fc68ced327c41 966cf5e84754769df6d04f14512fc68ced327c41 2008-09-04T06:29:39-07:00 2008-08-26T19:35:40-07:00 First pass at adding in CSRF protection in to Rack middleware. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 3cd9c0ada3e13bd7ffdc56b48b4bc5f995677ecf Michael S. Klishin michael@novemberain.com 883fedf6fb3b9bedf9d6e3507680bf60446e1dfa Goh Toh Chye tohchye@gmail.com http://github.com/wycats/merb-core/commit/9336e62851dfbd847f86673badf6d8ef21da43c3 9336e62851dfbd847f86673badf6d8ef21da43c3 2008-09-04T01:02:51-07:00 2008-09-03T22:30:12-07:00 Query string of the format "foo=bar&foo=baz" should return params {"foo" => "baz"} Added the specs to ensure this and remove the code that breaks this. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 1d300f0b5a2f5058a452e98e85b28a377214abff Michael S. Klishin michael@novemberain.com a57737c95408a5f4e026c6d29c01acae4c892cfc Goh Toh Chye tohchye@gmail.com http://github.com/wycats/merb-core/commit/883fedf6fb3b9bedf9d6e3507680bf60446e1dfa 883fedf6fb3b9bedf9d6e3507680bf60446e1dfa 2008-09-03T20:50:10-07:00 2008-08-29T06:44:34-07:00 Fixed multiple select not honored in params bug When multiple values are selected in mulitple select, params[key] will return an array of selected values Signed-off-by: Michael S. Klishin <michael@novemberain.com> 6b337ba9ae49700819cfced0e6ff540407c281ff Michael S. Klishin michael@novemberain.com b342fcb58cb5cf82d3c946ca74dd5ed34dfb4155 1f6b0058de588f4b8f479f886b10a864bc8f6b22 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a57737c95408a5f4e026c6d29c01acae4c892cfc a57737c95408a5f4e026c6d29c01acae4c892cfc 2008-09-02T17:21:25-07:00 2008-09-02T17:21:25-07:00 Merge branch 'master' of git://github.com/lholden/merb-core * 'master' of git://github.com/lholden/merb-core: Public specs for 'fragment' changes in url. Renamed anchor to fragment along with some minor tweeks to follow rfc2396 better. Add support for :anchor when generating url's. Ex. url(:root, :anchor => :lower_half). 7d8925dbae484877558597965594ab35d72f45e3 Michael S. Klishin michael@novemberain.com 02b3f1f228450beb944149b9650a123dbc5a0e06 Lori Holden email+git@loriholden.com http://github.com/wycats/merb-core/commit/1f6b0058de588f4b8f479f886b10a864bc8f6b22 1f6b0058de588f4b8f479f886b10a864bc8f6b22 2008-09-02T17:09:32-07:00 2008-09-02T17:09:32-07:00 Public specs for 'fragment' changes in url. 657e400ca44d2f334cc2126ed6526229c51bf931 Lori Holden email+git@loriholden.com f4f890c31f206a4e080e04c571d6780ee0e596ee Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b342fcb58cb5cf82d3c946ca74dd5ed34dfb4155 b342fcb58cb5cf82d3c946ca74dd5ed34dfb4155 2008-09-02T10:54:32-07:00 2008-09-02T10:54:32-07:00 AbstractController now uniformly uses instance_eval for Procs where previously the controller instance (self) was passed as an argument 9d04c912e77d2dd03050a5bd2ce9729b9a9ece43 Fabien Franzen info@atelierfabien.be 7b73934210b3ea614f6657787ac4ba61c83c338d Lori Holden email+git@loriholden.com http://github.com/wycats/merb-core/commit/02b3f1f228450beb944149b9650a123dbc5a0e06 02b3f1f228450beb944149b9650a123dbc5a0e06 2008-09-01T22:29:33-07:00 2008-09-01T22:29:33-07:00 Renamed anchor to fragment along with some minor tweeks to follow rfc2396 better. bd33c87743c458b4ce68bcd659792d4b9ea72412 Lori Holden email+git@loriholden.com f4f890c31f206a4e080e04c571d6780ee0e596ee Lori Holden email+git@loriholden.com http://github.com/wycats/merb-core/commit/7b73934210b3ea614f6657787ac4ba61c83c338d 7b73934210b3ea614f6657787ac4ba61c83c338d 2008-09-01T21:19:13-07:00 2008-09-01T21:19:13-07:00 Add support for :anchor when generating url's. Ex. url(:root, :anchor => :lower_half). 906f7d4b0f014ba84a900fdbc7c7ac9587540ad7 Lori Holden email+git@loriholden.com b3fd54e2a70e5fe5bf69307249577afab7f6fa9c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/f4f890c31f206a4e080e04c571d6780ee0e596ee f4f890c31f206a4e080e04c571d6780ee0e596ee 2008-08-31T17:15:33-07:00 2008-08-31T17:15:33-07:00 Revert "Make Merb::Request#protocol return valid protocol names (http, not http://)." This reverts commit 563e7b29f326434a2fcc4b45b0da50d39e2052c8. * Somehow this commit is breaking static assets in certain cases. 2dc134375931f51cb369eb0bd48b8f527b043903 Yehuda Katz wycats@gmail.com 8cef2df889356dff045fac8db344444355786cf0 jonuts jonah@honeyman.org http://github.com/wycats/merb-core/commit/b3fd54e2a70e5fe5bf69307249577afab7f6fa9c b3fd54e2a70e5fe5bf69307249577afab7f6fa9c 2008-08-31T01:02:28-07:00 2008-08-28T07:16:46-07:00 Adds specs for previous commit Signed-off-by: Michael S. Klishin <michael@novemberain.com> 74ef66ecbb0649fb362fbd65083801cc8a5aef2f Michael S. Klishin michael@novemberain.com 5306b23d1064afe2158b6043c71f705f793d632f jonuts jonah@honeyman.org http://github.com/wycats/merb-core/commit/8cef2df889356dff045fac8db344444355786cf0 8cef2df889356dff045fac8db344444355786cf0 2008-08-31T01:02:16-07:00 2008-08-28T05:16:25-07:00 Fixes display @object, :template => "path/to/foo" Signed-off-by: Michael S. Klishin <michael@novemberain.com> 72650bb28f034a230ba097d79624fc397366028e Michael S. Klishin michael@novemberain.com 76fcd7f6b741fecf9dcb68a4a25d7b501731ca7e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/5306b23d1064afe2158b6043c71f705f793d632f 5306b23d1064afe2158b6043c71f705f793d632f 2008-08-31T00:33:39-07:00 2008-08-31T00:33:39-07:00 Clean up Rakefile. 49a4fc88f26dc97d18dd54fcf86a7bab6c42787c Michael S. Klishin michael@novemberain.com a379fc3eaf52c3aba04d30777c491b4c6d47399b Goh Toh Chye tohchye@gmail.com http://github.com/wycats/merb-core/commit/76fcd7f6b741fecf9dcb68a4a25d7b501731ca7e 76fcd7f6b741fecf9dcb68a4a25d7b501731ca7e 2008-08-29T15:41:53-07:00 2008-08-29T07:11:29-07:00 Remove a line of extra code Signed-off-by: Michael S. Klishin <michael@novemberain.com> 67de067c584b6b3e3833879af2bf7aaa2117239c Michael S. Klishin michael@novemberain.com f54390e2499a5c8abcd68cfe831a23ad14289b10 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a379fc3eaf52c3aba04d30777c491b4c6d47399b a379fc3eaf52c3aba04d30777c491b4c6d47399b 2008-08-29T03:03:23-07:00 2008-08-29T03:03:23-07:00 Set cookie expires to nil when session_expiry is set to 0. Setting session_expiry to 0 used to expires the session immediately. See #459 in merb-core. 54864414ed944086b170e0128a77c40dc0c97062 Michael S. Klishin michael@novemberain.com 7ec680a385eeb345fc802ef78c0992cae4228ffc Antti Tarvainen antti.tarvainen@iki.fi http://github.com/wycats/merb-core/commit/f54390e2499a5c8abcd68cfe831a23ad14289b10 f54390e2499a5c8abcd68cfe831a23ad14289b10 2008-08-28T04:26:42-07:00 2008-08-28T03:47:42-07:00 ConditionalGet refactoring. e693e8eea6ddd74f9d4ed91315980ef110d0c6a2 Antti Tarvainen antti.tarvainen@iki.fi 53c510a39fc9daa394b7c50468abeef6fb5f0036 Antti Tarvainen antti.tarvainen@iki.fi http://github.com/wycats/merb-core/commit/7ec680a385eeb345fc802ef78c0992cae4228ffc 7ec680a385eeb345fc802ef78c0992cae4228ffc 2008-08-28T04:26:10-07:00 2008-08-28T03:36:24-07:00 Fix: ConditionalGet should not return the message body when the status code is 304. 08a4fba53d82a4a0b0bff923ec4ecf6107950479 Antti Tarvainen antti.tarvainen@iki.fi 563e7b29f326434a2fcc4b45b0da50d39e2052c8 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/53c510a39fc9daa394b7c50468abeef6fb5f0036 53c510a39fc9daa394b7c50468abeef6fb5f0036 2008-08-27T18:12:46-07:00 2008-08-27T18:12:46-07:00 Rescue Exception subclasses, not only StandardError subclasses. 9ab25d7ec41dd97aefef24b60c6a5d247e73a32b Michael S. Klishin michael@novemberain.com