Merge remote-tracking branch 'linkeddata/master'

# Conflicts:
#	rdfparser.js

Author: Jim Amsden

.gitignore

@@ -1,6 +1,2 @@
 parsers/*.js
-tests/*.js
 node_modules
-npm-debug.log
-dist/rdflib-rdfa.js
-web_browserify.js

.travis.yml

@@ -1,5 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - "0.12"
+  - "4.0"
+  - "5.0"
 

Makefile

@@ -1,57 +1,31 @@
 # rdflib.js Makefile
 
-R=util.js uri.js term.js rdfparser.js n3parser.js identity.js \
-	patchParser.js query.js sparql.js update.js jsonparser.js serialize.js updatesVia.js web_browserify.js
+R=util.js uri.js term.js rdfparser.js n3parser.js identity.js parseRDFa.js  \
+	patchParser.js query.js sparql.js update.js jsonparser.js serialize.js \
+	updatesVia.js web.js
 
-A=util.js uri.js term.js rdfparser.js n3parser.js identity.js \
-	parseRDFa.js  \
-	patchParser.js query.js sparql.js update.js jsonparser.js serialize.js updatesVia.js web_browserify.js
-
-targets=$(addprefix dist/, rdflib.js rdflib-rdfa.js)
-coffeejs=$(patsubst %.coffee,%.js,$(wildcard *.coffee))
+targets=$(addprefix dist/, rdflib-node.js)
+# coffeejs=$(patsubst %.coffee,%.js,$(wildcard *.coffee))
 
 PATH:=./node_modules/.bin:${PATH}
 
-all: web_browserify.js dist $(targets)
+all: dist $(targets) dist/rdflib.js
+
+size:
+	wc $R
 
-web_browserify.js: web.js
-	browserify web.js -o web_browserify.js
+dist/rdflib.js: dist/rdflib-node.js
+	browserify -r ./dist/rdflib-node.js:rdflib --exclude "xmlhttprequest" --standalone "\$$rdf" > dist/rdflib.js
 
 dist:
 	mkdir -p dist
 
-alpha: dist/rdflib-alpha.js
-	echo
-
-dist/rdflib-alpha.js: $R module.js
-	echo "(function(root, undef) {" > $@
-	cat $R module.js >> $@
-	date '+$$rdf.buildTime = "%Y-%m-%dT%H:%M:%S";'  >> $@
-	echo "})(this);" >> $@
-
-dist/rdflib.js: $R module.js
+dist/rdflib-node.js: $R module.js
+# dist/rdflib.js: $R module.js
 	echo "(function(root, undef) {" > $@
 	cat $R module.js >> $@
 	date '+$$rdf.buildTime = "%Y-%m-%dT%H:%M:%S";'  >> $@
-	echo "})(this);" >> $@
-
-J=dist
-# X=jquery.uri.js jquery.xmlns.js
-
-dist/rdflib-rdfa.js: $X $A module.js
-	echo "(function(root, undef) {" > $@
-	date '+$$rdf.buildTime = "%Y-%m-%dT%H:%M:%S";'  >> $@
-	cat $A module.js >> $@
-	echo "})(this);" >> $@
-
-# This URL rotted and we don't update this anymore 2015-02
-#jquery.uri.js:
-#	wget http://rdfquery.googlecode.com/svn-history/trunk/jquery.uri.js -O $@
-#
-#jquery.xmlns.js:
-#	wget http://rdfquery.googlecode.com/svn-history/trunk/jquery.xmlns.js -O $@
-
-upstream: jquery.uri.js jquery.xmlns.js
+	echo '})(this);' >> $@
 
 .PHONY: detach gh-pages
 
@@ -71,8 +45,8 @@ gh-pages: detach
 	git checkout master
 
 clean:
-	rm -f $(targets) $(coffeejs)
-	rm -f web_browserify.js
+	rm -f $(targets)
+	rm -f dist/rdflib.js
 
 status:
 	@pwd
@@ -84,17 +58,16 @@ writable:
 
 # npm install -g coffee-script nodeunit
 
-SRC=$(wildcard *.coffee */*.coffee)
-LIB=$(SRC:%.coffee=%.js)
+# SRC=$(wildcard *.coffee */*.coffee)
+# LIB=$(SRC:%.coffee=%.js)
 
-%.js: %.coffee
-	coffee -bp $< > $@
+# %.js: %.coffee
+# 	coffee -bp $< > $@
 
-.PHONY: coffee
-coffee: $(LIB)
+# .PHONY: coffee
+# coffee: $(LIB)
 
 .PHONY: test
-test: $(LIB)
+test: # $(LIB)
 	@nodeunit tests/*.js
 	make -C tests/serialize
-

README.md

@@ -1,49 +1,52 @@
 # rdflib.js
-
+[![NPM Version](https://img.shields.io/npm/v/rdflib.svg?style=flat)](https://npm.im/rdflib)
 [![Join the chat at https://gitter.im/linkeddata/rdflib.js](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/linkeddata/rdflib.js?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-Javascript RDF library for browsers and NodeJS.
+Javascript RDF library for browsers and Node.js.
 
-- Reads and writes RDF/xml, turtle and N3.
+- Reads and writes RDF/xml, Turtle and N3.
 - Read/Write Linked Data client, using WebDav or SPARQL/Update
-- Parses RDF/a. (rdflib-rdfa.js version only)
-- Local API for querying store
+- Parses RDF/a
+- Local API for querying a store
 - SPARQL queries (not full SPARQL)
-- Smushing of nodes from owl:sameAs, and owl:{f,inverseF}unctionProperty
+- Smushing of nodes from `owl:sameAs`, and `owl:{f,inverseF}unctionProperty`
 - Tracks provence of triples keeps metadata (in RDF) from HTTP accesses
 
-## Install
+## Documentation
 
-#### Browser
+See **[Tutorial for using rdflib.js](https://github.com/solid/solid-tutorial-rdflib.js)**
+for more information.
 
-Install dependencies you may need to generate the js file.
+Possible out of date information is available from here:
+[http://dig.csail.mit.edu/2005/ajar/ajaw/Developer.html](http://dig.csail.mit.edu/2005/ajar/ajaw/Developer.html).
+
+## Install
 
 ```bash
-$ npm install -g coffee-script nodeunit   
+npm install
 ```
 
 Generate the dist directory
 
 ```bash
-$ npm install
+make all
 ```
 
-#### NodeJS
+#### Node.js
+
+Make sure you have Node.js and Node Package Manager ([npm](https://npmjs.org/))
+installed.
 
-Make sure you have NodeJS and Node Package Manager ([npm](https://npmjs.org/)) installed.
 ```bash
 npm install --save rdflib
 ```
 
-## Documentation
-
-Possible out of date information is available from here: [http://dig.csail.mit.edu/2005/ajar/ajaw/Developer.html](http://dig.csail.mit.edu/2005/ajar/ajaw/Developer.html).
-
 ## Contribute
 
 #### Subdirectories
 
-- `dist`, Run 'make' in this directory to generate dist in whch libraries are buit
+- `dist`, Run 'make' in this directory to generate dist in which libraries are
+  built
 - `test`, Tests are here.
 
 #### Dependencies