b26df5a35bbd373cefabf9313b8f5ec3f3fc2464 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/aa09e3a2cc6d7b64441ec49b6a64a701478b39c2 aa09e3a2cc6d7b64441ec49b6a64a701478b39c2 2009-10-30T15:54:32-07:00 2009-10-01T15:05:19-07:00 Updated CHANGELOG e843e8d5fcf8730f6d8eb21f37df503d7072b76a snusnu gamsnjaga@gmail.com db4357f597bc903b5e2bdb5b5b9640ce31c3d5d6 Tymon Tobolski i@teamon.eu http://github.com/wycats/merb/commit/b26df5a35bbd373cefabf9313b8f5ec3f3fc2464 b26df5a35bbd373cefabf9313b8f5ec3f3fc2464 2009-10-26T16:31:40-07:00 2009-10-26T14:37:22-07:00 [merb-helpers] Select the correct field in select tags 605423c9ff0bb9a1b33852561fd8cfa8a41825b2 snusnu gamsnjaga@gmail.com 7d9a669471493cbd09b06025ec2a19742a84c514 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/db4357f597bc903b5e2bdb5b5b9640ce31c3d5d6 db4357f597bc903b5e2bdb5b5b9640ce31c3d5d6 2009-10-25T17:23:25-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. e5e5012ea28ddf0dd845f7c1af01a80e7663f910 snusnu gamsnjaga@gmail.com 8d84d2a0608071c1fdc4d09c30cf3188fdceb540 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/7d9a669471493cbd09b06025ec2a19742a84c514 7d9a669471493cbd09b06025ec2a19742a84c514 2009-10-25T17:22:09-07:00 2009-10-25T17:18:20-07:00 [merb-core] Fixed link to extlib in error message 9da3e6d1bfa82a4d7638e748347269d2b374fca3 snusnu gamsnjaga@gmail.com 29905986ffa33ad400ac376f7bc1852eddda42bd Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/8d84d2a0608071c1fdc4d09c30cf3188fdceb540 8d84d2a0608071c1fdc4d09c30cf3188fdceb540 2009-10-24T12:18:30-07:00 2009-10-23T15:39:33-07:00 [merb-core] -i and --irb-console 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] 2608c08fdbddfac995bf741675cd0b9a9b23116d snusnu gamsnjaga@gmail.com df8ebd4b7a19862619ac7819563262f18a4b6ace Pavel Kunc pavel.kunc@gmail.com http://github.com/wycats/merb/commit/29905986ffa33ad400ac376f7bc1852eddda42bd 29905986ffa33ad400ac376f7bc1852eddda42bd 2009-10-23T10:50:39-07:00 2009-10-23T10:39:33-07:00 [merb-gen] Explain how to load dependencies in (very) flat apps Because of how BootLoader loads dependencies one can't use dependency in the init.rb unless dependency "xy", :immediate => true is used. That's because Kernel.dependency() postpone loading of the gems to the later bootloader and loads the init.rb first to find out what dependencies to load. [#1289 state:resolved] 781f97e2c4add03ae35bf9f4522502251643d1d4 snusnu gamsnjaga@gmail.com 7e30838da56984d22bc829f25cc3ff3e6dac53a2 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/df8ebd4b7a19862619ac7819563262f18a4b6ace df8ebd4b7a19862619ac7819563262f18a4b6ace 2009-10-22T21:50:09-07:00 2009-10-22T21:19:32-07:00 [merb-gen] Fixing generated thor task to work with RubyGems 1.3.5. Setting thor dependency to use 0.9.x branch, as newer versions will break the default merb-gen app bundling tasks [#1306 state:resolved] d20c9c7e2829fc8c1575fa308b4cdb56eeb40d53 snusnu gamsnjaga@gmail.com cb5c783c7da0262b1b2853fabc38f2edea90790b Jonathan Stott jonathan.stott@gmail.com http://github.com/wycats/merb/commit/7e30838da56984d22bc829f25cc3ff3e6dac53a2 7e30838da56984d22bc829f25cc3ff3e6dac53a2 2009-10-22T11:48:03-07:00 2009-10-22T11:06:15-07:00 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/ 352f78d1d08633193b211d4e8fcd4b9d2ff3833f snusnu gamsnjaga@gmail.com 7d730e7765c2122d1391f56b70033de81a81fb1a snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/cb5c783c7da0262b1b2853fabc38f2edea90790b cb5c783c7da0262b1b2853fabc38f2edea90790b 2009-10-21T18:59:07-07:00 2009-10-21T18:59:07-07:00 [merb-haml] Fixed compilation of sass files Require sass instead of sass/plugin (via Tony Mann) 71044a9f6de5d27ab753534f033b7052383d8def snusnu gamsnjaga@gmail.com 9c44e16f550b00d8bb451d0532a2d0897d4e9103 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/7d730e7765c2122d1391f56b70033de81a81fb1a 7d730e7765c2122d1391f56b70033de81a81fb1a 2009-10-21T18:55:53-07:00 2009-10-01T02:06:10-07:00 [merb_datamapper] Print merb-gen message only for dm models [#895 state:resolved] 07a375d6950072ca33fad2c2f830a1740a60c4e6 snusnu gamsnjaga@gmail.com 260c696796d408a7e15aacdb1b0181a1b9b86246 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/9c44e16f550b00d8bb451d0532a2d0897d4e9103 9c44e16f550b00d8bb451d0532a2d0897d4e9103 2009-10-21T18:55:06-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] fabffd7f89d45c6b556e9ecd89b16452f358e12a snusnu gamsnjaga@gmail.com 8dd17dd8785b3187a3db038f9f1d53a65c4ddb38 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/260c696796d408a7e15aacdb1b0181a1b9b86246 260c696796d408a7e15aacdb1b0181a1b9b86246 2009-10-21T18:53:01-07:00 2009-10-21T10:49:29-07:00 [merb-core] Fixed focs for Merb::Router::Behavior#to [#1282 state:resolved] 0a60c9de66cdb8ee92254a4297fcde1cf81b72cf snusnu gamsnjaga@gmail.com c6642b7204461694c605410b1219e8f907e912a7 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/8dd17dd8785b3187a3db038f9f1d53a65c4ddb38 8dd17dd8785b3187a3db038f9f1d53a65c4ddb38 2009-10-21T18:51:30-07:00 2009-10-17T12:17:07-07:00 [merb-core] Allow testing without webrat Allow generated apps to still function even when Webrat isn't installed. Otherwise it will show an undefined Constant Merb::Test::ViewHelper, and you have to track it down to the source to see that this is because Webrat isn't available. ce75e5d8de315e186857f6cf79eaccf0495e7cf8 snusnu gamsnjaga@gmail.com 35404ab41f66a21fa6d63dbbb72c85e244046f23 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/c6642b7204461694c605410b1219e8f907e912a7 c6642b7204461694c605410b1219e8f907e912a7 2009-10-20T15:22:09-07:00 2009-10-20T15:22:09-07:00 [merb-core] Fixed docs for replacing an existing logger a239725bee06c31fbb716a54642c111ed8ff1895 snusnu gamsnjaga@gmail.com 161a6261089aa1a2eeaf36a5fa69bd95dac90072 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/35404ab41f66a21fa6d63dbbb72c85e244046f23 35404ab41f66a21fa6d63dbbb72c85e244046f23 2009-10-02T08:08:02-07:00 2009-10-02T08:08:02-07:00 [merb-helpers] Avoid dm-0.10 deprecation warnings This is a temporary fix for 1.0.x. In merb-1.1 this will be handled by active_model compliance, thus only #new_record? will be used from 1.1 onwards. afa1e61de70f215338f49e0d5961715e7865f064 snusnu gamsnjaga@gmail.com f9b723cf68e69cc6647eac0fdf52d6ad14cbd950 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/161a6261089aa1a2eeaf36a5fa69bd95dac90072 161a6261089aa1a2eeaf36a5fa69bd95dac90072 2009-10-02T05:57:38-07:00 2009-10-02T05:57:38-07:00 Bumped version in preparation for release c24c7127bbc1943d4db1427b96e045ea000792f5 snusnu gamsnjaga@gmail.com d41ee6a91f8d9d385158112f7b9d114ed1c24829 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/f9b723cf68e69cc6647eac0fdf52d6ad14cbd950 f9b723cf68e69cc6647eac0fdf52d6ad14cbd950 2009-10-01T20:16:15-07:00 2009-10-01T20:14:37-07:00 [merb-cache] Not using Time.today in specs makes them more robust 486389733a3920887944fed3ed879255cb205c93 snusnu gamsnjaga@gmail.com 960192b529f89f165a6ec249a3138cb7a3b08e04 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/d41ee6a91f8d9d385158112f7b9d114ed1c24829 d41ee6a91f8d9d385158112f7b9d114ed1c24829 2009-10-01T20:16:15-07:00 2009-10-01T19:34:14-07:00 Fixed rake uninstall to uninstall everything that got rake install'ed 733f426f7dcdef6c0041849455259105eb03201e snusnu gamsnjaga@gmail.com 633e8591c9ee76267d8297c97a8eb4419a441cf0 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/960192b529f89f165a6ec249a3138cb7a3b08e04 960192b529f89f165a6ec249a3138cb7a3b08e04 2009-10-01T20:16:15-07:00 2009-10-01T19:33:08-07:00 Install the merb meta-package as the last one a9719f31fabb42761da4aa267ec56af1815ebc65 snusnu gamsnjaga@gmail.com b8eb93668feb5d84df9c8d8bee551e23f1e4a0c4 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/633e8591c9ee76267d8297c97a8eb4419a441cf0 633e8591c9ee76267d8297c97a8eb4419a441cf0 2009-10-01T20:16:14-07:00 2009-10-01T19:06:52-07:00 Changed plugin dependencies to "~> #{Merb::VERSION}" 9f1aebce7d6405b70c14f123de0df9e803184a66 snusnu gamsnjaga@gmail.com 6eefe62740cdcfe6ca49e8a22e8b3a58fde5f256 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/b8eb93668feb5d84df9c8d8bee551e23f1e4a0c4 b8eb93668feb5d84df9c8d8bee551e23f1e4a0c4 2009-10-01T20:16:14-07:00 2009-10-01T18:53:21-07:00 [merb-gen] config/dependencies.rb requires "~> #{DM_VERSION}" in stack apps ac45e802f0ee5bf5f7571c1fb7dd41f986e466f8 snusnu gamsnjaga@gmail.com b5759980b0100485d7fc057ab078ac43a8052190 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/6eefe62740cdcfe6ca49e8a22e8b3a58fde5f256 6eefe62740cdcfe6ca49e8a22e8b3a58fde5f256 2009-10-01T15:04:46-07:00 2009-10-01T15:04:46-07:00 [merb_datamapper] Don't use gem method if not necessary 3b82a6aaf3cbed7c7b3abfbf4806738d2213055d snusnu gamsnjaga@gmail.com a45c4a875994208d79fc4571659a1a49a2e54706 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/b5759980b0100485d7fc057ab078ac43a8052190 b5759980b0100485d7fc057ab078ac43a8052190 2009-10-01T15:00:26-07:00 2009-10-01T15:00:26-07:00 [merb_datamapper] Depend on Merb::DM_VERSION 6ba088dbfea77bc463bbaeacdcb82465e2601d8b snusnu gamsnjaga@gmail.com 75eb0fc734394f4c9cbe29d78717dc31c23b1a66 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/a45c4a875994208d79fc4571659a1a49a2e54706 a45c4a875994208d79fc4571659a1a49a2e54706 2009-10-01T09:01:29-07:00 2009-10-01T09:00:30-07:00 [merb-assets] Don't rely on hash ordering in specs rake spec in the toplevel merb directory now passes all specs. Also, merb-core/rake specs:oneoh passes 737be2fe7766f387643d31588979e02225bbb22e snusnu gamsnjaga@gmail.com 214543f55eb28a421611b41955ebfe946a33415b Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/75eb0fc734394f4c9cbe29d78717dc31c23b1a66 75eb0fc734394f4c9cbe29d78717dc31c23b1a66 2009-10-01T08:24:49-07:00 2009-09-30T22:04:37-07:00 [merb-core] Fixed multipart specs (including spec10) All merb-core specs pass again. params[:tempfile] is of kind Tempfile and not File (as was specced previously). The only reason this broken spec passed earlier, was due to a bug in rspec <= 1.2.3 that allowed Tempfile.new('random').should be_a_kind_of(File) In rspec > 1.2.4 running the same will throw an error. 5aa57f3afa49c615fc75404e5f2121e2d60e298e snusnu gamsnjaga@gmail.com d42a3691d9490cefcce41279233fefaaaa2fd5b5 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/214543f55eb28a421611b41955ebfe946a33415b 214543f55eb28a421611b41955ebfe946a33415b 2009-09-30T18:49:00-07:00 2009-09-30T18:49:00-07:00 [merb_datamapper] Depend on the '~> 0.10' series d4ad01ae15411258ab7a4e7b3f831680315b8938 snusnu gamsnjaga@gmail.com 45116f1081081db980ce66b02412c68e24d13f97 snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/d42a3691d9490cefcce41279233fefaaaa2fd5b5 d42a3691d9490cefcce41279233fefaaaa2fd5b5 2009-09-28T18:32:33-07:00 2009-09-28T18:32:33-07:00 [merb-gen] Don't add resource route when using -p or -d The generator in merb_datamapper respects this too. 9800914a56ad5cc15e762cbb2f39141fd678fa70 snusnu gamsnjaga@gmail.com 26835c81c4afaff4998f66aa09fecca3e47000fd snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/45116f1081081db980ce66b02412c68e24d13f97 45116f1081081db980ce66b02412c68e24d13f97 2009-09-27T12:27:19-07:00 2009-09-27T12:24:01-07:00 [merb-auth-more] Original :length constraints for dm_salted_user Previously :crypted_password was set with :length => 60 This commit reestablishes this setting which was previously deleted in a first attempt to be compliant with dm-0.10.0 3eac230aeb2b4143ef21bf2fe811ed0c61241c06 snusnu gamsnjaga@gmail.com 64783360cd95c5a2574794c081a64f8bf50e098c Hongli Lai (Phusion) hongli@phusion.nl http://github.com/wycats/merb/commit/26835c81c4afaff4998f66aa09fecca3e47000fd 26835c81c4afaff4998f66aa09fecca3e47000fd 2009-09-27T07:53:25-07:00 2009-02-16T01:47:03-08:00 [merb-core] Fix run_later to work on servers other than just 'merb' Thin and Phusion Passenger for example. [#1255 state:resolved] 7238b02c0bc24ec79098f5513e88518ee5862cea snusnu gamsnjaga@gmail.com aa6b2fcb65c955f92810d517e2750530ee2603cd snusnu gamsnjaga@gmail.com http://github.com/wycats/merb/commit/64783360cd95c5a2574794c081a64f8bf50e098c 64783360cd95c5a2574794c081a64f8bf50e098c 2009-09-24T21:06:29-07:00 2009-09-24T21:02:16-07:00 [merb-helpers] Generate valid html id attributes Also fixed a previously failing spec for select helpers a6002413ce06f238ba3467543b01f4034acad78a snusnu gamsnjaga@gmail.com