c43f6c9cb9626e4cec786bf81a53ca1afc9d6a44 281dd17cb2b7a970260b27bbdc5e7d24e7220633 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/f1068ff008b7da9263fd9037d1a37b3813e70991 f1068ff008b7da9263fd9037d1a37b3813e70991 2008-03-11T12:33:33-07:00 2008-03-11T12:33:33-07:00 Merge branch 'rel-0.8' into multiengine Conflicts: db/schema.rb 4331244d9d66851e681030c5dbe0acb35e91fe9e François Beausoleil francois@teksol.info 61c7122a62226b4d146656ed9f484c42d82eadb1 rick technoweenie@gmail.com http://github.com/francois/mephisto/commit/281dd17cb2b7a970260b27bbdc5e7d24e7220633 281dd17cb2b7a970260b27bbdc5e7d24e7220633 2008-03-11T00:30:09-07:00 2008-03-11T00:29:51-07:00 tweaks to tests so they pass. TODO: fix stupid asset fixture crap during transition to rspec/model-stubbing 3002d9d74847c1a38a5881d9977c5a1d00b0a69a rick technoweenie@gmail.com 5460e71c367d46d55c290804d2c2981052977a04 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/429ecf2948716ebb2905174653643eba4299a97e 429ecf2948716ebb2905174653643eba4299a97e 2008-03-07T06:51:46-08:00 2008-03-07T06:51:46-08:00 Get ready to tell Defensio if the person posting the comment is a trusted user or not. Right now, ApplicationController has #admin?, but I can't use it in Mephisto#dispatch, because the correct before_filters aren't run. 2979eb47fed9cd8cca2404211066956fc0eaaf9f François Beausoleil francois@teksol.info 0072562e916270fb500541217c322dcebe14e502 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/87a0ff1dbaf24846a84ff7b6da19b717632d50f2 87a0ff1dbaf24846a84ff7b6da19b717632d50f2 2008-03-04T09:24:00-08:00 2008-03-04T09:23:16-08:00 In the overview and admin/comments pages, show the comment's spam engine information. The overview also highlights the blockquote with the correct class, which is coming from the engine. The DefensioEngine has information to show, the others use the default implementation in Base, which is to return nil. 492e5b746491e6c6264bbbf272a217cefb4f98ce François Beausoleil francois@teksol.info 9c610fccc09a0ea54393685b10d27f93c53baf8c rick technoweenie@gmail.com http://github.com/francois/mephisto/commit/3afcdaeac833515e2378c826fca7b1505aa48bb4 3afcdaeac833515e2378c826fca7b1505aa48bb4 2008-03-04T01:36:46-08:00 2008-03-04T01:36:46-08:00 tweak to Asset so it doesn't lose thumbnails when the asset itself is edited [Aubrey] 73a3a59801344c791a27f7372a62dfbe9f9e718d rick technoweenie@gmail.com 1f27e3587fc1724e677f04cc18167e4617ceff4f François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/6088ac3076140d9129d98a4b5d23989c77036c03 6088ac3076140d9129d98a4b5d23989c77036c03 2008-03-03T18:39:43-08:00 2008-03-03T18:35:21-08:00 Site#clear_approve_comment_if_spam_engine_not_null, a before_save callback, would sometimes return false, preventing the save from occuring. Got burned by this before: an ActiveRecord before_filter that doesn't return true will stop the save, without error messages. 3857dd20e27fc3fea557a9bcc19cc081c9917547 François Beausoleil francois@teksol.info 58bc68e70329d0417b35cc2aba0c7923517c22bf François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/1f27e3587fc1724e677f04cc18167e4617ceff4f 1f27e3587fc1724e677f04cc18167e4617ceff4f 2008-03-03T18:39:31-08:00 2008-03-03T18:25:15-08:00 When saving the Site, if the spam engine doesn't report a message, add a minimal one. 6f5c7b5fe49aab1b97e9835a6f0b0cd2649e8e44 François Beausoleil francois@teksol.info eb258effa5ea0787a2f79747aa2323db5b1a9d07 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/ba3ae9c8a85bb15a582562f885fb66e77f58a938 ba3ae9c8a85bb15a582562f885fb66e77f58a938 2008-03-03T12:34:42-08:00 2008-03-03T12:34:42-08:00 Hmmm, it's the SpamDetectionEngines namespace, you dummy... 8a6ebc4fcf4ca3e3f06d9137096c044977077c94 François Beausoleil francois@teksol.info bf56e8977833010e1a537b1873518fbf8be56ac6 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/eb258effa5ea0787a2f79747aa2323db5b1a9d07 eb258effa5ea0787a2f79747aa2323db5b1a9d07 2008-03-03T12:31:57-08:00 2008-03-03T12:31:57-08:00 It's the NullEngine, dummy... 80deeb6346916451d591814e1441e5213c35390a François Beausoleil francois@teksol.info a27e961912a2338249258d7f838aef484de01365 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/bf56e8977833010e1a537b1873518fbf8be56ac6 bf56e8977833010e1a537b1873518fbf8be56ac6 2008-03-03T10:43:43-08:00 2008-03-03T10:43:43-08:00 The Admin::Comments page styles the comment's using the spam engine's class wishes. The Defensio engine passes in a spaminess class, which the public stylesheet reuses to highlight spam-like comments. ea1dc21eee3703a2dd37a1160348bf24494907ee François Beausoleil francois@teksol.info 78f9f9372e54ebd656938489c3780315cde0e6be François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/a80561b04d2f058c3f5bb5d8407454a83fb357d3 a80561b04d2f058c3f5bb5d8407454a83fb357d3 2008-03-03T07:42:42-08:00 2008-03-03T07:42:42-08:00 Admin::ArticlesController#create notifies the spam detection engine about new articles. The different spam engines had to grow #announce_article to implement this. f10500aba4e7ff0bc0ce7d61638a48559277b9de François Beausoleil francois@teksol.info 6126dfec8324c82df94b7d8c94489dc46b342d1a François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/78f9f9372e54ebd656938489c3780315cde0e6be 78f9f9372e54ebd656938489c3780315cde0e6be 2008-03-03T07:41:26-08:00 2008-03-03T07:41:26-08:00 Don't version the Article#spam_engine_data column. 932479b00127f6379da86e812f915efbd22604c8 François Beausoleil francois@teksol.info 3dd3837f504776923f9376651864802736ab24f3 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/6126dfec8324c82df94b7d8c94489dc46b342d1a 6126dfec8324c82df94b7d8c94489dc46b342d1a 2008-03-03T07:16:50-08:00 2008-03-03T07:16:50-08:00 The default Site#approve_comments behaviour is now only available for the null engine. Other engines actually reset the #approve_comments flag to false, to let the validation go through. 04fe303ddc203e294baa7d7a9d82a6420789ac10 François Beausoleil francois@teksol.info eef0738e866f6e62f10f1bdae9e329928462a92d François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/e545c4aec2f2e27039f922a23aed2bf6722a6b55 e545c4aec2f2e27039f922a23aed2bf6722a6b55 2008-03-03T06:53:39-08:00 2008-03-03T06:53:39-08:00 Default to an empty Hash in Site#spam_engine_options. 22b35cea2f7b66ec5b2c0c0a29ba3404c260c490 François Beausoleil francois@teksol.info 4cadd52ca6ef9453a65399f844102b58ed07f06f François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/09ecfabb45832dad1d237bfc1384a5dcdd379031 09ecfabb45832dad1d237bfc1384a5dcdd379031 2008-03-03T04:46:21-08:00 2008-03-03T04:46:21-08:00 New Site#register_spam_detection_engine. The existing spam detection engines register themselves with Site on startup. 293788e9264066b1bd00eddd7847c365d34f21f5 François Beausoleil francois@teksol.info 43497e54bcb0175d6f7c02b1da721a8dcc1e8b7d François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/4cadd52ca6ef9453a65399f844102b58ed07f06f 4cadd52ca6ef9453a65399f844102b58ed07f06f 2008-03-03T04:30:56-08:00 2008-03-03T04:30:56-08:00 Removed the Akismet compatibility shim from Site. 192ae5927ce9496d151e4d7fd51060b3db1fec2c François Beausoleil francois@teksol.info 0a245ae5a0866d6952024a566b64c792ff3b2187 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/43497e54bcb0175d6f7c02b1da721a8dcc1e8b7d 43497e54bcb0175d6f7c02b1da721a8dcc1e8b7d 2008-03-03T04:28:22-08:00 2008-03-03T04:28:22-08:00 Site now asks it's spam engine to validate itself. b117034c2b035eae87a78e75d75bf6b2bae43754 François Beausoleil francois@teksol.info e570abd0a08dd9be0423496deeb135c36cfd6537 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/73408ff31f8185ce80b5dfb4a48933501ec60e43 73408ff31f8185ce80b5dfb4a48933501ec60e43 2008-03-03T04:05:35-08:00 2008-03-03T04:05:35-08:00 Normalized the parameters to the different spam detection engines. They always expect the permalink_url, followed by the comment object itself. 9b11676014ce1973878678c8b5e7314cda93c335 François Beausoleil francois@teksol.info ef8a5093132517e1dab803a98f8488b3cacd017f François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/1ecb41d5aa2531c2d8e4872612d503d980479c8d 1ecb41d5aa2531c2d8e4872612d503d980479c8d 2008-03-03T03:54:13-08:00 2008-03-03T03:54:13-08:00 Moved the serializable :spam_engine_data declaration to Content, because it caused failures with acts_as_version when in Comment only. 7d65ec4cffc06bbce04e7195b02af6352d11a4a4 François Beausoleil francois@teksol.info e75f8ec35a63b7e8381405aa19a625cf2eb34c46 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/ef8a5093132517e1dab803a98f8488b3cacd017f ef8a5093132517e1dab803a98f8488b3cacd017f 2008-03-03T03:52:49-08:00 2008-03-03T03:52:49-08:00 New Article#permalink_url that returns the full, canonical, URL of the article. 40edf4a13ad9eb96ccf340c8a768fc1810c9eca2 François Beausoleil francois@teksol.info 248b11a9cc4d37901d6dba67765f831c105500d1 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/e75f8ec35a63b7e8381405aa19a625cf2eb34c46 e75f8ec35a63b7e8381405aa19a625cf2eb34c46 2008-03-03T03:40:30-08:00 2008-03-03T03:40:30-08:00 Comment#spam_engine_data is a Hash. Made the serializable call mention this fact. 85416842543a97b798b956b5ef097183053ced40 François Beausoleil francois@teksol.info f4d879e252a966cd5594bef6c372bda55b57d27b François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/38129499530bba80c81b07c22104b312e158c518 38129499530bba80c81b07c22104b312e158c518 2008-03-02T20:15:49-08:00 2008-03-02T20:15:49-08:00 New spam_engine_data column in contents, which Comment serializes. Spam engines can store data in this field for their own purposes. 7ebb8bf66622d757c8e0f6b6770c6779d19b9569 François Beausoleil francois@teksol.info 0a55c3f8fefd682b26c8cbd79f1954a8e7511825 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/940af6ed7efa0cb5f1100dd5ba34e1a1b77fca24 940af6ed7efa0cb5f1100dd5ba34e1a1b77fca24 2008-02-29T20:49:40-08:00 2008-02-29T20:49:40-08:00 Force the full constant name in sites.spam_detection_engine. 9345d55232bdbb4c09d1a1b8f953ef0870edd550 François Beausoleil francois@teksol.info 4a7bb4a472ba7e54f6b49b12d275629ce96e2bf1 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/f822664c2220d33eabf86a9389044351a4c14d8e f822664c2220d33eabf86a9389044351a4c14d8e 2008-02-29T20:11:46-08:00 2008-02-29T20:11:46-08:00 Ripped out the Akismet-specific code from Comment and replaced it with the Site#spam_engine abstraction. a357dfc987b426fadadf9fc5044dd6566c80ae64 François Beausoleil francois@teksol.info 6560b7a62dc4abe272a3664b00e1af84448232ce François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/4a7bb4a472ba7e54f6b49b12d275629ce96e2bf1 4a7bb4a472ba7e54f6b49b12d275629ce96e2bf1 2008-02-29T20:10:44-08:00 2008-02-29T20:10:44-08:00 New Site#spam_engine that instantiates the correct spam engine from options. ac5971275792c7dee71e343c5741850a3c29d3cf François Beausoleil francois@teksol.info 1ad91a783836b351d041d96d8965cd4e03987e0c François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/dec651d05ddd0497e8f25afb45df9054a5f918fb dec651d05ddd0497e8f25afb45df9054a5f918fb 2008-02-29T19:19:32-08:00 2008-02-29T19:19:32-08:00 Moved Akismet options to the spam_engine_options column. Provided compatibility shim for the old accessors until the Akismet engine is setup. 4c05ee8d0198253efb91550f5d2cc47423c03d9c François Beausoleil francois@teksol.info d58e3639a6ce4d4308301d73e201a98e91d92ed9 François Beausoleil francois@teksol.info http://github.com/francois/mephisto/commit/1ad91a783836b351d041d96d8965cd4e03987e0c 1ad91a783836b351d041d96d8965cd4e03987e0c 2008-02-29T19:12:11-08:00 2008-02-29T19:12:11-08:00 Sites now have a serialized Hash of options for the spam engine. dbff749be4bcca6a56c61ad3bdb06368f1c44e2e François Beausoleil francois@teksol.info 963b29301a8e3c6b62557848575422dbad4a9245 rick technoweenie@gmail.com http://github.com/francois/mephisto/commit/b0fadcd7955634ef0fc82c18a8b769c7d9cb89d4 b0fadcd7955634ef0fc82c18a8b769c7d9cb89d4 2008-02-04T09:21:51-08:00 2008-02-04T09:21:51-08:00 host of fixes and added support for comment preview 12a89c5278097f788f6b742fb22a91e21f3bb9cc rick technoweenie@gmail.com 11e8349b382e9f11f71586635efd6e485e637507 rick technoweenie@gmail.com http://github.com/francois/mephisto/commit/d6e29a759244fc2dbbbecb2d59bbe63e027168b5 d6e29a759244fc2dbbbecb2d59bbe63e027168b5 2008-02-03T12:08:13-08:00 2008-02-03T12:08:13-08:00 use an after_create to setup site theme directories 9b22cfdda1f0baed6b8c3ebf1077624df988c54f rick technoweenie@gmail.com 885b67417c782139785cb4fc36cf251da148795b rick technoweenie@gmail.com http://github.com/francois/mephisto/commit/ca8a7879ef2a7da78c011ab8c27004968d58dc54 ca8a7879ef2a7da78c011ab8c27004968d58dc54 2008-02-03T11:07:02-08:00 2008-02-03T11:07:02-08:00 admin area for sites in multi-site configuration [Vincent, j2m] 3421ea7bcad2b06ee1207d5badba722bb7700709 rick technoweenie@gmail.com 13f2e77001bf8b0bed560b4a114e5952d74c3d4e technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/632f7735b6eaa878a9d5e418c0791f16e96fd06f 632f7735b6eaa878a9d5e418c0791f16e96fd06f 2007-11-23T21:07:19-08:00 2007-11-23T21:07:19-08:00 encode search/tag urls properly [rob-twf] git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@3058 567b1171-46fb-0310-a4c9-b4bef9110e78 6abf832d940b4499f19935a04ac55e107e0523f1 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 dd9dab0acec75dcdbaad92a5340b435f7c96464f technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/f1f452cedb159e01353c5da6dcd2015d973a6189 f1f452cedb159e01353c5da6dcd2015d973a6189 2007-11-23T21:00:41-08:00 2007-11-23T21:00:41-08:00 allow space AND comma delimited tags git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@3055 567b1171-46fb-0310-a4c9-b4bef9110e78 ca50ea5db121657d700cd09c69e028c15fa1490f technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 4cd2a0ca62e61595d58676d19f1737ef4345efc9 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/f0ff2e8a9910a949576c5bd6911f2c3010d8306c f0ff2e8a9910a949576c5bd6911f2c3010d8306c 2007-07-23T07:43:34-07:00 2007-07-23T07:43:34-07:00 remove orphan comments git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2936 567b1171-46fb-0310-a4c9-b4bef9110e78 7076213391ce8296a8e4a86df2f227bef89ccd2e technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 f5e53e93a75f7d233ac77b769eb69ed0a2f2bf78 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/6f644bee8b9698efd08d71b809f6f426e463df88 6f644bee8b9698efd08d71b809f6f426e463df88 2007-03-30T21:07:57-07:00 2007-03-30T21:07:57-07:00 sanitize comment attributes when they enter the db, not when they're displayed git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2822 567b1171-46fb-0310-a4c9-b4bef9110e78 5cf7f1320c5e6af72e7c24fed6cb1e5a8d292916 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 19c9f1382b8c615f1432af81bbe92df688a02bda technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/3a75a19ce68fac27f73064dd0bbc51ed9ebf889b 3a75a19ce68fac27f73064dd0bbc51ed9ebf889b 2007-03-14T19:13:49-07:00 2007-03-14T19:13:49-07:00 add attr_accessible to User [Neill Zero] git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2805 567b1171-46fb-0310-a4c9-b4bef9110e78 94ab2ab4f83d9c7175b94c18da922d32fcdba6d1 technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78