angularjs-rails-resource 0.1.2 → 0.1.3

data/README.md

@@ -54,7 +54,9 @@ The following options are available for the config object passed to the factory
  * **name** - This is the name used for root wrapping when dealing with singular instances.
  * **pluralName** *(optional)* - If specified this name will be used for unwrapping query results,
         if not specified the singular name with an appended 's' will be used.
- * **httpConfig** *(optional)* - Passed directly to $http.
+ * **httpConfig** *(optional)* - By default we will add the following headers to ensure that the request is processed as JSON by Rails. You can specify additional http config options or override any of the defaults by setting this property.  See the [AngularJS $http API](http://docs.angularjs.org/api/ng.$http) for more information.
+     * **headers**
+         * **Accept** - application/json
  * **defaultParams** *(optional)* - If the resource expects a default set of query params on every call you can specify them here.
  * **requestTransformers** *(optional) - See [Transformers / Interceptors](#transformers--interceptors)
  * **responseInterceptors** *(optional)* - See [Transformers / Interceptors](#transformers--interceptors)
@@ -280,9 +282,9 @@ Or, if you say the user typed in the book id into a scope variable and you wante
     book.update();
 
 ## Tests
-The tests are written using [Jasmine](http://pivotal.github.com/jasmine/) and are run using [Testacular](http://vojtajina.github.com/testacular/).
+The tests are written using [Jasmine](http://pivotal.github.com/jasmine/) and are run using [Karma](https://github.com/karma-runner/karma).
 
-Running the tests should be as simple as following the [instructions](https://github.com/vojtajina/testacular/blob/master/README.md)
+Running the tests should be as simple as following the [instructions](https://github.com/karma-runner/karma)
 
 ## Contributing
 

data/angularjs-rails-resource.gemspec

@@ -2,11 +2,11 @@
 require File.expand_path('../lib/angularjs-rails-resource/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Tommy Odom"]
-  gem.email         = ["odom@finelineprototyping.com"]
+  gem.authors       = ["Tommy Odom", "Chris Chase"]
+  gem.email         = ["odom@finelineprototyping.com", "chris@finelineprototyping.com"]
   gem.description   = %q{A small AngularJS add-on for integrating with Rails via JSON more easily.}
   gem.summary       = %q{}
-  gem.homepage      = "https://github.com/tpodom/angularjs-rails-resource"
+  gem.homepage      = "https://github.com/finelineprototyping/angularjs-rails-resource"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/angularjs-rails-resource/version.rb

@@ -1,7 +1,7 @@
 module Angularjs
   module Rails
     module Resource
-      VERSION = "0.1.2"
+      VERSION = "0.1.3"
     end
   end
 end

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

@@ -839,4 +839,207 @@ describe("js.rails", function () {
         }));
     });
 
+    describe('http settings', function() {
+        var $httpBackend, $rootScope, factory,
+            config = {
+                url: '/test',
+                name: 'test'
+            };
+
+        beforeEach(inject(function (_$httpBackend_, _$rootScope_, railsResourceFactory) {
+            $httpBackend = _$httpBackend_;
+            $rootScope = _$rootScope_;
+            factory = railsResourceFactory;
+        }));
+
+        afterEach(function() {
+            $httpBackend.verifyNoOutstandingExpectation();
+            $httpBackend.verifyNoOutstandingRequest();
+        });
+
+        function headerComparison(expectedHeaders) {
+            return function(headers) {
+                var matches = true;
+
+                angular.forEach(expectedHeaders, function (value, key) {
+                    if (headers[key] !== value) {
+                        matches = false;
+                    }
+                });
+
+                return matches;
+            };
+        }
+
+        it('query should pass default $http options', inject(function($httpBackend) {
+            var promise, result, Test;
+
+            $httpBackend.expectGET('/test', headerComparison({'Accept': 'application/json'})).respond(200, {test: {abc: 'xyz'}});
+
+            Test = factory(config);
+            expect(promise = Test.query()).toBeDefined();
+
+            promise.then(function (response) {
+                result = response;
+            });
+
+            $httpBackend.flush();
+        }));
+
+        it('query should allow custom Accept', inject(function($httpBackend) {
+            var promise, result, Test;
+
+            $httpBackend.expectGET('/test', headerComparison({'Accept': 'text/plain'})).respond(200, {test: {abc: 'xyz'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'Accept': 'text/plain'}}}));
+            expect(promise = Test.query()).toBeDefined();
+
+            promise.then(function (response) {
+                result = response;
+            });
+
+            $httpBackend.flush();
+        }));
+
+        it('query should allow custom header', inject(function($httpBackend) {
+            var promise, result, Test;
+
+            $httpBackend.expectGET('/test', headerComparison({'Accept': 'application/json', 'X-Test': 'test'})).respond(200, {test: {abc: 'xyz'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'X-Test': 'test'}}}));
+            expect(promise = Test.query()).toBeDefined();
+
+            promise.then(function (response) {
+                result = response;
+            });
+
+            $httpBackend.flush();
+        }));
+
+        it('get should pass default $http options', inject(function($httpBackend) {
+            var promise, result, Test;
+
+            $httpBackend.expectGET('/test/123', headerComparison({'Accept': 'application/json'})).respond(200, {test: {abc: 'xyz'}});
+
+            Test = factory(config);
+            expect(promise = Test.get(123)).toBeDefined();
+
+            promise.then(function (response) {
+                result = response;
+            });
+
+            $httpBackend.flush();
+        }));
+
+        it('get should allow custom Accept', inject(function($httpBackend) {
+            var promise, result, Test;
+
+            $httpBackend.expectGET('/test/123', headerComparison({'Accept': 'text/plain'})).respond(200, {test: {abc: 'xyz'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'Accept': 'text/plain'}}}));
+            expect(promise = Test.get(123)).toBeDefined();
+
+            promise.then(function (response) {
+                result = response;
+            });
+
+            $httpBackend.flush();
+        }));
+
+        it('get should allow custom header', inject(function($httpBackend) {
+            var promise, result, Test;
+
+            $httpBackend.expectGET('/test/123', headerComparison({'Accept': 'application/json', 'X-Test': 'test'})).respond(200, {test: {abc: 'xyz'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'X-Test': 'test'}}}));
+            expect(promise = Test.get(123)).toBeDefined();
+
+            promise.then(function (response) {
+                result = response;
+            });
+
+            $httpBackend.flush();
+        }));
+
+        it('create should pass default $http options', inject(function($httpBackend) {
+            var Test;
+
+            $httpBackend.expectPOST('/test', {test: {xyz: '123'}}, headerComparison({'Accept': 'application/json'})).respond(200, {test: {id: 123, xyz: '123'}});
+
+            Test = factory(config);
+            var test = new Test();
+            test.xyz = '123';
+            test.create();
+
+            $httpBackend.flush();
+        }));
+
+        it('create should allow custom Accept', inject(function($httpBackend) {
+            var Test;
+
+            $httpBackend.expectPOST('/test', {test: {xyz: '123'}}, headerComparison({'Accept': 'text/plain'})).respond(200, {test: {id: 123, xyz: '123'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'Accept': 'text/plain'}}}));
+            var test = new Test();
+            test.xyz = '123';
+            test.create();
+
+            $httpBackend.flush();
+        }));
+
+        it('create should allow custom header', inject(function($httpBackend) {
+            var Test;
+
+            $httpBackend.expectPOST('/test', {test: {xyz: '123'}}, headerComparison({'Accept': 'application/json', 'X-Test': 'test'})).respond(200, {test: {id: 123, xyz: '123'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'X-Test': 'test'}}}));
+            var test = new Test();
+            test.xyz = '123';
+            test.create();
+
+            $httpBackend.flush();
+        }));
+
+        it('update should pass default $http options', inject(function($httpBackend) {
+            var Test;
+
+            $httpBackend.expectPUT('/test/123', {test: {id: 123, xyz: '123'}}, headerComparison({'Accept': 'application/json'})).respond(200, {test: {id: 123, xyz: '123'}});
+
+            Test = factory(config);
+            var test = new Test();
+            test.id = 123;
+            test.xyz = '123';
+            test.update();
+
+            $httpBackend.flush();
+        }));
+
+        it('update should allow custom Accept', inject(function($httpBackend) {
+            var Test;
+
+            $httpBackend.expectPUT('/test/123', {test: {id: 123, xyz: '123'}}, headerComparison({'Accept': 'text/plain'})).respond(200, {test: {id: 123, xyz: '123'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'Accept': 'text/plain'}}}));
+            var test = new Test();
+            test.id = 123;
+            test.xyz = '123';
+            test.update();
+
+            $httpBackend.flush();
+        }));
+
+        it('update should allow custom header', inject(function($httpBackend) {
+            var Test;
+
+            $httpBackend.expectPUT('/test/123', {test: {id: 123, xyz: '123'}}, headerComparison({'Accept': 'application/json', 'X-Test': 'test'})).respond(200, {test: {id: 123, xyz: '123'}});
+
+            Test = factory(angular.extend(angular.copy(config), {httpConfig: {headers: {'X-Test': 'test'}}}));
+            var test = new Test();
+            test.id = 123;
+            test.xyz = '123';
+            test.update();
+
+            $httpBackend.flush();
+        }));
+    });
 });

data/vendor/assets/javascripts/angularjs/rails/resource.js

@@ -121,6 +121,7 @@
             RailsResource.rootName = config.name;
             RailsResource.rootPluralName = config.pluralName || config.name + 's';
             RailsResource.httpConfig = config.httpConfig || {};
+            RailsResource.httpConfig.headers = angular.extend({'Accept': 'application/json'}, RailsResource.httpConfig.headers || {});
             RailsResource.requestTransformers = [];
             RailsResource.responseInterceptors = [];
             RailsResource.defaultParams = config.defaultParams;

metadata

@@ -1,19 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-rails-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
 - Tommy Odom
+- Chris Chase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies: []
 description: A small AngularJS add-on for integrating with Rails via JSON more easily.
 email:
 - odom@finelineprototyping.com
+- chris@finelineprototyping.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -24,6 +26,7 @@ files:
 - README.md
 - Rakefile
 - angularjs-rails-resource.gemspec
+- karma.conf.js
 - lib/angularjs-rails-resource.rb
 - lib/angularjs-rails-resource/version.rb
 - test/lib/angular/angular-bootstrap-prettify.js
@@ -36,9 +39,8 @@ files:
 - test/lib/angular/angular.js
 - test/unit/angularjs/rails/resourceSpec.js
 - test/unit/helpers/spec_helper.js
-- testacular.conf.js
 - vendor/assets/javascripts/angularjs/rails/resource.js
-homepage: https://github.com/tpodom/angularjs-rails-resource
+homepage: https://github.com/finelineprototyping/angularjs-rails-resource
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -58,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ''