Changeset 5817

Timestamp:

01/30/08 00:51:19 (5 years ago)

Author:

kentaro

Message:

lang/perl/WWW-HatenaDiary?: Merged from Yappo's branch which enhances this module using WWW::HatenaLogin?

Location:

lang/perl/WWW-HatenaDiary/trunk

Files:

• . (modified) (1 prop)
• Makefile.PL (modified) (1 diff)
• lib/WWW/HatenaDiary.pm (modified) (13 diffs)
• t/97_podspell.t (modified) (1 diff)

lang/perl/WWW-HatenaDiary/trunk/Makefile.PL

@@ -9 +9 @@
     JSON::Syck
 /);
+requires WWW::HatenaLogin => 0.02;
 
 build_requires 'Test::More';

lang/perl/WWW-HatenaDiary/trunk/lib/WWW/HatenaDiary.pm

@@ -7 +7 @@
 use WWW::Mechanize;
 use JSON::Syck 'Load';
+use WWW::HatenaLogin;
 
 our $VERSION = '0.01';
-
-my $login_uri = 'https://www.hatena.ne.jp/login';
 
 sub new {
@@ -19 +18 @@
         base     => $base,
         group    => $args->{group},
-        username => $args->{username},
-        password => $args->{password},
-        mech     => WWW::Mechanize->new(
-            $args->{mech_opt} && ref $args->{mech_opt} ? %{$args->{mech_opt}} : ()
-        ),
+        login    => $args->{login} || WWW::HatenaLogin->new({ nologin => 1, %{ $args } }),
         verbose  => $args->{verbose},
     }, $class;
@@ -31 +26 @@
             process '//td[@class="username"]/a', 'username' => 'TEXT';
             result 'username';
-        }->scrape($self->{mech}->content, URI->new($login_uri));
-        $self->{username} = $username if !$self->{username};
-        $self->{diary}    = "$self->{base}$self->{username}/";
+        }->scrape($self->{login}->mech->content, $self->{login}->login_uri);
+        $self->{login}->username($username) if !$self->{login}->username;
+        $self->{diary}    = $self->{base}.$self->{login}->username.'/';
     }
 
@@ -41 +36 @@
 sub is_loggedin {
     my $self = shift;
-    my $link;
-
-    $self->{mech}->get($login_uri);
-    ($link) = map { $_->url } $self->{mech}->find_link(tag => 'meta');
-
-    !!$link;
+    $self->{login}->is_loggedin;
 }
 
@@ -52 +42 @@
     my ($self, $args) = @_;
 
-    if ($args) {
-        if ($args->{username}) {
-            $self->{username} = $args->{username};
-        }
-        if ($args->{password}) {
-            $self->{password} = $args->{password};
-        }
-    }
-
-    $self->{diary} = "$self->{base}$self->{username}/";
-    $self->{mech}->get($login_uri);
-    $self->{mech}->submit_form(
-        fields => {
-            name     => $self->{username},
-            password => $self->{password},
-        }
-    );
+    $self->{login}->login($args);
+    $self->{diary} = $self->{base}.$self->{login}->username.'/';
 
     !!($self->{rkm} = $self->get_rkm) ||
@@ -78 +53 @@
     my $rkm;
 
-    $self->{mech}->get("$self->{diary}?mode=json");
+    $self->{login}->mech->get("$self->{diary}?mode=json");
     eval {
-        $rkm = Load($self->{mech}->content)->{rkm};
+        $rkm = Load($self->{login}->mech->content)->{rkm};
     };
 
@@ -101 +76 @@
         if !$args->{uri};
 
-    $self->{mech}->get("$args->{uri}?mode=json");
-    Load($self->{mech}->content);
+    $self->{login}->mech->get("$args->{uri}?mode=json");
+    Load($self->{login}->mech->content);
 }
 
@@ -115 +90 @@
 
         my $uri = "$self->{diary}edit?date=$y$m$d";
-        $self->{mech}->get($uri);
-        my $form = $self->{mech}->form_name('edit');
+        $self->{login}->mech->get($uri);
+        my $form = $self->{login}->mech->form_name('edit');
 
         {
@@ -147 +122 @@
 
         my $uri = "$self->{diary}edit?date=$y$m$d";
-        $self->{mech}->get($uri);
-        $self->{mech}->submit_form(
+        $self->{login}->mech->get($uri);
+        $self->{login}->mech->submit_form(
             form_name => 'edit',
             fields => {
@@ -163 +138 @@
     }
 
-    $self->{mech}->success;
+    $self->{login}->mech->success;
 }
 
@@ -206 +181 @@
         my $uri = "$self->{diary}edit?date=$y$m$d";
 
-        $self->{mech}->get($uri);
+        $self->{login}->mech->get($uri);
 
         if ($self->{group}) {
-            for my $form ($self->{mech}->forms) {
+            for my $form ($self->{login}->mech->forms) {
                 if ($form->action =~ /deletediary$/) {
-                    $self->{mech}->request($form->click);
+                    $self->{login}->mech->request($form->click);
                 }
             }
         }
         else {
-            $self->{mech}->submit_form(form_number => 2);
+            $self->{login}->mech->submit_form(form_number => 2);
         }
     }
@@ -223 +198 @@
     }
 
-    $self->{mech}->success;
+    $self->{login}->mech->success;
 }
 
@@ -230 +205 @@
     my $uri = $args->{uri} || $self->{diary};
 
-    $self->{mech}->post($uri, {
+    $self->{login}->mech->post($uri, {
         rkm => $self->{rkm},
         %$args,

lang/perl/WWW-HatenaDiary/trunk/t/97_podspell.t

@@ -15 +15 @@
 cpan
 gmail
+AtomPub