063c2574a7ffa41473f802effa92b1a41089593f a319ad0c8480bc10225909d7f97898dfd3989e4f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/3e5171265f2cf3e4495fe5824b63e8a3cae79e3c 3e5171265f2cf3e4495fe5824b63e8a3cae79e3c 2008-10-29T14:31:13-07:00 2008-10-29T14:31:13-07:00 Merge branch 'active' of git@github.com:wycats/merb into active 082b3455504721d7894ed07ada9f0e18ac09007f Yehuda Katz wycats@gmail.com 432c44863b34e5e794892d3d1f406c4a483676ad Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/a319ad0c8480bc10225909d7f97898dfd3989e4f a319ad0c8480bc10225909d7f97898dfd3989e4f 2008-10-29T14:28:25-07:00 2008-10-29T14:20:40-07:00 Remove CSRF middleware. It doesn't really work at the middleware level. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 082b3455504721d7894ed07ada9f0e18ac09007f Michael S. Klishin michael@novemberain.com b2b5c67d557549415f646a6a26360dd1fdd16cbb Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/432c44863b34e5e794892d3d1f406c4a483676ad 432c44863b34e5e794892d3d1f406c4a483676ad 2008-10-29T14:28:20-07:00 2008-10-29T14:16:41-07:00 Improve slice generator spec. Signed-off-by: Michael S. Klishin <michael@novemberain.com> af6ad70e9f966ba83636b814ec8429473e58c2f9 Michael S. Klishin michael@novemberain.com ec0e166b5375010bf4eaf450b3cfe5515648d415 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/063c2574a7ffa41473f802effa92b1a41089593f 063c2574a7ffa41473f802effa92b1a41089593f 2008-10-29T14:19:48-07:00 2008-10-28T23:10:50-07:00 Finished the rest of the specs and got everything to work 33af1922fd3899ae981af38fde4facc80843262f Yehuda Katz wycats@gmail.com 7bf92cccd7009c75a17b71a62949781321400349 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/ec0e166b5375010bf4eaf450b3cfe5515648d415 ec0e166b5375010bf4eaf450b3cfe5515648d415 2008-10-29T14:19:48-07:00 2008-10-28T19:33:21-07:00 Starting to build cookie tracking for the #request spec helper 0382b41d11db10d5c39add8f8b71574cb83c50f6 Yehuda Katz wycats@gmail.com 655fe8de39fb35110e9bad3ad64f2683cbaa9ed8 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/7bf92cccd7009c75a17b71a62949781321400349 7bf92cccd7009c75a17b71a62949781321400349 2008-10-29T14:19:48-07:00 2008-10-28T17:47:06-07:00 Modifies structure of request specs to make it easy to override request in a child 5cf3348b0be48391fc2a6494c0b484f299ec24a7 Yehuda Katz wycats@gmail.com 464646f08e1cf3ff79539b37b7536d30f2e29688 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/655fe8de39fb35110e9bad3ad64f2683cbaa9ed8 655fe8de39fb35110e9bad3ad64f2683cbaa9ed8 2008-10-29T14:19:47-07:00 2008-10-28T16:34:06-07:00 Makes Merb::Parse a module to hold stuff in Request that really needed to be in its own module, and make some of it available to plugins. Also make Merb::Parse.escape and Merb::Parse.unescape public. 1adaf6633543f2e6f38446c5c4e0b5174abd2742 Yehuda Katz wycats@gmail.com aba175f41655ea5a43747540756ff4d6db06f6e3 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/464646f08e1cf3ff79539b37b7536d30f2e29688 464646f08e1cf3ff79539b37b7536d30f2e29688 2008-10-29T14:19:47-07:00 2008-10-28T15:38:54-07:00 Properly bumped merb.thor version now 31d61f89fd076d9be457712219cc6e6294956c12 Yehuda Katz wycats@gmail.com dc2376d334cdce87b035db52d85d967fb95147fc Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/aba175f41655ea5a43747540756ff4d6db06f6e3 aba175f41655ea5a43747540756ff4d6db06f6e3 2008-10-29T14:19:47-07:00 2008-10-28T15:34:12-07:00 Bumped merb.thor version to 0.0.6 3bcb887ddb934f30e5bbf1cf315d382bdbc59cdc Yehuda Katz wycats@gmail.com a217312401289b05a2f350fd828764f765a99ec3 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/dc2376d334cdce87b035db52d85d967fb95147fc dc2376d334cdce87b035db52d85d967fb95147fc 2008-10-29T14:19:47-07:00 2008-10-28T15:30:17-07:00 Updated merb.thor and GemManagement 352263b955caf9a4ac0ae032de2e1c7d02ee227a Yehuda Katz wycats@gmail.com e12351bd6fe9f64c24ce3a76a6975ecb456d09f6 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb/commit/a217312401289b05a2f350fd828764f765a99ec3 a217312401289b05a2f350fd828764f765a99ec3 2008-10-29T14:19:47-07:00 2008-10-28T05:14:20-07:00 Fixes a bug in failed logins to try the failed requests specific strategies if it had specific ones. Also fixes the redirect_back issue 29666723e85dd279ff6b9952ae5b52c8074d327f Yehuda Katz wycats@gmail.com 5a43d54c88284cfea32c0f60ab7f2b8a71ffd273 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/e12351bd6fe9f64c24ce3a76a6975ecb456d09f6 e12351bd6fe9f64c24ce3a76a6975ecb456d09f6 2008-10-29T14:19:47-07:00 2008-10-25T14:31:53-07:00 Use have_key instead of relying on old include matcher behaviour for hashes. d4ebbcdb3e670b90f472e186b4b51107e980100a Yehuda Katz wycats@gmail.com cd980a257ec2a1cca8522cf1e02aff6ffa0d1f60 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/5a43d54c88284cfea32c0f60ab7f2b8a71ffd273 5a43d54c88284cfea32c0f60ab7f2b8a71ffd273 2008-10-29T14:19:47-07:00 2008-10-25T14:28:28-07:00 Loosen dm-core version in spec_helper of DataMapper plugin 4b699159bfe3453fa306f4d6264f0aa96235b841 Yehuda Katz wycats@gmail.com 39337497be68b5bf4ea4eb62002da2c45e6ab9cf Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/cd980a257ec2a1cca8522cf1e02aff6ffa0d1f60 cd980a257ec2a1cca8522cf1e02aff6ffa0d1f60 2008-10-29T14:19:47-07:00 2008-10-25T14:19:34-07:00 Alias spec and specs tasks for -core 92e2d69ae9f1cc4869b42ea5139800e42ec9db7c Yehuda Katz wycats@gmail.com 25b411565f6b1616be75a14cab02c556ee638af4 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/39337497be68b5bf4ea4eb62002da2c45e6ab9cf 39337497be68b5bf4ea4eb62002da2c45e6ab9cf 2008-10-29T14:19:47-07:00 2008-10-25T14:16:00-07:00 Should fix multiple file uploads issue with JPEG files. a217ca3eb724997ef6218a24efafa885ec3d535a Yehuda Katz wycats@gmail.com 3b4d0569a2ca8db207936d1291fa6a526da79216 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/25b411565f6b1616be75a14cab02c556ee638af4 25b411565f6b1616be75a14cab02c556ee638af4 2008-10-29T14:19:46-07:00 2008-10-25T14:14:58-07:00 Make Rack middleware spec happy with RSpec 1.1.11. They changed internals of some matchers. 0ff9184e99a88a18faeb3d0fee299ee94568be0e Yehuda Katz wycats@gmail.com b9e8f63e51f635dc450a7bc480e3cbb9292440f9 Martin Gamsjaeger gamsnjaga@gmail.com http://github.com/wycats/merb/commit/3b4d0569a2ca8db207936d1291fa6a526da79216 3b4d0569a2ca8db207936d1291fa6a526da79216 2008-10-29T14:19:46-07:00 2008-10-24T07:19:13-07:00 Fixed generated POST request specs. Signed-off-by: Michael S. Klishin <michael@novemberain.com> cfb06d17963eafef5e898c56c768ffa93a2836d4 Yehuda Katz wycats@gmail.com accd4deb2404f2a21a457019553e8e580462e616 Ben Alpert spicyjalapeno@gmail.com http://github.com/wycats/merb/commit/b9e8f63e51f635dc450a7bc480e3cbb9292440f9 b9e8f63e51f635dc450a7bc480e3cbb9292440f9 2008-10-29T14:19:46-07:00 2008-10-23T19:35:27-07:00 rspec route_to: change camel_case to to_const_string Bug #613 Signed-off-by: Michael S. Klishin <michael@novemberain.com> fe18611b0bb472e35e2a865998642f6f21fdce1a Yehuda Katz wycats@gmail.com 7d1b5cc52e7f02915b0bbc37dcf261bc34e4a6d7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/accd4deb2404f2a21a457019553e8e580462e616 accd4deb2404f2a21a457019553e8e580462e616 2008-10-29T14:19:46-07:00 2008-10-27T14:46:22-07:00 Support RubyToRuby (r2r pre 1.2) or Ruby2Ruby (r2r post 1.2) abdbf4aa0a3cb6a43a0ef7a747a5773a78aa61c8 Yehuda Katz wycats@gmail.com 50a59f927894a96adf99cdbc7c5f140b362ad896 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/7d1b5cc52e7f02915b0bbc37dcf261bc34e4a6d7 7d1b5cc52e7f02915b0bbc37dcf261bc34e4a6d7 2008-10-29T14:19:46-07:00 2008-10-27T11:53:04-07:00 Adding appropriate specs for dependency * Split the dependency specs into their own files, so that we don't have to use a private, incorrect API for cleanup * Test :immediate, versions, and :require_as using real gems. e1df17f809af8d319da1802c26342620d0c3c75f Yehuda Katz wycats@gmail.com e36be3ef5db896247e0d4d9e5416503c571bd900 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/50a59f927894a96adf99cdbc7c5f140b362ad896 50a59f927894a96adf99cdbc7c5f140b362ad896 2008-10-29T14:19:46-07:00 2008-10-26T09:55:02-07:00 Some whitespace fixes c656cad8138a9bfe8e672fda3479b5a851c48cdf Yehuda Katz wycats@gmail.com 65a4465965ce569b640640007f2a62d1faf38b77 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/e36be3ef5db896247e0d4d9e5416503c571bd900 e36be3ef5db896247e0d4d9e5416503c571bd900 2008-10-29T14:19:46-07:00 2008-10-26T06:58:55-07:00 Don't clobber existing gems when installing missing dependencies only e3f5e1a4647edef7ae06e47c93c85b6e4433f1f0 Yehuda Katz wycats@gmail.com dca71ffc75ba914a2279984c32131fafd6472ed7 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/65a4465965ce569b640640007f2a62d1faf38b77 65a4465965ce569b640640007f2a62d1faf38b77 2008-10-29T14:19:46-07:00 2008-10-26T05:17:06-07:00 Added merb-auth subgems explicitly eb3a120f59485d1e82df17f51c9db07872331d04 Yehuda Katz wycats@gmail.com 0ed9b3afd433260d466ab5e746505113f525c504 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/dca71ffc75ba914a2279984c32131fafd6472ed7 dca71ffc75ba914a2279984c32131fafd6472ed7 2008-10-29T14:19:45-07:00 2008-10-26T04:04:26-07:00 Re-added all fixes of 5 days ago... recent merge conflict resolution reverted these 7c734c560925dbdf7a138d3b189e2568240106ff Yehuda Katz wycats@gmail.com d75531214efcf8e83fc5ef20f73039298ae635e0 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/b2b5c67d557549415f646a6a26360dd1fdd16cbb b2b5c67d557549415f646a6a26360dd1fdd16cbb 2008-10-29T14:01:44-07:00 2008-10-28T23:10:50-07:00 Finished the rest of the specs and got everything to work 77e8d31a58e11c7bfd0ceba70b55a46ae86f87b1 Yehuda Katz wycats@gmail.com c1b3ec4a91f828fc366a452926c05ad162714d13 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/d75531214efcf8e83fc5ef20f73039298ae635e0 d75531214efcf8e83fc5ef20f73039298ae635e0 2008-10-29T14:01:44-07:00 2008-10-28T19:33:21-07:00 Starting to build cookie tracking for the #request spec helper da924bbd1156033a6d96cedc10540ea07f6941ba Yehuda Katz wycats@gmail.com 6a274c9f3ed611444890f7835d650558d6824ba3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/c1b3ec4a91f828fc366a452926c05ad162714d13 c1b3ec4a91f828fc366a452926c05ad162714d13 2008-10-29T14:01:44-07:00 2008-10-28T17:47:06-07:00 Modifies structure of request specs to make it easy to override request in a child faea1dd7068f9575138db687c0431b265e477903 Yehuda Katz wycats@gmail.com 71427b1f7175651ae1e23940f10cd9a9b2983ab1 38aae0dbc54c2bdb1d05b10894644d93b3bf8eb6 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/6a274c9f3ed611444890f7835d650558d6824ba3 6a274c9f3ed611444890f7835d650558d6824ba3 2008-10-28T23:16:44-07:00 2008-10-28T23:16:44-07:00 Merge branch 'active' of git@github.com:wycats/merb into active * 'active' of git@github.com:wycats/merb: (21 commits) Makes Merb::Parse a module to hold stuff in Request that really needed to be in its own module, and make some of it available to plugins. Also make Merb::Parse.escape and Merb::Parse.unescape public. Properly bumped merb.thor version now Bumped merb.thor version to 0.0.6 Updated merb.thor and GemManagement Fixes a bug in failed logins to try the failed requests specific strategies if it had specific ones. Also fixes the redirect_back issue Use have_key instead of relying on old include matcher behaviour for hashes. Loosen dm-core version in spec_helper of DataMapper plugin Alias spec and specs tasks for -core Should fix multiple file uploads issue with JPEG files. Make Rack middleware spec happy with RSpec 1.1.11. They changed internals of some matchers. Fixed generated POST request specs. rspec route_to: change camel_case to to_const_string Support RubyToRuby (r2r pre 1.2) or Ruby2Ruby (r2r post 1.2) Adding appropriate specs for dependency Some whitespace fixes Don't clobber existing gems when installing missing dependencies only Added merb-auth subgems explicitly Re-added all fixes of 5 days ago... recent merge conflict resolution reverted these Support :require_as in dependency (TODO: More complete tests) Remove unnecessary whitespace ... Conflicts: merb-core/lib/merb-core/core_ext/kernel.rb 8c796c318a7bccd8e513b85c6e4b451ae3b0701e Matt Aimonetti mattaimonetti@gmail.com d05cf158cdf98753cf258dc93938930c3790d0f9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/38aae0dbc54c2bdb1d05b10894644d93b3bf8eb6 38aae0dbc54c2bdb1d05b10894644d93b3bf8eb6 2008-10-28T16:35:27-07:00 2008-10-28T16:34:06-07:00 Makes Merb::Parse a module to hold stuff in Request that really needed to be in its own module, and make some of it available to plugins. Also make Merb::Parse.escape and Merb::Parse.unescape public. 1adaf6633543f2e6f38446c5c4e0b5174abd2742 Yehuda Katz wycats@gmail.com 4d2e11f2f106c4cff9eb20d6566c3bbd1de291d5 aba3473bfc253cf22ad730f1f5d1fd8ff2cbb8ec Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb/commit/d05cf158cdf98753cf258dc93938930c3790d0f9 d05cf158cdf98753cf258dc93938930c3790d0f9 2008-10-28T16:28:44-07:00 2008-10-28T16:28:44-07:00 Merge branch 'failed_login' into merger 31d61f89fd076d9be457712219cc6e6294956c12 Daniel Neighman has.sox@gmail.com