Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support single quotes #91

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support single quotes #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0032133
Remove exit()s from test script
ypresto Mar 21, 2015
448a118
Support single quoted attributes
ypresto Mar 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 30 additions & 25 deletions lib/haml.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var Haml;

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahhh, sorry, but atom.io removes all trailing spaces automatically.

(function () {

var matchers, self_close_tags, embedder, forceXML, escaperName, escapeHtmlByDefault;
Expand All @@ -24,10 +24,15 @@ var Haml;
break;
default:
try {
value = JSON.parse("[" + attribs[key] +"]")[0];
var value_str = attribs[key];
var single_quote_match = /^'([^']*)'$/.exec(value_str);
if (single_quote_match) {
value_str = '"' + single_quote_match[1].replace(/\\/, '\\\\').replace(/"/, '\"') + '"';
}
value = JSON.parse("[" + value_str +"]")[0];
if (value === true) {
value = key;
} else if (typeof value === 'string' && embedder.test(value)) {
} else if (!single_quote_match && typeof value === 'string' && embedder.test(value)) {
value = '" +\n' + parse_interpol(html_escape(value)) + ' +\n"';
} else {
value = html_escape(value);
Expand Down Expand Up @@ -159,7 +164,7 @@ var Haml;
//unsafe!!!
items.push(match[2] || match[3]);
}

pos += next;
}
return items.filter(function (part) { return part && part.length > 0}).join(" +\n");
Expand Down Expand Up @@ -194,7 +199,7 @@ var Haml;
var leader0 = attribs._content.charAt(0),
leader1 = attribs._content.charAt(1),
leaderLength = 0;

if(leader0 == "<"){
leaderLength++;
whitespace.inside = true;
Expand Down Expand Up @@ -251,7 +256,7 @@ var Haml;
if (content === '""') {
content = '';
}

if(whitespace.inside){
if(content.length==0){
content='" "'
Expand All @@ -260,7 +265,7 @@ var Haml;
content = '" '+JSON.parse(content)+' "';
}catch(e){
content = '" "+\n'+content+'+\n" "';
}
}
}
}

Expand All @@ -271,7 +276,7 @@ var Haml;
} else {
output = '"<' + tag + attribs + ' />"';
}

if(whitespace.around){
//output now contains '"<b>hello</b>"'
//we need to crack it open to insert whitespace.
Expand Down Expand Up @@ -318,7 +323,7 @@ var Haml;
'} else { return ""; } }).call(this)';
}
},

// else if statements
{
name: "else if",
Expand All @@ -340,7 +345,7 @@ var Haml;
'} else { return ""; } }).call(this)';
}
},

// else statements
{
name: "else",
Expand All @@ -359,7 +364,7 @@ var Haml;
'} else { return ""; } }).call(this)';
}
},

// silent-comments
{
name: "silent-comments",
Expand All @@ -368,18 +373,18 @@ var Haml;
return '""';
}
},

//html-comments
{
name: "silent-comments",
regexp: /^(\s*)\/\s*(.*)\s*$/i,
process: function () {
this.contents.unshift(this.matches[2]);

return '"<!--'+this.contents.join('\\n').replace(/\"/g, '\\"')+'-->"';
}
},

// raw js
{
name: "rawjs",
Expand All @@ -399,7 +404,7 @@ var Haml;
return '"<pre>"+\n' + JSON.stringify(this.contents.join("\n"))+'+\n"</pre>"';
}
},

// declarations
{
name: "doctype",
Expand Down Expand Up @@ -535,7 +540,7 @@ var Haml;
}
}
});

// Match plain text
if (!found) {
output.push(function () {
Expand All @@ -552,27 +557,27 @@ var Haml;
return escaperName+'(' + line + ')';
}
}

function unescapedLine(){
try {
return parse_interpol(JSON.parse(line));
} catch (e) {
return line;
}
}

// always escaped
if((line.substr(0, 2) === "&=")) {
line = line.substr(2, line.length).trim();
return escapedLine();
}

//never escaped
if((line.substr(0, 2) === "!=")) {
line = line.substr(2, line.length).trim();
return unescapedLine();
}

// sometimes escaped
if ( (line[0] === '=')) {
line = line.substr(1, line.length).trim();
Expand All @@ -592,7 +597,7 @@ var Haml;
if (block) {
output.push(block.process());
}

var txt = output.filter(function (part) { return part && part.length > 0}).join(" +\n");
if(txt.length == 0){
txt = '""';
Expand Down Expand Up @@ -659,7 +664,7 @@ var Haml;
forceXML = config;
config = {};
}

var escaper;
if(config.customEscape){
escaper = "";
Expand All @@ -668,11 +673,11 @@ var Haml;
escaper = html_escape.toString() + "\n";
escaperName = "html_escape";
}

escapeHtmlByDefault = (config.escapeHtmlByDefault || config.escapeHTML || config.escape_html);

var js = optimize(compile(haml));

var str = "with(locals || {}) {\n" +
" try {\n" +
" var _$output=" + js + ";\n return _$output;" +
Expand Down
6 changes: 6 additions & 0 deletions test/single_quoted_attribs.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
%input#single-quote{ type: 'hidden' }
%input#single-quote-with-interpolation{ type: '#{hidden}' }
%input#single-quote-alt( type='hidden' )
%input#single-quote-with-interpolation-alt( type='#{hidden}' )
%input#single-quote-with-double-quote( type='hi"dden' )
%input#single-quote-with-backslash( type='hi\dden' )
1 change: 1 addition & 0 deletions test/single_quoted_attribs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<input type="hidden" id="single-quote" /><input type="#{hidden}" id="single-quote-with-interpolation" /><input type="hidden" id="single-quote-alt" /><input type="#{hidden}" id="single-quote-with-interpolation-alt" /><input type="hi&quot;dden" id="single-quote-with-double-quote" /><input type="hidden" id="single-quote-with-backslash" />
45 changes: 21 additions & 24 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ function compare(haml_file, haml, expected, scope, options){
var js_opt = Haml.optimize(js);
var jsFn = Haml(haml, options);
var actual = jsFn.call(scope.context, scope.locals);

assert.equal(actual, expected);
sys.puts(haml_file + " Passed")

actual = Haml.render(haml, {context:scope.context, locals:scope.locals})

assert.equal(actual, expected);
sys.puts(haml_file + " Haml.render Passed")

} catch (e) {
var message = e.name;
if (e.message) { message += ": " + e.message; }
Expand All @@ -36,7 +36,7 @@ function compare(haml_file, haml, expected, scope, options){
sys.error("\nActual["+actual.length+"]:\n\n" + actual);
sys.error("\nExpected["+expected.length+"]:\n\n" + expected);
}catch(e2){}

process.exit();
}
}
Expand Down Expand Up @@ -79,7 +79,6 @@ fs.readdir('.', function (err, files) {
}catch(e){
sys.error(e.stack);
sys.error(customEscape);
process.exit();
}
})();

Expand All @@ -88,50 +87,48 @@ fs.readdir('.', function (err, files) {
var hamlSrc = fs.readFileSync("./other/custom_escape.haml", "utf8");
var expected = fs.readFileSync("./other/custom_escape.html", "utf8");
var scope = eval("(" + fs.readFileSync("escaping.js") + ")");

sys.puts("custom_escape" + " Begun")
var jsFn = Haml(hamlSrc, {customEscape:"$esc"});

this.$esc = function(){
return "moo"
};
var actual = jsFn.call(scope.context, scope.locals);
try{

var actual = jsFn.call(scope.context, scope.locals);
try{
assert.equal(actual, expected);
sys.puts("custom_escape" + " Passed")
}catch(e){
sys.error("\nActual["+actual.length+"]:\n\n" + actual);
sys.error("\nExpected["+expected.length+"]:\n\n" + expected);
process.exit();
}
sys.puts("custom_escape" + " Passed")


})();


(function(){
var hamlSrc = fs.readFileSync("./other/escape_by_default.haml", "utf8");
var expected = fs.readFileSync("./other/escape_by_default.html", "utf8");
var scope = {};

sys.puts("escape_by_default" + " Begun")
var js = Haml.compile(hamlSrc);
var js = Haml.compile(hamlSrc);

var jsFn = Haml(hamlSrc, {escapeHtmlByDefault:true});

this.$esc = function(){
return "moo"
};
var actual = jsFn.call(scope.context, scope.locals);
try{

var actual = jsFn.call(scope.context, scope.locals);
try{
assert.equal(actual, expected);
sys.puts("escape_by_default" + " Passed")
}catch(e){
sys.error("\nActual["+actual.length+"]:\n\n" + actual);
sys.error("\nExpected["+expected.length+"]:\n\n" + expected);
process.exit();
}
sys.puts("escape_by_default" + " Passed")


})();