X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FHTML%2FZoom.pm;h=1af6a0b9413614d16dd3f7691c0aea267f8cac7b;hb=2d0662c077bfd275682acfad25d407e0724ec34f;hp=fd7602e0f20b97cf86e0fba40d2d061e05fa6cae;hpb=655965b3451d9a284a9601daaa16a3341a45fb8b;p=catagits%2FHTML-Zoom.git diff --git a/lib/HTML/Zoom.pm b/lib/HTML/Zoom.pm index fd7602e..1af6a0b 100644 --- a/lib/HTML/Zoom.pm +++ b/lib/HTML/Zoom.pm @@ -1,12 +1,16 @@ package HTML::Zoom; -use strict; -use warnings FATAL => 'all'; +use strictures 1; use HTML::Zoom::ZConfig; -use HTML::Zoom::MatchWithoutFilter; use HTML::Zoom::ReadFH; use HTML::Zoom::Transform; +use HTML::Zoom::TransformBuilder; +use Scalar::Util (); + +our $VERSION = '0.009006'; + +$VERSION = eval $VERSION; sub new { my ($class, $args) = @_; @@ -25,13 +29,18 @@ sub _with { bless({ %{$_[0]}, %{$_[1]} }, ref($_[0])); } -sub from_html { +sub from_events { my $self = shift->_self_or_new; $self->_with({ - initial_events => $self->zconfig->parser->html_to_events($_[0]) + initial_events => shift, }); } +sub from_html { + my $self = shift->_self_or_new; + $self->from_events($self->zconfig->parser->html_to_events($_[0])) +} + sub from_file { my $self = shift->_self_or_new; my $filename = shift; @@ -44,14 +53,7 @@ sub to_stream { unless $self->{initial_events}; my $sutils = $self->zconfig->stream_utils; my $stream = $sutils->stream_from_array(@{$self->{initial_events}}); - foreach my $filter_spec (@{$self->{filters}||[]}) { - $stream = HTML::Zoom::Transform->new({ - selector => $filter_spec->[0], - filters => [ $filter_spec->[1] ], - zconfig => $self->zconfig, - })->apply_to_stream($stream); - #$stream = $sutils->wrap_with_filter($stream, @{$filter_spec}); - } + $stream = $_->apply_to_stream($stream) for @{$self->{transforms}||[]}; $stream } @@ -59,9 +61,14 @@ sub to_fh { HTML::Zoom::ReadFH->from_zoom(shift); } +sub to_events { + my $self = shift; + [ $self->zconfig->stream_utils->stream_to_array($self->to_stream) ]; +} + sub run { my $self = shift; - $self->zconfig->stream_utils->stream_to_array($self->to_stream); + $self->to_events; return } @@ -71,6 +78,17 @@ sub apply { $self->$code; } +sub apply_if { + my ($self, $predicate, $code) = @_; + if($predicate) { + local $_ = $self; + $self->$code; + } + else { + $self; + } +} + sub to_html { my $self = shift; $self->zconfig->producer->html_from_stream($self->to_stream); @@ -81,22 +99,37 @@ sub memoize { ref($self)->new($self)->from_html($self->to_html); } -sub with_filter { +sub with_transform { my $self = shift->_self_or_new; - my ($selector, $filter) = @_; - my $match = $self->parse_selector($selector); + my ($transform) = @_; $self->_with({ - filters => [ @{$self->{filters}||[]}, [ $match, $filter ] ] + transforms => [ + @{$self->{transforms}||[]}, + $transform + ] }); } + +sub with_filter { + my $self = shift->_self_or_new; + my ($selector, $filter) = @_; + $self->with_transform( + HTML::Zoom::Transform->new({ + zconfig => $self->zconfig, + selector => $selector, + filters => [ $filter ] + }) + ); +} sub select { my $self = shift->_self_or_new; my ($selector) = @_; - my $match = $self->parse_selector($selector); - return HTML::Zoom::MatchWithoutFilter->construct( - $self, $match, $self->zconfig->filter_builder, - ); + return HTML::Zoom::TransformBuilder->new({ + zconfig => $self->zconfig, + selector => $selector, + proto => $self + }); } # There's a bug waiting to happen here: if you do something like @@ -112,17 +145,37 @@ sub select { sub then { my $self = shift; - die "Can't call ->then without a previous filter" - unless $self->{filters}; - $self->select($self->{filters}->[-1][0]); + die "Can't call ->then without a previous transform" + unless $self->{transforms}; + $self->select($self->{transforms}->[-1]->selector); } -sub parse_selector { - my ($self, $selector) = @_; - return $selector if ref($selector); # already a match sub - $self->zconfig->selector_parser->parse_selector($selector); +sub AUTOLOAD { + my ($self, $selector, @args) = @_; + my $sel = $self->select($selector); + my $meth = our $AUTOLOAD; + $meth =~ s/.*:://; + if (ref($selector) eq 'HASH') { + my $ret = $self; + $ret = $ret->_do($_, $meth, @{$selector->{$_}}) for keys %$selector; + $ret; + } else { + $self->_do($selector, $meth, @args); + } } +sub _do { + my ($self, $selector, $meth, @args) = @_; + my $sel = $self->select($selector); + if( my $cr = $sel->_zconfig->filter_builder->can($meth)) { + return $sel->$meth(@args); + } else { + die "We can't do $meth on ->select('$selector')"; + } +} + +sub DESTROY {} + 1; =head1 NAME @@ -160,13 +213,14 @@ HTML::Zoom - selector based streaming template engine $_->select('.name')->replace_content('Matt') ->select('.age')->replace_content('26') }, + # alternate form sub { - $_->select('.name')->replace_content('Mark') - ->select('.age')->replace_content('0x29') + $_->replace_content({'.name' => ['Mark'],'.age' => ['0x29'] }) }, + #alternate alternate form sub { - $_->select('.name')->replace_content('Epitaph') - ->select('.age')->replace_content('') + $_->replace_content('.name' => 'Epitaph') + ->replace_content('.age' => '') }, ], { repeat_between => '.between' } @@ -286,17 +340,15 @@ cleanly: map { my $field = $_; sub { $_->select('label') - ->add_attribute( for => $field->{id} ) + ->add_to_attribute( for => $field->{id} ) ->then ->replace_content( $field->{label} ) - - ->select('input') - ->add_attribute( name => $field->{name} ) - ->then - ->add_attribute( type => $field->{type} ) - ->then - ->add_attribute( value => $field->{value} ) - + ->add_to_attribute( + input => { + name => $field->{name}, + type => $field->{type}, + value => $field->{value} + }) } } @fields ]); @@ -591,6 +643,12 @@ zoom instance with that as the source HTML to be transformed. Convenience method - slurps the contents of $file and calls from_html with it. +=head2 from_events + + my $zoom = HTML::Zoom->from_events($evt); + +Create a new Zoom object from collected events + =head2 to_stream my $stream = $zoom->to_stream; @@ -639,6 +697,14 @@ sugar, the following is entirely equivalent: my $z2 = $sub->($z1); +=head2 apply_if + + my $z2 = $z1->apply_if($cond, sub { + $_->select('div')->replace_content('I AM A DIV!') }) + }); + +->apply but will only run the tranform if $cond is true + =head2 to_html my $html = $zoom->to_html; @@ -676,7 +742,7 @@ In normal usage, you probably don't need to call this yourself. my $z2 = $z1->select('div')->replace_content('I AM A DIV!'); -Returns an intermediary object of the class L +Returns an intermediary object of the class L on which methods of your L object can be called. In normal usage you should generally always put the pair of method calls @@ -684,21 +750,56 @@ together; the intermediary object isn't designed or expected to stick around. =head2 then - my $z2 = $z1->select('div')->add_attribute(class => 'spoon') + my $z2 = $z1->select('div')->add_to_attribute(class => 'spoon') ->then ->replace_content('I AM A DIV!'); Re-runs the previous select to allow you to chain actions together on the same selector. -=head2 parse_selector +=head1 AUTOLOAD METHODS - my $matcher = $zoom->parse_selector('div'); +L AUTOLOADS methods against L so that you can reduce a +certain amount of boilerplate typing. This allows you to replace: -Used by L and L to invoke the current -L object to create a matcher object (currently -a coderef but this is an implementation detail) for that selector. + $z->select('div')->replace_content("Hello World"); + +With: -In normal usage, you probably don't need to call this yourself. + $z->replace_content(div => "Hello World"); + +Besides saving a few keys per invocations, you may feel this looks neater +in your code and increases understanding. + +=head1 AUTHOR + +mst - Matt S. Trout (cpan:MSTROUT) + +=head1 CONTRIBUTORS + +Oliver Charles + +Jakub Nareski + +Simon Elliott + +Joe Highton + +John Napiorkowski + +Robert Buels + +David Dorward + +=head1 COPYRIGHT + +Copyright (c) 2010-2011 the HTML::Zoom L and L +as listed above. + +=head1 LICENSE + +This library is free software, you can redistribute it and/or modify +it under the same terms as Perl itself. =cut +