e657607af0f76911c3a0251171082429251713ce Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/45531b50194ac39b7820a5a73424d89674757b5a 45531b50194ac39b7820a5a73424d89674757b5a 2008-10-12T09:22:56-07:00 2008-10-12T09:22:56-07:00 Use 64 characters for session id in DM session model. Merb auth likes it that way. 2a2871881ac8cd372df13b7ebb1de915a818ccd1 Michael S. Klishin michael@novemberain.com b4c9847fa5e7c5efbb11c98257319f2b93e13bb9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/e657607af0f76911c3a0251171082429251713ce e657607af0f76911c3a0251171082429251713ce 2008-10-12T08:04:23-07:00 2008-10-12T08:04:23-07:00 Do not stop running if rake spec run fails along the way in some gem. bc9a85df93521ddf086fd91a4433e7d6edbf46a5 Michael S. Klishin michael@novemberain.com 785adbec26a56fa320426a41c807144eb56efd20 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/b4c9847fa5e7c5efbb11c98257319f2b93e13bb9 b4c9847fa5e7c5efbb11c98257319f2b93e13bb9 2008-10-12T08:03:10-07:00 2008-10-12T08:03:10-07:00 Do not load init in slice generators specs. 8f8f11f67ea2546683a549fc1419aed25163551c Michael S. Klishin michael@novemberain.com bd154c974610f28de7d8dd503790cf9b39a13b44 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/785adbec26a56fa320426a41c807144eb56efd20 785adbec26a56fa320426a41c807144eb56efd20 2008-10-12T07:58:08-07:00 2008-10-12T07:58:08-07:00 Add a note on session expiry to generated init file. 0e9c22e27ea483d2654b45ff1bd5f28700650d67 Michael S. Klishin michael@novemberain.com 8dac58864ea363e13ffa6723a0db0bd073e1e41d 969c57806b9df30dc80beb64d0416b45fd54619e Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/bd154c974610f28de7d8dd503790cf9b39a13b44 bd154c974610f28de7d8dd503790cf9b39a13b44 2008-10-11T13:14:38-07:00 2008-10-11T13:14:38-07:00 Merge branch 'master' into specsuite * master: (167 commits) removed useless generated views since we are all in agreement that this is bad form and won't help people Small fix to allow using Sequel. Finishes adding protect to merb-auth for protection on the router. fixed layout of generated DM models added merb gem dependencies, and updated the generated default DM model Depend on most recent Haml with bugfixes. Where are my generators, dude\? Ditto. Do not process file that should be just copied with Erb. Fixes public/dotaccess issue, improves generator performance a bit. Removed extra dependency (Templater) from Merb DM plugin gemspec. Make merb_datamapper generators discoverable again. added message commented out so people using stack can easily figure out how to get the messages from merb-auth update rakefile for content and consistancy update docs Always require discovered generators. Updates the router helper for merb-auth to allow for custom routes Adds support for params[] in bound fields fix to correctly include cleanup the exceptions_helper include ... 6d29e626ea028815554a68730b8aefe20d0c58cc Michael S. Klishin michael@novemberain.com ad3403fa6305ffcb924ff3ad14d402944546c8ae Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/969c57806b9df30dc80beb64d0416b45fd54619e 969c57806b9df30dc80beb64d0416b45fd54619e 2008-10-10T23:58:51-07:00 2008-10-10T23:58:51-07:00 removed useless generated views since we are all in agreement that this is bad form and won't help people 7d5cb006c02bb352aa9d5cc0b6417f678f9c51fb Matt Aimonetti mattaimonetti@gmail.com 588ad8748a1bc9151fadc25da6057d74a76a60ba Lori Holden lholden@yellowpages.com http://github.com/wycats/merb-more/commit/ad3403fa6305ffcb924ff3ad14d402944546c8ae ad3403fa6305ffcb924ff3ad14d402944546c8ae 2008-10-10T23:47:45-07:00 2008-10-10T13:03:19-07:00 Small fix to allow using Sequel. ceee4de33110fbf64e5c8572fa2ecea650cf30d2 Matt Aimonetti mattaimonetti@gmail.com 2323ba29ef931a0ec43fe1ec789baff09d89b348 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/588ad8748a1bc9151fadc25da6057d74a76a60ba 588ad8748a1bc9151fadc25da6057d74a76a60ba 2008-10-10T22:45:45-07:00 2008-10-10T22:44:30-07:00 Finishes adding protect to merb-auth for protection on the router. 988eb4d2c8ec311b4086ff702d788a511e70086d Daniel Neighman has.sox@gmail.com 19f864a303dff03411703c4a3f30955e693f010d Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/2323ba29ef931a0ec43fe1ec789baff09d89b348 2323ba29ef931a0ec43fe1ec789baff09d89b348 2008-10-10T19:51:39-07:00 2008-10-10T19:51:39-07:00 fixed layout of generated DM models dd3117f68a0294217d2aaf3e427d00a3fd4b48fa Matt Aimonetti mattaimonetti@gmail.com 5de77f36176e46fac88683b6edb2ad5f8649f9fd Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/19f864a303dff03411703c4a3f30955e693f010d 19f864a303dff03411703c4a3f30955e693f010d 2008-10-10T19:25:37-07:00 2008-10-10T19:25:37-07:00 added merb gem dependencies, and updated the generated default DM model 17e6752a4e74bc944c03f85f640c776b21d856df Matt Aimonetti mattaimonetti@gmail.com 834e18d6a59c930b31987c999b501ed6e96c6d1c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/5de77f36176e46fac88683b6edb2ad5f8649f9fd 5de77f36176e46fac88683b6edb2ad5f8649f9fd 2008-10-10T18:52:24-07:00 2008-10-10T18:52:24-07:00 Depend on most recent Haml with bugfixes. 1e03db357c9ac07f88cade9b0ea15ae469c5d6cc Michael S. Klishin michael@novemberain.com 8faac50fc2ca006680c4e0429162df656c8b52ca Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/834e18d6a59c930b31987c999b501ed6e96c6d1c 834e18d6a59c930b31987c999b501ed6e96c6d1c 2008-10-10T18:52:02-07:00 2008-10-10T18:52:02-07:00 Where are my generators, dude\? 21c779e6e69fe910c26c36e5b31685d08a19c826 Michael S. Klishin michael@novemberain.com 586b7d8128ffd49a884d1bdf523d505def3beeaf Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/8faac50fc2ca006680c4e0429162df656c8b52ca 8faac50fc2ca006680c4e0429162df656c8b52ca 2008-10-10T18:43:22-07:00 2008-10-10T18:43:22-07:00 Ditto. 39bd4a6d54156d1d72322f5a0edcae59535590e5 Michael S. Klishin michael@novemberain.com 4c2b8fd613d7bba471d481005812c793c54ddc23 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/586b7d8128ffd49a884d1bdf523d505def3beeaf 586b7d8128ffd49a884d1bdf523d505def3beeaf 2008-10-10T18:43:06-07:00 2008-10-10T18:43:06-07:00 Do not process file that should be just copied with Erb. 4c172ee402205d2f364e70ef0d5f561a026b2ae4 Michael S. Klishin michael@novemberain.com a58f35e333276994535b9d2cd9ba319fc2fef32b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/4c2b8fd613d7bba471d481005812c793c54ddc23 4c2b8fd613d7bba471d481005812c793c54ddc23 2008-10-10T18:39:38-07:00 2008-10-10T18:39:38-07:00 Fixes public/dotaccess issue, improves generator performance a bit. a2aa785aeb9a5c27dfe0c33da93d327963a1cb80 Michael S. Klishin michael@novemberain.com c4c120e0fa828f87d682bcec8b2d46361f6afa11 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/a58f35e333276994535b9d2cd9ba319fc2fef32b a58f35e333276994535b9d2cd9ba319fc2fef32b 2008-10-10T18:31:33-07:00 2008-10-10T18:30:05-07:00 Removed extra dependency (Templater) from Merb DM plugin gemspec. 27c9d84ed13f627e408b5d73e7b695b66b300309 Michael S. Klishin michael@novemberain.com 55d9a31b126de8a55d7dfb17ac744651eb615268 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/c4c120e0fa828f87d682bcec8b2d46361f6afa11 c4c120e0fa828f87d682bcec8b2d46361f6afa11 2008-10-10T18:16:16-07:00 2008-10-10T18:15:41-07:00 Make merb_datamapper generators discoverable again. 1c75a7b9b806a37b9d6ff186205b79626b42182e Michael S. Klishin michael@novemberain.com 84527c9b4a2f3173f22d3629327a4217d8adff23 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/55d9a31b126de8a55d7dfb17ac744651eb615268 55d9a31b126de8a55d7dfb17ac744651eb615268 2008-10-10T17:31:43-07:00 2008-10-10T17:31:43-07:00 added message commented out so people using stack can easily figure out how to get the messages from merb-auth 12bf97c71d0cf140fbe4efc02ed4bff058eed838 Matt Aimonetti mattaimonetti@gmail.com 7f76bfe088a2e2ad3710d06a42a8a943876edd61 be2e39cbaeceac4b957b4872108be8f3e5bc31ca Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/84527c9b4a2f3173f22d3629327a4217d8adff23 84527c9b4a2f3173f22d3629327a4217d8adff23 2008-10-10T16:57:50-07:00 2008-10-10T16:57:50-07:00 Merge commit 'monki/master' into sprint 24a322ed7bc058eb3b8621060930bdb538ab7c96 Yehuda Katz wycats@gmail.com e46ba28234725eeda1363dc4a58a271d88bd619d Wesley Beary monki@geemus.com http://github.com/wycats/merb-more/commit/be2e39cbaeceac4b957b4872108be8f3e5bc31ca be2e39cbaeceac4b957b4872108be8f3e5bc31ca 2008-10-10T16:43:28-07:00 2008-10-10T16:43:28-07:00 update rakefile for content and consistancy 84b224f2435fb5c41cde785c24947de370b55fca Wesley Beary monki@geemus.com 6e9847e882a4e1d512aafd2a1ceda1d9a9d157c1 Wesley Beary monki@geemus.com http://github.com/wycats/merb-more/commit/e46ba28234725eeda1363dc4a58a271d88bd619d e46ba28234725eeda1363dc4a58a271d88bd619d 2008-10-10T16:43:07-07:00 2008-10-10T16:43:07-07:00 update docs db2188c3d169d4275851f0315d6dc05833fc7e0b Wesley Beary monki@geemus.com ab67c95d261841b2ea4c60e89191e3ce8043e2f6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/7f76bfe088a2e2ad3710d06a42a8a943876edd61 7f76bfe088a2e2ad3710d06a42a8a943876edd61 2008-10-10T16:33:58-07:00 2008-10-10T16:33:58-07:00 Always require discovered generators. efc25c00e19cc26b99e546cd8a0a3aa29ceb8306 Michael S. Klishin michael@novemberain.com 928035f3e7a443fc8e65a860fd5e6f3d5fb0dc6f 688017caa18a40f7bdc442ab1171d2b14b844657 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/ab67c95d261841b2ea4c60e89191e3ce8043e2f6 ab67c95d261841b2ea4c60e89191e3ce8043e2f6 2008-10-10T16:08:35-07:00 2008-10-10T16:08:35-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-more into sprint * 'sprint' of git@github.com:wycats/merb-more: Updates the router helper for merb-auth to allow for custom routes Adds support for params[] in bound fields merging in master. This is the actual fix for the merb-auth rake issue Changed the behaviour of eager_cache regarding the block. Updated the specs a bit updated Merb::Cache.setup to be bootloader aware added CacheRequest with specs Add support for custom cache key in fragment caching. Revert "Fixed 'rake install' not installing gems." Fixed 'rake install' not installing gems. Updated Rakefiles to use Merb::RakeHelper from -core for merb-cache and merb-helpers. 6eccb59cebc4566b08012b7de2f3ec814ec4e4ce Michael S. Klishin michael@novemberain.com a747d26c82a97e5fc3564e55946d64002f4ee0f4 Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-more/commit/688017caa18a40f7bdc442ab1171d2b14b844657 688017caa18a40f7bdc442ab1171d2b14b844657 2008-10-10T15:59:13-07:00 2008-10-10T15:59:13-07:00 Updates the router helper for merb-auth to allow for custom routes d38696f1222d211c233e21a865be2766a7c0e2eb Daniel Neighman has.sox@gmail.com df08b0fc41356e0eab43874d4ec1c85f561c2621 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/a747d26c82a97e5fc3564e55946d64002f4ee0f4 a747d26c82a97e5fc3564e55946d64002f4ee0f4 2008-10-10T15:35:52-07:00 2008-10-10T15:35:52-07:00 Adds support for params[] in bound fields a1fea6aa02beb20be2a0809df75b04eac19cb281 Yehuda Katz wycats@gmail.com 3476778cbaabcc9763be2adfc37ddec7d9633a48 Wesley Beary monki@geemus.com http://github.com/wycats/merb-more/commit/6e9847e882a4e1d512aafd2a1ceda1d9a9d157c1 6e9847e882a4e1d512aafd2a1ceda1d9a9d157c1 2008-10-10T15:22:38-07:00 2008-10-10T15:22:38-07:00 fix to correctly include 931b0e58c94391f7fd3e8b3a1c1b32055a320a3b Wesley Beary monki@geemus.com 351506158d25d99acea4b3bf2a5c007db43e462a Wesley Beary monki@geemus.com http://github.com/wycats/merb-more/commit/3476778cbaabcc9763be2adfc37ddec7d9633a48 3476778cbaabcc9763be2adfc37ddec7d9633a48 2008-10-10T15:18:51-07:00 2008-10-10T15:18:51-07:00 cleanup the exceptions_helper include c72c1f4aba794a0e8e152f98e48765af30a38cbb Wesley Beary monki@geemus.com 25f654ef3ec3778f9756e945f5a7429542f59bae 4394aa9e85f2744e24358553b8a042cd85257a45 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/df08b0fc41356e0eab43874d4ec1c85f561c2621 df08b0fc41356e0eab43874d4ec1c85f561c2621 2008-10-10T15:10:03-07:00 2008-10-10T15:10:03-07:00 Merge branch 'master' into sprint 0b3e27e5998fb57c3bf3d26c0b2d5b9159e501f8 Yehuda Katz wycats@gmail.com 72b2a2c8fa18df1a026bfdd88efd4cc3916fb6e2 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/4394aa9e85f2744e24358553b8a042cd85257a45 4394aa9e85f2744e24358553b8a042cd85257a45 2008-10-10T15:07:55-07:00 2008-10-10T15:07:55-07:00 merging in master. fa393b0b5d4171133ae5aa25a603131b361997da Ben Burkert ben@benburkert.com 267d918d55a946f2220940aff5a908b6c5f0ddef fad172500881ba10a76a454c79901306c4b870d6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/928035f3e7a443fc8e65a860fd5e6f3d5fb0dc6f 928035f3e7a443fc8e65a860fd5e6f3d5fb0dc6f 2008-10-10T15:05:44-07:00 2008-10-10T15:05:44-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-more into sprint * 'sprint' of git@github.com:wycats/merb-more: (31 commits) Fixes merb auths rake file for rake -T in apps Removes the cleanup of lib/merb-auth.rb Fixed so-called mysteriously disappearing merb-auth/lib/merb-auth.rb moved the dm db tasks outside of the dm namespace adds back the merb-auth.rb file Adds capacity to set headers and status in the strategies. throw(:halt should not be used in strategies :) Win! Initial update of the generators for merb-auth adds routes to the router for logins in the generator Updates strategy redirect! to add a message Updates the basic auth strategy and strategies to allow for setting headers body etc Downcase resource name in after generation hook message. raising a more descriptive error when the generated view fails because no params are passed to the create method fixed the destroy controller action to stop trying to show you the delete resource adds routes to the router for logins in the generator Updates strategy redirect! to add a message Updates the basic auth strategy and strategies to allow for setting headers body etc Add merb-auth back in the -more gems removing the dashified version of merb dm Downcase resource name in after generation hook message. Prevent resource generator from generating views twice: only use default views when orm is set to :none. ... 30b473246e00f6e4449809695c40e6ea4c9432f2 Michael S. Klishin michael@novemberain.com