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.

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

parseComment() utility for Dabblet.title() #207

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion code/dabblet.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ window.Dabblet = $u.attach({
},

title: function(code) {
return (code && code.match(/^\/\*[\s\*\r\n]+(.+?)($|\*\/)/m) || [,'Untitled'])[1];
return utils.parseComment(code).title || 'Untitled';
},

wipe: function() {
Expand Down
33 changes: 33 additions & 0 deletions code/utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
(function() {

/**
* Generic utils.
*/

var utils = window.utils = {};

/**
* Extract `title` and `body` components
* from a `comment`.
*
* @param {String} comment
* @return {Object} item
* @api public
*/

utils.parseComment = function(comment) {
var matchCommentsRegexp = /(\/\*[\w\'\s\r\n\*]*\*\/)|(\/\/[(\w\s\']*)|(\<![\-\-\s\w\>\/]*\>)/gm;
var replaceRegexp = /^\/\*\*? |^ *\* ?|^\s|^(\/\*[\*\!]?)+\s*.?$| ?\*\/$|\/$/gm;

var str = comment.match(matchCommentsRegexp)[0];
str = str.replace(replaceRegexp, '');
var parts = str.split(/\n{1,}/).filter(Boolean);

var item = {};
item.title = parts[0];
item.body = parts.slice(1).join('\n');

return item;
};

}());
1 change: 1 addition & 0 deletions index-php.php
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
<div id="entity" class="previewer"></div>

<script src="/code/utopia.js"></script>
<script src="/code/utils.js"></script>
<script src="/code/selection.js"></script>
<script src="/code/prism.js"></script>
<script src="/code/code-highlight.js"></script>
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ <h1><a href="/">dabblet</a></h1>
<div id="entity" class="previewer"></div>

<script src="/code/utopia.js"></script>
<script src="/code/utils.js"></script>
<script src="/code/selection.js"></script>
<script src="/code/prism.js"></script>
<script src="/code/code-highlight.js"></script>
Expand Down
19 changes: 19 additions & 0 deletions test/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>dabblet test run</title>
<link rel="stylesheet" href="mocha/mocha.css" />
<script src="mocha/mocha.js"></script>
<script>mocha.setup('bdd')</script>
</head>
<body>
<div id="mocha"></div>
<script src="../code/utils.js"></script>
<script src="test.utils.js"></script>
<script>
if (window.mochaPhantomJS) mochaPhantomJS.run()
else mocha.run()
</script>
</body>
</html>
227 changes: 227 additions & 0 deletions test/mocha/mocha.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,227 @@
@charset "UTF-8";
body {
font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
padding: 60px 50px;
}

#mocha ul, #mocha li {
margin: 0;
padding: 0;
}

#mocha ul {
list-style: none;
}

#mocha h1, #mocha h2 {
margin: 0;
}

#mocha h1 {
margin-top: 15px;
font-size: 1em;
font-weight: 200;
}

#mocha h1 a {
text-decoration: none;
color: inherit;
}

#mocha h1 a:hover {
text-decoration: underline;
}

#mocha .suite .suite h1 {
margin-top: 0;
font-size: .8em;
}

.hidden {
display: none;
}

#mocha h2 {
font-size: 12px;
font-weight: normal;
cursor: pointer;
}

#mocha .suite {
margin-left: 15px;
}

#mocha .test {
margin-left: 15px;
}

#mocha .test.pending:hover h2::after {
content: '(pending)';
font-family: arial;
}

#mocha .test.pass.medium .duration {
background: #C09853;
}

#mocha .test.pass.slow .duration {
background: #B94A48;
}

#mocha .test.pass::before {
content: '✓';
font-size: 12px;
display: block;
float: left;
margin-right: 5px;
color: #00d6b2;
}

#mocha .test.pass .duration {
font-size: 9px;
margin-left: 5px;
padding: 2px 5px;
color: white;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
-ms-border-radius: 5px;
-o-border-radius: 5px;
border-radius: 5px;
}

#mocha .test.pass.fast .duration {
display: none;
}

#mocha .test.pending {
color: #0b97c4;
}

#mocha .test.pending::before {
content: '◦';
color: #0b97c4;
}

#mocha .test.fail {
color: #c00;
}

#mocha .test.fail pre {
color: black;
}

#mocha .test.fail::before {
content: '✖';
font-size: 12px;
display: block;
float: left;
margin-right: 5px;
color: #c00;
}

#mocha .test pre.error {
color: #c00;
max-height: 300px;
overflow: auto;
}

#mocha .test pre {
display: inline-block;
font: 12px/1.5 monaco, monospace;
margin: 5px;
padding: 15px;
border: 1px solid #eee;
border-bottom-color: #ddd;
-webkit-border-radius: 3px;
-webkit-box-shadow: 0 1px 3px #eee;
-moz-border-radius: 3px;
-moz-box-shadow: 0 1px 3px #eee;
}

#mocha .test h2 {
position: relative;
}

#mocha .test a.replay {
position: absolute;
top: 3px;
right: -20px;
text-decoration: none;
vertical-align: middle;
display: block;
width: 15px;
height: 15px;
line-height: 15px;
text-align: center;
background: #eee;
font-size: 15px;
-moz-border-radius: 15px;
border-radius: 15px;
-webkit-transition: opacity 200ms;
-moz-transition: opacity 200ms;
transition: opacity 200ms;
opacity: 0.2;
color: #888;
}

#mocha .test:hover a.replay {
opacity: 1;
}

#mocha-report.pass .test.fail {
display: none;
}

#mocha-report.fail .test.pass {
display: none;
}

#mocha-error {
color: #c00;
font-size: 1.5 em;
font-weight: 100;
letter-spacing: 1px;
}

#mocha-stats {
position: fixed;
top: 15px;
right: 10px;
font-size: 12px;
margin: 0;
color: #888;
}

#mocha-stats .progress {
float: right;
padding-top: 0;
}

#mocha-stats em {
color: black;
}

#mocha-stats a {
text-decoration: none;
color: inherit;
}

#mocha-stats a:hover {
border-bottom: 1px solid #eee;
}

#mocha-stats li {
display: inline-block;
margin: 0 5px;
list-style: none;
padding-top: 11px;
}

code .comment { color: #ddd }
code .init { color: #2F6FAD }
code .string { color: #5890AD }
code .keyword { color: #8A6343 }
code .number { color: #2F6FAD }
Loading