Merge pull request #217 from jmdobry/feature-$http-fallback

Added a fallback to using $http if js-data-http isn't loaded.

Author: jmdobry

.travis.yml

@@ -9,5 +9,5 @@ before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 script:
-  - grunt build
+  - grunt test
   - grunt coveralls || true

CHANGELOG.md

@@ -6,6 +6,7 @@
 ###### Other
 - #199 - Re-implement bindOne & bindAll in js-data-angular (they're missing from js-data)
 - #200 - Need to properly trigger digest where angular-data would have before
+- Added DSHttpAdapter fallback that uses $http if js-data-http isn't loaded
 
 ##### 1.0.0 - 04 October 2014
 

Gruntfile.js

@@ -35,14 +35,14 @@ module.exports = function (grunt) {
       main: {
         options: {
           banner: '/**\n' +
-            '* @author Jason Dobry <[email protected]>\n' +
-            '* @file js-data-angular.min.js\n' +
-            '* @version <%= pkg.version %> - Homepage <https://www.js-data.io/js-data-angular/>\n' +
-            '* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>\n' +
-            '* @license MIT <https://github.com/js-data/js-data-angular/blob/master/LICENSE>\n' +
-            '*\n' +
-            '* @overview Angular wrapper for js-data.\n' +
-            '*/\n'
+          '* @author Jason Dobry <[email protected]>\n' +
+          '* @file js-data-angular.min.js\n' +
+          '* @version <%= pkg.version %> - Homepage <https://www.js-data.io/js-data-angular/>\n' +
+          '* @copyright (c) 2014 Jason Dobry <https://github.com/jmdobry/>\n' +
+          '* @license MIT <https://github.com/js-data/js-data-angular/blob/master/LICENSE>\n' +
+          '*\n' +
+          '* @overview Angular wrapper for js-data.\n' +
+          '*/\n'
         },
         files: {
           'dist/js-data-angular.min.js': ['dist/js-data-angular.js']
@@ -63,6 +63,39 @@ module.exports = function (grunt) {
           'dist/js-data-angular.js': ['src/index.js']
         }
       }
+    },
+    karma: {
+      options: {
+        configFile: './karma.conf.js'
+      },
+      dev: {
+        browsers: ['Chrome'],
+        autoWatch: true,
+        singleRun: false,
+        reporters: ['spec'],
+        preprocessors: {}
+      },
+      min: {
+        browsers: ['Firefox', 'PhantomJS'],
+        options: {
+          files: [
+            'bower_components/angular-1.3.2/angular.js',
+            'bower_components/angular-mocks-1.3.2/angular-mocks.js',
+            'bower_components/js-data/dist/js-data.js',
+            'dist/js-data-angular.min.js',
+            'karma.start.js',
+            'test/**/*.js'
+          ]
+        }
+      },
+      ci: {
+        browsers: ['Firefox', 'PhantomJS']
+      }
+    },
+    coveralls: {
+      options: {
+        coverage_dir: 'coverage'
+      }
     }
   });
 
@@ -101,4 +134,5 @@ module.exports = function (grunt) {
   ]);
   grunt.registerTask('go', ['build', 'watch:dist']);
   grunt.registerTask('default', ['build']);
+  grunt.registerTask('test', ['build', 'karma:min']);
 };

bower.json

@@ -1,12 +1,12 @@
 {
   "author": "Jason Dobry",
   "name": "js-data-angular",
-  "description": "Angular wrapper for js-data.",
-  "version": "2.0.0-alpha.1-0",
+  "description": "Angular wrapper for js-data (originally angular-data).",
+  "version": "2.0.0-alpha.2-0",
   "homepage": "http://www.js-data.io/js-data-angular",
   "repository": {
     "type": "git",
-    "url": "git://github.com/js-data/js-data-angular.git"
+    "url": "https://github.com/js-data/js-data-angular.git"
   },
   "main": "./dist/js-data-angular.min.js",
   "ignore": [
@@ -18,7 +18,20 @@
     "node_modules/",
     "package.json"
   ],
+  "devDependencies": {
+    "angular-1.1.5": "angular-unstable#1.1.5",
+    "angular-1.2.16": "angular#1.2.16",
+    "angular-1.2.25": "angular#1.2.25",
+    "angular-1.3.2": "angular#1.3.2",
+    "angular-mocks-1.1.5": "angular-mocks-unstable#1.1.5",
+    "angular-mocks-1.2.16": "angular-mocks#1.2.16",
+    "angular-mocks-1.2.25": "angular-mocks#1.2.25",
+    "angular-mocks-1.3.2": "angular-mocks#1.3.2"
+  },
   "dependencies": {
-    "js-data": "~0.4.x"
+    "js-data": "~1.0.x"
+  },
+  "resolutions": {
+    "angular": "1.3.2"
   }
 }