Permalink
Browse files

Merge branch 'master' into Notifier

Conflicts:
	Gruntfile.js
  • Loading branch information...
2 parents e0e4b66 + 24e4022 commit d4da0ed15c495a5d7690a112cc6913dff499f5b5 @kborchers committed Mar 25, 2013
Showing with 1,401 additions and 14,308 deletions.
  1. +4 −0 .gitignore
  2. +14 −12 Gruntfile.js
  3. +30 −8 README.md
  4. +1 −1 component.json
  5. +0 −1,850 dist/aerogear.js
  6. +0 −1 dist/aerogear.js.map
  7. +0 −17 dist/aerogear.min.js
  8. +0 −122 docs/134779558e.html
  9. +0 −418 docs/16d174296b.html
  10. +0 −117 docs/39b39c364a.html
  11. +0 −179 docs/5bda6a95a1.html
  12. +0 −567 docs/6b2ce5cca5.html
  13. +0 −456 docs/9e1e419dfc.html
  14. +0 −1,480 docs/AeroGear.Auth.adapters.Rest.html
  15. +0 −797 docs/AeroGear.Auth.html
  16. +0 −1,047 docs/AeroGear.DataManager.adapters.Memory.html
  17. +0 −819 docs/AeroGear.DataManager.adapters.SessionLocal.html
  18. +0 −834 docs/AeroGear.DataManager.html
  19. +0 −2,123 docs/AeroGear.Pipeline.adapters.Rest.html
  20. +0 −834 docs/AeroGear.Pipeline.html
  21. +0 −134 docs/AeroGear.html
  22. +0 −164 docs/aerogear.core.js.html
  23. +0 −115 docs/f25d3e32ae.html
  24. +0 −86 docs/index.html
  25. +0 −202 docs/scripts/prettify/Apache-License-2.0.txt
  26. +0 −2 docs/scripts/prettify/lang-css.js
  27. +0 −28 docs/scripts/prettify/prettify.js
  28. +0 −286 docs/styles/jsdoc-default.css
  29. +0 −111 docs/styles/prettify-jsdoc.css
  30. +0 −132 docs/styles/prettify-tomorrow.css
  31. +1 −1 package.json
  32. +1 −1 src/aerogear.core.js
  33. +312 −314 src/authentication/adapters/rest.js
  34. +42 −44 src/authentication/aerogear.auth.js
  35. +343 −345 src/data-manager/adapters/memory.js
  36. +101 −103 src/data-manager/adapters/session-local.js
  37. +47 −49 src/data-manager/aerogear.datamanager.js
  38. +462 −464 src/pipeline/adapters/rest.js
  39. +43 −45 src/pipeline/aerogear.pipeline.js
View
@@ -0,0 +1,4 @@
+*.yaml
+dist/
+docs/
+node_modules/
View
@@ -29,19 +29,19 @@ module.exports = function(grunt) {
banner: "<%= meta.banner %>"
},
dist: {
- src: ['src/aerogear.core.js', 'src/utilities/aerogear.utilities.js', 'external/uuid/uuid.js', 'src/pipeline/aerogear.pipeline.js', 'src/pipeline/adapters/rest.js', 'src/data-manager/aerogear.datamanager.js', 'src/data-manager/adapters/memory.js', 'src/data-manager/adapters/session-local.js', 'src/authentication/aerogear.auth.js', 'src/authentication/adapters/rest.js', 'src/notifier/aerogear.notifier.js', 'src/notifier/adapters/vertx.js'],
+ src: ['src/aerogear.core.js', 'external/uuid/uuid.js', 'src/pipeline/aerogear.pipeline.js', 'src/pipeline/adapters/rest.js', 'src/data-manager/aerogear.datamanager.js', 'src/data-manager/adapters/memory.js', 'src/data-manager/adapters/session-local.js', 'src/authentication/aerogear.auth.js', 'src/authentication/adapters/rest.js'],
dest: 'dist/<%= pkg.name %>.js'
},
pipeline: {
- src: ['src/aerogear.core.js', 'src/utilities/aerogear.utilities.js', 'external/uuid/uuid.js', 'src/pipeline/aerogear.pipeline.js', 'src/pipeline/adapters/rest.js'],
+ src: ['src/aerogear.core.js', 'external/uuid/uuid.js', 'src/pipeline/aerogear.pipeline.js', 'src/pipeline/adapters/rest.js'],
dest: 'dist/<%= pkg.name %>.custom.js'
},
dataManager: {
- src: ['src/aerogear.core.js', 'src/utilities/aerogear.utilities.js', 'external/uuid/uuid.js', 'src/data-manager/aerogear.datamanager.js', 'src/data-manager/adapters/memory.js', 'src/data-manager/adapters/session-local.js'],
+ src: ['src/aerogear.core.js', 'external/uuid/uuid.js', 'src/data-manager/aerogear.datamanager.js', 'src/data-manager/adapters/memory.js', 'src/data-manager/adapters/session-local.js'],
dest: 'dist/<%= pkg.name %>.custom.js'
},
auth: {
- src: ['src/aerogear.core.js', 'src/utilities/aerogear.utilities.js', 'src/authentication/aerogear.auth.js', 'src/authentication/adapters/rest.js'],
+ src: ['src/aerogear.core.js', 'src/authentication/aerogear.auth.js', 'src/authentication/adapters/rest.js'],
dest: 'dist/<%= pkg.name %>.custom.js'
},
notifier: {
@@ -68,6 +68,8 @@ module.exports = function(grunt) {
options: {
banner: "<%= meta.banner %>",
sourceMap: "dist/<%= pkg.name %>.js.map",
+ sourceMappingURL: "<%= pkg.name %>.js.map",
+ sourceMapPrefix: 1,
beautify: {
ascii_only: true
}
@@ -88,13 +90,14 @@ module.exports = function(grunt) {
}
});
- var exec = require('child_process').exec;
- grunt.registerTask('docs', function() {
- grunt.log.writeln('Remove old docs');
- exec('rm -r docs');
- grunt.log.writeln('Old docs removed\nGenerate new docs');
- exec('jsdoc src/ -r -d docs README.md');
- grunt.log.writeln('New docs generated');
+ // IIFE wrapper task
+ grunt.registerTask('iife', function( custom ) {
+ var fs = require("fs"),
+ fileName = "dist/" + grunt.config("pkg").name + (custom ? ".custom" : "") + ".js",
+ fileText = fs.readFileSync( fileName, "utf-8" );
+
+ fileText = fileText.replace( /\*\//, "*/\n(function( window, undefined ) {\n" );
+ fs.writeFileSync( fileName, fileText + "})( this );\n", "utf-8" );
});
// grunt-contrib tasks
@@ -106,7 +109,6 @@ module.exports = function(grunt) {
// Default task
grunt.registerTask('default', ['jshint', 'qunit', 'concat:dist', 'uglify:all']);
grunt.registerTask('dev', ['jshint', 'concat:dist', 'uglify:all']);
- grunt.registerTask('build+docs', ['jshint', 'qunit', 'concat:dist', 'uglify:all', 'docs']);
grunt.registerTask('pipeline', ['jshint', 'qunit', 'concat:pipeline', 'uglify:custom']);
grunt.registerTask('data-manager', ['jshint', 'qunit', 'concat:dataManager', 'uglify:custom']);
grunt.registerTask('auth', ['jshint', 'qunit', 'concat:auth', 'uglify:custom']);
View
@@ -1,25 +1,47 @@
-aerogear-js
-===========
+# aerogear-js
JavaScript client library implementation for AeroGear. Eventually, this will include API's for persistence, security, data synchronization and more.
-Auth
-----
+## Auth
+- - -
The AeroGear.Auth namespace provides an authentication and enrollment API. Through the use of adapters, this library provides common methods like enroll, login and logout that will just work.
See the [Auth API docs](http://aerogear.org/docs/specs/aerogear-js/AeroGear.Auth.html) for more info.
-DataManager
------------
+## DataManager
+- - -
A collection of data connections (stores) and their corresponding data models. This object provides a standard way to interact with client side data no matter the data format or storage mechanism used.
See the [DataManager API docs](http://aerogear.org/docs/specs/aerogear-js/AeroGear.DataManager.html) for more info.
-Pipeline
---------
+## Pipeline
+- - -
Pipeline is a JavaScript library that provides a persistence API that is protocol agnostic and does not depend on any certain data model. Through the use of adapters, both provided and custom, user supplied, this library provides common methods like read, save and delete that will just work.
See the [Pipeline API docs](http://aerogear.org/docs/specs/aerogear-js/AeroGear.Pipeline.html) for more info.
+
+## Building
+- - -
+
+### Grunt
+
+[Grunt](http://gruntjs.com/) is used as the build tool which requires [Node.js](http://nodejs.org/) version >= 0.8.0.
+Please refer to [nodejs.org](http://nodejs.org) for details regarding installing Node.js.
+Please refer to Grunt's [getting started](http://gruntjs.com/getting-started) guide for details regarding installing Grunt.
+
+### Installing Dependencies
+To install the dependencies of the project run the following command:
+
+ $ npm install
+
+This will install the versions of the dependencies declared in package.json. This is only requried to be done once before
+building the first time, or if the dependencies in package.json have been updated.
+
+### Building the project
+
+ $ grunt
+
+The produced JavaScript will be in the __dist__ directory.
View
@@ -2,7 +2,7 @@
"name": "aerogear",
"title": "AeroGear JavaScript Library",
"description": "Provides a lightweight set of utilities for communication, security, storage and more.",
- "version": "1.0.0-M3",
+ "version": "1.0.0-CR1",
"main": "./dist/aerogear.min.js",
"homepage": "https://github.com/aerogear/aerogear-js",
"author": {
Oops, something went wrong.

0 comments on commit d4da0ed

Please sign in to comment.