c05e9ee1c3e6580b0bff72051c294cc955581001 Spyridon Vasileiadis spyridon.vasileiadis@googlemail.com http://github.com/emk/mephisto/commit/0535b5ff99d45c94e6cb5d54d8ddaf24081840bd 0535b5ff99d45c94e6cb5d54d8ddaf24081840bd 2009-03-15T06:56:38-07:00 2009-03-15T06:53:26-07:00 multisite: Fix broken article versions [This is an edited version of the author's blog post at http://inormalized.com/2009/2/19/how-to-fix-broken-article-versions-in-emk-mephisto-edge-post-0-8-1. -Eric] Currently in mephisto edge, article versions are broken. More precisely, the bug comes up ONLY when the installation operates in multisite mode (or even more precisely, when there are at least two articles belonging to two different sites). The problem is how acts_as_versioned is being used. An acts_as_versioned record has among others an “id” column (the default id that ActiveRecord requires) and a “version” column. Currently Mephisto falsely does the following inside \app\controllers\admin\articles_controller.rb on line 38 (edit action)... @version = params[:version] ? @article.versions.find(params[:version]) : @article or raise(ActiveRecord::RecordNotFound) the whole problem is the find(params[:version]) . What happens here is, that we lookup an article’s version by searching for its id instead of for its version column (even though we do use the correct :version parameter.) So this has to change to find_by_version(params[:version]) and thus become.. @version = params[:version] ? @article.versions.find_by_version(params[:version]) : @article or raise(ActiveRecord::RecordNotFound) Notice though that this doesn’t break in a single-site installation, because in this case id and version bot get the same (concurrent) increment. That is because all articles belong the same one and only Site instance. a89976f39245db9125dfb1dc3f21c0430d87953a Eric Kidd git@randomhacks.net 9a7251f4b1e8e7147935b1cad8d6f126196bf051 David Cato git@crunchyfrog.net http://github.com/emk/mephisto/commit/c05e9ee1c3e6580b0bff72051c294cc955581001 c05e9ee1c3e6580b0bff72051c294cc955581001 2009-03-15T06:35:02-07:00 2009-03-06T14:53:16-08:00 Fix tainted string error when updating comment When updating a comment, a tainted string error was being thrown due to the lack of a h() escape on the article title in the comment partial. A deprecation warning from truncate() in the comment partial has also been resolved. A functional test (test_should_update_comment) for the admin comments controller is also included. ca2ae99ace7993d04f809ae7eab6870a6250ca7f Eric Kidd git@randomhacks.net b68e9b2e3a14f33660bf39f3e557a9938c7b0e38 David Cato git@crunchyfrog.net http://github.com/emk/mephisto/commit/9a7251f4b1e8e7147935b1cad8d6f126196bf051 9a7251f4b1e8e7147935b1cad8d6f126196bf051 2009-03-15T06:34:25-07:00 2009-03-02T22:54:14-08:00 Expire cache on theme change from admin/settings Force cache expiration when changing the theme from the Admin::Settings controller as is done when changing the theme from the Admin::Themes controller so that the behavior after a change of theme is consistent, regardless of where the change is made. 06eb36f2d66ab6ec1465f19842fea6518d9ff33e Eric Kidd git@randomhacks.net 29e8c41bd7dcdb514c8eee87278cd36e9f97011b David Cato git@crunchyfrog.net http://github.com/emk/mephisto/commit/b68e9b2e3a14f33660bf39f3e557a9938c7b0e38 b68e9b2e3a14f33660bf39f3e557a9938c7b0e38 2009-03-15T06:28:22-07:00 2009-03-01T11:47:11-08:00 Mods for subdir deployment Changes required for deployment to a subdirectory: 1. CSS URL paths should be relative, not absolute 2. ActionController::AbstractRequest.relative_url_root is ActionController::Base.relative_url_root in Rails 2.2 57258706cd443b9b0e2b40e7d427bd148e4133b3 Eric Kidd git@randomhacks.net bb6c3a33fdbab9b4a65e157d54f7f6c52e413ee9 David Cato git@crunchyfrog.net http://github.com/emk/mephisto/commit/29e8c41bd7dcdb514c8eee87278cd36e9f97011b 29e8c41bd7dcdb514c8eee87278cd36e9f97011b 2009-03-15T06:27:55-07:00 2009-02-27T14:30:28-08:00 Pass comment approval status to the template By passing the comment's approval setting to the __thanks_for_comment template, the template can provide additional feedback such as "Your comment is awaiting moderator approval", "Sorry, we threw your comment away", or similar if the comment was not automatically approved. For example, __thanks_for_comment.liquid could look like the following: Thanks for the comment. {% unless approved %}It is awaiting moderation.{% endunless %} 18b0922930a31c8ab961e7435c5e6e5a3fb42fdf Eric Kidd git@randomhacks.net dd86ad9c22a3e6cc5eb97591997472d6b348b443 David Cato git@crunchyfrog.net http://github.com/emk/mephisto/commit/bb6c3a33fdbab9b4a65e157d54f7f6c52e413ee9 bb6c3a33fdbab9b4a65e157d54f7f6c52e413ee9 2009-03-15T06:25:59-07:00 2009-02-26T18:03:11-08:00 Force consistent ordering of dates containing NULLs Because database servers differ on how they sort NULL values, the sort order for articles was changed, via COALESCE, so that a NULL date will be treated as being less than (i.e., older than) any non-NULL date. This fixes test_should_search_article_by_section so that it passes with MySQL, SQLite, and PostgreSQL. [I'm merging this patch because I'm quite fond of PostgreSQL, and because it has been tested with most of the other databases we support. If this breaks your database, please let me know. -Eric] bdb33940bce48271283629d3945ff464fc7660cc Eric Kidd git@randomhacks.net 8d73a2a5ff64954ffb230dd7561a17e6fc1781af David Cato git@crunchyfrog.net http://github.com/emk/mephisto/commit/dd86ad9c22a3e6cc5eb97591997472d6b348b443 dd86ad9c22a3e6cc5eb97591997472d6b348b443 2009-03-15T06:25:09-07:00 2009-02-26T17:56:12-08:00 Don't depend on database ordering for asset tests test_should_edit_asset and test_should_update_asset were depending on database-specific ordering of the newly added assets. Although these tests worked with MySQL, they failed with PostgreSQL because an unordered find does not necessarily return the first of the three uploaded assets. Instead, Asset.find was changed to Asset.find_by_filename to specifically return the desired asset file. Asset.find_by_filename is used instead of Asset.find(:order => :id) so that there is no dependence on the order in which the three versions of the asset file are added. b7ee611ca57d445204eb9d71fd27939fd9341ad8 Eric Kidd git@randomhacks.net 73c5e891d5a0fada73d6c4161f12821608900d82 Mathieu Martin webmat@gmail.com http://github.com/emk/mephisto/commit/8d73a2a5ff64954ffb230dd7561a17e6fc1781af 8d73a2a5ff64954ffb230dd7561a17e6fc1781af 2009-03-15T06:17:33-07:00 2009-03-11T20:54:52-07:00 Fix the parameter logging filtering... Call filter_parameter_logging only once with all sensitive field names, rather than once per field to protect. 2de226078c3dc9194d5bf8234dca1b886619c042 Eric Kidd git@randomhacks.net a3ddf75ec7990c0560da4a64d983c8f9835ffb3e Dan Lynn git@danlynn.org http://github.com/emk/mephisto/commit/73c5e891d5a0fada73d6c4161f12821608900d82 73c5e891d5a0fada73d6c4161f12821608900d82 2009-03-15T06:15:24-07:00 2009-03-03T15:12:48-08:00 Avoid CoreImage failure on attachment_fu uploads This initializer avoids failures wen uploading images via attachment_fu when there is no external image library to use other than CoreImage. This works by removing "CoreImage" from the list of default processors that attachment_fu iterates over. This avoidance is only required when the rails process is ran under a forked process such as that which occurs with apache + Passenger + CoreImage under OSX since the Core Image APIs are not safe to call from a forked process and will fail. A helpful message is written to the production.log during startup to indicate that image resizing and thumbnailing will not be performed unless one of the other image libs is available. 2c7b7eb07b3dcf748a038fe3390f59bac94173a0 Eric Kidd git@randomhacks.net 0eab35f11bae7878ceb19c15863c410e0e1093e3 Dan Lynn git@danlynn.org http://github.com/emk/mephisto/commit/a3ddf75ec7990c0560da4a64d983c8f9835ffb3e a3ddf75ec7990c0560da4a64d983c8f9835ffb3e 2009-03-15T06:14:40-07:00 2009-02-26T12:16:57-08:00 Corrected comments to reflect actual behavior. 9bed979c551900877dd24b18b8700af48d6fa453 Eric Kidd git@randomhacks.net 7bb054c32a333dc63f8a1020b3d40c2fa9b18dac isaac isaackearse@gmail.com http://github.com/emk/mephisto/commit/0eab35f11bae7878ceb19c15863c410e0e1093e3 0eab35f11bae7878ceb19c15863c410e0e1093e3 2009-03-11T17:25:46-07:00 2009-03-11T17:25:46-07:00 Fix Asset.addInput function to work with latest version of prototype When adding another file I also clear the file input because there is no reason to upload the same file again. da3b2167c80a69d4f18dabcf04883811e81a7276 isaac isaackearse@gmail.com a41b1943fb1d8b9b67a91aa61bf8d6894ac6f951 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/7bb054c32a333dc63f8a1020b3d40c2fa9b18dac 7bb054c32a333dc63f8a1020b3d40c2fa9b18dac 2009-02-09T15:59:02-08:00 2009-02-09T15:59:02-08:00 filtered_column_code_macro: Word-wrap comment I'm trying to keep comments below 80 columns in new code, so I don't have to resize my Emacs window. 1dec46d6aa7def2a284e910800633a9008533194 Eric Kidd git@randomhacks.net b421706d759ee7749e9d448fbce3dc3bf89d0927 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/a41b1943fb1d8b9b67a91aa61bf8d6894ac6f951 a41b1943fb1d8b9b67a91aa61bf8d6894ac6f951 2009-02-09T15:57:33-08:00 2009-02-09T15:57:33-08:00 filtered_column_code_macro: Default to 'rake test' In general, Rails applications seem to reserve a bare rake command for running 'rake test'. So I'm going ahead and making that the default here, for better or for worse. 79400f8ed8c5e7956614da83505d9ec4596d1aa4 Eric Kidd git@randomhacks.net 1473acf8307ec21d2002acab94691841d8003580 Dan Lynn git@danlynn.org http://github.com/emk/mephisto/commit/b421706d759ee7749e9d448fbce3dc3bf89d0927 b421706d759ee7749e9d448fbce3dc3bf89d0927 2009-02-09T13:21:49-08:00 2009-02-09T13:21:49-08:00 Add default codemacro stylesheets for theme usage. Updated main README with instructions on how to link to these stylesheets. A codemacro Rakefile was added with tasks to test the plugin and generate a new default_coderay.css stylesheet. The codemacro plugin now wraps all code listings in a <div> enabling horizontal scrolling and dynamic width. e6b6df2cea1d78ac0a2f9a565f699c7fbfcd198e Dan Lynn git@danlynn.org 5c568b5587cd3df6021e80e021485db75d3b9e44 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/1473acf8307ec21d2002acab94691841d8003580 1473acf8307ec21d2002acab94691841d8003580 2009-02-01T18:14:10-08:00 2009-02-01T18:14:10-08:00 Fix display of theme homepage links Many thanks to Gustavo Sales (aka vatsu) for pointing out this bug and proposing a fix: http://github.com/vatsu/mephisto/commit/e7b0ecaaca4457dd7d542ac218baf979e1b7a190 http://github.com/vatsu/mephisto/commit/fbe32e923ad6dfb963a8311053214b3395aeb37b In order to minimize code duplication in the *.erb files, I've rewritten this code as a helper method. 33323a79d12d193b35a3b1ea4cc1dc8bfbc9d40f Eric Kidd git@randomhacks.net 15372c45281f9147418395421e467db1b2954d75 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/5c568b5587cd3df6021e80e021485db75d3b9e44 5c568b5587cd3df6021e80e021485db75d3b9e44 2009-02-01T17:05:17-08:00 2009-02-01T17:05:17-08:00 Require test gems in development environment, not test After experimenting a bit, this looks like a simpler approach. It allows developers to run: rake gems:install ...and it allows users to run: export RAILS_ENV=production rake gems:install Thank you to mat for his work on this! 7352b4ac6e9c6bb3dbc5e045445fdd741450bd4e Eric Kidd git@randomhacks.net 7ee79816ffc0f2433df412e87024061e794736e3 449d0e19a71ebd9fc1404c7f184209ad1854ffb2 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/15372c45281f9147418395421e467db1b2954d75 15372c45281f9147418395421e467db1b2954d75 2009-02-01T16:57:04-08:00 2009-02-01T16:57:04-08:00 Merge branch 'master' of git://github.com/mat/mephisto 3f7e6f83cd1d34d844fc77db62bb87c645eb9602 Eric Kidd git@randomhacks.net 985782461c010f13e0d3af6f152d0b1280cd1faf 9b7cbbb116d8d353f3132d5a59f79b67e9dab698 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/7ee79816ffc0f2433df412e87024061e794736e3 7ee79816ffc0f2433df412e87024061e794736e3 2009-02-01T16:45:55-08:00 2009-02-01T16:45:55-08:00 Merge branch 'master' of git://github.com/technoweenie/mephisto 9d0dbbbb12894eafbcaf25895480de8ee32958a6 Eric Kidd git@randomhacks.net e229865d6e63a6b6c0e6cb7aac21992ca303f94a Sean O'Brien sean.obrien56@yahoo.com http://github.com/emk/mephisto/commit/9b7cbbb116d8d353f3132d5a59f79b67e9dab698 9b7cbbb116d8d353f3132d5a59f79b67e9dab698 2009-01-29T23:41:07-08:00 2009-01-29T23:41:07-08:00 missing tainted string in cache listing 5fc6c3dbb07419ab0ef0975eebe230224745db5b Sean O'Brien sean.obrien56@yahoo.com e55515092134cffdd50fc1780921f06cf59654cd Matthias Lüdtke github@matthias-luedtke.de http://github.com/emk/mephisto/commit/449d0e19a71ebd9fc1404c7f184209ad1854ffb2 449d0e19a71ebd9fc1404c7f184209ad1854ffb2 2009-01-19T02:52:07-08:00 2009-01-19T02:52:07-08:00 Added info: install test gems before testing. aa44895c958f0f13730f6cd026700e3be5c7d8a2 Matthias Lüdtke github@matthias-luedtke.de eb3b699aec4ff332229b18bf40be812428d9ba22 Matthias Lüdtke github@matthias-luedtke.de http://github.com/emk/mephisto/commit/e55515092134cffdd50fc1780921f06cf59654cd e55515092134cffdd50fc1780921f06cf59654cd 2009-01-19T02:37:07-08:00 2009-01-19T02:37:07-08:00 Added missing config.gem 'ruby-debug' to environments/test.rb. eb9d9543ac087a4ad2af54a056205548874695ea Matthias Lüdtke github@matthias-luedtke.de 37aebc55a89bc5ae89f19331b8cf0ec2955793ee Matthias Lüdtke github@matthias-luedtke.de http://github.com/emk/mephisto/commit/eb3b699aec4ff332229b18bf40be812428d9ba22 eb3b699aec4ff332229b18bf40be812428d9ba22 2009-01-19T00:07:19-08:00 2009-01-19T00:07:19-08:00 Moved test gems from environment.rb to environments/test.rb. cdadf08b18d27b579bb7b23136e31b6dfa4a6408 Matthias Lüdtke github@matthias-luedtke.de 985782461c010f13e0d3af6f152d0b1280cd1faf Matthias Lüdtke github@matthias-luedtke.de http://github.com/emk/mephisto/commit/37aebc55a89bc5ae89f19331b8cf0ec2955793ee 37aebc55a89bc5ae89f19331b8cf0ec2955793ee 2009-01-18T23:55:29-08:00 2009-01-18T23:55:29-08:00 Fixed typo. 9455b824385b05f43ffd314ff5ffe0f8140df54e Matthias Lüdtke github@matthias-luedtke.de b2ead2f1617fcd3f5141f8c7b2082d57c47c8f85 James McCarthy james2mccarthy@gmail.com http://github.com/emk/mephisto/commit/985782461c010f13e0d3af6f152d0b1280cd1faf 985782461c010f13e0d3af6f152d0b1280cd1faf 2009-01-13T05:07:50-08:00 2008-12-19T18:06:02-08:00 Added some brackets 2ea2bc50a8b6a766b02f63d8e73cb0d9f9525367 Eric Kidd git@randomhacks.net e6ef40f48b4d37f18381e8a0ed2dd5a551a7d82b James McCarthy james2mccarthy@gmail.com http://github.com/emk/mephisto/commit/b2ead2f1617fcd3f5141f8c7b2082d57c47c8f85 b2ead2f1617fcd3f5141f8c7b2082d57c47c8f85 2009-01-13T05:07:27-08:00 2009-01-11T18:36:47-08:00 escaped link in _page.html.erb Signed-off-by: James McCarthy <james2mccarthy@gmail.com> f8437b7daf1349cf75fb3a352e1f6f6090699155 Eric Kidd git@randomhacks.net 3700f8d9e7aeefaf5d175d2ea4e412c2927ec229 Chris Cummer chris@postal-code.com http://github.com/emk/mephisto/commit/e6ef40f48b4d37f18381e8a0ed2dd5a551a7d82b e6ef40f48b4d37f18381e8a0ed2dd5a551a7d82b 2009-01-09T04:28:52-08:00 2009-01-04T12:36:51-08:00 Changed user login to send user to admin section on succesful login instead of the blog homepage since users have the ability to post to the blog f48310c10b955f3eacf2eea4017212f38fd66984 Eric Kidd git@randomhacks.net a3c0a7d80f75c5560a3fffa2c2f96831399ffd3c Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/3700f8d9e7aeefaf5d175d2ea4e412c2927ec229 3700f8d9e7aeefaf5d175d2ea4e412c2927ec229 2009-01-09T04:19:41-08:00 2009-01-09T04:19:41-08:00 Add TODO item for explaining how to make Unicode work 0c7b56f8159ce5e8931d77e6e8920cef257da22f Eric Kidd git@randomhacks.net ec67cdcf11399edd442749b9799c4dbe2059c39a Chris Cummer chris@postal-code.com http://github.com/emk/mephisto/commit/a3c0a7d80f75c5560a3fffa2c2f96831399ffd3c a3c0a7d80f75c5560a3fffa2c2f96831399ffd3c 2008-12-31T05:57:43-08:00 2008-12-30T13:20:00-08:00 Fixes 'attempted to output tainted string' error when rendering email address for mailto b56cc71c6397c67df9f05e1af6d0f0af4a36f3cd Eric Kidd git@randomhacks.net dfa982214629d3b6b9e43c1ff8e3ed3256d3899c Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/ec67cdcf11399edd442749b9799c4dbe2059c39a ec67cdcf11399edd442749b9799c4dbe2059c39a 2008-12-27T14:13:10-08:00 2008-12-27T14:13:10-08:00 Allow newer versions of these gems There's no reason to lock these to specific versions. 7a8989520188383f918a41f6bc068789b5aae496 Eric Kidd git@randomhacks.net f5807723f7959362b25748df52261f08e9692c69 Eric Kidd git@randomhacks.net http://github.com/emk/mephisto/commit/dfa982214629d3b6b9e43c1ff8e3ed3256d3899c dfa982214629d3b6b9e43c1ff8e3ed3256d3899c 2008-12-27T14:01:08-08:00 2008-12-27T14:01:08-08:00 Add version numbers to config.gem statements Let's just go ahead and require the minimum version of each gem that we actually know works. We also split out the test-specific gems into their own section. 8113f11e690097f8a814930e1cab900a021b7e9e Eric Kidd git@randomhacks.net