[Jifty-commit] jifty branch, master, updated. 1.10518-104-g62f32c9

[Jifty commits]

The branch, master has been updated
       via  62f32c9fc64f0be7fee257dec0ef2dcbc8a4a5fc (commit)
       via  b6a4c4bed58dfba2d623657eb8b7c07ba30ed4d7 (commit)
       via  1d916f19e13fa5eca337f7a712cd7696d48c9891 (commit)
      from  3825ccfe10c6259024f40361a4a7fee18c1e6ba6 (commit)

Summary of changes:
 lib/Jifty/Plugin/REST/Dispatcher.pm      | 10 +++++-----
 share/web/templates/index.html           |  2 +-
 t/99-pod-spelling.t                      |  2 +-
 t/TestApp/share/web/templates/index.html |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

- Log -----------------------------------------------------------------
commit 1d916f19e13fa5eca337f7a712cd7696d48c9891
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sun Feb 17 18:16:32 2013 -0500

    Move unescape to being an internal method

diff --git a/lib/Jifty/Plugin/REST/Dispatcher.pm b/lib/Jifty/Plugin/REST/Dispatcher.pm
index 8c869d7..155e46d 100644
--- a/lib/Jifty/Plugin/REST/Dispatcher.pm
+++ b/lib/Jifty/Plugin/REST/Dispatcher.pm
@@ -488,7 +488,7 @@ sub _resolve {
     return $hit;
 }
 
-sub unescape {
+sub _unescape {
     return map { Jifty::I18N->maybe_decode_utf8( URI::Escape::uri_unescape($_) ) } @_;
 }
 
@@ -570,7 +570,7 @@ Returns a list of items in MODELCLASS sorted by COLUMNNAME, with only COLUMNNAME
 
 sub list_model_items {
     # Normalize model name - fun!
-    my ( $model, $column ) = ( model($1), unescape($2) );
+    my ( $model, $column ) = ( model($1), _unescape($2) );
     my $col = $model->new->collection_class->new;
     $col->unlimit;
 
@@ -595,7 +595,7 @@ Returns 404 if it doesn't exist.
 =cut
 
 sub show_item_field {
-    my ( $model, $column, $key, $field ) = ( model($1), unescape($2, $3, $4) );
+    my ( $model, $column, $key, $field ) = ( model($1), _unescape($2, $3, $4) );
     my $rec = $model->new;
     $rec->load_by_cols( $column => $key );
     $rec->id          or abort(404);
@@ -617,7 +617,7 @@ Returns 404 if it doesn't exist.
 =cut
 
 sub show_item {
-    my ($model, $column, $key) = (model($1), unescape($2, $3));
+    my ($model, $column, $key) = (model($1), _unescape($2, $3));
     my $rec = $model->new;
 
     # Check that the field is actually a column
@@ -665,7 +665,7 @@ Order by the given column, descending.
 sub search_items {
     my ($model, $fragment) = (model($1), $2);
     my @pieces = grep {length} split '/', $fragment;
-    my $ret = ['search', $model, unescape(@pieces)];
+    my $ret = ['search', $model, _unescape(@pieces)];
 
     # limit to the key => value pairs they gave us
     my $collection = eval { $model->collection_class->new }

commit b6a4c4bed58dfba2d623657eb8b7c07ba30ed4d7
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sun Nov 4 23:38:20 2012 -0500

    Tests now require width and height on images; placate them

diff --git a/share/web/templates/index.html b/share/web/templates/index.html
index 31464a5..27e1042 100644
--- a/share/web/templates/index.html
+++ b/share/web/templates/index.html
@@ -1,4 +1,4 @@
 <&|/_elements/wrapper, title => _('Welcome to your new Jifty application') &>
-<img src="<% Jifty->web->static("images/pony.jpg") %>"
+<img src="<% Jifty->web->static("images/pony.jpg") %>" width="640" height="422"
      alt="<%_('You said you wanted a pony. (Source %1)','http://hdl.loc.gov/loc.pnp/cph.3c13461')%>" />
 </&>
diff --git a/t/TestApp/share/web/templates/index.html b/t/TestApp/share/web/templates/index.html
index 618fa99..a33fbdc 100644
--- a/t/TestApp/share/web/templates/index.html
+++ b/t/TestApp/share/web/templates/index.html
@@ -1,4 +1,4 @@
 <&|/_elements/wrapper, title => 'Jifty Test Application' &>
-<img src="/images/pony.jpg" alt="A Pony"/>
+<img src="/images/pony.jpg" width="640" height="422" alt="A Pony"/>
 This is content
 </&>

commit 62f32c9fc64f0be7fee257dec0ef2dcbc8a4a5fc
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Sun Nov 4 23:45:57 2012 -0500

    Make the POD spelling test happy

diff --git a/t/99-pod-spelling.t b/t/99-pod-spelling.t
index 2b439ed..b54addc 100644
--- a/t/99-pod-spelling.t
+++ b/t/99-pod-spelling.t
@@ -379,4 +379,4 @@ validationaction
 pushfrag
 Closs
 mis
-
+CDN

-----------------------------------------------------------------------