You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/07/16 22:17:02 UTC
[01/27] git commit: Exclude non-builtin apps from this test
Updated Branches:
refs/heads/cj/4656 58cc0246c -> c78912c46 (forced update)
Exclude non-builtin apps from this test
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/b8d0e6ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/b8d0e6ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/b8d0e6ac
Branch: refs/heads/cj/4656
Commit: b8d0e6ac000e6face2d8b5003be0635e896c3f5d
Parents: 584a728
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Jul 10 17:49:31 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 10 17:49:31 2013 +0000
----------------------------------------------------------------------
Allura/allura/tests/functional/test_admin.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/b8d0e6ac/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index 9535c36..8b1d703 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -155,10 +155,13 @@ class TestProjectAdmin(TestController):
assert "uninstall tool test-tool" in r.body, r.body
def test_tool_permissions(self):
+ BUILTIN_APPS = ['activity', 'blog', 'discussion', 'git', 'link',
+ 'shorturl', 'svn', 'tickets', 'userstats', 'wiki']
self.app.get('/admin/')
for i, ep in enumerate(pkg_resources.iter_entry_points('allura')):
app = ep.load()
- if not app.installable: continue
+ if not app.installable or ep.name.lower() not in BUILTIN_APPS:
+ continue
tool = ep.name
with audits('install tool test-%d' % i):
self.app.post('/admin/update_mounts', params={
[05/27] git commit: [#4659] ticket:381 upload multiple attachments
Posted by jo...@apache.org.
[#4659] ticket:381 upload multiple attachments
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/087b9ec5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/087b9ec5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/087b9ec5
Branch: refs/heads/cj/4656
Commit: 087b9ec58400c9ebe7ab4c41cd8581ff12195820
Parents: 8fd2f6f
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Fri Jul 5 15:44:48 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jul 11 14:35:12 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/discuss.py | 20 ++++++++++++++++----
Allura/allura/lib/widgets/discuss.py | 2 +-
Allura/allura/lib/widgets/form_fields.py | 3 ++-
Allura/allura/model/notification.py | 16 ++++++++++++----
.../templates/widgets/attachment_add.html | 4 ++--
Allura/allura/templates/widgets/edit_post.html | 4 ++--
Allura/allura/tests/model/test_discussion.py | 18 ++++++++++++++++++
.../tests/functional/test_forum.py | 5 +++++
ForgeTracker/forgetracker/model/ticket.py | 10 +++++++---
.../templates/tracker_widgets/ticket_form.html | 4 ++--
.../forgetracker/tests/functional/test_root.py | 12 ++++++++++++
ForgeTracker/forgetracker/tracker_main.py | 10 +++++++---
.../forgetracker/widgets/ticket_form.py | 5 +++--
.../forgewiki/tests/functional/test_root.py | 14 ++++++++++++++
ForgeWiki/forgewiki/wiki_main.py | 9 +++++++--
15 files changed, 110 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index 9ff5e6c..97a08e5 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -202,7 +202,10 @@ class ThreadController(BaseController, FeedController):
file_info = kw.get('file_info', None)
p = self.thread.add_post(**kw)
- p.add_attachment(file_info)
+ if isinstance(file_info, list):
+ map(p.add_attachment, file_info)
+ else:
+ p.add_attachment(file_info)
if self.thread.artifact:
self.thread.artifact.mod_date = datetime.utcnow()
flash('Message posted')
@@ -275,7 +278,10 @@ class PostController(BaseController):
require_access(self.post, 'moderate')
post_fields = self.W.edit_post.to_python(kw, None)
file_info = post_fields.pop('file_info', None)
- self.post.add_attachment(file_info)
+ if isinstance(file_info, list):
+ map(self.post.add_attachment, file_info)
+ else:
+ self.post.add_attachment(file_info)
for k,v in post_fields.iteritems():
try:
setattr(self.post, k, v)
@@ -320,7 +326,10 @@ class PostController(BaseController):
require_access(self.thread, 'post')
kw = self.W.edit_post.to_python(kw, None)
p = self.thread.add_post(parent_id=self.post._id, **kw)
- p.add_attachment(file_info)
+ if isinstance(file_info, list):
+ map(p.add_attachment, file_info)
+ else:
+ p.add_attachment(file_info)
redirect(request.referer)
@h.vardec
@@ -355,7 +364,10 @@ class PostController(BaseController):
@require_post()
def attach(self, file_info=None):
require_access(self.post, 'moderate')
- self.post.add_attachment(file_info)
+ if isinstance(file_info, list):
+ map(self.post.add_attachment, file_info)
+ else:
+ self.post.add_attachment(file_info)
redirect(request.referer)
@expose()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index e62a993..96a48b3 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -160,9 +160,9 @@ class EditPost(ff.ForgeForm):
for r in ffw.MarkdownEdit(name='text').resources(): yield r
yield ew.JSScript('''$(document).ready(function () {
$("a.attachment_form_add_button").click(function(evt){
+ evt.preventDefault();
$(this).hide();
$(".attachment_form_fields", this.parentNode).show();
- evt.preventDefault();
});
$("a.cancel_edit_post").click(function(evt){
$("textarea", this.parentNode).val($("input.original_value", this.parentNode).val());
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/lib/widgets/form_fields.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/form_fields.py b/Allura/allura/lib/widgets/form_fields.py
index 1accf93..221e0fc 100644
--- a/Allura/allura/lib/widgets/form_fields.py
+++ b/Allura/allura/lib/widgets/form_fields.py
@@ -191,9 +191,10 @@ class AttachmentAdd(ew_core.Widget):
def resources(self):
for r in super(AttachmentAdd, self).resources(): yield r
yield onready('''
- $("input.attachment_form_add_button").click(function () {
+ $(".attachment_form_add_button").click(function (evt) {
$(this).hide();
$(".attachment_form_fields", this.parentNode).show();
+ evt.preventDefault();
});
''')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index eced9d8..1d03eef 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -147,10 +147,18 @@ class Notification(MappedClass):
text = post.text
file_info = kwargs.pop('file_info', None)
if file_info is not None:
- file_info.file.seek(0, 2)
- bytecount = file_info.file.tell()
- file_info.file.seek(0)
- text = "%s\n\n\nAttachment: %s (%s; %s)" % (text, file_info.filename, h.do_filesizeformat(bytecount), file_info.type)
+ text = "%s\n\n\nAttachment:" % text
+ if isinstance(file_info, list):
+ for attach in file_info:
+ attach.file.seek(0, 2)
+ bytecount = attach.file.tell()
+ attach.file.seek(0)
+ text = "%s %s (%s; %s) " % (text, attach.filename, h.do_filesizeformat(bytecount), attach.type)
+ else:
+ file_info.file.seek(0, 2)
+ bytecount = file_info.file.tell()
+ file_info.file.seek(0)
+ text = "%s %s (%s; %s) " % (text, file_info.filename, h.do_filesizeformat(bytecount), file_info.type)
subject = post.subject or ''
if post.parent_id and not subject.lower().startswith('re:'):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/templates/widgets/attachment_add.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/attachment_add.html b/Allura/allura/templates/widgets/attachment_add.html
index 8ed2ab5..3af2ce7 100644
--- a/Allura/allura/templates/widgets/attachment_add.html
+++ b/Allura/allura/templates/widgets/attachment_add.html
@@ -19,11 +19,11 @@
<form method="post"
action="{{action}}"
enctype="multipart/form-data">
- <input type="button" value="Add attachment" class="attachment_form_add_button"/>
+ <a href="#" class="btn link attachment_form_add_button">Add attachments</a>
<ol class="attachment_form_fields" style="display:none">
<li>
<label for="{{name}}">File to upload</label>
- <input type="file" class="text" name="{{name}}" id="{{name}}"/>
+ <input type="file" class="text" name="{{name}}" multiple="True" id="{{name}}"/>
</li>
<li>
<label> </label>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/templates/widgets/edit_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/edit_post.html b/Allura/allura/templates/widgets/edit_post.html
index 65762f3..0fe22a7 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -27,12 +27,12 @@
<input type="hidden" class="original_value" value="{{value.text}}">
<span class="arw"><span></span></span><br/>
<div class="attachment_form_fields" style="display:none; padding: 5px 0;">
- <input type="file" class="text" name="{{att_name}}" {% if att_id %}id="{{att_id}}"{% endif %}/>
+ <input type="file" class="text" multiple="True" name="{{att_name}}" {% if att_id %}id="{{att_id}}"{% endif %}/>
</div>
<div style="clear:both"></div>
<input type="submit" value="{{submit_text}}"/>
<a href="#" class="btn link cancel_edit_post">Cancel</a>
- <a href="#" class="btn link attachment_form_add_button">Add attachment</a>
+ <a href="#" class="btn link attachment_form_add_button">Add attachments</a>
{% if widget.antispam %}{% for fld in g.antispam.extra_fields() %}
{{fld}}{% endfor %}{% endif %}
</form>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index ec23e3b..72920e6 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -223,6 +223,24 @@ def test_add_attachment():
assert attach.filename == 'test.txt', attach.filename
assert attach.content_type == 'text/plain', attach.content_type
+def test_notification_two_attaches():
+ d = M.Discussion(shortname='test', name='test')
+ t = M.Thread.new(discussion_id=d._id, subject='Test comment notification')
+ fs1 = FieldStorage()
+ fs1.name = 'file_info'
+ fs1.filename = 'fake.txt'
+ fs1.type = 'text/plain'
+ fs1.file = StringIO('this is the content of the fake file\n')
+ fs2 = FieldStorage()
+ fs2.name = 'file_info'
+ fs2.filename = 'fake2.txt'
+ fs2.type = 'text/plain'
+ fs2.file = StringIO('this is the content of the fake file\n')
+ t.post(text=u'test message', forum=None, subject='', file_info=[fs1, fs2])
+ ThreadLocalORMSession.flush_all()
+ n = M.Notification.query.get(subject=u'[test:wiki] Test comment notification')
+ assert '\nAttachment: fake.txt (37 Bytes; text/plain) fake2.txt (37 Bytes; text/plain)' in n.text
+
@with_setup(setUp, tearDown)
def test_discussion_delete():
d = M.Discussion(shortname='test', name='test')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
index a9288c8..c319263 100644
--- a/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
+++ b/ForgeDiscussion/forgediscussion/tests/functional/test_forum.py
@@ -226,7 +226,12 @@ class TestForumAsync(TestController):
r = self.app.post(url + 'attach',
upload_files=[('file_info', 'test.asdfasdtxt',
'This is a textfile')])
+ r = self.app.post(url + 'attach',
+ upload_files=[('file_info', 'test1.txt','This is a textfile'),
+ ('file_info', 'test2.txt','This is a textfile')])
r = self.app.get(url)
+ assert "test1.txt" in r
+ assert "test2.txt" in r
for link in r.html.findAll('a'):
if 'attachment' in link.get('href', ''):
self.app.get(str(link['href']))
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 175c660..6679e2a 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -833,9 +833,13 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
self.custom_fields[k] = v
self.commit()
if attachment is not None:
- self.attach(
- attachment.filename, attachment.file,
- content_type=attachment.type)
+ if isinstance(attachment, list):
+ for attach in attachment:
+ self.attach(attach.filename, attach.file, content_type=attach.type)
+ else:
+ self.attach(
+ attachment.filename, attachment.file,
+ content_type=attachment.type)
def _move_attach(self, attachments, attach_metadata, app_config):
for attach in attachments:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
index d9c5743..5741603 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/ticket_form.html
@@ -99,8 +99,8 @@
</div>
<div style="clear:both"> </div>
{% endif %}
- <div id="show_attach">
- <input type="checkbox"> I would like to add an attachment
+ <div>
+ <a href="#" id="show_attach">Add attachments</a>
</div>
<div style="clear:both"> </div>
<div id="view_attach" style="display:none">
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 77e0dc7..a78abd9 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -537,6 +537,18 @@ class TestFunctionalController(TrackerTestController):
download = self.app.get(str(ticket_editor.html.findAll('form')[1].findAll('a')[7]['href']))
assert_equal(download.body, file_data)
+ def test_two_attachments(self):
+ file_name1 = 'test_root1.py'
+ file_name2 = 'test_root2.py'
+ file_data = file(__file__).read()
+ self.new_ticket(summary='test new attachment')
+ ticket_editor = self.app.post('/bugs/1/update_ticket',{
+ 'summary':'zzz'
+ }, upload_files=[('attachment', file_name1, file_data), ('attachment', file_name2, file_data)]).follow()
+
+ assert 'test_root1.py' in ticket_editor
+ assert 'test_root2.py' in ticket_editor
+
def test_new_image_attachment_content(self):
h.set_context('test', 'bugs', neighborhood='Projects')
file_name = 'neo-icon-set-454545-256x350.png'
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 5476596..3d2d02d 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1293,9 +1293,13 @@ class TicketController(BaseController, FeedController):
if 'attachment' in post_data:
attachment = post_data['attachment']
- if hasattr(attachment, 'file'):
- self.ticket.attach(
- attachment.filename, attachment.file, content_type=attachment.type)
+ if isinstance(attachment, list):
+ for attach in attachment:
+ self.ticket.attach(attach.filename, attach.file, content_type=attach.type)
+ else:
+ if hasattr(attachment, 'file'):
+ self.ticket.attach(
+ attachment.filename, attachment.file, content_type=attachment.type)
for cf in c.app.globals.custom_fields or []:
if 'custom_fields.' + cf.name in post_data:
value = post_data['custom_fields.' + cf.name]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeTracker/forgetracker/widgets/ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index cb05085..edee7e5 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -106,7 +106,7 @@ class GenericTicketForm(ew.SimpleForm):
ffw.ProjectUserCombo(name='assigned_to', label='Owner'),
ffw.LabelEdit(label='Labels',name='labels', className='ticket_form_tags'),
ew.Checkbox(name='private', label='Mark as Private', attrs={'class':'unlabeled'}),
- ew.InputField(name='attachment', label='Attachment', field_type='file', validator=fev.FieldStorageUploadConverter(if_missing=None)),
+ ew.InputField(name='attachment', label='Attachment', field_type='file', attrs={'multiple': 'True'}, validator=fev.FieldStorageUploadConverter(if_missing=None)),
ffw.MarkdownEdit(name='comment', label='Comment',
attrs={'style':'min-height:7em; width:97%'}),
ew.SubmitButton(label=self.submit_text,name='submit',
@@ -135,7 +135,8 @@ class TicketForm(GenericTicketForm):
for r in super(TicketForm, self).resources(): yield r
yield ew.JSScript('''
$(function(){
- $('#show_attach input').click(function(){
+ $('#show_attach').click(function(evt) {
+ evt.preventDefault();
$('#view_attach').show();
$('#show_attach').hide();
});
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index f3570b2..05c0dd1 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -348,6 +348,20 @@ class TestRootController(TestController):
response = self.app.get('/wiki/tést/')
assert 'test_root.py' in response
+ def test_attach_two_fiels(self):
+ self.app.post(
+ '/wiki/tést/update',
+ params={
+ 'title':'tést',
+ 'text':'sometext',
+ 'labels':'',
+ 'viewable_by-0.id':'all'})
+ content = file(__file__).read()
+ self.app.post('/wiki/tést/attach', upload_files=[('file_info', 'test1.py', content),('file_info', 'test2.py', content)])
+ response = self.app.get('/wiki/tést/')
+ assert 'test1.py' in response
+ assert 'test2.py' in response
+
def test_new_text_attachment_content(self):
self.app.post(
'/wiki/tést/update',
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/087b9ec5/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 9cc0ffc..88f1102 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -649,8 +649,13 @@ class PageController(BaseController, FeedController):
if not self.page:
raise exc.HTTPNotFound
require_access(self.page, 'edit')
- if hasattr(file_info, 'file'):
- self.page.attach(file_info.filename, file_info.file, content_type=file_info.type)
+ if isinstance(file_info, list):
+ for attach in file_info:
+ if hasattr(attach, 'file'):
+ self.page.attach(attach.filename, attach.file, content_type=attach.type)
+ else:
+ if hasattr(file_info, 'file'):
+ self.page.attach(file_info.filename, file_info.file, content_type=file_info.type)
redirect(request.referer)
@expose()
[09/27] git commit: [#4659] Cleanup layout for attachment widget
Posted by jo...@apache.org.
[#4659] Cleanup layout for attachment widget
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c2ac0166
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c2ac0166
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c2ac0166
Branch: refs/heads/cj/4656
Commit: c2ac016668cda5c17226d4cb79974cfa1b3dfcc0
Parents: 779e794
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Thu Jul 11 20:19:34 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jul 11 20:19:34 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/widgets/attachment_add.html | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c2ac0166/Allura/allura/templates/widgets/attachment_add.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/attachment_add.html b/Allura/allura/templates/widgets/attachment_add.html
index 3af2ce7..51f4d5b 100644
--- a/Allura/allura/templates/widgets/attachment_add.html
+++ b/Allura/allura/templates/widgets/attachment_add.html
@@ -20,14 +20,8 @@
action="{{action}}"
enctype="multipart/form-data">
<a href="#" class="btn link attachment_form_add_button">Add attachments</a>
- <ol class="attachment_form_fields" style="display:none">
- <li>
- <label for="{{name}}">File to upload</label>
- <input type="file" class="text" name="{{name}}" multiple="True" id="{{name}}"/>
- </li>
- <li>
- <label> </label>
- <input type="submit" value="Attach file"/>
- </li>
- </ol>
+ <div class="attachment_form_fields" style="display:none">
+ <input type="file" class="text" name="{{name}}" multiple="True" id="{{name}}" style="margin-left:0"/><br/>
+ <input type="submit" value="Attach files"/>
+ </div>
</form>
[11/27] [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/jslint/jslint.js
----------------------------------------------------------------------
diff --git a/AlluraTesting/jslint/jslint.js b/AlluraTesting/jslint/jslint.js
deleted file mode 100644
index 4b2ddcc..0000000
--- a/AlluraTesting/jslint/jslint.js
+++ /dev/null
@@ -1,5729 +0,0 @@
-// jslint.js
-// 2010-08-05
-
-/*
-Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/*
- JSLINT is a global function. It takes two parameters.
-
- var myResult = JSLINT(source, option);
-
- The first parameter is either a string or an array of strings. If it is a
- string, it will be split on '\n' or '\r'. If it is an array of strings, it
- is assumed that each string represents one line. The source can be a
- JavaScript text, or HTML text, or a Konfabulator text.
-
- The second parameter is an optional object of options which control the
- operation of JSLINT. Most of the options are booleans: They are all are
- optional and have a default value of false.
-
- If it checks out, JSLINT returns true. Otherwise, it returns false.
-
- If false, you can inspect JSLINT.errors to find out the problems.
- JSLINT.errors is an array of objects containing these members:
-
- {
- line : The line (relative to 0) at which the lint was found
- character : The character (relative to 0) at which the lint was found
- reason : The problem
- evidence : The text line in which the problem occurred
- raw : The raw message before the details were inserted
- a : The first detail
- b : The second detail
- c : The third detail
- d : The fourth detail
- }
-
- If a fatal error was found, a null will be the last element of the
- JSLINT.errors array.
-
- You can request a Function Report, which shows all of the functions
- and the parameters and vars that they use. This can be used to find
- implied global variables and other problems. The report is in HTML and
- can be inserted in an HTML <body>.
-
- var myReport = JSLINT.report(limited);
-
- If limited is true, then the report will be limited to only errors.
-
- You can request a data structure which contains JSLint's results.
-
- var myData = JSLINT.data();
-
- It returns a structure with this form:
-
- {
- errors: [
- {
- line: NUMBER,
- character: NUMBER,
- reason: STRING,
- evidence: STRING
- }
- ],
- functions: [
- name: STRING,
- line: NUMBER,
- last: NUMBER,
- param: [
- STRING
- ],
- closure: [
- STRING
- ],
- var: [
- STRING
- ],
- exception: [
- STRING
- ],
- outer: [
- STRING
- ],
- unused: [
- STRING
- ],
- global: [
- STRING
- ],
- label: [
- STRING
- ]
- ],
- globals: [
- STRING
- ],
- member: {
- STRING: NUMBER
- },
- unuseds: [
- {
- name: STRING,
- line: NUMBER
- }
- ],
- implieds: [
- {
- name: STRING,
- line: NUMBER
- }
- ],
- urls: [
- STRING
- ],
- json: BOOLEAN
- }
-
- Empty arrays will not be included.
-
-*/
-
-/*jslint
- evil: true, nomen: false, onevar: false, regexp: false, strict: true
-*/
-
-/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%",
- "(begin)", "(breakage)", "(context)", "(error)", "(global)",
- "(identifier)", "(last)", "(line)", "(loopage)", "(name)", "(onevar)",
- "(params)", "(scope)", "(verb)", "*", "+", "++", "-", "--", "\/",
- "<", "<=", "==", "===", ">", ">=", ADSAFE, ActiveXObject,
- Array, Boolean, COM, CScript, Canvas, CustomAnimation, Date, Debug, E,
- Enumerator, Error, EvalError, FadeAnimation, Flash, FormField, Frame,
- Function, HotKey, Image, JSON, LN10, LN2, LOG10E, LOG2E, MAX_VALUE,
- MIN_VALUE, Math, MenuItem, MoveAnimation, NEGATIVE_INFINITY, Number,
- Object, Option, PI, POSITIVE_INFINITY, Point, RangeError, Rectangle,
- ReferenceError, RegExp, ResizeAnimation, RotateAnimation, SQRT1_2,
- SQRT2, ScrollBar, String, Style, SyntaxError, System, Text, TextArea,
- Timer, TypeError, URIError, URL, VBArray, WScript, Web, Window, XMLDOM,
- XMLHttpRequest, "\\", a, abbr, acronym, addEventListener, address,
- adsafe, alert, aliceblue, animator, antiquewhite, appleScript, applet,
- apply, approved, aqua, aquamarine, area, arguments, arity, article,
- aside, audio, autocomplete, azure, b, background,
- "background-attachment", "background-color", "background-image",
- "background-position", "background-repeat", base, bdo, beep, beige, big,
- bisque, bitwise, black, blanchedalmond, block, blockquote, blue,
- blueviolet, blur, body, border, "border-bottom", "border-bottom-color",
- "border-bottom-style", "border-bottom-width", "border-collapse",
- "border-color", "border-left", "border-left-color", "border-left-style",
- "border-left-width", "border-right", "border-right-color",
- "border-right-style", "border-right-width", "border-spacing",
- "border-style", "border-top", "border-top-color", "border-top-style",
- "border-top-width", "border-width", bottom, br, brown, browser,
- burlywood, button, bytesToUIString, c, cadetblue, call, callee, caller,
- canvas, cap, caption, "caption-side", cases, center, charAt, charCodeAt,
- character, chartreuse, chocolate, chooseColor, chooseFile, chooseFolder,
- cite, clear, clearInterval, clearTimeout, clip, close, closeWidget,
- closed, closure, cm, code, col, colgroup, color, command, comment,
- condition, confirm, console, constructor, content, convertPathToHFS,
- convertPathToPlatform, coral, cornflowerblue, cornsilk,
- "counter-increment", "counter-reset", create, crimson, css, cursor,
- cyan, d, darkblue, darkcyan, darkgoldenrod, darkgray, darkgreen,
- darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred,
- darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise,
- darkviolet, data, datalist, dd, debug, decodeURI, decodeURIComponent,
- deeppink, deepskyblue, defaultStatus, defineClass, del, deserialize,
- details, devel, dfn, dialog, dimension, dimgray, dir, direction,
- display, div, dl, document, dodgerblue, dt, edition, else, em, embed,
- empty, "empty-cells", encodeURI, encodeURIComponent, entityify, eqeqeq,
- errors, es5, escape, eval, event, evidence, evil, ex, exception, exec, exps,
- fieldset, figure, filesystem, firebrick, first, float, floor,
- floralwhite, focus, focusWidget, font, "font-face", "font-family",
- "font-size", "font-size-adjust", "font-stretch", "font-style",
- "font-variant", "font-weight", footer, forestgreen, forin, form,
- fragment, frame, frames, frameset, from, fromCharCode, fuchsia, fud,
- funct, function, functions, g, gainsboro, gc, getComputedStyle,
- ghostwhite, global, globals, gold, goldenrod, gray, green, greenyellow,
- h1, h2, h3, h4, h5, h6, hasOwnProperty, head, header, height, help,
- hgroup, history, honeydew, hotpink, hr, 'hta:application', html,
- i, iTunes, id, identifier,
- iframe, img, immed, implieds, in, include, indent, indexOf, indianred,
- indigo, init, input, ins, isAlpha, isApplicationRunning, isDigit,
- isFinite, isNaN, ivory, join, jslint, json, kbd, keygen, khaki,
- konfabulatorVersion, label, labelled, lang, last, lavender,
- lavenderblush, lawngreen, laxbreak, lbp, led, left, legend,
- lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral,
- lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon,
- lightseagreen, lightskyblue, lightslategray, lightsteelblue,
- lightyellow, lime, limegreen, line, "line-height", linen, link,
- "list-style", "list-style-image", "list-style-position",
- "list-style-type", load, loadClass, location, log, m, magenta, map,
- margin, "margin-bottom", "margin-left", "margin-right", "margin-top",
- mark, "marker-offset", maroon, match, "max-height", "max-width", maxerr,
- maxlen, md5, media, mediumaquamarine, mediumblue, mediumorchid,
- mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen,
- mediumturquoise, mediumvioletred, member, menu, message, meta, meter,
- midnightblue, "min-height", "min-width", mintcream, mistyrose, mm,
- moccasin, moveBy, moveTo, name, nav, navajowhite, navigator, navy, new,
- newcap, noframes, nomen, noscript, nud, object, ol, oldlace, olive,
- olivedrab, on, onbeforeunload, onblur, onerror, onevar, onfocus, onload,
- onresize, onunload, opacity, open, openURL, opener, opera, optgroup,
- option, orange, orangered, orchid, outer, outline, "outline-color",
- "outline-style", "outline-width", output, overflow, "overflow-x",
- "overflow-y", p, padding, "padding-bottom", "padding-left",
- "padding-right", "padding-top", page, "page-break-after",
- "page-break-before", palegoldenrod, palegreen, paleturquoise,
- palevioletred, papayawhip, param, parent, parseFloat, parseInt,
- passfail, pc, peachpuff, peru, pink, play, plum, plusplus, pop,
- popupMenu, position, powderblue, pre, predef, preferenceGroups,
- preferences, print, progress, prompt, prototype, pt, purple, push, px,
- q, quit, quotes, random, range, raw, reach, readFile, readUrl, reason,
- red, regexp, reloadWidget, removeEventListener, replace, report,
- reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, rhino, right,
- rosybrown, royalblue, rp, rt, ruby, runCommand, runCommandInBg,
- saddlebrown, safe, salmon, samp, sandybrown, saveAs, savePreferences,
- screen, script, scroll, scrollBy, scrollTo, seagreen, seal, search,
- seashell, section, select, serialize, setInterval, setTimeout, shift,
- showWidgetPreferences, sienna, silver, skyblue, slateblue, slategray,
- sleep, slice, small, snow, sort, source, span, spawn, speak, split,
- springgreen, src, stack, status, steelblue, strict, strong, style,
- styleproperty, sub, substr, sup, supplant, suppressUpdates, sync,
- system, table, "table-layout", tan, tbody, td, teal, tellWidget, test,
- "text-align", "text-decoration", "text-indent", "text-shadow",
- "text-transform", textarea, tfoot, th, thead, thistle, time, title,
- toLowerCase, toString, toUpperCase, toint32, token, tomato, top, tr, tt,
- turquoise, type, u, ul, undef, unescape, "unicode-bidi", unused,
- unwatch, updateNow, urls, value, valueOf, var, version,
- "vertical-align", video, violet, visibility, watch, wheat, white,
- "white-space", whitesmoke, widget, width, windows, "word-spacing",
- "word-wrap", yahooCheckLogin, yahooLogin, yahooLogout, yellow,
- yellowgreen, "z-index"
-*/
-
-// We build the application inside a function so that we produce only a single
-// global variable. The function will be invoked, its return value is the JSLINT
-// application itself.
-
-"use strict";
-
-var JSLINT = (function () {
- var adsafe_id, // The widget's ADsafe id.
- adsafe_may, // The widget may load approved scripts.
- adsafe_went, // ADSAFE.go has been called.
- anonname, // The guessed name for anonymous functions.
- approved, // ADsafe approved urls.
-
- atrule = {
- media : true,
- 'font-face': true,
- page : true
- },
-
-// These are operators that should not be used with the ! operator.
-
- bang = {
- '<': true,
- '<=': true,
- '==': true,
- '===': true,
- '!==': true,
- '!=': true,
- '>': true,
- '>=': true,
- '+': true,
- '-': true,
- '*': true,
- '/': true,
- '%': true
- },
-
-// These are members that should not be permitted in the safe subset.
-
- banned = { // the member names that ADsafe prohibits.
- 'arguments' : true,
- callee : true,
- caller : true,
- constructor : true,
- 'eval' : true,
- prototype : true,
- stack : true,
- unwatch : true,
- valueOf : true,
- watch : true
- },
-
-
-// These are the JSLint boolean options.
-
- boolOptions = {
- adsafe : true, // if ADsafe should be enforced
- bitwise : true, // if bitwise operators should not be allowed
- browser : true, // if the standard browser globals should be predefined
- cap : true, // if upper case HTML should be allowed
- css : true, // if CSS workarounds should be tolerated
- debug : true, // if debugger statements should be allowed
- devel : true, // if logging should be allowed (console, alert, etc.)
- eqeqeq : true, // if === should be required
- es5 : true, // if ES5 syntax should be allowed
- evil : true, // if eval should be allowed
- forin : true, // if for in statements must filter
- fragment : true, // if HTML fragments should be allowed
- immed : true, // if immediate invocations must be wrapped in parens
- laxbreak : true, // if line breaks should not be checked
- newcap : true, // if constructor names must be capitalized
- nomen : true, // if names should be checked
- on : true, // if HTML event handlers should be allowed
- onevar : true, // if only one var statement per function should be allowed
- passfail : true, // if the scan should stop on first error
- plusplus : true, // if increment/decrement should not be allowed
- regexp : true, // if the . should not be allowed in regexp literals
- rhino : true, // if the Rhino environment globals should be predefined
- undef : true, // if variables should be declared before used
- safe : true, // if use of some browser features should be restricted
- windows : true, // if MS Windows-specigic globals should be predefined
- strict : true, // require the "use strict"; pragma
- sub : true, // if all forms of subscript notation are tolerated
- white : true, // if strict whitespace rules apply
- widget : true // if the Yahoo Widgets globals should be predefined
- },
-
-// browser contains a set of global names which are commonly provided by a
-// web browser environment.
-
- browser = {
- addEventListener: false,
- blur : false,
- clearInterval : false,
- clearTimeout : false,
- close : false,
- closed : false,
- defaultStatus : false,
- document : false,
- event : false,
- focus : false,
- frames : false,
- getComputedStyle: false,
- history : false,
- Image : false,
- length : false,
- location : false,
- moveBy : false,
- moveTo : false,
- name : false,
- navigator : false,
- onbeforeunload : true,
- onblur : true,
- onerror : true,
- onfocus : true,
- onload : true,
- onresize : true,
- onunload : true,
- open : false,
- opener : false,
- Option : false,
- parent : false,
- print : false,
- removeEventListener: false,
- resizeBy : false,
- resizeTo : false,
- screen : false,
- scroll : false,
- scrollBy : false,
- scrollTo : false,
- setInterval : false,
- setTimeout : false,
- status : false,
- top : false,
- XMLHttpRequest : false
- },
-
- cssAttributeData,
- cssAny,
-
- cssColorData = {
- "aliceblue" : true,
- "antiquewhite" : true,
- "aqua" : true,
- "aquamarine" : true,
- "azure" : true,
- "beige" : true,
- "bisque" : true,
- "black" : true,
- "blanchedalmond" : true,
- "blue" : true,
- "blueviolet" : true,
- "brown" : true,
- "burlywood" : true,
- "cadetblue" : true,
- "chartreuse" : true,
- "chocolate" : true,
- "coral" : true,
- "cornflowerblue" : true,
- "cornsilk" : true,
- "crimson" : true,
- "cyan" : true,
- "darkblue" : true,
- "darkcyan" : true,
- "darkgoldenrod" : true,
- "darkgray" : true,
- "darkgreen" : true,
- "darkkhaki" : true,
- "darkmagenta" : true,
- "darkolivegreen" : true,
- "darkorange" : true,
- "darkorchid" : true,
- "darkred" : true,
- "darksalmon" : true,
- "darkseagreen" : true,
- "darkslateblue" : true,
- "darkslategray" : true,
- "darkturquoise" : true,
- "darkviolet" : true,
- "deeppink" : true,
- "deepskyblue" : true,
- "dimgray" : true,
- "dodgerblue" : true,
- "firebrick" : true,
- "floralwhite" : true,
- "forestgreen" : true,
- "fuchsia" : true,
- "gainsboro" : true,
- "ghostwhite" : true,
- "gold" : true,
- "goldenrod" : true,
- "gray" : true,
- "green" : true,
- "greenyellow" : true,
- "honeydew" : true,
- "hotpink" : true,
- "indianred" : true,
- "indigo" : true,
- "ivory" : true,
- "khaki" : true,
- "lavender" : true,
- "lavenderblush" : true,
- "lawngreen" : true,
- "lemonchiffon" : true,
- "lightblue" : true,
- "lightcoral" : true,
- "lightcyan" : true,
- "lightgoldenrodyellow" : true,
- "lightgreen" : true,
- "lightpink" : true,
- "lightsalmon" : true,
- "lightseagreen" : true,
- "lightskyblue" : true,
- "lightslategray" : true,
- "lightsteelblue" : true,
- "lightyellow" : true,
- "lime" : true,
- "limegreen" : true,
- "linen" : true,
- "magenta" : true,
- "maroon" : true,
- "mediumaquamarine" : true,
- "mediumblue" : true,
- "mediumorchid" : true,
- "mediumpurple" : true,
- "mediumseagreen" : true,
- "mediumslateblue" : true,
- "mediumspringgreen" : true,
- "mediumturquoise" : true,
- "mediumvioletred" : true,
- "midnightblue" : true,
- "mintcream" : true,
- "mistyrose" : true,
- "moccasin" : true,
- "navajowhite" : true,
- "navy" : true,
- "oldlace" : true,
- "olive" : true,
- "olivedrab" : true,
- "orange" : true,
- "orangered" : true,
- "orchid" : true,
- "palegoldenrod" : true,
- "palegreen" : true,
- "paleturquoise" : true,
- "palevioletred" : true,
- "papayawhip" : true,
- "peachpuff" : true,
- "peru" : true,
- "pink" : true,
- "plum" : true,
- "powderblue" : true,
- "purple" : true,
- "red" : true,
- "rosybrown" : true,
- "royalblue" : true,
- "saddlebrown" : true,
- "salmon" : true,
- "sandybrown" : true,
- "seagreen" : true,
- "seashell" : true,
- "sienna" : true,
- "silver" : true,
- "skyblue" : true,
- "slateblue" : true,
- "slategray" : true,
- "snow" : true,
- "springgreen" : true,
- "steelblue" : true,
- "tan" : true,
- "teal" : true,
- "thistle" : true,
- "tomato" : true,
- "turquoise" : true,
- "violet" : true,
- "wheat" : true,
- "white" : true,
- "whitesmoke" : true,
- "yellow" : true,
- "yellowgreen" : true
- },
-
- cssBorderStyle,
- cssBreak,
-
- cssLengthData = {
- '%': true,
- 'cm': true,
- 'em': true,
- 'ex': true,
- 'in': true,
- 'mm': true,
- 'pc': true,
- 'pt': true,
- 'px': true
- },
-
- cssOverflow,
-
- devel = {
- alert : false,
- confirm : false,
- console : false,
- Debug : false,
- opera : false,
- prompt : false
- },
-
- escapes = {
- '\b': '\\b',
- '\t': '\\t',
- '\n': '\\n',
- '\f': '\\f',
- '\r': '\\r',
- '"' : '\\"',
- '/' : '\\/',
- '\\': '\\\\'
- },
-
- funct, // The current function
-
- functionicity = [
- 'closure', 'exception', 'global', 'label',
- 'outer', 'unused', 'var'
- ],
-
- functions, // All of the functions
-
- global, // The global scope
- htmltag = {
- a: {},
- abbr: {},
- acronym: {},
- address: {},
- applet: {},
- area: {empty: true, parent: ' map '},
- article: {},
- aside: {},
- audio: {},
- b: {},
- base: {empty: true, parent: ' head '},
- bdo: {},
- big: {},
- blockquote: {},
- body: {parent: ' html noframes '},
- br: {empty: true},
- button: {},
- canvas: {parent: ' body p div th td '},
- caption: {parent: ' table '},
- center: {},
- cite: {},
- code: {},
- col: {empty: true, parent: ' table colgroup '},
- colgroup: {parent: ' table '},
- command: {parent: ' menu '},
- datalist: {},
- dd: {parent: ' dl '},
- del: {},
- details: {},
- dialog: {},
- dfn: {},
- dir: {},
- div: {},
- dl: {},
- dt: {parent: ' dl '},
- em: {},
- embed: {},
- fieldset: {},
- figure: {},
- font: {},
- footer: {},
- form: {},
- frame: {empty: true, parent: ' frameset '},
- frameset: {parent: ' html frameset '},
- h1: {},
- h2: {},
- h3: {},
- h4: {},
- h5: {},
- h6: {},
- head: {parent: ' html '},
- header: {},
- hgroup: {},
- hr: {empty: true},
- 'hta:application':
- {empty: true, parent: ' head '},
- html: {parent: '*'},
- i: {},
- iframe: {},
- img: {empty: true},
- input: {empty: true},
- ins: {},
- kbd: {},
- keygen: {},
- label: {},
- legend: {parent: ' details fieldset figure '},
- li: {parent: ' dir menu ol ul '},
- link: {empty: true, parent: ' head '},
- map: {},
- mark: {},
- menu: {},
- meta: {empty: true, parent: ' head noframes noscript '},
- meter: {},
- nav: {},
- noframes: {parent: ' html body '},
- noscript: {},
- object: {},
- ol: {},
- optgroup: {parent: ' select '},
- option: {parent: ' optgroup select '},
- output: {},
- p: {},
- param: {parent: ' applet object '},
- pre: {},
- progress: {},
- q: {},
- rp: {},
- rt: {},
- ruby: {},
- s: {},
- samp: {},
- script: {empty: true, parent: ' body div frame head iframe p pre span '},
- section: {},
- select: {},
- small: {},
- span: {},
- source: {},
- strong: {},
- style: {parent: ' head ', empty: true},
- sub: {},
- sup: {},
- table: {},
- tbody: {parent: ' table '},
- td: {parent: ' tr '},
- textarea: {},
- tfoot: {parent: ' table '},
- th: {parent: ' tr '},
- thead: {parent: ' table '},
- time: {},
- title: {parent: ' head '},
- tr: {parent: ' table tbody thead tfoot '},
- tt: {},
- u: {},
- ul: {},
- 'var': {},
- video: {}
- },
-
- ids, // HTML ids
- implied, // Implied globals
- inblock,
- indent,
- jsonmode,
- lines,
- lookahead,
- member,
- membersOnly,
- nexttoken,
- noreach,
- option,
- predefined, // Global variables defined by option
- prereg,
- prevtoken,
-
- rhino = {
- defineClass : false,
- deserialize : false,
- gc : false,
- help : false,
- load : false,
- loadClass : false,
- print : false,
- quit : false,
- readFile : false,
- readUrl : false,
- runCommand : false,
- seal : false,
- serialize : false,
- spawn : false,
- sync : false,
- toint32 : false,
- version : false
- },
-
- scope, // The current scope
-
- windows = {
- ActiveXObject: false,
- CScript : false,
- Debug : false,
- Enumerator : false,
- System : false,
- VBArray : false,
- WScript : false
- },
-
- src,
- stack,
-
-// standard contains the global names that are provided by the
-// ECMAScript standard.
-
- standard = {
- 'void' : false,
- Array : false,
- Boolean : false,
- Date : false,
- decodeURI : false,
- decodeURIComponent : false,
- encodeURI : false,
- encodeURIComponent : false,
- Error : false,
- 'eval' : false,
- EvalError : false,
- Function : false,
- hasOwnProperty : false,
- isFinite : false,
- isNaN : false,
- JSON : false,
- Math : false,
- Number : false,
- Object : false,
- parseInt : false,
- parseFloat : false,
- RangeError : false,
- ReferenceError : false,
- RegExp : false,
- String : false,
- SyntaxError : false,
- TypeError : false,
- URIError : false
- },
-
- standard_member = {
- E : true,
- LN2 : true,
- LN10 : true,
- LOG2E : true,
- LOG10E : true,
- PI : true,
- SQRT1_2 : true,
- SQRT2 : true,
- MAX_VALUE : true,
- MIN_VALUE : true,
- NEGATIVE_INFINITY : true,
- POSITIVE_INFINITY : true
- },
-
- strict_mode,
- syntax = {},
- tab,
- token,
- urls,
- warnings,
-
-// widget contains the global names which are provided to a Yahoo
-// (fna Konfabulator) widget.
-
- widget = {
- alert : true,
- animator : true,
- appleScript : true,
- beep : true,
- bytesToUIString : true,
- Canvas : true,
- chooseColor : true,
- chooseFile : true,
- chooseFolder : true,
- closeWidget : true,
- COM : true,
- convertPathToHFS : true,
- convertPathToPlatform : true,
- CustomAnimation : true,
- escape : true,
- FadeAnimation : true,
- filesystem : true,
- Flash : true,
- focusWidget : true,
- form : true,
- FormField : true,
- Frame : true,
- HotKey : true,
- Image : true,
- include : true,
- isApplicationRunning : true,
- iTunes : true,
- konfabulatorVersion : true,
- log : true,
- md5 : true,
- MenuItem : true,
- MoveAnimation : true,
- openURL : true,
- play : true,
- Point : true,
- popupMenu : true,
- preferenceGroups : true,
- preferences : true,
- print : true,
- prompt : true,
- random : true,
- Rectangle : true,
- reloadWidget : true,
- ResizeAnimation : true,
- resolvePath : true,
- resumeUpdates : true,
- RotateAnimation : true,
- runCommand : true,
- runCommandInBg : true,
- saveAs : true,
- savePreferences : true,
- screen : true,
- ScrollBar : true,
- showWidgetPreferences : true,
- sleep : true,
- speak : true,
- Style : true,
- suppressUpdates : true,
- system : true,
- tellWidget : true,
- Text : true,
- TextArea : true,
- Timer : true,
- unescape : true,
- updateNow : true,
- URL : true,
- Web : true,
- widget : true,
- Window : true,
- XMLDOM : true,
- XMLHttpRequest : true,
- yahooCheckLogin : true,
- yahooLogin : true,
- yahooLogout : true
- },
-
-// xmode is used to adapt to the exceptions in html parsing.
-// It can have these states:
-// false .js script file
-// html
-// outer
-// script
-// style
-// scriptstring
-// styleproperty
-
- xmode,
- xquote,
-
-// unsafe comment or string
- ax = /@cc|<\/?|script|\]*s\]|<\s*!|</i,
-// unsafe characters that are silently deleted by one or more browsers
-// Whitelist Replacement Char, 0xfffd
- cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\ufffc\ufffe-\uffff]/,
-// token
- tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/,
-// html token
- hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
-// characters in strings that need escapement
- nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
- nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-// outer html token
- ox = /[>&]|<[\/!]?|--/,
-// star slash
- lx = /\*\/|\/\*/,
-// identifier
- ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
-// javascript url
- jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
-// url badness
- ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto/i,
-// style
- sx = /^\s*([{:#%.=,>+\[\]@()"';]|\*=?|\$=|\|=|\^=|~=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
- ssx = /^\s*(\.?\d+(?:\.\d+)?|[@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|<\/)/,
-// attributes characters
- //qx = /[^a-zA-Z0-9+\-_\/ ]/,
- qx = /[^a-zA-Z0-9+\-_\/ .#]/, // We want dots in names, period; and hashes for templating
-// query characters for ids
- //dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
- // allow . and /
- dx = /[\[\]\\"'*<>&:(){}+=#]/,
-
- rx = {
- outer: hx,
- html: hx,
- style: sx,
- styleproperty: ssx
- };
-
- function F() {}
-
- if (typeof Object.create !== 'function') {
- Object.create = function (o) {
- F.prototype = o;
- return new F();
- };
- }
-
-
- function is_own(object, name) {
- return Object.prototype.hasOwnProperty.call(object, name);
- }
-
-
- function combine(t, o) {
- var n;
- for (n in o) {
- if (is_own(o, n)) {
- t[n] = o[n];
- }
- }
- }
-
- String.prototype.entityify = function () {
- return this.
- replace(/&/g, '&').
- replace(/</g, '<').
- replace(/>/g, '>');
- };
-
- String.prototype.isAlpha = function () {
- return (this >= 'a' && this <= 'z\uffff') ||
- (this >= 'A' && this <= 'Z\uffff');
- };
-
-
- String.prototype.isDigit = function () {
- return (this >= '0' && this <= '9');
- };
-
-
- String.prototype.supplant = function (o) {
- return this.replace(/\{([^{}]*)\}/g, function (a, b) {
- var r = o[b];
- return typeof r === 'string' || typeof r === 'number' ? r : a;
- });
- };
-
- String.prototype.name = function () {
-
-// If the string looks like an identifier, then we can return it as is.
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can simply slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe
-// sequences.
-
- if (ix.test(this)) {
- return this;
- }
- if (nx.test(this)) {
- return '"' + this.replace(nxg, function (a) {
- var c = escapes[a];
- if (c) {
- return c;
- }
- return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
- }) + '"';
- }
- return '"' + this + '"';
- };
-
-
- function assume() {
- if (!option.safe) {
- if (option.rhino) {
- combine(predefined, rhino);
- }
- if (option.devel) {
- combine(predefined, devel);
- }
- if (option.browser) {
- combine(predefined, browser);
- }
- if (option.windows) {
- combine(predefined, windows);
- }
- if (option.widget) {
- combine(predefined, widget);
- }
- }
- }
-
-
-// Produce an error warning.
-
- function quit(m, l, ch) {
- throw {
- name: 'JSLintError',
- line: l,
- character: ch,
- message: m + " (" + Math.floor((l / lines.length) * 100) +
- "% scanned)."
- };
- }
-
- function warning(m, t, a, b, c, d) {
- var ch, l, w;
- t = t || nexttoken;
- if (t.id === '(end)') { // `~
- t = token;
- }
- l = t.line || 0;
- ch = t.from || 0;
- w = {
- id: '(error)',
- raw: m,
- evidence: lines[l - 1] || '',
- line: l,
- character: ch,
- a: a,
- b: b,
- c: c,
- d: d
- };
- w.reason = m.supplant(w);
- JSLINT.errors.push(w);
- if (option.passfail) {
- quit('Stopping. ', l, ch);
- }
- warnings += 1;
- if (warnings >= option.maxerr) {
- quit("Too many errors.", l, ch);
- }
- return w;
- }
-
- function warningAt(m, l, ch, a, b, c, d) {
- return warning(m, {
- line: l,
- from: ch
- }, a, b, c, d);
- }
-
- function error(m, t, a, b, c, d) {
- var w = warning(m, t, a, b, c, d);
- quit("Stopping, unable to continue.", w.line, w.character);
- }
-
- function errorAt(m, l, ch, a, b, c, d) {
- return error(m, {
- line: l,
- from: ch
- }, a, b, c, d);
- }
-
-
-
-// lexical analysis
-
- var lex = (function lex() {
- var character, from, line, s;
-
-// Private lex methods
-
- function nextLine() {
- var at;
- if (line >= lines.length) {
- return false;
- }
- character = 1;
- s = lines[line];
- line += 1;
- at = s.search(/ \t/);
- if (at >= 0) {
- warningAt("Mixed spaces and tabs.", line, at + 1);
- }
- s = s.replace(/\t/g, tab);
- at = s.search(cx);
- if (at >= 0) {
- warningAt("Unsafe character.", line, at);
- }
- if (option.maxlen && option.maxlen < s.length) {
- warningAt("Line too long.", line, s.length);
- }
- return true;
- }
-
-// Produce a token object. The token inherits from a syntax symbol.
-
- function it(type, value) {
- var i, t;
- if (type === '(color)') {
- t = {type: type};
- } else if (type === '(punctuator)' ||
- (type === '(identifier)' && is_own(syntax, value))) {
- t = syntax[value] || syntax['(error)'];
- } else {
- t = syntax[type];
- }
- t = Object.create(t);
- if (type === '(string)' || type === '(range)') {
- if (jx.test(value)) {
- warningAt("Script URL.", line, from);
- }
- }
- if (type === '(identifier)') {
- t.identifier = true;
- if (value === '__iterator__' || value === '__proto__') {
- errorAt("Reserved name '{a}'.",
- line, from, value);
- } else if (option.nomen &&
- (value.charAt(0) === '_' ||
- value.charAt(value.length - 1) === '_')) {
- warningAt("Unexpected {a} in '{b}'.", line, from,
- "dangling '_'", value);
- }
- }
- t.value = value;
- t.line = line;
- t.character = character;
- t.from = from;
- i = t.id;
- if (i !== '(endline)') {
- prereg = i &&
- (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
- i === 'return');
- }
- return t;
- }
-
-// Public lex methods
-
- return {
- init: function (source) {
- if (typeof source === 'string') {
- lines = source.
- replace(/\r\n/g, '\n').
- replace(/\r/g, '\n').
- split('\n');
- } else {
- lines = source;
- }
- line = 0;
- nextLine();
- from = 1;
- },
-
- range: function (begin, end) {
- var c, value = '';
- from = character;
- if (s.charAt(0) !== begin) {
- errorAt("Expected '{a}' and instead saw '{b}'.",
- line, character, begin, s.charAt(0));
- }
- for (;;) {
- s = s.slice(1);
- character += 1;
- c = s.charAt(0);
- switch (c) {
- case '':
- errorAt("Missing '{a}'.", line, character, c);
- break;
- case end:
- s = s.slice(1);
- character += 1;
- return it('(range)', value);
- case xquote:
- case '\\':
- warningAt("Unexpected '{a}'.", line, character, c);
- }
- value += c;
- }
-
- },
-
-// skip all content up to marker
-
- skip_till: function (end) {
- for (;;) {
- i = s.indexOf(end);
- if (i >= 0) {
- break;
- }
- if (!nextLine()) {
- errorAt("Unclosed {a} block.", line, character, end);
- }
- }
- character += i;
- s = s.substr(i);
- },
-
-// token -- this is called by advance to get the next token.
-
- token: function () {
- var b, c, captures, d, depth, high, i, l, low, q, t;
-
- function match(x) {
- var r = x.exec(s), r1;
- if (r) {
- l = r[0].length;
- r1 = r[1];
- c = r1.charAt(0);
- s = s.substr(l);
- from = character + l - r1.length;
- character += l;
- return r1;
- }
- }
-
- function string(x) {
- var c, j, r = '';
-
- if (jsonmode && x !== '"') {
- warningAt("Strings must use doublequote.",
- line, character);
- }
-
- if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
- return it('(punctuator)', x);
- }
-
- function esc(n) {
- var i = parseInt(s.substr(j + 1, n), 16);
- j += n;
- if (i >= 32 && i <= 126 &&
- i !== 34 && i !== 92 && i !== 39) {
- warningAt("Unnecessary escapement.", line, character);
- }
- character += n;
- c = String.fromCharCode(i);
- }
- j = 0;
- for (;;) {
- while (j >= s.length) {
- j = 0;
- if (xmode !== 'html' || !nextLine()) {
- errorAt("Unclosed string.", line, from);
- }
- }
- c = s.charAt(j);
- if (c === x) {
- character += 1;
- s = s.substr(j + 1);
- return it('(string)', r, x);
- }
- if (c < ' ') {
- if (c === '\n' || c === '\r') {
- break;
- }
- warningAt("Control character in string: {a}.",
- line, character + j, s.slice(0, j));
- } else if (c === xquote) {
- warningAt("Bad HTML string", line, character + j);
- } else if (c === '<') {
- if (option.safe && xmode === 'html') {
- warningAt("ADsafe string violation.",
- line, character + j);
- } else if (s.charAt(j + 1) === '/' && (xmode || option.safe) && s.substr(j + 2, 6) === 'script') {
- warningAt("Expected '<\\/' and instead saw '</'.", line, character);
- } else if (s.charAt(j + 1) === '!' && (xmode || option.safe)) {
- warningAt("Unexpected '<!' in a string.", line, character);
- }
- } else if (c === '\\') {
- if (xmode === 'html') {
- if (option.safe) {
- warningAt("ADsafe string violation.",
- line, character + j);
- }
- } else if (xmode === 'styleproperty') {
- j += 1;
- character += 1;
- c = s.charAt(j);
- if (c !== x) {
- warningAt("Escapement in style string.",
- line, character + j);
- }
- } else {
- j += 1;
- character += 1;
- c = s.charAt(j);
- switch (c) {
- case xquote:
- warningAt("Bad HTML string", line,
- character + j);
- break;
- case '\\':
- case '\'':
- case '"':
- case '/':
- break;
- case 'b':
- c = '\b';
- break;
- case 'f':
- c = '\f';
- break;
- case 'n':
- c = '\n';
- break;
- case 'r':
- c = '\r';
- break;
- case 't':
- c = '\t';
- break;
- case 'u':
- esc(4);
- break;
- case 'v':
- c = '\v';
- break;
- case 'x':
- if (jsonmode) {
- warningAt("Avoid \\x-.", line, character);
- }
- esc(2);
- break;
- default:
- warningAt("Bad escapement.", line, character);
- }
- }
- }
- r += c;
- character += 1;
- j += 1;
- }
- }
-
- for (;;) {
- if (!s) {
- return it(nextLine() ? '(endline)' : '(end)', '');
- }
- while (xmode === 'outer') {
- i = s.search(ox);
- if (i === 0) {
- break;
- } else if (i > 0) {
- character += 1;
- s = s.slice(i);
- break;
- } else {
- if (!nextLine()) {
- return it('(end)', '');
- }
- }
- }
-// t = match(rx[xmode] || tx);
-// if (!t) {
-// if (xmode === 'html') {
-// return it('(error)', s.charAt(0));
-// } else {
-// t = '';
-// c = '';
-// while (s && s < '!') {
-// s = s.substr(1);
-// }
-// if (s) {
-// errorAt("Unexpected '{a}'.",
-// line, character, s.substr(0, 1));
-// }
-// }
- t = match(rx[xmode] || tx);
- if (!t) {
- t = '';
- c = '';
- while (s && s < '!') {
- s = s.substr(1);
- }
- if (s) {
- if (xmode === 'html') {
- return it('(error)', s.charAt(0));
- } else {
- errorAt("Unexpected '{a}'.",
- line, character, s.substr(0, 1));
- }
- }
- } else {
-
- // identifier
-
- if (c.isAlpha() || c === '_' || c === '$') {
- return it('(identifier)', t);
- }
-
- // number
-
- if (c.isDigit() || (c === '.' && t.substr(1, 1).isDigit())) {
- if (c === '.') {
- t = '0' + t;
- c = '0';
- }
-
- if (xmode !== 'style' && !isFinite(Number(t))) {
- warningAt("Bad number '{a}'.",
- line, character, t);
- }
- if (xmode !== 'style' &&
- xmode !== 'styleproperty' &&
- s.substr(0, 1).isAlpha()) {
- warningAt("Missing space after '{a}'.",
- line, character, t);
- }
- if (c === '0') {
- d = t.substr(1, 1);
- if (d.isDigit()) {
- if (token.id !== '.' && xmode !== 'styleproperty') {
- warningAt("Don't use extra leading zeros '{a}'.",
- line, character, t);
- }
- } else if (jsonmode && (d === 'x' || d === 'X')) {
- warningAt("Avoid 0x-. '{a}'.",
- line, character, t);
- }
- }
- if (t.substr(t.length - 1) === '.') {
- warningAt(
- "A trailing decimal point can be confused with a dot '{a}'.",
- line, character, t);
- }
- return it('(number)', t);
- }
- switch (t) {
-
- // string
-
- case '"':
- case "'":
- return string(t);
-
- // // comment
-
- case '//':
- if (src || (xmode && xmode !== 'script')) {
- warningAt("Unexpected comment.", line, character);
- } else if (xmode === 'script' && /<\s*\//i.test(s)) {
- warningAt("Unexpected <\/ in comment.", line, character);
- } else if ((option.safe || xmode === 'script') && ax.test(s)) {
- warningAt("Dangerous comment.", line, character);
- }
- s = '';
- token.comment = true;
- break;
-
- // /* comment
-
- case '/*':
- if (src || (xmode && xmode !== 'script' && xmode !== 'style' && xmode !== 'styleproperty')) {
- warningAt("Unexpected comment.", line, character);
- }
- if (option.safe && ax.test(s)) {
- warningAt("ADsafe comment violation.", line, character);
- }
- for (;;) {
- i = s.search(lx);
- if (i >= 0) {
- break;
- }
- if (!nextLine()) {
- errorAt("Unclosed comment.", line, character);
- } else {
- if (option.safe && ax.test(s)) {
- warningAt("ADsafe comment violation.",
- line, character);
- }
- }
- }
- character += i + 2;
- if (s.substr(i, 1) === '/') {
- errorAt("Nested comment.", line, character);
- }
- s = s.substr(i + 2);
- token.comment = true;
- break;
-
- // /*members /*jslint /*global
-
- case '/*members':
- case '/*member':
- case '/*jslint':
- case '/*global':
- case '*/':
- return {
- value: t,
- type: 'special',
- line: line,
- character: character,
- from: from
- };
-
- case '':
- break;
- // /
- case '/':
- if (token.id === '/=') {
- errorAt(
-"A regular expression literal can be confused with '/='.", line, from);
- }
- if (prereg) {
- depth = 0;
- captures = 0;
- l = 0;
- for (;;) {
- b = true;
- c = s.charAt(l);
- l += 1;
- switch (c) {
- case '':
- errorAt("Unclosed regular expression.",
- line, from);
- return;
- case '/':
- if (depth > 0) {
- warningAt("Unescaped '{a}'.",
- line, from + l, '/');
- }
- c = s.substr(0, l - 1);
- q = {
- g: true,
- i: true,
- m: true
- };
- while (q[s.charAt(l)] === true) {
- q[s.charAt(l)] = false;
- l += 1;
- }
- character += l;
- s = s.substr(l);
- q = s.charAt(0);
- if (q === '/' || q === '*') {
- errorAt("Confusing regular expression.",
- line, from);
- }
- return it('(regexp)', c);
- case '\\':
- c = s.charAt(l);
- if (c < ' ') {
- warningAt(
-"Unexpected control character in regular expression.", line, from + l);
- } else if (c === '<') {
- warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
- }
- l += 1;
- break;
- case '(':
- depth += 1;
- b = false;
- if (s.charAt(l) === '?') {
- l += 1;
- switch (s.charAt(l)) {
- case ':':
- case '=':
- case '!':
- l += 1;
- break;
- default:
- warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
- }
- } else {
- captures += 1;
- }
- break;
- case '|':
- b = false;
- break;
- case ')':
- if (depth === 0) {
- warningAt("Unescaped '{a}'.",
- line, from + l, ')');
- } else {
- depth -= 1;
- }
- break;
- case ' ':
- q = 1;
- while (s.charAt(l) === ' ') {
- l += 1;
- q += 1;
- }
- if (q > 1) {
- warningAt(
-"Spaces are hard to count. Use {{a}}.", line, from + l, q);
- }
- break;
- case '[':
- c = s.charAt(l);
- if (c === '^') {
- l += 1;
- if (option.regexp) {
- warningAt("Insecure '{a}'.",
- line, from + l, c);
- }
- }
- q = false;
- if (c === ']') {
- warningAt("Empty class.", line,
- from + l - 1);
- q = true;
- }
-klass: do {
- c = s.charAt(l);
- l += 1;
- switch (c) {
- case '[':
- case '^':
- warningAt("Unescaped '{a}'.",
- line, from + l, c);
- q = true;
- break;
- case '-':
- if (q) {
- q = false;
- } else {
- warningAt("Unescaped '{a}'.",
- line, from + l, '-');
- q = true;
- }
- break;
- case ']':
- if (!q) {
- warningAt("Unescaped '{a}'.",
- line, from + l - 1, '-');
- }
- break klass;
- case '\\':
- c = s.charAt(l);
- if (c < ' ') {
- warningAt(
-"Unexpected control character in regular expression.", line, from + l);
- } else if (c === '<') {
- warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
- }
- l += 1;
- q = true;
- break;
- case '/':
- warningAt("Unescaped '{a}'.",
- line, from + l - 1, '/');
- q = true;
- break;
- case '<':
- if (xmode === 'script') {
- c = s.charAt(l);
- if (c === '!' || c === '/') {
- warningAt(
-"HTML confusion in regular expression '<{a}'.", line, from + l, c);
- }
- }
- q = true;
- break;
- default:
- q = true;
- }
- } while (c);
- break;
- case '.':
- if (option.regexp) {
- warningAt("Insecure '{a}'.", line,
- from + l, c);
- }
- break;
- case ']':
- case '?':
- case '{':
- case '}':
- case '+':
- case '*':
- warningAt("Unescaped '{a}'.", line,
- from + l, c);
- break;
- case '<':
- if (xmode === 'script') {
- c = s.charAt(l);
- if (c === '!' || c === '/') {
- warningAt(
-"HTML confusion in regular expression '<{a}'.", line, from + l, c);
- }
- }
- }
- if (b) {
- switch (s.charAt(l)) {
- case '?':
- case '+':
- case '*':
- l += 1;
- if (s.charAt(l) === '?') {
- l += 1;
- }
- break;
- case '{':
- l += 1;
- c = s.charAt(l);
- if (c < '0' || c > '9') {
- warningAt(
-"Expected a number and instead saw '{a}'.", line, from + l, c);
- }
- l += 1;
- low = +c;
- for (;;) {
- c = s.charAt(l);
- if (c < '0' || c > '9') {
- break;
- }
- l += 1;
- low = +c + (low * 10);
- }
- high = low;
- if (c === ',') {
- l += 1;
- high = Infinity;
- c = s.charAt(l);
- if (c >= '0' && c <= '9') {
- l += 1;
- high = +c;
- for (;;) {
- c = s.charAt(l);
- if (c < '0' || c > '9') {
- break;
- }
- l += 1;
- high = +c + (high * 10);
- }
- }
- }
- if (s.charAt(l) !== '}') {
- warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
- } else {
- l += 1;
- }
- if (s.charAt(l) === '?') {
- l += 1;
- }
- if (low > high) {
- warningAt(
-"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
- }
- }
- }
- }
- c = s.substr(0, l - 1);
- character += l;
- s = s.substr(l);
- return it('(regexp)', c);
- }
- return it('(punctuator)', t);
-
- // punctuator
-
- case '<!--':
- l = line;
- c = character;
- for (;;) {
- i = s.indexOf('--');
- if (i >= 0) {
- break;
- }
- i = s.indexOf('<!-');
- if (i >= 0) {
- errorAt("Nested HTML comment.",
- line, character + i);
- }
- if (!nextLine()) {
- errorAt("Unclosed HTML comment.", l, c);
- }
- }
- l = s.indexOf('<!-');
- if (l >= 0 && l < i) {
- errorAt("Nested HTML comment.",
- line, character + l);
- }
- character += i;
- if (s[i + 2] !== '>') {
- errorAt("Expected -->.", line, character);
- }
- character += 3;
- s = s.slice(i + 3);
- break;
- case '#':
- if (xmode === 'html' || xmode === 'styleproperty') {
- for (;;) {
- c = s.charAt(0);
- if ((c < '0' || c > '9') &&
- (c < 'a' || c > 'f') &&
- (c < 'A' || c > 'F')) {
- break;
- }
- character += 1;
- s = s.substr(1);
- t += c;
- }
- if (t.length !== 4 && t.length !== 7) {
- warningAt("Bad hex color '{a}'.", line,
- from + l, t);
- }
- return it('(color)', t);
- }
- return it('(punctuator)', t);
- default:
- if (xmode === 'outer' && c === '&') {
- character += 1;
- s = s.substr(1);
- for (;;) {
- c = s.charAt(0);
- character += 1;
- s = s.substr(1);
- if (c === ';') {
- break;
- }
- if (!((c >= '0' && c <= '9') ||
- (c >= 'a' && c <= 'z') ||
- c === '#')) {
- errorAt("Bad entity", line, from + l,
- character);
- }
- }
- break;
- }
- return it('(punctuator)', t);
- }
- }
- }
- }
- };
- }());
-
-
- function addlabel(t, type) {
-
- if (option.safe && funct['(global)'] &&
- typeof predefined[t] !== 'boolean') {
- warning('ADsafe global: ' + t + '.', token);
- } else if (t === 'hasOwnProperty') {
- warning("'hasOwnProperty' is a really bad name.");
- }
-
-// Define t in the current function in the current scope.
-
- if (is_own(funct, t) && !funct['(global)']) {
- warning(funct[t] === true ?
- "'{a}' was used before it was defined." :
- "'{a}' is already defined.",
- nexttoken, t);
- }
- funct[t] = type;
- if (funct['(global)']) {
- global[t] = funct;
- if (is_own(implied, t)) {
- warning("'{a}' was used before it was defined.", nexttoken, t);
- delete implied[t];
- }
- } else {
- scope[t] = funct;
- }
- }
-
-
- function doOption() {
- var b, obj, filter, o = nexttoken.value, t, v;
- switch (o) {
- case '*/':
- error("Unbegun comment.");
- break;
- case '/*members':
- case '/*member':
- o = '/*members';
- if (!membersOnly) {
- membersOnly = {};
- }
- obj = membersOnly;
- break;
- case '/*jslint':
- if (option.safe) {
- warning("ADsafe restriction.");
- }
- obj = option;
- filter = boolOptions;
- break;
- case '/*global':
- if (option.safe) {
- warning("ADsafe restriction.");
- }
- obj = predefined;
- break;
- default:
- }
- t = lex.token();
-loop: for (;;) {
- for (;;) {
- if (t.type === 'special' && t.value === '*/') {
- break loop;
- }
- if (t.id !== '(endline)' && t.id !== ',') {
- break;
- }
- t = lex.token();
- }
- if (t.type !== '(string)' && t.type !== '(identifier)' &&
- o !== '/*members') {
- error("Bad option.", t);
- }
- v = lex.token();
- if (v.id === ':') {
- v = lex.token();
- if (obj === membersOnly) {
- error("Expected '{a}' and instead saw '{b}'.",
- t, '*/', ':');
- }
- if (t.value === 'indent' && o === '/*jslint') {
- b = +v.value;
- if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
- Math.floor(b) !== b) {
- error("Expected a small integer and instead saw '{a}'.",
- v, v.value);
- }
- obj.white = true;
- obj.indent = b;
- } else if (t.value === 'maxerr' && o === '/*jslint') {
- b = +v.value;
- if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
- Math.floor(b) !== b) {
- error("Expected a small integer and instead saw '{a}'.",
- v, v.value);
- }
- obj.maxerr = b;
- } else if (t.value === 'maxlen' && o === '/*jslint') {
- b = +v.value;
- if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
- Math.floor(b) !== b) {
- error("Expected a small integer and instead saw '{a}'.",
- v, v.value);
- }
- obj.maxlen = b;
- } else if (v.value === 'true') {
- obj[t.value] = true;
- } else if (v.value === 'false') {
- obj[t.value] = false;
- } else {
- error("Bad option value.", v);
- }
- t = lex.token();
- } else {
- if (o === '/*jslint') {
- error("Missing option value.", t);
- }
- obj[t.value] = false;
- t = v;
- }
- }
- if (filter) {
- assume();
- }
- }
-
-
-// We need a peek function. If it has an argument, it peeks that much farther
-// ahead. It is used to distinguish
-// for ( var i in ...
-// from
-// for ( var i = ...
-
- function peek(p) {
- var i = p || 0, j = 0, t;
-
- while (j <= i) {
- t = lookahead[j];
- if (!t) {
- t = lookahead[j] = lex.token();
- }
- j += 1;
- }
- return t;
- }
-
-
-
-// Produce the next token. It looks for programming errors.
-
- function advance(id, t) {
- switch (token.id) {
- case '(number)':
- if (nexttoken.id === '.') {
- warning(
-"A dot following a number can be confused with a decimal point.", token);
- }
- break;
- case '-':
- if (nexttoken.id === '-' || nexttoken.id === '--') {
- warning("Confusing minusses.");
- }
- break;
- case '+':
- if (nexttoken.id === '+' || nexttoken.id === '++') {
- warning("Confusing plusses.");
- }
- break;
- }
- if (token.type === '(string)' || token.identifier) {
- anonname = token.value;
- }
-
- if (id && nexttoken.id !== id) {
- if (t) {
- if (nexttoken.id === '(end)') {
- warning("Unmatched '{a}'.", t, t.id);
- } else {
- warning(
-"Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
- nexttoken, id, t.id, t.line, nexttoken.value);
- }
- } else if (nexttoken.type !== '(identifier)' ||
- nexttoken.value !== id) {
- warning("Expected '{a}' and instead saw '{b}'.",
- nexttoken, id, nexttoken.value);
- }
- }
- prevtoken = token;
- token = nexttoken;
- for (;;) {
- nexttoken = lookahead.shift() || lex.token();
- if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
- return;
- }
- if (nexttoken.type === 'special') {
- doOption();
- } else {
- if (nexttoken.id !== '(endline)') {
- break;
- }
- }
- }
- }
-
-
-// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add to Pratt's model .fud, which is
-// like nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define JavaScript. I retained Pratt's
-// nomenclature.
-
-// .nud Null denotation
-// .fud First null denotation
-// .led Left denotation
-// lbp Left binding power
-// rbp Right binding power
-
-// They are key to the parsing method called Top Down Operator Precedence.
-
- function parse(rbp, initial) {
- var left;
- if (nexttoken.id === '(end)') {
- error("Unexpected early end of program.", token);
- }
- advance();
- if (option.safe && typeof predefined[token.value] === 'boolean' &&
- (nexttoken.id !== '(' && nexttoken.id !== '.')) {
- warning('ADsafe violation.', token);
- }
- if (initial) {
- anonname = 'anonymous';
- funct['(verb)'] = token.value;
- }
- if (initial === true && token.fud) {
- left = token.fud();
- } else {
- if (token.nud) {
- left = token.nud();
- } else {
- if (nexttoken.type === '(number)' && token.id === '.') {
- warning(
-"A leading decimal point can be confused with a dot: '.{a}'.",
- token, nexttoken.value);
- advance();
- return token;
- } else {
- error("Expected an identifier and instead saw '{a}'.",
- token, token.id);
- }
- }
- while (rbp < nexttoken.lbp) {
- advance();
- if (token.led) {
- left = token.led(left);
- } else {
- error("Expected an operator and instead saw '{a}'.",
- token, token.id);
- }
- }
- }
- return left;
- }
-
-
-// Functions for conformance of style.
-
- function adjacent(left, right) {
- left = left || token;
- right = right || nexttoken;
- if (option.white || xmode === 'styleproperty' || xmode === 'style') {
- if (left.character !== right.from && left.line === right.line) {
- warning("Unexpected space after '{a}'.", right, left.value);
- }
- }
- }
-
- function nospace(left, right) {
- left = left || token;
- right = right || nexttoken;
- if (option.white && !left.comment) {
- if (left.line === right.line) {
- adjacent(left, right);
- }
- }
- }
-
-
- function nonadjacent(left, right) {
- if (option.white) {
- left = left || token;
- right = right || nexttoken;
- if (left.line === right.line && left.character === right.from) {
- warning("Missing space after '{a}'.",
-
<TRUNCATED>
[04/27] git commit: [#6220] Add help for video embedding
Posted by jo...@apache.org.
[#6220] Add help for video embedding
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8fd2f6fc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8fd2f6fc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8fd2f6fc
Branch: refs/heads/cj/4656
Commit: 8fd2f6fc77eb82cff70a605c41821717202d2f4d
Parents: f1938c5
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Jul 10 21:30:28 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 10 21:30:28 2013 +0000
----------------------------------------------------------------------
Allura/allura/templates/jinja_master/lib.html | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8fd2f6fc/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index a5bfa29..a3e8d6b 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -153,6 +153,7 @@
<li><a href="#md_ex_headers{{id}}">Headers</a></li>
<li><a href="#md_ex_hr{{id}}">Horizontal Rules</a></li>
<li><a href="#md_ex_img{{id}}">Images</a></li>
+ <li><a href="#md_ex_video{{id}}">Videos</a></li>
<li><a href="#md_ex_escapes{{id}}">Escapes and HTML</a></li>
<li><a href="#md_ex_moreheaders{{id}}">More Headers</a></li>
<li><a href="#md_ex_toc1{{id}}">Table of Contents</a></li>
@@ -527,6 +528,18 @@ image.</p>
</div>
+<div class="markdown_syntax_section hidden_in_modal md_ex_video{{id}}">
+<h2 id="md_ex_video{{id}}">Videos</h2>
+<p>To embed a YouTube video, use the `embed` macro (only YouTube is supported at this time):</p>
+<div class="codehilite"><pre>
+[[embed url=http://www.youtube.com/watch?v=6YbBmqUnoQM]]
+</pre></div>
+
+<p>Output:</p>
+{{g.markdown.convert('''[[embed url=http://www.youtube.com/watch?v=6YbBmqUnoQM]]''')}}
+</div>
+
+
<div class="markdown_syntax_section hidden_in_modal md_ex_escapes{{id}}">
<h2 id="md_ex_escapes{{id}}">Escapes and HTML</h2>
<p>What if you want to just show asterisks, not italics?</p>
@@ -685,7 +698,7 @@ allowed, permitting basic styling and layout: <div markdown style="float:left
</pre></div>
</div>
-<div class="markdown_syntax_section hidden_in_modal md_ex_project_macros{{id}}">
+<div class="markdown_syntax_section hidden_in_modal md_ex_project_macros{{id}}" id="md_ex_project_macros{{id}}">
<h2 id="md_ex_download_button{{id}}">Download Button</h2>
<p>You can display a download button that links to the best download available for the active project. Please note that if you use this macro and there is no download associated with your project, the button will not appear.</p>
[18/27] git commit: fix indentation
Posted by jo...@apache.org.
fix indentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/94b75f0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/94b75f0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/94b75f0a
Branch: refs/heads/cj/4656
Commit: 94b75f0a158f06f3c57690c8fdae51d452cf9015
Parents: 37e91c9
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Sat May 25 13:28:20 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Jul 11 21:30:46 2013 +0000
----------------------------------------------------------------------
AlluraTest/alluratest/validation.py | 175 ++++++++++++++++---------------
1 file changed, 91 insertions(+), 84 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/94b75f0a/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index 235d7c0..7a5fd0b 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -115,112 +115,118 @@ def report_validation_error(val_name, filename, message):
else:
sys.stderr.write('=' * 40 + '\n' + message)
+
def dump_to_file(prefix, html):
f = tempfile.NamedTemporaryFile(prefix=prefix, delete=False)
f.write(html)
f.close()
return f.name
+
def validate_html(html_or_response):
- if hasattr(html_or_response, 'body'):
- html = html_or_response.body
- else:
- html = html_or_response
+ if hasattr(html_or_response, 'body'):
+ html = html_or_response.body
+ else:
+ html = html_or_response
- html = html.lstrip()
+ html = html.lstrip()
+
+ if html.startswith('<!DOCTYPE html>'):
+ return validate_html5(html)
+ else:
+ assert False, 'Non-valid HTML: ' + html[:100] + '...'
- if html.startswith('<!DOCTYPE html>'):
- return validate_html5(html)
- else:
- assert False, 'Non-valid HTML: ' + html[:100] + '...'
def validate_json(json_or_response):
- if hasattr(json_or_response, 'body'):
- j = json_or_response.body
- else:
- j = json_or_response
+ if hasattr(json_or_response, 'body'):
+ j = json_or_response.body
+ else:
+ j = json_or_response
- try:
- obj = json.loads(j)
- except Exception, e:
- ok_(False, "Couldn't validate JSON: " + str(e) + ':' + j[:100] + '...')
+ try:
+ obj = json.loads(j)
+ except Exception, e:
+ ok_(False, "Couldn't validate JSON: " + str(e) + ':' + j[:100] + '...')
+
+ return obj
- return obj
def validate_html5(html_or_response):
- if hasattr(html_or_response, 'body'):
- html = html_or_response.body
- else:
- html = html_or_response
- register_openers()
- params = [("out","text"),("content",html)]
- datagen, headers = multipart_encode(params)
- request = urllib2.Request("http://html5.validator.nu/", datagen, headers)
- count = 3
- while True:
- try:
- resp = urllib2.urlopen(request, timeout=3).read()
+ if hasattr(html_or_response, 'body'):
+ html = html_or_response.body
+ else:
+ html = html_or_response
+ register_openers()
+ params = [("out","text"),("content",html)]
+ datagen, headers = multipart_encode(params)
+ request = urllib2.Request("http://html5.validator.nu/", datagen, headers)
+ count = 3
+ while True:
+ try:
+ resp = urllib2.urlopen(request, timeout=3).read()
+ break
+ except:
+ resp = "Couldn't connect to validation service to check the HTML"
+ count -= 1
+ if count == 0:
+ sys.stderr.write('WARNING: ' + resp + '\n')
break
- except:
- resp = "Couldn't connect to validation service to check the HTML"
- count -= 1
- if count == 0:
- sys.stderr.write('WARNING: ' + resp + '\n')
- break
-
- resp = resp.replace('“','"').replace('”','"').replace('–','-')
-
- ignored_errors = [
- 'Required attributes missing on element "object"',
- 'Stray end tag "embed".',
- 'Stray end tag "param".',
- r'Bad value .+? for attribute "onclick" on element "input": invalid return',
- ]
- for ignore in ignored_errors:
- resp = re.sub('Error: ' + ignore, 'Ignoring: ' + ignore, resp)
-
- if 'Error:' in resp:
- fname = dump_to_file('html5-', html)
- message = resp.decode('ascii','ignore')
- report_validation_error('html5', fname, message)
+
+ resp = resp.replace('“','"').replace('”','"').replace('–','-')
+
+ ignored_errors = [
+ 'Required attributes missing on element "object"',
+ 'Stray end tag "embed".',
+ 'Stray end tag "param".',
+ r'Bad value .+? for attribute "onclick" on element "input": invalid return',
+ ]
+ for ignore in ignored_errors:
+ resp = re.sub('Error: ' + ignore, 'Ignoring: ' + ignore, resp)
+
+ if 'Error:' in resp:
+ fname = dump_to_file('html5-', html)
+ message = resp.decode('ascii','ignore')
+ report_validation_error('html5', fname, message)
def validate_html5_chunk(html):
- """ When you don't have a html & body tags - this adds it"""
- # WebTest doesn't like HTML fragments without doctype,
- # so we output them sometimes for fragments, which is hack.
- # Unhack it here.
- doctype = '<!DOCTYPE html>'
- if html.startswith(doctype):
- html = html[len(doctype):]
-
- html = '''<!DOCTYPE html>
- <html>
- <head><title></title></head>
- <body>
- %s
- </body></html>''' % html
- return validate_html5(html)
+ """ When you don't have a html & body tags - this adds it"""
+ # WebTest doesn't like HTML fragments without doctype,
+ # so we output them sometimes for fragments, which is hack.
+ # Unhack it here.
+ doctype = '<!DOCTYPE html>'
+ if html.startswith(doctype):
+ html = html[len(doctype):]
+
+ html = '''<!DOCTYPE html>
+ <html>
+ <head><title></title></head>
+ <body>
+ %s
+ </body></html>''' % html
+ return validate_html5(html)
+
def validate_js(html_or_response):
- if hasattr(html_or_response, 'body'):
- if html_or_response.status_int != 200:
- return
- html = html_or_response.body
- else:
- html = html_or_response
- basedir = path.dirname(path.abspath(__file__))
- jslint_dir = basedir + '/../jslint'
- fname = dump_to_file('jslint-', html)
- cmd = 'java -jar ' + jslint_dir + '/js.jar '+ jslint_dir +'/jslint.js ' + fname
- p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- stdout, stderr = p.communicate(html)
- if stdout.startswith('jslint: No problems found'):
- os.unlink(fname)
+ if hasattr(html_or_response, 'body'):
+ if html_or_response.status_int != 200:
return
- stdout = stdout.decode('UTF-8', 'replace')
- msg = '\n'.join(repr(s) for s in stdout.split('\n') if s)
- report_validation_error('js', fname, msg)
+ html = html_or_response.body
+ else:
+ html = html_or_response
+ basedir = path.dirname(path.abspath(__file__))
+ jslint_dir = basedir + '/../jslint'
+ fname = dump_to_file('jslint-', html)
+ cmd = 'java -jar ' + jslint_dir + '/js.jar '+ jslint_dir +'/jslint.js ' + fname
+ p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ stdout, stderr = p.communicate(html)
+ if stdout.startswith('jslint: No problems found'):
+ os.unlink(fname)
+ return
+ stdout = stdout.decode('UTF-8', 'replace')
+ msg = '\n'.join(repr(s) for s in stdout.split('\n') if s)
+ report_validation_error('js', fname, msg)
+
def validate_page(html_or_response):
if Config.instance().validation_enabled('html5'):
@@ -228,6 +234,7 @@ def validate_page(html_or_response):
if Config.instance().validation_enabled('inlinejs'):
validate_js(html_or_response)
+
class AntiSpamTestApp(TestApp):
def post(self, *args, **kwargs):
[03/27] git commit: [#6220] ticket:383 embed macro (youtube support
only)
Posted by jo...@apache.org.
[#6220] ticket:383 embed macro (youtube support only)
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/f1938c5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/f1938c5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/f1938c5e
Branch: refs/heads/cj/4656
Commit: f1938c5e421cc7f77f1c6c02c7bf18fbfbfdd912
Parents: 885ef99
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Tue Jul 9 15:14:47 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 10 21:29:19 2013 +0000
----------------------------------------------------------------------
Allura/allura/lib/macro.py | 11 +++++++++++
Allura/allura/lib/markdown_extensions.py | 6 +++---
Allura/allura/lib/utils.py | 11 +++++++++++
Allura/allura/tests/test_globals.py | 7 +++++++
Allura/allura/tests/test_utils.py | 12 ++++++++++++
requirements-common.txt | 1 +
6 files changed, 45 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1938c5e/Allura/allura/lib/macro.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/macro.py b/Allura/allura/lib/macro.py
index 27c0d35..aac20ff 100644
--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -20,6 +20,8 @@ import random
import shlex
import logging
import traceback
+import oembed
+import jinja2
from operator import attrgetter
import pymongo
@@ -374,3 +376,12 @@ def members(limit=20):
response = users.display(users=output, over_limit=over_limit)
return response
+@macro()
+def embed(url=None):
+ consumer = oembed.OEmbedConsumer()
+ endpoint = oembed.OEmbedEndpoint('http://www.youtube.com/oembed', ['http://*.youtube.com/*', 'https://*.youtube.com/*'])
+ consumer.addEndpoint(endpoint)
+ try:
+ return jinja2.Markup('<div class="grid-20">%s</div>' % consumer.embed(url)['html'])
+ except oembed.OEmbedNoEndpoint as e:
+ return '[[embed url=%s]]' % url
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1938c5e/Allura/allura/lib/markdown_extensions.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/markdown_extensions.py b/Allura/allura/lib/markdown_extensions.py
index be2805a..4879bf4 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -24,11 +24,11 @@ from pylons import request
from BeautifulSoup import BeautifulSoup
import markdown
-import feedparser
from . import macro
from . import helpers as h
from allura import model as M
+from allura.lib.utils import ForgeHTMLSanitizer
log = logging.getLogger(__name__)
@@ -288,9 +288,9 @@ class HTMLSanitizer(markdown.postprocessors.Postprocessor):
def run(self, text):
try:
- p = feedparser._HTMLSanitizer('utf-8')
+ p = ForgeHTMLSanitizer('utf-8')
except TypeError: # $@%## pre-released versions from SOG
- p = feedparser._HTMLSanitizer('utf-8', '')
+ p = ForgeHTMLSanitizer('utf-8', '')
p.feed(text.encode('utf-8'))
return unicode(p.output(), 'utf-8')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1938c5e/Allura/allura/lib/utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py
index a88511c..d6796e5 100644
--- a/Allura/allura/lib/utils.py
+++ b/Allura/allura/lib/utils.py
@@ -43,6 +43,7 @@ from webhelpers.html import literal
from webob import exc
from pygments.formatters import HtmlFormatter
from setproctitle import getproctitle
+from feedparser import _HTMLSanitizer
from ew import jinja2_ew as ew
from ming.utils import LazyProperty
@@ -494,3 +495,13 @@ def serve_file(fp, filename, content_type, last_modified=None, cache_expires=Non
return tg.request.environ['wsgi.file_wrapper'](fp, block_size)
else:
return iter(lambda: fp.read(block_size), '')
+
+
+class ForgeHTMLSanitizer(_HTMLSanitizer):
+
+ def unknown_starttag(self, tag, attrs):
+ if 'iframe' in self.acceptable_elements:
+ self.acceptable_elements.remove('iframe')
+ if (tag == 'iframe') and (dict(attrs).get('src', '').startswith('http://www.youtube.com/embed/')):
+ self.acceptable_elements.append('iframe')
+ _HTMLSanitizer.unknown_starttag(self, tag, attrs)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1938c5e/Allura/allura/tests/test_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_globals.py b/Allura/allura/tests/test_globals.py
index 429ca27..60860a5 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -256,6 +256,13 @@ def test_macro_include_extra_br():
assert html.strip().replace('\n', '') == expected_html, html
+def test_macro_embed():
+ r = g.markdown_wiki.convert('[[embed url=http://www.youtube.com/watch?v=kOLpSPEA72U]]')
+ assert '''<div class="grid-20"><iframe height="270" src="http://www.youtube.com/embed/kOLpSPEA72U?feature=oembed" width="480"></iframe></div>''' in r
+ r = g.markdown_wiki.convert('[[embed url=http://vimeo.com/46163090]]')
+ assert_equal(r, '<div class="markdown_content"><p>[[embed url=http://vimeo.com/46163090]]</p></div>')
+
+
def test_markdown_toc():
with h.push_context('test', neighborhood='Projects'):
r = g.markdown_wiki.convert("""[TOC]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1938c5e/Allura/allura/tests/test_utils.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_utils.py b/Allura/allura/tests/test_utils.py
index bd44ca2..494e893 100644
--- a/Allura/allura/tests/test_utils.py
+++ b/Allura/allura/tests/test_utils.py
@@ -229,3 +229,15 @@ class TestCodeStats(unittest.TestCase):
assert stats['line_count'] == 8
assert stats['data_line_count'] == 5
assert stats['code_size'] == len(blob.text)
+
+class TestHTMLSanitizer(unittest.TestCase):
+
+ def test_html_sanitizer_iframe(self):
+ p = utils.ForgeHTMLSanitizer('utf-8', '')
+ p.feed('<div><iframe></iframe></div>')
+ assert_equal(p.output(), '<div></div>')
+
+ def test_html_sanitizer_youtube_iframe(self):
+ p = utils.ForgeHTMLSanitizer('utf-8', '')
+ p.feed('<div><iframe src="http://www.youtube.com/embed/kOLpSPEA72U?feature=oembed"></iframe></div>')
+ assert_equal(p.output(),'<div><iframe src="http://www.youtube.com/embed/kOLpSPEA72U?feature=oembed"></iframe></div>')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/f1938c5e/requirements-common.txt
----------------------------------------------------------------------
diff --git a/requirements-common.txt b/requirements-common.txt
index 8dd3b5b..d496708 100644
--- a/requirements-common.txt
+++ b/requirements-common.txt
@@ -36,6 +36,7 @@ pysolr==2.1.0-beta
python-dateutil==1.5
python-magic==0.4.3
python-openid==2.2.5
+python-oembed==0.2.1
pytidylib==0.2.1
# for taskd proc name switching
setproctitle==1.1.7
[19/27] git commit: [#4122] change ./run_tests to python,
run suites in parallel
Posted by jo...@apache.org.
[#4122] change ./run_tests to python, run suites in parallel
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3ec3fedb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3ec3fedb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3ec3fedb
Branch: refs/heads/cj/4656
Commit: 3ec3fedb0daad79408694f90792272549f73e5e1
Parents: ff72589
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon May 6 18:30:30 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Jul 11 22:10:00 2013 +0000
----------------------------------------------------------------------
run_tests | 140 ++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 104 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3ec3fedb/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index 59e1825..7d033b1 100755
--- a/run_tests
+++ b/run_tests
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env python
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
@@ -17,38 +17,106 @@
# specific language governing permissions and limitations
# under the License.
-if [ -n "$SF_SYSTEM_FUNC" ]; then
- if [ -z "$VIRTUAL_ENV" ]; then
- source /var/local/env-allura/bin/activate
- fi
-fi
-
-# main
-
-if [ "$TEST_MODULES" == "" ]; then
- TEST_MODULES="\
- AlluraTest \
- Allura \
- ForgeBlog \
- ForgeLink \
- ForgeChat \
- ForgeDiscussion \
- ForgeGit \
- ForgeSVN \
- ForgeTracker \
- ForgeWiki \
- ForgeActivity \
- ForgeShortUrl \
- ForgeUserStats \
- "
-fi
-
-# Run with --with-coverage for coverage (add --cover-html for html report)
-for module in $TEST_MODULES; do
- (
- echo "Running tests in module $module"
- cd $module
- cover_package=$(echo $module | tr "[:upper:]" "[:lower:]")
- nosetests --cover-package=$cover_package --cover-html-dir=report.coverage --cover-erase $* || exit
- ) || exit
-done
+import argparse
+from copy import copy
+from glob import glob
+from multiprocessing.pool import ThreadPool
+import subprocess
+import sys
+import threading
+import textwrap
+
+
+def run_one(cmd, **popen_kwargs):
+ print '{} running {} {}'.format(threading.current_thread(), cmd, popen_kwargs)
+ all_popen_kwargs = dict(shell=True, stderr=subprocess.STDOUT,
+ stdout=subprocess.PIPE,
+ bufsize=1, # 1 == line-buffered
+ close_fds='posix' in sys.builtin_module_names)
+ all_popen_kwargs.update(popen_kwargs)
+ proc = subprocess.Popen(cmd, **all_popen_kwargs)
+ while proc.poll() is None:
+ line = proc.stdout.readline()
+ sys.stdout.write(line)
+ sys.stdout.flush()
+ # wait for completion and get remainder of output
+ out_remainder, _ = proc.communicate()
+ sys.stdout.write(out_remainder)
+ sys.stdout.flush()
+ return proc
+
+
+def run_many(cmds, processes=None):
+ """
+ cmds: list of shell commands, or list of (shell cmds, popen_kwargs)
+ processes: number of processes, or None for # of CPU cores
+ """
+ thread_pool = ThreadPool(processes=processes)
+
+ async_results = []
+ for cmd_kwds in cmds:
+ if type(cmd_kwds) == ():
+ cmd = cmd_kwds
+ kwds = {}
+ else:
+ cmd = cmd_kwds[0]
+ kwds = cmd_kwds[1]
+ result = thread_pool.apply_async(run_one, args=(cmd,), kwds=kwds)
+ async_results.append(result)
+
+ thread_pool.close()
+ thread_pool.join()
+
+ procs = [async_result.get() for async_result in async_results]
+ return [p.returncode for p in procs]
+
+
+def get_packages():
+ packages = [p.split('/')[0] for p in glob("*/setup.py")]
+
+ # make it first, to catch syntax errors
+ packages.remove('AlluraTest')
+ packages.insert(0, 'AlluraTest')
+ return packages
+
+
+def check_packages(packages):
+ for pkg in packages:
+ try:
+ __import__(pkg.lower())
+ except ImportError:
+ print "Not running tests for {}, since it isn't set up".format(pkg)
+ else:
+ yield pkg
+
+
+def run_tests_in_parallel(options, nosetests_args):
+ cmds = []
+ for package in check_packages(options.packages):
+ cover_package = package.lower()
+ our_nosetests_args = copy(nosetests_args)
+ our_nosetests_args.append('--cover-package={}'.format(cover_package))
+ cmd = "nosetests {nosetests_args}".format(
+ nosetests_args=' '.join(our_nosetests_args),
+ )
+ cmds.append((cmd, dict(cwd=package)))
+ return run_many(cmds, processes=options.num_processes)
+
+
+def parse_args():
+ parser = argparse.ArgumentParser(formatter_class=argparse.RawDescriptionHelpFormatter,
+ epilog=textwrap.dedent('''
+ All additional arguments are passed along to nosetests
+ (e.g. -v --with-coverage)
+ Note: --cover-package will be set automatically to the appropriate value'''))
+ parser.add_argument('-n', help='Number of processes to use at once. Default: # CPUs',
+ dest='num_processes', type=int, default=None)
+ parser.add_argument('-p', help='List of packages to run tests on. Default: all',
+ dest='packages', choices=get_packages(), default=get_packages(),
+ nargs='+')
+ return parser.parse_known_args()
+
+
+if __name__ == "__main__":
+ ret_codes = run_tests_in_parallel(*parse_args())
+ sys.exit(any(ret_codes))
[16/27] git commit: [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
[#4122] rename AlluraTesting dir to AlluraTest, to match the module name below
This makes the coverage output from ./run_tests better
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/37e91c91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/37e91c91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/37e91c91
Branch: refs/heads/cj/4656
Commit: 37e91c9136b973d84eb7309858ddb1e20f05c586
Parents: c2ac016
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Mon May 6 18:24:09 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Jul 11 21:30:45 2013 +0000
----------------------------------------------------------------------
AlluraTest/LICENSE | 234 +
AlluraTest/alluratest/__init__.py | 16 +
AlluraTest/alluratest/controller.py | 183 +
AlluraTest/alluratest/test_syntax.py | 95 +
AlluraTest/alluratest/validation.py | 321 +
AlluraTest/jslint/Makefile | 7 +
AlluraTest/jslint/env-js.jar | Bin 0 -> 1110999 bytes
AlluraTest/jslint/fulljslint.js | 5688 +++++++++++++++++
AlluraTest/jslint/js.jar | Bin 0 -> 871260 bytes
AlluraTest/jslint/jslint.js | 5729 ++++++++++++++++++
AlluraTest/jslint/rhino.js | 41 +
AlluraTest/setup.py | 39 +
AlluraTest/twill-tests/README | 19 +
AlluraTest/twill-tests/create_repo.twill | 47 +
AlluraTest/twill-tests/edit_wiki_page.twill | 36 +
AlluraTest/twill-tests/login.twill | 27 +
AlluraTest/twill-tests/new_issue.twill | 36 +
AlluraTest/twill-tests/smoke-front-page.twill | 20 +
AlluraTest/twill-tests/smoke-project-home.twill | 20 +
.../twill-tests/smoke-tracker-search.twill | 20 +
AlluraTest/twill-tests/smoke-tracker.twill | 20 +
AlluraTest/twill-tests/smoke-user-profile.twill | 20 +
AlluraTest/twill-tests/smoke-wiki.twill | 20 +
AlluraTesting/LICENSE | 234 -
AlluraTesting/alluratest/__init__.py | 16 -
AlluraTesting/alluratest/controller.py | 183 -
AlluraTesting/alluratest/test_syntax.py | 95 -
AlluraTesting/alluratest/validation.py | 321 -
AlluraTesting/jslint/Makefile | 7 -
AlluraTesting/jslint/env-js.jar | Bin 1110999 -> 0 bytes
AlluraTesting/jslint/fulljslint.js | 5688 -----------------
AlluraTesting/jslint/js.jar | Bin 871260 -> 0 bytes
AlluraTesting/jslint/jslint.js | 5729 ------------------
AlluraTesting/jslint/rhino.js | 41 -
AlluraTesting/setup.py | 39 -
AlluraTesting/twill-tests/README | 19 -
AlluraTesting/twill-tests/create_repo.twill | 47 -
AlluraTesting/twill-tests/edit_wiki_page.twill | 36 -
AlluraTesting/twill-tests/login.twill | 27 -
AlluraTesting/twill-tests/new_issue.twill | 36 -
.../twill-tests/smoke-front-page.twill | 20 -
.../twill-tests/smoke-project-home.twill | 20 -
.../twill-tests/smoke-tracker-search.twill | 20 -
AlluraTesting/twill-tests/smoke-tracker.twill | 20 -
.../twill-tests/smoke-user-profile.twill | 20 -
AlluraTesting/twill-tests/smoke-wiki.twill | 20 -
rat-excludes.txt | 2 +-
run_clonedigger | 2 +-
run_tests | 2 +-
49 files changed, 12641 insertions(+), 12641 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/LICENSE
----------------------------------------------------------------------
diff --git a/AlluraTest/LICENSE b/AlluraTest/LICENSE
new file mode 100644
index 0000000..15f71ee
--- /dev/null
+++ b/AlluraTest/LICENSE
@@ -0,0 +1,234 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+AlluraTest SUBCOMPONENTS:
+
+AlluraTest includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source code
+for the these subcomponents is subject to the terms and conditions of the
+following licenses.
+
+For jslint.js, in directory
+jslint/
+
+ Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
+ so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ The Software shall be used for Good, not Evil.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/alluratest/__init__.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/__init__.py b/AlluraTest/alluratest/__init__.py
new file mode 100644
index 0000000..144e298
--- /dev/null
+++ b/AlluraTest/alluratest/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/controller.py b/AlluraTest/alluratest/controller.py
new file mode 100644
index 0000000..95d9b4b
--- /dev/null
+++ b/AlluraTest/alluratest/controller.py
@@ -0,0 +1,183 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""Unit and functional test suite for allura."""
+import os
+import urllib
+
+import mock
+import beaker.session
+from formencode import variabledecode
+from paste.deploy import loadapp
+from paste.deploy.converters import asbool
+from paste.script.appinstall import SetupCommand
+from pylons import tmpl_context as c, app_globals as g
+from pylons import url, request, response, session
+import tg
+from webtest import TestApp
+from webob import Request, Response
+import ew
+from ming.orm import ThreadLocalORMSession
+import ming.orm
+
+from allura import model as M
+import allura.lib.security
+from allura.lib.app_globals import Globals
+from allura.lib import helpers as h
+from allura.websetup.schema import REGISTRY
+#from allura.lib.custom_middleware import environ as ENV, MagicalC
+from .validation import ValidatingTestApp
+
+DFL_APP_NAME = 'main_without_authn'
+
+# these are all helpers & base classes, and should never
+# be considered test cases when imported into some test module
+__test__ = False
+
+
+def get_config_file(config=None):
+ if not config:
+ config = 'test.ini'
+
+ try:
+ conf_dir = tg.config.here
+ except AttributeError:
+ conf_dir = os.getcwd()
+ return os.path.join(conf_dir, config)
+
+
+def setup_basic_test(config=None, app_name=DFL_APP_NAME):
+ '''Create clean environment for running tests'''
+ try:
+ conf_dir = tg.config.here
+ except AttributeError:
+ conf_dir = os.getcwd()
+ ew.TemplateEngine.initialize({})
+ test_file = os.path.join(conf_dir, get_config_file(config))
+ cmd = SetupCommand('setup-app')
+ cmd.run([test_file])
+
+ # run all tasks, e.g. indexing from bootstrap operations
+ while M.MonQTask.run_ready('setup'):
+ ThreadLocalORMSession.flush_all()
+setup_basic_test.__test__ = False # sometimes __test__ above isn't sufficient
+
+
+def setup_functional_test(config=None, app_name=DFL_APP_NAME):
+ '''Create clean environment for running tests. Also return WSGI test app'''
+ config = get_config_file(config)
+ setup_basic_test(config, app_name)
+ conf_dir = tg.config.here
+ wsgiapp = loadapp('config:%s#%s' % (config, app_name),
+ relative_to=conf_dir)
+ return wsgiapp
+setup_functional_test.__test__ = False # sometimes __test__ above isn't sufficient
+
+
+def setup_unit_test():
+ try:
+ while True:
+ REGISTRY.cleanup()
+ except:
+ pass
+ REGISTRY.prepare()
+ REGISTRY.register(ew.widget_context, ew.core.WidgetContext('http', ew.ResourceManager()))
+ REGISTRY.register(g, Globals())
+ REGISTRY.register(c, mock.Mock())
+ REGISTRY.register(url, lambda:None)
+ REGISTRY.register(request, Request.blank('/', remote_addr='1.1.1.1'))
+ REGISTRY.register(response, Response())
+ REGISTRY.register(session, beaker.session.SessionObject({}))
+ REGISTRY.register(allura.credentials, allura.lib.security.Credentials())
+ c.memoize_cache = {}
+ c.queued_messages = None
+ c.model_cache = None
+ ThreadLocalORMSession.close_all()
+setup_unit_test.__test__ = False # sometimes __test__ above isn't sufficient
+
+
+def setup_global_objects():
+ setup_unit_test()
+ h.set_context('test', 'wiki', neighborhood='Projects')
+ c.user = M.User.query.get(username='test-admin')
+
+
+class TestController(object):
+
+ application_under_test = 'main'
+ validate_skip = False
+
+ def setUp(self):
+ """Method called by nose before running each test"""
+ self.app = ValidatingTestApp(setup_functional_test(app_name=self.application_under_test))
+ if self.validate_skip:
+ self.app.validate_skip = self.validate_skip
+ if asbool(tg.config.get('smtp.mock')):
+ self.smtp_mock = mock.patch('allura.lib.mail_util.smtplib.SMTP')
+ self.smtp_mock.start()
+
+ def tearDown(self):
+ """Method called by nose after running each test"""
+ if asbool(tg.config.get('smtp.mock')):
+ self.smtp_mock.stop()
+
+ def webflash(self, response):
+ "Extract webflash content from response."
+ return urllib.unquote(response.cookies_set.get('webflash', ''))
+
+
+class TestRestApiBase(TestController):
+
+ def setUp(self):
+ super(TestRestApiBase, self).setUp()
+ setup_global_objects()
+# h.set_context('test', 'home')
+ self.user = M.User.query.get(username='test-admin')
+ self.token = M.ApiToken(user_id=self.user._id)
+ ming.orm.session(self.token).flush()
+
+ def set_api_token(self, token):
+ self.token = token
+
+ def _api_getpost(self, method, path, api_key=None, api_timestamp=None, api_signature=None,
+ wrap_args=None, **params):
+ if wrap_args:
+ params = {wrap_args: params}
+ params = variabledecode.variable_encode(params, add_repetitions=False)
+ if api_key: params['api_key'] = api_key
+ if api_timestamp: params['api_timestamp'] = api_timestamp
+ if api_signature: params['api_signature'] = api_signature
+ params = self.token.sign_request(path, params)
+
+ fn = self.app.post if method=='POST' else self.app.get
+
+ response = fn(
+ str(path),
+ params=params,
+ status=[200, 302, 400, 403, 404])
+ if response.status_int == 302:
+ return response.follow()
+ else:
+ return response
+
+ def api_get(self, path, api_key=None, api_timestamp=None, api_signature=None,
+ wrap_args=None, **params):
+ return self._api_getpost('GET', path, api_key, api_timestamp, api_signature, wrap_args, **params)
+
+ def api_post(self, path, api_key=None, api_timestamp=None, api_signature=None,
+ wrap_args=None, **params):
+ return self._api_getpost('POST', path, api_key, api_timestamp, api_signature, wrap_args, **params)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/alluratest/test_syntax.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/test_syntax.py b/AlluraTest/alluratest/test_syntax.py
new file mode 100644
index 0000000..b394798
--- /dev/null
+++ b/AlluraTest/alluratest/test_syntax.py
@@ -0,0 +1,95 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+import os.path
+from glob import glob
+from subprocess import Popen, PIPE
+import sys
+
+toplevel_dir = os.path.abspath(os.path.dirname(__file__) + "/../..")
+
+def run(cmd):
+ proc = Popen(cmd, shell=True, cwd=toplevel_dir, stdout=PIPE, stderr=PIPE)
+ # must capture & reprint stdount, so that nosetests can capture it
+ (stdout, stderr) = proc.communicate()
+ sys.stdout.write(stdout)
+ sys.stderr.write(stderr)
+ return proc.returncode
+
+find_py = "find Allura Forge* -name '*.py'"
+
+# a recepe from itertools doc
+from itertools import izip_longest
+def grouper(n, iterable, fillvalue=None):
+ "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
+ args = [iter(iterable)] * n
+ return izip_longest(fillvalue=fillvalue, *args)
+
+def test_pyflakes():
+ # skip some that aren't critical errors
+ skips = [
+ 'imported but unused',
+ 'redefinition of unused',
+ 'assigned to but never used',
+ '__version__',
+ ]
+ proc = Popen(find_py, shell=True, cwd=toplevel_dir, stdout=PIPE, stderr=PIPE)
+ (find_stdout, stderr) = proc.communicate()
+ sys.stderr.write(stderr)
+ assert proc.returncode == 0, proc.returncode
+
+ # run pyflakes in batches, so it doesn't take tons of memory
+ error = False
+ all_files = [f for f in find_stdout.split('\n')
+ if '/migrations/' not in f and f.strip()]
+ for files in grouper(20, all_files, fillvalue=''):
+ cmd = "pyflakes " + ' '.join(files) + " | grep -v '" + "' | grep -v '".join(skips) + "'"
+ #print 'Command was: %s' % cmd
+ retval = run(cmd)
+ if retval != 1:
+ print
+ #print 'Command was: %s' % cmd
+ print 'Returned %s' % retval
+ error = True
+
+ if error:
+ raise Exception('pyflakes failure, see stdout')
+
+def test_no_now():
+ if run(find_py + " | xargs grep '\.now(' ") not in [1,123]:
+ raise Exception("These should use .utcnow()")
+ if run(find_py + " | xargs grep '\.fromtimestamp(' ") not in [1,123]:
+ raise Exception("These should use .utcfromtimestamp()")
+
+def test_no_prints():
+ skips = [
+ '/tests/',
+ 'Allura/allura/command/',
+ 'Allura/ldap-setup.py',
+ 'Allura/ldap-userconfig.py',
+ 'Allura/ez_setup/',
+ 'Allura/allura/lib/AsciiDammit.py',
+ '/scripts/',
+ 'Allura/allura/lib/import_api.py',
+ 'ForgeSVN/setup.py',
+ ]
+ if run(find_py + " | grep -v '" + "' | grep -v '".join(skips) + "' | xargs grep -v '^ *#' | grep 'print ' | grep -E -v '(pprint|#pragma: ?printok)' ") != 1:
+ raise Exception("These should use logging instead of print")
+
+def test_no_tabs():
+ if run(find_py + " | xargs grep ' ' ") not in [1,123]:
+ raise Exception('These should not use tab chars')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
new file mode 100644
index 0000000..235d7c0
--- /dev/null
+++ b/AlluraTest/alluratest/validation.py
@@ -0,0 +1,321 @@
+# -*- coding: utf-8 -*-
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+Functions to syntax-validate output content
+"""
+from os import path, environ, getcwd
+import os
+import sys
+import logging
+import tempfile
+import subprocess
+import json
+import urllib2
+import re
+
+import tg
+import mock
+import beaker.session
+from paste.deploy import loadapp
+from paste.script.appinstall import SetupCommand
+from pylons import tmpl_context as c, app_globals as g
+from pylons import url, request, response, session
+import webtest
+from webtest import TestApp
+from webob import Request, Response
+from nose.tools import ok_, assert_true, assert_false
+from poster.encode import multipart_encode
+from poster.streaminghttp import register_openers
+from ming.utils import LazyProperty
+
+from allura.lib import utils
+
+ENABLE_CONTENT_VALIDATION = False
+# By default we want to run only validations which are fast,
+# but on special test hosts - all.
+COMPLETE_TESTS_HOST = 'sb-forge-4039'
+
+log = logging.getLogger(__name__)
+
+class Config(object):
+ "Config to encapsulate flexible/complex test enabled/disabled rules."
+ _instance = None
+
+ def __init__(self):
+ self.ini_config = None
+ pass
+
+ @classmethod
+ def instance(cls):
+ if not cls._instance:
+ cls._instance = cls()
+ return cls._instance
+
+ @LazyProperty
+ def test_ini(self):
+ if not self.ini_config:
+ from . import controller
+ import ConfigParser
+ conf = ConfigParser.ConfigParser({'validate_html5': 'false', 'validate_inlinejs': 'false'})
+ conf.read(controller.get_config_file())
+ self.ini_config = conf
+ return self.ini_config
+
+ @LazyProperty
+ def hostname(self):
+ if os.path.exists('/etc/soghost'):
+ with open('/etc/soghost') as fp:
+ return fp.read().strip()
+
+ def validation_enabled(self, val_type):
+ env_var = os.getenv('ALLURA_VALIDATION')
+ if env_var == 'all':
+ return True
+ elif env_var == 'none':
+ return False
+ elif env_var is not None:
+ return val_type in env_var.split(',')
+
+ if self.hostname == COMPLETE_TESTS_HOST:
+ return True
+
+ enabled = self.test_ini.getboolean('validation', 'validate_' + val_type)
+ return enabled
+
+ def fail_on_validation(self, val_type):
+ env_var = os.getenv('ALLURA_VALIDATION')
+ if env_var == 'all':
+ return True
+ if self.hostname == COMPLETE_TESTS_HOST:
+ return True
+ return ENABLE_CONTENT_VALIDATION
+
+
+def report_validation_error(val_name, filename, message):
+ message = '%s Validation errors (%s):\n%s\n' % (val_name, filename, message)
+ if Config.instance().fail_on_validation(val_name):
+ ok_(False, message)
+ else:
+ sys.stderr.write('=' * 40 + '\n' + message)
+
+def dump_to_file(prefix, html):
+ f = tempfile.NamedTemporaryFile(prefix=prefix, delete=False)
+ f.write(html)
+ f.close()
+ return f.name
+
+def validate_html(html_or_response):
+ if hasattr(html_or_response, 'body'):
+ html = html_or_response.body
+ else:
+ html = html_or_response
+
+ html = html.lstrip()
+
+ if html.startswith('<!DOCTYPE html>'):
+ return validate_html5(html)
+ else:
+ assert False, 'Non-valid HTML: ' + html[:100] + '...'
+
+def validate_json(json_or_response):
+ if hasattr(json_or_response, 'body'):
+ j = json_or_response.body
+ else:
+ j = json_or_response
+
+ try:
+ obj = json.loads(j)
+ except Exception, e:
+ ok_(False, "Couldn't validate JSON: " + str(e) + ':' + j[:100] + '...')
+
+ return obj
+
+def validate_html5(html_or_response):
+ if hasattr(html_or_response, 'body'):
+ html = html_or_response.body
+ else:
+ html = html_or_response
+ register_openers()
+ params = [("out","text"),("content",html)]
+ datagen, headers = multipart_encode(params)
+ request = urllib2.Request("http://html5.validator.nu/", datagen, headers)
+ count = 3
+ while True:
+ try:
+ resp = urllib2.urlopen(request, timeout=3).read()
+ break
+ except:
+ resp = "Couldn't connect to validation service to check the HTML"
+ count -= 1
+ if count == 0:
+ sys.stderr.write('WARNING: ' + resp + '\n')
+ break
+
+ resp = resp.replace('“','"').replace('”','"').replace('–','-')
+
+ ignored_errors = [
+ 'Required attributes missing on element "object"',
+ 'Stray end tag "embed".',
+ 'Stray end tag "param".',
+ r'Bad value .+? for attribute "onclick" on element "input": invalid return',
+ ]
+ for ignore in ignored_errors:
+ resp = re.sub('Error: ' + ignore, 'Ignoring: ' + ignore, resp)
+
+ if 'Error:' in resp:
+ fname = dump_to_file('html5-', html)
+ message = resp.decode('ascii','ignore')
+ report_validation_error('html5', fname, message)
+
+
+def validate_html5_chunk(html):
+ """ When you don't have a html & body tags - this adds it"""
+ # WebTest doesn't like HTML fragments without doctype,
+ # so we output them sometimes for fragments, which is hack.
+ # Unhack it here.
+ doctype = '<!DOCTYPE html>'
+ if html.startswith(doctype):
+ html = html[len(doctype):]
+
+ html = '''<!DOCTYPE html>
+ <html>
+ <head><title></title></head>
+ <body>
+ %s
+ </body></html>''' % html
+ return validate_html5(html)
+
+def validate_js(html_or_response):
+ if hasattr(html_or_response, 'body'):
+ if html_or_response.status_int != 200:
+ return
+ html = html_or_response.body
+ else:
+ html = html_or_response
+ basedir = path.dirname(path.abspath(__file__))
+ jslint_dir = basedir + '/../jslint'
+ fname = dump_to_file('jslint-', html)
+ cmd = 'java -jar ' + jslint_dir + '/js.jar '+ jslint_dir +'/jslint.js ' + fname
+ p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ stdout, stderr = p.communicate(html)
+ if stdout.startswith('jslint: No problems found'):
+ os.unlink(fname)
+ return
+ stdout = stdout.decode('UTF-8', 'replace')
+ msg = '\n'.join(repr(s) for s in stdout.split('\n') if s)
+ report_validation_error('js', fname, msg)
+
+def validate_page(html_or_response):
+ if Config.instance().validation_enabled('html5'):
+ validate_html(html_or_response)
+ if Config.instance().validation_enabled('inlinejs'):
+ validate_js(html_or_response)
+
+class AntiSpamTestApp(TestApp):
+
+ def post(self, *args, **kwargs):
+ if kwargs.pop('antispam', False):
+ antispam = utils.AntiSpam()
+ params = {
+ 'timestamp': antispam.timestamp_text,
+ 'spinner': antispam.spinner_text,
+ antispam.enc('honey0'): '',
+ antispam.enc('honey1'): '',
+ }
+ for k, v in kwargs['params'].iteritems():
+ params[antispam.enc(k)] = v
+ kwargs['params'] = params
+ return super(AntiSpamTestApp, self).post(*args, **kwargs)
+
+class PostParamCheckingTestApp(AntiSpamTestApp):
+
+ def _validate_params(self, params, method):
+ if not params:
+ return
+ # params can be a list or a dict
+ if hasattr(params, 'items'):
+ params = params.items()
+ for k, v in params:
+ if not isinstance(k, basestring):
+ raise TypeError('%s key %s is %s, not str' % (method, k, type(k)))
+ if not isinstance(v, (basestring, webtest.app.File)):
+ raise TypeError('%s key %s has value %s of type %s, not str. ' % (method, k, v, type(v)))
+
+ def get(self, *args, **kwargs):
+ self._validate_params(kwargs.get('params'), 'get')
+ return super(PostParamCheckingTestApp, self).get(*args, **kwargs)
+
+ def post(self, *args, **kwargs):
+ self._validate_params(kwargs.get('params'), 'post')
+ return super(PostParamCheckingTestApp, self).post(*args, **kwargs)
+
+class ValidatingTestApp(PostParamCheckingTestApp):
+
+ # Subclasses may set this to True to skip validation altogether
+ validate_skip = False
+
+ def _validate(self, resp, method, val_params):
+ """Perform validation on webapp response. This handles responses of
+ various types and forms."""
+ if resp.status_int != 200:
+ return
+
+ content = resp.body
+ content_type = resp.headers['Content-Type']
+ if content_type.startswith('text/html'):
+ if val_params['validate_chunk']:
+ validate_html5_chunk(content)
+ else:
+ validate_page(resp)
+ elif content_type.split(';', 1)[0] in ('text/plain', 'text/x-python', 'application/octet-stream'):
+ pass
+ elif content_type.startswith('application/json'):
+ validate_json(content)
+ elif content_type.startswith(('application/x-javascript','application/javascript', 'text/javascript')):
+ validate_js(content)
+ elif content_type.startswith('application/xml'):
+ import feedparser
+ d = feedparser.parse(content)
+ assert d.bozo == 0, 'Non-wellformed feed'
+ elif content_type.startswith('image/'):
+ pass
+ else:
+ assert False, 'Unexpected output content type: ' + content_type
+
+ def _get_validation_params(self, kw):
+ "Separate validation params from normal TestApp methods params."
+ params = {}
+ for k in ('validate_skip', 'validate_chunk'):
+ params[k] = kw.pop(k, False)
+ return params, kw
+
+ def get(self, *args, **kw):
+ val_params, kw = self._get_validation_params(kw)
+ resp = super(ValidatingTestApp, self).get(*args, **kw)
+ if not self.validate_skip and not val_params['validate_skip']:
+ self._validate(resp, 'get', val_params)
+ return resp
+
+ def post(self, *args, **kw):
+ val_params, kw = self._get_validation_params(kw)
+ resp = super(ValidatingTestApp, self).post(*args, **kw)
+ if not self.validate_skip and not val_params['validate_skip']:
+ self._validate(resp, 'post', val_params)
+ return resp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/jslint/Makefile
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/Makefile b/AlluraTest/jslint/Makefile
new file mode 100644
index 0000000..7efd72e
--- /dev/null
+++ b/AlluraTest/jslint/Makefile
@@ -0,0 +1,7 @@
+# Make single-file jslint script out of main script (from jslint.com,
+# patched by us to tweak its behavior, as it configurability leaves much
+# to be desired) and Rhino support module. Needed because Rhino accepts
+# only single file as script.
+
+jslint.js: fulljslint.js rhino.js
+ cat $^ >$@
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/jslint/env-js.jar
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/env-js.jar b/AlluraTest/jslint/env-js.jar
new file mode 100644
index 0000000..072891a
Binary files /dev/null and b/AlluraTest/jslint/env-js.jar differ
[08/27] git commit: [#4659] ticket:381 refactored multiple attachments
Posted by jo...@apache.org.
[#4659] ticket:381 refactored multiple attachments
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/870f5aad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/870f5aad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/870f5aad
Branch: refs/heads/cj/4656
Commit: 870f5aad4b4c2c5680429d6f649df47a6bb7adc1
Parents: 087b9ec
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Fri Jul 5 21:03:24 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jul 11 14:35:13 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/discuss.py | 20 ++++----------------
Allura/allura/lib/widgets/discuss.py | 2 +-
Allura/allura/model/artifact.py | 7 +++++++
Allura/allura/model/discuss.py | 6 ++++++
Allura/allura/model/notification.py | 18 +++++++-----------
Allura/allura/templates/widgets/edit_post.html | 4 +---
ForgeTracker/forgetracker/tracker_main.py | 8 +-------
.../forgetracker/widgets/ticket_form.py | 2 +-
.../forgewiki/tests/functional/test_root.py | 2 +-
ForgeWiki/forgewiki/wiki_main.py | 8 +-------
10 files changed, 30 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index 97a08e5..45b0124 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -202,10 +202,7 @@ class ThreadController(BaseController, FeedController):
file_info = kw.get('file_info', None)
p = self.thread.add_post(**kw)
- if isinstance(file_info, list):
- map(p.add_attachment, file_info)
- else:
- p.add_attachment(file_info)
+ p.add_multiple_attach(file_info)
if self.thread.artifact:
self.thread.artifact.mod_date = datetime.utcnow()
flash('Message posted')
@@ -278,10 +275,7 @@ class PostController(BaseController):
require_access(self.post, 'moderate')
post_fields = self.W.edit_post.to_python(kw, None)
file_info = post_fields.pop('file_info', None)
- if isinstance(file_info, list):
- map(self.post.add_attachment, file_info)
- else:
- self.post.add_attachment(file_info)
+ self.post.add_multiple_attach(file_info)
for k,v in post_fields.iteritems():
try:
setattr(self.post, k, v)
@@ -326,10 +320,7 @@ class PostController(BaseController):
require_access(self.thread, 'post')
kw = self.W.edit_post.to_python(kw, None)
p = self.thread.add_post(parent_id=self.post._id, **kw)
- if isinstance(file_info, list):
- map(p.add_attachment, file_info)
- else:
- p.add_attachment(file_info)
+ p.add_multiple_attach(file_info)
redirect(request.referer)
@h.vardec
@@ -364,10 +355,7 @@ class PostController(BaseController):
@require_post()
def attach(self, file_info=None):
require_access(self.post, 'moderate')
- if isinstance(file_info, list):
- map(self.post.add_attachment, file_info)
- else:
- self.post.add_attachment(file_info)
+ self.post.add_multiple_attach(file_info)
redirect(request.referer)
@expose()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/Allura/allura/lib/widgets/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/discuss.py b/Allura/allura/lib/widgets/discuss.py
index 96a48b3..e62a993 100644
--- a/Allura/allura/lib/widgets/discuss.py
+++ b/Allura/allura/lib/widgets/discuss.py
@@ -160,9 +160,9 @@ class EditPost(ff.ForgeForm):
for r in ffw.MarkdownEdit(name='text').resources(): yield r
yield ew.JSScript('''$(document).ready(function () {
$("a.attachment_form_add_button").click(function(evt){
- evt.preventDefault();
$(this).hide();
$(".attachment_form_fields", this.parentNode).show();
+ evt.preventDefault();
});
$("a.cancel_edit_post").click(function(evt){
$("textarea", this.parentNode).val($("input.original_value", this.parentNode).val());
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 05d7c14..6fbe0f5 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -386,6 +386,13 @@ class Artifact(MappedClass):
"""
return self.get_discussion_thread()[0]
+ def add_multiple_attach(self, file_info):
+ if not isinstance(file_info, list):
+ file_info = [file_info]
+ for attach in file_info:
+ if hasattr(attach, 'file'):
+ self.attach(attach.filename, attach.file, content_type=attach.type)
+
def attach(self, filename, fp, **kw):
"""Attach a file to this Artifact.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 7699d33..b15d03d 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -527,6 +527,12 @@ class Post(Message, VersionedArtifact, ActivityObject):
return self.attachment_class().query.find(dict(
post_id=self._id, type='attachment'))
+ def add_multiple_attach(self, file_info):
+ if isinstance(file_info, list):
+ map(self.add_attachment, file_info)
+ else:
+ self.add_attachment(file_info)
+
def add_attachment(self, file_info):
if hasattr(file_info, 'file'):
mime_type = file_info.type
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/Allura/allura/model/notification.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/notification.py b/Allura/allura/model/notification.py
index 1d03eef..d4b0755 100644
--- a/Allura/allura/model/notification.py
+++ b/Allura/allura/model/notification.py
@@ -148,17 +148,13 @@ class Notification(MappedClass):
file_info = kwargs.pop('file_info', None)
if file_info is not None:
text = "%s\n\n\nAttachment:" % text
- if isinstance(file_info, list):
- for attach in file_info:
- attach.file.seek(0, 2)
- bytecount = attach.file.tell()
- attach.file.seek(0)
- text = "%s %s (%s; %s) " % (text, attach.filename, h.do_filesizeformat(bytecount), attach.type)
- else:
- file_info.file.seek(0, 2)
- bytecount = file_info.file.tell()
- file_info.file.seek(0)
- text = "%s %s (%s; %s) " % (text, file_info.filename, h.do_filesizeformat(bytecount), file_info.type)
+ if not isinstance(file_info, list):
+ file_info = [file_info]
+ for attach in file_info:
+ attach.file.seek(0, 2)
+ bytecount = attach.file.tell()
+ attach.file.seek(0)
+ text = "%s %s (%s; %s) " % (text, attach.filename, h.do_filesizeformat(bytecount), attach.type)
subject = post.subject or ''
if post.parent_id and not subject.lower().startswith('re:'):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/Allura/allura/templates/widgets/edit_post.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/widgets/edit_post.html b/Allura/allura/templates/widgets/edit_post.html
index 0fe22a7..38ad0b3 100644
--- a/Allura/allura/templates/widgets/edit_post.html
+++ b/Allura/allura/templates/widgets/edit_post.html
@@ -26,13 +26,11 @@
{{widget.display_field(widget.fields.text)}}
<input type="hidden" class="original_value" value="{{value.text}}">
<span class="arw"><span></span></span><br/>
- <div class="attachment_form_fields" style="display:none; padding: 5px 0;">
- <input type="file" class="text" multiple="True" name="{{att_name}}" {% if att_id %}id="{{att_id}}"{% endif %}/>
- </div>
<div style="clear:both"></div>
<input type="submit" value="{{submit_text}}"/>
<a href="#" class="btn link cancel_edit_post">Cancel</a>
<a href="#" class="btn link attachment_form_add_button">Add attachments</a>
+ <input type="file" class="text attachment_form_fields" style="display:none" multiple="True" name="{{att_name}}" {% if att_id %}id="{{att_id}}"{% endif %}/>
{% if widget.antispam %}{% for fld in g.antispam.extra_fields() %}
{{fld}}{% endfor %}{% endif %}
</form>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 3d2d02d..9037c4d 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1293,13 +1293,7 @@ class TicketController(BaseController, FeedController):
if 'attachment' in post_data:
attachment = post_data['attachment']
- if isinstance(attachment, list):
- for attach in attachment:
- self.ticket.attach(attach.filename, attach.file, content_type=attach.type)
- else:
- if hasattr(attachment, 'file'):
- self.ticket.attach(
- attachment.filename, attachment.file, content_type=attachment.type)
+ self.ticket.add_multiple_attach(attachment)
for cf in c.app.globals.custom_fields or []:
if 'custom_fields.' + cf.name in post_data:
value = post_data['custom_fields.' + cf.name]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/ForgeTracker/forgetracker/widgets/ticket_form.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/widgets/ticket_form.py b/ForgeTracker/forgetracker/widgets/ticket_form.py
index edee7e5..f022177 100644
--- a/ForgeTracker/forgetracker/widgets/ticket_form.py
+++ b/ForgeTracker/forgetracker/widgets/ticket_form.py
@@ -136,9 +136,9 @@ class TicketForm(GenericTicketForm):
yield ew.JSScript('''
$(function(){
$('#show_attach').click(function(evt) {
- evt.preventDefault();
$('#view_attach').show();
$('#show_attach').hide();
+ evt.preventDefault();
});
$('form').submit(function() {
var value = $('div.tagsinput div input').val();
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/ForgeWiki/forgewiki/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/tests/functional/test_root.py b/ForgeWiki/forgewiki/tests/functional/test_root.py
index 05c0dd1..3312ed7 100644
--- a/ForgeWiki/forgewiki/tests/functional/test_root.py
+++ b/ForgeWiki/forgewiki/tests/functional/test_root.py
@@ -348,7 +348,7 @@ class TestRootController(TestController):
response = self.app.get('/wiki/tést/')
assert 'test_root.py' in response
- def test_attach_two_fiels(self):
+ def test_attach_two_files(self):
self.app.post(
'/wiki/tést/update',
params={
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/870f5aad/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 88f1102..76f66f6 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -649,13 +649,7 @@ class PageController(BaseController, FeedController):
if not self.page:
raise exc.HTTPNotFound
require_access(self.page, 'edit')
- if isinstance(file_info, list):
- for attach in file_info:
- if hasattr(attach, 'file'):
- self.page.attach(attach.filename, attach.file, content_type=attach.type)
- else:
- if hasattr(file_info, 'file'):
- self.page.attach(file_info.filename, file_info.file, content_type=file_info.type)
+ self.page.add_multiple_attach(file_info)
redirect(request.referer)
@expose()
[22/27] git commit: [#6355] Try repo path with extension stripped off
Posted by jo...@apache.org.
[#6355] Try repo path with extension stripped off
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/6d18b9ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/6d18b9ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/6d18b9ff
Branch: refs/heads/cj/4656
Commit: 6d18b9ffe788b2feaddd7e1dee79c6903a03807b
Parents: dbfa5af
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Mon Jul 15 21:55:24 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Jul 15 21:55:24 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6d18b9ff/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 4e197e6..4c1ee37 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -312,7 +312,7 @@ class AuthController(BaseController):
c.project = project
c.app = project.app_instance(rest[0])
if not c.app:
- c.app = project.app_instance(rest[0])[0]
+ c.app = project.app_instance(os.path.splitext(rest[0])[0])
if c.app is None:
log.info("Can't find repo at %s on repo_path %s",
rest[0], repo_path)
[06/27] git commit: [#4659] ticket:381 test for multiple attachments
Posted by jo...@apache.org.
[#4659] ticket:381 test for multiple attachments
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/94026f29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/94026f29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/94026f29
Branch: refs/heads/cj/4656
Commit: 94026f295048ff34325d51ea420ebdc5d71f567a
Parents: 870f5aa
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Mon Jul 8 08:47:11 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jul 11 14:35:13 2013 +0000
----------------------------------------------------------------------
Allura/allura/tests/model/test_discussion.py | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/94026f29/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index 72920e6..4ac1e37 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -206,6 +206,28 @@ def test_attachment_methods():
n = M.Notification.query.get(subject=u'[test:wiki] Test comment notification')
assert '\nAttachment: fake.txt (37 Bytes; text/plain)' in n.text
+@with_setup(setUp, tearDown())
+def test_multiple_attach():
+ test_file1 = FieldStorage()
+ test_file1.name = 'file_info'
+ test_file1.filename = 'test1.txt'
+ test_file1.type = 'text/plain'
+ test_file1.file=StringIO('test file1\n')
+ test_file2 = FieldStorage()
+ test_file2.name = 'file_info'
+ test_file2.filename = 'test2.txt'
+ test_file2.type = 'text/plain'
+ test_file2.file=StringIO('test file2\n')
+ d = M.Discussion(shortname='test', name='test')
+ t = M.Thread.new(discussion_id=d._id, subject='Test Thread')
+ test_post = t.post('test post')
+ test_post.add_multiple_attach([test_file1, test_file2])
+ ThreadLocalORMSession.flush_all()
+ assert test_post.attachments.count() == 2, test_post.attachments.count()
+ attaches = test_post.attachments.all()
+ assert 'test1.txt' in [attaches[0].filename, attaches[1].filename]
+ assert 'test2.txt' in [attaches[0].filename, attaches[1].filename]
+
@with_setup(setUp, tearDown)
def test_add_attachment():
test_file = FieldStorage()
[17/27] git commit: remove hardcoded hostname
Posted by jo...@apache.org.
remove hardcoded hostname
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ff725898
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ff725898
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ff725898
Branch: refs/heads/cj/4656
Commit: ff725898642c6fa729b94a0038350eb03b3daca4
Parents: 94b75f0
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Sat May 25 13:29:05 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Jul 11 21:30:46 2013 +0000
----------------------------------------------------------------------
AlluraTest/alluratest/validation.py | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ff725898/AlluraTest/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTest/alluratest/validation.py b/AlluraTest/alluratest/validation.py
index 7a5fd0b..39f73c3 100644
--- a/AlluraTest/alluratest/validation.py
+++ b/AlluraTest/alluratest/validation.py
@@ -47,11 +47,6 @@ from ming.utils import LazyProperty
from allura.lib import utils
-ENABLE_CONTENT_VALIDATION = False
-# By default we want to run only validations which are fast,
-# but on special test hosts - all.
-COMPLETE_TESTS_HOST = 'sb-forge-4039'
-
log = logging.getLogger(__name__)
class Config(object):
@@ -93,9 +88,6 @@ class Config(object):
elif env_var is not None:
return val_type in env_var.split(',')
- if self.hostname == COMPLETE_TESTS_HOST:
- return True
-
enabled = self.test_ini.getboolean('validation', 'validate_' + val_type)
return enabled
@@ -103,9 +95,7 @@ class Config(object):
env_var = os.getenv('ALLURA_VALIDATION')
if env_var == 'all':
return True
- if self.hostname == COMPLETE_TESTS_HOST:
- return True
- return ENABLE_CONTENT_VALIDATION
+ return False
def report_validation_error(val_name, filename, message):
[02/27] git commit: [#3060] Bump ForgeHg version
Posted by jo...@apache.org.
[#3060] Bump ForgeHg version
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/885ef999
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/885ef999
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/885ef999
Branch: refs/heads/cj/4656
Commit: 885ef9995dafe227986d1dbd15ee3005c11562dd
Parents: b8d0e6a
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Wed Jul 10 17:55:29 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Wed Jul 10 17:55:29 2013 +0000
----------------------------------------------------------------------
requirements-sf.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/885ef999/requirements-sf.txt
----------------------------------------------------------------------
diff --git a/requirements-sf.txt b/requirements-sf.txt
index c151bbf..7ce28ae 100644
--- a/requirements-sf.txt
+++ b/requirements-sf.txt
@@ -4,7 +4,7 @@ akismet==0.2.0
amqplib==0.6.1
kombu==1.0.4
coverage==3.5a1-20110413
-ForgeHg==0.1.13
+ForgeHg==0.1.15
ForgePastebin==0.2.7
mechanize==0.2.4
mercurial==1.4.3
[27/27] git commit: [#4656] Refactor project name validation
Posted by jo...@apache.org.
[#4656] Refactor project name validation
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c3b47b75
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c3b47b75
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c3b47b75
Branch: refs/heads/cj/4656
Commit: c3b47b75d1588c6c6f6b4ee2a22f3ceee469fbc6
Parents: 8067670
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Jul 2 19:56:40 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Jul 16 20:15:14 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 16 ++++++------
Allura/allura/lib/plugin.py | 41 ++++++++++++++++++++++++-------
2 files changed, 41 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c3b47b75/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index bff0399..e5edd80 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -175,21 +175,23 @@ class NeighborhoodController(object):
@expose('json:')
def suggest_name(self, project_name=''):
- result = dict()
- result['suggested_name'] = re.sub("[^A-Za-z0-9]", "", project_name).lower()[:15]
- return result
+ provider = plugin.ProjectRegistrationProvider.get()
+ return dict(suggested_name=provider.suggest_name(project_name,
+ self.neighborhood))
@expose('json:')
def check_names(self, project_name='', unix_name=''):
+ provider = plugin.ProjectRegistrationProvider.get()
result = dict()
try:
W.add_project.fields['project_name'].validate(project_name, '')
except Invalid as e:
result['name_message'] = str(e)
- if not h.re_project_name.match(unix_name) or not (3 <= len(unix_name) <= 15):
- result['unixname_message'] = 'Please use only letters, numbers, and dashes 3-15 characters long.'
- else:
- result['unixname_message'] = plugin.ProjectRegistrationProvider.get().name_taken(unix_name, self.neighborhood)
+
+ unixname_invalid_err = provider.validate_project_shortname(unix_name,
+ self.neighborhood)
+ result['unixname_message'] = (unixname_invalid_err or
+ provider.name_taken(unix_name, self.neighborhood))
return result
@h.vardec
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c3b47b75/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 855e71c..c0319f7 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -365,6 +365,10 @@ class ProjectRegistrationProvider(object):
return app_globals.Globals().entry_points['registration'][method]()
def name_taken(self, project_name, neighborhood):
+ """Return False if ``project_name`` is available in ``neighborhood``.
+ If unavailable, return an error message (str) explaining why.
+
+ """
from allura import model as M
p = M.Project.query.get(shortname=project_name, neighborhood_id=neighborhood._id)
if p:
@@ -375,18 +379,28 @@ class ProjectRegistrationProvider(object):
return False
def extra_name_checks(self):
- '''This should be a list or iterator containing tuples.
- The first tiem in the tuple should be an error message and the
- second should be a regex. If the user attempts to register a
- project with a name that matches the regex, the field will
- be marked invalid with the message displayed to the user.
- '''
+ """Return an iterable of ``(error_message, regex)`` tuples.
+
+ If user attempts to register a project with a name that matches
+ ``regex``, the field will be marked invalid, and ``error_message``
+ displayed to the user.
+
+ """
return []
+ def suggest_name(self, project_name, neighborhood):
+ """Return a suggested project shortname for the full ``project_name``.
+
+ Example: "My Great Project" -> "mygreatproject"
+
+ """
+ return re.sub("[^A-Za-z0-9]", "", project_name).lower()
+
def rate_limit(self, user, neighborhood):
- '''Check the various config-defined project registration rate
+ """Check the various config-defined project registration rate
limits, and if any are exceeded, raise ProjectRatelimitError.
- '''
+
+ """
if security.has_access(neighborhood, 'admin', user=user)():
return
# have to have the replace because, despite being UTC,
@@ -468,13 +482,22 @@ class ProjectRegistrationProvider(object):
check_shortname = shortname.replace('u/', '', 1)
else:
check_shortname = shortname
- if not h.re_project_name.match(check_shortname):
+ err = self.validate_project_shortname(check_shortname, neighborhood)
+ if err:
raise ValueError('Invalid project shortname: %s' % shortname)
p = M.Project.query.get(shortname=shortname, neighborhood_id=neighborhood._id)
if p:
raise forge_exc.ProjectConflict('%s already exists in nbhd %s' % (shortname, neighborhood._id))
+ def validate_project_shortname(self, shortname, neighborhood):
+ """Return an error message if ``shortname`` is invalid for
+ ``neighborhood``, else return None.
+
+ """
+ if not h.re_project_name.match(shortname):
+ return 'Please use only letters, numbers, and dashes 3-15 characters long.'
+
def _create_project(self, neighborhood, shortname, project_name, user, user_project, private_project, apps):
'''
Actually create the project, no validation. This should not be called directly
[07/27] git commit: [#4659] ticket:381 refactored multiple attachments
Posted by jo...@apache.org.
[#4659] ticket:381 refactored multiple attachments
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/779e7947
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/779e7947
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/779e7947
Branch: refs/heads/cj/4656
Commit: 779e7947e8a34d26e404ee93fd5a9eb0ff8f3074
Parents: 94026f2
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Tue Jul 9 18:28:30 2013 +0400
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jul 11 14:35:13 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/discuss.py | 8 ++++----
Allura/allura/model/artifact.py | 2 +-
Allura/allura/model/discuss.py | 2 +-
Allura/allura/tests/model/test_discussion.py | 4 ++--
ForgeTracker/forgetracker/model/ticket.py | 8 +-------
ForgeTracker/forgetracker/tracker_main.py | 2 +-
ForgeWiki/forgewiki/wiki_main.py | 2 +-
7 files changed, 11 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/Allura/allura/controllers/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/discuss.py b/Allura/allura/controllers/discuss.py
index 45b0124..9f745a3 100644
--- a/Allura/allura/controllers/discuss.py
+++ b/Allura/allura/controllers/discuss.py
@@ -202,7 +202,7 @@ class ThreadController(BaseController, FeedController):
file_info = kw.get('file_info', None)
p = self.thread.add_post(**kw)
- p.add_multiple_attach(file_info)
+ p.add_multiple_attachments(file_info)
if self.thread.artifact:
self.thread.artifact.mod_date = datetime.utcnow()
flash('Message posted')
@@ -275,7 +275,7 @@ class PostController(BaseController):
require_access(self.post, 'moderate')
post_fields = self.W.edit_post.to_python(kw, None)
file_info = post_fields.pop('file_info', None)
- self.post.add_multiple_attach(file_info)
+ self.post.add_multiple_attachments(file_info)
for k,v in post_fields.iteritems():
try:
setattr(self.post, k, v)
@@ -320,7 +320,7 @@ class PostController(BaseController):
require_access(self.thread, 'post')
kw = self.W.edit_post.to_python(kw, None)
p = self.thread.add_post(parent_id=self.post._id, **kw)
- p.add_multiple_attach(file_info)
+ p.add_multiple_attachments(file_info)
redirect(request.referer)
@h.vardec
@@ -355,7 +355,7 @@ class PostController(BaseController):
@require_post()
def attach(self, file_info=None):
require_access(self.post, 'moderate')
- self.post.add_multiple_attach(file_info)
+ self.post.add_multiple_attachments(file_info)
redirect(request.referer)
@expose()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 6fbe0f5..b41b103 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -386,7 +386,7 @@ class Artifact(MappedClass):
"""
return self.get_discussion_thread()[0]
- def add_multiple_attach(self, file_info):
+ def add_multiple_attachments(self, file_info):
if not isinstance(file_info, list):
file_info = [file_info]
for attach in file_info:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index b15d03d..76cf615 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -527,7 +527,7 @@ class Post(Message, VersionedArtifact, ActivityObject):
return self.attachment_class().query.find(dict(
post_id=self._id, type='attachment'))
- def add_multiple_attach(self, file_info):
+ def add_multiple_attachments(self, file_info):
if isinstance(file_info, list):
map(self.add_attachment, file_info)
else:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/Allura/allura/tests/model/test_discussion.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/model/test_discussion.py b/Allura/allura/tests/model/test_discussion.py
index 4ac1e37..34e550a 100644
--- a/Allura/allura/tests/model/test_discussion.py
+++ b/Allura/allura/tests/model/test_discussion.py
@@ -207,7 +207,7 @@ def test_attachment_methods():
assert '\nAttachment: fake.txt (37 Bytes; text/plain)' in n.text
@with_setup(setUp, tearDown())
-def test_multiple_attach():
+def test_multiple_attachments():
test_file1 = FieldStorage()
test_file1.name = 'file_info'
test_file1.filename = 'test1.txt'
@@ -221,7 +221,7 @@ def test_multiple_attach():
d = M.Discussion(shortname='test', name='test')
t = M.Thread.new(discussion_id=d._id, subject='Test Thread')
test_post = t.post('test post')
- test_post.add_multiple_attach([test_file1, test_file2])
+ test_post.add_multiple_attachments([test_file1, test_file2])
ThreadLocalORMSession.flush_all()
assert test_post.attachments.count() == 2, test_post.attachments.count()
attaches = test_post.attachments.all()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 6679e2a..80ce102 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -833,13 +833,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
self.custom_fields[k] = v
self.commit()
if attachment is not None:
- if isinstance(attachment, list):
- for attach in attachment:
- self.attach(attach.filename, attach.file, content_type=attach.type)
- else:
- self.attach(
- attachment.filename, attachment.file,
- content_type=attachment.type)
+ self.add_multiple_attachments(attachment)
def _move_attach(self, attachments, attach_metadata, app_config):
for attach in attachments:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 9037c4d..b6af2ee 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1293,7 +1293,7 @@ class TicketController(BaseController, FeedController):
if 'attachment' in post_data:
attachment = post_data['attachment']
- self.ticket.add_multiple_attach(attachment)
+ self.ticket.add_multiple_attachments(attachment)
for cf in c.app.globals.custom_fields or []:
if 'custom_fields.' + cf.name in post_data:
value = post_data['custom_fields.' + cf.name]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/779e7947/ForgeWiki/forgewiki/wiki_main.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 76f66f6..57e2bff 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -649,7 +649,7 @@ class PageController(BaseController, FeedController):
if not self.page:
raise exc.HTTPNotFound
require_access(self.page, 'edit')
- self.page.add_multiple_attach(file_info)
+ self.page.add_multiple_attachments(file_info)
redirect(request.referer)
@expose()
[23/27] git commit: [#6290] Ensure last_updated is properly set for
trove updates
Posted by jo...@apache.org.
[#6290] Ensure last_updated is properly set for trove updates
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/80676708
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/80676708
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/80676708
Branch: refs/heads/cj/4656
Commit: 8067670843bc36cb25a11673e07684b2c51074d9
Parents: 6d18b9f
Author: Wayne Witzel III <ww...@slashdotmedia.com>
Authored: Tue Jul 16 01:33:29 2013 +0000
Committer: Wayne Witzel III <ww...@slashdotmedia.com>
Committed: Tue Jul 16 01:35:56 2013 +0000
----------------------------------------------------------------------
Allura/allura/ext/admin/admin_main.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/80676708/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 7b188c9..1083d86 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -408,6 +408,7 @@ class ProjectAdminController(BaseController):
current_troves.append(trove_obj._id)
M.AuditLog.log('add trove %s: %s', type, trove_obj.fullpath)
ThreadLocalORMSession.flush_all() # just in case the event handling is super fast
+ c.project.last_updated = datetime.utcnow()
g.post_event('project_updated')
else:
error_msg = 'This category has already been assigned to the project.'
@@ -439,6 +440,7 @@ class ProjectAdminController(BaseController):
M.AuditLog.log('remove trove %s: %s', type, trove_obj.fullpath)
current_troves.remove(trove_obj._id)
ThreadLocalORMSession.flush_all() # just in case the event handling is super fast
+ c.project.last_updated = datetime.utcnow()
g.post_event('project_updated')
redirect('trove')
[12/27] [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/jslint/fulljslint.js
----------------------------------------------------------------------
diff --git a/AlluraTesting/jslint/fulljslint.js b/AlluraTesting/jslint/fulljslint.js
deleted file mode 100644
index 0bf59bb..0000000
--- a/AlluraTesting/jslint/fulljslint.js
+++ /dev/null
@@ -1,5688 +0,0 @@
-// jslint.js
-// 2010-08-05
-
-/*
-Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-/*
- JSLINT is a global function. It takes two parameters.
-
- var myResult = JSLINT(source, option);
-
- The first parameter is either a string or an array of strings. If it is a
- string, it will be split on '\n' or '\r'. If it is an array of strings, it
- is assumed that each string represents one line. The source can be a
- JavaScript text, or HTML text, or a Konfabulator text.
-
- The second parameter is an optional object of options which control the
- operation of JSLINT. Most of the options are booleans: They are all are
- optional and have a default value of false.
-
- If it checks out, JSLINT returns true. Otherwise, it returns false.
-
- If false, you can inspect JSLINT.errors to find out the problems.
- JSLINT.errors is an array of objects containing these members:
-
- {
- line : The line (relative to 0) at which the lint was found
- character : The character (relative to 0) at which the lint was found
- reason : The problem
- evidence : The text line in which the problem occurred
- raw : The raw message before the details were inserted
- a : The first detail
- b : The second detail
- c : The third detail
- d : The fourth detail
- }
-
- If a fatal error was found, a null will be the last element of the
- JSLINT.errors array.
-
- You can request a Function Report, which shows all of the functions
- and the parameters and vars that they use. This can be used to find
- implied global variables and other problems. The report is in HTML and
- can be inserted in an HTML <body>.
-
- var myReport = JSLINT.report(limited);
-
- If limited is true, then the report will be limited to only errors.
-
- You can request a data structure which contains JSLint's results.
-
- var myData = JSLINT.data();
-
- It returns a structure with this form:
-
- {
- errors: [
- {
- line: NUMBER,
- character: NUMBER,
- reason: STRING,
- evidence: STRING
- }
- ],
- functions: [
- name: STRING,
- line: NUMBER,
- last: NUMBER,
- param: [
- STRING
- ],
- closure: [
- STRING
- ],
- var: [
- STRING
- ],
- exception: [
- STRING
- ],
- outer: [
- STRING
- ],
- unused: [
- STRING
- ],
- global: [
- STRING
- ],
- label: [
- STRING
- ]
- ],
- globals: [
- STRING
- ],
- member: {
- STRING: NUMBER
- },
- unuseds: [
- {
- name: STRING,
- line: NUMBER
- }
- ],
- implieds: [
- {
- name: STRING,
- line: NUMBER
- }
- ],
- urls: [
- STRING
- ],
- json: BOOLEAN
- }
-
- Empty arrays will not be included.
-
-*/
-
-/*jslint
- evil: true, nomen: false, onevar: false, regexp: false, strict: true
-*/
-
-/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%",
- "(begin)", "(breakage)", "(context)", "(error)", "(global)",
- "(identifier)", "(last)", "(line)", "(loopage)", "(name)", "(onevar)",
- "(params)", "(scope)", "(verb)", "*", "+", "++", "-", "--", "\/",
- "<", "<=", "==", "===", ">", ">=", ADSAFE, ActiveXObject,
- Array, Boolean, COM, CScript, Canvas, CustomAnimation, Date, Debug, E,
- Enumerator, Error, EvalError, FadeAnimation, Flash, FormField, Frame,
- Function, HotKey, Image, JSON, LN10, LN2, LOG10E, LOG2E, MAX_VALUE,
- MIN_VALUE, Math, MenuItem, MoveAnimation, NEGATIVE_INFINITY, Number,
- Object, Option, PI, POSITIVE_INFINITY, Point, RangeError, Rectangle,
- ReferenceError, RegExp, ResizeAnimation, RotateAnimation, SQRT1_2,
- SQRT2, ScrollBar, String, Style, SyntaxError, System, Text, TextArea,
- Timer, TypeError, URIError, URL, VBArray, WScript, Web, Window, XMLDOM,
- XMLHttpRequest, "\\", a, abbr, acronym, addEventListener, address,
- adsafe, alert, aliceblue, animator, antiquewhite, appleScript, applet,
- apply, approved, aqua, aquamarine, area, arguments, arity, article,
- aside, audio, autocomplete, azure, b, background,
- "background-attachment", "background-color", "background-image",
- "background-position", "background-repeat", base, bdo, beep, beige, big,
- bisque, bitwise, black, blanchedalmond, block, blockquote, blue,
- blueviolet, blur, body, border, "border-bottom", "border-bottom-color",
- "border-bottom-style", "border-bottom-width", "border-collapse",
- "border-color", "border-left", "border-left-color", "border-left-style",
- "border-left-width", "border-right", "border-right-color",
- "border-right-style", "border-right-width", "border-spacing",
- "border-style", "border-top", "border-top-color", "border-top-style",
- "border-top-width", "border-width", bottom, br, brown, browser,
- burlywood, button, bytesToUIString, c, cadetblue, call, callee, caller,
- canvas, cap, caption, "caption-side", cases, center, charAt, charCodeAt,
- character, chartreuse, chocolate, chooseColor, chooseFile, chooseFolder,
- cite, clear, clearInterval, clearTimeout, clip, close, closeWidget,
- closed, closure, cm, code, col, colgroup, color, command, comment,
- condition, confirm, console, constructor, content, convertPathToHFS,
- convertPathToPlatform, coral, cornflowerblue, cornsilk,
- "counter-increment", "counter-reset", create, crimson, css, cursor,
- cyan, d, darkblue, darkcyan, darkgoldenrod, darkgray, darkgreen,
- darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred,
- darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise,
- darkviolet, data, datalist, dd, debug, decodeURI, decodeURIComponent,
- deeppink, deepskyblue, defaultStatus, defineClass, del, deserialize,
- details, devel, dfn, dialog, dimension, dimgray, dir, direction,
- display, div, dl, document, dodgerblue, dt, edition, else, em, embed,
- empty, "empty-cells", encodeURI, encodeURIComponent, entityify, eqeqeq,
- errors, es5, escape, eval, event, evidence, evil, ex, exception, exec, exps,
- fieldset, figure, filesystem, firebrick, first, float, floor,
- floralwhite, focus, focusWidget, font, "font-face", "font-family",
- "font-size", "font-size-adjust", "font-stretch", "font-style",
- "font-variant", "font-weight", footer, forestgreen, forin, form,
- fragment, frame, frames, frameset, from, fromCharCode, fuchsia, fud,
- funct, function, functions, g, gainsboro, gc, getComputedStyle,
- ghostwhite, global, globals, gold, goldenrod, gray, green, greenyellow,
- h1, h2, h3, h4, h5, h6, hasOwnProperty, head, header, height, help,
- hgroup, history, honeydew, hotpink, hr, 'hta:application', html,
- i, iTunes, id, identifier,
- iframe, img, immed, implieds, in, include, indent, indexOf, indianred,
- indigo, init, input, ins, isAlpha, isApplicationRunning, isDigit,
- isFinite, isNaN, ivory, join, jslint, json, kbd, keygen, khaki,
- konfabulatorVersion, label, labelled, lang, last, lavender,
- lavenderblush, lawngreen, laxbreak, lbp, led, left, legend,
- lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral,
- lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon,
- lightseagreen, lightskyblue, lightslategray, lightsteelblue,
- lightyellow, lime, limegreen, line, "line-height", linen, link,
- "list-style", "list-style-image", "list-style-position",
- "list-style-type", load, loadClass, location, log, m, magenta, map,
- margin, "margin-bottom", "margin-left", "margin-right", "margin-top",
- mark, "marker-offset", maroon, match, "max-height", "max-width", maxerr,
- maxlen, md5, media, mediumaquamarine, mediumblue, mediumorchid,
- mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen,
- mediumturquoise, mediumvioletred, member, menu, message, meta, meter,
- midnightblue, "min-height", "min-width", mintcream, mistyrose, mm,
- moccasin, moveBy, moveTo, name, nav, navajowhite, navigator, navy, new,
- newcap, noframes, nomen, noscript, nud, object, ol, oldlace, olive,
- olivedrab, on, onbeforeunload, onblur, onerror, onevar, onfocus, onload,
- onresize, onunload, opacity, open, openURL, opener, opera, optgroup,
- option, orange, orangered, orchid, outer, outline, "outline-color",
- "outline-style", "outline-width", output, overflow, "overflow-x",
- "overflow-y", p, padding, "padding-bottom", "padding-left",
- "padding-right", "padding-top", page, "page-break-after",
- "page-break-before", palegoldenrod, palegreen, paleturquoise,
- palevioletred, papayawhip, param, parent, parseFloat, parseInt,
- passfail, pc, peachpuff, peru, pink, play, plum, plusplus, pop,
- popupMenu, position, powderblue, pre, predef, preferenceGroups,
- preferences, print, progress, prompt, prototype, pt, purple, push, px,
- q, quit, quotes, random, range, raw, reach, readFile, readUrl, reason,
- red, regexp, reloadWidget, removeEventListener, replace, report,
- reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, rhino, right,
- rosybrown, royalblue, rp, rt, ruby, runCommand, runCommandInBg,
- saddlebrown, safe, salmon, samp, sandybrown, saveAs, savePreferences,
- screen, script, scroll, scrollBy, scrollTo, seagreen, seal, search,
- seashell, section, select, serialize, setInterval, setTimeout, shift,
- showWidgetPreferences, sienna, silver, skyblue, slateblue, slategray,
- sleep, slice, small, snow, sort, source, span, spawn, speak, split,
- springgreen, src, stack, status, steelblue, strict, strong, style,
- styleproperty, sub, substr, sup, supplant, suppressUpdates, sync,
- system, table, "table-layout", tan, tbody, td, teal, tellWidget, test,
- "text-align", "text-decoration", "text-indent", "text-shadow",
- "text-transform", textarea, tfoot, th, thead, thistle, time, title,
- toLowerCase, toString, toUpperCase, toint32, token, tomato, top, tr, tt,
- turquoise, type, u, ul, undef, unescape, "unicode-bidi", unused,
- unwatch, updateNow, urls, value, valueOf, var, version,
- "vertical-align", video, violet, visibility, watch, wheat, white,
- "white-space", whitesmoke, widget, width, windows, "word-spacing",
- "word-wrap", yahooCheckLogin, yahooLogin, yahooLogout, yellow,
- yellowgreen, "z-index"
-*/
-
-// We build the application inside a function so that we produce only a single
-// global variable. The function will be invoked, its return value is the JSLINT
-// application itself.
-
-"use strict";
-
-var JSLINT = (function () {
- var adsafe_id, // The widget's ADsafe id.
- adsafe_may, // The widget may load approved scripts.
- adsafe_went, // ADSAFE.go has been called.
- anonname, // The guessed name for anonymous functions.
- approved, // ADsafe approved urls.
-
- atrule = {
- media : true,
- 'font-face': true,
- page : true
- },
-
-// These are operators that should not be used with the ! operator.
-
- bang = {
- '<': true,
- '<=': true,
- '==': true,
- '===': true,
- '!==': true,
- '!=': true,
- '>': true,
- '>=': true,
- '+': true,
- '-': true,
- '*': true,
- '/': true,
- '%': true
- },
-
-// These are members that should not be permitted in the safe subset.
-
- banned = { // the member names that ADsafe prohibits.
- 'arguments' : true,
- callee : true,
- caller : true,
- constructor : true,
- 'eval' : true,
- prototype : true,
- stack : true,
- unwatch : true,
- valueOf : true,
- watch : true
- },
-
-
-// These are the JSLint boolean options.
-
- boolOptions = {
- adsafe : true, // if ADsafe should be enforced
- bitwise : true, // if bitwise operators should not be allowed
- browser : true, // if the standard browser globals should be predefined
- cap : true, // if upper case HTML should be allowed
- css : true, // if CSS workarounds should be tolerated
- debug : true, // if debugger statements should be allowed
- devel : true, // if logging should be allowed (console, alert, etc.)
- eqeqeq : true, // if === should be required
- es5 : true, // if ES5 syntax should be allowed
- evil : true, // if eval should be allowed
- forin : true, // if for in statements must filter
- fragment : true, // if HTML fragments should be allowed
- immed : true, // if immediate invocations must be wrapped in parens
- laxbreak : true, // if line breaks should not be checked
- newcap : true, // if constructor names must be capitalized
- nomen : true, // if names should be checked
- on : true, // if HTML event handlers should be allowed
- onevar : true, // if only one var statement per function should be allowed
- passfail : true, // if the scan should stop on first error
- plusplus : true, // if increment/decrement should not be allowed
- regexp : true, // if the . should not be allowed in regexp literals
- rhino : true, // if the Rhino environment globals should be predefined
- undef : true, // if variables should be declared before used
- safe : true, // if use of some browser features should be restricted
- windows : true, // if MS Windows-specigic globals should be predefined
- strict : true, // require the "use strict"; pragma
- sub : true, // if all forms of subscript notation are tolerated
- white : true, // if strict whitespace rules apply
- widget : true // if the Yahoo Widgets globals should be predefined
- },
-
-// browser contains a set of global names which are commonly provided by a
-// web browser environment.
-
- browser = {
- addEventListener: false,
- blur : false,
- clearInterval : false,
- clearTimeout : false,
- close : false,
- closed : false,
- defaultStatus : false,
- document : false,
- event : false,
- focus : false,
- frames : false,
- getComputedStyle: false,
- history : false,
- Image : false,
- length : false,
- location : false,
- moveBy : false,
- moveTo : false,
- name : false,
- navigator : false,
- onbeforeunload : true,
- onblur : true,
- onerror : true,
- onfocus : true,
- onload : true,
- onresize : true,
- onunload : true,
- open : false,
- opener : false,
- Option : false,
- parent : false,
- print : false,
- removeEventListener: false,
- resizeBy : false,
- resizeTo : false,
- screen : false,
- scroll : false,
- scrollBy : false,
- scrollTo : false,
- setInterval : false,
- setTimeout : false,
- status : false,
- top : false,
- XMLHttpRequest : false
- },
-
- cssAttributeData,
- cssAny,
-
- cssColorData = {
- "aliceblue" : true,
- "antiquewhite" : true,
- "aqua" : true,
- "aquamarine" : true,
- "azure" : true,
- "beige" : true,
- "bisque" : true,
- "black" : true,
- "blanchedalmond" : true,
- "blue" : true,
- "blueviolet" : true,
- "brown" : true,
- "burlywood" : true,
- "cadetblue" : true,
- "chartreuse" : true,
- "chocolate" : true,
- "coral" : true,
- "cornflowerblue" : true,
- "cornsilk" : true,
- "crimson" : true,
- "cyan" : true,
- "darkblue" : true,
- "darkcyan" : true,
- "darkgoldenrod" : true,
- "darkgray" : true,
- "darkgreen" : true,
- "darkkhaki" : true,
- "darkmagenta" : true,
- "darkolivegreen" : true,
- "darkorange" : true,
- "darkorchid" : true,
- "darkred" : true,
- "darksalmon" : true,
- "darkseagreen" : true,
- "darkslateblue" : true,
- "darkslategray" : true,
- "darkturquoise" : true,
- "darkviolet" : true,
- "deeppink" : true,
- "deepskyblue" : true,
- "dimgray" : true,
- "dodgerblue" : true,
- "firebrick" : true,
- "floralwhite" : true,
- "forestgreen" : true,
- "fuchsia" : true,
- "gainsboro" : true,
- "ghostwhite" : true,
- "gold" : true,
- "goldenrod" : true,
- "gray" : true,
- "green" : true,
- "greenyellow" : true,
- "honeydew" : true,
- "hotpink" : true,
- "indianred" : true,
- "indigo" : true,
- "ivory" : true,
- "khaki" : true,
- "lavender" : true,
- "lavenderblush" : true,
- "lawngreen" : true,
- "lemonchiffon" : true,
- "lightblue" : true,
- "lightcoral" : true,
- "lightcyan" : true,
- "lightgoldenrodyellow" : true,
- "lightgreen" : true,
- "lightpink" : true,
- "lightsalmon" : true,
- "lightseagreen" : true,
- "lightskyblue" : true,
- "lightslategray" : true,
- "lightsteelblue" : true,
- "lightyellow" : true,
- "lime" : true,
- "limegreen" : true,
- "linen" : true,
- "magenta" : true,
- "maroon" : true,
- "mediumaquamarine" : true,
- "mediumblue" : true,
- "mediumorchid" : true,
- "mediumpurple" : true,
- "mediumseagreen" : true,
- "mediumslateblue" : true,
- "mediumspringgreen" : true,
- "mediumturquoise" : true,
- "mediumvioletred" : true,
- "midnightblue" : true,
- "mintcream" : true,
- "mistyrose" : true,
- "moccasin" : true,
- "navajowhite" : true,
- "navy" : true,
- "oldlace" : true,
- "olive" : true,
- "olivedrab" : true,
- "orange" : true,
- "orangered" : true,
- "orchid" : true,
- "palegoldenrod" : true,
- "palegreen" : true,
- "paleturquoise" : true,
- "palevioletred" : true,
- "papayawhip" : true,
- "peachpuff" : true,
- "peru" : true,
- "pink" : true,
- "plum" : true,
- "powderblue" : true,
- "purple" : true,
- "red" : true,
- "rosybrown" : true,
- "royalblue" : true,
- "saddlebrown" : true,
- "salmon" : true,
- "sandybrown" : true,
- "seagreen" : true,
- "seashell" : true,
- "sienna" : true,
- "silver" : true,
- "skyblue" : true,
- "slateblue" : true,
- "slategray" : true,
- "snow" : true,
- "springgreen" : true,
- "steelblue" : true,
- "tan" : true,
- "teal" : true,
- "thistle" : true,
- "tomato" : true,
- "turquoise" : true,
- "violet" : true,
- "wheat" : true,
- "white" : true,
- "whitesmoke" : true,
- "yellow" : true,
- "yellowgreen" : true
- },
-
- cssBorderStyle,
- cssBreak,
-
- cssLengthData = {
- '%': true,
- 'cm': true,
- 'em': true,
- 'ex': true,
- 'in': true,
- 'mm': true,
- 'pc': true,
- 'pt': true,
- 'px': true
- },
-
- cssOverflow,
-
- devel = {
- alert : false,
- confirm : false,
- console : false,
- Debug : false,
- opera : false,
- prompt : false
- },
-
- escapes = {
- '\b': '\\b',
- '\t': '\\t',
- '\n': '\\n',
- '\f': '\\f',
- '\r': '\\r',
- '"' : '\\"',
- '/' : '\\/',
- '\\': '\\\\'
- },
-
- funct, // The current function
-
- functionicity = [
- 'closure', 'exception', 'global', 'label',
- 'outer', 'unused', 'var'
- ],
-
- functions, // All of the functions
-
- global, // The global scope
- htmltag = {
- a: {},
- abbr: {},
- acronym: {},
- address: {},
- applet: {},
- area: {empty: true, parent: ' map '},
- article: {},
- aside: {},
- audio: {},
- b: {},
- base: {empty: true, parent: ' head '},
- bdo: {},
- big: {},
- blockquote: {},
- body: {parent: ' html noframes '},
- br: {empty: true},
- button: {},
- canvas: {parent: ' body p div th td '},
- caption: {parent: ' table '},
- center: {},
- cite: {},
- code: {},
- col: {empty: true, parent: ' table colgroup '},
- colgroup: {parent: ' table '},
- command: {parent: ' menu '},
- datalist: {},
- dd: {parent: ' dl '},
- del: {},
- details: {},
- dialog: {},
- dfn: {},
- dir: {},
- div: {},
- dl: {},
- dt: {parent: ' dl '},
- em: {},
- embed: {},
- fieldset: {},
- figure: {},
- font: {},
- footer: {},
- form: {},
- frame: {empty: true, parent: ' frameset '},
- frameset: {parent: ' html frameset '},
- h1: {},
- h2: {},
- h3: {},
- h4: {},
- h5: {},
- h6: {},
- head: {parent: ' html '},
- header: {},
- hgroup: {},
- hr: {empty: true},
- 'hta:application':
- {empty: true, parent: ' head '},
- html: {parent: '*'},
- i: {},
- iframe: {},
- img: {empty: true},
- input: {empty: true},
- ins: {},
- kbd: {},
- keygen: {},
- label: {},
- legend: {parent: ' details fieldset figure '},
- li: {parent: ' dir menu ol ul '},
- link: {empty: true, parent: ' head '},
- map: {},
- mark: {},
- menu: {},
- meta: {empty: true, parent: ' head noframes noscript '},
- meter: {},
- nav: {},
- noframes: {parent: ' html body '},
- noscript: {},
- object: {},
- ol: {},
- optgroup: {parent: ' select '},
- option: {parent: ' optgroup select '},
- output: {},
- p: {},
- param: {parent: ' applet object '},
- pre: {},
- progress: {},
- q: {},
- rp: {},
- rt: {},
- ruby: {},
- s: {},
- samp: {},
- script: {empty: true, parent: ' body div frame head iframe p pre span '},
- section: {},
- select: {},
- small: {},
- span: {},
- source: {},
- strong: {},
- style: {parent: ' head ', empty: true},
- sub: {},
- sup: {},
- table: {},
- tbody: {parent: ' table '},
- td: {parent: ' tr '},
- textarea: {},
- tfoot: {parent: ' table '},
- th: {parent: ' tr '},
- thead: {parent: ' table '},
- time: {},
- title: {parent: ' head '},
- tr: {parent: ' table tbody thead tfoot '},
- tt: {},
- u: {},
- ul: {},
- 'var': {},
- video: {}
- },
-
- ids, // HTML ids
- implied, // Implied globals
- inblock,
- indent,
- jsonmode,
- lines,
- lookahead,
- member,
- membersOnly,
- nexttoken,
- noreach,
- option,
- predefined, // Global variables defined by option
- prereg,
- prevtoken,
-
- rhino = {
- defineClass : false,
- deserialize : false,
- gc : false,
- help : false,
- load : false,
- loadClass : false,
- print : false,
- quit : false,
- readFile : false,
- readUrl : false,
- runCommand : false,
- seal : false,
- serialize : false,
- spawn : false,
- sync : false,
- toint32 : false,
- version : false
- },
-
- scope, // The current scope
-
- windows = {
- ActiveXObject: false,
- CScript : false,
- Debug : false,
- Enumerator : false,
- System : false,
- VBArray : false,
- WScript : false
- },
-
- src,
- stack,
-
-// standard contains the global names that are provided by the
-// ECMAScript standard.
-
- standard = {
- 'void' : false,
- Array : false,
- Boolean : false,
- Date : false,
- decodeURI : false,
- decodeURIComponent : false,
- encodeURI : false,
- encodeURIComponent : false,
- Error : false,
- 'eval' : false,
- EvalError : false,
- Function : false,
- hasOwnProperty : false,
- isFinite : false,
- isNaN : false,
- JSON : false,
- Math : false,
- Number : false,
- Object : false,
- parseInt : false,
- parseFloat : false,
- RangeError : false,
- ReferenceError : false,
- RegExp : false,
- String : false,
- SyntaxError : false,
- TypeError : false,
- URIError : false
- },
-
- standard_member = {
- E : true,
- LN2 : true,
- LN10 : true,
- LOG2E : true,
- LOG10E : true,
- PI : true,
- SQRT1_2 : true,
- SQRT2 : true,
- MAX_VALUE : true,
- MIN_VALUE : true,
- NEGATIVE_INFINITY : true,
- POSITIVE_INFINITY : true
- },
-
- strict_mode,
- syntax = {},
- tab,
- token,
- urls,
- warnings,
-
-// widget contains the global names which are provided to a Yahoo
-// (fna Konfabulator) widget.
-
- widget = {
- alert : true,
- animator : true,
- appleScript : true,
- beep : true,
- bytesToUIString : true,
- Canvas : true,
- chooseColor : true,
- chooseFile : true,
- chooseFolder : true,
- closeWidget : true,
- COM : true,
- convertPathToHFS : true,
- convertPathToPlatform : true,
- CustomAnimation : true,
- escape : true,
- FadeAnimation : true,
- filesystem : true,
- Flash : true,
- focusWidget : true,
- form : true,
- FormField : true,
- Frame : true,
- HotKey : true,
- Image : true,
- include : true,
- isApplicationRunning : true,
- iTunes : true,
- konfabulatorVersion : true,
- log : true,
- md5 : true,
- MenuItem : true,
- MoveAnimation : true,
- openURL : true,
- play : true,
- Point : true,
- popupMenu : true,
- preferenceGroups : true,
- preferences : true,
- print : true,
- prompt : true,
- random : true,
- Rectangle : true,
- reloadWidget : true,
- ResizeAnimation : true,
- resolvePath : true,
- resumeUpdates : true,
- RotateAnimation : true,
- runCommand : true,
- runCommandInBg : true,
- saveAs : true,
- savePreferences : true,
- screen : true,
- ScrollBar : true,
- showWidgetPreferences : true,
- sleep : true,
- speak : true,
- Style : true,
- suppressUpdates : true,
- system : true,
- tellWidget : true,
- Text : true,
- TextArea : true,
- Timer : true,
- unescape : true,
- updateNow : true,
- URL : true,
- Web : true,
- widget : true,
- Window : true,
- XMLDOM : true,
- XMLHttpRequest : true,
- yahooCheckLogin : true,
- yahooLogin : true,
- yahooLogout : true
- },
-
-// xmode is used to adapt to the exceptions in html parsing.
-// It can have these states:
-// false .js script file
-// html
-// outer
-// script
-// style
-// scriptstring
-// styleproperty
-
- xmode,
- xquote,
-
-// unsafe comment or string
- ax = /@cc|<\/?|script|\]*s\]|<\s*!|</i,
-// unsafe characters that are silently deleted by one or more browsers
-// Whitelist Replacement Char, 0xfffd
- cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\ufffc\ufffe-\uffff]/,
-// token
- tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/,
-// html token
- hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
-// characters in strings that need escapement
- nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
- nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-// outer html token
- ox = /[>&]|<[\/!]?|--/,
-// star slash
- lx = /\*\/|\/\*/,
-// identifier
- ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
-// javascript url
- jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
-// url badness
- ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto/i,
-// style
- sx = /^\s*([{:#%.=,>+\[\]@()"';]|\*=?|\$=|\|=|\^=|~=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
- ssx = /^\s*(\.?\d+(?:\.\d+)?|[@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|<\/)/,
-// attributes characters
- //qx = /[^a-zA-Z0-9+\-_\/ ]/,
- qx = /[^a-zA-Z0-9+\-_\/ .#]/, // We want dots in names, period; and hashes for templating
-// query characters for ids
- //dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
- // allow . and /
- dx = /[\[\]\\"'*<>&:(){}+=#]/,
-
- rx = {
- outer: hx,
- html: hx,
- style: sx,
- styleproperty: ssx
- };
-
- function F() {}
-
- if (typeof Object.create !== 'function') {
- Object.create = function (o) {
- F.prototype = o;
- return new F();
- };
- }
-
-
- function is_own(object, name) {
- return Object.prototype.hasOwnProperty.call(object, name);
- }
-
-
- function combine(t, o) {
- var n;
- for (n in o) {
- if (is_own(o, n)) {
- t[n] = o[n];
- }
- }
- }
-
- String.prototype.entityify = function () {
- return this.
- replace(/&/g, '&').
- replace(/</g, '<').
- replace(/>/g, '>');
- };
-
- String.prototype.isAlpha = function () {
- return (this >= 'a' && this <= 'z\uffff') ||
- (this >= 'A' && this <= 'Z\uffff');
- };
-
-
- String.prototype.isDigit = function () {
- return (this >= '0' && this <= '9');
- };
-
-
- String.prototype.supplant = function (o) {
- return this.replace(/\{([^{}]*)\}/g, function (a, b) {
- var r = o[b];
- return typeof r === 'string' || typeof r === 'number' ? r : a;
- });
- };
-
- String.prototype.name = function () {
-
-// If the string looks like an identifier, then we can return it as is.
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can simply slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe
-// sequences.
-
- if (ix.test(this)) {
- return this;
- }
- if (nx.test(this)) {
- return '"' + this.replace(nxg, function (a) {
- var c = escapes[a];
- if (c) {
- return c;
- }
- return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
- }) + '"';
- }
- return '"' + this + '"';
- };
-
-
- function assume() {
- if (!option.safe) {
- if (option.rhino) {
- combine(predefined, rhino);
- }
- if (option.devel) {
- combine(predefined, devel);
- }
- if (option.browser) {
- combine(predefined, browser);
- }
- if (option.windows) {
- combine(predefined, windows);
- }
- if (option.widget) {
- combine(predefined, widget);
- }
- }
- }
-
-
-// Produce an error warning.
-
- function quit(m, l, ch) {
- throw {
- name: 'JSLintError',
- line: l,
- character: ch,
- message: m + " (" + Math.floor((l / lines.length) * 100) +
- "% scanned)."
- };
- }
-
- function warning(m, t, a, b, c, d) {
- var ch, l, w;
- t = t || nexttoken;
- if (t.id === '(end)') { // `~
- t = token;
- }
- l = t.line || 0;
- ch = t.from || 0;
- w = {
- id: '(error)',
- raw: m,
- evidence: lines[l - 1] || '',
- line: l,
- character: ch,
- a: a,
- b: b,
- c: c,
- d: d
- };
- w.reason = m.supplant(w);
- JSLINT.errors.push(w);
- if (option.passfail) {
- quit('Stopping. ', l, ch);
- }
- warnings += 1;
- if (warnings >= option.maxerr) {
- quit("Too many errors.", l, ch);
- }
- return w;
- }
-
- function warningAt(m, l, ch, a, b, c, d) {
- return warning(m, {
- line: l,
- from: ch
- }, a, b, c, d);
- }
-
- function error(m, t, a, b, c, d) {
- var w = warning(m, t, a, b, c, d);
- quit("Stopping, unable to continue.", w.line, w.character);
- }
-
- function errorAt(m, l, ch, a, b, c, d) {
- return error(m, {
- line: l,
- from: ch
- }, a, b, c, d);
- }
-
-
-
-// lexical analysis
-
- var lex = (function lex() {
- var character, from, line, s;
-
-// Private lex methods
-
- function nextLine() {
- var at;
- if (line >= lines.length) {
- return false;
- }
- character = 1;
- s = lines[line];
- line += 1;
- at = s.search(/ \t/);
- if (at >= 0) {
- warningAt("Mixed spaces and tabs.", line, at + 1);
- }
- s = s.replace(/\t/g, tab);
- at = s.search(cx);
- if (at >= 0) {
- warningAt("Unsafe character.", line, at);
- }
- if (option.maxlen && option.maxlen < s.length) {
- warningAt("Line too long.", line, s.length);
- }
- return true;
- }
-
-// Produce a token object. The token inherits from a syntax symbol.
-
- function it(type, value) {
- var i, t;
- if (type === '(color)') {
- t = {type: type};
- } else if (type === '(punctuator)' ||
- (type === '(identifier)' && is_own(syntax, value))) {
- t = syntax[value] || syntax['(error)'];
- } else {
- t = syntax[type];
- }
- t = Object.create(t);
- if (type === '(string)' || type === '(range)') {
- if (jx.test(value)) {
- warningAt("Script URL.", line, from);
- }
- }
- if (type === '(identifier)') {
- t.identifier = true;
- if (value === '__iterator__' || value === '__proto__') {
- errorAt("Reserved name '{a}'.",
- line, from, value);
- } else if (option.nomen &&
- (value.charAt(0) === '_' ||
- value.charAt(value.length - 1) === '_')) {
- warningAt("Unexpected {a} in '{b}'.", line, from,
- "dangling '_'", value);
- }
- }
- t.value = value;
- t.line = line;
- t.character = character;
- t.from = from;
- i = t.id;
- if (i !== '(endline)') {
- prereg = i &&
- (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
- i === 'return');
- }
- return t;
- }
-
-// Public lex methods
-
- return {
- init: function (source) {
- if (typeof source === 'string') {
- lines = source.
- replace(/\r\n/g, '\n').
- replace(/\r/g, '\n').
- split('\n');
- } else {
- lines = source;
- }
- line = 0;
- nextLine();
- from = 1;
- },
-
- range: function (begin, end) {
- var c, value = '';
- from = character;
- if (s.charAt(0) !== begin) {
- errorAt("Expected '{a}' and instead saw '{b}'.",
- line, character, begin, s.charAt(0));
- }
- for (;;) {
- s = s.slice(1);
- character += 1;
- c = s.charAt(0);
- switch (c) {
- case '':
- errorAt("Missing '{a}'.", line, character, c);
- break;
- case end:
- s = s.slice(1);
- character += 1;
- return it('(range)', value);
- case xquote:
- case '\\':
- warningAt("Unexpected '{a}'.", line, character, c);
- }
- value += c;
- }
-
- },
-
-// skip all content up to marker
-
- skip_till: function (end) {
- for (;;) {
- i = s.indexOf(end);
- if (i >= 0) {
- break;
- }
- if (!nextLine()) {
- errorAt("Unclosed {a} block.", line, character, end);
- }
- }
- character += i;
- s = s.substr(i);
- },
-
-// token -- this is called by advance to get the next token.
-
- token: function () {
- var b, c, captures, d, depth, high, i, l, low, q, t;
-
- function match(x) {
- var r = x.exec(s), r1;
- if (r) {
- l = r[0].length;
- r1 = r[1];
- c = r1.charAt(0);
- s = s.substr(l);
- from = character + l - r1.length;
- character += l;
- return r1;
- }
- }
-
- function string(x) {
- var c, j, r = '';
-
- if (jsonmode && x !== '"') {
- warningAt("Strings must use doublequote.",
- line, character);
- }
-
- if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
- return it('(punctuator)', x);
- }
-
- function esc(n) {
- var i = parseInt(s.substr(j + 1, n), 16);
- j += n;
- if (i >= 32 && i <= 126 &&
- i !== 34 && i !== 92 && i !== 39) {
- warningAt("Unnecessary escapement.", line, character);
- }
- character += n;
- c = String.fromCharCode(i);
- }
- j = 0;
- for (;;) {
- while (j >= s.length) {
- j = 0;
- if (xmode !== 'html' || !nextLine()) {
- errorAt("Unclosed string.", line, from);
- }
- }
- c = s.charAt(j);
- if (c === x) {
- character += 1;
- s = s.substr(j + 1);
- return it('(string)', r, x);
- }
- if (c < ' ') {
- if (c === '\n' || c === '\r') {
- break;
- }
- warningAt("Control character in string: {a}.",
- line, character + j, s.slice(0, j));
- } else if (c === xquote) {
- warningAt("Bad HTML string", line, character + j);
- } else if (c === '<') {
- if (option.safe && xmode === 'html') {
- warningAt("ADsafe string violation.",
- line, character + j);
- } else if (s.charAt(j + 1) === '/' && (xmode || option.safe) && s.substr(j + 2, 6) === 'script') {
- warningAt("Expected '<\\/' and instead saw '</'.", line, character);
- } else if (s.charAt(j + 1) === '!' && (xmode || option.safe)) {
- warningAt("Unexpected '<!' in a string.", line, character);
- }
- } else if (c === '\\') {
- if (xmode === 'html') {
- if (option.safe) {
- warningAt("ADsafe string violation.",
- line, character + j);
- }
- } else if (xmode === 'styleproperty') {
- j += 1;
- character += 1;
- c = s.charAt(j);
- if (c !== x) {
- warningAt("Escapement in style string.",
- line, character + j);
- }
- } else {
- j += 1;
- character += 1;
- c = s.charAt(j);
- switch (c) {
- case xquote:
- warningAt("Bad HTML string", line,
- character + j);
- break;
- case '\\':
- case '\'':
- case '"':
- case '/':
- break;
- case 'b':
- c = '\b';
- break;
- case 'f':
- c = '\f';
- break;
- case 'n':
- c = '\n';
- break;
- case 'r':
- c = '\r';
- break;
- case 't':
- c = '\t';
- break;
- case 'u':
- esc(4);
- break;
- case 'v':
- c = '\v';
- break;
- case 'x':
- if (jsonmode) {
- warningAt("Avoid \\x-.", line, character);
- }
- esc(2);
- break;
- default:
- warningAt("Bad escapement.", line, character);
- }
- }
- }
- r += c;
- character += 1;
- j += 1;
- }
- }
-
- for (;;) {
- if (!s) {
- return it(nextLine() ? '(endline)' : '(end)', '');
- }
- while (xmode === 'outer') {
- i = s.search(ox);
- if (i === 0) {
- break;
- } else if (i > 0) {
- character += 1;
- s = s.slice(i);
- break;
- } else {
- if (!nextLine()) {
- return it('(end)', '');
- }
- }
- }
-// t = match(rx[xmode] || tx);
-// if (!t) {
-// if (xmode === 'html') {
-// return it('(error)', s.charAt(0));
-// } else {
-// t = '';
-// c = '';
-// while (s && s < '!') {
-// s = s.substr(1);
-// }
-// if (s) {
-// errorAt("Unexpected '{a}'.",
-// line, character, s.substr(0, 1));
-// }
-// }
- t = match(rx[xmode] || tx);
- if (!t) {
- t = '';
- c = '';
- while (s && s < '!') {
- s = s.substr(1);
- }
- if (s) {
- if (xmode === 'html') {
- return it('(error)', s.charAt(0));
- } else {
- errorAt("Unexpected '{a}'.",
- line, character, s.substr(0, 1));
- }
- }
- } else {
-
- // identifier
-
- if (c.isAlpha() || c === '_' || c === '$') {
- return it('(identifier)', t);
- }
-
- // number
-
- if (c.isDigit() || (c === '.' && t.substr(1, 1).isDigit())) {
- if (c === '.') {
- t = '0' + t;
- c = '0';
- }
-
- if (xmode !== 'style' && !isFinite(Number(t))) {
- warningAt("Bad number '{a}'.",
- line, character, t);
- }
- if (xmode !== 'style' &&
- xmode !== 'styleproperty' &&
- s.substr(0, 1).isAlpha()) {
- warningAt("Missing space after '{a}'.",
- line, character, t);
- }
- if (c === '0') {
- d = t.substr(1, 1);
- if (d.isDigit()) {
- if (token.id !== '.' && xmode !== 'styleproperty') {
- warningAt("Don't use extra leading zeros '{a}'.",
- line, character, t);
- }
- } else if (jsonmode && (d === 'x' || d === 'X')) {
- warningAt("Avoid 0x-. '{a}'.",
- line, character, t);
- }
- }
- if (t.substr(t.length - 1) === '.') {
- warningAt(
- "A trailing decimal point can be confused with a dot '{a}'.",
- line, character, t);
- }
- return it('(number)', t);
- }
- switch (t) {
-
- // string
-
- case '"':
- case "'":
- return string(t);
-
- // // comment
-
- case '//':
- if (src || (xmode && xmode !== 'script')) {
- warningAt("Unexpected comment.", line, character);
- } else if (xmode === 'script' && /<\s*\//i.test(s)) {
- warningAt("Unexpected <\/ in comment.", line, character);
- } else if ((option.safe || xmode === 'script') && ax.test(s)) {
- warningAt("Dangerous comment.", line, character);
- }
- s = '';
- token.comment = true;
- break;
-
- // /* comment
-
- case '/*':
- if (src || (xmode && xmode !== 'script' && xmode !== 'style' && xmode !== 'styleproperty')) {
- warningAt("Unexpected comment.", line, character);
- }
- if (option.safe && ax.test(s)) {
- warningAt("ADsafe comment violation.", line, character);
- }
- for (;;) {
- i = s.search(lx);
- if (i >= 0) {
- break;
- }
- if (!nextLine()) {
- errorAt("Unclosed comment.", line, character);
- } else {
- if (option.safe && ax.test(s)) {
- warningAt("ADsafe comment violation.",
- line, character);
- }
- }
- }
- character += i + 2;
- if (s.substr(i, 1) === '/') {
- errorAt("Nested comment.", line, character);
- }
- s = s.substr(i + 2);
- token.comment = true;
- break;
-
- // /*members /*jslint /*global
-
- case '/*members':
- case '/*member':
- case '/*jslint':
- case '/*global':
- case '*/':
- return {
- value: t,
- type: 'special',
- line: line,
- character: character,
- from: from
- };
-
- case '':
- break;
- // /
- case '/':
- if (token.id === '/=') {
- errorAt(
-"A regular expression literal can be confused with '/='.", line, from);
- }
- if (prereg) {
- depth = 0;
- captures = 0;
- l = 0;
- for (;;) {
- b = true;
- c = s.charAt(l);
- l += 1;
- switch (c) {
- case '':
- errorAt("Unclosed regular expression.",
- line, from);
- return;
- case '/':
- if (depth > 0) {
- warningAt("Unescaped '{a}'.",
- line, from + l, '/');
- }
- c = s.substr(0, l - 1);
- q = {
- g: true,
- i: true,
- m: true
- };
- while (q[s.charAt(l)] === true) {
- q[s.charAt(l)] = false;
- l += 1;
- }
- character += l;
- s = s.substr(l);
- q = s.charAt(0);
- if (q === '/' || q === '*') {
- errorAt("Confusing regular expression.",
- line, from);
- }
- return it('(regexp)', c);
- case '\\':
- c = s.charAt(l);
- if (c < ' ') {
- warningAt(
-"Unexpected control character in regular expression.", line, from + l);
- } else if (c === '<') {
- warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
- }
- l += 1;
- break;
- case '(':
- depth += 1;
- b = false;
- if (s.charAt(l) === '?') {
- l += 1;
- switch (s.charAt(l)) {
- case ':':
- case '=':
- case '!':
- l += 1;
- break;
- default:
- warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
- }
- } else {
- captures += 1;
- }
- break;
- case '|':
- b = false;
- break;
- case ')':
- if (depth === 0) {
- warningAt("Unescaped '{a}'.",
- line, from + l, ')');
- } else {
- depth -= 1;
- }
- break;
- case ' ':
- q = 1;
- while (s.charAt(l) === ' ') {
- l += 1;
- q += 1;
- }
- if (q > 1) {
- warningAt(
-"Spaces are hard to count. Use {{a}}.", line, from + l, q);
- }
- break;
- case '[':
- c = s.charAt(l);
- if (c === '^') {
- l += 1;
- if (option.regexp) {
- warningAt("Insecure '{a}'.",
- line, from + l, c);
- }
- }
- q = false;
- if (c === ']') {
- warningAt("Empty class.", line,
- from + l - 1);
- q = true;
- }
-klass: do {
- c = s.charAt(l);
- l += 1;
- switch (c) {
- case '[':
- case '^':
- warningAt("Unescaped '{a}'.",
- line, from + l, c);
- q = true;
- break;
- case '-':
- if (q) {
- q = false;
- } else {
- warningAt("Unescaped '{a}'.",
- line, from + l, '-');
- q = true;
- }
- break;
- case ']':
- if (!q) {
- warningAt("Unescaped '{a}'.",
- line, from + l - 1, '-');
- }
- break klass;
- case '\\':
- c = s.charAt(l);
- if (c < ' ') {
- warningAt(
-"Unexpected control character in regular expression.", line, from + l);
- } else if (c === '<') {
- warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
- }
- l += 1;
- q = true;
- break;
- case '/':
- warningAt("Unescaped '{a}'.",
- line, from + l - 1, '/');
- q = true;
- break;
- case '<':
- if (xmode === 'script') {
- c = s.charAt(l);
- if (c === '!' || c === '/') {
- warningAt(
-"HTML confusion in regular expression '<{a}'.", line, from + l, c);
- }
- }
- q = true;
- break;
- default:
- q = true;
- }
- } while (c);
- break;
- case '.':
- if (option.regexp) {
- warningAt("Insecure '{a}'.", line,
- from + l, c);
- }
- break;
- case ']':
- case '?':
- case '{':
- case '}':
- case '+':
- case '*':
- warningAt("Unescaped '{a}'.", line,
- from + l, c);
- break;
- case '<':
- if (xmode === 'script') {
- c = s.charAt(l);
- if (c === '!' || c === '/') {
- warningAt(
-"HTML confusion in regular expression '<{a}'.", line, from + l, c);
- }
- }
- }
- if (b) {
- switch (s.charAt(l)) {
- case '?':
- case '+':
- case '*':
- l += 1;
- if (s.charAt(l) === '?') {
- l += 1;
- }
- break;
- case '{':
- l += 1;
- c = s.charAt(l);
- if (c < '0' || c > '9') {
- warningAt(
-"Expected a number and instead saw '{a}'.", line, from + l, c);
- }
- l += 1;
- low = +c;
- for (;;) {
- c = s.charAt(l);
- if (c < '0' || c > '9') {
- break;
- }
- l += 1;
- low = +c + (low * 10);
- }
- high = low;
- if (c === ',') {
- l += 1;
- high = Infinity;
- c = s.charAt(l);
- if (c >= '0' && c <= '9') {
- l += 1;
- high = +c;
- for (;;) {
- c = s.charAt(l);
- if (c < '0' || c > '9') {
- break;
- }
- l += 1;
- high = +c + (high * 10);
- }
- }
- }
- if (s.charAt(l) !== '}') {
- warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
- } else {
- l += 1;
- }
- if (s.charAt(l) === '?') {
- l += 1;
- }
- if (low > high) {
- warningAt(
-"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
- }
- }
- }
- }
- c = s.substr(0, l - 1);
- character += l;
- s = s.substr(l);
- return it('(regexp)', c);
- }
- return it('(punctuator)', t);
-
- // punctuator
-
- case '<!--':
- l = line;
- c = character;
- for (;;) {
- i = s.indexOf('--');
- if (i >= 0) {
- break;
- }
- i = s.indexOf('<!-');
- if (i >= 0) {
- errorAt("Nested HTML comment.",
- line, character + i);
- }
- if (!nextLine()) {
- errorAt("Unclosed HTML comment.", l, c);
- }
- }
- l = s.indexOf('<!-');
- if (l >= 0 && l < i) {
- errorAt("Nested HTML comment.",
- line, character + l);
- }
- character += i;
- if (s[i + 2] !== '>') {
- errorAt("Expected -->.", line, character);
- }
- character += 3;
- s = s.slice(i + 3);
- break;
- case '#':
- if (xmode === 'html' || xmode === 'styleproperty') {
- for (;;) {
- c = s.charAt(0);
- if ((c < '0' || c > '9') &&
- (c < 'a' || c > 'f') &&
- (c < 'A' || c > 'F')) {
- break;
- }
- character += 1;
- s = s.substr(1);
- t += c;
- }
- if (t.length !== 4 && t.length !== 7) {
- warningAt("Bad hex color '{a}'.", line,
- from + l, t);
- }
- return it('(color)', t);
- }
- return it('(punctuator)', t);
- default:
- if (xmode === 'outer' && c === '&') {
- character += 1;
- s = s.substr(1);
- for (;;) {
- c = s.charAt(0);
- character += 1;
- s = s.substr(1);
- if (c === ';') {
- break;
- }
- if (!((c >= '0' && c <= '9') ||
- (c >= 'a' && c <= 'z') ||
- c === '#')) {
- errorAt("Bad entity", line, from + l,
- character);
- }
- }
- break;
- }
- return it('(punctuator)', t);
- }
- }
- }
- }
- };
- }());
-
-
- function addlabel(t, type) {
-
- if (option.safe && funct['(global)'] &&
- typeof predefined[t] !== 'boolean') {
- warning('ADsafe global: ' + t + '.', token);
- } else if (t === 'hasOwnProperty') {
- warning("'hasOwnProperty' is a really bad name.");
- }
-
-// Define t in the current function in the current scope.
-
- if (is_own(funct, t) && !funct['(global)']) {
- warning(funct[t] === true ?
- "'{a}' was used before it was defined." :
- "'{a}' is already defined.",
- nexttoken, t);
- }
- funct[t] = type;
- if (funct['(global)']) {
- global[t] = funct;
- if (is_own(implied, t)) {
- warning("'{a}' was used before it was defined.", nexttoken, t);
- delete implied[t];
- }
- } else {
- scope[t] = funct;
- }
- }
-
-
- function doOption() {
- var b, obj, filter, o = nexttoken.value, t, v;
- switch (o) {
- case '*/':
- error("Unbegun comment.");
- break;
- case '/*members':
- case '/*member':
- o = '/*members';
- if (!membersOnly) {
- membersOnly = {};
- }
- obj = membersOnly;
- break;
- case '/*jslint':
- if (option.safe) {
- warning("ADsafe restriction.");
- }
- obj = option;
- filter = boolOptions;
- break;
- case '/*global':
- if (option.safe) {
- warning("ADsafe restriction.");
- }
- obj = predefined;
- break;
- default:
- }
- t = lex.token();
-loop: for (;;) {
- for (;;) {
- if (t.type === 'special' && t.value === '*/') {
- break loop;
- }
- if (t.id !== '(endline)' && t.id !== ',') {
- break;
- }
- t = lex.token();
- }
- if (t.type !== '(string)' && t.type !== '(identifier)' &&
- o !== '/*members') {
- error("Bad option.", t);
- }
- v = lex.token();
- if (v.id === ':') {
- v = lex.token();
- if (obj === membersOnly) {
- error("Expected '{a}' and instead saw '{b}'.",
- t, '*/', ':');
- }
- if (t.value === 'indent' && o === '/*jslint') {
- b = +v.value;
- if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
- Math.floor(b) !== b) {
- error("Expected a small integer and instead saw '{a}'.",
- v, v.value);
- }
- obj.white = true;
- obj.indent = b;
- } else if (t.value === 'maxerr' && o === '/*jslint') {
- b = +v.value;
- if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
- Math.floor(b) !== b) {
- error("Expected a small integer and instead saw '{a}'.",
- v, v.value);
- }
- obj.maxerr = b;
- } else if (t.value === 'maxlen' && o === '/*jslint') {
- b = +v.value;
- if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
- Math.floor(b) !== b) {
- error("Expected a small integer and instead saw '{a}'.",
- v, v.value);
- }
- obj.maxlen = b;
- } else if (v.value === 'true') {
- obj[t.value] = true;
- } else if (v.value === 'false') {
- obj[t.value] = false;
- } else {
- error("Bad option value.", v);
- }
- t = lex.token();
- } else {
- if (o === '/*jslint') {
- error("Missing option value.", t);
- }
- obj[t.value] = false;
- t = v;
- }
- }
- if (filter) {
- assume();
- }
- }
-
-
-// We need a peek function. If it has an argument, it peeks that much farther
-// ahead. It is used to distinguish
-// for ( var i in ...
-// from
-// for ( var i = ...
-
- function peek(p) {
- var i = p || 0, j = 0, t;
-
- while (j <= i) {
- t = lookahead[j];
- if (!t) {
- t = lookahead[j] = lex.token();
- }
- j += 1;
- }
- return t;
- }
-
-
-
-// Produce the next token. It looks for programming errors.
-
- function advance(id, t) {
- switch (token.id) {
- case '(number)':
- if (nexttoken.id === '.') {
- warning(
-"A dot following a number can be confused with a decimal point.", token);
- }
- break;
- case '-':
- if (nexttoken.id === '-' || nexttoken.id === '--') {
- warning("Confusing minusses.");
- }
- break;
- case '+':
- if (nexttoken.id === '+' || nexttoken.id === '++') {
- warning("Confusing plusses.");
- }
- break;
- }
- if (token.type === '(string)' || token.identifier) {
- anonname = token.value;
- }
-
- if (id && nexttoken.id !== id) {
- if (t) {
- if (nexttoken.id === '(end)') {
- warning("Unmatched '{a}'.", t, t.id);
- } else {
- warning(
-"Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
- nexttoken, id, t.id, t.line, nexttoken.value);
- }
- } else if (nexttoken.type !== '(identifier)' ||
- nexttoken.value !== id) {
- warning("Expected '{a}' and instead saw '{b}'.",
- nexttoken, id, nexttoken.value);
- }
- }
- prevtoken = token;
- token = nexttoken;
- for (;;) {
- nexttoken = lookahead.shift() || lex.token();
- if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
- return;
- }
- if (nexttoken.type === 'special') {
- doOption();
- } else {
- if (nexttoken.id !== '(endline)') {
- break;
- }
- }
- }
- }
-
-
-// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add to Pratt's model .fud, which is
-// like nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define JavaScript. I retained Pratt's
-// nomenclature.
-
-// .nud Null denotation
-// .fud First null denotation
-// .led Left denotation
-// lbp Left binding power
-// rbp Right binding power
-
-// They are key to the parsing method called Top Down Operator Precedence.
-
- function parse(rbp, initial) {
- var left;
- if (nexttoken.id === '(end)') {
- error("Unexpected early end of program.", token);
- }
- advance();
- if (option.safe && typeof predefined[token.value] === 'boolean' &&
- (nexttoken.id !== '(' && nexttoken.id !== '.')) {
- warning('ADsafe violation.', token);
- }
- if (initial) {
- anonname = 'anonymous';
- funct['(verb)'] = token.value;
- }
- if (initial === true && token.fud) {
- left = token.fud();
- } else {
- if (token.nud) {
- left = token.nud();
- } else {
- if (nexttoken.type === '(number)' && token.id === '.') {
- warning(
-"A leading decimal point can be confused with a dot: '.{a}'.",
- token, nexttoken.value);
- advance();
- return token;
- } else {
- error("Expected an identifier and instead saw '{a}'.",
- token, token.id);
- }
- }
- while (rbp < nexttoken.lbp) {
- advance();
- if (token.led) {
- left = token.led(left);
- } else {
- error("Expected an operator and instead saw '{a}'.",
- token, token.id);
- }
- }
- }
- return left;
- }
-
-
-// Functions for conformance of style.
-
- function adjacent(left, right) {
- left = left || token;
- right = right || nexttoken;
- if (option.white || xmode === 'styleproperty' || xmode === 'style') {
- if (left.character !== right.from && left.line === right.line) {
- warning("Unexpected space after '{a}'.", right, left.value);
- }
- }
- }
-
- function nospace(left, right) {
- left = left || token;
- right = right || nexttoken;
- if (option.white && !left.comment) {
- if (left.line === right.line) {
- adjacent(left, right);
- }
- }
- }
-
-
- function nonadjacent(left, right) {
- if (option.white) {
- left = left || token;
- right = right || nexttoken;
- if (left.line === right.line && left.character === right.from) {
- warning("Missing space after '{a}'.",
-
<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/jslint/js.jar
----------------------------------------------------------------------
diff --git a/AlluraTesting/jslint/js.jar b/AlluraTesting/jslint/js.jar
deleted file mode 100644
index 2369f99..0000000
Binary files a/AlluraTesting/jslint/js.jar and /dev/null differ
[25/27] git commit: [#4656] More refactor to project shortname
validation
Posted by jo...@apache.org.
[#4656] More refactor to project shortname validation
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/c78912c4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/c78912c4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/c78912c4
Branch: refs/heads/cj/4656
Commit: c78912c4692def26a65263e762f33a61b0173c2a
Parents: 7efec56
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Mon Jul 8 18:57:19 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Jul 16 20:15:14 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 3 +-
Allura/allura/lib/plugin.py | 42 +++++++++++++++-----
Allura/allura/lib/widgets/forms.py | 9 ++---
.../tests/functional/test_neighborhood.py | 14 +++----
Allura/allura/tests/test_plugin.py | 30 ++++++++++++--
5 files changed, 70 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c78912c4/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 36c4667..3cf4112 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -81,7 +81,8 @@ class NeighborhoodController(object):
def _lookup(self, pname, *remainder):
pname = unquote(pname)
provider = plugin.ProjectRegistrationProvider.get()
- if provider.validate_project_shortname(pname, self.neighborhood):
+ valid, reason = provider.valid_project_shortname(pname, self.neighborhood)
+ if not valid:
raise exc.HTTPNotFound, pname
project = M.Project.query.get(shortname=self.prefix + pname, neighborhood_id=self.neighborhood._id)
if project is None and self.prefix == 'u/':
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c78912c4/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 111aa77..76a18ae 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -364,16 +364,14 @@ class ProjectRegistrationProvider(object):
method = config.get('registration.method', 'local')
return app_globals.Globals().entry_points['registration'][method]()
- def name_taken(self, project_name, neighborhood):
+ def _name_taken(self, project_name, neighborhood):
"""Return False if ``project_name`` is available in ``neighborhood``.
If unavailable, return an error message (str) explaining why.
"""
from allura import model as M
p = M.Project.query.get(shortname=project_name, neighborhood_id=neighborhood._id)
- if p:
- return 'This project name is taken.'
- return False
+ return bool(p)
def suggest_name(self, project_name, neighborhood):
"""Return a suggested project shortname for the full ``project_name``.
@@ -469,21 +467,45 @@ class ProjectRegistrationProvider(object):
check_shortname = shortname.replace('u/', '', 1)
else:
check_shortname = shortname
- err = self.validate_project_shortname(check_shortname, neighborhood)
- if err:
+ allowed, err = self.allowed_project_shortname(check_shortname, neighborhood)
+ if not allowed:
raise ValueError('Invalid project shortname: %s' % shortname)
p = M.Project.query.get(shortname=shortname, neighborhood_id=neighborhood._id)
if p:
raise forge_exc.ProjectConflict('%s already exists in nbhd %s' % (shortname, neighborhood._id))
- def validate_project_shortname(self, shortname, neighborhood):
- """Return an error message if ``shortname`` is invalid for
- ``neighborhood``, else return None.
+ def valid_project_shortname(self, shortname, neighborhood):
+ """Determine if the project shortname appears to be valid.
+
+ Returns a pair of values, the first being a bool indicating whether
+ the name appears to be valid, and the second being a message indicating
+ the reason, if any, why the name is invalid.
+ NB: Even if a project shortname is valid, it might still not be
+ allowed (it could already be taken, for example). Use the method
+ ``allowed_project_shortname`` instead to check if the shortname can
+ actually be used.
"""
if not h.re_project_name.match(shortname):
- return 'Please use only letters, numbers, and dashes 3-15 characters long.'
+ return (False, 'Please use only letters, numbers, and dashes 3-15 characters long.')
+ return (True, None)
+
+ def allowed_project_shortname(self, shortname, neighborhood):
+ """Determine if a project shortname can be used.
+
+ A shortname can be used if it is valid and is not already taken.
+
+ Returns a pair of values, the first being a bool indicating whether
+ the name can be used, and the second being a message indicating the
+ reason, if any, why the name cannot be used.
+ """
+ valid, reason = self.valid_project_shortname(shortname, neighborhood)
+ if not valid:
+ return (False, reason)
+ if self._name_taken(shortname, neighborhood):
+ return (False, 'This project name is taken.')
+ return (True, None)
def _create_project(self, neighborhood, shortname, project_name, user, user_project, private_project, apps):
'''
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c78912c4/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 2312c71..a5ebe15 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -47,15 +47,12 @@ class _HTMLExplanation(ew.InputField):
class NeighborhoodProjectShortNameValidator(fev.FancyValidator):
- def _to_python(self, value, state):
+ def to_python(self, value, state):
value = h.really_unicode(value or '').encode('utf-8').lower()
neighborhood = M.Neighborhood.query.get(name=state.full_dict['neighborhood'])
provider = plugin.ProjectRegistrationProvider.get()
- message = provider.validate_project_shortname(value, neighborhood)
- if message:
- raise formencode.Invalid(message, value, state)
- message = provider.name_taken(value, neighborhood)
- if message:
+ allowed, message = provider.allowed_project_shortname(value, neighborhood)
+ if not allowed:
raise formencode.Invalid(message, value, state)
return value
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c78912c4/Allura/allura/tests/functional/test_neighborhood.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_neighborhood.py b/Allura/allura/tests/functional/test_neighborhood.py
index fd6c3e4..f63d597 100644
--- a/Allura/allura/tests/functional/test_neighborhood.py
+++ b/Allura/allura/tests/functional/test_neighborhood.py
@@ -449,7 +449,7 @@ class TestNeighborhood(TestController):
params=dict(project_unixname='', project_name='Nothing', project_description='', neighborhood='Adobe'),
antispam=True,
extra_environ=dict(username='root'))
- assert r.html.find('div', {'class':'error'}).string == 'Please enter a value'
+ assert r.html.find('div', {'class':'error'}).string == 'Please use only letters, numbers, and dashes 3-15 characters long.'
r = self.app.post('/adobe/register',
params=dict(project_unixname='mymoz', project_name='My Moz', project_description='', neighborhood='Adobe'),
antispam=True,
@@ -742,12 +742,12 @@ class TestNeighborhood(TestController):
def test_name_check(self):
for name in ('My+Moz', 'Te%st!', 'ab', 'a' * 16):
- r = self.app.get('/p/check_names?unix_name=%s' % name)
- assert r.json['unixname_message'] == 'Please use only letters, numbers, and dashes 3-15 characters long.'
- r = self.app.get('/p/check_names?unix_name=mymoz')
- assert_equal(r.json['unixname_message'], False)
- r = self.app.get('/p/check_names?unix_name=test')
- assert r.json['unixname_message'] == 'This project name is taken.'
+ r = self.app.get('/p/check_names?neighborhood=Projects&project_unixname=%s' % name)
+ assert_equal(r.json, {'project_unixname': 'Please use only letters, numbers, and dashes 3-15 characters long.'})
+ r = self.app.get('/p/check_names?neighborhood=Projects&project_unixname=mymoz')
+ assert_equal(r.json, {})
+ r = self.app.get('/p/check_names?neighborhood=Projects&project_unixname=test')
+ assert_equal(r.json, {'project_unixname': 'This project name is taken.'})
@td.with_tool('test/sub1', 'Wiki', 'wiki')
def test_neighborhood_project(self):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/c78912c4/Allura/allura/tests/test_plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_plugin.py b/Allura/allura/tests/test_plugin.py
index aa2aaeb..712fe52 100644
--- a/Allura/allura/tests/test_plugin.py
+++ b/Allura/allura/tests/test_plugin.py
@@ -46,10 +46,32 @@ class TestProjectRegistrationProvider(object):
assert_equals(f('A More Than Fifteen Character Name', Mock()),
'amorethanfifteencharactername')
- def test_validate_project_shortname(self):
- f = self.provider.validate_project_shortname
+ def test_valid_project_shortname(self):
+ f = self.provider.valid_project_shortname
p = Mock()
- assert_equals(f('thisislegit', p), None)
- assert_equals(f('this is invalid and too long', p),
+ valid = (True, None)
+ invalid = (False,
'Please use only letters, numbers, and dashes '
'3-15 characters long.')
+ assert_equals(f('thisislegit', p), valid)
+ assert_equals(f('not valid', p), invalid)
+ assert_equals(f('this-is-valid-but-too-long', p), invalid)
+ assert_equals(f('this is invalid and too long', p), invalid)
+
+ def test_allowed_project_shortname(self):
+ allowed = valid = (True, None)
+ invalid = (False, 'invalid')
+ taken = (False, 'This project name is taken.')
+ cases = [
+ (valid, False, allowed),
+ (invalid, False, invalid),
+ (valid, True, taken),
+ ]
+ p = Mock()
+ vps = self.provider.valid_project_shortname = Mock()
+ nt = self.provider._name_taken = Mock()
+ f = self.provider.allowed_project_shortname
+ for vps_v, nt_v, result in cases:
+ vps.return_value = vps_v
+ nt.return_value = nt_v
+ assert_equals(f('project', p), result)
[20/27] git commit: [#6277] make forgeuserstats tmp repos not
conflict with forgegit
Posted by jo...@apache.org.
[#6277] make forgeuserstats tmp repos not conflict with forgegit
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/d2a60bbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/d2a60bbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/d2a60bbb
Branch: refs/heads/cj/4656
Commit: d2a60bbbf547798b74a42ee87d68b6a26480a373
Parents: 3ec3fed
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue May 28 10:32:26 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Thu Jul 11 22:10:00 2013 +0000
----------------------------------------------------------------------
ForgeUserStats/forgeuserstats/tests/test_model.py | 5 +++--
ForgeUserStats/forgeuserstats/tests/test_stats.py | 8 ++++++--
run_tests | 4 ++++
3 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d2a60bbb/ForgeUserStats/forgeuserstats/tests/test_model.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/tests/test_model.py b/ForgeUserStats/forgeuserstats/tests/test_model.py
index 2203469..6940385 100644
--- a/ForgeUserStats/forgeuserstats/tests/test_model.py
+++ b/ForgeUserStats/forgeuserstats/tests/test_model.py
@@ -29,10 +29,11 @@ from allura.model import User, Project, TroveCategory
from allura.lib import helpers as h
from allura import model as M
-from forgegit.tests import with_git
-
from forgeuserstats.model import stats as USM
+test_project_with_repo = 'test2' # important to be distinct from 'test' which ForgeGit uses, so that the tests can run in parallel and not clobber each other
+with_git = td.with_tool(test_project_with_repo, 'Git', 'src-git', 'Git', type='git')
+
class TestUserStats(unittest.TestCase):
def setUp(self):
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d2a60bbb/ForgeUserStats/forgeuserstats/tests/test_stats.py
----------------------------------------------------------------------
diff --git a/ForgeUserStats/forgeuserstats/tests/test_stats.py b/ForgeUserStats/forgeuserstats/tests/test_stats.py
index b2b20ce..bbb43f5 100644
--- a/ForgeUserStats/forgeuserstats/tests/test_stats.py
+++ b/ForgeUserStats/forgeuserstats/tests/test_stats.py
@@ -27,10 +27,14 @@ from allura.lib import helpers as h
from allura.model import User
from allura import model as M
-from forgegit.tests import with_git
from forgewiki import model as WM
from forgetracker import model as TM
+
+test_project_with_repo = 'test2' # important to be distinct from 'test' which ForgeGit uses, so that the tests can run in parallel and not clobber each other
+with_git = td.with_tool(test_project_with_repo, 'Git', 'src-git', 'Git', type='git')
+
+
class TestStats(TestController):
def setUp(self):
@@ -185,7 +189,7 @@ class TestGitCommit(TestController, unittest.TestCase):
@td.with_wiki
def setup_with_tools(self):
setup_global_objects()
- h.set_context('test', 'src-git', neighborhood='Projects')
+ h.set_context(test_project_with_repo, 'src-git', neighborhood='Projects')
repo_dir = pkg_resources.resource_filename(
'forgeuserstats', 'tests/data')
c.app.repo.fs_path = repo_dir
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/d2a60bbb/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index 7d033b1..a85aefe 100755
--- a/run_tests
+++ b/run_tests
@@ -29,6 +29,8 @@ import textwrap
def run_one(cmd, **popen_kwargs):
print '{} running {} {}'.format(threading.current_thread(), cmd, popen_kwargs)
+ sys.stdout.flush()
+
all_popen_kwargs = dict(shell=True, stderr=subprocess.STDOUT,
stdout=subprocess.PIPE,
bufsize=1, # 1 == line-buffered
@@ -43,6 +45,8 @@ def run_one(cmd, **popen_kwargs):
out_remainder, _ = proc.communicate()
sys.stdout.write(out_remainder)
sys.stdout.flush()
+ print 'finished {} {}'.format(cmd, popen_kwargs)
+ sys.stdout.flush()
return proc
[13/27] [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/jslint/rhino.js
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/rhino.js b/AlluraTest/jslint/rhino.js
new file mode 100644
index 0000000..04be512
--- /dev/null
+++ b/AlluraTest/jslint/rhino.js
@@ -0,0 +1,41 @@
+// rhino.js
+// 2009-09-11
+/*
+Copyright (c) 2002 Douglas Crockford (www.JSLint.com) Rhino Edition
+*/
+
+// This is the Rhino companion to fulljslint.js.
+
+/*global JSLINT */
+/*jslint rhino: true, strict: false */
+
+(function (a) {
+ var e, i, input;
+ if (!a[0]) {
+ print("Usage: jslint.js file.js");
+ quit(1);
+ }
+ input = readFile(a[0]);
+ if (!input) {
+ print("jslint: Couldn't open file '" + a[0] + "'.");
+ quit(1);
+ }
+ if (!JSLINT(input, {bitwise: true, eqeqeq: true, immed: true,
+ newcap: true, nomen: true, onevar: true, plusplus: true,
+ regexp: true, rhino: true, undef: true, white: true})) {
+ for (i = 0; i < JSLINT.errors.length; i += 1) {
+ e = JSLINT.errors[i];
+ if (e) {
+ print('Lint at line ' + e.line + ' character ' +
+ e.character + ': ' + e.reason);
+ print((e.evidence || '').
+ replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
+ print('');
+ }
+ }
+ quit(2);
+ } else {
+ print("jslint: No problems found in " + a[0]);
+ quit();
+ }
+}(arguments));
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/setup.py
----------------------------------------------------------------------
diff --git a/AlluraTest/setup.py b/AlluraTest/setup.py
new file mode 100644
index 0000000..421cd39
--- /dev/null
+++ b/AlluraTest/setup.py
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+from setuptools import setup, find_packages
+import sys, os
+
+setup(name='AlluraTest',
+ version='0.1',
+ description="Allura testing support",
+ long_description="""\
+""",
+ classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+ keywords='',
+ author='',
+ author_email='',
+ url='',
+ license='',
+ packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+ include_package_data=True,
+ zip_safe=False,
+ install_requires=[
+ "poster",
+ # -*- Extra requirements: -*-
+ ]
+ )
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/README
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/README b/AlluraTest/twill-tests/README
new file mode 100644
index 0000000..59e490e
--- /dev/null
+++ b/AlluraTest/twill-tests/README
@@ -0,0 +1,19 @@
+Twill Tests
+
+First, you'll need twill-sh:
+
+ sudo easy_install twill
+
+
+Files in this directory ending with '.twill' are tests to be run by twill-sh
+
+ twill-sh --url=http://url.of.forge.to.test/ twill-tests/*.twill
+
+e.g.,
+
+ twill-sh --url=http://re.sourceforge.net/ twill-tests/*.twill
+
+
+If you just want to run the quick "smoke tests":
+
+ twill-sh --url=... twill-tests/smoke*.twill
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/create_repo.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/create_repo.twill b/AlluraTest/twill-tests/create_repo.twill
new file mode 100644
index 0000000..17b9a3a
--- /dev/null
+++ b/AlluraTest/twill-tests/create_repo.twill
@@ -0,0 +1,47 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+setlocal username test_admin
+setlocal password foo
+
+clear_extra_headers
+go ./auth/
+formvalue 1 username $username
+formvalue 1 password $password
+submit
+
+code 200
+
+go ./p/test/admin/tools
+
+code 200
+
+formvalue 2 "new.ep_name" "Git"
+formvalue 2 "new.mount_point" "deleteme"
+submit
+
+code 200
+
+go ../deleteme/
+
+code 200
+
+find ready
+
+go ../admin/tools
+
+# Delete the repo :-(
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/edit_wiki_page.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/edit_wiki_page.twill b/AlluraTest/twill-tests/edit_wiki_page.twill
new file mode 100644
index 0000000..2b659ec
--- /dev/null
+++ b/AlluraTest/twill-tests/edit_wiki_page.twill
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+setlocal username test_admin
+setlocal password foo
+
+clear_extra_headers
+go ./auth/
+formvalue 1 username $username
+formvalue 1 password $password
+submit
+
+code 200
+
+go ./p/test/wiki/TestWikiWord/edit
+
+code 200
+
+formvalue 3 text "This is just a test."
+submit
+
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/login.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/login.twill b/AlluraTest/twill-tests/login.twill
new file mode 100644
index 0000000..fbe6f67
--- /dev/null
+++ b/AlluraTest/twill-tests/login.twill
@@ -0,0 +1,27 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+setlocal username test_admin
+setlocal password foo
+
+clear_extra_headers
+go ./auth/
+formvalue 1 username $username
+formvalue 1 password $password
+submit
+
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/new_issue.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/new_issue.twill b/AlluraTest/twill-tests/new_issue.twill
new file mode 100644
index 0000000..7b05168
--- /dev/null
+++ b/AlluraTest/twill-tests/new_issue.twill
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+setlocal username test_admin
+setlocal password foo
+
+clear_extra_headers
+go ./auth/
+formvalue 1 username $username
+formvalue 1 password $password
+submit
+
+code 200
+
+go ./p/test/bugs/new/
+
+code 200
+
+formvalue 2 "ticket_form.summary" "test create ticket"
+submit
+
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/smoke-front-page.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/smoke-front-page.twill b/AlluraTest/twill-tests/smoke-front-page.twill
new file mode 100644
index 0000000..a0f4852
--- /dev/null
+++ b/AlluraTest/twill-tests/smoke-front-page.twill
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clear_extra_headers
+go .
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/smoke-project-home.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/smoke-project-home.twill b/AlluraTest/twill-tests/smoke-project-home.twill
new file mode 100644
index 0000000..3d1e8bf
--- /dev/null
+++ b/AlluraTest/twill-tests/smoke-project-home.twill
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clear_extra_headers
+go ./p/test/home/
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/smoke-tracker-search.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/smoke-tracker-search.twill b/AlluraTest/twill-tests/smoke-tracker-search.twill
new file mode 100644
index 0000000..d8d03a3
--- /dev/null
+++ b/AlluraTest/twill-tests/smoke-tracker-search.twill
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clear_extra_headers
+go ./p/test/bugs/search/
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/smoke-tracker.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/smoke-tracker.twill b/AlluraTest/twill-tests/smoke-tracker.twill
new file mode 100644
index 0000000..1e9e0f7
--- /dev/null
+++ b/AlluraTest/twill-tests/smoke-tracker.twill
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clear_extra_headers
+go ./p/test/bugs/
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/smoke-user-profile.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/smoke-user-profile.twill b/AlluraTest/twill-tests/smoke-user-profile.twill
new file mode 100644
index 0000000..907f17d
--- /dev/null
+++ b/AlluraTest/twill-tests/smoke-user-profile.twill
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clear_extra_headers
+go ./u/test_admin/profile/
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/twill-tests/smoke-wiki.twill
----------------------------------------------------------------------
diff --git a/AlluraTest/twill-tests/smoke-wiki.twill b/AlluraTest/twill-tests/smoke-wiki.twill
new file mode 100644
index 0000000..03e2c56
--- /dev/null
+++ b/AlluraTest/twill-tests/smoke-wiki.twill
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+clear_extra_headers
+go ./p/test/wiki/Home/
+code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/LICENSE
----------------------------------------------------------------------
diff --git a/AlluraTesting/LICENSE b/AlluraTesting/LICENSE
deleted file mode 100644
index 196ac43..0000000
--- a/AlluraTesting/LICENSE
+++ /dev/null
@@ -1,234 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-AlluraTesting SUBCOMPONENTS:
-
-AlluraTesting includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source code
-for the these subcomponents is subject to the terms and conditions of the
-following licenses.
-
-For jslint.js, in directory
-jslint/
-
- Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
-
- Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
- so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- The Software shall be used for Good, not Evil.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/alluratest/__init__.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/__init__.py b/AlluraTesting/alluratest/__init__.py
deleted file mode 100644
index 144e298..0000000
--- a/AlluraTesting/alluratest/__init__.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/alluratest/controller.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/controller.py b/AlluraTesting/alluratest/controller.py
deleted file mode 100644
index 95d9b4b..0000000
--- a/AlluraTesting/alluratest/controller.py
+++ /dev/null
@@ -1,183 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""Unit and functional test suite for allura."""
-import os
-import urllib
-
-import mock
-import beaker.session
-from formencode import variabledecode
-from paste.deploy import loadapp
-from paste.deploy.converters import asbool
-from paste.script.appinstall import SetupCommand
-from pylons import tmpl_context as c, app_globals as g
-from pylons import url, request, response, session
-import tg
-from webtest import TestApp
-from webob import Request, Response
-import ew
-from ming.orm import ThreadLocalORMSession
-import ming.orm
-
-from allura import model as M
-import allura.lib.security
-from allura.lib.app_globals import Globals
-from allura.lib import helpers as h
-from allura.websetup.schema import REGISTRY
-#from allura.lib.custom_middleware import environ as ENV, MagicalC
-from .validation import ValidatingTestApp
-
-DFL_APP_NAME = 'main_without_authn'
-
-# these are all helpers & base classes, and should never
-# be considered test cases when imported into some test module
-__test__ = False
-
-
-def get_config_file(config=None):
- if not config:
- config = 'test.ini'
-
- try:
- conf_dir = tg.config.here
- except AttributeError:
- conf_dir = os.getcwd()
- return os.path.join(conf_dir, config)
-
-
-def setup_basic_test(config=None, app_name=DFL_APP_NAME):
- '''Create clean environment for running tests'''
- try:
- conf_dir = tg.config.here
- except AttributeError:
- conf_dir = os.getcwd()
- ew.TemplateEngine.initialize({})
- test_file = os.path.join(conf_dir, get_config_file(config))
- cmd = SetupCommand('setup-app')
- cmd.run([test_file])
-
- # run all tasks, e.g. indexing from bootstrap operations
- while M.MonQTask.run_ready('setup'):
- ThreadLocalORMSession.flush_all()
-setup_basic_test.__test__ = False # sometimes __test__ above isn't sufficient
-
-
-def setup_functional_test(config=None, app_name=DFL_APP_NAME):
- '''Create clean environment for running tests. Also return WSGI test app'''
- config = get_config_file(config)
- setup_basic_test(config, app_name)
- conf_dir = tg.config.here
- wsgiapp = loadapp('config:%s#%s' % (config, app_name),
- relative_to=conf_dir)
- return wsgiapp
-setup_functional_test.__test__ = False # sometimes __test__ above isn't sufficient
-
-
-def setup_unit_test():
- try:
- while True:
- REGISTRY.cleanup()
- except:
- pass
- REGISTRY.prepare()
- REGISTRY.register(ew.widget_context, ew.core.WidgetContext('http', ew.ResourceManager()))
- REGISTRY.register(g, Globals())
- REGISTRY.register(c, mock.Mock())
- REGISTRY.register(url, lambda:None)
- REGISTRY.register(request, Request.blank('/', remote_addr='1.1.1.1'))
- REGISTRY.register(response, Response())
- REGISTRY.register(session, beaker.session.SessionObject({}))
- REGISTRY.register(allura.credentials, allura.lib.security.Credentials())
- c.memoize_cache = {}
- c.queued_messages = None
- c.model_cache = None
- ThreadLocalORMSession.close_all()
-setup_unit_test.__test__ = False # sometimes __test__ above isn't sufficient
-
-
-def setup_global_objects():
- setup_unit_test()
- h.set_context('test', 'wiki', neighborhood='Projects')
- c.user = M.User.query.get(username='test-admin')
-
-
-class TestController(object):
-
- application_under_test = 'main'
- validate_skip = False
-
- def setUp(self):
- """Method called by nose before running each test"""
- self.app = ValidatingTestApp(setup_functional_test(app_name=self.application_under_test))
- if self.validate_skip:
- self.app.validate_skip = self.validate_skip
- if asbool(tg.config.get('smtp.mock')):
- self.smtp_mock = mock.patch('allura.lib.mail_util.smtplib.SMTP')
- self.smtp_mock.start()
-
- def tearDown(self):
- """Method called by nose after running each test"""
- if asbool(tg.config.get('smtp.mock')):
- self.smtp_mock.stop()
-
- def webflash(self, response):
- "Extract webflash content from response."
- return urllib.unquote(response.cookies_set.get('webflash', ''))
-
-
-class TestRestApiBase(TestController):
-
- def setUp(self):
- super(TestRestApiBase, self).setUp()
- setup_global_objects()
-# h.set_context('test', 'home')
- self.user = M.User.query.get(username='test-admin')
- self.token = M.ApiToken(user_id=self.user._id)
- ming.orm.session(self.token).flush()
-
- def set_api_token(self, token):
- self.token = token
-
- def _api_getpost(self, method, path, api_key=None, api_timestamp=None, api_signature=None,
- wrap_args=None, **params):
- if wrap_args:
- params = {wrap_args: params}
- params = variabledecode.variable_encode(params, add_repetitions=False)
- if api_key: params['api_key'] = api_key
- if api_timestamp: params['api_timestamp'] = api_timestamp
- if api_signature: params['api_signature'] = api_signature
- params = self.token.sign_request(path, params)
-
- fn = self.app.post if method=='POST' else self.app.get
-
- response = fn(
- str(path),
- params=params,
- status=[200, 302, 400, 403, 404])
- if response.status_int == 302:
- return response.follow()
- else:
- return response
-
- def api_get(self, path, api_key=None, api_timestamp=None, api_signature=None,
- wrap_args=None, **params):
- return self._api_getpost('GET', path, api_key, api_timestamp, api_signature, wrap_args, **params)
-
- def api_post(self, path, api_key=None, api_timestamp=None, api_signature=None,
- wrap_args=None, **params):
- return self._api_getpost('POST', path, api_key, api_timestamp, api_signature, wrap_args, **params)
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/alluratest/test_syntax.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/test_syntax.py b/AlluraTesting/alluratest/test_syntax.py
deleted file mode 100644
index b394798..0000000
--- a/AlluraTesting/alluratest/test_syntax.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-import os.path
-from glob import glob
-from subprocess import Popen, PIPE
-import sys
-
-toplevel_dir = os.path.abspath(os.path.dirname(__file__) + "/../..")
-
-def run(cmd):
- proc = Popen(cmd, shell=True, cwd=toplevel_dir, stdout=PIPE, stderr=PIPE)
- # must capture & reprint stdount, so that nosetests can capture it
- (stdout, stderr) = proc.communicate()
- sys.stdout.write(stdout)
- sys.stderr.write(stderr)
- return proc.returncode
-
-find_py = "find Allura Forge* -name '*.py'"
-
-# a recepe from itertools doc
-from itertools import izip_longest
-def grouper(n, iterable, fillvalue=None):
- "grouper(3, 'ABCDEFG', 'x') --> ABC DEF Gxx"
- args = [iter(iterable)] * n
- return izip_longest(fillvalue=fillvalue, *args)
-
-def test_pyflakes():
- # skip some that aren't critical errors
- skips = [
- 'imported but unused',
- 'redefinition of unused',
- 'assigned to but never used',
- '__version__',
- ]
- proc = Popen(find_py, shell=True, cwd=toplevel_dir, stdout=PIPE, stderr=PIPE)
- (find_stdout, stderr) = proc.communicate()
- sys.stderr.write(stderr)
- assert proc.returncode == 0, proc.returncode
-
- # run pyflakes in batches, so it doesn't take tons of memory
- error = False
- all_files = [f for f in find_stdout.split('\n')
- if '/migrations/' not in f and f.strip()]
- for files in grouper(20, all_files, fillvalue=''):
- cmd = "pyflakes " + ' '.join(files) + " | grep -v '" + "' | grep -v '".join(skips) + "'"
- #print 'Command was: %s' % cmd
- retval = run(cmd)
- if retval != 1:
- print
- #print 'Command was: %s' % cmd
- print 'Returned %s' % retval
- error = True
-
- if error:
- raise Exception('pyflakes failure, see stdout')
-
-def test_no_now():
- if run(find_py + " | xargs grep '\.now(' ") not in [1,123]:
- raise Exception("These should use .utcnow()")
- if run(find_py + " | xargs grep '\.fromtimestamp(' ") not in [1,123]:
- raise Exception("These should use .utcfromtimestamp()")
-
-def test_no_prints():
- skips = [
- '/tests/',
- 'Allura/allura/command/',
- 'Allura/ldap-setup.py',
- 'Allura/ldap-userconfig.py',
- 'Allura/ez_setup/',
- 'Allura/allura/lib/AsciiDammit.py',
- '/scripts/',
- 'Allura/allura/lib/import_api.py',
- 'ForgeSVN/setup.py',
- ]
- if run(find_py + " | grep -v '" + "' | grep -v '".join(skips) + "' | xargs grep -v '^ *#' | grep 'print ' | grep -E -v '(pprint|#pragma: ?printok)' ") != 1:
- raise Exception("These should use logging instead of print")
-
-def test_no_tabs():
- if run(find_py + " | xargs grep ' ' ") not in [1,123]:
- raise Exception('These should not use tab chars')
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/alluratest/validation.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/alluratest/validation.py b/AlluraTesting/alluratest/validation.py
deleted file mode 100644
index 235d7c0..0000000
--- a/AlluraTesting/alluratest/validation.py
+++ /dev/null
@@ -1,321 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-"""
-Functions to syntax-validate output content
-"""
-from os import path, environ, getcwd
-import os
-import sys
-import logging
-import tempfile
-import subprocess
-import json
-import urllib2
-import re
-
-import tg
-import mock
-import beaker.session
-from paste.deploy import loadapp
-from paste.script.appinstall import SetupCommand
-from pylons import tmpl_context as c, app_globals as g
-from pylons import url, request, response, session
-import webtest
-from webtest import TestApp
-from webob import Request, Response
-from nose.tools import ok_, assert_true, assert_false
-from poster.encode import multipart_encode
-from poster.streaminghttp import register_openers
-from ming.utils import LazyProperty
-
-from allura.lib import utils
-
-ENABLE_CONTENT_VALIDATION = False
-# By default we want to run only validations which are fast,
-# but on special test hosts - all.
-COMPLETE_TESTS_HOST = 'sb-forge-4039'
-
-log = logging.getLogger(__name__)
-
-class Config(object):
- "Config to encapsulate flexible/complex test enabled/disabled rules."
- _instance = None
-
- def __init__(self):
- self.ini_config = None
- pass
-
- @classmethod
- def instance(cls):
- if not cls._instance:
- cls._instance = cls()
- return cls._instance
-
- @LazyProperty
- def test_ini(self):
- if not self.ini_config:
- from . import controller
- import ConfigParser
- conf = ConfigParser.ConfigParser({'validate_html5': 'false', 'validate_inlinejs': 'false'})
- conf.read(controller.get_config_file())
- self.ini_config = conf
- return self.ini_config
-
- @LazyProperty
- def hostname(self):
- if os.path.exists('/etc/soghost'):
- with open('/etc/soghost') as fp:
- return fp.read().strip()
-
- def validation_enabled(self, val_type):
- env_var = os.getenv('ALLURA_VALIDATION')
- if env_var == 'all':
- return True
- elif env_var == 'none':
- return False
- elif env_var is not None:
- return val_type in env_var.split(',')
-
- if self.hostname == COMPLETE_TESTS_HOST:
- return True
-
- enabled = self.test_ini.getboolean('validation', 'validate_' + val_type)
- return enabled
-
- def fail_on_validation(self, val_type):
- env_var = os.getenv('ALLURA_VALIDATION')
- if env_var == 'all':
- return True
- if self.hostname == COMPLETE_TESTS_HOST:
- return True
- return ENABLE_CONTENT_VALIDATION
-
-
-def report_validation_error(val_name, filename, message):
- message = '%s Validation errors (%s):\n%s\n' % (val_name, filename, message)
- if Config.instance().fail_on_validation(val_name):
- ok_(False, message)
- else:
- sys.stderr.write('=' * 40 + '\n' + message)
-
-def dump_to_file(prefix, html):
- f = tempfile.NamedTemporaryFile(prefix=prefix, delete=False)
- f.write(html)
- f.close()
- return f.name
-
-def validate_html(html_or_response):
- if hasattr(html_or_response, 'body'):
- html = html_or_response.body
- else:
- html = html_or_response
-
- html = html.lstrip()
-
- if html.startswith('<!DOCTYPE html>'):
- return validate_html5(html)
- else:
- assert False, 'Non-valid HTML: ' + html[:100] + '...'
-
-def validate_json(json_or_response):
- if hasattr(json_or_response, 'body'):
- j = json_or_response.body
- else:
- j = json_or_response
-
- try:
- obj = json.loads(j)
- except Exception, e:
- ok_(False, "Couldn't validate JSON: " + str(e) + ':' + j[:100] + '...')
-
- return obj
-
-def validate_html5(html_or_response):
- if hasattr(html_or_response, 'body'):
- html = html_or_response.body
- else:
- html = html_or_response
- register_openers()
- params = [("out","text"),("content",html)]
- datagen, headers = multipart_encode(params)
- request = urllib2.Request("http://html5.validator.nu/", datagen, headers)
- count = 3
- while True:
- try:
- resp = urllib2.urlopen(request, timeout=3).read()
- break
- except:
- resp = "Couldn't connect to validation service to check the HTML"
- count -= 1
- if count == 0:
- sys.stderr.write('WARNING: ' + resp + '\n')
- break
-
- resp = resp.replace('“','"').replace('”','"').replace('–','-')
-
- ignored_errors = [
- 'Required attributes missing on element "object"',
- 'Stray end tag "embed".',
- 'Stray end tag "param".',
- r'Bad value .+? for attribute "onclick" on element "input": invalid return',
- ]
- for ignore in ignored_errors:
- resp = re.sub('Error: ' + ignore, 'Ignoring: ' + ignore, resp)
-
- if 'Error:' in resp:
- fname = dump_to_file('html5-', html)
- message = resp.decode('ascii','ignore')
- report_validation_error('html5', fname, message)
-
-
-def validate_html5_chunk(html):
- """ When you don't have a html & body tags - this adds it"""
- # WebTest doesn't like HTML fragments without doctype,
- # so we output them sometimes for fragments, which is hack.
- # Unhack it here.
- doctype = '<!DOCTYPE html>'
- if html.startswith(doctype):
- html = html[len(doctype):]
-
- html = '''<!DOCTYPE html>
- <html>
- <head><title></title></head>
- <body>
- %s
- </body></html>''' % html
- return validate_html5(html)
-
-def validate_js(html_or_response):
- if hasattr(html_or_response, 'body'):
- if html_or_response.status_int != 200:
- return
- html = html_or_response.body
- else:
- html = html_or_response
- basedir = path.dirname(path.abspath(__file__))
- jslint_dir = basedir + '/../jslint'
- fname = dump_to_file('jslint-', html)
- cmd = 'java -jar ' + jslint_dir + '/js.jar '+ jslint_dir +'/jslint.js ' + fname
- p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- stdout, stderr = p.communicate(html)
- if stdout.startswith('jslint: No problems found'):
- os.unlink(fname)
- return
- stdout = stdout.decode('UTF-8', 'replace')
- msg = '\n'.join(repr(s) for s in stdout.split('\n') if s)
- report_validation_error('js', fname, msg)
-
-def validate_page(html_or_response):
- if Config.instance().validation_enabled('html5'):
- validate_html(html_or_response)
- if Config.instance().validation_enabled('inlinejs'):
- validate_js(html_or_response)
-
-class AntiSpamTestApp(TestApp):
-
- def post(self, *args, **kwargs):
- if kwargs.pop('antispam', False):
- antispam = utils.AntiSpam()
- params = {
- 'timestamp': antispam.timestamp_text,
- 'spinner': antispam.spinner_text,
- antispam.enc('honey0'): '',
- antispam.enc('honey1'): '',
- }
- for k, v in kwargs['params'].iteritems():
- params[antispam.enc(k)] = v
- kwargs['params'] = params
- return super(AntiSpamTestApp, self).post(*args, **kwargs)
-
-class PostParamCheckingTestApp(AntiSpamTestApp):
-
- def _validate_params(self, params, method):
- if not params:
- return
- # params can be a list or a dict
- if hasattr(params, 'items'):
- params = params.items()
- for k, v in params:
- if not isinstance(k, basestring):
- raise TypeError('%s key %s is %s, not str' % (method, k, type(k)))
- if not isinstance(v, (basestring, webtest.app.File)):
- raise TypeError('%s key %s has value %s of type %s, not str. ' % (method, k, v, type(v)))
-
- def get(self, *args, **kwargs):
- self._validate_params(kwargs.get('params'), 'get')
- return super(PostParamCheckingTestApp, self).get(*args, **kwargs)
-
- def post(self, *args, **kwargs):
- self._validate_params(kwargs.get('params'), 'post')
- return super(PostParamCheckingTestApp, self).post(*args, **kwargs)
-
-class ValidatingTestApp(PostParamCheckingTestApp):
-
- # Subclasses may set this to True to skip validation altogether
- validate_skip = False
-
- def _validate(self, resp, method, val_params):
- """Perform validation on webapp response. This handles responses of
- various types and forms."""
- if resp.status_int != 200:
- return
-
- content = resp.body
- content_type = resp.headers['Content-Type']
- if content_type.startswith('text/html'):
- if val_params['validate_chunk']:
- validate_html5_chunk(content)
- else:
- validate_page(resp)
- elif content_type.split(';', 1)[0] in ('text/plain', 'text/x-python', 'application/octet-stream'):
- pass
- elif content_type.startswith('application/json'):
- validate_json(content)
- elif content_type.startswith(('application/x-javascript','application/javascript', 'text/javascript')):
- validate_js(content)
- elif content_type.startswith('application/xml'):
- import feedparser
- d = feedparser.parse(content)
- assert d.bozo == 0, 'Non-wellformed feed'
- elif content_type.startswith('image/'):
- pass
- else:
- assert False, 'Unexpected output content type: ' + content_type
-
- def _get_validation_params(self, kw):
- "Separate validation params from normal TestApp methods params."
- params = {}
- for k in ('validate_skip', 'validate_chunk'):
- params[k] = kw.pop(k, False)
- return params, kw
-
- def get(self, *args, **kw):
- val_params, kw = self._get_validation_params(kw)
- resp = super(ValidatingTestApp, self).get(*args, **kw)
- if not self.validate_skip and not val_params['validate_skip']:
- self._validate(resp, 'get', val_params)
- return resp
-
- def post(self, *args, **kw):
- val_params, kw = self._get_validation_params(kw)
- resp = super(ValidatingTestApp, self).post(*args, **kw)
- if not self.validate_skip and not val_params['validate_skip']:
- self._validate(resp, 'post', val_params)
- return resp
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/jslint/Makefile
----------------------------------------------------------------------
diff --git a/AlluraTesting/jslint/Makefile b/AlluraTesting/jslint/Makefile
deleted file mode 100644
index 7efd72e..0000000
--- a/AlluraTesting/jslint/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# Make single-file jslint script out of main script (from jslint.com,
-# patched by us to tweak its behavior, as it configurability leaves much
-# to be desired) and Rhino support module. Needed because Rhino accepts
-# only single file as script.
-
-jslint.js: fulljslint.js rhino.js
- cat $^ >$@
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/jslint/env-js.jar
----------------------------------------------------------------------
diff --git a/AlluraTesting/jslint/env-js.jar b/AlluraTesting/jslint/env-js.jar
deleted file mode 100644
index 072891a..0000000
Binary files a/AlluraTesting/jslint/env-js.jar and /dev/null differ
[14/27] [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/jslint/jslint.js
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/jslint.js b/AlluraTest/jslint/jslint.js
new file mode 100644
index 0000000..4b2ddcc
--- /dev/null
+++ b/AlluraTest/jslint/jslint.js
@@ -0,0 +1,5729 @@
+// jslint.js
+// 2010-08-05
+
+/*
+Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/*
+ JSLINT is a global function. It takes two parameters.
+
+ var myResult = JSLINT(source, option);
+
+ The first parameter is either a string or an array of strings. If it is a
+ string, it will be split on '\n' or '\r'. If it is an array of strings, it
+ is assumed that each string represents one line. The source can be a
+ JavaScript text, or HTML text, or a Konfabulator text.
+
+ The second parameter is an optional object of options which control the
+ operation of JSLINT. Most of the options are booleans: They are all are
+ optional and have a default value of false.
+
+ If it checks out, JSLINT returns true. Otherwise, it returns false.
+
+ If false, you can inspect JSLINT.errors to find out the problems.
+ JSLINT.errors is an array of objects containing these members:
+
+ {
+ line : The line (relative to 0) at which the lint was found
+ character : The character (relative to 0) at which the lint was found
+ reason : The problem
+ evidence : The text line in which the problem occurred
+ raw : The raw message before the details were inserted
+ a : The first detail
+ b : The second detail
+ c : The third detail
+ d : The fourth detail
+ }
+
+ If a fatal error was found, a null will be the last element of the
+ JSLINT.errors array.
+
+ You can request a Function Report, which shows all of the functions
+ and the parameters and vars that they use. This can be used to find
+ implied global variables and other problems. The report is in HTML and
+ can be inserted in an HTML <body>.
+
+ var myReport = JSLINT.report(limited);
+
+ If limited is true, then the report will be limited to only errors.
+
+ You can request a data structure which contains JSLint's results.
+
+ var myData = JSLINT.data();
+
+ It returns a structure with this form:
+
+ {
+ errors: [
+ {
+ line: NUMBER,
+ character: NUMBER,
+ reason: STRING,
+ evidence: STRING
+ }
+ ],
+ functions: [
+ name: STRING,
+ line: NUMBER,
+ last: NUMBER,
+ param: [
+ STRING
+ ],
+ closure: [
+ STRING
+ ],
+ var: [
+ STRING
+ ],
+ exception: [
+ STRING
+ ],
+ outer: [
+ STRING
+ ],
+ unused: [
+ STRING
+ ],
+ global: [
+ STRING
+ ],
+ label: [
+ STRING
+ ]
+ ],
+ globals: [
+ STRING
+ ],
+ member: {
+ STRING: NUMBER
+ },
+ unuseds: [
+ {
+ name: STRING,
+ line: NUMBER
+ }
+ ],
+ implieds: [
+ {
+ name: STRING,
+ line: NUMBER
+ }
+ ],
+ urls: [
+ STRING
+ ],
+ json: BOOLEAN
+ }
+
+ Empty arrays will not be included.
+
+*/
+
+/*jslint
+ evil: true, nomen: false, onevar: false, regexp: false, strict: true
+*/
+
+/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%",
+ "(begin)", "(breakage)", "(context)", "(error)", "(global)",
+ "(identifier)", "(last)", "(line)", "(loopage)", "(name)", "(onevar)",
+ "(params)", "(scope)", "(verb)", "*", "+", "++", "-", "--", "\/",
+ "<", "<=", "==", "===", ">", ">=", ADSAFE, ActiveXObject,
+ Array, Boolean, COM, CScript, Canvas, CustomAnimation, Date, Debug, E,
+ Enumerator, Error, EvalError, FadeAnimation, Flash, FormField, Frame,
+ Function, HotKey, Image, JSON, LN10, LN2, LOG10E, LOG2E, MAX_VALUE,
+ MIN_VALUE, Math, MenuItem, MoveAnimation, NEGATIVE_INFINITY, Number,
+ Object, Option, PI, POSITIVE_INFINITY, Point, RangeError, Rectangle,
+ ReferenceError, RegExp, ResizeAnimation, RotateAnimation, SQRT1_2,
+ SQRT2, ScrollBar, String, Style, SyntaxError, System, Text, TextArea,
+ Timer, TypeError, URIError, URL, VBArray, WScript, Web, Window, XMLDOM,
+ XMLHttpRequest, "\\", a, abbr, acronym, addEventListener, address,
+ adsafe, alert, aliceblue, animator, antiquewhite, appleScript, applet,
+ apply, approved, aqua, aquamarine, area, arguments, arity, article,
+ aside, audio, autocomplete, azure, b, background,
+ "background-attachment", "background-color", "background-image",
+ "background-position", "background-repeat", base, bdo, beep, beige, big,
+ bisque, bitwise, black, blanchedalmond, block, blockquote, blue,
+ blueviolet, blur, body, border, "border-bottom", "border-bottom-color",
+ "border-bottom-style", "border-bottom-width", "border-collapse",
+ "border-color", "border-left", "border-left-color", "border-left-style",
+ "border-left-width", "border-right", "border-right-color",
+ "border-right-style", "border-right-width", "border-spacing",
+ "border-style", "border-top", "border-top-color", "border-top-style",
+ "border-top-width", "border-width", bottom, br, brown, browser,
+ burlywood, button, bytesToUIString, c, cadetblue, call, callee, caller,
+ canvas, cap, caption, "caption-side", cases, center, charAt, charCodeAt,
+ character, chartreuse, chocolate, chooseColor, chooseFile, chooseFolder,
+ cite, clear, clearInterval, clearTimeout, clip, close, closeWidget,
+ closed, closure, cm, code, col, colgroup, color, command, comment,
+ condition, confirm, console, constructor, content, convertPathToHFS,
+ convertPathToPlatform, coral, cornflowerblue, cornsilk,
+ "counter-increment", "counter-reset", create, crimson, css, cursor,
+ cyan, d, darkblue, darkcyan, darkgoldenrod, darkgray, darkgreen,
+ darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred,
+ darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise,
+ darkviolet, data, datalist, dd, debug, decodeURI, decodeURIComponent,
+ deeppink, deepskyblue, defaultStatus, defineClass, del, deserialize,
+ details, devel, dfn, dialog, dimension, dimgray, dir, direction,
+ display, div, dl, document, dodgerblue, dt, edition, else, em, embed,
+ empty, "empty-cells", encodeURI, encodeURIComponent, entityify, eqeqeq,
+ errors, es5, escape, eval, event, evidence, evil, ex, exception, exec, exps,
+ fieldset, figure, filesystem, firebrick, first, float, floor,
+ floralwhite, focus, focusWidget, font, "font-face", "font-family",
+ "font-size", "font-size-adjust", "font-stretch", "font-style",
+ "font-variant", "font-weight", footer, forestgreen, forin, form,
+ fragment, frame, frames, frameset, from, fromCharCode, fuchsia, fud,
+ funct, function, functions, g, gainsboro, gc, getComputedStyle,
+ ghostwhite, global, globals, gold, goldenrod, gray, green, greenyellow,
+ h1, h2, h3, h4, h5, h6, hasOwnProperty, head, header, height, help,
+ hgroup, history, honeydew, hotpink, hr, 'hta:application', html,
+ i, iTunes, id, identifier,
+ iframe, img, immed, implieds, in, include, indent, indexOf, indianred,
+ indigo, init, input, ins, isAlpha, isApplicationRunning, isDigit,
+ isFinite, isNaN, ivory, join, jslint, json, kbd, keygen, khaki,
+ konfabulatorVersion, label, labelled, lang, last, lavender,
+ lavenderblush, lawngreen, laxbreak, lbp, led, left, legend,
+ lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral,
+ lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon,
+ lightseagreen, lightskyblue, lightslategray, lightsteelblue,
+ lightyellow, lime, limegreen, line, "line-height", linen, link,
+ "list-style", "list-style-image", "list-style-position",
+ "list-style-type", load, loadClass, location, log, m, magenta, map,
+ margin, "margin-bottom", "margin-left", "margin-right", "margin-top",
+ mark, "marker-offset", maroon, match, "max-height", "max-width", maxerr,
+ maxlen, md5, media, mediumaquamarine, mediumblue, mediumorchid,
+ mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen,
+ mediumturquoise, mediumvioletred, member, menu, message, meta, meter,
+ midnightblue, "min-height", "min-width", mintcream, mistyrose, mm,
+ moccasin, moveBy, moveTo, name, nav, navajowhite, navigator, navy, new,
+ newcap, noframes, nomen, noscript, nud, object, ol, oldlace, olive,
+ olivedrab, on, onbeforeunload, onblur, onerror, onevar, onfocus, onload,
+ onresize, onunload, opacity, open, openURL, opener, opera, optgroup,
+ option, orange, orangered, orchid, outer, outline, "outline-color",
+ "outline-style", "outline-width", output, overflow, "overflow-x",
+ "overflow-y", p, padding, "padding-bottom", "padding-left",
+ "padding-right", "padding-top", page, "page-break-after",
+ "page-break-before", palegoldenrod, palegreen, paleturquoise,
+ palevioletred, papayawhip, param, parent, parseFloat, parseInt,
+ passfail, pc, peachpuff, peru, pink, play, plum, plusplus, pop,
+ popupMenu, position, powderblue, pre, predef, preferenceGroups,
+ preferences, print, progress, prompt, prototype, pt, purple, push, px,
+ q, quit, quotes, random, range, raw, reach, readFile, readUrl, reason,
+ red, regexp, reloadWidget, removeEventListener, replace, report,
+ reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, rhino, right,
+ rosybrown, royalblue, rp, rt, ruby, runCommand, runCommandInBg,
+ saddlebrown, safe, salmon, samp, sandybrown, saveAs, savePreferences,
+ screen, script, scroll, scrollBy, scrollTo, seagreen, seal, search,
+ seashell, section, select, serialize, setInterval, setTimeout, shift,
+ showWidgetPreferences, sienna, silver, skyblue, slateblue, slategray,
+ sleep, slice, small, snow, sort, source, span, spawn, speak, split,
+ springgreen, src, stack, status, steelblue, strict, strong, style,
+ styleproperty, sub, substr, sup, supplant, suppressUpdates, sync,
+ system, table, "table-layout", tan, tbody, td, teal, tellWidget, test,
+ "text-align", "text-decoration", "text-indent", "text-shadow",
+ "text-transform", textarea, tfoot, th, thead, thistle, time, title,
+ toLowerCase, toString, toUpperCase, toint32, token, tomato, top, tr, tt,
+ turquoise, type, u, ul, undef, unescape, "unicode-bidi", unused,
+ unwatch, updateNow, urls, value, valueOf, var, version,
+ "vertical-align", video, violet, visibility, watch, wheat, white,
+ "white-space", whitesmoke, widget, width, windows, "word-spacing",
+ "word-wrap", yahooCheckLogin, yahooLogin, yahooLogout, yellow,
+ yellowgreen, "z-index"
+*/
+
+// We build the application inside a function so that we produce only a single
+// global variable. The function will be invoked, its return value is the JSLINT
+// application itself.
+
+"use strict";
+
+var JSLINT = (function () {
+ var adsafe_id, // The widget's ADsafe id.
+ adsafe_may, // The widget may load approved scripts.
+ adsafe_went, // ADSAFE.go has been called.
+ anonname, // The guessed name for anonymous functions.
+ approved, // ADsafe approved urls.
+
+ atrule = {
+ media : true,
+ 'font-face': true,
+ page : true
+ },
+
+// These are operators that should not be used with the ! operator.
+
+ bang = {
+ '<': true,
+ '<=': true,
+ '==': true,
+ '===': true,
+ '!==': true,
+ '!=': true,
+ '>': true,
+ '>=': true,
+ '+': true,
+ '-': true,
+ '*': true,
+ '/': true,
+ '%': true
+ },
+
+// These are members that should not be permitted in the safe subset.
+
+ banned = { // the member names that ADsafe prohibits.
+ 'arguments' : true,
+ callee : true,
+ caller : true,
+ constructor : true,
+ 'eval' : true,
+ prototype : true,
+ stack : true,
+ unwatch : true,
+ valueOf : true,
+ watch : true
+ },
+
+
+// These are the JSLint boolean options.
+
+ boolOptions = {
+ adsafe : true, // if ADsafe should be enforced
+ bitwise : true, // if bitwise operators should not be allowed
+ browser : true, // if the standard browser globals should be predefined
+ cap : true, // if upper case HTML should be allowed
+ css : true, // if CSS workarounds should be tolerated
+ debug : true, // if debugger statements should be allowed
+ devel : true, // if logging should be allowed (console, alert, etc.)
+ eqeqeq : true, // if === should be required
+ es5 : true, // if ES5 syntax should be allowed
+ evil : true, // if eval should be allowed
+ forin : true, // if for in statements must filter
+ fragment : true, // if HTML fragments should be allowed
+ immed : true, // if immediate invocations must be wrapped in parens
+ laxbreak : true, // if line breaks should not be checked
+ newcap : true, // if constructor names must be capitalized
+ nomen : true, // if names should be checked
+ on : true, // if HTML event handlers should be allowed
+ onevar : true, // if only one var statement per function should be allowed
+ passfail : true, // if the scan should stop on first error
+ plusplus : true, // if increment/decrement should not be allowed
+ regexp : true, // if the . should not be allowed in regexp literals
+ rhino : true, // if the Rhino environment globals should be predefined
+ undef : true, // if variables should be declared before used
+ safe : true, // if use of some browser features should be restricted
+ windows : true, // if MS Windows-specigic globals should be predefined
+ strict : true, // require the "use strict"; pragma
+ sub : true, // if all forms of subscript notation are tolerated
+ white : true, // if strict whitespace rules apply
+ widget : true // if the Yahoo Widgets globals should be predefined
+ },
+
+// browser contains a set of global names which are commonly provided by a
+// web browser environment.
+
+ browser = {
+ addEventListener: false,
+ blur : false,
+ clearInterval : false,
+ clearTimeout : false,
+ close : false,
+ closed : false,
+ defaultStatus : false,
+ document : false,
+ event : false,
+ focus : false,
+ frames : false,
+ getComputedStyle: false,
+ history : false,
+ Image : false,
+ length : false,
+ location : false,
+ moveBy : false,
+ moveTo : false,
+ name : false,
+ navigator : false,
+ onbeforeunload : true,
+ onblur : true,
+ onerror : true,
+ onfocus : true,
+ onload : true,
+ onresize : true,
+ onunload : true,
+ open : false,
+ opener : false,
+ Option : false,
+ parent : false,
+ print : false,
+ removeEventListener: false,
+ resizeBy : false,
+ resizeTo : false,
+ screen : false,
+ scroll : false,
+ scrollBy : false,
+ scrollTo : false,
+ setInterval : false,
+ setTimeout : false,
+ status : false,
+ top : false,
+ XMLHttpRequest : false
+ },
+
+ cssAttributeData,
+ cssAny,
+
+ cssColorData = {
+ "aliceblue" : true,
+ "antiquewhite" : true,
+ "aqua" : true,
+ "aquamarine" : true,
+ "azure" : true,
+ "beige" : true,
+ "bisque" : true,
+ "black" : true,
+ "blanchedalmond" : true,
+ "blue" : true,
+ "blueviolet" : true,
+ "brown" : true,
+ "burlywood" : true,
+ "cadetblue" : true,
+ "chartreuse" : true,
+ "chocolate" : true,
+ "coral" : true,
+ "cornflowerblue" : true,
+ "cornsilk" : true,
+ "crimson" : true,
+ "cyan" : true,
+ "darkblue" : true,
+ "darkcyan" : true,
+ "darkgoldenrod" : true,
+ "darkgray" : true,
+ "darkgreen" : true,
+ "darkkhaki" : true,
+ "darkmagenta" : true,
+ "darkolivegreen" : true,
+ "darkorange" : true,
+ "darkorchid" : true,
+ "darkred" : true,
+ "darksalmon" : true,
+ "darkseagreen" : true,
+ "darkslateblue" : true,
+ "darkslategray" : true,
+ "darkturquoise" : true,
+ "darkviolet" : true,
+ "deeppink" : true,
+ "deepskyblue" : true,
+ "dimgray" : true,
+ "dodgerblue" : true,
+ "firebrick" : true,
+ "floralwhite" : true,
+ "forestgreen" : true,
+ "fuchsia" : true,
+ "gainsboro" : true,
+ "ghostwhite" : true,
+ "gold" : true,
+ "goldenrod" : true,
+ "gray" : true,
+ "green" : true,
+ "greenyellow" : true,
+ "honeydew" : true,
+ "hotpink" : true,
+ "indianred" : true,
+ "indigo" : true,
+ "ivory" : true,
+ "khaki" : true,
+ "lavender" : true,
+ "lavenderblush" : true,
+ "lawngreen" : true,
+ "lemonchiffon" : true,
+ "lightblue" : true,
+ "lightcoral" : true,
+ "lightcyan" : true,
+ "lightgoldenrodyellow" : true,
+ "lightgreen" : true,
+ "lightpink" : true,
+ "lightsalmon" : true,
+ "lightseagreen" : true,
+ "lightskyblue" : true,
+ "lightslategray" : true,
+ "lightsteelblue" : true,
+ "lightyellow" : true,
+ "lime" : true,
+ "limegreen" : true,
+ "linen" : true,
+ "magenta" : true,
+ "maroon" : true,
+ "mediumaquamarine" : true,
+ "mediumblue" : true,
+ "mediumorchid" : true,
+ "mediumpurple" : true,
+ "mediumseagreen" : true,
+ "mediumslateblue" : true,
+ "mediumspringgreen" : true,
+ "mediumturquoise" : true,
+ "mediumvioletred" : true,
+ "midnightblue" : true,
+ "mintcream" : true,
+ "mistyrose" : true,
+ "moccasin" : true,
+ "navajowhite" : true,
+ "navy" : true,
+ "oldlace" : true,
+ "olive" : true,
+ "olivedrab" : true,
+ "orange" : true,
+ "orangered" : true,
+ "orchid" : true,
+ "palegoldenrod" : true,
+ "palegreen" : true,
+ "paleturquoise" : true,
+ "palevioletred" : true,
+ "papayawhip" : true,
+ "peachpuff" : true,
+ "peru" : true,
+ "pink" : true,
+ "plum" : true,
+ "powderblue" : true,
+ "purple" : true,
+ "red" : true,
+ "rosybrown" : true,
+ "royalblue" : true,
+ "saddlebrown" : true,
+ "salmon" : true,
+ "sandybrown" : true,
+ "seagreen" : true,
+ "seashell" : true,
+ "sienna" : true,
+ "silver" : true,
+ "skyblue" : true,
+ "slateblue" : true,
+ "slategray" : true,
+ "snow" : true,
+ "springgreen" : true,
+ "steelblue" : true,
+ "tan" : true,
+ "teal" : true,
+ "thistle" : true,
+ "tomato" : true,
+ "turquoise" : true,
+ "violet" : true,
+ "wheat" : true,
+ "white" : true,
+ "whitesmoke" : true,
+ "yellow" : true,
+ "yellowgreen" : true
+ },
+
+ cssBorderStyle,
+ cssBreak,
+
+ cssLengthData = {
+ '%': true,
+ 'cm': true,
+ 'em': true,
+ 'ex': true,
+ 'in': true,
+ 'mm': true,
+ 'pc': true,
+ 'pt': true,
+ 'px': true
+ },
+
+ cssOverflow,
+
+ devel = {
+ alert : false,
+ confirm : false,
+ console : false,
+ Debug : false,
+ opera : false,
+ prompt : false
+ },
+
+ escapes = {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '/' : '\\/',
+ '\\': '\\\\'
+ },
+
+ funct, // The current function
+
+ functionicity = [
+ 'closure', 'exception', 'global', 'label',
+ 'outer', 'unused', 'var'
+ ],
+
+ functions, // All of the functions
+
+ global, // The global scope
+ htmltag = {
+ a: {},
+ abbr: {},
+ acronym: {},
+ address: {},
+ applet: {},
+ area: {empty: true, parent: ' map '},
+ article: {},
+ aside: {},
+ audio: {},
+ b: {},
+ base: {empty: true, parent: ' head '},
+ bdo: {},
+ big: {},
+ blockquote: {},
+ body: {parent: ' html noframes '},
+ br: {empty: true},
+ button: {},
+ canvas: {parent: ' body p div th td '},
+ caption: {parent: ' table '},
+ center: {},
+ cite: {},
+ code: {},
+ col: {empty: true, parent: ' table colgroup '},
+ colgroup: {parent: ' table '},
+ command: {parent: ' menu '},
+ datalist: {},
+ dd: {parent: ' dl '},
+ del: {},
+ details: {},
+ dialog: {},
+ dfn: {},
+ dir: {},
+ div: {},
+ dl: {},
+ dt: {parent: ' dl '},
+ em: {},
+ embed: {},
+ fieldset: {},
+ figure: {},
+ font: {},
+ footer: {},
+ form: {},
+ frame: {empty: true, parent: ' frameset '},
+ frameset: {parent: ' html frameset '},
+ h1: {},
+ h2: {},
+ h3: {},
+ h4: {},
+ h5: {},
+ h6: {},
+ head: {parent: ' html '},
+ header: {},
+ hgroup: {},
+ hr: {empty: true},
+ 'hta:application':
+ {empty: true, parent: ' head '},
+ html: {parent: '*'},
+ i: {},
+ iframe: {},
+ img: {empty: true},
+ input: {empty: true},
+ ins: {},
+ kbd: {},
+ keygen: {},
+ label: {},
+ legend: {parent: ' details fieldset figure '},
+ li: {parent: ' dir menu ol ul '},
+ link: {empty: true, parent: ' head '},
+ map: {},
+ mark: {},
+ menu: {},
+ meta: {empty: true, parent: ' head noframes noscript '},
+ meter: {},
+ nav: {},
+ noframes: {parent: ' html body '},
+ noscript: {},
+ object: {},
+ ol: {},
+ optgroup: {parent: ' select '},
+ option: {parent: ' optgroup select '},
+ output: {},
+ p: {},
+ param: {parent: ' applet object '},
+ pre: {},
+ progress: {},
+ q: {},
+ rp: {},
+ rt: {},
+ ruby: {},
+ s: {},
+ samp: {},
+ script: {empty: true, parent: ' body div frame head iframe p pre span '},
+ section: {},
+ select: {},
+ small: {},
+ span: {},
+ source: {},
+ strong: {},
+ style: {parent: ' head ', empty: true},
+ sub: {},
+ sup: {},
+ table: {},
+ tbody: {parent: ' table '},
+ td: {parent: ' tr '},
+ textarea: {},
+ tfoot: {parent: ' table '},
+ th: {parent: ' tr '},
+ thead: {parent: ' table '},
+ time: {},
+ title: {parent: ' head '},
+ tr: {parent: ' table tbody thead tfoot '},
+ tt: {},
+ u: {},
+ ul: {},
+ 'var': {},
+ video: {}
+ },
+
+ ids, // HTML ids
+ implied, // Implied globals
+ inblock,
+ indent,
+ jsonmode,
+ lines,
+ lookahead,
+ member,
+ membersOnly,
+ nexttoken,
+ noreach,
+ option,
+ predefined, // Global variables defined by option
+ prereg,
+ prevtoken,
+
+ rhino = {
+ defineClass : false,
+ deserialize : false,
+ gc : false,
+ help : false,
+ load : false,
+ loadClass : false,
+ print : false,
+ quit : false,
+ readFile : false,
+ readUrl : false,
+ runCommand : false,
+ seal : false,
+ serialize : false,
+ spawn : false,
+ sync : false,
+ toint32 : false,
+ version : false
+ },
+
+ scope, // The current scope
+
+ windows = {
+ ActiveXObject: false,
+ CScript : false,
+ Debug : false,
+ Enumerator : false,
+ System : false,
+ VBArray : false,
+ WScript : false
+ },
+
+ src,
+ stack,
+
+// standard contains the global names that are provided by the
+// ECMAScript standard.
+
+ standard = {
+ 'void' : false,
+ Array : false,
+ Boolean : false,
+ Date : false,
+ decodeURI : false,
+ decodeURIComponent : false,
+ encodeURI : false,
+ encodeURIComponent : false,
+ Error : false,
+ 'eval' : false,
+ EvalError : false,
+ Function : false,
+ hasOwnProperty : false,
+ isFinite : false,
+ isNaN : false,
+ JSON : false,
+ Math : false,
+ Number : false,
+ Object : false,
+ parseInt : false,
+ parseFloat : false,
+ RangeError : false,
+ ReferenceError : false,
+ RegExp : false,
+ String : false,
+ SyntaxError : false,
+ TypeError : false,
+ URIError : false
+ },
+
+ standard_member = {
+ E : true,
+ LN2 : true,
+ LN10 : true,
+ LOG2E : true,
+ LOG10E : true,
+ PI : true,
+ SQRT1_2 : true,
+ SQRT2 : true,
+ MAX_VALUE : true,
+ MIN_VALUE : true,
+ NEGATIVE_INFINITY : true,
+ POSITIVE_INFINITY : true
+ },
+
+ strict_mode,
+ syntax = {},
+ tab,
+ token,
+ urls,
+ warnings,
+
+// widget contains the global names which are provided to a Yahoo
+// (fna Konfabulator) widget.
+
+ widget = {
+ alert : true,
+ animator : true,
+ appleScript : true,
+ beep : true,
+ bytesToUIString : true,
+ Canvas : true,
+ chooseColor : true,
+ chooseFile : true,
+ chooseFolder : true,
+ closeWidget : true,
+ COM : true,
+ convertPathToHFS : true,
+ convertPathToPlatform : true,
+ CustomAnimation : true,
+ escape : true,
+ FadeAnimation : true,
+ filesystem : true,
+ Flash : true,
+ focusWidget : true,
+ form : true,
+ FormField : true,
+ Frame : true,
+ HotKey : true,
+ Image : true,
+ include : true,
+ isApplicationRunning : true,
+ iTunes : true,
+ konfabulatorVersion : true,
+ log : true,
+ md5 : true,
+ MenuItem : true,
+ MoveAnimation : true,
+ openURL : true,
+ play : true,
+ Point : true,
+ popupMenu : true,
+ preferenceGroups : true,
+ preferences : true,
+ print : true,
+ prompt : true,
+ random : true,
+ Rectangle : true,
+ reloadWidget : true,
+ ResizeAnimation : true,
+ resolvePath : true,
+ resumeUpdates : true,
+ RotateAnimation : true,
+ runCommand : true,
+ runCommandInBg : true,
+ saveAs : true,
+ savePreferences : true,
+ screen : true,
+ ScrollBar : true,
+ showWidgetPreferences : true,
+ sleep : true,
+ speak : true,
+ Style : true,
+ suppressUpdates : true,
+ system : true,
+ tellWidget : true,
+ Text : true,
+ TextArea : true,
+ Timer : true,
+ unescape : true,
+ updateNow : true,
+ URL : true,
+ Web : true,
+ widget : true,
+ Window : true,
+ XMLDOM : true,
+ XMLHttpRequest : true,
+ yahooCheckLogin : true,
+ yahooLogin : true,
+ yahooLogout : true
+ },
+
+// xmode is used to adapt to the exceptions in html parsing.
+// It can have these states:
+// false .js script file
+// html
+// outer
+// script
+// style
+// scriptstring
+// styleproperty
+
+ xmode,
+ xquote,
+
+// unsafe comment or string
+ ax = /@cc|<\/?|script|\]*s\]|<\s*!|</i,
+// unsafe characters that are silently deleted by one or more browsers
+// Whitelist Replacement Char, 0xfffd
+ cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\ufffc\ufffe-\uffff]/,
+// token
+ tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/,
+// html token
+ hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
+// characters in strings that need escapement
+ nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
+ nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+// outer html token
+ ox = /[>&]|<[\/!]?|--/,
+// star slash
+ lx = /\*\/|\/\*/,
+// identifier
+ ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
+// javascript url
+ jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
+// url badness
+ ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto/i,
+// style
+ sx = /^\s*([{:#%.=,>+\[\]@()"';]|\*=?|\$=|\|=|\^=|~=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
+ ssx = /^\s*(\.?\d+(?:\.\d+)?|[@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|<\/)/,
+// attributes characters
+ //qx = /[^a-zA-Z0-9+\-_\/ ]/,
+ qx = /[^a-zA-Z0-9+\-_\/ .#]/, // We want dots in names, period; and hashes for templating
+// query characters for ids
+ //dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
+ // allow . and /
+ dx = /[\[\]\\"'*<>&:(){}+=#]/,
+
+ rx = {
+ outer: hx,
+ html: hx,
+ style: sx,
+ styleproperty: ssx
+ };
+
+ function F() {}
+
+ if (typeof Object.create !== 'function') {
+ Object.create = function (o) {
+ F.prototype = o;
+ return new F();
+ };
+ }
+
+
+ function is_own(object, name) {
+ return Object.prototype.hasOwnProperty.call(object, name);
+ }
+
+
+ function combine(t, o) {
+ var n;
+ for (n in o) {
+ if (is_own(o, n)) {
+ t[n] = o[n];
+ }
+ }
+ }
+
+ String.prototype.entityify = function () {
+ return this.
+ replace(/&/g, '&').
+ replace(/</g, '<').
+ replace(/>/g, '>');
+ };
+
+ String.prototype.isAlpha = function () {
+ return (this >= 'a' && this <= 'z\uffff') ||
+ (this >= 'A' && this <= 'Z\uffff');
+ };
+
+
+ String.prototype.isDigit = function () {
+ return (this >= '0' && this <= '9');
+ };
+
+
+ String.prototype.supplant = function (o) {
+ return this.replace(/\{([^{}]*)\}/g, function (a, b) {
+ var r = o[b];
+ return typeof r === 'string' || typeof r === 'number' ? r : a;
+ });
+ };
+
+ String.prototype.name = function () {
+
+// If the string looks like an identifier, then we can return it as is.
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can simply slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe
+// sequences.
+
+ if (ix.test(this)) {
+ return this;
+ }
+ if (nx.test(this)) {
+ return '"' + this.replace(nxg, function (a) {
+ var c = escapes[a];
+ if (c) {
+ return c;
+ }
+ return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
+ }) + '"';
+ }
+ return '"' + this + '"';
+ };
+
+
+ function assume() {
+ if (!option.safe) {
+ if (option.rhino) {
+ combine(predefined, rhino);
+ }
+ if (option.devel) {
+ combine(predefined, devel);
+ }
+ if (option.browser) {
+ combine(predefined, browser);
+ }
+ if (option.windows) {
+ combine(predefined, windows);
+ }
+ if (option.widget) {
+ combine(predefined, widget);
+ }
+ }
+ }
+
+
+// Produce an error warning.
+
+ function quit(m, l, ch) {
+ throw {
+ name: 'JSLintError',
+ line: l,
+ character: ch,
+ message: m + " (" + Math.floor((l / lines.length) * 100) +
+ "% scanned)."
+ };
+ }
+
+ function warning(m, t, a, b, c, d) {
+ var ch, l, w;
+ t = t || nexttoken;
+ if (t.id === '(end)') { // `~
+ t = token;
+ }
+ l = t.line || 0;
+ ch = t.from || 0;
+ w = {
+ id: '(error)',
+ raw: m,
+ evidence: lines[l - 1] || '',
+ line: l,
+ character: ch,
+ a: a,
+ b: b,
+ c: c,
+ d: d
+ };
+ w.reason = m.supplant(w);
+ JSLINT.errors.push(w);
+ if (option.passfail) {
+ quit('Stopping. ', l, ch);
+ }
+ warnings += 1;
+ if (warnings >= option.maxerr) {
+ quit("Too many errors.", l, ch);
+ }
+ return w;
+ }
+
+ function warningAt(m, l, ch, a, b, c, d) {
+ return warning(m, {
+ line: l,
+ from: ch
+ }, a, b, c, d);
+ }
+
+ function error(m, t, a, b, c, d) {
+ var w = warning(m, t, a, b, c, d);
+ quit("Stopping, unable to continue.", w.line, w.character);
+ }
+
+ function errorAt(m, l, ch, a, b, c, d) {
+ return error(m, {
+ line: l,
+ from: ch
+ }, a, b, c, d);
+ }
+
+
+
+// lexical analysis
+
+ var lex = (function lex() {
+ var character, from, line, s;
+
+// Private lex methods
+
+ function nextLine() {
+ var at;
+ if (line >= lines.length) {
+ return false;
+ }
+ character = 1;
+ s = lines[line];
+ line += 1;
+ at = s.search(/ \t/);
+ if (at >= 0) {
+ warningAt("Mixed spaces and tabs.", line, at + 1);
+ }
+ s = s.replace(/\t/g, tab);
+ at = s.search(cx);
+ if (at >= 0) {
+ warningAt("Unsafe character.", line, at);
+ }
+ if (option.maxlen && option.maxlen < s.length) {
+ warningAt("Line too long.", line, s.length);
+ }
+ return true;
+ }
+
+// Produce a token object. The token inherits from a syntax symbol.
+
+ function it(type, value) {
+ var i, t;
+ if (type === '(color)') {
+ t = {type: type};
+ } else if (type === '(punctuator)' ||
+ (type === '(identifier)' && is_own(syntax, value))) {
+ t = syntax[value] || syntax['(error)'];
+ } else {
+ t = syntax[type];
+ }
+ t = Object.create(t);
+ if (type === '(string)' || type === '(range)') {
+ if (jx.test(value)) {
+ warningAt("Script URL.", line, from);
+ }
+ }
+ if (type === '(identifier)') {
+ t.identifier = true;
+ if (value === '__iterator__' || value === '__proto__') {
+ errorAt("Reserved name '{a}'.",
+ line, from, value);
+ } else if (option.nomen &&
+ (value.charAt(0) === '_' ||
+ value.charAt(value.length - 1) === '_')) {
+ warningAt("Unexpected {a} in '{b}'.", line, from,
+ "dangling '_'", value);
+ }
+ }
+ t.value = value;
+ t.line = line;
+ t.character = character;
+ t.from = from;
+ i = t.id;
+ if (i !== '(endline)') {
+ prereg = i &&
+ (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
+ i === 'return');
+ }
+ return t;
+ }
+
+// Public lex methods
+
+ return {
+ init: function (source) {
+ if (typeof source === 'string') {
+ lines = source.
+ replace(/\r\n/g, '\n').
+ replace(/\r/g, '\n').
+ split('\n');
+ } else {
+ lines = source;
+ }
+ line = 0;
+ nextLine();
+ from = 1;
+ },
+
+ range: function (begin, end) {
+ var c, value = '';
+ from = character;
+ if (s.charAt(0) !== begin) {
+ errorAt("Expected '{a}' and instead saw '{b}'.",
+ line, character, begin, s.charAt(0));
+ }
+ for (;;) {
+ s = s.slice(1);
+ character += 1;
+ c = s.charAt(0);
+ switch (c) {
+ case '':
+ errorAt("Missing '{a}'.", line, character, c);
+ break;
+ case end:
+ s = s.slice(1);
+ character += 1;
+ return it('(range)', value);
+ case xquote:
+ case '\\':
+ warningAt("Unexpected '{a}'.", line, character, c);
+ }
+ value += c;
+ }
+
+ },
+
+// skip all content up to marker
+
+ skip_till: function (end) {
+ for (;;) {
+ i = s.indexOf(end);
+ if (i >= 0) {
+ break;
+ }
+ if (!nextLine()) {
+ errorAt("Unclosed {a} block.", line, character, end);
+ }
+ }
+ character += i;
+ s = s.substr(i);
+ },
+
+// token -- this is called by advance to get the next token.
+
+ token: function () {
+ var b, c, captures, d, depth, high, i, l, low, q, t;
+
+ function match(x) {
+ var r = x.exec(s), r1;
+ if (r) {
+ l = r[0].length;
+ r1 = r[1];
+ c = r1.charAt(0);
+ s = s.substr(l);
+ from = character + l - r1.length;
+ character += l;
+ return r1;
+ }
+ }
+
+ function string(x) {
+ var c, j, r = '';
+
+ if (jsonmode && x !== '"') {
+ warningAt("Strings must use doublequote.",
+ line, character);
+ }
+
+ if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
+ return it('(punctuator)', x);
+ }
+
+ function esc(n) {
+ var i = parseInt(s.substr(j + 1, n), 16);
+ j += n;
+ if (i >= 32 && i <= 126 &&
+ i !== 34 && i !== 92 && i !== 39) {
+ warningAt("Unnecessary escapement.", line, character);
+ }
+ character += n;
+ c = String.fromCharCode(i);
+ }
+ j = 0;
+ for (;;) {
+ while (j >= s.length) {
+ j = 0;
+ if (xmode !== 'html' || !nextLine()) {
+ errorAt("Unclosed string.", line, from);
+ }
+ }
+ c = s.charAt(j);
+ if (c === x) {
+ character += 1;
+ s = s.substr(j + 1);
+ return it('(string)', r, x);
+ }
+ if (c < ' ') {
+ if (c === '\n' || c === '\r') {
+ break;
+ }
+ warningAt("Control character in string: {a}.",
+ line, character + j, s.slice(0, j));
+ } else if (c === xquote) {
+ warningAt("Bad HTML string", line, character + j);
+ } else if (c === '<') {
+ if (option.safe && xmode === 'html') {
+ warningAt("ADsafe string violation.",
+ line, character + j);
+ } else if (s.charAt(j + 1) === '/' && (xmode || option.safe) && s.substr(j + 2, 6) === 'script') {
+ warningAt("Expected '<\\/' and instead saw '</'.", line, character);
+ } else if (s.charAt(j + 1) === '!' && (xmode || option.safe)) {
+ warningAt("Unexpected '<!' in a string.", line, character);
+ }
+ } else if (c === '\\') {
+ if (xmode === 'html') {
+ if (option.safe) {
+ warningAt("ADsafe string violation.",
+ line, character + j);
+ }
+ } else if (xmode === 'styleproperty') {
+ j += 1;
+ character += 1;
+ c = s.charAt(j);
+ if (c !== x) {
+ warningAt("Escapement in style string.",
+ line, character + j);
+ }
+ } else {
+ j += 1;
+ character += 1;
+ c = s.charAt(j);
+ switch (c) {
+ case xquote:
+ warningAt("Bad HTML string", line,
+ character + j);
+ break;
+ case '\\':
+ case '\'':
+ case '"':
+ case '/':
+ break;
+ case 'b':
+ c = '\b';
+ break;
+ case 'f':
+ c = '\f';
+ break;
+ case 'n':
+ c = '\n';
+ break;
+ case 'r':
+ c = '\r';
+ break;
+ case 't':
+ c = '\t';
+ break;
+ case 'u':
+ esc(4);
+ break;
+ case 'v':
+ c = '\v';
+ break;
+ case 'x':
+ if (jsonmode) {
+ warningAt("Avoid \\x-.", line, character);
+ }
+ esc(2);
+ break;
+ default:
+ warningAt("Bad escapement.", line, character);
+ }
+ }
+ }
+ r += c;
+ character += 1;
+ j += 1;
+ }
+ }
+
+ for (;;) {
+ if (!s) {
+ return it(nextLine() ? '(endline)' : '(end)', '');
+ }
+ while (xmode === 'outer') {
+ i = s.search(ox);
+ if (i === 0) {
+ break;
+ } else if (i > 0) {
+ character += 1;
+ s = s.slice(i);
+ break;
+ } else {
+ if (!nextLine()) {
+ return it('(end)', '');
+ }
+ }
+ }
+// t = match(rx[xmode] || tx);
+// if (!t) {
+// if (xmode === 'html') {
+// return it('(error)', s.charAt(0));
+// } else {
+// t = '';
+// c = '';
+// while (s && s < '!') {
+// s = s.substr(1);
+// }
+// if (s) {
+// errorAt("Unexpected '{a}'.",
+// line, character, s.substr(0, 1));
+// }
+// }
+ t = match(rx[xmode] || tx);
+ if (!t) {
+ t = '';
+ c = '';
+ while (s && s < '!') {
+ s = s.substr(1);
+ }
+ if (s) {
+ if (xmode === 'html') {
+ return it('(error)', s.charAt(0));
+ } else {
+ errorAt("Unexpected '{a}'.",
+ line, character, s.substr(0, 1));
+ }
+ }
+ } else {
+
+ // identifier
+
+ if (c.isAlpha() || c === '_' || c === '$') {
+ return it('(identifier)', t);
+ }
+
+ // number
+
+ if (c.isDigit() || (c === '.' && t.substr(1, 1).isDigit())) {
+ if (c === '.') {
+ t = '0' + t;
+ c = '0';
+ }
+
+ if (xmode !== 'style' && !isFinite(Number(t))) {
+ warningAt("Bad number '{a}'.",
+ line, character, t);
+ }
+ if (xmode !== 'style' &&
+ xmode !== 'styleproperty' &&
+ s.substr(0, 1).isAlpha()) {
+ warningAt("Missing space after '{a}'.",
+ line, character, t);
+ }
+ if (c === '0') {
+ d = t.substr(1, 1);
+ if (d.isDigit()) {
+ if (token.id !== '.' && xmode !== 'styleproperty') {
+ warningAt("Don't use extra leading zeros '{a}'.",
+ line, character, t);
+ }
+ } else if (jsonmode && (d === 'x' || d === 'X')) {
+ warningAt("Avoid 0x-. '{a}'.",
+ line, character, t);
+ }
+ }
+ if (t.substr(t.length - 1) === '.') {
+ warningAt(
+ "A trailing decimal point can be confused with a dot '{a}'.",
+ line, character, t);
+ }
+ return it('(number)', t);
+ }
+ switch (t) {
+
+ // string
+
+ case '"':
+ case "'":
+ return string(t);
+
+ // // comment
+
+ case '//':
+ if (src || (xmode && xmode !== 'script')) {
+ warningAt("Unexpected comment.", line, character);
+ } else if (xmode === 'script' && /<\s*\//i.test(s)) {
+ warningAt("Unexpected <\/ in comment.", line, character);
+ } else if ((option.safe || xmode === 'script') && ax.test(s)) {
+ warningAt("Dangerous comment.", line, character);
+ }
+ s = '';
+ token.comment = true;
+ break;
+
+ // /* comment
+
+ case '/*':
+ if (src || (xmode && xmode !== 'script' && xmode !== 'style' && xmode !== 'styleproperty')) {
+ warningAt("Unexpected comment.", line, character);
+ }
+ if (option.safe && ax.test(s)) {
+ warningAt("ADsafe comment violation.", line, character);
+ }
+ for (;;) {
+ i = s.search(lx);
+ if (i >= 0) {
+ break;
+ }
+ if (!nextLine()) {
+ errorAt("Unclosed comment.", line, character);
+ } else {
+ if (option.safe && ax.test(s)) {
+ warningAt("ADsafe comment violation.",
+ line, character);
+ }
+ }
+ }
+ character += i + 2;
+ if (s.substr(i, 1) === '/') {
+ errorAt("Nested comment.", line, character);
+ }
+ s = s.substr(i + 2);
+ token.comment = true;
+ break;
+
+ // /*members /*jslint /*global
+
+ case '/*members':
+ case '/*member':
+ case '/*jslint':
+ case '/*global':
+ case '*/':
+ return {
+ value: t,
+ type: 'special',
+ line: line,
+ character: character,
+ from: from
+ };
+
+ case '':
+ break;
+ // /
+ case '/':
+ if (token.id === '/=') {
+ errorAt(
+"A regular expression literal can be confused with '/='.", line, from);
+ }
+ if (prereg) {
+ depth = 0;
+ captures = 0;
+ l = 0;
+ for (;;) {
+ b = true;
+ c = s.charAt(l);
+ l += 1;
+ switch (c) {
+ case '':
+ errorAt("Unclosed regular expression.",
+ line, from);
+ return;
+ case '/':
+ if (depth > 0) {
+ warningAt("Unescaped '{a}'.",
+ line, from + l, '/');
+ }
+ c = s.substr(0, l - 1);
+ q = {
+ g: true,
+ i: true,
+ m: true
+ };
+ while (q[s.charAt(l)] === true) {
+ q[s.charAt(l)] = false;
+ l += 1;
+ }
+ character += l;
+ s = s.substr(l);
+ q = s.charAt(0);
+ if (q === '/' || q === '*') {
+ errorAt("Confusing regular expression.",
+ line, from);
+ }
+ return it('(regexp)', c);
+ case '\\':
+ c = s.charAt(l);
+ if (c < ' ') {
+ warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+ } else if (c === '<') {
+ warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+ }
+ l += 1;
+ break;
+ case '(':
+ depth += 1;
+ b = false;
+ if (s.charAt(l) === '?') {
+ l += 1;
+ switch (s.charAt(l)) {
+ case ':':
+ case '=':
+ case '!':
+ l += 1;
+ break;
+ default:
+ warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
+ }
+ } else {
+ captures += 1;
+ }
+ break;
+ case '|':
+ b = false;
+ break;
+ case ')':
+ if (depth === 0) {
+ warningAt("Unescaped '{a}'.",
+ line, from + l, ')');
+ } else {
+ depth -= 1;
+ }
+ break;
+ case ' ':
+ q = 1;
+ while (s.charAt(l) === ' ') {
+ l += 1;
+ q += 1;
+ }
+ if (q > 1) {
+ warningAt(
+"Spaces are hard to count. Use {{a}}.", line, from + l, q);
+ }
+ break;
+ case '[':
+ c = s.charAt(l);
+ if (c === '^') {
+ l += 1;
+ if (option.regexp) {
+ warningAt("Insecure '{a}'.",
+ line, from + l, c);
+ }
+ }
+ q = false;
+ if (c === ']') {
+ warningAt("Empty class.", line,
+ from + l - 1);
+ q = true;
+ }
+klass: do {
+ c = s.charAt(l);
+ l += 1;
+ switch (c) {
+ case '[':
+ case '^':
+ warningAt("Unescaped '{a}'.",
+ line, from + l, c);
+ q = true;
+ break;
+ case '-':
+ if (q) {
+ q = false;
+ } else {
+ warningAt("Unescaped '{a}'.",
+ line, from + l, '-');
+ q = true;
+ }
+ break;
+ case ']':
+ if (!q) {
+ warningAt("Unescaped '{a}'.",
+ line, from + l - 1, '-');
+ }
+ break klass;
+ case '\\':
+ c = s.charAt(l);
+ if (c < ' ') {
+ warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+ } else if (c === '<') {
+ warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+ }
+ l += 1;
+ q = true;
+ break;
+ case '/':
+ warningAt("Unescaped '{a}'.",
+ line, from + l - 1, '/');
+ q = true;
+ break;
+ case '<':
+ if (xmode === 'script') {
+ c = s.charAt(l);
+ if (c === '!' || c === '/') {
+ warningAt(
+"HTML confusion in regular expression '<{a}'.", line, from + l, c);
+ }
+ }
+ q = true;
+ break;
+ default:
+ q = true;
+ }
+ } while (c);
+ break;
+ case '.':
+ if (option.regexp) {
+ warningAt("Insecure '{a}'.", line,
+ from + l, c);
+ }
+ break;
+ case ']':
+ case '?':
+ case '{':
+ case '}':
+ case '+':
+ case '*':
+ warningAt("Unescaped '{a}'.", line,
+ from + l, c);
+ break;
+ case '<':
+ if (xmode === 'script') {
+ c = s.charAt(l);
+ if (c === '!' || c === '/') {
+ warningAt(
+"HTML confusion in regular expression '<{a}'.", line, from + l, c);
+ }
+ }
+ }
+ if (b) {
+ switch (s.charAt(l)) {
+ case '?':
+ case '+':
+ case '*':
+ l += 1;
+ if (s.charAt(l) === '?') {
+ l += 1;
+ }
+ break;
+ case '{':
+ l += 1;
+ c = s.charAt(l);
+ if (c < '0' || c > '9') {
+ warningAt(
+"Expected a number and instead saw '{a}'.", line, from + l, c);
+ }
+ l += 1;
+ low = +c;
+ for (;;) {
+ c = s.charAt(l);
+ if (c < '0' || c > '9') {
+ break;
+ }
+ l += 1;
+ low = +c + (low * 10);
+ }
+ high = low;
+ if (c === ',') {
+ l += 1;
+ high = Infinity;
+ c = s.charAt(l);
+ if (c >= '0' && c <= '9') {
+ l += 1;
+ high = +c;
+ for (;;) {
+ c = s.charAt(l);
+ if (c < '0' || c > '9') {
+ break;
+ }
+ l += 1;
+ high = +c + (high * 10);
+ }
+ }
+ }
+ if (s.charAt(l) !== '}') {
+ warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
+ } else {
+ l += 1;
+ }
+ if (s.charAt(l) === '?') {
+ l += 1;
+ }
+ if (low > high) {
+ warningAt(
+"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
+ }
+ }
+ }
+ }
+ c = s.substr(0, l - 1);
+ character += l;
+ s = s.substr(l);
+ return it('(regexp)', c);
+ }
+ return it('(punctuator)', t);
+
+ // punctuator
+
+ case '<!--':
+ l = line;
+ c = character;
+ for (;;) {
+ i = s.indexOf('--');
+ if (i >= 0) {
+ break;
+ }
+ i = s.indexOf('<!-');
+ if (i >= 0) {
+ errorAt("Nested HTML comment.",
+ line, character + i);
+ }
+ if (!nextLine()) {
+ errorAt("Unclosed HTML comment.", l, c);
+ }
+ }
+ l = s.indexOf('<!-');
+ if (l >= 0 && l < i) {
+ errorAt("Nested HTML comment.",
+ line, character + l);
+ }
+ character += i;
+ if (s[i + 2] !== '>') {
+ errorAt("Expected -->.", line, character);
+ }
+ character += 3;
+ s = s.slice(i + 3);
+ break;
+ case '#':
+ if (xmode === 'html' || xmode === 'styleproperty') {
+ for (;;) {
+ c = s.charAt(0);
+ if ((c < '0' || c > '9') &&
+ (c < 'a' || c > 'f') &&
+ (c < 'A' || c > 'F')) {
+ break;
+ }
+ character += 1;
+ s = s.substr(1);
+ t += c;
+ }
+ if (t.length !== 4 && t.length !== 7) {
+ warningAt("Bad hex color '{a}'.", line,
+ from + l, t);
+ }
+ return it('(color)', t);
+ }
+ return it('(punctuator)', t);
+ default:
+ if (xmode === 'outer' && c === '&') {
+ character += 1;
+ s = s.substr(1);
+ for (;;) {
+ c = s.charAt(0);
+ character += 1;
+ s = s.substr(1);
+ if (c === ';') {
+ break;
+ }
+ if (!((c >= '0' && c <= '9') ||
+ (c >= 'a' && c <= 'z') ||
+ c === '#')) {
+ errorAt("Bad entity", line, from + l,
+ character);
+ }
+ }
+ break;
+ }
+ return it('(punctuator)', t);
+ }
+ }
+ }
+ }
+ };
+ }());
+
+
+ function addlabel(t, type) {
+
+ if (option.safe && funct['(global)'] &&
+ typeof predefined[t] !== 'boolean') {
+ warning('ADsafe global: ' + t + '.', token);
+ } else if (t === 'hasOwnProperty') {
+ warning("'hasOwnProperty' is a really bad name.");
+ }
+
+// Define t in the current function in the current scope.
+
+ if (is_own(funct, t) && !funct['(global)']) {
+ warning(funct[t] === true ?
+ "'{a}' was used before it was defined." :
+ "'{a}' is already defined.",
+ nexttoken, t);
+ }
+ funct[t] = type;
+ if (funct['(global)']) {
+ global[t] = funct;
+ if (is_own(implied, t)) {
+ warning("'{a}' was used before it was defined.", nexttoken, t);
+ delete implied[t];
+ }
+ } else {
+ scope[t] = funct;
+ }
+ }
+
+
+ function doOption() {
+ var b, obj, filter, o = nexttoken.value, t, v;
+ switch (o) {
+ case '*/':
+ error("Unbegun comment.");
+ break;
+ case '/*members':
+ case '/*member':
+ o = '/*members';
+ if (!membersOnly) {
+ membersOnly = {};
+ }
+ obj = membersOnly;
+ break;
+ case '/*jslint':
+ if (option.safe) {
+ warning("ADsafe restriction.");
+ }
+ obj = option;
+ filter = boolOptions;
+ break;
+ case '/*global':
+ if (option.safe) {
+ warning("ADsafe restriction.");
+ }
+ obj = predefined;
+ break;
+ default:
+ }
+ t = lex.token();
+loop: for (;;) {
+ for (;;) {
+ if (t.type === 'special' && t.value === '*/') {
+ break loop;
+ }
+ if (t.id !== '(endline)' && t.id !== ',') {
+ break;
+ }
+ t = lex.token();
+ }
+ if (t.type !== '(string)' && t.type !== '(identifier)' &&
+ o !== '/*members') {
+ error("Bad option.", t);
+ }
+ v = lex.token();
+ if (v.id === ':') {
+ v = lex.token();
+ if (obj === membersOnly) {
+ error("Expected '{a}' and instead saw '{b}'.",
+ t, '*/', ':');
+ }
+ if (t.value === 'indent' && o === '/*jslint') {
+ b = +v.value;
+ if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+ Math.floor(b) !== b) {
+ error("Expected a small integer and instead saw '{a}'.",
+ v, v.value);
+ }
+ obj.white = true;
+ obj.indent = b;
+ } else if (t.value === 'maxerr' && o === '/*jslint') {
+ b = +v.value;
+ if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+ Math.floor(b) !== b) {
+ error("Expected a small integer and instead saw '{a}'.",
+ v, v.value);
+ }
+ obj.maxerr = b;
+ } else if (t.value === 'maxlen' && o === '/*jslint') {
+ b = +v.value;
+ if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+ Math.floor(b) !== b) {
+ error("Expected a small integer and instead saw '{a}'.",
+ v, v.value);
+ }
+ obj.maxlen = b;
+ } else if (v.value === 'true') {
+ obj[t.value] = true;
+ } else if (v.value === 'false') {
+ obj[t.value] = false;
+ } else {
+ error("Bad option value.", v);
+ }
+ t = lex.token();
+ } else {
+ if (o === '/*jslint') {
+ error("Missing option value.", t);
+ }
+ obj[t.value] = false;
+ t = v;
+ }
+ }
+ if (filter) {
+ assume();
+ }
+ }
+
+
+// We need a peek function. If it has an argument, it peeks that much farther
+// ahead. It is used to distinguish
+// for ( var i in ...
+// from
+// for ( var i = ...
+
+ function peek(p) {
+ var i = p || 0, j = 0, t;
+
+ while (j <= i) {
+ t = lookahead[j];
+ if (!t) {
+ t = lookahead[j] = lex.token();
+ }
+ j += 1;
+ }
+ return t;
+ }
+
+
+
+// Produce the next token. It looks for programming errors.
+
+ function advance(id, t) {
+ switch (token.id) {
+ case '(number)':
+ if (nexttoken.id === '.') {
+ warning(
+"A dot following a number can be confused with a decimal point.", token);
+ }
+ break;
+ case '-':
+ if (nexttoken.id === '-' || nexttoken.id === '--') {
+ warning("Confusing minusses.");
+ }
+ break;
+ case '+':
+ if (nexttoken.id === '+' || nexttoken.id === '++') {
+ warning("Confusing plusses.");
+ }
+ break;
+ }
+ if (token.type === '(string)' || token.identifier) {
+ anonname = token.value;
+ }
+
+ if (id && nexttoken.id !== id) {
+ if (t) {
+ if (nexttoken.id === '(end)') {
+ warning("Unmatched '{a}'.", t, t.id);
+ } else {
+ warning(
+"Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
+ nexttoken, id, t.id, t.line, nexttoken.value);
+ }
+ } else if (nexttoken.type !== '(identifier)' ||
+ nexttoken.value !== id) {
+ warning("Expected '{a}' and instead saw '{b}'.",
+ nexttoken, id, nexttoken.value);
+ }
+ }
+ prevtoken = token;
+ token = nexttoken;
+ for (;;) {
+ nexttoken = lookahead.shift() || lex.token();
+ if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
+ return;
+ }
+ if (nexttoken.type === 'special') {
+ doOption();
+ } else {
+ if (nexttoken.id !== '(endline)') {
+ break;
+ }
+ }
+ }
+ }
+
+
+// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
+// is looking for ad hoc lint patterns. We add to Pratt's model .fud, which is
+// like nud except that it is only used on the first token of a statement.
+// Having .fud makes it much easier to define JavaScript. I retained Pratt's
+// nomenclature.
+
+// .nud Null denotation
+// .fud First null denotation
+// .led Left denotation
+// lbp Left binding power
+// rbp Right binding power
+
+// They are key to the parsing method called Top Down Operator Precedence.
+
+ function parse(rbp, initial) {
+ var left;
+ if (nexttoken.id === '(end)') {
+ error("Unexpected early end of program.", token);
+ }
+ advance();
+ if (option.safe && typeof predefined[token.value] === 'boolean' &&
+ (nexttoken.id !== '(' && nexttoken.id !== '.')) {
+ warning('ADsafe violation.', token);
+ }
+ if (initial) {
+ anonname = 'anonymous';
+ funct['(verb)'] = token.value;
+ }
+ if (initial === true && token.fud) {
+ left = token.fud();
+ } else {
+ if (token.nud) {
+ left = token.nud();
+ } else {
+ if (nexttoken.type === '(number)' && token.id === '.') {
+ warning(
+"A leading decimal point can be confused with a dot: '.{a}'.",
+ token, nexttoken.value);
+ advance();
+ return token;
+ } else {
+ error("Expected an identifier and instead saw '{a}'.",
+ token, token.id);
+ }
+ }
+ while (rbp < nexttoken.lbp) {
+ advance();
+ if (token.led) {
+ left = token.led(left);
+ } else {
+ error("Expected an operator and instead saw '{a}'.",
+ token, token.id);
+ }
+ }
+ }
+ return left;
+ }
+
+
+// Functions for conformance of style.
+
+ function adjacent(left, right) {
+ left = left || token;
+ right = right || nexttoken;
+ if (option.white || xmode === 'styleproperty' || xmode === 'style') {
+ if (left.character !== right.from && left.line === right.line) {
+ warning("Unexpected space after '{a}'.", right, left.value);
+ }
+ }
+ }
+
+ function nospace(left, right) {
+ left = left || token;
+ right = right || nexttoken;
+ if (option.white && !left.comment) {
+ if (left.line === right.line) {
+ adjacent(left, right);
+ }
+ }
+ }
+
+
+ function nonadjacent(left, right) {
+ if (option.white) {
+ left = left || token;
+ right = right || nexttoken;
+ if (left.line === right.line && left.character === right.from) {
+ warning("Missing space after '{a}'.",
+ nexttoke
<TRUNCATED>
[15/27] [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/jslint/fulljslint.js
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/fulljslint.js b/AlluraTest/jslint/fulljslint.js
new file mode 100644
index 0000000..0bf59bb
--- /dev/null
+++ b/AlluraTest/jslint/fulljslint.js
@@ -0,0 +1,5688 @@
+// jslint.js
+// 2010-08-05
+
+/*
+Copyright (c) 2002 Douglas Crockford (www.JSLint.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+/*
+ JSLINT is a global function. It takes two parameters.
+
+ var myResult = JSLINT(source, option);
+
+ The first parameter is either a string or an array of strings. If it is a
+ string, it will be split on '\n' or '\r'. If it is an array of strings, it
+ is assumed that each string represents one line. The source can be a
+ JavaScript text, or HTML text, or a Konfabulator text.
+
+ The second parameter is an optional object of options which control the
+ operation of JSLINT. Most of the options are booleans: They are all are
+ optional and have a default value of false.
+
+ If it checks out, JSLINT returns true. Otherwise, it returns false.
+
+ If false, you can inspect JSLINT.errors to find out the problems.
+ JSLINT.errors is an array of objects containing these members:
+
+ {
+ line : The line (relative to 0) at which the lint was found
+ character : The character (relative to 0) at which the lint was found
+ reason : The problem
+ evidence : The text line in which the problem occurred
+ raw : The raw message before the details were inserted
+ a : The first detail
+ b : The second detail
+ c : The third detail
+ d : The fourth detail
+ }
+
+ If a fatal error was found, a null will be the last element of the
+ JSLINT.errors array.
+
+ You can request a Function Report, which shows all of the functions
+ and the parameters and vars that they use. This can be used to find
+ implied global variables and other problems. The report is in HTML and
+ can be inserted in an HTML <body>.
+
+ var myReport = JSLINT.report(limited);
+
+ If limited is true, then the report will be limited to only errors.
+
+ You can request a data structure which contains JSLint's results.
+
+ var myData = JSLINT.data();
+
+ It returns a structure with this form:
+
+ {
+ errors: [
+ {
+ line: NUMBER,
+ character: NUMBER,
+ reason: STRING,
+ evidence: STRING
+ }
+ ],
+ functions: [
+ name: STRING,
+ line: NUMBER,
+ last: NUMBER,
+ param: [
+ STRING
+ ],
+ closure: [
+ STRING
+ ],
+ var: [
+ STRING
+ ],
+ exception: [
+ STRING
+ ],
+ outer: [
+ STRING
+ ],
+ unused: [
+ STRING
+ ],
+ global: [
+ STRING
+ ],
+ label: [
+ STRING
+ ]
+ ],
+ globals: [
+ STRING
+ ],
+ member: {
+ STRING: NUMBER
+ },
+ unuseds: [
+ {
+ name: STRING,
+ line: NUMBER
+ }
+ ],
+ implieds: [
+ {
+ name: STRING,
+ line: NUMBER
+ }
+ ],
+ urls: [
+ STRING
+ ],
+ json: BOOLEAN
+ }
+
+ Empty arrays will not be included.
+
+*/
+
+/*jslint
+ evil: true, nomen: false, onevar: false, regexp: false, strict: true
+*/
+
+/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%",
+ "(begin)", "(breakage)", "(context)", "(error)", "(global)",
+ "(identifier)", "(last)", "(line)", "(loopage)", "(name)", "(onevar)",
+ "(params)", "(scope)", "(verb)", "*", "+", "++", "-", "--", "\/",
+ "<", "<=", "==", "===", ">", ">=", ADSAFE, ActiveXObject,
+ Array, Boolean, COM, CScript, Canvas, CustomAnimation, Date, Debug, E,
+ Enumerator, Error, EvalError, FadeAnimation, Flash, FormField, Frame,
+ Function, HotKey, Image, JSON, LN10, LN2, LOG10E, LOG2E, MAX_VALUE,
+ MIN_VALUE, Math, MenuItem, MoveAnimation, NEGATIVE_INFINITY, Number,
+ Object, Option, PI, POSITIVE_INFINITY, Point, RangeError, Rectangle,
+ ReferenceError, RegExp, ResizeAnimation, RotateAnimation, SQRT1_2,
+ SQRT2, ScrollBar, String, Style, SyntaxError, System, Text, TextArea,
+ Timer, TypeError, URIError, URL, VBArray, WScript, Web, Window, XMLDOM,
+ XMLHttpRequest, "\\", a, abbr, acronym, addEventListener, address,
+ adsafe, alert, aliceblue, animator, antiquewhite, appleScript, applet,
+ apply, approved, aqua, aquamarine, area, arguments, arity, article,
+ aside, audio, autocomplete, azure, b, background,
+ "background-attachment", "background-color", "background-image",
+ "background-position", "background-repeat", base, bdo, beep, beige, big,
+ bisque, bitwise, black, blanchedalmond, block, blockquote, blue,
+ blueviolet, blur, body, border, "border-bottom", "border-bottom-color",
+ "border-bottom-style", "border-bottom-width", "border-collapse",
+ "border-color", "border-left", "border-left-color", "border-left-style",
+ "border-left-width", "border-right", "border-right-color",
+ "border-right-style", "border-right-width", "border-spacing",
+ "border-style", "border-top", "border-top-color", "border-top-style",
+ "border-top-width", "border-width", bottom, br, brown, browser,
+ burlywood, button, bytesToUIString, c, cadetblue, call, callee, caller,
+ canvas, cap, caption, "caption-side", cases, center, charAt, charCodeAt,
+ character, chartreuse, chocolate, chooseColor, chooseFile, chooseFolder,
+ cite, clear, clearInterval, clearTimeout, clip, close, closeWidget,
+ closed, closure, cm, code, col, colgroup, color, command, comment,
+ condition, confirm, console, constructor, content, convertPathToHFS,
+ convertPathToPlatform, coral, cornflowerblue, cornsilk,
+ "counter-increment", "counter-reset", create, crimson, css, cursor,
+ cyan, d, darkblue, darkcyan, darkgoldenrod, darkgray, darkgreen,
+ darkkhaki, darkmagenta, darkolivegreen, darkorange, darkorchid, darkred,
+ darksalmon, darkseagreen, darkslateblue, darkslategray, darkturquoise,
+ darkviolet, data, datalist, dd, debug, decodeURI, decodeURIComponent,
+ deeppink, deepskyblue, defaultStatus, defineClass, del, deserialize,
+ details, devel, dfn, dialog, dimension, dimgray, dir, direction,
+ display, div, dl, document, dodgerblue, dt, edition, else, em, embed,
+ empty, "empty-cells", encodeURI, encodeURIComponent, entityify, eqeqeq,
+ errors, es5, escape, eval, event, evidence, evil, ex, exception, exec, exps,
+ fieldset, figure, filesystem, firebrick, first, float, floor,
+ floralwhite, focus, focusWidget, font, "font-face", "font-family",
+ "font-size", "font-size-adjust", "font-stretch", "font-style",
+ "font-variant", "font-weight", footer, forestgreen, forin, form,
+ fragment, frame, frames, frameset, from, fromCharCode, fuchsia, fud,
+ funct, function, functions, g, gainsboro, gc, getComputedStyle,
+ ghostwhite, global, globals, gold, goldenrod, gray, green, greenyellow,
+ h1, h2, h3, h4, h5, h6, hasOwnProperty, head, header, height, help,
+ hgroup, history, honeydew, hotpink, hr, 'hta:application', html,
+ i, iTunes, id, identifier,
+ iframe, img, immed, implieds, in, include, indent, indexOf, indianred,
+ indigo, init, input, ins, isAlpha, isApplicationRunning, isDigit,
+ isFinite, isNaN, ivory, join, jslint, json, kbd, keygen, khaki,
+ konfabulatorVersion, label, labelled, lang, last, lavender,
+ lavenderblush, lawngreen, laxbreak, lbp, led, left, legend,
+ lemonchiffon, length, "letter-spacing", li, lib, lightblue, lightcoral,
+ lightcyan, lightgoldenrodyellow, lightgreen, lightpink, lightsalmon,
+ lightseagreen, lightskyblue, lightslategray, lightsteelblue,
+ lightyellow, lime, limegreen, line, "line-height", linen, link,
+ "list-style", "list-style-image", "list-style-position",
+ "list-style-type", load, loadClass, location, log, m, magenta, map,
+ margin, "margin-bottom", "margin-left", "margin-right", "margin-top",
+ mark, "marker-offset", maroon, match, "max-height", "max-width", maxerr,
+ maxlen, md5, media, mediumaquamarine, mediumblue, mediumorchid,
+ mediumpurple, mediumseagreen, mediumslateblue, mediumspringgreen,
+ mediumturquoise, mediumvioletred, member, menu, message, meta, meter,
+ midnightblue, "min-height", "min-width", mintcream, mistyrose, mm,
+ moccasin, moveBy, moveTo, name, nav, navajowhite, navigator, navy, new,
+ newcap, noframes, nomen, noscript, nud, object, ol, oldlace, olive,
+ olivedrab, on, onbeforeunload, onblur, onerror, onevar, onfocus, onload,
+ onresize, onunload, opacity, open, openURL, opener, opera, optgroup,
+ option, orange, orangered, orchid, outer, outline, "outline-color",
+ "outline-style", "outline-width", output, overflow, "overflow-x",
+ "overflow-y", p, padding, "padding-bottom", "padding-left",
+ "padding-right", "padding-top", page, "page-break-after",
+ "page-break-before", palegoldenrod, palegreen, paleturquoise,
+ palevioletred, papayawhip, param, parent, parseFloat, parseInt,
+ passfail, pc, peachpuff, peru, pink, play, plum, plusplus, pop,
+ popupMenu, position, powderblue, pre, predef, preferenceGroups,
+ preferences, print, progress, prompt, prototype, pt, purple, push, px,
+ q, quit, quotes, random, range, raw, reach, readFile, readUrl, reason,
+ red, regexp, reloadWidget, removeEventListener, replace, report,
+ reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, rhino, right,
+ rosybrown, royalblue, rp, rt, ruby, runCommand, runCommandInBg,
+ saddlebrown, safe, salmon, samp, sandybrown, saveAs, savePreferences,
+ screen, script, scroll, scrollBy, scrollTo, seagreen, seal, search,
+ seashell, section, select, serialize, setInterval, setTimeout, shift,
+ showWidgetPreferences, sienna, silver, skyblue, slateblue, slategray,
+ sleep, slice, small, snow, sort, source, span, spawn, speak, split,
+ springgreen, src, stack, status, steelblue, strict, strong, style,
+ styleproperty, sub, substr, sup, supplant, suppressUpdates, sync,
+ system, table, "table-layout", tan, tbody, td, teal, tellWidget, test,
+ "text-align", "text-decoration", "text-indent", "text-shadow",
+ "text-transform", textarea, tfoot, th, thead, thistle, time, title,
+ toLowerCase, toString, toUpperCase, toint32, token, tomato, top, tr, tt,
+ turquoise, type, u, ul, undef, unescape, "unicode-bidi", unused,
+ unwatch, updateNow, urls, value, valueOf, var, version,
+ "vertical-align", video, violet, visibility, watch, wheat, white,
+ "white-space", whitesmoke, widget, width, windows, "word-spacing",
+ "word-wrap", yahooCheckLogin, yahooLogin, yahooLogout, yellow,
+ yellowgreen, "z-index"
+*/
+
+// We build the application inside a function so that we produce only a single
+// global variable. The function will be invoked, its return value is the JSLINT
+// application itself.
+
+"use strict";
+
+var JSLINT = (function () {
+ var adsafe_id, // The widget's ADsafe id.
+ adsafe_may, // The widget may load approved scripts.
+ adsafe_went, // ADSAFE.go has been called.
+ anonname, // The guessed name for anonymous functions.
+ approved, // ADsafe approved urls.
+
+ atrule = {
+ media : true,
+ 'font-face': true,
+ page : true
+ },
+
+// These are operators that should not be used with the ! operator.
+
+ bang = {
+ '<': true,
+ '<=': true,
+ '==': true,
+ '===': true,
+ '!==': true,
+ '!=': true,
+ '>': true,
+ '>=': true,
+ '+': true,
+ '-': true,
+ '*': true,
+ '/': true,
+ '%': true
+ },
+
+// These are members that should not be permitted in the safe subset.
+
+ banned = { // the member names that ADsafe prohibits.
+ 'arguments' : true,
+ callee : true,
+ caller : true,
+ constructor : true,
+ 'eval' : true,
+ prototype : true,
+ stack : true,
+ unwatch : true,
+ valueOf : true,
+ watch : true
+ },
+
+
+// These are the JSLint boolean options.
+
+ boolOptions = {
+ adsafe : true, // if ADsafe should be enforced
+ bitwise : true, // if bitwise operators should not be allowed
+ browser : true, // if the standard browser globals should be predefined
+ cap : true, // if upper case HTML should be allowed
+ css : true, // if CSS workarounds should be tolerated
+ debug : true, // if debugger statements should be allowed
+ devel : true, // if logging should be allowed (console, alert, etc.)
+ eqeqeq : true, // if === should be required
+ es5 : true, // if ES5 syntax should be allowed
+ evil : true, // if eval should be allowed
+ forin : true, // if for in statements must filter
+ fragment : true, // if HTML fragments should be allowed
+ immed : true, // if immediate invocations must be wrapped in parens
+ laxbreak : true, // if line breaks should not be checked
+ newcap : true, // if constructor names must be capitalized
+ nomen : true, // if names should be checked
+ on : true, // if HTML event handlers should be allowed
+ onevar : true, // if only one var statement per function should be allowed
+ passfail : true, // if the scan should stop on first error
+ plusplus : true, // if increment/decrement should not be allowed
+ regexp : true, // if the . should not be allowed in regexp literals
+ rhino : true, // if the Rhino environment globals should be predefined
+ undef : true, // if variables should be declared before used
+ safe : true, // if use of some browser features should be restricted
+ windows : true, // if MS Windows-specigic globals should be predefined
+ strict : true, // require the "use strict"; pragma
+ sub : true, // if all forms of subscript notation are tolerated
+ white : true, // if strict whitespace rules apply
+ widget : true // if the Yahoo Widgets globals should be predefined
+ },
+
+// browser contains a set of global names which are commonly provided by a
+// web browser environment.
+
+ browser = {
+ addEventListener: false,
+ blur : false,
+ clearInterval : false,
+ clearTimeout : false,
+ close : false,
+ closed : false,
+ defaultStatus : false,
+ document : false,
+ event : false,
+ focus : false,
+ frames : false,
+ getComputedStyle: false,
+ history : false,
+ Image : false,
+ length : false,
+ location : false,
+ moveBy : false,
+ moveTo : false,
+ name : false,
+ navigator : false,
+ onbeforeunload : true,
+ onblur : true,
+ onerror : true,
+ onfocus : true,
+ onload : true,
+ onresize : true,
+ onunload : true,
+ open : false,
+ opener : false,
+ Option : false,
+ parent : false,
+ print : false,
+ removeEventListener: false,
+ resizeBy : false,
+ resizeTo : false,
+ screen : false,
+ scroll : false,
+ scrollBy : false,
+ scrollTo : false,
+ setInterval : false,
+ setTimeout : false,
+ status : false,
+ top : false,
+ XMLHttpRequest : false
+ },
+
+ cssAttributeData,
+ cssAny,
+
+ cssColorData = {
+ "aliceblue" : true,
+ "antiquewhite" : true,
+ "aqua" : true,
+ "aquamarine" : true,
+ "azure" : true,
+ "beige" : true,
+ "bisque" : true,
+ "black" : true,
+ "blanchedalmond" : true,
+ "blue" : true,
+ "blueviolet" : true,
+ "brown" : true,
+ "burlywood" : true,
+ "cadetblue" : true,
+ "chartreuse" : true,
+ "chocolate" : true,
+ "coral" : true,
+ "cornflowerblue" : true,
+ "cornsilk" : true,
+ "crimson" : true,
+ "cyan" : true,
+ "darkblue" : true,
+ "darkcyan" : true,
+ "darkgoldenrod" : true,
+ "darkgray" : true,
+ "darkgreen" : true,
+ "darkkhaki" : true,
+ "darkmagenta" : true,
+ "darkolivegreen" : true,
+ "darkorange" : true,
+ "darkorchid" : true,
+ "darkred" : true,
+ "darksalmon" : true,
+ "darkseagreen" : true,
+ "darkslateblue" : true,
+ "darkslategray" : true,
+ "darkturquoise" : true,
+ "darkviolet" : true,
+ "deeppink" : true,
+ "deepskyblue" : true,
+ "dimgray" : true,
+ "dodgerblue" : true,
+ "firebrick" : true,
+ "floralwhite" : true,
+ "forestgreen" : true,
+ "fuchsia" : true,
+ "gainsboro" : true,
+ "ghostwhite" : true,
+ "gold" : true,
+ "goldenrod" : true,
+ "gray" : true,
+ "green" : true,
+ "greenyellow" : true,
+ "honeydew" : true,
+ "hotpink" : true,
+ "indianred" : true,
+ "indigo" : true,
+ "ivory" : true,
+ "khaki" : true,
+ "lavender" : true,
+ "lavenderblush" : true,
+ "lawngreen" : true,
+ "lemonchiffon" : true,
+ "lightblue" : true,
+ "lightcoral" : true,
+ "lightcyan" : true,
+ "lightgoldenrodyellow" : true,
+ "lightgreen" : true,
+ "lightpink" : true,
+ "lightsalmon" : true,
+ "lightseagreen" : true,
+ "lightskyblue" : true,
+ "lightslategray" : true,
+ "lightsteelblue" : true,
+ "lightyellow" : true,
+ "lime" : true,
+ "limegreen" : true,
+ "linen" : true,
+ "magenta" : true,
+ "maroon" : true,
+ "mediumaquamarine" : true,
+ "mediumblue" : true,
+ "mediumorchid" : true,
+ "mediumpurple" : true,
+ "mediumseagreen" : true,
+ "mediumslateblue" : true,
+ "mediumspringgreen" : true,
+ "mediumturquoise" : true,
+ "mediumvioletred" : true,
+ "midnightblue" : true,
+ "mintcream" : true,
+ "mistyrose" : true,
+ "moccasin" : true,
+ "navajowhite" : true,
+ "navy" : true,
+ "oldlace" : true,
+ "olive" : true,
+ "olivedrab" : true,
+ "orange" : true,
+ "orangered" : true,
+ "orchid" : true,
+ "palegoldenrod" : true,
+ "palegreen" : true,
+ "paleturquoise" : true,
+ "palevioletred" : true,
+ "papayawhip" : true,
+ "peachpuff" : true,
+ "peru" : true,
+ "pink" : true,
+ "plum" : true,
+ "powderblue" : true,
+ "purple" : true,
+ "red" : true,
+ "rosybrown" : true,
+ "royalblue" : true,
+ "saddlebrown" : true,
+ "salmon" : true,
+ "sandybrown" : true,
+ "seagreen" : true,
+ "seashell" : true,
+ "sienna" : true,
+ "silver" : true,
+ "skyblue" : true,
+ "slateblue" : true,
+ "slategray" : true,
+ "snow" : true,
+ "springgreen" : true,
+ "steelblue" : true,
+ "tan" : true,
+ "teal" : true,
+ "thistle" : true,
+ "tomato" : true,
+ "turquoise" : true,
+ "violet" : true,
+ "wheat" : true,
+ "white" : true,
+ "whitesmoke" : true,
+ "yellow" : true,
+ "yellowgreen" : true
+ },
+
+ cssBorderStyle,
+ cssBreak,
+
+ cssLengthData = {
+ '%': true,
+ 'cm': true,
+ 'em': true,
+ 'ex': true,
+ 'in': true,
+ 'mm': true,
+ 'pc': true,
+ 'pt': true,
+ 'px': true
+ },
+
+ cssOverflow,
+
+ devel = {
+ alert : false,
+ confirm : false,
+ console : false,
+ Debug : false,
+ opera : false,
+ prompt : false
+ },
+
+ escapes = {
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '/' : '\\/',
+ '\\': '\\\\'
+ },
+
+ funct, // The current function
+
+ functionicity = [
+ 'closure', 'exception', 'global', 'label',
+ 'outer', 'unused', 'var'
+ ],
+
+ functions, // All of the functions
+
+ global, // The global scope
+ htmltag = {
+ a: {},
+ abbr: {},
+ acronym: {},
+ address: {},
+ applet: {},
+ area: {empty: true, parent: ' map '},
+ article: {},
+ aside: {},
+ audio: {},
+ b: {},
+ base: {empty: true, parent: ' head '},
+ bdo: {},
+ big: {},
+ blockquote: {},
+ body: {parent: ' html noframes '},
+ br: {empty: true},
+ button: {},
+ canvas: {parent: ' body p div th td '},
+ caption: {parent: ' table '},
+ center: {},
+ cite: {},
+ code: {},
+ col: {empty: true, parent: ' table colgroup '},
+ colgroup: {parent: ' table '},
+ command: {parent: ' menu '},
+ datalist: {},
+ dd: {parent: ' dl '},
+ del: {},
+ details: {},
+ dialog: {},
+ dfn: {},
+ dir: {},
+ div: {},
+ dl: {},
+ dt: {parent: ' dl '},
+ em: {},
+ embed: {},
+ fieldset: {},
+ figure: {},
+ font: {},
+ footer: {},
+ form: {},
+ frame: {empty: true, parent: ' frameset '},
+ frameset: {parent: ' html frameset '},
+ h1: {},
+ h2: {},
+ h3: {},
+ h4: {},
+ h5: {},
+ h6: {},
+ head: {parent: ' html '},
+ header: {},
+ hgroup: {},
+ hr: {empty: true},
+ 'hta:application':
+ {empty: true, parent: ' head '},
+ html: {parent: '*'},
+ i: {},
+ iframe: {},
+ img: {empty: true},
+ input: {empty: true},
+ ins: {},
+ kbd: {},
+ keygen: {},
+ label: {},
+ legend: {parent: ' details fieldset figure '},
+ li: {parent: ' dir menu ol ul '},
+ link: {empty: true, parent: ' head '},
+ map: {},
+ mark: {},
+ menu: {},
+ meta: {empty: true, parent: ' head noframes noscript '},
+ meter: {},
+ nav: {},
+ noframes: {parent: ' html body '},
+ noscript: {},
+ object: {},
+ ol: {},
+ optgroup: {parent: ' select '},
+ option: {parent: ' optgroup select '},
+ output: {},
+ p: {},
+ param: {parent: ' applet object '},
+ pre: {},
+ progress: {},
+ q: {},
+ rp: {},
+ rt: {},
+ ruby: {},
+ s: {},
+ samp: {},
+ script: {empty: true, parent: ' body div frame head iframe p pre span '},
+ section: {},
+ select: {},
+ small: {},
+ span: {},
+ source: {},
+ strong: {},
+ style: {parent: ' head ', empty: true},
+ sub: {},
+ sup: {},
+ table: {},
+ tbody: {parent: ' table '},
+ td: {parent: ' tr '},
+ textarea: {},
+ tfoot: {parent: ' table '},
+ th: {parent: ' tr '},
+ thead: {parent: ' table '},
+ time: {},
+ title: {parent: ' head '},
+ tr: {parent: ' table tbody thead tfoot '},
+ tt: {},
+ u: {},
+ ul: {},
+ 'var': {},
+ video: {}
+ },
+
+ ids, // HTML ids
+ implied, // Implied globals
+ inblock,
+ indent,
+ jsonmode,
+ lines,
+ lookahead,
+ member,
+ membersOnly,
+ nexttoken,
+ noreach,
+ option,
+ predefined, // Global variables defined by option
+ prereg,
+ prevtoken,
+
+ rhino = {
+ defineClass : false,
+ deserialize : false,
+ gc : false,
+ help : false,
+ load : false,
+ loadClass : false,
+ print : false,
+ quit : false,
+ readFile : false,
+ readUrl : false,
+ runCommand : false,
+ seal : false,
+ serialize : false,
+ spawn : false,
+ sync : false,
+ toint32 : false,
+ version : false
+ },
+
+ scope, // The current scope
+
+ windows = {
+ ActiveXObject: false,
+ CScript : false,
+ Debug : false,
+ Enumerator : false,
+ System : false,
+ VBArray : false,
+ WScript : false
+ },
+
+ src,
+ stack,
+
+// standard contains the global names that are provided by the
+// ECMAScript standard.
+
+ standard = {
+ 'void' : false,
+ Array : false,
+ Boolean : false,
+ Date : false,
+ decodeURI : false,
+ decodeURIComponent : false,
+ encodeURI : false,
+ encodeURIComponent : false,
+ Error : false,
+ 'eval' : false,
+ EvalError : false,
+ Function : false,
+ hasOwnProperty : false,
+ isFinite : false,
+ isNaN : false,
+ JSON : false,
+ Math : false,
+ Number : false,
+ Object : false,
+ parseInt : false,
+ parseFloat : false,
+ RangeError : false,
+ ReferenceError : false,
+ RegExp : false,
+ String : false,
+ SyntaxError : false,
+ TypeError : false,
+ URIError : false
+ },
+
+ standard_member = {
+ E : true,
+ LN2 : true,
+ LN10 : true,
+ LOG2E : true,
+ LOG10E : true,
+ PI : true,
+ SQRT1_2 : true,
+ SQRT2 : true,
+ MAX_VALUE : true,
+ MIN_VALUE : true,
+ NEGATIVE_INFINITY : true,
+ POSITIVE_INFINITY : true
+ },
+
+ strict_mode,
+ syntax = {},
+ tab,
+ token,
+ urls,
+ warnings,
+
+// widget contains the global names which are provided to a Yahoo
+// (fna Konfabulator) widget.
+
+ widget = {
+ alert : true,
+ animator : true,
+ appleScript : true,
+ beep : true,
+ bytesToUIString : true,
+ Canvas : true,
+ chooseColor : true,
+ chooseFile : true,
+ chooseFolder : true,
+ closeWidget : true,
+ COM : true,
+ convertPathToHFS : true,
+ convertPathToPlatform : true,
+ CustomAnimation : true,
+ escape : true,
+ FadeAnimation : true,
+ filesystem : true,
+ Flash : true,
+ focusWidget : true,
+ form : true,
+ FormField : true,
+ Frame : true,
+ HotKey : true,
+ Image : true,
+ include : true,
+ isApplicationRunning : true,
+ iTunes : true,
+ konfabulatorVersion : true,
+ log : true,
+ md5 : true,
+ MenuItem : true,
+ MoveAnimation : true,
+ openURL : true,
+ play : true,
+ Point : true,
+ popupMenu : true,
+ preferenceGroups : true,
+ preferences : true,
+ print : true,
+ prompt : true,
+ random : true,
+ Rectangle : true,
+ reloadWidget : true,
+ ResizeAnimation : true,
+ resolvePath : true,
+ resumeUpdates : true,
+ RotateAnimation : true,
+ runCommand : true,
+ runCommandInBg : true,
+ saveAs : true,
+ savePreferences : true,
+ screen : true,
+ ScrollBar : true,
+ showWidgetPreferences : true,
+ sleep : true,
+ speak : true,
+ Style : true,
+ suppressUpdates : true,
+ system : true,
+ tellWidget : true,
+ Text : true,
+ TextArea : true,
+ Timer : true,
+ unescape : true,
+ updateNow : true,
+ URL : true,
+ Web : true,
+ widget : true,
+ Window : true,
+ XMLDOM : true,
+ XMLHttpRequest : true,
+ yahooCheckLogin : true,
+ yahooLogin : true,
+ yahooLogout : true
+ },
+
+// xmode is used to adapt to the exceptions in html parsing.
+// It can have these states:
+// false .js script file
+// html
+// outer
+// script
+// style
+// scriptstring
+// styleproperty
+
+ xmode,
+ xquote,
+
+// unsafe comment or string
+ ax = /@cc|<\/?|script|\]*s\]|<\s*!|</i,
+// unsafe characters that are silently deleted by one or more browsers
+// Whitelist Replacement Char, 0xfffd
+ cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\ufffc\ufffe-\uffff]/,
+// token
+ tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/,
+// html token
+ hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
+// characters in strings that need escapement
+ nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
+ nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+// outer html token
+ ox = /[>&]|<[\/!]?|--/,
+// star slash
+ lx = /\*\/|\/\*/,
+// identifier
+ ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
+// javascript url
+ jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
+// url badness
+ ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto/i,
+// style
+ sx = /^\s*([{:#%.=,>+\[\]@()"';]|\*=?|\$=|\|=|\^=|~=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
+ ssx = /^\s*(\.?\d+(?:\.\d+)?|[@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|<\/)/,
+// attributes characters
+ //qx = /[^a-zA-Z0-9+\-_\/ ]/,
+ qx = /[^a-zA-Z0-9+\-_\/ .#]/, // We want dots in names, period; and hashes for templating
+// query characters for ids
+ //dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
+ // allow . and /
+ dx = /[\[\]\\"'*<>&:(){}+=#]/,
+
+ rx = {
+ outer: hx,
+ html: hx,
+ style: sx,
+ styleproperty: ssx
+ };
+
+ function F() {}
+
+ if (typeof Object.create !== 'function') {
+ Object.create = function (o) {
+ F.prototype = o;
+ return new F();
+ };
+ }
+
+
+ function is_own(object, name) {
+ return Object.prototype.hasOwnProperty.call(object, name);
+ }
+
+
+ function combine(t, o) {
+ var n;
+ for (n in o) {
+ if (is_own(o, n)) {
+ t[n] = o[n];
+ }
+ }
+ }
+
+ String.prototype.entityify = function () {
+ return this.
+ replace(/&/g, '&').
+ replace(/</g, '<').
+ replace(/>/g, '>');
+ };
+
+ String.prototype.isAlpha = function () {
+ return (this >= 'a' && this <= 'z\uffff') ||
+ (this >= 'A' && this <= 'Z\uffff');
+ };
+
+
+ String.prototype.isDigit = function () {
+ return (this >= '0' && this <= '9');
+ };
+
+
+ String.prototype.supplant = function (o) {
+ return this.replace(/\{([^{}]*)\}/g, function (a, b) {
+ var r = o[b];
+ return typeof r === 'string' || typeof r === 'number' ? r : a;
+ });
+ };
+
+ String.prototype.name = function () {
+
+// If the string looks like an identifier, then we can return it as is.
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can simply slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe
+// sequences.
+
+ if (ix.test(this)) {
+ return this;
+ }
+ if (nx.test(this)) {
+ return '"' + this.replace(nxg, function (a) {
+ var c = escapes[a];
+ if (c) {
+ return c;
+ }
+ return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
+ }) + '"';
+ }
+ return '"' + this + '"';
+ };
+
+
+ function assume() {
+ if (!option.safe) {
+ if (option.rhino) {
+ combine(predefined, rhino);
+ }
+ if (option.devel) {
+ combine(predefined, devel);
+ }
+ if (option.browser) {
+ combine(predefined, browser);
+ }
+ if (option.windows) {
+ combine(predefined, windows);
+ }
+ if (option.widget) {
+ combine(predefined, widget);
+ }
+ }
+ }
+
+
+// Produce an error warning.
+
+ function quit(m, l, ch) {
+ throw {
+ name: 'JSLintError',
+ line: l,
+ character: ch,
+ message: m + " (" + Math.floor((l / lines.length) * 100) +
+ "% scanned)."
+ };
+ }
+
+ function warning(m, t, a, b, c, d) {
+ var ch, l, w;
+ t = t || nexttoken;
+ if (t.id === '(end)') { // `~
+ t = token;
+ }
+ l = t.line || 0;
+ ch = t.from || 0;
+ w = {
+ id: '(error)',
+ raw: m,
+ evidence: lines[l - 1] || '',
+ line: l,
+ character: ch,
+ a: a,
+ b: b,
+ c: c,
+ d: d
+ };
+ w.reason = m.supplant(w);
+ JSLINT.errors.push(w);
+ if (option.passfail) {
+ quit('Stopping. ', l, ch);
+ }
+ warnings += 1;
+ if (warnings >= option.maxerr) {
+ quit("Too many errors.", l, ch);
+ }
+ return w;
+ }
+
+ function warningAt(m, l, ch, a, b, c, d) {
+ return warning(m, {
+ line: l,
+ from: ch
+ }, a, b, c, d);
+ }
+
+ function error(m, t, a, b, c, d) {
+ var w = warning(m, t, a, b, c, d);
+ quit("Stopping, unable to continue.", w.line, w.character);
+ }
+
+ function errorAt(m, l, ch, a, b, c, d) {
+ return error(m, {
+ line: l,
+ from: ch
+ }, a, b, c, d);
+ }
+
+
+
+// lexical analysis
+
+ var lex = (function lex() {
+ var character, from, line, s;
+
+// Private lex methods
+
+ function nextLine() {
+ var at;
+ if (line >= lines.length) {
+ return false;
+ }
+ character = 1;
+ s = lines[line];
+ line += 1;
+ at = s.search(/ \t/);
+ if (at >= 0) {
+ warningAt("Mixed spaces and tabs.", line, at + 1);
+ }
+ s = s.replace(/\t/g, tab);
+ at = s.search(cx);
+ if (at >= 0) {
+ warningAt("Unsafe character.", line, at);
+ }
+ if (option.maxlen && option.maxlen < s.length) {
+ warningAt("Line too long.", line, s.length);
+ }
+ return true;
+ }
+
+// Produce a token object. The token inherits from a syntax symbol.
+
+ function it(type, value) {
+ var i, t;
+ if (type === '(color)') {
+ t = {type: type};
+ } else if (type === '(punctuator)' ||
+ (type === '(identifier)' && is_own(syntax, value))) {
+ t = syntax[value] || syntax['(error)'];
+ } else {
+ t = syntax[type];
+ }
+ t = Object.create(t);
+ if (type === '(string)' || type === '(range)') {
+ if (jx.test(value)) {
+ warningAt("Script URL.", line, from);
+ }
+ }
+ if (type === '(identifier)') {
+ t.identifier = true;
+ if (value === '__iterator__' || value === '__proto__') {
+ errorAt("Reserved name '{a}'.",
+ line, from, value);
+ } else if (option.nomen &&
+ (value.charAt(0) === '_' ||
+ value.charAt(value.length - 1) === '_')) {
+ warningAt("Unexpected {a} in '{b}'.", line, from,
+ "dangling '_'", value);
+ }
+ }
+ t.value = value;
+ t.line = line;
+ t.character = character;
+ t.from = from;
+ i = t.id;
+ if (i !== '(endline)') {
+ prereg = i &&
+ (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
+ i === 'return');
+ }
+ return t;
+ }
+
+// Public lex methods
+
+ return {
+ init: function (source) {
+ if (typeof source === 'string') {
+ lines = source.
+ replace(/\r\n/g, '\n').
+ replace(/\r/g, '\n').
+ split('\n');
+ } else {
+ lines = source;
+ }
+ line = 0;
+ nextLine();
+ from = 1;
+ },
+
+ range: function (begin, end) {
+ var c, value = '';
+ from = character;
+ if (s.charAt(0) !== begin) {
+ errorAt("Expected '{a}' and instead saw '{b}'.",
+ line, character, begin, s.charAt(0));
+ }
+ for (;;) {
+ s = s.slice(1);
+ character += 1;
+ c = s.charAt(0);
+ switch (c) {
+ case '':
+ errorAt("Missing '{a}'.", line, character, c);
+ break;
+ case end:
+ s = s.slice(1);
+ character += 1;
+ return it('(range)', value);
+ case xquote:
+ case '\\':
+ warningAt("Unexpected '{a}'.", line, character, c);
+ }
+ value += c;
+ }
+
+ },
+
+// skip all content up to marker
+
+ skip_till: function (end) {
+ for (;;) {
+ i = s.indexOf(end);
+ if (i >= 0) {
+ break;
+ }
+ if (!nextLine()) {
+ errorAt("Unclosed {a} block.", line, character, end);
+ }
+ }
+ character += i;
+ s = s.substr(i);
+ },
+
+// token -- this is called by advance to get the next token.
+
+ token: function () {
+ var b, c, captures, d, depth, high, i, l, low, q, t;
+
+ function match(x) {
+ var r = x.exec(s), r1;
+ if (r) {
+ l = r[0].length;
+ r1 = r[1];
+ c = r1.charAt(0);
+ s = s.substr(l);
+ from = character + l - r1.length;
+ character += l;
+ return r1;
+ }
+ }
+
+ function string(x) {
+ var c, j, r = '';
+
+ if (jsonmode && x !== '"') {
+ warningAt("Strings must use doublequote.",
+ line, character);
+ }
+
+ if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
+ return it('(punctuator)', x);
+ }
+
+ function esc(n) {
+ var i = parseInt(s.substr(j + 1, n), 16);
+ j += n;
+ if (i >= 32 && i <= 126 &&
+ i !== 34 && i !== 92 && i !== 39) {
+ warningAt("Unnecessary escapement.", line, character);
+ }
+ character += n;
+ c = String.fromCharCode(i);
+ }
+ j = 0;
+ for (;;) {
+ while (j >= s.length) {
+ j = 0;
+ if (xmode !== 'html' || !nextLine()) {
+ errorAt("Unclosed string.", line, from);
+ }
+ }
+ c = s.charAt(j);
+ if (c === x) {
+ character += 1;
+ s = s.substr(j + 1);
+ return it('(string)', r, x);
+ }
+ if (c < ' ') {
+ if (c === '\n' || c === '\r') {
+ break;
+ }
+ warningAt("Control character in string: {a}.",
+ line, character + j, s.slice(0, j));
+ } else if (c === xquote) {
+ warningAt("Bad HTML string", line, character + j);
+ } else if (c === '<') {
+ if (option.safe && xmode === 'html') {
+ warningAt("ADsafe string violation.",
+ line, character + j);
+ } else if (s.charAt(j + 1) === '/' && (xmode || option.safe) && s.substr(j + 2, 6) === 'script') {
+ warningAt("Expected '<\\/' and instead saw '</'.", line, character);
+ } else if (s.charAt(j + 1) === '!' && (xmode || option.safe)) {
+ warningAt("Unexpected '<!' in a string.", line, character);
+ }
+ } else if (c === '\\') {
+ if (xmode === 'html') {
+ if (option.safe) {
+ warningAt("ADsafe string violation.",
+ line, character + j);
+ }
+ } else if (xmode === 'styleproperty') {
+ j += 1;
+ character += 1;
+ c = s.charAt(j);
+ if (c !== x) {
+ warningAt("Escapement in style string.",
+ line, character + j);
+ }
+ } else {
+ j += 1;
+ character += 1;
+ c = s.charAt(j);
+ switch (c) {
+ case xquote:
+ warningAt("Bad HTML string", line,
+ character + j);
+ break;
+ case '\\':
+ case '\'':
+ case '"':
+ case '/':
+ break;
+ case 'b':
+ c = '\b';
+ break;
+ case 'f':
+ c = '\f';
+ break;
+ case 'n':
+ c = '\n';
+ break;
+ case 'r':
+ c = '\r';
+ break;
+ case 't':
+ c = '\t';
+ break;
+ case 'u':
+ esc(4);
+ break;
+ case 'v':
+ c = '\v';
+ break;
+ case 'x':
+ if (jsonmode) {
+ warningAt("Avoid \\x-.", line, character);
+ }
+ esc(2);
+ break;
+ default:
+ warningAt("Bad escapement.", line, character);
+ }
+ }
+ }
+ r += c;
+ character += 1;
+ j += 1;
+ }
+ }
+
+ for (;;) {
+ if (!s) {
+ return it(nextLine() ? '(endline)' : '(end)', '');
+ }
+ while (xmode === 'outer') {
+ i = s.search(ox);
+ if (i === 0) {
+ break;
+ } else if (i > 0) {
+ character += 1;
+ s = s.slice(i);
+ break;
+ } else {
+ if (!nextLine()) {
+ return it('(end)', '');
+ }
+ }
+ }
+// t = match(rx[xmode] || tx);
+// if (!t) {
+// if (xmode === 'html') {
+// return it('(error)', s.charAt(0));
+// } else {
+// t = '';
+// c = '';
+// while (s && s < '!') {
+// s = s.substr(1);
+// }
+// if (s) {
+// errorAt("Unexpected '{a}'.",
+// line, character, s.substr(0, 1));
+// }
+// }
+ t = match(rx[xmode] || tx);
+ if (!t) {
+ t = '';
+ c = '';
+ while (s && s < '!') {
+ s = s.substr(1);
+ }
+ if (s) {
+ if (xmode === 'html') {
+ return it('(error)', s.charAt(0));
+ } else {
+ errorAt("Unexpected '{a}'.",
+ line, character, s.substr(0, 1));
+ }
+ }
+ } else {
+
+ // identifier
+
+ if (c.isAlpha() || c === '_' || c === '$') {
+ return it('(identifier)', t);
+ }
+
+ // number
+
+ if (c.isDigit() || (c === '.' && t.substr(1, 1).isDigit())) {
+ if (c === '.') {
+ t = '0' + t;
+ c = '0';
+ }
+
+ if (xmode !== 'style' && !isFinite(Number(t))) {
+ warningAt("Bad number '{a}'.",
+ line, character, t);
+ }
+ if (xmode !== 'style' &&
+ xmode !== 'styleproperty' &&
+ s.substr(0, 1).isAlpha()) {
+ warningAt("Missing space after '{a}'.",
+ line, character, t);
+ }
+ if (c === '0') {
+ d = t.substr(1, 1);
+ if (d.isDigit()) {
+ if (token.id !== '.' && xmode !== 'styleproperty') {
+ warningAt("Don't use extra leading zeros '{a}'.",
+ line, character, t);
+ }
+ } else if (jsonmode && (d === 'x' || d === 'X')) {
+ warningAt("Avoid 0x-. '{a}'.",
+ line, character, t);
+ }
+ }
+ if (t.substr(t.length - 1) === '.') {
+ warningAt(
+ "A trailing decimal point can be confused with a dot '{a}'.",
+ line, character, t);
+ }
+ return it('(number)', t);
+ }
+ switch (t) {
+
+ // string
+
+ case '"':
+ case "'":
+ return string(t);
+
+ // // comment
+
+ case '//':
+ if (src || (xmode && xmode !== 'script')) {
+ warningAt("Unexpected comment.", line, character);
+ } else if (xmode === 'script' && /<\s*\//i.test(s)) {
+ warningAt("Unexpected <\/ in comment.", line, character);
+ } else if ((option.safe || xmode === 'script') && ax.test(s)) {
+ warningAt("Dangerous comment.", line, character);
+ }
+ s = '';
+ token.comment = true;
+ break;
+
+ // /* comment
+
+ case '/*':
+ if (src || (xmode && xmode !== 'script' && xmode !== 'style' && xmode !== 'styleproperty')) {
+ warningAt("Unexpected comment.", line, character);
+ }
+ if (option.safe && ax.test(s)) {
+ warningAt("ADsafe comment violation.", line, character);
+ }
+ for (;;) {
+ i = s.search(lx);
+ if (i >= 0) {
+ break;
+ }
+ if (!nextLine()) {
+ errorAt("Unclosed comment.", line, character);
+ } else {
+ if (option.safe && ax.test(s)) {
+ warningAt("ADsafe comment violation.",
+ line, character);
+ }
+ }
+ }
+ character += i + 2;
+ if (s.substr(i, 1) === '/') {
+ errorAt("Nested comment.", line, character);
+ }
+ s = s.substr(i + 2);
+ token.comment = true;
+ break;
+
+ // /*members /*jslint /*global
+
+ case '/*members':
+ case '/*member':
+ case '/*jslint':
+ case '/*global':
+ case '*/':
+ return {
+ value: t,
+ type: 'special',
+ line: line,
+ character: character,
+ from: from
+ };
+
+ case '':
+ break;
+ // /
+ case '/':
+ if (token.id === '/=') {
+ errorAt(
+"A regular expression literal can be confused with '/='.", line, from);
+ }
+ if (prereg) {
+ depth = 0;
+ captures = 0;
+ l = 0;
+ for (;;) {
+ b = true;
+ c = s.charAt(l);
+ l += 1;
+ switch (c) {
+ case '':
+ errorAt("Unclosed regular expression.",
+ line, from);
+ return;
+ case '/':
+ if (depth > 0) {
+ warningAt("Unescaped '{a}'.",
+ line, from + l, '/');
+ }
+ c = s.substr(0, l - 1);
+ q = {
+ g: true,
+ i: true,
+ m: true
+ };
+ while (q[s.charAt(l)] === true) {
+ q[s.charAt(l)] = false;
+ l += 1;
+ }
+ character += l;
+ s = s.substr(l);
+ q = s.charAt(0);
+ if (q === '/' || q === '*') {
+ errorAt("Confusing regular expression.",
+ line, from);
+ }
+ return it('(regexp)', c);
+ case '\\':
+ c = s.charAt(l);
+ if (c < ' ') {
+ warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+ } else if (c === '<') {
+ warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+ }
+ l += 1;
+ break;
+ case '(':
+ depth += 1;
+ b = false;
+ if (s.charAt(l) === '?') {
+ l += 1;
+ switch (s.charAt(l)) {
+ case ':':
+ case '=':
+ case '!':
+ l += 1;
+ break;
+ default:
+ warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
+ }
+ } else {
+ captures += 1;
+ }
+ break;
+ case '|':
+ b = false;
+ break;
+ case ')':
+ if (depth === 0) {
+ warningAt("Unescaped '{a}'.",
+ line, from + l, ')');
+ } else {
+ depth -= 1;
+ }
+ break;
+ case ' ':
+ q = 1;
+ while (s.charAt(l) === ' ') {
+ l += 1;
+ q += 1;
+ }
+ if (q > 1) {
+ warningAt(
+"Spaces are hard to count. Use {{a}}.", line, from + l, q);
+ }
+ break;
+ case '[':
+ c = s.charAt(l);
+ if (c === '^') {
+ l += 1;
+ if (option.regexp) {
+ warningAt("Insecure '{a}'.",
+ line, from + l, c);
+ }
+ }
+ q = false;
+ if (c === ']') {
+ warningAt("Empty class.", line,
+ from + l - 1);
+ q = true;
+ }
+klass: do {
+ c = s.charAt(l);
+ l += 1;
+ switch (c) {
+ case '[':
+ case '^':
+ warningAt("Unescaped '{a}'.",
+ line, from + l, c);
+ q = true;
+ break;
+ case '-':
+ if (q) {
+ q = false;
+ } else {
+ warningAt("Unescaped '{a}'.",
+ line, from + l, '-');
+ q = true;
+ }
+ break;
+ case ']':
+ if (!q) {
+ warningAt("Unescaped '{a}'.",
+ line, from + l - 1, '-');
+ }
+ break klass;
+ case '\\':
+ c = s.charAt(l);
+ if (c < ' ') {
+ warningAt(
+"Unexpected control character in regular expression.", line, from + l);
+ } else if (c === '<') {
+ warningAt(
+"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
+ }
+ l += 1;
+ q = true;
+ break;
+ case '/':
+ warningAt("Unescaped '{a}'.",
+ line, from + l - 1, '/');
+ q = true;
+ break;
+ case '<':
+ if (xmode === 'script') {
+ c = s.charAt(l);
+ if (c === '!' || c === '/') {
+ warningAt(
+"HTML confusion in regular expression '<{a}'.", line, from + l, c);
+ }
+ }
+ q = true;
+ break;
+ default:
+ q = true;
+ }
+ } while (c);
+ break;
+ case '.':
+ if (option.regexp) {
+ warningAt("Insecure '{a}'.", line,
+ from + l, c);
+ }
+ break;
+ case ']':
+ case '?':
+ case '{':
+ case '}':
+ case '+':
+ case '*':
+ warningAt("Unescaped '{a}'.", line,
+ from + l, c);
+ break;
+ case '<':
+ if (xmode === 'script') {
+ c = s.charAt(l);
+ if (c === '!' || c === '/') {
+ warningAt(
+"HTML confusion in regular expression '<{a}'.", line, from + l, c);
+ }
+ }
+ }
+ if (b) {
+ switch (s.charAt(l)) {
+ case '?':
+ case '+':
+ case '*':
+ l += 1;
+ if (s.charAt(l) === '?') {
+ l += 1;
+ }
+ break;
+ case '{':
+ l += 1;
+ c = s.charAt(l);
+ if (c < '0' || c > '9') {
+ warningAt(
+"Expected a number and instead saw '{a}'.", line, from + l, c);
+ }
+ l += 1;
+ low = +c;
+ for (;;) {
+ c = s.charAt(l);
+ if (c < '0' || c > '9') {
+ break;
+ }
+ l += 1;
+ low = +c + (low * 10);
+ }
+ high = low;
+ if (c === ',') {
+ l += 1;
+ high = Infinity;
+ c = s.charAt(l);
+ if (c >= '0' && c <= '9') {
+ l += 1;
+ high = +c;
+ for (;;) {
+ c = s.charAt(l);
+ if (c < '0' || c > '9') {
+ break;
+ }
+ l += 1;
+ high = +c + (high * 10);
+ }
+ }
+ }
+ if (s.charAt(l) !== '}') {
+ warningAt(
+"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
+ } else {
+ l += 1;
+ }
+ if (s.charAt(l) === '?') {
+ l += 1;
+ }
+ if (low > high) {
+ warningAt(
+"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
+ }
+ }
+ }
+ }
+ c = s.substr(0, l - 1);
+ character += l;
+ s = s.substr(l);
+ return it('(regexp)', c);
+ }
+ return it('(punctuator)', t);
+
+ // punctuator
+
+ case '<!--':
+ l = line;
+ c = character;
+ for (;;) {
+ i = s.indexOf('--');
+ if (i >= 0) {
+ break;
+ }
+ i = s.indexOf('<!-');
+ if (i >= 0) {
+ errorAt("Nested HTML comment.",
+ line, character + i);
+ }
+ if (!nextLine()) {
+ errorAt("Unclosed HTML comment.", l, c);
+ }
+ }
+ l = s.indexOf('<!-');
+ if (l >= 0 && l < i) {
+ errorAt("Nested HTML comment.",
+ line, character + l);
+ }
+ character += i;
+ if (s[i + 2] !== '>') {
+ errorAt("Expected -->.", line, character);
+ }
+ character += 3;
+ s = s.slice(i + 3);
+ break;
+ case '#':
+ if (xmode === 'html' || xmode === 'styleproperty') {
+ for (;;) {
+ c = s.charAt(0);
+ if ((c < '0' || c > '9') &&
+ (c < 'a' || c > 'f') &&
+ (c < 'A' || c > 'F')) {
+ break;
+ }
+ character += 1;
+ s = s.substr(1);
+ t += c;
+ }
+ if (t.length !== 4 && t.length !== 7) {
+ warningAt("Bad hex color '{a}'.", line,
+ from + l, t);
+ }
+ return it('(color)', t);
+ }
+ return it('(punctuator)', t);
+ default:
+ if (xmode === 'outer' && c === '&') {
+ character += 1;
+ s = s.substr(1);
+ for (;;) {
+ c = s.charAt(0);
+ character += 1;
+ s = s.substr(1);
+ if (c === ';') {
+ break;
+ }
+ if (!((c >= '0' && c <= '9') ||
+ (c >= 'a' && c <= 'z') ||
+ c === '#')) {
+ errorAt("Bad entity", line, from + l,
+ character);
+ }
+ }
+ break;
+ }
+ return it('(punctuator)', t);
+ }
+ }
+ }
+ }
+ };
+ }());
+
+
+ function addlabel(t, type) {
+
+ if (option.safe && funct['(global)'] &&
+ typeof predefined[t] !== 'boolean') {
+ warning('ADsafe global: ' + t + '.', token);
+ } else if (t === 'hasOwnProperty') {
+ warning("'hasOwnProperty' is a really bad name.");
+ }
+
+// Define t in the current function in the current scope.
+
+ if (is_own(funct, t) && !funct['(global)']) {
+ warning(funct[t] === true ?
+ "'{a}' was used before it was defined." :
+ "'{a}' is already defined.",
+ nexttoken, t);
+ }
+ funct[t] = type;
+ if (funct['(global)']) {
+ global[t] = funct;
+ if (is_own(implied, t)) {
+ warning("'{a}' was used before it was defined.", nexttoken, t);
+ delete implied[t];
+ }
+ } else {
+ scope[t] = funct;
+ }
+ }
+
+
+ function doOption() {
+ var b, obj, filter, o = nexttoken.value, t, v;
+ switch (o) {
+ case '*/':
+ error("Unbegun comment.");
+ break;
+ case '/*members':
+ case '/*member':
+ o = '/*members';
+ if (!membersOnly) {
+ membersOnly = {};
+ }
+ obj = membersOnly;
+ break;
+ case '/*jslint':
+ if (option.safe) {
+ warning("ADsafe restriction.");
+ }
+ obj = option;
+ filter = boolOptions;
+ break;
+ case '/*global':
+ if (option.safe) {
+ warning("ADsafe restriction.");
+ }
+ obj = predefined;
+ break;
+ default:
+ }
+ t = lex.token();
+loop: for (;;) {
+ for (;;) {
+ if (t.type === 'special' && t.value === '*/') {
+ break loop;
+ }
+ if (t.id !== '(endline)' && t.id !== ',') {
+ break;
+ }
+ t = lex.token();
+ }
+ if (t.type !== '(string)' && t.type !== '(identifier)' &&
+ o !== '/*members') {
+ error("Bad option.", t);
+ }
+ v = lex.token();
+ if (v.id === ':') {
+ v = lex.token();
+ if (obj === membersOnly) {
+ error("Expected '{a}' and instead saw '{b}'.",
+ t, '*/', ':');
+ }
+ if (t.value === 'indent' && o === '/*jslint') {
+ b = +v.value;
+ if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+ Math.floor(b) !== b) {
+ error("Expected a small integer and instead saw '{a}'.",
+ v, v.value);
+ }
+ obj.white = true;
+ obj.indent = b;
+ } else if (t.value === 'maxerr' && o === '/*jslint') {
+ b = +v.value;
+ if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+ Math.floor(b) !== b) {
+ error("Expected a small integer and instead saw '{a}'.",
+ v, v.value);
+ }
+ obj.maxerr = b;
+ } else if (t.value === 'maxlen' && o === '/*jslint') {
+ b = +v.value;
+ if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
+ Math.floor(b) !== b) {
+ error("Expected a small integer and instead saw '{a}'.",
+ v, v.value);
+ }
+ obj.maxlen = b;
+ } else if (v.value === 'true') {
+ obj[t.value] = true;
+ } else if (v.value === 'false') {
+ obj[t.value] = false;
+ } else {
+ error("Bad option value.", v);
+ }
+ t = lex.token();
+ } else {
+ if (o === '/*jslint') {
+ error("Missing option value.", t);
+ }
+ obj[t.value] = false;
+ t = v;
+ }
+ }
+ if (filter) {
+ assume();
+ }
+ }
+
+
+// We need a peek function. If it has an argument, it peeks that much farther
+// ahead. It is used to distinguish
+// for ( var i in ...
+// from
+// for ( var i = ...
+
+ function peek(p) {
+ var i = p || 0, j = 0, t;
+
+ while (j <= i) {
+ t = lookahead[j];
+ if (!t) {
+ t = lookahead[j] = lex.token();
+ }
+ j += 1;
+ }
+ return t;
+ }
+
+
+
+// Produce the next token. It looks for programming errors.
+
+ function advance(id, t) {
+ switch (token.id) {
+ case '(number)':
+ if (nexttoken.id === '.') {
+ warning(
+"A dot following a number can be confused with a decimal point.", token);
+ }
+ break;
+ case '-':
+ if (nexttoken.id === '-' || nexttoken.id === '--') {
+ warning("Confusing minusses.");
+ }
+ break;
+ case '+':
+ if (nexttoken.id === '+' || nexttoken.id === '++') {
+ warning("Confusing plusses.");
+ }
+ break;
+ }
+ if (token.type === '(string)' || token.identifier) {
+ anonname = token.value;
+ }
+
+ if (id && nexttoken.id !== id) {
+ if (t) {
+ if (nexttoken.id === '(end)') {
+ warning("Unmatched '{a}'.", t, t.id);
+ } else {
+ warning(
+"Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
+ nexttoken, id, t.id, t.line, nexttoken.value);
+ }
+ } else if (nexttoken.type !== '(identifier)' ||
+ nexttoken.value !== id) {
+ warning("Expected '{a}' and instead saw '{b}'.",
+ nexttoken, id, nexttoken.value);
+ }
+ }
+ prevtoken = token;
+ token = nexttoken;
+ for (;;) {
+ nexttoken = lookahead.shift() || lex.token();
+ if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
+ return;
+ }
+ if (nexttoken.type === 'special') {
+ doOption();
+ } else {
+ if (nexttoken.id !== '(endline)') {
+ break;
+ }
+ }
+ }
+ }
+
+
+// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
+// is looking for ad hoc lint patterns. We add to Pratt's model .fud, which is
+// like nud except that it is only used on the first token of a statement.
+// Having .fud makes it much easier to define JavaScript. I retained Pratt's
+// nomenclature.
+
+// .nud Null denotation
+// .fud First null denotation
+// .led Left denotation
+// lbp Left binding power
+// rbp Right binding power
+
+// They are key to the parsing method called Top Down Operator Precedence.
+
+ function parse(rbp, initial) {
+ var left;
+ if (nexttoken.id === '(end)') {
+ error("Unexpected early end of program.", token);
+ }
+ advance();
+ if (option.safe && typeof predefined[token.value] === 'boolean' &&
+ (nexttoken.id !== '(' && nexttoken.id !== '.')) {
+ warning('ADsafe violation.', token);
+ }
+ if (initial) {
+ anonname = 'anonymous';
+ funct['(verb)'] = token.value;
+ }
+ if (initial === true && token.fud) {
+ left = token.fud();
+ } else {
+ if (token.nud) {
+ left = token.nud();
+ } else {
+ if (nexttoken.type === '(number)' && token.id === '.') {
+ warning(
+"A leading decimal point can be confused with a dot: '.{a}'.",
+ token, nexttoken.value);
+ advance();
+ return token;
+ } else {
+ error("Expected an identifier and instead saw '{a}'.",
+ token, token.id);
+ }
+ }
+ while (rbp < nexttoken.lbp) {
+ advance();
+ if (token.led) {
+ left = token.led(left);
+ } else {
+ error("Expected an operator and instead saw '{a}'.",
+ token, token.id);
+ }
+ }
+ }
+ return left;
+ }
+
+
+// Functions for conformance of style.
+
+ function adjacent(left, right) {
+ left = left || token;
+ right = right || nexttoken;
+ if (option.white || xmode === 'styleproperty' || xmode === 'style') {
+ if (left.character !== right.from && left.line === right.line) {
+ warning("Unexpected space after '{a}'.", right, left.value);
+ }
+ }
+ }
+
+ function nospace(left, right) {
+ left = left || token;
+ right = right || nexttoken;
+ if (option.white && !left.comment) {
+ if (left.line === right.line) {
+ adjacent(left, right);
+ }
+ }
+ }
+
+
+ function nonadjacent(left, right) {
+ if (option.white) {
+ left = left || token;
+ right = right || nexttoken;
+ if (left.line === right.line && left.character === right.from) {
+ warning("Missing space after '{a}'.",
+
<TRUNCATED>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTest/jslint/js.jar
----------------------------------------------------------------------
diff --git a/AlluraTest/jslint/js.jar b/AlluraTest/jslint/js.jar
new file mode 100644
index 0000000..2369f99
Binary files /dev/null and b/AlluraTest/jslint/js.jar differ
[24/27] git commit: [#4656] Add tests for new provider methods
Posted by jo...@apache.org.
[#4656] Add tests for new provider methods
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dce4fe8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dce4fe8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dce4fe8c
Branch: refs/heads/cj/4656
Commit: dce4fe8c3c05109f9d9e8de7e2495ebf13b673ac
Parents: c3b47b7
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Jul 2 21:36:57 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Jul 16 20:15:14 2013 +0000
----------------------------------------------------------------------
Allura/allura/tests/test_plugin.py | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dce4fe8c/Allura/allura/tests/test_plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/test_plugin.py b/Allura/allura/tests/test_plugin.py
index 6e1a07a..aa2aaeb 100644
--- a/Allura/allura/tests/test_plugin.py
+++ b/Allura/allura/tests/test_plugin.py
@@ -16,7 +16,7 @@
# under the License.
from nose.tools import assert_equals
-from mock import MagicMock, patch
+from mock import Mock, MagicMock, patch
from allura import model as M
from allura.lib.utils import TruthyCallable
@@ -25,16 +25,31 @@ from allura.lib.plugin import ProjectRegistrationProvider
class TestProjectRegistrationProvider(object):
+ def setUp(self):
+ self.provider = ProjectRegistrationProvider()
+
@patch('allura.lib.security.has_access')
def test_validate_project_15char_user(self, has_access):
has_access.return_value = TruthyCallable(lambda: True)
- provider = ProjectRegistrationProvider()
nbhd = M.Neighborhood()
- provider.validate_project(
+ self.provider.validate_project(
neighborhood=nbhd,
shortname='u/' + ('a' * 15),
project_name='15 char username',
user=MagicMock(),
user_project=True,
private_project=False,
- )
\ No newline at end of file
+ )
+
+ def test_suggest_name(self):
+ f = self.provider.suggest_name
+ assert_equals(f('A More Than Fifteen Character Name', Mock()),
+ 'amorethanfifteencharactername')
+
+ def test_validate_project_shortname(self):
+ f = self.provider.validate_project_shortname
+ p = Mock()
+ assert_equals(f('thisislegit', p), None)
+ assert_equals(f('this is invalid and too long', p),
+ 'Please use only letters, numbers, and dashes '
+ '3-15 characters long.')
[26/27] git commit: [#4656] Refactored project name validation
Posted by jo...@apache.org.
[#4656] Refactored project name validation
AJAX validation and validation on submit were not using the same
validation checks. Refactored the validation code so that both use
the same checks and consolidated redundant API methods related to those
checks.
The "extra_name_checks" method is no longer used, and those checks
should be folded into the new, more general "validate_project_shortname"
method.
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7efec56e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7efec56e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7efec56e
Branch: refs/heads/cj/4656
Commit: 7efec56ef005433e79fdb377ef6c0a8da5f28ecd
Parents: dce4fe8
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Wed Jul 3 20:05:19 2013 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Tue Jul 16 20:15:14 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 19 +++++--------------
Allura/allura/lib/plugin.py | 13 -------------
Allura/allura/lib/widgets/forms.py | 30 +++++++++++++++---------------
3 files changed, 20 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7efec56e/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index e5edd80..36c4667 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -80,7 +80,8 @@ class NeighborhoodController(object):
@expose()
def _lookup(self, pname, *remainder):
pname = unquote(pname)
- if not h.re_project_name.match(pname):
+ provider = plugin.ProjectRegistrationProvider.get()
+ if provider.validate_project_shortname(pname, self.neighborhood):
raise exc.HTTPNotFound, pname
project = M.Project.query.get(shortname=self.prefix + pname, neighborhood_id=self.neighborhood._id)
if project is None and self.prefix == 'u/':
@@ -180,19 +181,9 @@ class NeighborhoodController(object):
self.neighborhood))
@expose('json:')
- def check_names(self, project_name='', unix_name=''):
- provider = plugin.ProjectRegistrationProvider.get()
- result = dict()
- try:
- W.add_project.fields['project_name'].validate(project_name, '')
- except Invalid as e:
- result['name_message'] = str(e)
-
- unixname_invalid_err = provider.validate_project_shortname(unix_name,
- self.neighborhood)
- result['unixname_message'] = (unixname_invalid_err or
- provider.name_taken(unix_name, self.neighborhood))
- return result
+ @validate(W.add_project)
+ def check_names(self, **raw_data):
+ return c.form_errors
@h.vardec
@expose()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7efec56e/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index c0319f7..111aa77 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -373,21 +373,8 @@ class ProjectRegistrationProvider(object):
p = M.Project.query.get(shortname=project_name, neighborhood_id=neighborhood._id)
if p:
return 'This project name is taken.'
- for check in self.extra_name_checks():
- if re.match(str(check[1]),project_name) is not None:
- return check[0]
return False
- def extra_name_checks(self):
- """Return an iterable of ``(error_message, regex)`` tuples.
-
- If user attempts to register a project with a name that matches
- ``regex``, the field will be marked invalid, and ``error_message``
- displayed to the user.
-
- """
- return []
-
def suggest_name(self, project_name, neighborhood):
"""Return a suggested project shortname for the full ``project_name``.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7efec56e/Allura/allura/lib/widgets/forms.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/forms.py b/Allura/allura/lib/widgets/forms.py
index 9501b70..2312c71 100644
--- a/Allura/allura/lib/widgets/forms.py
+++ b/Allura/allura/lib/widgets/forms.py
@@ -45,12 +45,16 @@ class _HTMLExplanation(ew.InputField):
''',
'jinja2')
-class NeighborhoodProjectTakenValidator(fev.FancyValidator):
+class NeighborhoodProjectShortNameValidator(fev.FancyValidator):
def _to_python(self, value, state):
value = h.really_unicode(value or '').encode('utf-8').lower()
neighborhood = M.Neighborhood.query.get(name=state.full_dict['neighborhood'])
- message = plugin.ProjectRegistrationProvider.get().name_taken(value, neighborhood)
+ provider = plugin.ProjectRegistrationProvider.get()
+ message = provider.validate_project_shortname(value, neighborhood)
+ if message:
+ raise formencode.Invalid(message, value, state)
+ message = provider.name_taken(value, neighborhood)
if message:
raise formencode.Invalid(message, value, state)
return value
@@ -779,14 +783,7 @@ class NeighborhoodAddProjectForm(ForgeForm):
V.MaxBytesValidator(max=40)))
project_unixname = ew.InputField(
label='Short Name', field_type='text',
- validator=formencode.All(
- fev.String(not_empty=True),
- fev.MinLength(3),
- fev.MaxLength(15),
- fev.Regex(
- r'^[A-z][-A-z0-9]{2,}$',
- messages={'invalid':'Please use only letters, numbers, and dashes 3-15 characters long.'}),
- NeighborhoodProjectTakenValidator()))
+ validator=NeighborhoodProjectShortNameValidator())
tools = ew.CheckboxSet(name='tools', options=[
## Required for Neighborhood functional tests to pass
ew.Option(label='Wiki', html_value='wiki', selected=True)
@@ -805,12 +802,14 @@ class NeighborhoodAddProjectForm(ForgeForm):
def resources(self):
for r in super(NeighborhoodAddProjectForm, self).resources(): yield r
yield ew.CSSLink('css/add_project.css')
+ neighborhood = g.antispam.enc('neighborhood')
project_name = g.antispam.enc('project_name')
project_unixname = g.antispam.enc('project_unixname')
yield ew.JSScript('''
$(function(){
var $scms = $('input[type=checkbox].scm');
+ var $nbhd_input = $('input[name="%(neighborhood)s"]');
var $name_input = $('input[name="%(project_name)s"]');
var $unixname_input = $('input[name="%(project_unixname)s"]');
var $url_fragment = $('#url_fragment');
@@ -864,12 +863,13 @@ class NeighborhoodAddProjectForm(ForgeForm):
});
var check_names = function() {
var data = {
- 'project_name':$name_input.val(),
- 'unix_name': $unixname_input.val()
+ 'neighborhood': $nbhd_input.val(),
+ 'project_name': $name_input.val(),
+ 'project_unixname': $unixname_input.val()
};
$.getJSON('check_names', data, function(result){
- handle_error($name_input, result.name_message);
- handle_error($unixname_input, result.unixname_message);
+ handle_error($name_input, result.project_name);
+ handle_error($unixname_input, result.project_unixname);
});
};
var manual = false;
@@ -897,7 +897,7 @@ class NeighborhoodAddProjectForm(ForgeForm):
delay(check_names, 500);
});
});
- ''' % dict(project_name=project_name, project_unixname=project_unixname))
+ ''' % dict(neighborhood=neighborhood, project_name=project_name, project_unixname=project_unixname))
class MoveTicketForm(ForgeForm):
[10/27] [#4122] rename AlluraTesting dir to AlluraTest,
to match the module name below
Posted by jo...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/jslint/rhino.js
----------------------------------------------------------------------
diff --git a/AlluraTesting/jslint/rhino.js b/AlluraTesting/jslint/rhino.js
deleted file mode 100644
index 04be512..0000000
--- a/AlluraTesting/jslint/rhino.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// rhino.js
-// 2009-09-11
-/*
-Copyright (c) 2002 Douglas Crockford (www.JSLint.com) Rhino Edition
-*/
-
-// This is the Rhino companion to fulljslint.js.
-
-/*global JSLINT */
-/*jslint rhino: true, strict: false */
-
-(function (a) {
- var e, i, input;
- if (!a[0]) {
- print("Usage: jslint.js file.js");
- quit(1);
- }
- input = readFile(a[0]);
- if (!input) {
- print("jslint: Couldn't open file '" + a[0] + "'.");
- quit(1);
- }
- if (!JSLINT(input, {bitwise: true, eqeqeq: true, immed: true,
- newcap: true, nomen: true, onevar: true, plusplus: true,
- regexp: true, rhino: true, undef: true, white: true})) {
- for (i = 0; i < JSLINT.errors.length; i += 1) {
- e = JSLINT.errors[i];
- if (e) {
- print('Lint at line ' + e.line + ' character ' +
- e.character + ': ' + e.reason);
- print((e.evidence || '').
- replace(/^\s*(\S*(\s+\S+)*)\s*$/, "$1"));
- print('');
- }
- }
- quit(2);
- } else {
- print("jslint: No problems found in " + a[0]);
- quit();
- }
-}(arguments));
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/setup.py
----------------------------------------------------------------------
diff --git a/AlluraTesting/setup.py b/AlluraTesting/setup.py
deleted file mode 100644
index a449b84..0000000
--- a/AlluraTesting/setup.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-from setuptools import setup, find_packages
-import sys, os
-
-setup(name='AlluraTesting',
- version='0.1',
- description="Allura testing support",
- long_description="""\
-""",
- classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
- keywords='',
- author='',
- author_email='',
- url='',
- license='',
- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
- include_package_data=True,
- zip_safe=False,
- install_requires=[
- "poster",
- # -*- Extra requirements: -*-
- ]
- )
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/README
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/README b/AlluraTesting/twill-tests/README
deleted file mode 100644
index 59e490e..0000000
--- a/AlluraTesting/twill-tests/README
+++ /dev/null
@@ -1,19 +0,0 @@
-Twill Tests
-
-First, you'll need twill-sh:
-
- sudo easy_install twill
-
-
-Files in this directory ending with '.twill' are tests to be run by twill-sh
-
- twill-sh --url=http://url.of.forge.to.test/ twill-tests/*.twill
-
-e.g.,
-
- twill-sh --url=http://re.sourceforge.net/ twill-tests/*.twill
-
-
-If you just want to run the quick "smoke tests":
-
- twill-sh --url=... twill-tests/smoke*.twill
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/create_repo.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/create_repo.twill b/AlluraTesting/twill-tests/create_repo.twill
deleted file mode 100644
index 17b9a3a..0000000
--- a/AlluraTesting/twill-tests/create_repo.twill
+++ /dev/null
@@ -1,47 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-setlocal username test_admin
-setlocal password foo
-
-clear_extra_headers
-go ./auth/
-formvalue 1 username $username
-formvalue 1 password $password
-submit
-
-code 200
-
-go ./p/test/admin/tools
-
-code 200
-
-formvalue 2 "new.ep_name" "Git"
-formvalue 2 "new.mount_point" "deleteme"
-submit
-
-code 200
-
-go ../deleteme/
-
-code 200
-
-find ready
-
-go ../admin/tools
-
-# Delete the repo :-(
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/edit_wiki_page.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/edit_wiki_page.twill b/AlluraTesting/twill-tests/edit_wiki_page.twill
deleted file mode 100644
index 2b659ec..0000000
--- a/AlluraTesting/twill-tests/edit_wiki_page.twill
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-setlocal username test_admin
-setlocal password foo
-
-clear_extra_headers
-go ./auth/
-formvalue 1 username $username
-formvalue 1 password $password
-submit
-
-code 200
-
-go ./p/test/wiki/TestWikiWord/edit
-
-code 200
-
-formvalue 3 text "This is just a test."
-submit
-
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/login.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/login.twill b/AlluraTesting/twill-tests/login.twill
deleted file mode 100644
index fbe6f67..0000000
--- a/AlluraTesting/twill-tests/login.twill
+++ /dev/null
@@ -1,27 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-setlocal username test_admin
-setlocal password foo
-
-clear_extra_headers
-go ./auth/
-formvalue 1 username $username
-formvalue 1 password $password
-submit
-
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/new_issue.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/new_issue.twill b/AlluraTesting/twill-tests/new_issue.twill
deleted file mode 100644
index 7b05168..0000000
--- a/AlluraTesting/twill-tests/new_issue.twill
+++ /dev/null
@@ -1,36 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-setlocal username test_admin
-setlocal password foo
-
-clear_extra_headers
-go ./auth/
-formvalue 1 username $username
-formvalue 1 password $password
-submit
-
-code 200
-
-go ./p/test/bugs/new/
-
-code 200
-
-formvalue 2 "ticket_form.summary" "test create ticket"
-submit
-
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/smoke-front-page.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/smoke-front-page.twill b/AlluraTesting/twill-tests/smoke-front-page.twill
deleted file mode 100644
index a0f4852..0000000
--- a/AlluraTesting/twill-tests/smoke-front-page.twill
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clear_extra_headers
-go .
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/smoke-project-home.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/smoke-project-home.twill b/AlluraTesting/twill-tests/smoke-project-home.twill
deleted file mode 100644
index 3d1e8bf..0000000
--- a/AlluraTesting/twill-tests/smoke-project-home.twill
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clear_extra_headers
-go ./p/test/home/
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/smoke-tracker-search.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/smoke-tracker-search.twill b/AlluraTesting/twill-tests/smoke-tracker-search.twill
deleted file mode 100644
index d8d03a3..0000000
--- a/AlluraTesting/twill-tests/smoke-tracker-search.twill
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clear_extra_headers
-go ./p/test/bugs/search/
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/smoke-tracker.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/smoke-tracker.twill b/AlluraTesting/twill-tests/smoke-tracker.twill
deleted file mode 100644
index 1e9e0f7..0000000
--- a/AlluraTesting/twill-tests/smoke-tracker.twill
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clear_extra_headers
-go ./p/test/bugs/
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/smoke-user-profile.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/smoke-user-profile.twill b/AlluraTesting/twill-tests/smoke-user-profile.twill
deleted file mode 100644
index 907f17d..0000000
--- a/AlluraTesting/twill-tests/smoke-user-profile.twill
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clear_extra_headers
-go ./u/test_admin/profile/
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/AlluraTesting/twill-tests/smoke-wiki.twill
----------------------------------------------------------------------
diff --git a/AlluraTesting/twill-tests/smoke-wiki.twill b/AlluraTesting/twill-tests/smoke-wiki.twill
deleted file mode 100644
index 03e2c56..0000000
--- a/AlluraTesting/twill-tests/smoke-wiki.twill
+++ /dev/null
@@ -1,20 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-clear_extra_headers
-go ./p/test/wiki/Home/
-code 200
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/rat-excludes.txt
----------------------------------------------------------------------
diff --git a/rat-excludes.txt b/rat-excludes.txt
index 78aba56..0c0de3c 100644
--- a/rat-excludes.txt
+++ b/rat-excludes.txt
@@ -32,7 +32,7 @@ Allura/allura/public/nf/js/sylvester.js
Allura/allura/tests/data/genshi_hello_tmpl
Allura/allura/tests/data/test_mime/text_file.txt
Allura/run/dummy.txt
-AlluraTesting/jslint/
+AlluraTest/jslint/
ForgeGit/forgegit/data/post-receive_tmpl
ForgeSVN/forgesvn/tests/data/
solr_config/core0/conf/spellings.txt
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/run_clonedigger
----------------------------------------------------------------------
diff --git a/run_clonedigger b/run_clonedigger
index cda4b67..d7f1a1f 100755
--- a/run_clonedigger
+++ b/run_clonedigger
@@ -27,7 +27,7 @@ fi
if [ "$TEST_MODULES" == "" ]; then
TEST_MODULES="\
- AlluraTesting \
+ AlluraTest \
Allura \
ForgeBlog \
ForgeLink \
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/37e91c91/run_tests
----------------------------------------------------------------------
diff --git a/run_tests b/run_tests
index fa39230..59e1825 100755
--- a/run_tests
+++ b/run_tests
@@ -27,7 +27,7 @@ fi
if [ "$TEST_MODULES" == "" ]; then
TEST_MODULES="\
- AlluraTesting \
+ AlluraTest \
Allura \
ForgeBlog \
ForgeLink \
[21/27] git commit: [#6355] Handle dots in repo names
Posted by jo...@apache.org.
[#6355] Handle dots in repo names
Signed-off-by: Tim Van Steenburgh <tv...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/dbfa5afd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/dbfa5afd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/dbfa5afd
Branch: refs/heads/cj/4656
Commit: dbfa5afd2849f9d33901aa4ac170bb5b9d8945f5
Parents: d2a60bb
Author: Tim Van Steenburgh <tv...@gmail.com>
Authored: Tue Jul 2 14:33:11 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Mon Jul 15 21:03:18 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 7 ++++---
ForgeGit/forgegit/tests/functional/test_auth.py | 7 +++++++
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dbfa5afd/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index 5b3acf3..4e197e6 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -309,12 +309,13 @@ class AuthController(BaseController):
project_path, repo_path)
response.status = 404
return dict(disallow, error='unknown project')
- mount_point = os.path.splitext(rest[0])[0]
c.project = project
- c.app = project.app_instance(mount_point)
+ c.app = project.app_instance(rest[0])
+ if not c.app:
+ c.app = project.app_instance(rest[0])[0]
if c.app is None:
log.info("Can't find repo at %s on repo_path %s",
- mount_point, repo_path)
+ rest[0], repo_path)
return disallow
return dict(allow_read=has_access(c.app, 'read')(user=user),
allow_write=has_access(c.app, 'write')(user=user),
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/dbfa5afd/ForgeGit/forgegit/tests/functional/test_auth.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_auth.py b/ForgeGit/forgegit/tests/functional/test_auth.py
index fcee919..4a16aab 100644
--- a/ForgeGit/forgegit/tests/functional/test_auth.py
+++ b/ForgeGit/forgegit/tests/functional/test_auth.py
@@ -21,8 +21,10 @@ import json
from datadiff.tools import assert_equal
from allura.tests import TestController
+from allura.tests.decorators import with_tool
from forgegit.tests import with_git
+
class TestGitUserPermissions(TestController):
allow = dict(allow_read=True, allow_write=True, allow_create=True)
read = dict(allow_read=True, allow_write=False, allow_create=False)
@@ -67,6 +69,11 @@ class TestGitUserPermissions(TestController):
username='test-usera',
status=404)
+ @with_tool('test', 'Git', 'src.c++.git', 'Git', type='git')
+ def test_dot_and_plus(self):
+ r = self._check_repo('/git/test.p/src.c++.git')
+ assert r == self.allow, r
+
def _check_repo(self, path, username='test-admin', **kw):
url = '/auth/repo_permissions'
r = self.app.get(url, params=dict(