Changeset 17689 for lang

Timestamp:

08/16/08 09:30:42 (5 years ago)

Author:

daisuke

Message:

coerce instead of hand manipulation

Location:

lang/perl/MooseX-DOM/trunk/lib/MooseX/DOM

Files:

• LibXML.pm (modified) (4 diffs)
• LibXML/ContextNode.pm (modified) (3 diffs)

lang/perl/MooseX-DOM/trunk/lib/MooseX/DOM/LibXML.pm

@@ -12 +12 @@
     is => 'rw',
     isa => 'MooseX::DOM::LibXML::ContextNode',
+    coerce => 1,
 );
 
@@ -23 +24 @@
 no Moose;
 
+sub BUILD {
+    my $self = shift;
+    $self->node->register_namespaces( $self->namespaces );
+    $self;
+}
+
 sub init_meta {
     # Only MooseX::DOM knows the true caller, so we expect it to
@@ -33 +40 @@
         'MooseX::DOM::Meta::LibXML'
     );
-}
-
-sub BUILDARGS {
-    my ($self, %args) = @_;
-
-    my $namespaces = $args{namespaces} || {};
-    my $node = delete $args{node};
-    if ($node) {
-        if (! ref $node) {
-            $node = MooseX::DOM::LibXML::ContextNode->new(
-                node => XML::LibXML->new->parse_string($node)->documentElement,
-                namespaces => $namespaces
-            );
-        } elsif ($node->isa('XML::LibXML::Element')) {
-            $node = MooseX::DOM::LibXML::ContextNode->new(
-                node => $node,
-                namespaces => $namespaces
-            );
-        } else {
-            confess "Don't know how to handle $node";
-        }
-
-        $args{node} = $node;
-    }
-
-    return  { %args };
 }
 
@@ -108 +89 @@
                 # attributes => { attr1 => $val1, attr2 => $val2 }
 
+
+                # Find the meta attribute for 'node', and add type constraints
+                
                 $tag = $args{tag} if $args{tag};
                 my $attrs = $args{attributes};
 
                 my $meta = $caller->meta;
+                my $node_attr = $meta->get_attribute('node');
+                return () unless $node_attr;
+
+
                 $meta->dom_root( { tag => $tag, attributes => $attrs } );
 

lang/perl/MooseX-DOM/trunk/lib/MooseX/DOM/LibXML/ContextNode.pm

@@ -3 +3 @@
 package MooseX::DOM::LibXML::ContextNode;
 use Moose;
+use Moose::Util::TypeConstraints;
 use Class::Inspector;
 use XML::LibXML;
 use XML::LibXML::XPathContext;
+
+coerce 'MooseX::DOM::LibXML::ContextNode'
+    => from 'Str'
+    => via { 
+        MooseX::DOM::LibXML::ContextNode->new(
+            node => XML::LibXML->new->parse_string($_)->documentElement
+        )
+    }
+;
 
 has 'node' => (
@@ -22 +32 @@
     is => 'rw',
     isa => 'XML::LibXML::XPathContext',
-    required => 1,
     handles => [ qw(findnodes findvalue) ],
 );
@@ -30 +39 @@
 no Moose;
 
-sub BUILDARGS {
-    my ($self, %args) = @_;
+sub BUILD {
+    my ($self, $args) = @_;
 
-    my $xc = XML::LibXML::XPathContext->new($args{node});
-    while (my ($prefix, $uri) = each %{ $args{namespaces} || {} }) {
+    my $xc = XML::LibXML::XPathContext->new($self->node);
+    $self->context($xc);
+    $self->register_namespaces( $args->{namespaces} ) if $args->{namespaces};
+    $self;
+}
+
+sub register_namespaces {
+    my ($self, $namespaces) = @_;
+
+    my $xc = $self->context;
+    while (my ($prefix, $uri) = each %{ $namespaces || {} }) {
         next if defined $xc->lookupNs($uri);
 
         $xc->registerNs($prefix, $uri);
     }
-
-    return { %args, context => $xc };
 }
 
+
 1;