Merge remote-tracking branch 'robertkrimen/master'

Conflicts:
	MANIFEST
	ToDo

.gitignore

@@ -0,0 +1,8 @@
+tests/tjs/var
+Makefile
+Makefile.old
+Makefile.js
+t/a.js
+t/b.js
+t/check.js
+t?

Changes

@@ -1,3 +1,75 @@
+---
+version: 0.261
+date: Tuesday April 27 09:35:06 PDT 2010
+changes:
+- Fixed rt56956 with test case - DIV operator broken (Agent Zhang)
+
+---
+version: 0.260
+date: Monday April 26 12:03:40 PDT 2010
+
+---
+version: 0.25_2
+date: Saturday April 24 18:48:53 PDT 2010
+changes:
+- Implemented rt4308 - Capture implementation (Tom Molesworth)
+- Added test for rt37570 - List method for lists (fixed in 5eaf340da...)
+
+---
+version: 0.25_1
+date: Thursday April 22 17:58:53 PDT 2010
+changes:
+- Fixed rt53454 with test case - Support rudimentary array range operator
+- Fixed rt53453 with test case - Make Jemplate slice like TT slice
+- Fixed rt53967 with test case - Compiler double-dot path fail
+- Added test case for rt37539 - Intermediate instantiation
+- Added test case for rt37540 - Iterate over empty object
+- Added test case for rt37895 - Inconsistent jemplate version
+
+---
+version: 0.25
+date:    Wednesday April 21 13:44:19 PDT 2010
+changes:
+- release
+
+---
+version: 0.24_4
+date:    Saturday January 09 17:06:40 PST 2010
+changes:
+- added .pairs (VMethod) functionality with tests
+- fixed quoted.t failing test
+
+---
+version: 0.24_3
+date:    Mon Jun 8 2009
+changes:
+- fixed bug, related to empty template body (http://rt.cpan.org/Public/Bug/Display.html?id=37061)
+- fixed bug in Parser.yp, which produced compilation error for macroses
+- fixed "intermediate instantiation" issue (http://rt.cpan.org/Public/Bug/Display.html?id=37539)
+- fixed "iteration over empty object" issue (http://rt.cpan.org/Public/Bug/Display.html?id=37540)
+- added and tested MACRO directive
+- added PRE_PROCESS and POST_PROCESS configuration options
+- added and tested global scope access via GLOBAL modifier (GLOBAL.jQeuery etc)
+- added dummy LOCAL modifier, for symmetry
+- added "init" method for Jemplate singleton
+- added experimental RAW directive (RAW jQuery, equivalent of jQuery = GLOBAL.jQuery)
+
+VMethods:
+- added "list" for lists (http://rt.cpan.org/Public/Bug/Display.html?id=37570)
+- added "item" for hashes
+- fixed "import" for hashes
+
+Test suite:
+- combined back to a single copy
+
+Patches:
+- Integrated patch from RT#37895
+
+version: 0.24_2
+date: Monday June 08 10:37:54 PDT 2009
+changes:
+- Fix to get tests working on MSWin32 (rt23883)
+
 ---
 version: 0.24
 date:    Fri Sep 19 15:09:35 PDT 2008

MANIFEST

@@ -0,0 +1,147 @@
+bin/jemplate
+bin/README
+Changes
+ToDo
+DESIGN
+doc/html/Jemplate.html
+doc/Makefile
+doc/text/Jemplate.text
+examples/ajax/data.json
+examples/ajax/index.html
+examples/ajax/template/body.html
+examples/features/index.html
+examples/features/templates/body.html
+examples/features/templates/footer.html
+examples/features/templates/hacker.html
+examples/features/templates/header.html
+examples/features/templates/wrapper.html
+examples/features/templates/wrapper2.html
+examples/hello/index.html
+examples/hello/templates/hello.html
+examples/index.html
+examples/js/ajax.js
+examples/js/features.js
+examples/js/hello.js
+examples/Makefile
+inc/Module/Install.pm
+inc/Module/Install/Base.pm
+inc/Module/Install/Can.pm
+inc/Module/Install/Fetch.pm
+inc/Module/Install/Include.pm
+inc/Module/Install/Makefile.pm
+inc/Module/Install/Metadata.pm
+inc/Module/Install/TestBase.pm
+inc/Module/Install/Win32.pm
+inc/Module/Install/WriteAll.pm
+inc/Module/Install/Scripts.pm
+inc/Spiffy.pm
+inc/Test/Base.pm
+inc/Test/Base/Filter.pm
+inc/Test/Builder.pm
+inc/Test/Builder/Module.pm
+inc/Test/More.pm
+jemplate
+lib/Jemplate.pm
+lib/Jemplate/Directive.pm
+lib/Jemplate/Grammar.pm
+lib/Jemplate/Parser.pm
+lib/Jemplate/Runtime.pm
+lib/Jemplate/Runtime/Compact.pm
+LICENSE
+Makefile.PL
+MANIFEST			This list of files
+META.yml
+README
+t/a.js
+t/assets/jt/hello
+t/assets/jt/a/.hidden/apple
+t/assets/jt/a/b/c/.hidden
+t/assets/jt/a/b/cherry
+t/b.js
+t/block.t
+t/call.t
+t/check.js
+t/clear.t
+t/for.t
+t/get-set.t
+t/hello.t
+t/if-else.t
+t/if-variations.t
+t/javascript.t
+t/list.t
+t/list/bar/one
+t/list/bar/two
+t/list/foo/one
+t/list/foo/two
+t/list/one
+t/list/three
+t/list/two
+t/macro.t
+t/process.t
+t/quoted.t
+t/runtime.t
+t/stash.t
+t/switch.t
+t/tags.t
+t/test.t
+t/TestJemplate.pm
+t/throw.t
+t/while.t
+t/wrapper.t
+t/pairs.t
+t/9bug/37539-intermediate-instantiation.t
+t/9bug/37540-iterate-over-empty-object.t
+t/9bug/37895-inconsistent-jemplate-version.t
+t/9bug/53967-compiler-double-dot-path-fail.t
+t/9bug/53453-make-Jemplate-slice-like-TT-slice.t
+t/9bug/53454-array-range-operator.t
+t/9bug/37570-list-for-lists.t
+t/9bug/43809-capture-implementation.t
+t/9bug/56965-DIV-operator-broken.t
+tests/Makefile
+tests/README
+tests/bin/daemon
+tests/bin/prepare-var-jt
+tests/bin/pull-jemplates
+tests/bin/render-template
+tests/bin/test-run
+tests/config.yaml
+tests/jemplate2/greeting/english
+tests/jemplate2/greeting/spanish
+tests/jemplate2/greetings
+tests/jemplate2/hello
+tests/js/Subclass.js
+tests/js/Test/Base.js
+tests/js/Test/Builder.js
+tests/js/Test/Harness/Browser.js
+tests/js/Test/Harness.js
+tests/js/Test/Jemplate.js
+tests/js/jemplate_dummy_plugin.js
+tests/js/jquery-1.2.3.js
+tests/old/Makefile
+tests/old/mangler/README
+tests/old/mangler/ctx.tst
+tests/old/mangler/mangle.pl
+tests/old/mangler/test-data.tmpl.tt
+tests/t/basics.t.js
+tests/t/bugs.t.js
+tests/t/default.t.js
+tests/t/directives.t.js
+tests/t/filters.t.js
+tests/t/greetings.t.js
+tests/t/hash.t.js
+tests/t/hello.t.js
+tests/t/join.t.js
+tests/t/list.t.js
+tests/t/localise.t.js
+tests/t/loop.t.js
+tests/t/objects.t.js
+tests/t/plugins.t.js
+tests/t/set.t.js
+tests/t/stash.t.js
+tests/t/string.t.js
+tests/t/test.html
+tests/template/index.html
+tests/template/test.html
+tests/tjs/Makefile
+tests/tjs/config.yaml

MANIFEST.SKIP

@@ -7,3 +7,8 @@
 ^t/Jemplate.js$
 ^src/
 ^tests/tjs/var/
+^tmp.*
+^tests/
+Makefile.old
+t[0-9]
+Template-TT3

Makefile.PL

@@ -18,11 +18,18 @@ all_from        'lib/Jemplate.pm';
 
 #build_requires        'Directory::Scratch';
 
+if (-e 'inc/.author') {
+    my $all_from = join '/', 'lib', split m/-/, name . '.pm';
+    `perldoc -tF $all_from > README` if ! -e 'README' || (stat $all_from)[9] > (stat 'README')[9];
+}
+
 requires        'Template' => '2.19';
 requires        'File::Find::Rule' => '0.30';
 
 use_test_base;
 
+tests_recursive;
+
 no_index        directory => 'examples';
 
 clean_files     't/Jemplate.js t/a.js t/b.js t/check.js';

README

@@ -1,3 +1,6 @@
+VERSION
+    Version 0.261
+
 NAME
     Jemplate - JavaScript Templating with Template Toolkit
 
@@ -22,6 +25,10 @@ SYNOPSIS
             Jemplate.process('my-template.html', data, '#some-div');
         });
 
+    From the commandline:
+
+        jemplate --runtime --compile path/to/jemplate/directory/ > jemplate.js
+
 DESCRIPTION
     Jemplate is a templating framework for JavaScript that is built over
     Perl's Template Toolkit (TT2).
@@ -161,12 +168,13 @@ CURRENT SUPPORT
       * [% LAST %]
       * [% CLEAR %]
       * [%# this is a comment %]
+      * [% MACRO name(param1, param2) BLOCK %] ... [% END %]
 
     ALL of the string virtual functions are supported.
 
     ALL of the array virtual functions are supported:
 
-    ALL of the hash virtual functions are supported (except for import):
+    ALL of the hash virtual functions are supported:
 
     MANY of the standard filters are implemented.
 
@@ -185,8 +193,8 @@ BROWSER SUPPORT
     All tests run 100% successful in the above browsers.
 
 DEVELOPMENT
-    The bleeding edge code is available via Subversion at
-    http://svn.jemplate.net/repo/trunk/
+    The bleeding edge code is available via Git at
+    git://github.com/ingydotnet/jemplate.git
 
     You can run the runtime tests directly from
     http://svn.jemplate.net/repo/trunk/tests/run/index.html or from the
@@ -229,6 +237,8 @@ AUTHORS
 
     Robert Krimen <[email protected]>
 
+    Nickolay Platonov <[email protected]>
+
 COPYRIGHT
     Copyright (c) 2006-2008. Ingy döt Net.
 

ToDo

@@ -9,6 +9,10 @@
 
 === 0.23
 
+Add note about commit 3c4d9 referring to wrong rt, should refer to 23883
+
+TODO: Does use_test_base not work? make test compains that Test::Base is not installed -rokr
+
 FUTURE:
 
 09:55 < nkuttler_> apparently firefox sets the accept header to request xml rather than json, which obviously is incompatible with later JSON.parse calls. I have added a