From b8ea246d267928ff4673069655467e9f4ca0585e Mon Sep 17 00:00:00 2001 From: Gianni Ceccarelli Date: Thu, 19 Mar 2009 14:42:47 +0100 Subject: the great renaming, part 2 --- Makefile.PL | 4 ++-- lib/Tree/Transform/XSLTish.pm | 16 ++++++++-------- lib/Tree/Transform/XSLTish/Context.pm | 5 ++--- lib/Tree/Transform/XSLTish/Transformer.pm | 24 ++++++++++++------------ lib/Tree/Transform/XSLTish/Utils.pm | 2 +- t/01-basic.t | 4 ++-- t/02-inherit.t | 4 ++-- t/03-byname.t | 2 +- t/04-errors.t | 2 +- 9 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index bb78d3e..11e7649 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -1,8 +1,8 @@ use inc::Module::Install; -name 'Tree-Transform'; +name 'Tree-Transform-XSLTish'; license 'perl'; -all_from 'lib/Tree/Transform.pm'; +all_from 'lib/Tree/Transform/XSLTish.pm'; requires 'Tree::XPathEngine' => 0, 'Moose' => 0, diff --git a/lib/Tree/Transform/XSLTish.pm b/lib/Tree/Transform/XSLTish.pm index bf3d18b..390616f 100644 --- a/lib/Tree/Transform/XSLTish.pm +++ b/lib/Tree/Transform/XSLTish.pm @@ -1,11 +1,11 @@ -package Tree::Transform; +package Tree::Transform::XSLTish; use strict; use warnings; use Sub::Exporter; use Params::Validate ':all'; -use Tree::Transform::Utils; -use Tree::Transform::Transformer; -use Carp::Clan qw(^Tree::Transform); +use Tree::Transform::XSLTish::Utils; +use Tree::Transform::XSLTish::Transformer; +use Carp::Clan qw(^Tree::Transform::XSLTish); our $VERSION='0.1'; @@ -19,7 +19,7 @@ Sub::Exporter::setup_exporter({ }); sub default_rules { - my $store=Tree::Transform::Utils::_rules_store(scalar caller); + my $store=Tree::Transform::XSLTish::Utils::_rules_store(scalar caller); push @{$store->{by_match}}, {match=> '/',priority=>0,action=>sub { $_[0]->apply_rules } }, @@ -39,7 +39,7 @@ sub tree_rule { # TODO at least one of 'name' and 'match' must be specified # TODO default priority mased on match - my $store=Tree::Transform::Utils::_rules_store(scalar caller); + my $store=Tree::Transform::XSLTish::Utils::_rules_store(scalar caller); if ($args{match}) { push @{$store->{by_match}},\%args; @@ -55,7 +55,7 @@ sub tree_rule { return; } -sub _transformer_class { 'Tree::Transform::Transformer' }; +sub _transformer_class { 'Tree::Transform::XSLTish::Transformer' }; sub new_transformer { my ($rules_package)=@_; @@ -68,7 +68,7 @@ __END__ =head1 NAME -Tree::Transform - transform tree data, like XSLT but in Perl +Tree::Transform::XSLTish - transform tree data, like XSLT but in Perl =head1 AUTHOR diff --git a/lib/Tree/Transform/XSLTish/Context.pm b/lib/Tree/Transform/XSLTish/Context.pm index 5e70079..2e696a5 100644 --- a/lib/Tree/Transform/XSLTish/Context.pm +++ b/lib/Tree/Transform/XSLTish/Context.pm @@ -1,7 +1,6 @@ -package Tree::Transform::Context; +package Tree::Transform::XSLTish::Context; use Moose; -use Tree::Transform::Utils; -use Carp::Clan qw(^Tree::Transform); +use Carp::Clan qw(^Tree::Transform::XSLTish); has 'current_node' => ( is => 'rw', isa => 'Object' ); has 'node_list' => ( is => 'rw', isa => 'ArrayRef[Object]' ); diff --git a/lib/Tree/Transform/XSLTish/Transformer.pm b/lib/Tree/Transform/XSLTish/Transformer.pm index 95448af..2f8fc52 100644 --- a/lib/Tree/Transform/XSLTish/Transformer.pm +++ b/lib/Tree/Transform/XSLTish/Transformer.pm @@ -1,18 +1,18 @@ -package Tree::Transform::Transformer; +package Tree::Transform::XSLTish::Transformer; use Moose; use MooseX::AttributeHelpers; use Params::Validate ':all'; -use Tree::Transform::Utils; -use Tree::Transform::Context; +use Tree::Transform::XSLTish::Utils; +use Tree::Transform::XSLTish::Context; use Tree::XPathEngine; -use Carp::Clan qw(^Tree::Transform); +use Carp::Clan qw(^Tree::Transform::XSLTish); has 'rules_package' => (is => 'ro', isa => 'ClassName'); has 'context_stack' => ( metaclass => 'Collection::Array', is => 'rw', - isa => 'ArrayRef[Tree::Transform::Context]', + isa => 'ArrayRef[Tree::Transform::XSLTish::Context]', default => sub { [] }, provides => { last => 'context', @@ -47,9 +47,9 @@ sub apply_rules { @nodes=$self->it->xpath_get_child_nodes(); }; - my $guard=Tree::Transform::ContextGuard->new + my $guard=Tree::Transform::XSLTish::ContextGuard->new ($self, - Tree::Transform::Context->new(node_list=>\@nodes) + Tree::Transform::XSLTish::Context->new(node_list=>\@nodes) ); my @ret; @@ -85,7 +85,7 @@ sub call_rule { sub find_rule { my ($self,$context)=@_; - for my $pack (Tree::Transform::Utils::_get_inheritance + for my $pack (Tree::Transform::XSLTish::Utils::_get_inheritance ($self->rules_package)) { my $ret=$self->find_rule_in_package($pack,$context); return $ret if $ret; @@ -97,7 +97,7 @@ sub find_rule { sub find_rule_by_name { my ($self,$name,$context)=@_; - for my $pack (Tree::Transform::Utils::_get_inheritance + for my $pack (Tree::Transform::XSLTish::Utils::_get_inheritance ($self->rules_package)) { my $ret=$self->find_rule_by_name_in_package($pack,$name,$context); return $ret if $ret; @@ -111,7 +111,7 @@ sub find_rule_in_package { $context||=$self->context; - my $store=Tree::Transform::Utils::_rules_store($package); + my $store=Tree::Transform::XSLTish::Utils::_rules_store($package); my $rules=$store->{by_match}; @@ -133,7 +133,7 @@ sub find_rule_by_name_in_package { $context||=$self->context; - my $store=Tree::Transform::Utils::_rules_store($package); + my $store=Tree::Transform::XSLTish::Utils::_rules_store($package); my $rules=$store->{by_name}; @@ -170,7 +170,7 @@ sub rule_matches { __PACKAGE__->meta->make_immutable;no Moose; -package Tree::Transform::ContextGuard; +package Tree::Transform::XSLTish::ContextGuard; sub new { my ($class,$trans,$context)=@_; diff --git a/lib/Tree/Transform/XSLTish/Utils.pm b/lib/Tree/Transform/XSLTish/Utils.pm index cdc58f7..11a25cb 100644 --- a/lib/Tree/Transform/XSLTish/Utils.pm +++ b/lib/Tree/Transform/XSLTish/Utils.pm @@ -1,4 +1,4 @@ -package Tree::Transform::Utils; +package Tree::Transform::XSLTish::Utils; use strict; use warnings; use Class::MOP; diff --git a/t/01-basic.t b/t/01-basic.t index 305b67b..7c622e8 100644 --- a/t/01-basic.t +++ b/t/01-basic.t @@ -1,6 +1,6 @@ #!perl package BasicTransform;{ - use Tree::Transform; + use Tree::Transform::XSLTish; use strict; use warnings; @@ -15,7 +15,7 @@ package BasicTransform;{ } package OtherTransform;{ - use Tree::Transform; + use Tree::Transform::XSLTish; use strict; use warnings; diff --git a/t/02-inherit.t b/t/02-inherit.t index 3b0f65a..1b1b90a 100644 --- a/t/02-inherit.t +++ b/t/02-inherit.t @@ -1,6 +1,6 @@ #!perl package TransformA;{ - use Tree::Transform; + use Tree::Transform::XSLTish; use strict; use warnings; @@ -14,7 +14,7 @@ package TransformA;{ package TransformB;{ use base 'TransformA'; - use Tree::Transform; + use Tree::Transform::XSLTish; use strict; use warnings; diff --git a/t/03-byname.t b/t/03-byname.t index 8b67b65..3c801fa 100644 --- a/t/03-byname.t +++ b/t/03-byname.t @@ -1,6 +1,6 @@ #!perl package NameTransform;{ - use Tree::Transform; + use Tree::Transform::XSLTish; use strict; use warnings; diff --git a/t/04-errors.t b/t/04-errors.t index 5333303..9e2903a 100644 --- a/t/04-errors.t +++ b/t/04-errors.t @@ -13,7 +13,7 @@ $tree->new_daughter->name("coso$_") for 1..5; warning_like { eval <<'PACK' } [qr/duplicate rule name/i],'Name collision'; package BadTransform;{ - use Tree::Transform; + use Tree::Transform::XSLTish; use strict; use warnings; -- cgit v1.2.3