48fa415a891b00881eda2e14d05020b01e04183e David James djwonk@collectiveinsight.net http://github.com/wycats/merb-more/commit/825d94f27ab3448d76f8f37bf16cc8e13ae06b3c 825d94f27ab3448d76f8f37bf16cc8e13ae06b3c 2008-05-05T14:46:31-07:00 2008-05-05T14:43:51-07:00 Removed mention of merb_rspec from auto-generated docs. 3cca05589d82cac51735225e35f627b746c98b2b David James djwonk@collectiveinsight.net 4f87aceb53318e5f9122577b6e646f6c139d1532 90cb974cf44583f4e30fe8fd2bff5c8c5d584476 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/48fa415a891b00881eda2e14d05020b01e04183e 48fa415a891b00881eda2e14d05020b01e04183e 2008-05-05T02:37:55-07:00 2008-05-05T02:37:55-07:00 Merge branch 'master' of git@github.com:wycats/merb-more fb57ff99842a116331b7c51c9ea7c9acea39accb booss alex.boussinet@gmail.com 8690d673201d6cff9019dc26291af773eafdb4a0 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/4f87aceb53318e5f9122577b6e646f6c139d1532 4f87aceb53318e5f9122577b6e646f6c139d1532 2008-05-05T02:37:39-07:00 2008-05-05T02:37:39-07:00 Cache error with default content-type fixed. Closing #125 60bf5b2e7724935edb7dced8374068816d733a42 booss alex.boussinet@gmail.com a65ae3c6f860b340f795686f3c5ee0f420419c6c Glenn Rempe glenn@rempe.us http://github.com/wycats/merb-more/commit/90cb974cf44583f4e30fe8fd2bff5c8c5d584476 90cb974cf44583f4e30fe8fd2bff5c8c5d584476 2008-05-04T13:47:12-07:00 2008-05-04T13:38:59-07:00 Removed crufty SVN hidden dirs, now that repos is in Git. Signed-off-by: Glenn Rempe <glenn@rempe.us> Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> d632d3cbf7ed1a9540354a0f30c81369856bafcb Ezra Zygmuntowicz ez@engineyard.com 1e6ea8700a2b91910467f1ad364c6058b7b6f9e5 571cbf5ee9723f4e00d3389a31a7a93f45b083be Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/a65ae3c6f860b340f795686f3c5ee0f420419c6c a65ae3c6f860b340f795686f3c5ee0f420419c6c 2008-05-03T17:34:26-07:00 2008-05-03T17:34:26-07:00 Merge branch 'master' of git@github.com:wycats/merb-more be1a1c1dcc4d08d991303804974505fbd980186c Ezra Zygmuntowicz ez@engineyard.com 7516b44c726d49517a80c6a4932a09d921a1b75f Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/1e6ea8700a2b91910467f1ad364c6058b7b6f9e5 1e6ea8700a2b91910467f1ad364c6058b7b6f9e5 2008-05-03T17:34:08-07:00 2008-05-03T17:34:08-07:00 bump merb-more versions to 0.9.3 cb2f8b7c170d6322e88c1fda2f747ea221f5d3ad Ezra Zygmuntowicz ez@engineyard.com 7516b44c726d49517a80c6a4932a09d921a1b75f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/571cbf5ee9723f4e00d3389a31a7a93f45b083be 571cbf5ee9723f4e00d3389a31a7a93f45b083be 2008-05-03T17:34:00-07:00 2008-05-03T17:32:55-07:00 Make generated Autotest files Windows-friendly again. f79992ee669e5efd802866167b7bbb6e1f70bf26 Michael S. Klishin michael@novemberain.com ca2ebff57b91e85b581579cdf4e8d67a3aba620e Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/7516b44c726d49517a80c6a4932a09d921a1b75f 7516b44c726d49517a80c6a4932a09d921a1b75f 2008-05-03T17:21:19-07:00 2008-05-03T17:21:19-07:00 allow usage of a custom GEM_HOME when building gems in rakefile 252441075dd8b1e6f3272d49196ecd2ac246227e Ezra Zygmuntowicz ez@engineyard.com 737b687b884855b3ef60b13cc7c86c33462c9ae0 Maciej Piechotka uzytkownik2@gmail.com http://github.com/wycats/merb-more/commit/ca2ebff57b91e85b581579cdf4e8d67a3aba620e ca2ebff57b91e85b581579cdf4e8d67a3aba620e 2008-05-03T17:04:04-07:00 2008-04-17T10:53:23-07:00 Add missing dependency for merb-builder Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 881edb661451168a1ee6af5f57e2d0ea0f2acad0 Ezra Zygmuntowicz ez@engineyard.com 0bf42337679acb3a4c72873cf639652a7b489515 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/737b687b884855b3ef60b13cc7c86c33462c9ae0 737b687b884855b3ef60b13cc7c86c33462c9ae0 2008-05-03T16:59:12-07:00 2008-05-03T16:59:12-07:00 make partials with args work in parts. edcb01e62790864092802375640fad7007c06ffa Ezra Zygmuntowicz ez@engineyard.com 2bab707c85924b4c5aee521d02f4e36a95392e90 Cory ODaniel codaniel@rippletv.com http://github.com/wycats/merb-more/commit/0bf42337679acb3a4c72873cf639652a7b489515 0bf42337679acb3a4c72873cf639652a7b489515 2008-05-03T16:55:06-07:00 2008-05-02T11:04:30-07:00 A css/js auto linker based on controller/action names. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 3ebd0bf566fab6695acbf176aa6991d6c16450cf Ezra Zygmuntowicz ez@engineyard.com 34226ef6e347f8f722446a00aaf27e63108790c6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/2bab707c85924b4c5aee521d02f4e36a95392e90 2bab707c85924b4c5aee521d02f4e36a95392e90 2008-05-03T13:29:42-07:00 2008-05-03T13:29:42-07:00 Leave a notice on libraries under lib/ autoloading in init.rb (see details). Bootloader in merb-core sets :lib type path globbing to nil, meaning no globbing for /lib directory. So libraries organized in a way - lib/ magicwand/ lib/ magicwand.rb will not play nice with autoload. Using Merb.push_path for lib in init.rb with **/*.rb globbing does the trick but changing this in core causes spec suite to blow up. Until this investigated and resolved, we leave a comment in generated init.rb. 35f09be9c500fd20c4fae605660459067d0d1e1d Michael S. Klishin michael@novemberain.com 5ebf1d6c1285df767d7dfd8e34084756ca052534 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/34226ef6e347f8f722446a00aaf27e63108790c6 34226ef6e347f8f722446a00aaf27e63108790c6 2008-05-03T13:14:49-07:00 2008-05-03T13:14:49-07:00 Revert "Add Merb.root / 'lib' directory to list of :lib paths so it does autoload." This reverts commit 5ebf1d6c1285df767d7dfd8e34084756ca052534. The issues with lib/library/lib/library.rb schema is because in merb-core bootloader sets glob for :lib as nil but should use **/*.rb instead. So this has to be fixed in merb-core. aeb3423e5359fbd9cc892644f16415cbd3bb13f6 Michael S. Klishin michael@novemberain.com 60fe88514673c438e5cd793e536788761105c8ac Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/5ebf1d6c1285df767d7dfd8e34084756ca052534 5ebf1d6c1285df767d7dfd8e34084756ca052534 2008-05-03T13:03:30-07:00 2008-05-03T13:03:30-07:00 Add Merb.root / 'lib' directory to list of :lib paths so it does autoload. d65a2e1ad578c5e2ab4a6c59dd26964013ae9d70 Michael S. Klishin michael@novemberain.com c99e18b072be2aab475488685b5ebb9944fa97ed Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/60fe88514673c438e5cd793e536788761105c8ac 60fe88514673c438e5cd793e536788761105c8ac 2008-05-02T17:30:58-07:00 2008-05-02T17:30:58-07:00 Fix merb-builder, thanks atmpos aeb3423e5359fbd9cc892644f16415cbd3bb13f6 Ezra Zygmuntowicz ez@engineyard.com dfff3001445dfc4201d5994f79be400fe41ff489 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/c99e18b072be2aab475488685b5ebb9944fa97ed c99e18b072be2aab475488685b5ebb9944fa97ed 2008-05-02T00:21:11-07:00 2008-05-02T00:21:11-07:00 Make loadp paths and dependencies come first in generated config. 8f4e78c69c23ce09a640b47d21da954edb5bb77c Michael S. Klishin michael@novemberain.com b93ae85cbd397503ee28eca77ad8e15865696f8b Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/dfff3001445dfc4201d5994f79be400fe41ff489 dfff3001445dfc4201d5994f79be400fe41ff489 2008-05-02T00:20:41-07:00 2008-05-02T00:20:41-07:00 Make Merb::Config.use section come after dependencies. * With this order we can set up dependencies first, then use it in config. [#248 state:resolved] cdf6224899eb98844d274a88e1c1363b3286459b Michael S. Klishin michael@novemberain.com 6fed613f03c5a28a79f06e6edd57fa9ec5dbb41e Damian Terentiev infusiastic@gmail.com http://github.com/wycats/merb-more/commit/b93ae85cbd397503ee28eca77ad8e15865696f8b b93ae85cbd397503ee28eca77ad8e15865696f8b 2008-05-01T21:01:17-07:00 2008-04-13T05:08:04-07:00 Added a small fix to autotest/merb_rspec.rb template spec_commands method could fail to find a spec command. Now it also tries to get the output of `which spec` as a last resort. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 7c9ab017034fc2819088047cbc314ee25147dc8c Michael S. Klishin michael@novemberain.com ecdb7c07a4279bc7b65ecf3c5af20abf3c3ec15f Damian Terentiev infusiastic@gmail.com http://github.com/wycats/merb-more/commit/6fed613f03c5a28a79f06e6edd57fa9ec5dbb41e 6fed613f03c5a28a79f06e6edd57fa9ec5dbb41e 2008-05-01T20:50:16-07:00 2008-04-13T08:56:42-07:00 Doc fix for merb-gen README file Updated merb-gen command syntax to current, added information where to put custom merb generators. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 3732e2af428318c3a171808f94418f3cc6bb785c Michael S. Klishin michael@novemberain.com 13ce63bfe24fb199eb8de88f509d36e4e96675a3 Damian Terentiev infusiastic@gmail.com http://github.com/wycats/merb-more/commit/ecdb7c07a4279bc7b65ecf3c5af20abf3c3ec15f ecdb7c07a4279bc7b65ecf3c5af20abf3c3ec15f 2008-05-01T20:37:39-07:00 2008-04-14T01:46:04-07:00 Updated templates for merb app generation Signed-off-by: Michael S. Klishin <michael@novemberain.com> 704f5b862134ebce1cf6a3fc0a2ea22ccf487a51 Michael S. Klishin michael@novemberain.com 52c1d17802fef0931ba6ebc02e32735a72b30721 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/13ce63bfe24fb199eb8de88f509d36e4e96675a3 13ce63bfe24fb199eb8de88f509d36e4e96675a3 2008-04-30T00:00:42-07:00 2008-04-30T00:00:42-07:00 Add example and dependencies / installation order tricks to generated init.rb 309114b382c295741d205f5ca45ae09e2502baeb Michael S. Klishin michael@novemberain.com 8690d673201d6cff9019dc26291af773eafdb4a0 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/52c1d17802fef0931ba6ebc02e32735a72b30721 52c1d17802fef0931ba6ebc02e32735a72b30721 2008-04-29T23:27:45-07:00 2008-04-29T23:27:45-07:00 Update generated init file: add inflection examples, notes on gems bundling and lazy loading of dependencies. 809732410519fec086f07d1336f1808764cd9894 Michael S. Klishin michael@novemberain.com 47d372f6a6f195974792a76554ccab41b324b2a9 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/8690d673201d6cff9019dc26291af773eafdb4a0 8690d673201d6cff9019dc26291af773eafdb4a0 2008-04-29T05:17:11-07:00 2008-04-29T05:17:11-07:00 Cached page requests now respect the original content-type, fixing #116 39812c00c36a053cb789115923e5ac0cba2366db booss alex.boussinet@gmail.com d955257412574cb383ce8b300bb974665fdf1052 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/47d372f6a6f195974792a76554ccab41b324b2a9 47d372f6a6f195974792a76554ccab41b324b2a9 2008-04-26T11:41:25-07:00 2008-04-26T11:41:25-07:00 Arguments to require_js and require_css methods are now kept seperate This enables correct :bundle and other argument handling for a set of assets. ce4495cc634b00dffe3c5612de799ce2b1c32530 Fabien Franzen info@atelierfabien.be 128efd8efa740f4e11ef0b2cc058a11af01c6542 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/d955257412574cb383ce8b300bb974665fdf1052 d955257412574cb383ce8b300bb974665fdf1052 2008-04-26T09:58:54-07:00 2008-04-26T09:58:54-07:00 Properly handle assets urls with query strings in them Prevent the helper from adding .css to urls like /stylesheets/color.css?c=red b6b43fed7f49ac1434b0bc80599a8140a1319b56 Fabien Franzen info@atelierfabien.be 22cd0b1a96706561b9e8ba5952963f3f7ff9e4a7 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/128efd8efa740f4e11ef0b2cc058a11af01c6542 128efd8efa740f4e11ef0b2cc058a11af01c6542 2008-04-25T01:23:24-07:00 2008-04-25T01:23:24-07:00 Fixed "Page caching doesn't deactivate" closing #106 ee78f9a51913857f43fffc8b63bf7a14be068535 booss alex.boussinet@gmail.com 1dd5d5c2500fb627d421788d2aee56e7e944a8ec Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/22cd0b1a96706561b9e8ba5952963f3f7ff9e4a7 22cd0b1a96706561b9e8ba5952963f3f7ff9e4a7 2008-04-24T01:30:48-07:00 2008-04-24T01:30:48-07:00 Small touchup regarding asset bundling 67f0d4e45ab55fe0b53dfa6ab3763e9d39930cf0 Fabien Franzen info@atelierfabien.be 3b43242f29389d533c618f53d512db6e95893962 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/1dd5d5c2500fb627d421788d2aee56e7e944a8ec 1dd5d5c2500fb627d421788d2aee56e7e944a8ec 2008-04-23T02:03:05-07:00 2008-04-23T02:03:05-07:00 Made bundles stale for 60 seconds after modification/generation This way generating bundles won't be affected as much by starting multiple instances of your app. The first instance will probably regenerate the bundles once started. Other instances will follow in max. 60 seconds afterwards. Additionally, when writing the bundle an exclusive file lock is enforced. Fixed bug in include_require_* logic. 4188578a1c8228f91465bd4b659a7e69fa987315 Fabien Franzen info@atelierfabien.be 6757d1546065ea4fdf1c9d6ac0a53c6b612ca076 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/3b43242f29389d533c618f53d512db6e95893962 3b43242f29389d533c618f53d512db6e95893962 2008-04-23T01:10:53-07:00 2008-04-23T01:10:53-07:00 Added bundling for require_js and require_css; track cached bundles in-memory The helper methods require_js and require_css now accept options to be merged with the include_required_js and include_required_css options. So :bundle and in the case of css :media options work as expected. A list of cached bundles is kept in memory instead of looking for an existing file (which can be out of date). The in-memory tracking of bundles implies that bundles are regenerated whenever the app (re)starts. In other words, at deployment too. (What about starting up multiple instances?) 6f19d8552ba97bc8c175a338ea2c9452c538188c Fabien Franzen info@atelierfabien.be 0af191cbf8eaeb7f3997c019c519bfeea95e7363 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/6757d1546065ea4fdf1c9d6ac0a53c6b612ca076 6757d1546065ea4fdf1c9d6ac0a53c6b612ca076 2008-04-22T22:13:32-07:00 2008-04-22T22:12:59-07:00 merb-mailer absolute_url convenience method thanks mde: Mimics the behavior of absolute_url in AbstractController, using @base_controller.request. Useful to display the host name in the URLs in signup-confirmations for Merbful Auth. e24bd45db5b1bd489d4072272b3582c15926fefb Michael D. Ivey ivey@gweezlebur.com