604e0fdf4467cacde2d11c8ced491cac56ddc5f1 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/b34d3d4fb6da70c2e9e9e56ddccc73f8a3e55e39 b34d3d4fb6da70c2e9e9e56ddccc73f8a3e55e39 2009-10-30T16:47:02-07:00 2009-10-30T16:43:41-07:00 Merb development has moved to http://github.com/merb 70ca0e674ec9d6eec568469a03dc9fb9bd478fe5 snusnu gamsnjaga@gmail.com 3f58b968e2a223817cd176f6dcc4587ea31a32c4 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/604e0fdf4467cacde2d11c8ced491cac56ddc5f1 604e0fdf4467cacde2d11c8ced491cac56ddc5f1 2009-10-28T18:43:08-07:00 2009-10-28T18:41:26-07:00 [merb-core] Log more classloader behavior in verbose mode During application boot, the classloader stashes files with missing requirements to reload them once all files have been processed. This needs to be done when a not yet loaded constant is referenced from the class being loaded. This patch prints a message to the verbose log, telling which files had missing requirements, and where the original NameError happened. dfc01befe86f7e4a55c560a722e55a5fab757bbd snusnu gamsnjaga@gmail.com ef036e4408d2e4932de31f5cc2f443a5464523e0 Tymon Tobolski i@teamon.eu http://github.com/wycats/merb/commit/3f58b968e2a223817cd176f6dcc4587ea31a32c4 3f58b968e2a223817cd176f6dcc4587ea31a32c4 2009-10-28T13:32:51-07:00 2009-10-28T09:00:43-07:00 [merb_datamapper] Added missing messages in resource controller generator 221cd1d985b9379706e5d4020bf839e4fb8cc3d5 snusnu gamsnjaga@gmail.com 59fe9d9e2db322f4be880e1979cc8295fe9b1fa1 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/ef036e4408d2e4932de31f5cc2f443a5464523e0 ef036e4408d2e4932de31f5cc2f443a5464523e0 2009-10-26T22:30:13-07:00 2009-10-26T22:30:13-07:00 [merb-core] Minor docfix ea7e0c343ed31884fd4b7c2a15a1cd15faaf7a36 snusnu gamsnjaga@gmail.com a0fb0bf03c2e8be90b782bc4616c626e47440005 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/59fe9d9e2db322f4be880e1979cc8295fe9b1fa1 59fe9d9e2db322f4be880e1979cc8295fe9b1fa1 2009-10-26T21:50:03-07:00 2009-10-26T21:44:39-07:00 [merb-gen] Create spec task when running merb-gen plugin foo [#1128 state:resolved] 5818ea2fc1928370ea0abec25636b683345faaa0 snusnu gamsnjaga@gmail.com b0bd28095274099f0caab548cd0e090a916219cb snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/a0fb0bf03c2e8be90b782bc4616c626e47440005 a0fb0bf03c2e8be90b782bc4616c626e47440005 2009-10-26T21:50:03-07:00 2009-10-26T21:05:11-07:00 [merb-auth-more] #redirect_back respects Merb::Config[:path_prefix] [#1105 state:resolved] 17f74e843a211d8b3a8d44534d877ba8b04b44e2 snusnu gamsnjaga@gmail.com 823e14f2d34770b2c60f6b0cc16f6ff5533e0785 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/b0bd28095274099f0caab548cd0e090a916219cb b0bd28095274099f0caab548cd0e090a916219cb 2009-10-26T18:43:56-07:00 2009-10-26T18:43:56-07:00 [merb-gen] Removed merb_orm :none from generated init.rb [#1058 state:resolved] 25c3957c99697914280e4edfde545a8cae08bec3 snusnu gamsnjaga@gmail.com 923406abf993b4e82938a342c506dff1e0abcad5 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/823e14f2d34770b2c60f6b0cc16f6ff5533e0785 823e14f2d34770b2c60f6b0cc16f6ff5533e0785 2009-10-26T18:23:23-07:00 2009-10-26T18:23:23-07:00 [merb-core] Extracted Merb.verbose_logging? method Dries up repeated use of rather verbose environment check. Also provides an easily accessible guard that can be used to check if really verbose debug messages should be emitted. [#1044 state:resolved] 69f4b96e039f6b63112c8b00f1a00e99a4805fd4 snusnu gamsnjaga@gmail.com e2e3866efa39e5a307fdd406005e0012c02e3c90 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/923406abf993b4e82938a342c506dff1e0abcad5 923406abf993b4e82938a342c506dff1e0abcad5 2009-10-26T17:25:33-07:00 2009-10-22T11:10:44-07:00 [merb-cache] Decompress only once in Merb::Cache::GzipStore#fetch * This change misses specs mainly because the current merb-cache specs seem rather horrible and I couldn't find an easy way to spec it (The other specs use an ugly mix of mocking/stubbing and are pretty inconsistent imho. They could definitely need some refactoring! * Fixed formatting weirdness in abstract_strategy_store.rb [#1013 state:resolved] b4d11d43860e9e685c638615e4e4fe4833998d78 snusnu gamsnjaga@gmail.com fcf8ceda79ef327989d86d176bc2ffda8024ce94 Tymon Tobolski i@teamon.eu http://github.com/wycats/merb/commit/e2e3866efa39e5a307fdd406005e0012c02e3c90 e2e3866efa39e5a307fdd406005e0012c02e3c90 2009-10-26T16:07:46-07:00 2009-10-26T14:37:22-07:00 [merb-helpers] Select the correct field in select tags 5ba24ef012a8cc2d73898aad9086592b34562d16 snusnu gamsnjaga@gmail.com 5fc01fc833ecd1901dc495bebe7a35c331d3be08 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/fcf8ceda79ef327989d86d176bc2ffda8024ce94 fcf8ceda79ef327989d86d176bc2ffda8024ce94 2009-10-25T17:20:10-07:00 2009-10-25T17:20:10-07:00 [merb-gen] Add default rspec options to spec.opts file This also works around an issue where rspec-1.2.9 seems to write all spec files to the spec/spec.opts file in case the spec.opts file is empty. 7831b42f1a435bc3723189edc18038b586726a01 snusnu gamsnjaga@gmail.com a6014acc93fc68d9687ad7151976129332bbab09 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/5fc01fc833ecd1901dc495bebe7a35c331d3be08 5fc01fc833ecd1901dc495bebe7a35c331d3be08 2009-10-25T17:18:20-07:00 2009-10-25T17:18:20-07:00 [merb-core] Fixed link to extlib in error message 20f7b66a194e4172ad3eff2933da40061da6004d snusnu gamsnjaga@gmail.com 95aed998c937a59e017349d5b2eb9f4e3075605d Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/a6014acc93fc68d9687ad7151976129332bbab09 a6014acc93fc68d9687ad7151976129332bbab09 2009-10-24T08:25:24-07:00 2009-10-23T15:39:33-07:00 [merb-core] Make CLI -i, --irb-console to take precedence over config in init.rb. This change allows you to have default adapter set in the init.rb and still if you want to run Merb in IRB you can do it. Currently you can't because setting adapter in init.rb override the config value from ARGV parsing. [#1262 state:resolved] 0a212e2a1098d5014099044fedf7f5dba1defcb0 Pavel Kunc pavel.kunc@gmail.com f004ffbe05e60129b483a82d40966261957b0a4d snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/95aed998c937a59e017349d5b2eb9f4e3075605d 95aed998c937a59e017349d5b2eb9f4e3075605d 2009-10-22T19:21:32-07:00 2009-10-22T19:21:32-07:00 [merb-haml] Removed last definition of #symbolize_keys! 4130b53575ceb7e0b203fb0c124bc53a147cd634 snusnu gamsnjaga@gmail.com bf99fbacee44b067c53033b05feba2fbcd4fc8a6 Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/f004ffbe05e60129b483a82d40966261957b0a4d f004ffbe05e60129b483a82d40966261957b0a4d 2009-10-22T12:39:28-07:00 2009-10-22T11:06:15-07:00 [merb-core] Fix potential timing attack on cookie sessions [#1298 state: resolved ] This patch fixes a potential timing attack on the HMAC authentication used to verify cookie session contents by ensuring a constant time algorithm is used to compare the hashes. For more information see: http://codahale.com/a-lesson-in-timing-attacks/ 98997f5991531a9e3b8a303cb4caabdeff6aae05 snusnu gamsnjaga@gmail.com 20b96c7f455b54429052e1ba7a5e2e1139adfe6e snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/bf99fbacee44b067c53033b05feba2fbcd4fc8a6 bf99fbacee44b067c53033b05feba2fbcd4fc8a6 2009-10-21T19:05:42-07:00 2009-10-21T10:49:29-07:00 [merb-core] Fixed docs for Merb::Router::Behavior#to [#1282 state:resolved] e343f838b5161fb2dd6d9c37158ae15f8fc8999f snusnu gamsnjaga@gmail.com 93fa05d7bf0c686488ea60b5b84b29f9d905d463 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/20b96c7f455b54429052e1ba7a5e2e1139adfe6e 20b96c7f455b54429052e1ba7a5e2e1139adfe6e 2009-10-20T22:13:55-07:00 2009-10-16T15:09:33-07:00 [merb-assets] Fixed external asset urls when path_prefix is set Added checks for relative, absolute, and external urls for when path_prefix is set in Merb::Config. path_prefix should be ignored when an external url is requested, however it should be used when absolute or relative urls are passed. [#614 state:resolved] e7bc7ecdffcae267867c6586178d855c96134017 snusnu gamsnjaga@gmail.com 4669b5283fd31efb2afff67252ceeb110188d7fc Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/93fa05d7bf0c686488ea60b5b84b29f9d905d463 93fa05d7bf0c686488ea60b5b84b29f9d905d463 2009-10-20T21:40:13-07:00 2009-10-16T14:38:22-07:00 [merb-assets] Fixing :reload option on asset helpers Fixed :reload => false so it no longer defaults to Merb::Config[:reload_templates] when explicitly set. This was causing problems if you want to specifically overwrite the behavior of writing random strings (which can break urls, especially for external resources). 30adb40303b472824472bbc5b13aa23f85927cbd snusnu gamsnjaga@gmail.com b7c0c9ab2e4e945bc18657aaad8eec5d3400dea3 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/4669b5283fd31efb2afff67252ceeb110188d7fc 4669b5283fd31efb2afff67252ceeb110188d7fc 2009-10-20T17:58:50-07:00 2009-10-20T17:58:50-07:00 [merb-auth-slice-password] Use proper config value Without this change, the default password strategy is always activated because the wrong config key is used. [#1179 state:resolved] 9ff95110788ac20068b8fda5fb8ee65b538367f7 snusnu gamsnjaga@gmail.com c72db0a74cec018524b1ae0c8349136222acf5de snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/b7c0c9ab2e4e945bc18657aaad8eec5d3400dea3 b7c0c9ab2e4e945bc18657aaad8eec5d3400dea3 2009-10-20T15:23:17-07:00 2009-10-20T15:22:09-07:00 [merb-core] Fixed docs for replacing an existing logger 8e26fd85ebb6fe13af5321e4f1287c7bc15e6fa5 snusnu gamsnjaga@gmail.com 5fe78404ed91cca7226a07324d29cf2bd22e4c0e snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/c72db0a74cec018524b1ae0c8349136222acf5de c72db0a74cec018524b1ae0c8349136222acf5de 2009-10-18T21:15:50-07:00 2009-10-18T21:15:50-07:00 [merb-auth-more] Run shared specs for all user mixins * Fixed previously failing rake spec task due to spec order dependencies * Refactored specs to use a shared spec that can be used to test basic compliance * Use local merb-core and local merb-auth-more when running from a typical dev checkout (a git clone) * Added specs for sequel bcrypt mixin * Simplified require paths in lib and spec f97780018258bbb2bc50418da5dab51ec226ec7f snusnu gamsnjaga@gmail.com a14de33b0cf75ed93c08fc6b9e6d5231f9bc018f Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/5fe78404ed91cca7226a07324d29cf2bd22e4c0e 5fe78404ed91cca7226a07324d29cf2bd22e4c0e 2009-10-17T15:22:15-07:00 2009-10-01T04:59:01-07:00 [merb-core] Forking class reloading fix for Ruby 1.9.x. On Ruby 1.9.x (tested on 1.9.1 and 1.9.2dev) class reloading failded to work. After every single save it just hanged after creating new child. This patch fixes the problem with properly closing the pipes and using Process.waitpid instead of Proces.detatch. Patch also rise rate at Kernel.select checks the output from the child which lowers system requirements for the class reloading. d5f974da9a9c1582de23242aea3a0fe2446da9a2 Pavel Kunc pavel.kunc@gmail.com ccd2b086be761c01cf53e39c12f2259a53c776ed Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/a14de33b0cf75ed93c08fc6b9e6d5231f9bc018f a14de33b0cf75ed93c08fc6b9e6d5231f9bc018f 2009-10-17T14:24:48-07:00 2009-10-16T15:36:06-07:00 [merb-core] Setting default_cookie_domain for cookie sesisons (via Dusty Doris) Added an explicit declaration to use Merb::Config[:default_cookie_domain] when creating the cookie session store. [#482 state:resolved] d9f224637ea993bc1c05170bbd40bd6c4d78c29c Pavel Kunc pavel.kunc@gmail.com 7d6979be372515c015f94f306b0e67e72a4818ee Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/ccd2b086be761c01cf53e39c12f2259a53c776ed ccd2b086be761c01cf53e39c12f2259a53c776ed 2009-10-17T13:36:40-07:00 2009-10-17T13:34:25-07:00 [merb-helpers] Spec change for the Sequel error_messages. I've dropped support for the Sequel < 2.7.0 in pk-merb_sequel. This change allows to expect that Model.errors is Hash. b54d83379bf010a452550bf81fe3814b5524b5f8 Pavel Kunc pavel.kunc@gmail.com fc35f52f6e0a52a85a435af4454da9bff61290a8 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/7d6979be372515c015f94f306b0e67e72a4818ee 7d6979be372515c015f94f306b0e67e72a4818ee 2009-10-17T12:34:36-07:00 2009-10-16T16:51:06-07:00 [merb-core] Better error handling for creating log file If the log/ directory doesn't exist, we should create it (mkdir -p) so the app doesnt throw an error when trying to initialize the log file in production mode. [#1300 state:resolved] 7dd4b907f20852d76da72ca5e3e741a94c7d2587 Pavel Kunc pavel.kunc@gmail.com 0e0b5089ea3add5bd4175a70398af3b244a82efa Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/fc35f52f6e0a52a85a435af4454da9bff61290a8 fc35f52f6e0a52a85a435af4454da9bff61290a8 2009-10-17T12:20:59-07:00 2009-10-17T05:13:53-07:00 [merb-core] Set log level to :error for specs. This eliminate too verbose output when running specs. c881e990e110793eb1cfd19d7b39d9780d45945a Pavel Kunc pavel.kunc@gmail.com 0ce2d9d71adf81eab7cf6263b6b1057ff9f7d532 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/0e0b5089ea3add5bd4175a70398af3b244a82efa 0e0b5089ea3add5bd4175a70398af3b244a82efa 2009-10-17T12:16:57-07:00 2009-10-17T11:05:30-07:00 [merb-core] Refactoring redirect message handling Refactoring the redirect url handling (adds messages into the query parameter) into a separate private method. [#494 state:resolved] [#1252 state:resolved] 9ad9d04aa7591f650b83016f55e81358cb6a9015 Pavel Kunc pavel.kunc@gmail.com 556c8f9af9f0caead8c74f259f7cfb57ec714651 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/0ce2d9d71adf81eab7cf6263b6b1057ff9f7d532 0ce2d9d71adf81eab7cf6263b6b1057ff9f7d532 2009-10-17T12:16:48-07:00 2009-10-16T18:00:21-07:00 [merb-core] Fixing redirect with anchor and message (via kev) When adding the message query, we need to allow for anchors within the url, otherwise the message will be ignored. Updated to use a URL object instead which handles the mixing/matching without concatenating a string. This provides protection against these edge cases. [#1252 state:resolved] f97d0f7cd2be152d2222ed3c33be43ca5e101ccd Pavel Kunc pavel.kunc@gmail.com 4c03e16553e6fe04855b17871d4738e461b33c32 Maxime Guilbot maxime@ekohe.com http://github.com/wycats/merb/commit/556c8f9af9f0caead8c74f259f7cfb57ec714651 556c8f9af9f0caead8c74f259f7cfb57ec714651 2009-10-16T14:26:19-07:00 2009-09-28T17:15:27-07:00 [merb-core] Fixed Merb::Router#route_for for custom collection routes [#1172 state:resolved] 835a2200b0f0c4ccd4fc21184a235ccb1b315bd1 snusnu gamsnjaga@gmail.com 2d67468d02e6091edcb24b222fec8a9fd4e49f7e Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/4c03e16553e6fe04855b17871d4738e461b33c32 4c03e16553e6fe04855b17871d4738e461b33c32 2009-10-16T13:32:11-07:00 2009-10-16T12:56:33-07:00 [merb-core] Added shortcuts for sending redirect messages Added shortcuts: redirect url, :notice => "..." redirect url, :error => "..." These messages are then available via message[:notice] and message[:error]. [#494 state:resolved] 44e9ab2d1f1e69152f0bb08a91339d9be936108c snusnu gamsnjaga@gmail.com