angularjs-rails-resource 2.2.2 → 2.3.0

data/package.json

@@ -1,10 +1,10 @@
 {
   "name": "angularjs-rails-resource",
-  "description" : "A resource factory inspired by $resource from AngularJS",
-  "version": "2.2.2",
-  "main" : "angularjs-rails-resource.min.js",
-  "homepage" : "https://github.com/FineLinePrototyping/angularjs-rails-resource.git",
-  "author" : "",
+  "description": "A resource factory inspired by $resource from AngularJS",
+  "version": "2.3.0",
+  "main": "angularjs-rails-resource.min.js",
+  "homepage": "https://github.com/FineLinePrototyping/angularjs-rails-resource.git",
+  "author": "",
   "repository": {
     "type": "git",
     "url": "https://github.com/FineLinePrototyping/angularjs-rails-resource.git"
@@ -14,29 +14,31 @@
     "resources"
   ],
   "dependencies": {
-    "angular": "^1.0"
+    "angular": "^1.3"
   },
   "devDependencies": {
+    "angular-mocks": "^1.3",
     "grunt": "~0.4.1",
-    "grunt-contrib-jshint": "~0.6.0",
-    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-bump": "~0.0.13",
+    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-compress": "~0.5.2",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-clean": "~0.5.0",
+    "grunt-contrib-jshint": "~0.6.0",
+    "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-watch": "~0.5.1",
-    "grunt-contrib-compress": "~0.5.2",
-    "grunt-bump": "~0.0.13",
-    "karma": "~0.10",
+    "karma": "~2.0",
+    "karma-chrome-launcher": "~2.2",
     "karma-jasmine": "~0.1",
-    "karma-chrome-launcher": "~0.1",
-    "karma-phantomjs-launcher": "~0.1",
-    "karma-junit-reporter": "~0.1",
+    "karma-junit-reporter": "~1.2",
+    "karma-phantomjs-launcher": "~1.0",
+    "phantomjs-prebuilt": ">=2",
     "q": "~0.9.2",
     "q-io": "~1.10.6",
     "qq": "~0.3.5"
   },
   "scripts": {
-    "test": "./node_modules/.bin/karma start --single-run --browsers PhantomJS"
+    "test": "PHANTOMJS_BIN=./node_modules/.bin/phantomjs ./node_modules/.bin/karma start --single-run --browsers PhantomJS"
   },
   "licenses": [
     {
@@ -44,4 +46,4 @@
       "url": "https://github.com/FineLinePrototyping/angularjs-rails-resource.js/blob/master/LICENSE"
     }
   ]
-}
+}

data/test/unit/angularjs/rails/extensions/snapshotsSpec.js

@@ -27,12 +27,12 @@ describe('RailsResource.snapshots', function () {
         book = new Book(data);
         expect(book.snapshot()).toBe(0);
 
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(1);
-        expect(book.$snapshots[0].$snapshots).toBeUndefined();
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(1);
+        expect(book.$$snapshots[0].$$snapshots).toBeUndefined();
         expect(book).toEqualData(data);
-        expect(book.$snapshots[0].$key).toBe('1234');
-        expect(book.$snapshots[0]).toEqualData(data);
+        expect(book.$$snapshots[0].$key).toBe('1234');
+        expect(book.$$snapshots[0]).toEqualData(data);
     });
 
     it('should store deep copy', function () {
@@ -49,9 +49,9 @@ describe('RailsResource.snapshots', function () {
         book = new Book(data);
         book.snapshot();
 
-        expect(book.$snapshots[0].author).toBeDefined();
-        expect(book.$snapshots[0].author.id).toBe(1);
-        expect(book.$snapshots[0]).toEqualData(data);
+        expect(book.$$snapshots[0].author).toBeDefined();
+        expect(book.$$snapshots[0].author.id).toBe(1);
+        expect(book.$$snapshots[0]).toEqualData(data);
     });
 
     it('should store multiple snapshots', function () {
@@ -63,11 +63,11 @@ describe('RailsResource.snapshots', function () {
         book.$key = '1236';
         expect(book.snapshot()).toBe(2);
 
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(3);
-        expect(book.$snapshots[0].$key).toBe('1234');
-        expect(book.$snapshots[1].$key).toBe('1235');
-        expect(book.$snapshots[2].$key).toBe('1236');
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(3);
+        expect(book.$$snapshots[0].$key).toBe('1234');
+        expect(book.$$snapshots[1].$key).toBe('1235');
+        expect(book.$$snapshots[2].$key).toBe('1236');
     });
 
     it('should rollback single version', function () {
@@ -80,8 +80,8 @@ describe('RailsResource.snapshots', function () {
         book.rollback();
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(1);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(1);
     });
 
     it('should rollback deep copy', function () {
@@ -142,13 +142,13 @@ describe('RailsResource.snapshots', function () {
         book.rollback();
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(1);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(1);
         book.rollback();
 
         expect(book.$key).toBe('1234');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
 
@@ -164,8 +164,8 @@ describe('RailsResource.snapshots', function () {
         book.rollback(2);
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(1);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(1);
     });
 
     it('should not change resource on rollback if no snapshots saved', function () {
@@ -188,8 +188,8 @@ describe('RailsResource.snapshots', function () {
         book.rollback(-1);
 
         expect(book.$key).toBe('1234');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should roll back to the first snapshot when versions exceeds available snapshots', function () {
@@ -203,8 +203,8 @@ describe('RailsResource.snapshots', function () {
         book.rollback(1000);
 
         expect(book.$key).toBe('1234');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should roll back to version in middle', function () {
@@ -218,8 +218,8 @@ describe('RailsResource.snapshots', function () {
         book.rollbackTo(1);
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(1);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(1);
     });
 
     it('should roll back to first version', function () {
@@ -233,8 +233,8 @@ describe('RailsResource.snapshots', function () {
         book.rollbackTo(0);
 
         expect(book.$key).toBe('1234');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should roll back to last version when version exceeds available versions', function () {
@@ -249,8 +249,8 @@ describe('RailsResource.snapshots', function () {
         book.rollbackTo(100);
 
         expect(book.$key).toBe('1236');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(2);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(2);
     });
 
     it('should reset snapshots on create', function () {
@@ -264,8 +264,8 @@ describe('RailsResource.snapshots', function () {
         $httpBackend.flush();
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should be able to save after rollback', function () {
@@ -280,8 +280,28 @@ describe('RailsResource.snapshots', function () {
         $httpBackend.flush();
 
         expect(book.$key).toBe('1234');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
+    });
+
+    it('should not submit $$snapshots', function () {
+        var book, data = {id: 1, $key: '1234', name: 'The Winds of Winter'};
+        book = new Book(data);
+        book.snapshot();
+        book.$key = '1235';
+
+        $httpBackend.whenPUT('/books/1', function(putData) {
+            var json = JSON.parse(putData);
+            expect(json.book.$$snapshots).toBeUndefined();
+            return true;
+        }).respond(200, {book: {id: 1}});
+
+        book.save();
+        $httpBackend.flush();
+
+        expect(book.$key).toBe('1235');
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should reset snapshots on update', function () {
@@ -295,8 +315,8 @@ describe('RailsResource.snapshots', function () {
         $httpBackend.flush();
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should reset snapshots on delete', function () {
@@ -310,8 +330,8 @@ describe('RailsResource.snapshots', function () {
         $httpBackend.flush();
 
         expect(book.$key).toBe('1235');
-        expect(book.$snapshots).toBeDefined();
-        expect(book.$snapshots.length).toBe(0);
+        expect(book.$$snapshots).toBeDefined();
+        expect(book.$$snapshots.length).toBe(0);
     });
 
     it('should call rollback callback on rollback', function () {
@@ -397,7 +417,7 @@ describe('RailsResource.snapshots', function () {
             book.snapshot();
             book.author.name = 'George Orwell';
 
-            expect(book.$snapshots[0].author).not.toBeDefined();
+            expect(book.$$snapshots[0].author).not.toBeDefined();
             expect(book.author).toEqualData({id: 1, name: 'George Orwell'});
 
             book.rollback();
@@ -435,8 +455,8 @@ describe('RailsResource.snapshots', function () {
             book.$key = '1235';
             book.author.name = 'George Orwell';
 
-            expect(book.$snapshots[0].author).toBeDefined();
-            expect(book.$snapshots[0].$key).not.toBeDefined();
+            expect(book.$$snapshots[0].author).toBeDefined();
+            expect(book.$$snapshots[0].$key).not.toBeDefined();
             expect(book.$key).toBe('1235');
             expect(book.author).toEqualData({id: 1, name: 'George Orwell'});
 

data/test/unit/angularjs/rails/resourceSpec.js

@@ -15,14 +15,15 @@ describe('railsResourceFactory', function () {
     });
 
     describe('singular', function() {
-        var $httpBackend, $rootScope, factory, Test, testInterceptor,
+        var $httpBackend, $timeout, $rootScope, factory, Test, testInterceptor,
             config = {
                 url: '/test',
                 name: 'test'
             };
 
-        beforeEach(inject(function (_$httpBackend_, _$rootScope_, railsResourceFactory, railsTestInterceptor) {
+        beforeEach(inject(function (_$httpBackend_, _$timeout_, _$rootScope_, railsResourceFactory, railsTestInterceptor) {
             $httpBackend = _$httpBackend_;
+            $timeout = _$timeout_;
             $rootScope = _$rootScope_;
             factory = railsResourceFactory;
             Test = railsResourceFactory(config);
@@ -177,22 +178,24 @@ describe('railsResourceFactory', function () {
         });
 
         it('get should call failure callback when 404', function () {
-            var promise, success = false, failure = false;
+            inject(function ($exceptionHandler) {
+                var promise, success = false, failure = false;
 
-            $httpBackend.expectGET('/test/123').respond(404);
+                $httpBackend.expectGET('/test/123').respond(404);
 
-            expect(promise = Test.get(123)).toBeDefined();
-
-            promise.then(function () {
-                success = true;
-            }, function () {
-                failure = true;
-            });
+                expect(promise = Test.get(123)).toBeDefined();
 
-            $httpBackend.flush();
+                promise.then(function () {
+                    success = true;
+                }, function () {
+                    failure = true;
+                });
 
-            expect(success).toBe(false);
-            expect(failure).toBe(true);
+                $httpBackend.flush();
+                expect($exceptionHandler.errors).toEqual([]);
+                expect(success).toBe(false);
+                expect(failure).toBe(true);
+            });
         });
 
         it('get with default params should add parameter abc=1', function () {
@@ -559,6 +562,164 @@ describe('railsResourceFactory', function () {
           expect(Resource.configure(config)).toBeInstanceOf(Object);
         });
 
+        it('get should catch exceptions on failure', function () {
+            inject(function ($exceptionHandler) {
+                var failure = false;
+
+                $httpBackend.expectGET('/test/123').respond(500);
+
+                Test.get(123).catch(function (response) { failure = true});
+
+                $httpBackend.flush();
+                expect($exceptionHandler.errors).toEqual([]);
+                expect(failure).toBeTruthy();
+            });
+        });
+
+        it('get should timeout after configured time', function () {
+            var promise, Resource, success = false, failure = false;
+            $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+            
+            Resource = factory(angular.extend({}, config, {
+                httpConfig: {
+                    timeout: 5000
+                }
+            }));
+            promise = Resource.get(123);
+            promise.then(function () {
+                success = true;
+            }, function () {
+                failure = true;
+            });
+
+            $timeout.flush();
+            $httpBackend.verifyNoOutstandingExpectation();
+            $httpBackend.verifyNoOutstandingRequest();
+            expect(success).toBeFalsy();
+            expect(failure).toBeTruthy();                
+        });
+
+        it('$http should abort after timeout promise resolved', function () {
+            inject(function ($q) {
+                var promise, success = false, failure = false,
+                    timeoutDeferred = $q.defer();
+                $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+
+                promise = Test.$http({method: 'get', url: Test.resourceUrl(123), timeout: timeoutDeferred.promise});
+                promise.then(function () {
+                    success = true;
+                }, function () {
+                    failure = true;
+                });
+
+                timeoutDeferred.resolve();
+                $rootScope.$digest();                
+                $httpBackend.verifyNoOutstandingExpectation();
+                $httpBackend.verifyNoOutstandingRequest();
+                expect(success).toBeFalsy();
+                expect(failure).toBeTruthy(); 
+            });               
+        });
+
+        it('get should abort after abort called', function () {
+            inject(function ($q) {
+                var promise, success = false, failure = false;
+                $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+
+                promise = Test.get(123);
+                promise.then(function () {
+                    success = true;
+                }, function () {
+                    failure = true;
+                });
+
+                promise.abort();
+                $rootScope.$digest();
+                $httpBackend.verifyNoOutstandingExpectation();
+                $httpBackend.verifyNoOutstandingRequest();
+                expect(success).toBeFalsy();
+                expect(failure).toBeTruthy();
+            });
+        });
+
+        it('should have abort after chaining promise with then', function () {
+            inject(function ($q) {
+                var promise, success = false, failure = false;
+                $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+
+                promise = Test.get(123).then(function () {
+                    success = true;
+                }, function () {
+                    failure = true;
+                });
+
+                promise.abort();
+                $rootScope.$digest();
+                $httpBackend.verifyNoOutstandingExpectation();
+                $httpBackend.verifyNoOutstandingRequest();
+                expect(success).toBeFalsy();
+                expect(failure).toBeTruthy();
+            });
+        });
+
+        it('should have abort after chaining promise with catch', function () {
+            inject(function ($q) {
+                var promise, caught = false;
+                $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+
+                promise = Test.get(123).catch(function () {
+                    caught = true;
+                });
+
+                promise.abort();
+                $rootScope.$digest();
+                $httpBackend.verifyNoOutstandingExpectation();
+                $httpBackend.verifyNoOutstandingRequest();
+                expect(caught).toBeTruthy();
+            });
+        });
+
+        it('should have abort after chaining promise with finally', function () {
+            inject(function ($q) {
+                var promise, caught = false, final = false;
+                $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+
+                promise = Test.get(123).catch(function () {
+                    caught = true;
+                }).finally(function () {
+                    final = true;
+                });
+
+                promise.abort();
+                $rootScope.$digest();
+                $httpBackend.verifyNoOutstandingExpectation();
+                $httpBackend.verifyNoOutstandingRequest();
+                expect(caught).toBeTruthy();
+                expect(final).toBeTruthy();
+            });
+        });
+
+        it('should have abort after multiple chainings', function () {
+            inject(function ($q) {
+                var promise, failure = false;
+                $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+
+                promise = Test.get(123)
+                    .then(function () {}, function () {
+                        return $q.reject(value);
+                    })
+                    .then(function () {}, function () {
+                        failure = true;
+                    });
+
+                promise.abort();
+                $rootScope.$digest();
+                $httpBackend.verifyNoOutstandingExpectation();
+                $httpBackend.verifyNoOutstandingRequest();
+                expect(failure).toBeTruthy();
+            });
+        });
+
         describe('overridden idAttribute', function () {
             beforeEach(inject(function (_$httpBackend_, _$rootScope_, railsResourceFactory) {
                 Test = railsResourceFactory({url: '/test', name: 'test', idAttribute: 'xyz'});