Skip to content

Commit 7c90ea5

Browse files
rjsparksrjsparks
committed
Merged in Michael's update to newer dajaxice.
Repaired the existing tests in trunk except for one. That one points to a real bug in the code - the access protection for the functions that change visible and public for an agenda are not right, leading to pages that can't work (see the failing test for more notes). This should be ready to start porting the updated tests into the make_test_data framework. - Legacy-Id: 7283
1 parent accbf3d commit 7c90ea5

53 files changed

Lines changed: 1402 additions & 52 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎django-dajaxice/.travis.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
language: python
2+
python:
3+
- "2.6"
4+
- "2.7"
5+
- "3.2"
6+
7+
env:
8+
- DJANGO=django==1.3
9+
- DJANGO=django==1.4
10+
- DJANGO=https://github.com/django/django/tarball/stable/1.5.x
11+
12+
install:
13+
- pip install -q $DJANGO --use-mirrors
14+
- pip install https://github.com/jorgebastida/django-app-test-runner/zipball/master
15+
16+
script:
17+
- app-test-runner dajaxice dajaxice
18+
19+
branches:
20+
only:
21+
- master
22+
- develop
23+
24+
matrix:
25+
exclude:
26+
# Django < 1.5 not supported on python 3
27+
- python: "3.2"
28+
env: DJANGO=django==1.3
29+
- python: "3.2"
30+
env: DJANGO=django==1.4
31+
# Django 1.5 strongly recommends python 2.7 or later (so skip 2.6)
32+
- python: "2.6"
33+
env: DJANGO=https://github.com/django/django/tarball/stable/1.5.x

‎django-dajaxice/AUTHORS‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
Glue is mainly developed and maintained by Jorge Bastida <me@jorgebastida.com>
2+
3+
A big thanks to all the contributors:
4+
Angel Abad for the Debian and Ubuntu distribution package.
5+
Denis Darii <denis.darii@gmail.com>
6+
Florian Le Goff <florian@9h37.fr>
7+
Youen Péron <@youen>
8+
Clément Nodet <clement.nodet@gmail.com>
9+
Francisco Vianna <@fvianna>
10+
Paweł Krawczyk <@kravietz>
11+
Michael Fladischer <michael@fladi.at>
12+
Anton Agestam <msn@antonagestam.se>
13+
Michal Hořejšek <horejsekmichal@gmail.com>
14+
Ken <@kkansky>
15+
16+
And the authors of:
17+
XmlHttpRequest.js project (License inside COPYING)
18+
json2.js Library (License inside COPYING)

‎django-dajaxice/COPYING‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# django-dajaxixe License ################################################
2+
3+
Copyright (c) 2009-2012 Benito Jorge Bastida
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are
8+
met:
9+
10+
1. Redistributions of source code must retain the above copyright
11+
notice, this list of conditions and the following disclaimer.
12+
13+
2. Redistributions in binary form must reproduce the above
14+
copyright notice, this list of conditions and the following
15+
disclaimer in the documentation and/or other materials provided
16+
with the distribution.
17+
18+
3. Neither the name of the author nor the names of other
19+
contributors may be used to endorse or promote products derived
20+
from this software without specific prior written permission.
21+
22+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
23+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
24+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
25+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
26+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
27+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
28+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
29+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
30+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
32+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33+
34+
35+
36+
# XMLHttpRequest.js License ################################################
37+
38+
XMLHttpRequest.js Copyright (C) 2008 Sergey Ilinsky (http://www.ilinsky.com)
39+
40+
This work is free software; you can redistribute it and/or modify
41+
it under the terms of the GNU Lesser General Public License as published by
42+
the Free Software Foundation; either version 2.1 of the License, or
43+
(at your option) any later version.
44+
45+
This work is distributed in the hope that it will be useful,
46+
but without any warranty; without even the implied warranty of
47+
merchantability or fitness for a particular purpose. See the
48+
GNU Lesser General Public License for more details.
49+
50+
You should have received a copy of the GNU Lesser General Public License
51+
along with this library; if not, write to the Free Software Foundation, Inc.,
52+
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
53+
54+
# json2.js License ###########################################################
55+
56+
http://www.json.org/json2.js 2009-09-29
57+
58+
Public Domain. NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
59+
See http://www.JSON.org/js.html
60+
You are free to copy, modify, or redistribute.
61+
62+
################################################################################

‎django-dajaxice/MANIFEST.in‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
include *.py
2+
include COPYING
3+
include AUTHORS
4+
recursive-include dajaxice *
5+
recursive-exclude dajaxice *.pyc
6+
recursive-include examples *
7+
recursive-exclude examples *.pyc
8+
recursive-include docs *

‎django-dajaxice/README.rst‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
django-dajaxice
2+
===============
3+
4+
Dajaxice is the communication core of dajaxproject. It's main goal is to trivialize the asynchronous communication within the django server side code and your js code.
5+
6+
dajaxice is JS-framework agnostic and focuses on decoupling the presentation logic from the server-side logic. dajaxice only requieres 5 minutes to start working.
7+
8+
Project Aims
9+
------------
10+
11+
* Isolate the communication between the client and the server.
12+
* JS Framework agnostic (No Prototype, JQuery... needed ).
13+
* Presentation logic outside the views (No presentation code inside ajax functions).
14+
* Lightweight.
15+
* Crossbrowsing ready.
16+
* Unobtrusive standard-compliant (W3C) XMLHttpRequest 1.0 object usage.
17+
18+
Official site http://dajaxproject.com
19+
Documentation http://readthedocs.org/projects/django-dajaxice/

dajaxice/__init__.py renamed to django-dajaxice/dajaxice/__init__.py

File renamed without changes.

dajaxice/core/Dajaxice.py renamed to django-dajaxice/dajaxice/core/Dajaxice.py

File renamed without changes.

dajaxice/core/__init__.py renamed to django-dajaxice/dajaxice/core/__init__.py

File renamed without changes.

dajaxice/decorators.py renamed to django-dajaxice/dajaxice/decorators.py

File renamed without changes.

dajaxice/exceptions.py renamed to django-dajaxice/dajaxice/exceptions.py

File renamed without changes.

0 commit comments

Comments
 (0)