0c628dc7e2ff8b7529f43e4090d37adc8e86ba54 24bfceaae2b1edf7c2f92fb9a7716a523ba7f417 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/f2712773d0f8beed1be8ec97fcd39a27f6ff4159 f2712773d0f8beed1be8ec97fcd39a27f6ff4159 2008-12-20T08:04:57-08:00 2008-12-20T08:04:57-08:00 Merge branch 'master' into new-plugins Conflicts: lib/mephisto/plugin.rb 1e506c6f381b3ba951c3c9b76de90aeccf33aad0 Eric Kidd git@randomhacks.net 06917544a35c178a5ab2c9ec61773693e4886d36 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/173c3b82e7dae0f7d616c5522104e48f76ef94ad 173c3b82e7dae0f7d616c5522104e48f76ef94ad 2008-12-19T15:05:56-08:00 2008-12-19T15:05:56-08:00 Attempt to escape strings in FlickrMacro This plugin had absolutely no HTML escaping. I've attempted to fix this, but since the API key has expired, this code has not been tested. af794530fc408a12fae29c5a22f833f4a7d51f1c Eric Kidd git@randomhacks.net 9b5e2f5a84b1acd4b2c0cf443f99af864c1e3d4b isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/0c628dc7e2ff8b7529f43e4090d37adc8e86ba54 0c628dc7e2ff8b7529f43e4090d37adc8e86ba54 2008-12-18T05:57:04-08:00 2008-12-13T15:05:21-08:00 Removed mephisto plugin generator => not the right time for this [Note from Eric: I hadn't intended to pull the first part of this patch, but since I did, I'm going to go ahead and pull the second.] e5f587c16e6b85f24097cb73a5475cfad0507893 Eric Kidd git@randomhacks.net f7b275e720ae402befc2615095aa89c36e1e3397 bf1a5deb79007d56901984d70eb3ad0f8122ef7a Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/9b5e2f5a84b1acd4b2c0cf443f99af864c1e3d4b 9b5e2f5a84b1acd4b2c0cf443f99af864c1e3d4b 2008-12-18T05:52:14-08:00 2008-12-18T05:52:14-08:00 Merge branch 'master' into new-plugins Conflicts: app/views/layouts/application.rhtml I also fixed two unit test failures caused by SafeERB in the plugins controller. 4af7d0c55461436074a7533b1752ac2c28511438 Eric Kidd git@randomhacks.net fab1cd638b4f84e604cdc7457fac8fe721e89341 isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/f7b275e720ae402befc2615095aa89c36e1e3397 f7b275e720ae402befc2615095aa89c36e1e3397 2008-12-18T05:40:04-08:00 2008-12-12T19:33:18-08:00 Removed last traces of engines_config v2 (Eric Kidd): Removed unrelated changes 25f74ffc1e1c7427ad0b70497eedab82f8e53d5f Eric Kidd git@randomhacks.net 13c1fd45e4fa434d37d488039549c3253cdd36c6 isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/fab1cd638b4f84e604cdc7457fac8fe721e89341 fab1cd638b4f84e604cdc7457fac8fe721e89341 2008-12-12T19:09:32-08:00 2008-12-12T19:09:32-08:00 added mephisto-plugin-generator as a submodule => experimental 2871bcf39a13e07fc29e10a706b6264bcf48ecf2 isaac isaackearse@gmail.com 31430c44ac1d26cd3b4dbb26a7374dd6164e2b47 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/d2c8c8e3aee4c222c645f0b7b493799ffd826bc3 d2c8c8e3aee4c222c645f0b7b493799ffd826bc3 2008-12-12T05:24:57-08:00 2008-12-12T05:24:57-08:00 Security: Replace white_list with Rails 2.2 sanitizer The Rails 2.2 santizer is an enhanced version of Rick's original white_list plugin, so let's upgrade and get the latest fixes. Note that Mephisto had separate rules for sanitizing comments and non-comments in Atom feeds. This difference was introduced in commit 88df87e3a1cb8474fa479d855035ab4d2ca2351e. Unfortunately, I'm not able to track down any information on the problem being fixed here. Since we already add half of the tags in question to the whitelist, I've decided to just treat all sanitized Atom feed content the same. Please let me know if this breaks anything. d442e5291b0aec71e6ecde67222ee49e59c38df1 Eric Kidd git@randomhacks.net f7994ddd9e8c3f3421a353e59b7758e6e4282a54 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/ab5eadb825c579c39a13eb58cc27021a38e92fcc ab5eadb825c579c39a13eb58cc27021a38e92fcc 2008-12-10T18:04:36-08:00 2008-12-10T18:04:36-08:00 Add updated mephisto_feedback plugin [Notes from Eric Kidd.] This is a copy of Rick's original mephisto_feedback plugin, updated by Isaac Kearse for the new plugins API. (I'm setting the author of this commit as Rick, because the code is almost all his.) This plugin probably won't be included with the default installation of Mephisto, because it implements a feature that only interests a subset of Mephisto users. But it makes a good test case to see how this new plugin branch works. a79dbf22cd5677c8bc67a7dadd630736da19f1b0 Eric Kidd git@randomhacks.net b281d564ee4c46a93c68d8801bd211bd9102507d isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/d6e01aa9d9f8fdd53adff89ef7e0a61023f58a0f d6e01aa9d9f8fdd53adff89ef7e0a61023f58a0f 2008-12-10T17:51:28-08:00 2008-12-10T17:51:28-08:00 Remove engines_config This Rails plugin is no longer needed with the new Mephisto plugin system. e33222fa9379ea37b8d7bff3b4125a25687dc769 Eric Kidd git@randomhacks.net 01ee5176e5538e48051f1c60aa0afde9dc596847 isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/b281d564ee4c46a93c68d8801bd211bd9102507d b281d564ee4c46a93c68d8801bd211bd9102507d 2008-12-10T17:46:48-08:00 2008-12-10T17:46:48-08:00 Overhaul plugin system [These notes written by Eric Kidd.] Once upon a time, Mephisto had a plugin system which worked like this: http://jamescrisp.blogspot.com/2007/04/tips-for-developing-mephisto-plugins.html Sven Fuchs replaced the old plugin system with a more powerful plugin system based on Engines. Here are some links he recommended describing that plugin system: http://jamescrisp.org/2008/08/25/migrating-mephisto-plugins-to-drax-08/ http://groups.google.com/group/MephistoBlog/browse_thread/thread/ec7cc25e5720ec9c/8d8b867c8f020557?lnk=gst#8d8b867c8f020557 http://groups.google.com/group/MephistoBlog/browse_thread/thread/7fd7d1198ef8345e/c000f0e1ea8c490e?lnk=gst#c000f0e1ea8c490e This is a collapsed, edited version of a plugins branch by Isaac Kearse. The new API is based on engines, but it has greater compatibility with the old plugins API. Much of the code in lib/mephisto/plugin.rb is taken from an earlier version of Mephisto, and was deleted by Sven Fuchs in revision 1ad1b56b4a6c9284534b0afbb9d5d87715ae4312. Open questions for code review: What does Admin::PluginsController#destroy do? Who can access Admin::PluginsController? Only multi-site admins? Do plugin preferences and multi-site support interact reasonably? v2 (Eric Kidd): Collapsed working branch into single patch Changed flash message for PluginsController#destroy HTML-escaped tab names Fixed indentation in unit test files & removed obsolete comments Documented spec/models/plugin_spec.rb as out-of-date 1f178c50767183b528cddde13a988ffaae98ddb5 Eric Kidd git@randomhacks.net 3e62741f75608cf53e50db9ec07ad21b25c3c8e5 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/170fe8c55be53add05623fc1236b6bb9b0244b10 170fe8c55be53add05623fc1236b6bb9b0244b10 2008-12-09T15:36:28-08:00 2008-12-09T15:33:11-08:00 Strip leading and trailing newlines from <macro:code> This allows us to write things like: <macro:code> x = y + 2 </macro:code> ...and not get gratuitous empty lines at either end. 37f48cd5f8b1f5add6e9f3cc602bf4fd86d1b440 Eric Kidd git@randomhacks.net 5e9e696b13dba9dfdfd0385d3c7a52231121f99e Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/762512970014032b21a6e8476070a9d6ecb3dac6 762512970014032b21a6e8476070a9d6ecb3dac6 2008-12-08T15:09:12-08:00 2008-12-08T15:09:12-08:00 Silence default_error_messages warning Note that this is a local modification to an upstream plugin, but it's pretty minor, and it's OK to discard it when upgrading attachment_fu. 5690233e2c06539f6ced00d1c60501dcea975950 Eric Kidd git@randomhacks.net 7b898b142b0465e52f2b2b24d765c2e774ee20b9 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/5e9e696b13dba9dfdfd0385d3c7a52231121f99e 5e9e696b13dba9dfdfd0385d3c7a52231121f99e 2008-12-08T14:58:40-08:00 2008-12-08T14:58:40-08:00 Replace embedded copy of coderay with up-to-date gem version Here's one more library hiding inside vendor/plugins that we can just treat as a normal gem. Note that this patch doesn't fix any of our underlying <macro:code> problems. This does get us support for quite a few more languages, and it allows us to replace our custom JavaScript support with the new JavaScript support in the upstream library. de4ba7fbcdaca3aaea2a2997acf7e3669fd964d8 Eric Kidd git@randomhacks.net 8ca3c36470c1d47ab0538e6ffa1bb804c6e12f90 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/7b898b142b0465e52f2b2b24d765c2e774ee20b9 7b898b142b0465e52f2b2b24d765c2e774ee20b9 2008-12-08T14:52:13-08:00 2008-12-08T14:52:13-08:00 Clean up code_macro test suites slightly & fix HTML escaping The "css" option to the <macro:code> form was never actually implemented, and the associated unit tests are failing. So I removed the test cases and the useless option. I also added some test cases to check that "<" characters in code get escaped properly, and fixed the code to make the tests pass. In general, <macro:code> has a number of fairly serious problems, and the unit tests aren't testing what they think they're testing, largely thanks to some error-recovery code that masks underlying exceptions. c29af3d067e938e1e1d158ef11a9b76caffaa841 Eric Kidd git@randomhacks.net f8483ff752790a8cf749d043d4b0a5cbfe36212b Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/9f6649052e95e726d2b5f258dd25e45f0db3fe66 9f6649052e95e726d2b5f258dd25e45f0db3fe66 2008-12-07T10:01:00-08:00 2008-12-07T10:01:00-08:00 Remove a_gems plugin This plugin provided "gems:*" tasks, which are now available in Rails 2.2. It was also responsible for loading vendor/rubypants-0.2.0, which is an old, customized gem that we can't put into the regular gems directory without some repackaging work. So we just handle that case manually for now. 970367f71fa95074cbe3b8cf6521087cd7c8054a Eric Kidd git@randomhacks.net 0a8bf45508e303f3555a27c92641e040ca21869a Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/dadfc5765d738b902c5cef8f293e865e2c536239 dadfc5765d738b902c5cef8f293e865e2c536239 2008-12-06T08:19:36-08:00 2008-12-06T08:15:28-08:00 Upgrade to latest mocha 13dd2d4f1b12c5cbf028622075903e5c79e18863 Eric Kidd git@randomhacks.net 5ab972f39af0feca6042fe17484801c40d27af5e Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/0a8bf45508e303f3555a27c92641e040ca21869a 0a8bf45508e303f3555a27c92641e040ca21869a 2008-12-06T08:10:53-08:00 2008-12-06T08:10:53-08:00 Upgrade to will_paginate 2.2.2 f11589c2feef59baf46521a34c343b88d3e0d17f Eric Kidd git@randomhacks.net d9965ec5f5a561896f6a1eb71074e1d3ed648222 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/5ab972f39af0feca6042fe17484801c40d27af5e 5ab972f39af0feca6042fe17484801c40d27af5e 2008-12-06T07:58:28-08:00 2008-12-06T07:58:28-08:00 Move machinist to vendor/gems ff9d821759cc9d1a0f0ee70efc7aa759390babd9 Eric Kidd git@randomhacks.net 851e87f1e0ae918eb75ed2584d8015153d0b3cd0 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/7e20e4a02d06b77aac5503dac44761f5e4503310 7e20e4a02d06b77aac5503dac44761f5e4503310 2008-12-06T07:27:14-08:00 2008-12-06T07:26:55-08:00 Move liquid to vendor/gems 622be1516a9f14a0ee7c95ec591fa0a3881b1481 Eric Kidd git@randomhacks.net 4b8089af64c2d59d18483697ed7e5ea423221c82 isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/0361ef8f0159da3985c7d17cc6f698560753719c 0361ef8f0159da3985c7d17cc6f698560753719c 2008-12-04T19:41:10-08:00 2008-12-04T19:41:10-08:00 update rspec and rspec-rails to latest github versions f004366e2e7409328caaac3cd72b974e76faf85d isaac isaackearse@gmail.com eaf28200b1ce5503bb2b47e9b43745b36cdfa204 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/4b8089af64c2d59d18483697ed7e5ea423221c82 4b8089af64c2d59d18483697ed7e5ea423221c82 2008-12-04T18:23:13-08:00 2008-12-04T18:23:13-08:00 Remove labeled_form_helper, switch to standard one All these features are available in core. We won't know if this patch is good until we actually get the website up, though. 86d3cbf375b9a53021270c9d14f6a118c821685f Eric Kidd git@randomhacks.net 9646238051f937da2c51196584f6a8bbaa39237a Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/843fad183a7da34ec2757bc80d41cfb938055c15 843fad183a7da34ec2757bc80d41cfb938055c15 2008-12-04T17:42:37-08:00 2008-12-04T17:42:37-08:00 Remove simply_helpful plugin All the features of the simply_helpful plugin were either merged into core Rails, or were deprecated. So let's just get rid of it and clean up any damage as we go. Removing this fixes quite a few unit test failures. 2a3a37a67261e5a6b533b6fcb76c5bfd5ca00e71 Eric Kidd git@randomhacks.net 79a460e1d6a65d326dbb5739324d42ce4624bd70 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/e3f7316605d7e6caaaf15d0659d326600e16bc14 e3f7316605d7e6caaaf15d0659d326600e16bc14 2008-12-04T17:14:05-08:00 2008-12-04T17:14:05-08:00 Upgrade to latest release of attachment_fu Updated to commit 42a37fab15c6d1dacc6043ee40b25de12b63ac04 from repository git://github.com/technoweenie/attachment_fu.git . Note that this version of attachment_fu is actually deprecated in favor of the forthcoming rewrite. We need to add some explicit attr_accessible declarations to match Mephisto's old behavior. 2b390f88d604547ee705e67e33ee2a9d6e06f042 Eric Kidd git@randomhacks.net 1e02b1e4bf2bebb9b960168ae93e48c74bc3dc15 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/79a460e1d6a65d326dbb5739324d42ce4624bd70 79a460e1d6a65d326dbb5739324d42ce4624bd70 2008-12-04T14:54:41-08:00 2008-12-04T14:54:41-08:00 Upgrade to latest acts_as_versioned This eliminates some API conflicts with Rails 2.2 and gets more of the tests passing. This is version c310d2805ed243fd7587afcc5cec1bbbb9198947 from git://github.com/technoweenie/acts_as_versioned.git . 68d5dc2c4bb3ea7da59f5f196e676f4caa8354df Eric Kidd git@randomhacks.net 1cda19ef5d618a9e81adc03112f858a9ddb86a35 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/1e02b1e4bf2bebb9b960168ae93e48c74bc3dc15 1e02b1e4bf2bebb9b960168ae93e48c74bc3dc15 2008-12-04T06:39:26-08:00 2008-12-04T06:39:26-08:00 Update for miscellenous API changes in Rails 2.2.2 The tests will now load, but they have a massive number of failures. 2a9e3da0da4cdedec224b95029ed74713667e833 Eric Kidd git@randomhacks.net 6aefe20fca67f5e43685d0af6ef39a0118d50f45 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/1cda19ef5d618a9e81adc03112f858a9ddb86a35 1cda19ef5d618a9e81adc03112f858a9ddb86a35 2008-12-04T06:37:51-08:00 2008-12-04T06:37:25-08:00 Upgrade to latest development version of engines This is commit 4cb49974cc62e6e89c15b03d08bab3ba07f7213a from the git://github.com/lazyatom/engines.git repository. The released version of engines doesn't seem to support Rails 2.2 at the moment. Note that the unit tests still won't run. 24447677b22df9aa9ca3299d8ffae4e317508305 Eric Kidd git@randomhacks.net 4efb0c3ebd8eafd7f2c15aad843d135c05cbbd00 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/0b38582b560b50cbfd3acba2046e308a96cd77b1 0b38582b560b50cbfd3acba2046e308a96cd77b1 2008-12-02T16:51:10-08:00 2008-12-02T16:51:10-08:00 Convert specs from model_stubbing to machinist (all tests green) With this patch, our tests now run at 100%! Our remaining spec failures all involved model_stubbing, an old library by Rick. According to Rick, he's no longer maintaining model_stubbing, and he recommends that we use machinist to generate test data instead. This patch rips out model_stubbing, and replaces it with a combination of machinist and faker. In most cases, the new code is quite a bit shorter, simpler and easier to understand. A few minor things worth noting: - Several rspec blocks have been combined or nested. - Unnecessary setup code has been removed. - Two of the three copies of the code in site_spec.rb have been deleted. - An extra test case has been added for membership_spec.rb, to better document some interesting behavior I discovered while debugging. The machinist plugin is version 17985ba55aff6420caadb70ef698dd93aef5a26b from http://github.com/notahat/machinist/tree/master. 1a8a3268d3fd380bd930631f09f10bd3814d2240 Eric Kidd git@randomhacks.net 380af1a31445298b1e701528456e585bb56e1345 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/da8a69d407f5fff85600710e53ed45fd08fa128b da8a69d407f5fff85600710e53ed45fd08fa128b 2008-12-01T21:45:54-08:00 2008-12-01T21:45:54-08:00 Fix TRUNCATE TABLE errors in in-tree model_stubbing As discovered by Aubrey Holland, model_stubbing relies on the non-portable TRUNCATE TABLE command: http://groups.google.com/group/MephistoBlog/msg/7da91b7410271ff2 Applying Aubrey's fix allows 'rake spec' to run against SQLite3. Note that there are still a good number of spec failures which will need to be addressed. It's a little bit dodgy to patch the in-tree copy of model_stubbing, but doing so will suffice for now. 522cb7103c9e2421c0f035e2120e4d411a0d70d2 Eric Kidd git@randomhacks.net 90337f19a39555e9689bafee78cffd81ae0cdcc9 1ad1b56b4a6c9284534b0afbb9d5d87715ae4312 Isaac Kearse isaackearse@gmail.com http://github.com/emk/mephisto/commit/41a870e17ae5e574d65c512affa441c70ad411f2 41a870e17ae5e574d65c512affa441c70ad411f2 2008-03-28T22:53:25-07:00 2008-03-28T22:53:25-07:00 Merge commit 'activereload/engines' 1c96affcd41848cb4e3cb2985970676030e0eaec Isaac Kearse isaackearse@gmail.com 2772ec18227b04b3cb618748a2900a7b93b84d94 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/5b7d39d435a4aa2e78025fae57a2ef442fb8f981 5b7d39d435a4aa2e78025fae57a2ef442fb8f981 2008-03-04T01:11:25-08:00 2008-03-04T01:11:02-08:00 tweak attachment_fu for better attr_accessible compatibility [rob-twf] 496b2bc0423400165636112b5a6bb1239945252a rick technoweenie@gmail.com 2772ec18227b04b3cb618748a2900a7b93b84d94 Sven Fuchs svenfuchs@artweb-design.de http://github.com/emk/mephisto/commit/1ad1b56b4a6c9284534b0afbb9d5d87715ae4312 1ad1b56b4a6c9284534b0afbb9d5d87715ae4312 2008-02-20T11:11:20-08:00 2008-02-20T11:11:20-08:00 initial commit to engines branch adc435b61f05728a991fd314188bc3e75cfb6038 Sven Fuchs svenfuchs@artweb-design.de 7af009a57222f56ad33aa9527f323321ff39320e Sven Fuchs svenfuchs@artweb-design.de http://github.com/emk/mephisto/commit/d971d941df4351ad42b41896b3446f3d43fa9bcd d971d941df4351ad42b41896b3446f3d43fa9bcd 2008-02-06T13:27:46-08:00 2008-02-06T13:27:46-08:00 Enhance include_into with alias_method_chaining, closing #152 8441e1a82843804d1bace8fcceea3aaedb60e87a Sven Fuchs svenfuchs@artweb-design.de aa2a339404fa179b7250930e471554dd32e0a528 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/885b67417c782139785cb4fc36cf251da148795b 885b67417c782139785cb4fc36cf251da148795b 2008-02-03T10:40:09-08:00 2008-02-03T10:40:09-08:00 update mephisto wordpress converter to WP 2.3 [Aubrey] bbeae39ccd66fb995a4c0d613efe33f68500cf3f rick technoweenie@gmail.com 13c8aab7b6d4501731ed95b27cfdaf5cb346af80 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/08e831d1c9bf302524559c0cb019e9cd5ad0c33b 08e831d1c9bf302524559c0cb019e9cd5ad0c33b 2008-02-03T10:02:38-08:00 2008-02-03T10:02:38-08:00 move Module.include_into into aaa so other plugins can use it 0358a5445102bc3b2275760ab2fd83d4c0f72309 rick technoweenie@gmail.com 005ff943d9469b781cc88296d6ffa5acf8193ad7 rick technoweenie@gmail.com http://github.com/emk/mephisto/commit/bfdb76bac23813a53a70179baca641b11d61a324 bfdb76bac23813a53a70179baca641b11d61a324 2008-02-02T15:45:11-08:00 2008-02-02T15:45:11-08:00 use the correct ::Object const name 2bde281266730c1e39a0a147664c6f71372a084f rick technoweenie@gmail.com