Merge pull request #31 from jmdobry/0.7.0

0.7.0
js-data · Feb 25, 2014 · e8b3962 · e8b3962
2 parents b48c9b9 + 7224f18
commit e8b3962
Show file tree

Hide file tree

Showing 57 changed files with 3,148 additions and 1,109 deletions.
diff --git a/.npmignore b/.npmignore
@@ -0,0 +1,10 @@
+.*
+bower.json
+*.iml
+.idea/
+test/
+coverage/
+bower_components/
+karma*
+guide/
+doc/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+##### 0.7.0 - 24 February 2014
+
+###### Breaking API changes
+- `DS.eject(resourceName, id)` can now only eject individual items
+
+###### Backwards API changes
+- #34 - Added `DS.ejectAll(resourceName, params)`
+- #33 - Added `DS.destroyAll(resourceName, params[, options])`
+- #35 - Add options for asynchronous getter methods to return data without putting it into the data store
+
 ##### 0.6.0 - 17 January 2014
 
 Added pluggable filters for the "where" clause of a query. Angular-data's "query language" will remain small and simple.

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -11,9 +11,12 @@ module.exports = function (grunt) {
 	require('load-grunt-tasks')(grunt);
 	require('time-grunt')(grunt);
 
+	var dev = process.cwd().indexOf('/home/codetrain/angular-data') === -1,
+		pkg = grunt.file.readJSON('package.json');
+
 	// Project configuration.
 	grunt.initConfig({
-		pkg: grunt.file.readJSON('package.json'),
+		pkg: pkg,
 		clean: {
 			coverage: ['coverage/'],
 			dist: ['dist/'],
@@ -70,13 +73,13 @@ module.exports = function (grunt) {
 				files: {
 					'dist/angular-data.js': ['src/index.js']
 				},
-				// TODO: There's got to be a better way to consume observe-js without it polluting the global space
 				options: {
 					alias: [
-						'lib/observe-js.js:observejs',
+						'lib/observe-js/observe-js.js:observejs',
 						'src/errors/index.js:errors',
 						'src/utils/index.js:utils'
 					],
+					// TODO: There's got to be a better way to consume observe-js without it polluting the global space
 					postBundleCB: function (err, src, next) {
 						if (err) {
 							next(err);
@@ -170,6 +173,13 @@ module.exports = function (grunt) {
 				dest: 'doc/resources/img/',
 				flatten: true
 			},
+			chart: {
+				expand: true,
+				cwd: 'guide/',
+				src: 'chart.png',
+				dest: 'doc/resources/img/',
+				flatten: true
+			},
 			cream_dust: {
 				expand: true,
 				cwd: 'guide/',
@@ -186,9 +196,15 @@ module.exports = function (grunt) {
 					groupIcon: 'icon-book',
 					sections: [
 						{
-							id: 'overview',
-							title: 'Overview',
-							docs: ['guide/overview/'],
+							id: 'angular-data',
+							title: 'angular-data',
+							docs: [
+								'guide/angular-data/index.doc',
+								'guide/angular-data/overview.doc',
+								'guide/angular-data/resources.doc',
+								'guide/angular-data/synchronous.doc',
+								'guide/angular-data/asynchronous.doc'
+							],
 							rank: {
 								index: 1,
 								overview: 2,
@@ -198,14 +214,45 @@ module.exports = function (grunt) {
 							}
 						},
 						{
-							id: 'resource',
+							id: 'angular-cache',
+							title: 'angular-cache',
+							docs: ['guide/angular-cache/'],
+							rank: {
+								index: 1,
+								basics: 2,
+								configure: 3,
+								http: 4,
+								storage: 5
+							}
+						},
+						{
+							id: 'angular-data-resource',
 							title: 'Defining Resources',
-							docs: ['guide/resource/'],
+							docs: ['guide/angular-data/resource/'],
 							rank: {
 								index: 1,
 								overview: 2,
 								basic: 3,
-								advanced: 4
+								advanced: 4,
+								lifecycle: 5
+							}
+						},
+						{
+							id: 'angular-data-queries',
+							title: 'Queries',
+							docs: ['guide/angular-data/queries/'],
+							rank: {
+								index: 1,
+								overview: 2
+							}
+						},
+						{
+							id: 'angular-data-adapters',
+							title: 'Adapters',
+							docs: ['guide/angular-data/adapters/'],
+							rank: {
+								index: 1,
+								overview: 2
 							}
 						}
 					]
@@ -217,12 +264,20 @@ module.exports = function (grunt) {
 					showSource: true,
 					sections: [
 						{
-							id: 'api',
+							id: 'angular-data',
 							title: 'angular-data',
 							scripts: [
 								'src/'
 							],
 							docs: ['guide/api']
+						},
+						{
+							id: 'angular-cache',
+							title: 'angular-cache',
+							scripts: [
+								'bower_components/angular-cache/dist/angular-cache.js'
+							],
+							docs: ['guide/api']
 						}
 					]
 				}
@@ -232,13 +287,36 @@ module.exports = function (grunt) {
 			showAngularDocs: false,
 			docular_partial_home: 'guide/home.html',
 			docular_partial_navigation: 'guide/nav.html',
-			docular_partial_footer: 'guide/footer.html'
+			docular_partial_footer: 'guide/footer.html'//,
+//			analytics: {
+//				account: 'UA-46792694-5',
+//				domainName: 'angular-cache.codetrain.io'
+//			},
+//			discussions: {
+//				shortName: 'angular-data',
+//				url: 'http://angular-cache.codetrain.io',
+//				dev: dev
+//			}
 		}
 	});
 
+	grunt.registerTask('version', function (filePath) {
+		var file = grunt.file.read(filePath);
+
+		file = file.replace(/<%= pkg\.version %>/gi, pkg.version);
+
+		grunt.file.write(filePath, file);
+	});
+
 	grunt.registerTask('test', ['clean:coverage', 'karma:dev']);
 	grunt.registerTask('doc', ['clean:doc', 'docular', 'concat', 'copy', 'clean:afterDoc', 'uglify:scripts']);
-	grunt.registerTask('build', ['clean:dist', 'jshint', 'browserify', 'uglify:main']);
+	grunt.registerTask('build', [
+		'clean',
+		'jshint',
+		'browserify',
+		'version:dist/angular-data.js',
+		'uglify:main'
+	]);
 	grunt.registerTask('default', ['build']);
 
 	// Used by TravisCI

diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "author": "Jason Dobry",
   "name": "angular-data",
   "description": "Data store for Angular.js.",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "homepage": "http://jmdobry.github.io/angular-data/",
   "repository": {
     "type": "git",
@@ -11,22 +11,24 @@
   "main": "./dist/angular-data.min.js",
   "ignore": [
     ".idea/",
-    ".bowerrc",
+    ".*",
     "*.iml",
     "src/",
+    "lib/",
     "doc/",
     "guide/",
     "coverage/",
-    ".jshintrc",
     "Gruntfile.js",
     "node_modules/",
     "test/",
+    "package.json",
     "karma.conf.js",
-    ".gitignore",
-    ".travis.yml"
+    "karma.start.js"
   ],
   "devDependencies": {
-    "angular": "~1.2.8",
-    "angular-mocks": "~1.2.8"
+    "angular": "~1.2.13",
+    "angular-mocks": "~1.2.13",
+    "angular-cache": "~3.0.0-beta.1",
+    "observe-js": "~0.2.0"
   }
 }