de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/efc020f427d96ecf90b1cf863e8d3a4c393af3db efc020f427d96ecf90b1cf863e8d3a4c393af3db 2008-11-03T15:45:20-08:00 2008-11-03T15:45:20-08:00 Fixes an oversight in RC5 e78e4b092dcd30aa01291758264ec072510afde1 Yehuda Katz wycats@gmail.com aa16b61d61499606b54c19b529c18089122bd305 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1 de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1 2008-11-03T13:56:05-08:00 2008-11-02T19:58:06-08:00 Convert view matchers to nokogiri with a rexml fallback The view matchers have_xpath, have_selector, have_tag, matches_tag now use nokogiri. If nokogiri is not present (for example, in situations where it cannot be compiled), the matchers fallback on rexml. 0627f1d405f132ed2bc178bc69125e908222f64a Carl Lerche carllerche@mac.com faaac4ab0e7bdd0edd8e7046b13227fe6bd76482 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/aa16b61d61499606b54c19b529c18089122bd305 aa16b61d61499606b54c19b529c18089122bd305 2008-11-03T01:12:17-08:00 2008-11-03T01:12:17-08:00 Add support for action-args for JRuby. * Doesn't work with actions defined via define_method * Do we need to support that in general? * Modified headius' code to support the actual spec we were using * We should probably convert the ParseTree version to use headius' spec. 63e1aeb6c0adfe8e5a8ca0d1883da10deb701b6f Yehuda Katz wycats@gmail.com 84b5158ee499999a226e6d56ba0c6993668203fb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/faaac4ab0e7bdd0edd8e7046b13227fe6bd76482 faaac4ab0e7bdd0edd8e7046b13227fe6bd76482 2008-11-02T23:09:14-08:00 2008-11-02T23:09:14-08:00 Spec suite runs cab0993ba0e66839cd41a835039425d865d4c412 Yehuda Katz wycats@gmail.com cb3d67fba177a0be2a23feef953e2f0024fec73a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/84b5158ee499999a226e6d56ba0c6993668203fb 84b5158ee499999a226e6d56ba0c6993668203fb 2008-11-02T22:50:33-08:00 2008-11-02T22:50:33-08:00 built-in webrat support 938619651dd7963c51426b306c3729cb708e5e4c Yehuda Katz wycats@gmail.com 0c3e992ddffa1d0661e960f4c89f131fa72ce84f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/cb3d67fba177a0be2a23feef953e2f0024fec73a cb3d67fba177a0be2a23feef953e2f0024fec73a 2008-11-02T15:48:44-08:00 2008-11-02T15:48:44-08:00 cp takes an Array, not a glob bebc0ca8acba0a6981f08c8d7beb73c06e15b1e2 Yehuda Katz wycats@gmail.com 7df1c84df7709365c22f3c38892414385669f42e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/0c3e992ddffa1d0661e960f4c89f131fa72ce84f 0c3e992ddffa1d0661e960f4c89f131fa72ce84f 2008-11-02T15:39:38-08:00 2008-11-02T15:39:38-08:00 Add a task to generate the nightlies f48de10ceb602d6be8b7dd07516b5b4b714a1a55 Yehuda Katz wycats@gmail.com 38b8bf43b42846381eaa9c0d07ebe76e21d8410c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/7df1c84df7709365c22f3c38892414385669f42e 7df1c84df7709365c22f3c38892414385669f42e 2008-11-02T15:17:26-08:00 2008-11-02T15:17:26-08:00 Friendlier error for mongrel fail d3381da5df9dfbd37a3ab1c9051dff7c61a6a94b Yehuda Katz wycats@gmail.com 60401c033119acfae8b5799079ab226007082440 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/38b8bf43b42846381eaa9c0d07ebe76e21d8410c 38b8bf43b42846381eaa9c0d07ebe76e21d8410c 2008-11-02T09:54:52-08:00 2008-11-02T09:54:52-08:00 This was causing pain when starting merb 0431af8a1253623b8e39c0a4a2dc7ac9363fee8a Yehuda Katz wycats@gmail.com 1e5efc188eeda74b4dc9e833b5940af0e9969d3c Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/60401c033119acfae8b5799079ab226007082440 60401c033119acfae8b5799079ab226007082440 2008-11-02T09:48:23-08:00 2008-11-02T09:48:23-08:00 Gem binary wrapper now exclusively loads from ./gems when using local ./bin/* wrapper c348f72090f678e21aaf7a934d0f34c17358b09a Fabien Franzen info@atelierfabien.be e89f9f70ca2cabc713f567acd4b44bb5e8a7a851 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/1e5efc188eeda74b4dc9e833b5940af0e9969d3c 1e5efc188eeda74b4dc9e833b5940af0e9969d3c 2008-11-02T09:21:44-08:00 2008-11-02T09:21:44-08:00 Default to --include-dependencies (--ignore-dependencies is available), always install bin wrappers b81c4b997e261b13e5374c7ae73c16e9c3a1fc37 Fabien Franzen info@atelierfabien.be 933a07df7145c1363c976de7ce0bd88367ab5790 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/e89f9f70ca2cabc713f567acd4b44bb5e8a7a851 e89f9f70ca2cabc713f567acd4b44bb5e8a7a851 2008-11-02T09:19:22-08:00 2008-11-02T09:19:22-08:00 Write executable wrappers for all installed gems (GemManagement) 6972f7da7d699a9c9504957601140b18a2379e4c Fabien Franzen info@atelierfabien.be d1a8c0135547540210d760fc1eba999df79b7311 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/933a07df7145c1363c976de7ce0bd88367ab5790 933a07df7145c1363c976de7ce0bd88367ab5790 2008-11-01T21:02:45-07:00 2008-11-01T21:02:45-07:00 Whoops... merb-more was requiring merb... circular deps ftl f52b2f15f6e32a5d2a9a6b011c2d7e1d86a200c6 Yehuda Katz wycats@gmail.com 8b2b7a67d2aea2220e842066d497448d729568b6 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/d1a8c0135547540210d760fc1eba999df79b7311 d1a8c0135547540210d760fc1eba999df79b7311 2008-10-31T22:59:56-07:00 2008-10-31T22:59:56-07:00 Tests now run under jruby, and in non-forked mode (for CI) 7ab4912a60a3125308457cc5967fee8b8eb642ff Yehuda Katz wycats@gmail.com 9b7bbedb2e88732bf83ef3f0273d5e01a5845ec5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/8b2b7a67d2aea2220e842066d497448d729568b6 8b2b7a67d2aea2220e842066d497448d729568b6 2008-10-31T16:57:25-07:00 2008-10-31T16:56:30-07:00 Modify the rakefiles to be DRY 882ca317ec851cd8e9570ef2da67fea646c1e29d Yehuda Katz wycats@gmail.com ae8b3d05a32db4c5f88dc5415475006765756198 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/9b7bbedb2e88732bf83ef3f0273d5e01a5845ec5 9b7bbedb2e88732bf83ef3f0273d5e01a5845ec5 2008-10-31T15:44:14-07:00 2008-10-31T15:44:14-07:00 [#950 status:resolved] Generates resource routes with variable prefix Fixes a bug where a resource route containing a variable prefix would not figure out the arguments correctly and use the current request parameters as defaults correctly. b374d0564139f8e8aa973ee7a85ad52b3ec302b8 Carl Lerche carllerche@mac.com cbb494be4a2bfe6bf95690f0fa14691abd8113c8 Carl Lerche carllerche@mac.com http://github.com/wycats/merb/commit/ae8b3d05a32db4c5f88dc5415475006765756198 ae8b3d05a32db4c5f88dc5415475006765756198 2008-10-31T13:30:38-07:00 2008-10-28T00:08:26-07:00 Added the pseudoname :this to Router When trying to generate a route using the name :this, the Router will use the current request's route. This allows to easily do stuff like pagination where we just need to regenerate the same route using different parameters. 4a309219e97c7d21bd8d2356ec9df33748c1eb0e Carl Lerche carllerche@mac.com 058b620a7fd6e8584674a923ac968a514b4d5c65 390b8cd12896c50525e10f64c517513cc41675d2 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/cbb494be4a2bfe6bf95690f0fa14691abd8113c8 cbb494be4a2bfe6bf95690f0fa14691abd8113c8 2008-10-30T14:47:00-07:00 2008-10-30T14:47:00-07:00 Merge branch 'wycats_active' into active * wycats_active: (29 commits) Adds support for %s in socket file The generator should no thave a separate hardcoded version Bumped to 0.9.13 Fixes merb-auth to release correctly Look for Merb, not Merb::Plugins Revert too-clever solution to a problem that broke all sorts of stuff HEAD now on 0.9.12 Updated to 0.9.11 Finished the rest of the specs and got everything to work Starting to build cookie tracking for the #request spec helper Modifies structure of request specs to make it easy to override request in a child 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. ... f69d29e3d5440bf6ce6f70604344513501ba8234 Michael S. Klishin michael@novemberain.com 0375096b364c8e5d87f9da730ed767b8c5dfbf82 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/058b620a7fd6e8584674a923ac968a514b4d5c65 058b620a7fd6e8584674a923ac968a514b4d5c65 2008-10-30T14:39:46-07:00 2008-10-30T14:37:12-07:00 Require dm-core in DM session store file. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 9281788574f0f5acecd41906cd3250890691cd0d Michael S. Klishin michael@novemberain.com a319ad0c8480bc10225909d7f97898dfd3989e4f 79226c73b10d3df951e106c66875515fa7c67598 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb/commit/0375096b364c8e5d87f9da730ed767b8c5dfbf82 0375096b364c8e5d87f9da730ed767b8c5dfbf82 2008-10-30T14:39:28-07:00 2008-10-30T14:39:28-07:00 Merge branch 'wycats_active' into active * wycats_active: Remove CSRF middleware. It doesn't really work at the middleware level. Improve slice generator spec. 082b3455504721d7894ed07ada9f0e18ac09007f Michael S. Klishin michael@novemberain.com fa83a233b8e05fdc24764569c5419047b46e4649 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/390b8cd12896c50525e10f64c517513cc41675d2 390b8cd12896c50525e10f64c517513cc41675d2 2008-10-30T13:30:56-07:00 2008-10-30T13:30:56-07:00 Adds support for %s in socket file e5e9eb180432926aa3da101a87938dbefefe7d20 Yehuda Katz wycats@gmail.com 45c19b03020231de9238ee009fe19084d6ff2f50 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/fa83a233b8e05fdc24764569c5419047b46e4649 fa83a233b8e05fdc24764569c5419047b46e4649 2008-10-30T13:26:47-07:00 2008-10-30T13:26:47-07:00 The generator should no thave a separate hardcoded version 3c62186428551b91acf8552d299016429b1515c6 Yehuda Katz wycats@gmail.com dba7caa9e7c110446bd1e7eee4b8d65741103bc7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/45c19b03020231de9238ee009fe19084d6ff2f50 45c19b03020231de9238ee009fe19084d6ff2f50 2008-10-30T10:57:04-07:00 2008-10-30T10:57:04-07:00 Bumped to 0.9.13 7ed759a30713f0e02fbcb836b49942bba1ea202d Yehuda Katz wycats@gmail.com fc92683ae1189ea4f97db90d7b15852224293cf8 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/dba7caa9e7c110446bd1e7eee4b8d65741103bc7 dba7caa9e7c110446bd1e7eee4b8d65741103bc7 2008-10-30T10:54:47-07:00 2008-10-30T10:54:47-07:00 Fixes merb-auth to release correctly 89b6db7a7aa9c1b560ca670872c76df2ccaef130 Yehuda Katz wycats@gmail.com 8a0fc6fd3448b1e271936a09035cb9cc28ae1cea Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/fc92683ae1189ea4f97db90d7b15852224293cf8 fc92683ae1189ea4f97db90d7b15852224293cf8 2008-10-29T23:50:08-07:00 2008-10-29T23:50:08-07:00 Look for Merb, not Merb::Plugins b76da7a512076fffc7b7ca4f91ef02a244985ba0 Yehuda Katz wycats@gmail.com 19659e6c82dc0a12e81151cd2bcfab67e59cb1fb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/8a0fc6fd3448b1e271936a09035cb9cc28ae1cea 8a0fc6fd3448b1e271936a09035cb9cc28ae1cea 2008-10-29T23:49:59-07:00 2008-10-29T23:49:59-07:00 Revert too-clever solution to a problem that broke all sorts of stuff 237d52a24e9a5deb5bfd32cb1007d50bfa3a8a53 Yehuda Katz wycats@gmail.com 16d7aee4c25d65fcd7af60b64cd59554939abbe2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/19659e6c82dc0a12e81151cd2bcfab67e59cb1fb 19659e6c82dc0a12e81151cd2bcfab67e59cb1fb 2008-10-29T18:55:26-07:00 2008-10-29T18:55:26-07:00 HEAD now on 0.9.12 19799267d92e83b0bc3f38246256da59af9cfa9a Yehuda Katz wycats@gmail.com 3e5171265f2cf3e4495fe5824b63e8a3cae79e3c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/16d7aee4c25d65fcd7af60b64cd59554939abbe2 16d7aee4c25d65fcd7af60b64cd59554939abbe2 2008-10-29T18:54:30-07:00 2008-10-29T18:54:30-07:00 Updated to 0.9.11 562521990ead64fbc9ec483685f34989ca89e647 Yehuda Katz wycats@gmail.com 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