Changeset 8913 for lang/perl/HTTP-MobileAttribute

Timestamp:

04/05/08 16:45:20 (5 years ago)

Author:

tokuhirom

Message:

Plugin::Parser::* はさしかえたくなることはないだろうということで、Agent::* に parser 系をまるっと書いちゃうことにした。

Location:

lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP

Files:

• MobileAttribute.pm (modified) (3 diffs)
• MobileAttribute/Agent (added)
• MobileAttribute/Agent/AirHPhone.pm (added)
• MobileAttribute/Agent/Base.pm (added)
• MobileAttribute/Agent/DoCoMo.pm (added)
• MobileAttribute/Agent/EZweb.pm (added)
• MobileAttribute/Agent/NonMobile.pm (added)
• MobileAttribute/Agent/ThirdForce.pm (added)
• MobileAttribute/Attribute/CarrierMethod.pm (modified) (1 diff)
• MobileAttribute/Plugin.pm (modified) (1 diff)
• MobileAttribute/Plugin/Core.pm (modified) (1 diff)
• MobileAttribute/Plugin/Parser (deleted)

lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP/MobileAttribute.pm

@@ -3 +3 @@
 use warnings;
 our $VERSION = '0.04';
-use Class::Component;
 use HTTP::MobileAttribute::Request;
 use HTTP::MobileAttribute::CarrierDetector;
-
-__PACKAGE__->load_components(qw/DisableDynamicPlugin Autocall::InjectMethod/);
+use UNIVERSAL::require;
 
 # XXX: This really affects the first time H::MobileAttribute gets loaded
@@ -21 +19 @@
 }
 
-our %CARRIER_CLASSES;
-sub load_plugin {
-    my $class = shift;
-    %CARRIER_CLASSES = ();
-    $class->SUPER::load_plugin(@_);
-}
+sub carriers { qw/DoCoMo AirHPhone ThirdForce EZweb NonMobile/ }
+
+BEGIN {
+    for (carriers()) {
+        "HTTP::MobileAttribute::Agent::$_"->use or die $@;
+    }
+};
 
 sub new {
@@ -38 +37 @@
     my $carrier_longname = HTTP::MobileAttribute::CarrierDetector::detect($request->get('User-Agent'));
 
-    my $carrier_class = $CARRIER_CLASSES{ $carrier_longname };
-    if (! $carrier_class) {
-        $carrier_class = $class->agent_class($carrier_longname);
-        for my $type (qw/ components plugins methods hooks /) {
-            my $method = "class_component_$type";
-            $carrier_class->$method($class->$method);
-        }
-        $CARRIER_CLASSES{ $carrier_longname } = $carrier_class;
-    }
-
-    my $self = $carrier_class->SUPER::new({
+    my $self = $class->agent_class($carrier_longname)->new({
         request          => $request,
         carrier_longname => $carrier_longname,
     });
-
-    $self->create_accessors_delayed();
-    $self->parse();
-
+    $self->parse;
     return $self;
 }
 
-for my $accessor (qw/request carrier_longname/) {
-    no strict 'refs';
-    *{$accessor} = sub { shift->{$accessor} };
-}
-
-sub user_agent { shift->request->get('User-Agent') }
-
 sub agent_class { 'HTTP::MobileAttribute::Agent::' . $_[1] }
 
-my @delayed_accessors;
+sub load_plugins {
+    my ($class, @plugins) = @_;
 
-sub create_accessors_delayed {
-    my ($self, ) = @_;
-
-    while (my $accessor_info = pop @delayed_accessors) {
-        for my $method (@{ $accessor_info->{accessors} }) {
-            no strict 'refs';
-            *{"$accessor_info->{package}::$method"} = sub { $_[1]->{$method} };
-            $self->agent_class($accessor_info->{carrier})->register_method(
-                $method => $accessor_info->{package}
-            );
-        }
+    for my $carrier (carriers()) {
+        $class->agent_class($carrier)->load_plugins(@plugins);
     }
 }
 
-sub register_accessors_delayed {
-    my ($self, $accessor_info) = @_;
-
-    push @delayed_accessors, $accessor_info;
-}
-
-package # hide from pause
-    HTTP::MobileAttribute::Agent::DoCoMo;
-use base qw/HTTP::MobileAttribute/;
-
-package # hide from pause
-    HTTP::MobileAttribute::Agent::EZweb;
-use base qw/HTTP::MobileAttribute/;
-
-package # hide from pause
-    HTTP::MobileAttribute::Agent::ThirdForce;
-use base qw/HTTP::MobileAttribute/;
-
-package # hide from pause
-    HTTP::MobileAttribute::Agent::AirHPhone;
-use base qw/HTTP::MobileAttribute/;
-
-package # hide from pause
-    HTTP::MobileAttribute::Agent::NonMobile;
-use base qw/HTTP::MobileAttribute/;
 
 1;

lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP/MobileAttribute/Attribute/CarrierMethod.pm

@@ -8 +8 @@
 
     if (ref $param) {
-        $c->agent_class($param->[0])->register_method( $param->[1] => { plugin => $plugin, method => $method } );
+        return unless $c =~ $param->[0];
+        $c->register_method( $param->[1] => { plugin => $plugin, method => $method } );
     } else {
-        $c->agent_class($param)->register_method( $method => $plugin );
+        return unless $c =~ $param;
+        $c->register_method( $method => $plugin );
     }
 }

lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP/MobileAttribute/Plugin.pm

@@ -4 +4 @@
 use base qw/Class::Component::Plugin/;
 
-__PACKAGE__->mk_classdata('__accessors');
-
-sub new {
-    my ($class, $config, $c) = @_;
-    my $self = $class->SUPER::new($config, $c);
-    if ($self->__accessors) {
-        $c->register_accessors_delayed( $self->__accessors);
-        $self->__accessors(undef);
-    }
-    $self;
-}
-
-sub accessors {
-    my ($class, $carrier, $accessors) = @_;
-
-    $class->__accessors({carrier => $carrier, accessors => $accessors, package => $class});
+sub class_component_load_attribute_resolver {
+    $_[1] eq 'CarrierMethod' ? "HTTP::MobileAttribute::Attribute::CarrierMethod" : undef
 }
 

lang/perl/HTTP-MobileAttribute/trunk/lib/HTTP/MobileAttribute/Plugin/Core.pm

@@ -7 +7 @@
     my ($class, $config, $c) = @_;
     my $self = $class->SUPER::new($config, $c);
-    $c->load_plugins(map({ "Parser::$_" } qw/DoCoMo ThirdForce EZweb NonMobile AirHPhone/));
+    # $c->load_plugins();
     $self;
 }