add several new scalar methods and document them

diff --git a/site/cgi-bin/modules/Squirrel/Template/Expr/WrapScalar.pm b/site/cgi-bin/modules/Squirrel/Template/Expr/WrapScalar.pm
index 8d3c52147ff8fa26f9ed3660540552efedd410bf..b31fcf9cb500b5d741602541e8a21064f73f3f0d 100644 (file)
--- a/site/cgi-bin/modules/Squirrel/Template/Expr/WrapScalar.pm
+++ b/site/cgi-bin/modules/Squirrel/Template/Expr/WrapScalar.pm
@@ -2,7 +2,7 @@ package Squirrel::Template::Expr::WrapScalar;
 use strict;
 use base qw(Squirrel::Template::Expr::WrapBase);
 
-our $VERSION = "1.003";
+our $VERSION = "1.004";
 
 sub _do_length  {
   my ($self, $args) = @_;
@@ -44,7 +44,7 @@ sub _do_trim {
   my ($self, $args) = @_;
 
   @$args == 0
-    or die [ error => "scalar.defined takes no parameters" ];
+    or die [ error => "scalar.trim takes no parameters" ];
 
   my $copy = $self->[0];
   $copy =~ s/\A\s+//;
@@ -82,6 +82,102 @@ sub _do_evaltag {
   return $self->[1]->perform($self->[2], $func, $tag_args, $self->[0]);
 }
 
+sub _do_quotemeta {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.quotemeta takes no parameters" ];
+
+  return quotemeta($self->[0]);
+}
+
+sub _do_contains {
+  my ($self, $args) = @_;
+
+  @$args == 1
+    or die [ error => "scalar.contains requires one parameter" ];
+
+  return index($self->[0], $args->[0], @$args > 1 ? $args->[1] : 0) >= 0;
+}
+
+sub _do_index {
+  my ($self, $args) = @_;
+
+  @$args == 1 || @$args == 2
+    or die [ error => "scalar.index requires one or two parameters" ];
+
+  return index($self->[0], $args->[0], @$args > 1 ? $args->[1] : 0);
+}
+
+sub _do_rindex {
+  my ($self, $args) = @_;
+
+  @$args == 1 || @$args == 2
+    or die [ error => "scalar.rindex requires one or two parameters" ];
+
+  return @$args > 1
+    ? rindex($self->[0], $args->[0], $args->[1])
+      :  rindex($self->[0], $args->[0]);
+}
+
+sub _do_chr {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.chr takes no parameters" ];
+
+  return chr($self->[0]);
+}
+
+sub _do_int {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.int takes no parameters" ];
+
+  return int($self->[0]);
+}
+
+sub _do_rand {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.rand takes no parameters" ];
+
+  return rand($self->[0]);
+}
+
+sub _do_abs {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.abs takes no parameters" ];
+
+  return abs($self->[0]);
+}
+
+sub _do_floor {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.floor takes no parameters" ];
+
+  require POSIX;
+
+  return POSIX::floor($self->[0]);
+}
+
+sub _do_ceil {
+  my ($self, $args) = @_;
+
+  @$args == 0
+    or die [ error => "scalar.ceil takes no parameters" ];
+
+  require POSIX;
+
+  return POSIX::ceil($self->[0]);
+}
+
 sub call {
   my ($self, $method, $args) = @_;
 
@@ -110,6 +206,18 @@ Squirrel::Template::Expr::WrapScalar - provide methods for scalars
   split = somescalar.split(":", count);
   formatted = somescalar.format("%05d");
   value = somescalar.evaltag
+  quoted = somescalar.quotemeta
+  contains = somescalar.contains("foo")
+  pos = somescalar.index("foo")
+  pos = somescalar.index("foo", 5)
+  pos = somescalar.rindex("foo")
+  pos = somescalar.rindex("foo", 5)
+  char = somenumber.chr
+  int = somenumber.int
+  random = somenumber.rand
+  abs = (-10).abs  # 10
+  floor = (-10.1).floor # -11
+  ceil = (-10.1).ceil # -10
 
 =head1 DESCRIPTION
 
@@ -153,6 +261,72 @@ negative C<count> returns all elements.
 Evalulate the value of string as if processed as a tag.  The string
 must not include the surrounding <: ... :>.
 
+=item quotemeta
+
+Return the string with regular expression metacharacters quoted with
+C<\>.
+
+=item contains(substring)
+
+Returns true if the subject contains the given substring.
+
+=item index(substring)
+
+=item index(substring, start)
+
+Return the position of C<substring> within the subject, searching
+forward from C<start> or from the beginning of the string.  Returns -1
+if C<substring> isn't found.
+
+=item rindex(substring)
+
+=item rindex(substring, start)
+
+Return the position of C<substring> within the subject, searching
+backward from C<start> or from the end of the string.  Returns -1 if
+C<substring> isn't found.
+
+=item chr
+
+Convert a character code into a character.
+
+  (65).chr # "A"
+
+=item int
+
+Convert a number to an integer.
+
+  (10.1).int # 10
+
+=item rand
+
+Produce a floating point random number greater or equal to 0 and less
+than the subject.
+
+  (10).rand # 0 <= result < 10
+
+=item abs
+
+Return the absolute value of the subject.
+
+=item floor
+
+Return the highest integer less than or equal to the subject
+
+  (10).floor # 10
+  (10.1).floor  # 10
+  (-10.1).floor # -11
+
+=item ceil
+
+Return the lowest integer greater than or equal to the subject.
+
+  (10).ceil # 10
+  (10.1).ceil # 11
+  (-10.1).ceil # -10
+
+=back
+
 =head1 SEE ALSO
 
 L<Squirrel::Template::Expr>, L<Squirrel::Template>

diff --git a/t/020-templater/040-original.t b/t/020-templater/040-original.t
index 8345449046f473d7d14ccc90dc3b0ec826d267a0..2cd7ec9ebe0f5c74692379a2549ab89c1dadd515 100644 (file)
--- a/t/020-templater/040-original.t
+++ b/t/020-templater/040-original.t
@@ -1,7 +1,7 @@
 #!perl -w
 # Basic tests for Squirrel::Template
 use strict;
-use Test::More tests => 113;
+use Test::More tests => 154;
 
 sub template_test($$$$;$$);
 
@@ -465,6 +465,49 @@ OUT
      [ '[ "abc" =~ /(.)(.)/ ][1]', "b" ],
      [ '{ "a": 11, "b": 12, "c": 20 }["b"]', 12 ],
      [ 'testclass.foo', "[TestClass.foo]" ],
+
+     # WrapScalar
+     [ '"foo".length', 3 ],
+     [ '"foo".length(1)', "* scalar.length takes no parameters *" ],
+     [ '"foo".upper', "FOO" ],
+     [ '"foo".upper(1)', "* scalar.upper takes no parameters *" ],
+     [ '"Foo".lower', "foo" ],
+     [ '"Foo".lower(1)', "* scalar.lower takes no parameters *" ],
+     [ '"foo".defined', '1' ],
+     [ '"foo".defined(1)', '* scalar.defined takes no parameters *' ],
+     [ '"foo".trim', "foo" ],
+     [ '" a b ".trim', "a b" ],
+     [ '" a b ".trim(1)', "* scalar.trim takes no parameters *" ],
+     [ '"a b".split.join("|")', "a|b" ],
+     [ '"a,b,c".split(",").join("|")', 'a|b|c' ],
+     [ '"a,b,c".split(",",2).join("|")', 'a|b,c' ],
+     [ '(10.1).format("%.2f")', "10.10" ],
+     [ '(10.1).format("%.2f", 1)', "* scalar.format takes one parameter *" ],
+     [ '"str".evaltag', 'ABC' ],
+     [ '"cat [str] [str2]".evaltag', 'ABCDEF' ],
+     [ '"abc*".quotemeta', "abc\\*" ],
+     [ '"abc".quotemeta(1)', "* scalar.quotemeta takes no parameters *" ],
+     [ '"abcdef".contains("cde")', 1 ],
+     [ '"abcdef".contains("cdf")', "" ],
+     [ '"abcdef".contains("cdf",1)', "* scalar.contains requires one parameter *" ],
+     [ '"abcdefabcdef".index("cde")', 2 ],
+     [ '"abcdefabcdef".index("cdf")', -1 ],
+     [ '"abcdefabcdef".index("cde", 5)', 8 ],
+     [ '"abc".index("ab",1,2)', '* scalar.index requires one or two parameters *' ],
+     [ '"abcdefabcdef".rindex("cde")', 8 ],
+     [ '"abcdefabcdef".rindex("cde", 7)', 2 ],
+     [ '"abcdefabcdef".rindex("cde", 7, 3)', '* scalar.rindex requires one or two parameters *' ],
+     [ "(65).chr", "A" ],
+     [ "(10.1).int", 10 ],
+     [ "(10).int", 10 ],
+     [ "(10).rand < 10 and (10).rand >= 0", 1 ],
+     [ "(-10).abs", "10" ],
+     [ '(10).floor', 10 ],
+     [ '(10.1).floor', 10 ],
+     [ '(-10.1).floor', -11 ],
+     [ '(10).ceil', 10 ],
+     [ '(10.1).ceil', 11 ],
+     [ '(-10.1).ceil', -10 ],
     );
   for my $test (@expr_tests) {
     my ($expr, $result) = @$test;

diff --git a/t/data/known_pod_issues.txt b/t/data/known_pod_issues.txt
index bf0ed6fc6187e064d361566bcbfd43fd5f3b4dea..c2874257bbf53364bf1f20033ca6e3b7d4ad28d3 100644 (file)
--- a/t/data/known_pod_issues.txt
+++ b/t/data/known_pod_issues.txt
@@ -98,7 +98,6 @@ site/cgi-bin/modules/Squirrel/Table.pm        unresolved internal link '_where_clause'
 site/cgi-bin/modules/Squirrel/Template.pm      Verbatim paragraph in NAME section      1
 site/cgi-bin/modules/Squirrel/Template/Expr.pm multiple occurrence of link target 'Methods'    1
 site/cgi-bin/modules/Squirrel/Template/Expr/WrapScalar.pm      =back without previous =over    1
-site/cgi-bin/modules/Squirrel/Template/Expr/WrapScalar.pm      =over on line 121 without closing =back (at head1)      1
 site/cgi-bin/search.pl Verbatim paragraph in NAME section      1
 site/cgi-bin/shop.pl   multiple occurrence of link target '%<format>'  1
 site/cgi-bin/shop.pl   multiple occurrence of link target 'gst'        1