[Jifty-commit] r3836 - in Template-Declare: lib/HTML lib/Template/Declare lib/XUL t

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Aug 10 05:06:35 EDT 2007


Author: agentz
Date: Fri Aug 10 05:06:02 2007
New Revision: 3836

Added:
   Template-Declare/lib/Template/Declare/TagSet/
   Template-Declare/lib/Template/Declare/TagSet/HTML.pm
      - copied, changed from r3834, /Template-Declare/lib/HTML/TagSet.pm
   Template-Declare/lib/Template/Declare/TagSet/XUL.pm
      - copied, changed from r3831, /Template-Declare/lib/XUL/TagSet.pm
Removed:
   Template-Declare/lib/HTML/
   Template-Declare/lib/XUL/
Modified:
   Template-Declare/lib/Template/Declare/TagSet.pm
   Template-Declare/lib/Template/Declare/Tags.pm
   Template-Declare/t/alternative.t
   Template-Declare/t/tagset_html.t
   Template-Declare/t/tagset_mix.t
   Template-Declare/t/tagset_xul.t

Log:
TD - TagSet::HTML and TagSet::XUL are not renamed to Template::Declare::TagSet::HTML and Template::Declare::TagSet::XUL, respectively. and we can now say 'use Template::Declare::Tags qw/ HTML XUL /;'

Modified: Template-Declare/lib/Template/Declare/TagSet.pm
==============================================================================
--- Template-Declare/lib/Template/Declare/TagSet.pm	(original)
+++ Template-Declare/lib/Template/Declare/TagSet.pm	Fri Aug 10 05:06:02 2007
@@ -74,7 +74,7 @@
 
 But there's some cases where you want to override the
 deafault implementation. For example,
-C<< HTML::TagSet->can_combine_empty_tags('img') >> returns true (1) since C<< <img src="..." /> >> is always
+C<< Template::Declare::TagSet::HTML->can_combine_empty_tags('img') >> returns true (1) since C<< <img src="..." /> >> is always
 required for HTML pages.
 
 =back
@@ -85,6 +85,6 @@
 
 =head1 SEE ALSO
 
-L<HTML::TagSet>, L<XUL::TagSet>, L<Template::Declare::Tags>,
+L<Template::Declare::TagSet::HTML>, L<Template::Declare::TagSet::XUL>, L<Template::Declare::Tags>,
 L<Template::Declare>.
 

Copied: Template-Declare/lib/Template/Declare/TagSet/HTML.pm (from r3834, /Template-Declare/lib/HTML/TagSet.pm)
==============================================================================
--- /Template-Declare/lib/HTML/TagSet.pm	(original)
+++ Template-Declare/lib/Template/Declare/TagSet/HTML.pm	Fri Aug 10 05:06:02 2007
@@ -1,4 +1,4 @@
-package HTML::TagSet;
+package Template::Declare::TagSet::HTML;
 
 use strict;
 use warnings;
@@ -37,33 +37,34 @@
 
 =head1 NAME
 
-HTML::TagSet - Tag set for HTML
+Template::Declare::TagSet::HTML - Tag set for HTML
 
 =head1 SYNOPSIS
 
-    use HTML::TagSet;
-    my $list = HTML::TagSet->get_tag_list();
+    use Template::Declare::TagSet::HTML;
+    my $tagset = 'Template::Declare::TagSet::HTML';
+    my $list = $tagset->get_tag_list();
     print "@$list";
 
-    my $altern = HTML::TagSet->get_alternate_spelling('tr');
+    my $altern = $tagset->get_alternate_spelling('tr');
     if ( defined $altern ) {
         print $altern;
     }
 
-    if ( HTML::TagSet->can_combine_empty_tags('img') ) {
+    if ( $tagset->can_combine_empty_tags('img') ) {
         print "<img src='blah.gif' />";
     }
 
     # normal use
     package MyApp::Templates;
-    use Template::Declare::Tags qw/ HTML::TagSet /;
+    use Template::Declare::Tags 'HTML';
     use base 'Template::Declare';
     # ...
 
 
 =head1 INHERITANCE
 
-    HTML::TagSet
+    Template::Declare::TagSet::HTML
         isa Template::Declare::TagSet
 
 =head1 METHODS
@@ -74,7 +75,7 @@
 
 Returns an array ref for the tag names.
 
-Out of the box, C<HTML::TagSet> returns the
+Out of the box, C<Template::Declare::TagSet::HTML> returns the
 C<:html2 :html3 :html4 :netscape> and C<:form>
 tagsets from CGI.pm.
 
@@ -101,5 +102,5 @@
 
 =head1 SEE ALSO
 
-L<Template::Declare::TagSet>, L<XUL::TagSet>, L<Template::Declare::Tags>, L<Template::Declare>.
+L<Template::Declare::TagSet>, L<Template::Declare::TagSet::XUL>, L<Template::Declare::Tags>, L<Template::Declare>.
 

Copied: Template-Declare/lib/Template/Declare/TagSet/XUL.pm (from r3831, /Template-Declare/lib/XUL/TagSet.pm)
==============================================================================
--- /Template-Declare/lib/XUL/TagSet.pm	(original)
+++ Template-Declare/lib/Template/Declare/TagSet/XUL.pm	Fri Aug 10 05:06:02 2007
@@ -1,4 +1,4 @@
-package XUL::TagSet;
+package Template::Declare::TagSet::XUL;
 
 use strict;
 use warnings;
@@ -56,32 +56,33 @@
 
 =head1 NAME
 
-XUL::TagSet - Tag set for XUL
+Template::Declare::TagSet::XUL - Tag set for XUL
 
 =head1 SYNOPSIS
 
-    use XUL::TagSet;
-    my $list = XUL::TagSet->get_tag_list();
+    use Template::Declare::TagSet::XUL;
+    my $tagset = 'Template::Declare::TagSet::XUL';
+    my $list = $tagset->get_tag_list();
     print "@$list";
 
-    my $altern = XUL::TagSet->get_alternate_spelling('template');
+    my $altern = $tagset->get_alternate_spelling('template');
     if ( defined $altern ) {
         print $altern;
     }
 
-    if ( XUL::TagSet->can_combine_empty_tags('button') ) {
+    if ( $tagset->can_combine_empty_tags('button') ) {
         print "<button label='OK' />";
     }
 
     # normal use
     package MyApp::Templates;
-    use Template::Declare::Tags qw/ XUL::TagSet /;
+    use Template::Declare::Tags qw/ XUL /;
     use base 'Template::Declare';
     # ...
 
 =head1 INHERITANCE
 
-    XUL::TagSet
+   Template::Declare::TagSet::XUL
         isa Template::Declare::TagSet
 
 =head1 METHODS
@@ -113,5 +114,5 @@
 
 =head1 SEE ALSO
 
-L<Template::Declare::TagSet>, L<HTML::TagSet>, L<Template::Declare::Tags>, L<Template::Declare>.
+L<Template::Declare::TagSet>, L<Template::Declare::TagSet::HTML>, L<Template::Declare::Tags>, L<Template::Declare>.
 

Modified: Template-Declare/lib/Template/Declare/Tags.pm
==============================================================================
--- Template-Declare/lib/Template/Declare/Tags.pm	(original)
+++ Template-Declare/lib/Template/Declare/Tags.pm	Fri Aug 10 05:06:02 2007
@@ -28,9 +28,12 @@
     my $self = shift;
     my @set_modules;
     if (!@_) {
-        push @_, 'HTML::TagSet';
+        push @_, 'HTML';
     }
-    for my $module (@_) {
+    while (@_) {
+        my $lang = shift;
+        my $module = "Template::Declare::TagSet::$lang";
+
         eval "use $module";
         if ($@) {
             warn $@;
@@ -64,7 +67,7 @@
 
     package MyApp::Templates;
     use base 'Template::Declare';
-    use Template::Declare::Tags qw/ HTML::TagSet XUL::TagSet /;
+    use Template::Declare::Tags qw/ HTML XUL /;
 
 =head1 DESCRIPTION
 
@@ -74,18 +77,18 @@
 You can specify the tag sets used by providing a list of
 module list in the C<use> statement:
 
-    use Template::Declare::Tags qw/ HTML::TagSet XUL::TagSet/;
+    use Template::Declare::Tags qw/ HTML XUL /;
 
-By default, it uses the tag set provided by L<HTML::TagSet>. So
+By default, it uses the tag set provided by L<Template::Declare::TagSet::HTML>. So
 
     use Template::Declare::Tags;
 
 is equivalent to
 
-    use Template::Declare::Tags 'HTML::TagSet';
+    use Template::Declare::Tags 'HTML';
 
-Currently L<Template::Declare> bundles L<HTML::TagSet>
-for HTML tags and L<XUL::TagSet> for XUL tags. You can
+Currently L<Template::Declare> bundles L<Template::Declare::TagSet::HTML>
+for HTML tags and L<Template::Declare::TagSet::XUL> for XUL tags. You can
 certainly specify your own tag set classes, as long
 as they subclass L<Template::Declare::TagSet> and implement
 the corresponding methods (e.g. C<get_tag_list>).
@@ -645,7 +648,7 @@
 
 =head1 SEE ALSO
 
-L<HTML::TagSet>, L<XUL::TagSet>, L<Template::Declare>.
+L<Template::Declare::TagSet::HTML>, L<Template::Declare::TagSet::XUL>, L<Template::Declare>.
 
 =head1 AUTHOR
 

Modified: Template-Declare/t/alternative.t
==============================================================================
--- Template-Declare/t/alternative.t	(original)
+++ Template-Declare/t/alternative.t	Fri Aug 10 05:06:02 2007
@@ -4,7 +4,7 @@
 
 package MyApp::Templates;
 
-use Template::Declare::Tags 'HTML::TagSet';
+use Template::Declare::Tags 'HTML';
 
 eval "td { 'hi' }";
 ::ok $@, 'td is invalid';
@@ -21,7 +21,7 @@
 package MyApp::Templates2;
 
 use base 'Template::Declare';
-use Template::Declare::Tags 'XUL::TagSet';
+use Template::Declare::Tags 'XUL';
 
 template main => sub {
     xul_tempalte {}

Modified: Template-Declare/t/tagset_html.t
==============================================================================
--- Template-Declare/t/tagset_html.t	(original)
+++ Template-Declare/t/tagset_html.t	Fri Aug 10 05:06:02 2007
@@ -4,7 +4,7 @@
 package MyApp::Templates;
 
 use base 'Template::Declare';
-use Template::Declare::Tags qw/ HTML::TagSet /;
+use Template::Declare::Tags qw/ HTML /;
 
 template main => sub {
     table {

Modified: Template-Declare/t/tagset_mix.t
==============================================================================
--- Template-Declare/t/tagset_mix.t	(original)
+++ Template-Declare/t/tagset_mix.t	Fri Aug 10 05:06:02 2007
@@ -4,7 +4,7 @@
 package MyApp::Templates;
 
 use base 'Template::Declare';
-use Template::Declare::Tags qw/ HTML::TagSet XUL::TagSet /;
+use Template::Declare::Tags qw/ HTML XUL /;
 
 template main => sub {
     groupbox {

Modified: Template-Declare/t/tagset_xul.t
==============================================================================
--- Template-Declare/t/tagset_xul.t	(original)
+++ Template-Declare/t/tagset_xul.t	Fri Aug 10 05:06:02 2007
@@ -4,7 +4,7 @@
 package MyApp::Templates;
 
 use base 'Template::Declare';
-use Template::Declare::Tags qw/ XUL::TagSet /;
+use Template::Declare::Tags qw/ XUL /;
 
 template main => sub {
     xml_decl { 'xml', version => '1.0' };


More information about the Jifty-commit mailing list