Fixed mime type setting, fixed errors in revision 445, folded in Maypole::Component...

[maypole.git] / lib / Maypole / Model / Base.pm

diff --git a/lib/Maypole/Model/Base.pm b/lib/Maypole/Model/Base.pm
index 26288c29f15cd32d4d00a0dd117ba215cbc1c333..de33ac98c991137b24712b86d947553629d2f01e 100644 (file)
--- a/lib/Maypole/Model/Base.pm
+++ b/lib/Maypole/Model/Base.pm
@@ -4,6 +4,7 @@ use strict;
 use Maypole::Constants;
 use attributes ();
 
+# don't know why this is a global - drb
 our %remember;
 
 sub MODIFY_CODE_ATTRIBUTES 
@@ -28,6 +29,7 @@ sub process {
     $r->{template} = $method;
     my $obj = $class->fetch_objects($r);
     $r->objects([$obj]) if $obj;
+    
     $class->$method( $r, $obj, @{ $r->{args} } );
 }
 
@@ -187,19 +189,22 @@ Defaults to checking if the sub has the C<:Exported> attribute.
 
 =cut
 
-sub is_public 
-{
-    my ($self, $action) = @_;
-    
-    my %attrs = map {$_ => 1} $self->method_attrs($action);
-    
-    return 1 if $attrs{Exported};
-    
-    warn "$action not exported" if Maypole->debug;
-    
-    return 0;
+sub is_public {
+    my ( $self, $action, $attrs ) = @_;
+    my $cv = $self->can($action);
+    warn "is_public failed . action is $action. self is $self" and return 0 unless $cv;
+
+    my %attrs = (ref $attrs) ?  %$attrs : map {$_ => 1} $self->method_attrs($action,$cv) ;
+
+    do {
+       warn "is_public failed. $action not exported. attributes are : ", %attrs;
+       return 0;
+    } unless $attrs{Exported};
+    return 1;
 }
 
+
+
 =head2 method_attrs
 
 Returns the list of attributes defined for a method. Maypole itself only
@@ -207,16 +212,15 @@ defines the C<Exported> attribute.
 
 =cut
 
-sub method_attrs
-{
-    my ($class, $method) = @_;
+sub method_attrs {
+    my ($class, $method, $cv) = @_;
     
-    my $cv = $class->can($method);
+    $cv ||= $class->can($method);
     
     return unless $cv;
     
     my @attrs = attributes::get($cv);
-    
+
     return @attrs;
 }