r50232 - in /branches/upstream/libparse-mediawikidump-perl/current: ./ lib/Parse/ lib/Parse/MediaWikiDump/ t/

angelabad-guest at users.alioth.debian.org angelabad-guest at users.alioth.debian.org
Tue Jan 5 12:39:46 UTC 2010


Author: angelabad-guest
Date: Tue Jan  5 12:39:23 2010
New Revision: 50232

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50232
Log:
[svn-upgrade] Integrating new upstream version, libparse-mediawikidump-perl (1.0.4)

Modified:
    branches/upstream/libparse-mediawikidump-perl/current/Changes
    branches/upstream/libparse-mediawikidump-perl/current/META.yml
    branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump.pm
    branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Pages.pm
    branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Revisions.pm
    branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/page.pm
    branches/upstream/libparse-mediawikidump-perl/current/t/30-pages.t
    branches/upstream/libparse-mediawikidump-perl/current/t/30-revisions.t
    branches/upstream/libparse-mediawikidump-perl/current/t/70-memory-cycle.t
    branches/upstream/libparse-mediawikidump-perl/current/t/pages_test.xml
    branches/upstream/libparse-mediawikidump-perl/current/t/revisions_test.xml

Modified: branches/upstream/libparse-mediawikidump-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/Changes?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/Changes (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/Changes Tue Jan  5 12:39:23 2010
@@ -1,11 +1,16 @@
 Revision history for Parse-MediaWikiDump
+
+1.0.4	Jan 04, 2010
+	* Fixed bug #53361: Incorrectly assigned usernames 
+	  with anon edits
+	* Added support for getting access to IP of anonymous
+	  edits
 
 1.0.3	Nov 21, 2009
 	* Fixed bug #51607 "Build failed CPAN smoke test for 
 	  for i686pc solaris" by specifying minimum version 
 	  numbers for all dependencies in Makefile.PL.
 	
-
 1.0.2	Nov 15, 2009
 	* Fixed bug #51461 "Warnings During Build" - now
 	  the test process squelches the harmless 

Modified: branches/upstream/libparse-mediawikidump-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/META.yml?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/META.yml (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/META.yml Tue Jan  5 12:39:23 2010
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:               Parse-MediaWikiDump
-version:            1.0.3
+version:            1.0.4
 abstract:           Tools to process MediaWiki dump files
 author:
     - Tyler Riddle <triddle at gmail.com>

Modified: branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump.pm?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump.pm (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump.pm Tue Jan  5 12:39:23 2010
@@ -1,5 +1,5 @@
 package Parse::MediaWikiDump;
-our $VERSION = '1.0.3';
+our $VERSION = '1.0.4';
 
 use Parse::MediaWikiDump::XML;
 use Parse::MediaWikiDump::Revisions;
@@ -204,7 +204,7 @@
 
 This software module is stable - there will not be any more API changes nor will there
 be additional features added. Bugs will be fixed but further development effort will be
-centered around a replacement for this module.
+centered around a replacement for this module: MediaWiki::DumpFile
 
 =head1 USAGE
 

Modified: branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Pages.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Pages.pm?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Pages.pm (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Pages.pm Tue Jan  5 12:39:23 2010
@@ -1,6 +1,6 @@
 package Parse::MediaWikiDump::Pages;
 
-our $VERSION = '1.0.3';
+our $VERSION = '1.0.4';
 
 use base qw(Parse::MediaWikiDump::Revisions);
 
@@ -52,7 +52,7 @@
 	my $time = $f->textcapture('timestamp');
 	my $contributor = $f->node('contributor');
 	my $username = $f->textcapture('username');
-	my $ip = $f->textcapture('ip');
+	my $ip = $f->textcapture('ip', 'userip');
 	my $contrib_id = $f->textcapture('id', 'userid');
 	my $comment = $f->textcapture('comment');
 	my $text = $f->textcapture('text');
@@ -81,8 +81,6 @@
 sub save_namespace_node {
 	return Parse::MediaWikiDump::Revisions::save_namespace_node(@_);
 }
-
-
 
 1;
 

Modified: branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Revisions.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Revisions.pm?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Revisions.pm (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/Revisions.pm Tue Jan  5 12:39:23 2010
@@ -1,6 +1,6 @@
 package Parse::MediaWikiDump::Revisions;
 
-our $VERSION = '1.0.3';
+our $VERSION = '1.0.4';
 
 use 5.8.0;
 
@@ -177,13 +177,13 @@
 	my $title = $f->textcapture('title');
 	my $id = $f->textcapture('id');
 	my $revision = $f->node('revision', 
-		Start => sub { $_[1]->{minor} = 0 }, End => sub { push(@$store_page, { %{ $_[1] } } ) } );
+		Start => \&handle_revision_node_start, End => sub { push(@$store_page, { %{ $_[1] } } ) } );
 	my $rev_id = $f->textcapture('id', 'revision_id');
 	my $minor = $f->node('minor', Start => sub { $_[1]->{minor} = 1 } );
 	my $time = $f->textcapture('timestamp');
 	my $contributor = $f->node('contributor');
 	my $username = $f->textcapture('username');
-	my $ip = $f->textcapture('ip');
+	my $ip = $f->textcapture('ip', 'userip');
 	my $contrib_id = $f->textcapture('id', 'userid');
 	my $comment = $f->textcapture('comment');
 	my $text = $f->textcapture('text');
@@ -269,6 +269,15 @@
 	$a->{version} = $version;
 }
 
+sub handle_revision_node_start { 
+	my (undef, $a) = @_;
+	
+	$a->{minor} = 0;
+	delete($a->{username});
+	delete($a->{userid});
+	delete($a->{userip});
+}
+
 sub save_siteinfo {
 	my ($self, $info) = @_;
 	my %info = %$info;

Modified: branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/page.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/page.pm?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/page.pm (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/lib/Parse/MediaWikiDump/page.pm Tue Jan  5 12:39:23 2010
@@ -1,6 +1,6 @@
 package Parse::MediaWikiDump::page;
 
-our $VERSION = '1.0.3';
+our $VERSION = '1.0.4';
 
 use strict;
 use warnings;
@@ -111,6 +111,11 @@
 	return $$self{DATA}{userid};
 }
 
+sub userip {
+	my ($self) = @_;
+	return $$self{DATA}{userip};
+}
+
 sub minor {
 	my ($self) = @_;
 	return $$self{DATA}{minor};
@@ -184,11 +189,15 @@
   
 =item $page->username
 
-Returns a string of the username responsible for this specific revision of the article
+Returns a string of the username responsible for this specific revision of the article or undef if the editor was anonymous
   
 =item $page->userid
 
-Returns a number that is the id for the user returned by $page->username
+Returns a number that is the id for the user returned by $page->username or undef if the editor was anonymous
+
+=item $page->userip
+
+Returns a string of the IP of the editor if the edit was anonymous or undef otherwise
   
 =item $page->minor
 

Modified: branches/upstream/libparse-mediawikidump-perl/current/t/30-pages.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/t/30-pages.t?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/t/30-pages.t (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/t/30-pages.t Tue Jan  5 12:39:23 2010
@@ -1,6 +1,6 @@
 #!perl -w
 
-use Test::Simple tests => 96;
+use Test::Simple tests => 108;
 use strict;
 use Parse::MediaWikiDump;
 
@@ -26,6 +26,7 @@
 	test_two();
 	test_three();
 	test_four();
+	test_five();
 
 	ok(! defined($pages->next));
 }
@@ -41,7 +42,7 @@
 	ok($pages->version eq '0.3');
 	
 	if ($mode eq 'file') {
-		ok($pages->size == 2874);
+		ok($pages->size == 3100);
 	} elsif ($mode eq 'handle') {
 		ok(! defined($pages->size))
 	} else {
@@ -110,3 +111,15 @@
 	ok($page->namespace eq '');
 	ok($page->title eq 'NotANameSpace:Bar');
 }
+
+sub test_five {
+	my $page = $pages->next;
+	
+	ok(defined($page));
+	
+	ok($page->id == 5);
+	ok($page->title eq 'Moar Tests');
+	ok(! defined($page->username));
+	ok(! defined($page->userid));
+	ok($page->userip eq '62.104.212.74');
+}

Modified: branches/upstream/libparse-mediawikidump-perl/current/t/30-revisions.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/t/30-revisions.t?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/t/30-revisions.t (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/t/30-revisions.t Tue Jan  5 12:39:23 2010
@@ -1,6 +1,6 @@
 #!perl -w
 
-use Test::Simple tests => 102;
+use Test::Simple tests => 114;
 use strict;
 use Parse::MediaWikiDump;
 use Data::Dumper;
@@ -28,6 +28,7 @@
 	test_three();
 	test_four();
 	test_five();
+	test_six();
 	
 	ok(! defined($revisions->next));
 }
@@ -44,7 +45,7 @@
 	ok($revisions->version eq '0.3');
 	
 	if ($mode eq 'file') {
-		ok($revisions->size == 3112);
+		ok($revisions->size == 3570);
 	} elsif ($mode eq 'handle') {
 		ok(! defined($revisions->size));
 	} else {
@@ -128,3 +129,16 @@
 	ok(defined(${$page->text}));		
 }
 
+#test for bug 53361
+sub test_six {
+	my $page = $revisions->next;
+	ok($page->title eq 'Test for bug 53361');
+	ok($page->username eq 'Ben-Zin');
+	ok(! defined($page->userip));
+	
+	$page = $revisions->next;
+	ok($page->title eq 'Test for bug 53361');
+	ok($page->userip eq '62.104.212.74');
+	ok(! defined($page->username));
+}
+

Modified: branches/upstream/libparse-mediawikidump-perl/current/t/70-memory-cycle.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/t/70-memory-cycle.t?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/t/70-memory-cycle.t (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/t/70-memory-cycle.t Tue Jan  5 12:39:23 2010
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use Test::Memory::Cycle tests => 12;
+use Test::Memory::Cycle tests => 15;
 use Test::Warn;
 
 use Parse::MediaWikiDump;

Modified: branches/upstream/libparse-mediawikidump-perl/current/t/pages_test.xml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/t/pages_test.xml?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/t/pages_test.xml (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/t/pages_test.xml Tue Jan  5 12:39:23 2010
@@ -84,4 +84,17 @@
     </revision>
 </page>
 
+<page>
+  <title>Moar Tests</title>
+  <id>5</id>
+	<revision>
+		<id>38847</id>
+		<timestamp>2002-10-31T14:53:37Z</timestamp>
+		<contributor>
+			<ip>62.104.212.74</ip>
+		</contributor>
+		<text id="38847" />
+	</revision>
+</page>
+
 </mediawiki>

Modified: branches/upstream/libparse-mediawikidump-perl/current/t/revisions_test.xml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libparse-mediawikidump-perl/current/t/revisions_test.xml?rev=50232&op=diff
==============================================================================
--- branches/upstream/libparse-mediawikidump-perl/current/t/revisions_test.xml (original)
+++ branches/upstream/libparse-mediawikidump-perl/current/t/revisions_test.xml Tue Jan  5 12:39:23 2010
@@ -88,4 +88,29 @@
     </revision>
 </page>
 
+<page>
+	<title>Test for bug 53361</title>
+	<id>145</id>
+
+	<revision>
+		<id>38841</id>
+		<timestamp>2002-09-08T22:15:32Z</timestamp>
+		<contributor>
+			<username>Ben-Zin</username>
+			<id>9</id>
+		</contributor>
+	<minor/>
+	<comment>en: </comment>
+	<text id="38841" />
+	</revision>
+	<revision>
+		<id>38847</id>
+		<timestamp>2002-10-31T14:53:37Z</timestamp>
+		<contributor>
+			<ip>62.104.212.74</ip>
+		</contributor>
+		<text id="38847" />
+	</revision>
+</page>
+
 </mediawiki>




More information about the Pkg-perl-cvs-commits mailing list