sprockets-jsrender 0.1.2 → 0.1.3

data/README

@@ -3,20 +3,22 @@ Sprockets jsRender/jsViews
 
 This gem adds jsRender/jsViews templates as tilt templates for Sprockets 2 in Rails 3.1. 
 
-Thanks
-======
-Inpired by sprockets-jquery-tmpl by Ryan Dy (https://github.com/rdy/sprockets-jquery-tmpl)
-jsrender and jsviews are created bu Boris Moore (https://github.com/BorisMoore/jsrender)
-
 Installing
 ==========
 
  1. Add the gem to bundler or install:  `gem install sprockets-jsrender`
  2. Add to your app/assets/javascripts/application.js the following lines
  //= require jsrender 
- //= require jquery.observable
- //= require jquery.views
+ //= require jquery.observable //(optional)
+ //= require jquery.views      //(optional)
+
+Any files in assets/javascripts/jsrender will be automatically added to list of templates using the path from that directory - i.e. assets/javascripts/jsrender/index.jsr will be mapped to $.render ["index"]( obj )
+
+
+Acknowledgments
+===============
+Inspired by sprockets-jquery-tmpl by Ryan Dy (https://github.com/rdy/sprockets-jquery-tmpl)
+jsrender and jsviews are created bu Boris Moore (https://github.com/BorisMoore/jsrender)
 
-Any files in assets/javascripts/jsrender will be automatically added to list of templates using the path from that directory (i.e. assets/javascripts/jsrender/examples/index.jsr will be mapped to $.render("examples/index") )
 
 Copyright (c) 2012 Enrico Rubboli, released under the MIT license

data/app/assets/javascripts/jquery.views.js

@@ -7,7 +7,7 @@
  * Copyright 2012, Boris Moore
  * Released under the MIT License.
  */
-// informal pre beta commit counter: 2
+// informal pre beta commit counter: 3
 
 this.jQuery && jQuery.link || (function( global, undefined ) {
 // global is the this object, which is window when running in the usual browser environment.
@@ -419,113 +419,115 @@ function linkViews( node, parent, nextNode, depth, data, context, prevNode, inde
 	context = context || {};
 	node = prevNode || node;
 
-	if ( !prevNode && node.nodeType === 1 ) {
-		if ( viewDepth++ === 0 ) {
-			// Add top-level element nodes to view.nodes
-			currentView.nodes.push( node );
-		}
-		if ( linkMarkup = node.getAttribute( jsv.linkAttr ) ) {
-			linkIndex = currentView._lnk++;
-			// Compiled linkFn expressions are stored in the tmpl.links array of the template
-			links = currentView.links || currentView.tmpl.links;
-			if ( !(link = links[ linkIndex ] )) {
-				link = links [ linkIndex ] = {};
-				if ( linkMarkup.charAt(linkMarkup.length-1) !== "}" ) {
-					// Simplified syntax is used: data-link="expression"
-					// Convert to data-link="{:expression}", or for inputs, data-link="{:expression:}" for (default) two-way binding
-					linkMarkup = delimOpen1 + ":" + linkMarkup + ($.nodeName( node, "input" ) ? ":" : "") + delimClose0;
-				}
-				while( tokens = rTag.exec( linkMarkup )) { // TODO require } to be followed by whitespace or $, and remove the \}(!\}) option.
-					// Iterate over the data-link expressions, for different target attrs, e.g. <input data-link="{:firstName:} title{:~description(firstName, lastName)}"
-					// tokens: [all, attr, tag, converter, colon, html, code, linkedParams]
-					attr = tokens[ 1 ];
-					expression = tokens[ 2 ];
-					if ( tokens[ 5 ]) {
-						// Only for {:} link"
-						if ( !attr && (convertBack = /^.*:([\w$]*)$/.exec( tokens[ 8 ] ))) {
-							// two-way binding
-							convertBack = convertBack[ 1 ];
-							if ( cbLength = convertBack.length ) {
-								// There is a convertBack function
-								expression = tokens[ 2 ].slice( 0, -cbLength - 1 ) + delimClose0; // Remove the convertBack string from expression.
+	if ( node ) {
+		if ( !prevNode && node.nodeType === 1 ) {
+			if ( viewDepth++ === 0 ) {
+				// Add top-level element nodes to view.nodes
+				currentView.nodes.push( node );
+			}
+			if ( linkMarkup = node.getAttribute( jsv.linkAttr ) ) {
+				linkIndex = currentView._lnk++;
+				// Compiled linkFn expressions are stored in the tmpl.links array of the template
+				links = currentView.links || currentView.tmpl.links;
+				if ( !(link = links[ linkIndex ] )) {
+					link = links [ linkIndex ] = {};
+					if ( linkMarkup.charAt(linkMarkup.length-1) !== "}" ) {
+						// Simplified syntax is used: data-link="expression"
+						// Convert to data-link="{:expression}", or for inputs, data-link="{:expression:}" for (default) two-way binding
+						linkMarkup = delimOpen1 + ":" + linkMarkup + ($.nodeName( node, "input" ) ? ":" : "") + delimClose0;
+					}
+					while( tokens = rTag.exec( linkMarkup )) { // TODO require } to be followed by whitespace or $, and remove the \}(!\}) option.
+						// Iterate over the data-link expressions, for different target attrs, e.g. <input data-link="{:firstName:} title{:~description(firstName, lastName)}"
+						// tokens: [all, attr, tag, converter, colon, html, code, linkedParams]
+						attr = tokens[ 1 ];
+						expression = tokens[ 2 ];
+						if ( tokens[ 5 ]) {
+							// Only for {:} link"
+							if ( !attr && (convertBack = /^.*:([\w$]*)$/.exec( tokens[ 8 ] ))) {
+								// two-way binding
+								convertBack = convertBack[ 1 ];
+								if ( cbLength = convertBack.length ) {
+									// There is a convertBack function
+									expression = tokens[ 2 ].slice( 0, -cbLength - 1 ) + delimClose0; // Remove the convertBack string from expression.
+								}
+							}
+							if ( convertBack === null ) {
+								convertBack = undefined;
 							}
 						}
-						if ( convertBack === null ) {
-							convertBack = undefined;
+						// Compile the linkFn expression which evaluates and binds a data-link expression
+						// TODO - optimize for the case of simple data path with no conversion, helpers, etc.:
+						//     i.e. data-link="a.b.c". Avoid creating new instances of Function every time. Can use a default function for all of these...
+						link[ attr ] = jsv.tmplFn( delimOpen0 + expression + delimClose1, undefined, TRUE );
+						if ( !attr && convertBack !== undefined ) {
+							link[ attr ].to = convertBack;
 						}
 					}
-					// Compile the linkFn expression which evaluates and binds a data-link expression
-					// TODO - optimize for the case of simple data path with no conversion, helpers, etc.:
-					//     i.e. data-link="a.b.c". Avoid creating new instances of Function every time. Can use a default function for all of these...
-					link[ attr ] = jsv.tmplFn( delimOpen0 + expression + delimClose1, undefined, TRUE );
-					if ( !attr && convertBack !== undefined ) {
-						link[ attr ].to = convertBack;
-					}
 				}
+				for ( attr in link ) {
+					bindDataLinkTarget(
+						currentView.data || data, //source
+						node,                     //target
+						attr,                     //attr
+						link[ attr ],             //compiled link markup expression
+						currentView               //view
+					);
+				}
+	// TODO - Add one-way-to-source support
+	//			if ( linkMarkup.lastIndexOf( "toSrc{", 0 ) === 0 ) {
+	//				linkMarkup = "{toSrc " + linkMarkup.slice(6);
+	//			}
 			}
-			for ( attr in link ) {
-				bindDataLinkTarget(
-					currentView.data|| data, //source
-					node,                    //target
-					attr,                    //attr
-					link[ attr ],            //compiled link markup expression
-					currentView              //view
-				);
-			}
-// TODO - Add one-way-to-source support
-//			if ( linkMarkup.lastIndexOf( "toSrc{", 0 ) === 0 ) {
-//				linkMarkup = "{toSrc " + linkMarkup.slice(6);
-//			}
+			node = node.firstChild;
+		} else {
+			node = node.nextSibling;
 		}
-		node = node.firstChild;
-	} else {
-		node = node.nextSibling;
-	}
 
-	while ( node && node !== nextNode ) {
-		if ( node.nodeType === 1 ) {
-			linkViews( node, currentView, nextNode, viewDepth, data, context );
-		} else if ( node.nodeType === 8 && (tokens = rTmplOrItemComment.exec( node.nodeValue ))) {
-			// tokens: [ all, slash, 'item', 'tmpl', path, index, tmplParam ]
-			parentNode = node.parentNode;
-			if ( tokens[ 1 ]) {
-				// <!--/item--> or <!--/tmpl-->
-				currentView.nextNode = node;
-				if ( currentView.ctx.onAfterCreate ) {
-					currentView.ctx.onAfterCreate.call( currentView, currentView );
-				}
-				if ( tokens[ 2 ]) {
-					// An item close tag: <!--/item-->
-					currentView = parent;
-				} else  {
-					// A tmpl close tag: <!--/tmpl-->
-					return node;
-				}
-			} else {
-				// <!--item--> or <!--tmpl-->
-				parentElViews = parentElViews || jsViewsData( parentNode, viewStr, TRUE );
-				if ( tokens[ 2 ]) {
-					// An item open tag: <!--item-->
-					parentElViews.push(
-						currentView = linkedView( currentView.views[ index ] )
-					);
-					index++;
-					currentView.prevNode = node;
+		while ( node && node !== nextNode ) {
+			if ( node.nodeType === 1 ) {
+				linkViews( node, currentView, nextNode, viewDepth, data, context );
+			} else if ( node.nodeType === 8 && (tokens = rTmplOrItemComment.exec( node.nodeValue ))) {
+				// tokens: [ all, slash, 'item', 'tmpl', path, index, tmplParam ]
+				parentNode = node.parentNode;
+				if ( tokens[ 1 ]) {
+					// <!--/item--> or <!--/tmpl-->
+					currentView.nextNode = node;
+					if ( currentView.ctx.onAfterCreate ) {
+						currentView.ctx.onAfterCreate.call( currentView, currentView );
+					}
+					if ( tokens[ 2 ]) {
+						// An item close tag: <!--/item-->
+						currentView = parent;
+					} else  {
+						// A tmpl close tag: <!--/tmpl-->
+						return node;
+					}
 				} else {
-					// A tmpl open tag: <!--tmpl(path) name-->
-					parentElViews.push(
-						view = linkedView( currentView.views[ tokens[ 5 ]] )
-					);
-					view.prevNode = node;
-					// Jump to the nextNode of the tmpl view
-					node = linkViews( node, view, nextNode, 0, undefined, undefined, undefined, 0 );
+					// <!--item--> or <!--tmpl-->
+					parentElViews = parentElViews || jsViewsData( parentNode, viewStr, TRUE );
+					if ( tokens[ 2 ]) {
+						// An item open tag: <!--item-->
+						parentElViews.push(
+							currentView = linkedView( currentView.views[ index ] )
+						);
+						index++;
+						currentView.prevNode = node;
+					} else {
+						// A tmpl open tag: <!--tmpl(path) name-->
+						parentElViews.push(
+							view = linkedView( currentView.views[ tokens[ 5 ]] )
+						);
+						view.prevNode = node;
+						// Jump to the nextNode of the tmpl view
+						node = linkViews( node, view, nextNode, 0, undefined, undefined, undefined, 0 );
+					}
 				}
+			} else if ( viewDepth === 0 ) {
+				// Add top-level non-element nodes to view.nodes
+				currentView.nodes.push( node );
 			}
-		} else if ( viewDepth === 0 ) {
-			// Add top-level non-element nodes to view.nodes
-			currentView.nodes.push( node );
+			node = node.nextSibling;
 		}
-		node = node.nextSibling;
 	}
 }
 

data/app/assets/javascripts/jsrender.js

@@ -6,7 +6,7 @@
  * Copyright 2012, Boris Moore
  * Released under the MIT License.
  */
-// informal pre beta commit counter: 3
+// informal pre beta commit counter: 6
 
 this.jsviews || this.jQuery && jQuery.views || (function( window, undefined ) {
 
@@ -81,7 +81,7 @@ function setDelimiters( openChars, closeChars ) {
 	// Build regex with new delimiters
 	jsv.rTag = rTag // make rTag available to JsViews (or other components) for parsing binding expressions
 		= secondOpenChar
-			//          tag    (followed by / space or })   or  colon     or  html or code
+			//          tag    (followed by / space or })   or  colon or html or code
 		+ "(?:(?:(\\w+(?=[\\/\\s" + firstCloseChar + "]))|(?:(\\w+)?(:)|(>)|(\\*)))"
 		//     params
 		+ "\\s*((?:[^" + firstCloseChar + "]|" + firstCloseChar + "(?!" + secondCloseChar + "))*?)"
@@ -356,8 +356,8 @@ function renderContent( data, context, parentView, path, index ) {
 // Generate a reusable function that will serve to render a template against data
 // (Compile AST then build template function)
 
-function syntaxError() {
-	throw "Syntax error";
+function syntaxError( message, e ) {
+	throw (e ? (e.name + ': "' + e.message + '"') : "Syntax error")  +  (message ? (" \n" + message) : "");
 }
 
 function tmplFn( markup, tmpl, bind ) {
@@ -466,10 +466,10 @@ function tmplFn( markup, tmpl, bind ) {
 	for ( i = 0; i < l; i++ ) {
 		// AST nodes: [ tagName, converter, params, content, hash, contentMarkup ]
 		node = astTop[ i ];
-		if ( node[ 0 ] === "*" ) {
-			code = code.slice( 0, i ? -1 : -3 ) + ";" + node[ 1 ] + (i + 1 < l ? "ret+=" : "");
-		} else if ( "" + node === node ) { // type string
+		if ( "" + node === node ) { // type string
 			code += '"' + node + '"+';
+		} else if ( node[ 0 ] === "*" ) {
+			code = code.slice( 0, i ? -1 : -3 ) + ";" + node[ 1 ] + (i + 1 < l ? "ret+=" : "");
 		} else {
 			tag = node[ 0 ];
 			converter = node[ 1 ];
@@ -498,7 +498,7 @@ function tmplFn( markup, tmpl, bind ) {
 					+ ")+";
 		}
 	}
-	code =  new Function( "data, view, j, b, u", fnDeclStr
+	code = fnDeclStr
 		+ (getsValue ? "v," : "")
 		+ (hasTag ? "t=j.tag," : "")
 		+ (hasConverter ? "c=j.convert," : "")
@@ -508,8 +508,13 @@ function tmplFn( markup, tmpl, bind ) {
 		+ (allowCode ? 'ret=' : 'return ')
 		+ code.slice( 0, -1 ) + ";\n\n"
 		+ (allowCode ? "return ret;" : "")
-		+ "}catch(e){return j.err(e);}"
-	);
+		+ "}catch(e){return j.err(e);}";
+
+	try {
+		code =  new Function( "data, view, j, b, u", code );
+	} catch(e) {
+		syntaxError( "Error in compiled template code:\n" + code, e );
+	}
 
 	// Include only the var references that are needed in the code
 	if ( tmpl ) {
@@ -626,8 +631,16 @@ function compile( name, tmpl, parent, options ) {
 		// Return the template object, if already compiled, or the markup string
 
 		if ( ("" + value === value) || value.nodeType > 0 ) {
-			// If selector is valid and returns at least one element, get first element
-			elem = value.nodeType > 0 ? value : !rTmplString.test( value ) && jQuery && jQuery( value )[0];
+			try {
+				elem = value.nodeType > 0
+					? value
+					: !rTmplString.test( value )
+						// If value is a string and does not contain HTML or tag content, then test as selector
+						&& jQuery && jQuery( value )[0];
+						// If selector is valid and returns at least one element, get first element
+						// If invalid, jQuery will throw. We will stay with the original string.
+			} catch(e) {}
+
 			if ( elem && elem.type ) {
 				// It is a script element
 				// Create a name for data linking if none provided

data/lib/sprockets/jsrender/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module JSRender
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-jsrender
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-06 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack