# HG changeset patch # User Franck Deroche # Date 1259069113 -3600 # Node ID 9ce879ecbce6ddefe55516d50d13bc0375725ee8 OG Stats beta 3 diff -r 000000000000 -r 9ce879ecbce6 LICENSE.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LICENSE.txt Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,274 @@ +GNU GENERAL PUBLIC LICENSE + + Version 2, June 1991 + +Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave, +Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute +verbatim copies of this license document, but changing it is not allowed. + + Preamble + +The licenses for most software are designed to take away your freedom to +share and change it. By contrast, the GNU General Public License is +intended to guarantee your freedom to share and change free software--to +make sure the software is free for all its users. This General Public License +applies to most of the Free Software Foundation's software and to any other +program whose authors commit to using it. (Some other Free Software +Foundation software is covered by the GNU Library General Public License +instead.) You can apply it to your programs, too. + +When we speak of free software, we are referring to freedom, not price. Our +General Public Licenses are designed to make sure that you have the +freedom to distribute copies of free software (and charge for this service if +you wish), that you receive source code or can get it if you want it, that you +can change the software or use pieces of it in new free programs; and that +you know you can do these things. + +To protect your rights, we need to make restrictions that forbid anyone to +deny you these rights or to ask you to surrender the rights. These restrictions +translate to certain responsibilities for you if you distribute copies of the +software, or if you modify it. + +For example, if you distribute copies of such a program, whether gratis or for +a fee, you must give the recipients all the rights that you have. You must make +sure that they, too, receive or can get the source code. And you must show +them these terms so they know their rights. + +We protect your rights with two steps: (1) copyright the software, and (2) +offer you this license which gives you legal permission to copy, distribute +and/or modify the software. + +Also, for each author's protection and ours, we want to make certain that +everyone understands that there is no warranty for this free software. If the +software is modified by someone else and passed on, we want its recipients +to know that what they have is not the original, so that any problems +introduced by others will not reflect on the original authors' reputations. + +Finally, any free program is threatened constantly by software patents. We +wish to avoid the danger that redistributors of a free program will individually +obtain patent licenses, in effect making the program proprietary. To prevent +this, we have made it clear that any patent must be licensed for everyone's +free use or not licensed at all. + +The precise terms and conditions for copying, distribution and modification +follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND + MODIFICATION + +0. This License applies to any program or other work which contains a notice +placed by the copyright holder saying it may be distributed under the terms +of this General Public License. The "Program", below, refers to any such +program or work, and a "work based on the Program" means either the +Program or any derivative work under copyright law: that is to say, a work +containing the Program or a portion of it, either verbatim or with +modifications and/or translated into another language. (Hereinafter, translation +is included without limitation in the term "modification".) Each licensee is +addressed as "you". + +Activities other than copying, distribution and modification are not covered +by this License; they are outside its scope. The act of running the Program is +not restricted, and the output from the Program is covered only if its contents +constitute a work based on the Program (independent of having been made +by running the Program). Whether that is true depends on what the Program +does. + +1. You may copy and distribute verbatim copies of the Program's source +code as you receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice and +disclaimer of warranty; keep intact all the notices that refer to this License +and to the absence of any warranty; and give any other recipients of the +Program a copy of this License along with the Program. + +You may charge a fee for the physical act of transferring a copy, and you +may at your option offer warranty protection in exchange for a fee. + +2. You may modify your copy or copies of the Program or any portion of it, +thus forming a work based on the Program, and copy and distribute such +modifications or work under the terms of Section 1 above, provided that you +also meet all of these conditions: + +a) You must cause the modified files to carry prominent notices stating that +you changed the files and the date of any change. + +b) You must cause any work that you distribute or publish, that in whole or in +part contains or is derived from the Program or any part thereof, to be +licensed as a whole at no charge to all third parties under the terms of this +License. + +c) If the modified program normally reads commands interactively when run, +you must cause it, when started running for such interactive use in the most +ordinary way, to print or display an announcement including an appropriate +copyright notice and a notice that there is no warranty (or else, saying that +you provide a warranty) and that users may redistribute the program under +these conditions, and telling the user how to view a copy of this License. +(Exception: if the Program itself is interactive but does not normally print such +an announcement, your work based on the Program is not required to print +an announcement.) + +These requirements apply to the modified work as a whole. If identifiable +sections of that work are not derived from the Program, and can be +reasonably considered independent and separate works in themselves, then +this License, and its terms, do not apply to those sections when you distribute +them as separate works. But when you distribute the same sections as part +of a whole which is a work based on the Program, the distribution of the +whole must be on the terms of this License, whose permissions for other +licensees extend to the entire whole, and thus to each and every part +regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest your rights to +work written entirely by you; rather, the intent is to exercise the right to +control the distribution of derivative or collective works based on the +Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of a +storage or distribution medium does not bring the other work under the scope +of this License. + +3. You may copy and distribute the Program (or a work based on it, under +Section 2) in object code or executable form under the terms of Sections 1 +and 2 above provided that you also do one of the following: + +a) Accompany it with the complete corresponding machine-readable source +code, which must be distributed under the terms of Sections 1 and 2 above +on a medium customarily used for software interchange; or, + +b) Accompany it with a written offer, valid for at least three years, to give +any third party, for a charge no more than your cost of physically performing +source distribution, a complete machine-readable copy of the corresponding +source code, to be distributed under the terms of Sections 1 and 2 above on +a medium customarily used for software interchange; or, + +c) Accompany it with the information you received as to the offer to distribute +corresponding source code. (This alternative is allowed only for +noncommercial distribution and only if you received the program in object +code or executable form with such an offer, in accord with Subsection b +above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source code +means all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation and +installation of the executable. However, as a special exception, the source +code distributed need not include anything that is normally distributed (in +either source or binary form) with the major components (compiler, kernel, +and so on) of the operating system on which the executable runs, unless that +component itself accompanies the executable. + +If distribution of executable or object code is made by offering access to +copy from a designated place, then offering equivalent access to copy the +source code from the same place counts as distribution of the source code, +even though third parties are not compelled to copy the source along with the +object code. + +4. You may not copy, modify, sublicense, or distribute the Program except as +expressly provided under this License. Any attempt otherwise to copy, +modify, sublicense or distribute the Program is void, and will automatically +terminate your rights under this License. However, parties who have received +copies, or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + +5. You are not required to accept this License, since you have not signed it. +However, nothing else grants you permission to modify or distribute the +Program or its derivative works. These actions are prohibited by law if you +do not accept this License. Therefore, by modifying or distributing the +Program (or any work based on the Program), you indicate your acceptance +of this License to do so, and all its terms and conditions for copying, +distributing or modifying the Program or works based on it. + +6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the original +licensor to copy, distribute or modify the Program subject to these terms and +conditions. You may not impose any further restrictions on the recipients' +exercise of the rights granted herein. You are not responsible for enforcing +compliance by third parties to this License. + +7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), conditions +are imposed on you (whether by court order, agreement or otherwise) that +contradict the conditions of this License, they do not excuse you from the +conditions of this License. If you cannot distribute so as to satisfy +simultaneously your obligations under this License and any other pertinent +obligations, then as a consequence you may not distribute the Program at all. +For example, if a patent license would not permit royalty-free redistribution +of the Program by all those who receive copies directly or indirectly through +you, then the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply and +the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any patents or +other property right claims or to contest validity of any such claims; this +section has the sole purpose of protecting the integrity of the free software +distribution system, which is implemented by public license practices. Many +people have made generous contributions to the wide range of software +distributed through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing to +distribute software through any other system and a licensee cannot impose +that choice. + +This section is intended to make thoroughly clear what is believed to be a +consequence of the rest of this License. + +8. If the distribution and/or use of the Program is restricted in certain +countries either by patents or by copyrighted interfaces, the original copyright +holder who places the Program under this License may add an explicit +geographical distribution limitation excluding those countries, so that +distribution is permitted only in or among countries not thus excluded. In such +case, this License incorporates the limitation as if written in the body of this +License. + +9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will be +similar in spirit to the present version, but may differ in detail to address new +problems or concerns. + +Each version is given a distinguishing version number. If the Program specifies +a version number of this License which applies to it and "any later version", +you have the option of following the terms and conditions either of that +version or of any later version published by the Free Software Foundation. If +the Program does not specify a version number of this License, you may +choose any version ever published by the Free Software Foundation. + +10. If you wish to incorporate parts of the Program into other free programs +whose distribution conditions are different, write to the author to ask for +permission. For software which is copyrighted by the Free Software +Foundation, write to the Free Software Foundation; we sometimes make +exceptions for this. Our decision will be guided by the two goals of +preserving the free status of all derivatives of our free software and of +promoting the sharing and reuse of software generally. + + NO WARRANTY + +11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, +THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT +PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE +STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT +WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND +PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL +NECESSARY SERVICING, REPAIR OR CORRECTION. + +12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR +AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR +ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE +LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, +SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES +ARISING OUT OF THE USE OR INABILITY TO USE THE +PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA +OR DATA BEING RENDERED INACCURATE OR LOSSES +SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE +PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN +IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF +THE POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS diff -r 000000000000 -r 9ce879ecbce6 README.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.txt Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,2 @@ +// $Id: README.txt,v 1.2 2009/05/30 09:26:55 dereine Exp $ +@TODO Write readme file diff -r 000000000000 -r 9ce879ecbce6 og_statistics.faceted_search.inc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/og_statistics.faceted_search.inc Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,45 @@ + 'checkbox', + '#title' => t('Sort by number of group nodes'), + '#default_value' => faceted_search_variable_get($env_id, 'og_statistics_sort', FALSE), + '#description' => t('If only searching group content types enables sorting by the most recent node added to the group, rather than comment added to the group node itself.'), + '#weight' => -1, + ); +} +} + +/** + * Implementation of hook_faceted_search_query_alter(). + * + * This is quite late in the sequence, but were altering a facet + * (the content-type one) rather than making a new one we could hook + * in the sort(s) to. + * @todo I guess there is a much better way of doing this! Like + * maybe inheriting content-type facet and extending it and making it + * sort an option? + */ +function og_statistics_faceted_search_query_alter($search, &$query) { + if (faceted_search_variable_get($search->_env_id, 'og_statistics_sort', FALSE)) { // change for a variable + $query->tables['default']['c']['table'] = 'og_statistics'; + $query->fields['default']['score']['field'] = '%d * POW(2, (GREATEST(MAX(n.created), MAX(n.changed), MAX(c.last_node_timestamp)) - %d) * 6.43e-8)'; + } +} + diff -r 000000000000 -r 9ce879ecbce6 og_statistics.info --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/og_statistics.info Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,14 @@ +;$Id; +name = Organic groups statistics +description = "Enable statistics for organic groups." +package = "Organic groups" +dependencies[] = og +dependencies[] = og_views +core = 6.x + +; Information added by drupal.org packaging script on 2009-06-18 +version = "6.x-1.0-beta3" +core = "6.x" +project = "og_statistics" +datestamp = "1245344747" + diff -r 000000000000 -r 9ce879ecbce6 og_statistics.install --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/og_statistics.install Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,80 @@ + 'Saves some statistics foreach group', + 'fields' => array( + 'nid' => array( + 'description' => "The groups's {node}.nid.", + 'type' => 'int', + 'size' => 'normal', + 'not null' => TRUE, + ), + 'members_count' => array( + 'description' => 'How many members has a group', + 'type' => 'int', + 'size' => 'normal', + 'not null' => TRUE, + ), + 'posts_count' => array( + 'description' => 'How many posts has a group', + 'type' => 'int', + 'size' => 'normal', + 'not null' => TRUE, + ), + 'comments_count' => array( + 'description' => 'How many comments has a group', + 'type' => 'int', + 'size' => 'normal', + 'not null' => TRUE, + ), + 'last_node_timestamp' => array( + 'description' => 'Last Time when a in the group was created.', + 'type' => 'int', + 'size' => 'normal', + 'not null' => FALSE, + 'default' => 0, + ), + 'last_comment_timestamp' => array( + 'description' => 'Last Time when a comment in the group was created.', + 'type' => 'int', + 'size' => 'normal', + 'not null' => FALSE, + 'default' => 0, + ), + 'last_member_timestamp' => array( + 'description' => 'Last Time when a user joins a group.', + 'type' => 'int', + 'size' => 'normal', + 'not null' => FALSE, + 'default' => 0, + ), + ), + 'primary key' => array('nid'), + ); + + return $schema; +} + +/** + * Implemenation of hook_uninstall(). + */ +function og_statistics_uninstall() { + drupal_uninstall_schema('og_statistics'); +} diff -r 000000000000 -r 9ce879ecbce6 og_statistics.module --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/og_statistics.module Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,321 @@ +type)) { + og_statistics_write_pure_record($node->nid); + } + // Update statistics. + elseif (og_is_group_post_type($node->type)) { + if (isset($node->og_groups)) { + $node->og_groups = array_unique($node->og_groups); + foreach ($node->og_groups as $gid) { + og_statistics_add_node($gid); + og_statistics_update_last_node($node->created, $gid); + } + } + } + break; + case 'delete': + // Remove a record for group. + if (og_is_group_type($node->type)) { + og_statistics_delete_record($node); + } + // Update statistics. + elseif (og_is_group_post_type($node->type)) { + if (isset($node->og_groups)) { + $node->og_groups = array_unique($node->og_groups); + foreach ($node->og_groups as $gid) { + og_statistics_remove_node($gid); + } + } + } + break; + case 'update': + // Update statistics. + if (og_is_group_post_type($node->type)) { + if (isset($node->og_groups)) { + $updated_gid = array_intersect($node->og_groups, $node->og_initial_groups); + $added_gid = array_diff($node->og_groups, $node->og_initial_groups); + $removed_gid = array_diff($node->og_initial_groups, $node->og_groups); + foreach ($updated_gid as $gid) { + og_statistics_update_last_node($node->changed, $gid); + } + foreach ($added_gid as $gid) { + og_statistics_add_node($gid); + og_statistics_update_last_node($node->changed, $gid); + } + foreach ($removed_gid as $gid) { + og_statistics_remove_node($gid); + } + } + } + } +} + +/** + * Implementation of hook_comment(). + */ +function og_statistics_comment(&$a1, $op) { + switch ($op) { + case 'insert': + $node = node_load($a1['nid']); + if (og_is_group_post_type($node->type)) { + foreach ($node->og_groups as $gid) { + og_statistics_add_comment($gid); + og_statistics_update_last_comment($a1['timestamp'], $gid); + } + } + break; + case 'delete': + $node = node_load($a1->nid); + if (og_is_group_post_type($node->type)) { + foreach ($node->og_groups as $gid) { + og_statistics_remove_comment($gid); + } + } + break; + case 'update': + $node = node_load($a1['nid']); + if (og_is_group_post_type($node->type)) { + foreach ($node->og_groups as $gid) { + og_statistics_update_last_comment($a1['timestamp'], $gid); + } + } + break; + } +} + +/** + * Implementation of hook_og(). + */ +function og_statistics_og($op, $gid, $uid, $args) { + switch ($op) { + case 'user insert': + $time = time(); + og_statistics_add_user($gid); + og_statistics_update_last_member($time, $gid); + break; + case 'user delete': + og_statistics_remove_user($gid); + break; + } +} + +/** + * Returns a statistic for a group(). + * + * @param $gid + * The group nid. + * + * @todo + * Build perhaps a static cache here. + * + */ +function og_statistics_load($gid) { + $result = db_query("SELECT * FROM {og_statistics} WHERE nid = %d", $gid); + return db_fetch_array($result); +} + +/** + * Writes a record of statistics without any content, but nid. + * + * @param $gid + * The group nid. + */ +function og_statistics_write_pure_record($gid) { + // All statistics are set to zero. + $stat = array( + 'nid' => $gid, + 'members_count' => 0, + 'posts_count' => 0, + 'comments_count' => 0, + 'last_node_timestamp' => 0, + 'last_comment_timestamp' => 0, + 'last_member_timestamp' => 0, + ); + drupal_write_record('og_statistics', $stat); +} + +/** + * Add 1 to posts_count of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_add_node($gid) { + $stat = og_statistics_load($gid); + $stat['posts_count']++; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Removes 1 form posts_count of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_remove_node($gid) { + $stat = og_statistics_load($gid); + $stat['posts_count']--; + // Load the count of comments and remove this amount of comments. + $node = node_load($gid); + $stat['comments_count'] -= $node->comment_count; + + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Updates the last node of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_update_last_node($timestamp, $gid) { + $stat = og_statistics_load($gid); + $stat['last_node_timestamp'] = $timestamp; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Add 1 to comments_count of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_add_comment($gid) { + $stat = og_statistics_load($gid); + $stat['comments_count']++; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Removes 1 from comments_count of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_remove_comment($gid) { + $stat = og_statistics_load($gid); + $stat['comments_count']--; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Updates the last comment of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_update_last_comment($timestamp, $gid) { + $stat = og_statistics_load($gid); + $stat['last_comment_timestamp'] = $timestamp; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Add 1 to members_count of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_add_user($gid) { + $stat = og_statistics_load($gid); + $stat['members_count']++; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Removes 1 from members_count of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_remove_user($gid) { + $stat = og_statistics_load($gid); + $stat['members_count']--; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Updates the last member of a group. + * + * @param $gid + * The group nid. + */ +function og_statistics_update_last_member($timestamp, $gid) { + $stat = og_statistics_load($gid); + $stat['last_member_timestamp'] = $timestamp; + drupal_write_record('og_statistics', $stat, 'nid'); +} + +/** + * Removes a complete record. + * + * @param $gid + * The group nid. + */ +function og_statistics_delete_record($gid) { + db_query("DELETE FROM {og_statistics} WHERE nid = %d", $gid); +} + +/** + * views stuff. + */ + +/** + * Implementation of hook_views_api(). + */ +function og_statistics_views_api() { + return array( + 'api' => 2, + ); +} + diff -r 000000000000 -r 9ce879ecbce6 og_statistics.test --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/og_statistics.test Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,158 @@ + t('Organic groups statistics'), + 'description' => t('tests statistics of og_statistics module'), + 'group' => t('Organic groups'), + ); + } + + function setUp() { + parent::setUp('node', 'user', 'comment', 'views', 'og', 'og_views', 'og_statistics', 'og_access'); + + // Create a user with admin permissions. + $web_admin = $this->drupalCreateUser(array('administer nodes', 'administer content types', 'access administration pages', 'administer site configuration', 'administer organic groups')); + $this->drupalLogin($web_admin); + } + + function TestOgStatisticsWritePureRecord() { + // Create a group node content type. + $og_group_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_group_type->name, 'group'); + + // Create a group post content type. + $og_post_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_post_type->name, 'group_post_standard'); + + // Rebuild the menu so the new content types will appear in the menu. + menu_rebuild(); + + // Create a group node. + $gid = $this->addOgGroup($og_group_type->name); + + // get the record of the group + $stat = og_statistics_load($gid); + unset($stat['nid']); + $members = + + $empty = FALSE; + $this->assertFalse($empty, print_r($stat, TRUE)); + foreach ($stat as $key => $item) { + $empty = $empty || $item == TRUE; + } + $this->assertFalse($empty, t('All stats should have 0 as item')); + } + + // Tests nodeapi statistics. + function TestOgStatisticsNodeapi() { + // Create a group node content type. + $og_group_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_group_type->name, 'group'); + + // Create a group post content type. + $og_post_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_post_type->name, 'group_post_standard'); + + // Rebuild the menu so the new content types will appear in the menu. + menu_rebuild(); + + // create a test group + $gid = $this->addOgGroup($og_group_type->name); + $before = og_statistics_load($gid); + + // add a test post + $nids[] = $nid = $this->addOgPost($og_post_type->name, array($gid)); + $node = node_load($nid); + // Rebuild the menu so the new content types will appear in the menu. + menu_rebuild(); + $after = og_statistics_load($gid); + $count_one_up = ($after['posts_count'] - $before['posts_count']) == 1; + + $this->assertTrue($count_one_up, 'A node post in a group, counts the counter 1 up'); + $this->assertEqual($node->created, $after['last_node_timestamp'], 'A node post in a group, sets the last node timestamp'); + + // remove the post + node_delete($nid); + $before = $after; + $after = og_statistics_load($gid); + $count_down = ($after['posts_count'] - $before['posts_count']) == -1; + + $this->assertTrue($count_down, 'A node poast in a group was deleted, counts the counter 1 down'); + } + + // Tests comments hooks statistic + function TestOgStatisticsComment() { + // Create a group node content type. + $og_group_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_group_type->name, 'group'); + + // Create a group post content type. + $og_post_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_post_type->name, 'group_post_standard'); + + // Rebuild the menu so the new content types will appear in the menu. + menu_rebuild(); + + // create a test group + $gid = $this->addOgGroup($og_group_type->name); + $before = og_statistics_load($gid); + + // add a test post + $nids[] = $nid = $this->addOgPost($og_post_type->name, array($gid)); + + // adds some comments + $edit = array(); + $edit['subject'] = $this->randomName(10); + $edit['comment'] = $this->randomName(50); + $edit['nid'] = $nid; + $cid = comment_save($edit); + $comment = _comment_load($cid); + + $after = og_statistics_load($gid); + $count_up = ($after['comments_count'] - $before['comments_count']) == 1; + $this->assertTrue($count_up, 'new comment to one group post, counts up the comment counter'); + $this->assertEqual($comment->timestamp, $after['last_comment_timestamp'], 'new comment to one group post, counts up the comment counter'); + } + + function TestOgStatisticsOg() { + // Create a group node content type. + $og_group_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_group_type->name, 'group'); + + // Create a group post content type. + $og_post_type = $this->drupalCreateContentType(); + variable_set('og_content_type_usage_'. $og_post_type->name, 'group_post_standard'); + + // Rebuild the menu so the new content types will appear in the menu. + menu_rebuild(); + + // create a test group + $gid = $this->addOgGroup($og_group_type->name); + $before = og_statistics_load($gid); + + // let one member choine the group + $account = $this->drupalCreateUser(); + $time = time(); + og_save_subscription($gid, $account->uid, array('created' => $time)); + + $after = og_statistics_load($gid); + + $count_up = ($after['members_count'] - $before['members_count']) == 1; + + $this->assertTrue($count_up, 'New subscription to a group adds the counter 1 up'); + $this->assertEqual($time, $after['last_member_timestamp'], 'New subscription to a group adds the counter 1 up'); + } +} + diff -r 000000000000 -r 9ce879ecbce6 og_statistics.views.inc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/og_statistics.views.inc Tue Nov 24 14:25:13 2009 +0100 @@ -0,0 +1,95 @@ + array( + 'left_field' => 'nid', + 'field' => 'nid', + ), + ); + $data['og_statistics']['members_count'] = array( + 'title' => t('Group Statistic: Members Count'), + 'real field' => 'members_count', + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['og_statistics']['posts_count'] = array( + 'title' => t('Group Statistic: Posts Count'), + 'real field' => 'posts_count', + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['og_statistics']['comments_count'] = array( + 'title' => t('Group Statistic: Comments Count'), + 'real field' => 'comments_count', + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['og_statistics']['last_node_timestamp'] = array( + 'title' => t('Group Statistic: Last inserted/updated Node-time'), + 'real field' => 'last_node_timestamp', + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'sort' => array( + 'handler' => 'views_handler_sort_date', + ), + ); + $data['og_statistics']['last_comment_timestamp'] = array( + 'title' => t('Group Statistic: Last Comment-time'), + 'real field' => 'last_comment_timestamp', + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'sort' => array( + 'handler' => 'views_handler_sort_date', + ), + ); + $data['og_statistics']['last_member_timestamp'] = array( + 'title' => t('Group Statistic: last Member subscription'), + 'real field' => 'last_member_timestamp', + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'sort' => array( + 'handler' => 'views_handler_sort_date', + ), + ); + return $data; +} +