Changeset 14624 for websites

Timestamp:

06/26/08 09:29:50 (5 years ago)

Author:

tomi-ru

Message:

configのマージを忘れていたので追加。あとViewクラスでもpath_to()使うと思い追加してみた

Location:

websites/mobilecat/trunk/lib

Files:

• Catalyst/View/MobileJpFilter.pm (modified) (2 diffs)
• MobileCat/View/MobileJpFilter.pm (modified) (1 diff)

websites/mobilecat/trunk/lib/Catalyst/View/MobileJpFilter.pm

@@ -5 +5 @@
 
 use Class::C3;
+use Data::Visitor::Callback;
 use HTML::MobileJp::Filter;
 
-__PACKAGE__->mk_accessors('filter');
+__PACKAGE__->mk_accessors(qw( html_filter ));
 
 sub new {
-    my ($class, $c, @args) = @_;
-    my $self = $class->next::method($c, @args);
+    my ($class, $c, $args) = @_;
+     
+    my $self = $class->next::method($c, $args);
     
-    $self->filter(do {
-        HTML::MobileJp::Filter->new( filters => $self->config->{filters} );    
-    }); 
+    $self->config(
+        $self->merge_config_hashes($self->config, $args)
+    );
+    
+    my $v = Data::Visitor::Callback->new(
+        plain_value => sub {
+            return unless defined $_;
+            s{__path_to\((.*?)\)__}{ $c->path_to( $1 ? split( /,/, $1 ) : () ) }eg;
+        },
+    );
+    $v->visit( $self->config );
+    
+    $self->html_filter(do {
+        HTML::MobileJp::Filter->new( filters => $self->config->{filters} )
+    });
     
     $self;
@@ -23 +37 @@
     my ($self, $c) = @_;
     
-    my $html = $self->filter->filter(
+    my $html = $self->html_filter->filter(
         mobile_agent => $c->req->mobile_agent,
         html         => $c->res->body || "",

websites/mobilecat/trunk/lib/MobileCat/View/MobileJpFilter.pm

@@ -11 +11 @@
   - module: DoCoMoCSS
     config:
-      base_dir: root
+      base_dir: __path_to(root)__
   - module: DoCoMoGUID 
   - module: EntityReference
   - module: FallbackImage 
     config:
-      template: '<img src="%s" />'
+      template: '<img src="%s.gif" />'
       params:
         - unicode_hex