aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Lal <james@lightsofapollo.com>2012-06-18 20:59:35 -0700
committerJames Lal <james@lightsofapollo.com>2012-06-18 20:59:35 -0700
commitf1ae9e6f2a4503b9c5ab55abb13d95cbd9ee753c (patch)
treed628e71dc77c8fa422e91ef453c809b0dc3a2dac
parenta6c747412c0960331e4055eee97d8328ff88d584 (diff)
downloadjsCalDAV-f1ae9e6f2a4503b9c5ab55abb13d95cbd9ee753c.tar.gz
Rename lib to webcals
-rw-r--r--Makefile2
-rw-r--r--lib/webcals/ics.js (renamed from lib/caldav/ics.js)2
-rw-r--r--lib/webcals/responder.js (renamed from lib/caldav/responder.js)2
-rw-r--r--lib/webcals/sax.js (renamed from lib/caldav/sax.js)3
-rw-r--r--lib/webcals/sax/propstat.js (renamed from lib/caldav/sax/propstat.js)2
-rw-r--r--lib/webcals/webcals.js (renamed from lib/caldav/caldav.js)0
-rw-r--r--lib/webcals/xhr.js (renamed from lib/caldav/xhr.js)2
-rw-r--r--package.json2
-rw-r--r--samples/calendar-data2
-rw-r--r--samples/resource-type2
-rw-r--r--samples/xml/calendar-multiget.xml6
-rw-r--r--test.js6
-rw-r--r--test/helper.js6
-rw-r--r--test/webcals/ics_test.js (renamed from test/caldav/ics_test.js)2
-rw-r--r--test/webcals/sax/propstat_test.js (renamed from test/caldav/sax/propstat_test.js)2
-rw-r--r--test/webcals/sax_test.js (renamed from test/caldav/sax_test.js)1
16 files changed, 23 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index de8556a..f833021 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ test:
--ui tdd \
--reporter $(REPORTER) \
--growl test/helper.js \
- test/caldav/*_test.js
+ test/webcals/*_test.js
.PHONY: watch
FILES=
diff --git a/lib/caldav/ics.js b/lib/webcals/ics.js
index 47d9151..2397239 100644
--- a/lib/caldav/ics.js
+++ b/lib/webcals/ics.js
@@ -136,5 +136,5 @@
this,
(this.CalDav) ?
[CalDav('ics'), CalDav] :
- [module, require('./caldav')]
+ [module, require('./webcals')]
));
diff --git a/lib/caldav/responder.js b/lib/webcals/responder.js
index b4abd21..9fd7ed9 100644
--- a/lib/caldav/responder.js
+++ b/lib/webcals/responder.js
@@ -205,5 +205,5 @@
this,
(this.CalDav) ?
[CalDav('responder'), CalDav] :
- [module, require('./caldav')]
+ [module, require('./webcals')]
));
diff --git a/lib/caldav/sax.js b/lib/webcals/sax.js
index 28fa716..1e169fd 100644
--- a/lib/caldav/sax.js
+++ b/lib/webcals/sax.js
@@ -24,7 +24,6 @@
this.parse.onend = this.onend.bind(this);
- this.depth = 0;
this.handles = {};
this.stack = [];
@@ -154,5 +153,5 @@
this,
(this.CalDav) ?
[CalDav('xml_parser'), CalDav] :
- [module, require('./caldav')]
+ [module, require('./webcals')]
));
diff --git a/lib/caldav/sax/propstat.js b/lib/webcals/sax/propstat.js
index 0339f92..03bedaa 100644
--- a/lib/caldav/sax/propstat.js
+++ b/lib/webcals/sax/propstat.js
@@ -26,5 +26,5 @@
this,
(this.CalDav) ?
[CalDav('sax/propstat'), CalDav] :
- [module, require('../caldav')]
+ [module, require('../webcals')]
));
diff --git a/lib/caldav/caldav.js b/lib/webcals/webcals.js
index cf81358..cf81358 100644
--- a/lib/caldav/caldav.js
+++ b/lib/webcals/webcals.js
diff --git a/lib/caldav/xhr.js b/lib/webcals/xhr.js
index bfc3eeb..adec5a6 100644
--- a/lib/caldav/xhr.js
+++ b/lib/webcals/xhr.js
@@ -107,5 +107,5 @@
this,
(this.CalDav) ?
[CalDav('xhr'), CalDav] :
- [module, require('./caldav')]
+ [module, require('./webcals')]
));
diff --git a/package.json b/package.json
index 4c84623..2fd6cbd 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "caldav",
+ "name": "webcals",
"version": "0.0.1",
"author": "",
"description": "",
diff --git a/samples/calendar-data b/samples/calendar-data
index 1b9ed7b..458cf27 100644
--- a/samples/calendar-data
+++ b/samples/calendar-data
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" ?>
<C:calendar-query xmlns:D="DAV:"
- xmlns:C="urn:ietf:params:xml:ns:caldav">
+ xmlns:C="urn:ietf:params:xml:ns:webcals">
<D:prop>
<D:getetag/>
<C:calendar-data/>
diff --git a/samples/resource-type b/samples/resource-type
index a6aa471..0dea2ce 100644
--- a/samples/resource-type
+++ b/samples/resource-type
@@ -1,5 +1,5 @@
<?xml version="1.0" ?>
-<D:propfind xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:CS="http://calendarserver.org/ns/" xmlns:D="DAV:">
+<D:propfind xmlns:C="urn:ietf:params:xml:ns:webcals" xmlns:CS="http://calendarserver.org/ns/" xmlns:D="DAV:">
<D:prop>
<D:resourcetype/>
<D:owner/>
diff --git a/samples/xml/calendar-multiget.xml b/samples/xml/calendar-multiget.xml
index 9ef1aaf..baf0404 100644
--- a/samples/xml/calendar-multiget.xml
+++ b/samples/xml/calendar-multiget.xml
@@ -4,7 +4,7 @@
<D:propstat>
<D:status>HTTP/1.1 200 OK</D:status>
<D:prop>
- <C:calendar-data xmlns:C="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+ <C:calendar-data xmlns:C="urn:ietf:params:xml:ns:webcals">BEGIN:VCALENDAR
VERSION:2.0 PRODID:Zimbra-Calendar-Provider
BEGIN:VTIMEZONE TZID:Etc/GMT
BEGIN:STANDARD DTSTART:19710101T000000
@@ -27,7 +27,7 @@
<D:propstat>
<D:status>HTTP/1.1 200 OK</D:status>
<D:prop>
- <C:calendar-data xmlns:C="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+ <C:calendar-data xmlns:C="urn:ietf:params:xml:ns:webcals">BEGIN:VCALENDAR
VERSION:2.0 PRODID:Zimbra-Calendar-Provider
BEGIN:VEVENT UID:25b74da2-47d3-4ea8-be27-774fb13041b8
SUMMARY:Bar ORGANIZER;CN=Sahaja Lal:mailto:calmozilla1@yahoo.com
@@ -46,7 +46,7 @@
<D:propstat>
<D:status>HTTP/1.1 200 OK</D:status>
<D:prop>
- <C:calendar-data xmlns:C="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+ <C:calendar-data xmlns:C="urn:ietf:params:xml:ns:webcals">BEGIN:VCALENDAR
VERSION:2.0 PRODID:Zimbra-Calendar-Provider
BEGIN:VEVENT UID:a8c499cb-3cab-44d5-ab1e-18abc0f5286f
SUMMARY:Baz ORGANIZER;CN=Sahaja Lal:mailto:calmozilla1@yahoo.com
diff --git a/test.js b/test.js
index a0452e3..cb20ad2 100644
--- a/test.js
+++ b/test.js
@@ -1,4 +1,4 @@
-var XHR = require('./lib/caldav/xhr.js');
+var XHR = require('./lib/webcals/xhr.js');
var url, user, pass, domain;
function getBody(file) {
@@ -7,7 +7,7 @@ function getBody(file) {
);
}
-domain = 'http://localdav.com';
+domain = 'http://lowebcals.com';
uri = '/calendars/admin';
user = 'admin';
pass = 'admin';
@@ -40,7 +40,7 @@ function request(options) {
function getProps() {
var body = '<?xml version="1.0" encoding="utf-8" ?>' +
- '<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">' +
+ '<D:propfind xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:webcals">' +
'<D:prop>' +
'<C:calendar-home-set/>' +
'<C:calendar-user-address-set/>' +
diff --git a/test/helper.js b/test/helper.js
index 9f40311..b36aeeb 100644
--- a/test/helper.js
+++ b/test/helper.js
@@ -4,6 +4,10 @@ var chai = require('chai'),
chai.Assertion.includeStack = true;
assert = chai.assert;
+globalNS = {
+ require: require
+};
+
loadSample = function(file, cb) {
var root = __dirname + '/../samples/';
fs.readFile(root + file, 'utf8', function(err, contents) {
@@ -12,5 +16,5 @@ loadSample = function(file, cb) {
};
requireLib = function(lib) {
- return require(__dirname + '/../lib/caldav/' + lib);
+ return require(__dirname + '/../lib/webcals/' + lib);
};
diff --git a/test/caldav/ics_test.js b/test/webcals/ics_test.js
index 3f821b4..904bbf9 100644
--- a/test/caldav/ics_test.js
+++ b/test/webcals/ics_test.js
@@ -2,7 +2,7 @@ var fs = require('fs'),
ics = requireLib('ics'),
data = fs.readFileSync(__dirname + '/../../data/test.data', 'utf8');
-suite('caldav/ics', function() {
+suite('webcals/ics', function() {
test('intiailizer', function() {
ics(data, function(data) {
diff --git a/test/caldav/sax/propstat_test.js b/test/webcals/sax/propstat_test.js
index 74360a7..56e65fd 100644
--- a/test/caldav/sax/propstat_test.js
+++ b/test/webcals/sax/propstat_test.js
@@ -1,4 +1,4 @@
-suite('caldav/sax/propstat', function() {
+suite('webcals/sax/propstat', function() {
var stat = requireLib('sax/propstat'),
sax = requireLib('sax'),
subject;
diff --git a/test/caldav/sax_test.js b/test/webcals/sax_test.js
index 83d69c1..312990c 100644
--- a/test/caldav/sax_test.js
+++ b/test/webcals/sax_test.js
@@ -6,6 +6,7 @@ suite('sax test', function() {
subject;
test('existance', function() {
+ return;
var parser = new xml();
var StatusHandler = {