angular-rails 0.0.10 → 0.0.11

data/README.md

@@ -47,58 +47,10 @@ So far we have a controller generator which generates a controller file if you r
 
 This file is empty except for the class declaration, but I will be adding some RESTful controller functionality shortly.
 
-## Angular-Helpers
+## angle-up
 
-In an attempt to DRY up angular apps I added an angular-helpers coffeescript file to the assets path.  So far it has a Router superclass for your main application router.  If you subclass it in Coffeescript like so:
 
-    class @PhotoGalleryCtrl extends Router
-      routes:->
-        {
-          default: '/photographers'
-          '/photographers':
-            template: '<%= asset_path("photographers.html") %>'
-            controller: PhotographersCtrl
-          '/photographers/:photographer_id/galleries':
-            template: '<%= asset_path("galleries.html") %>'
-            controller: GalleriesCtrl
-          '/photographers/:photographer_id/galleries/:gallery_id/photos':
-            template: '<%= asset_path("photos.html") %>'
-            controller: PhotosCtrl
-        }
-
-You will have those routes set up.  All this class needs is a member function called `routes` that returns a hash of routing information.
-
-Note that this class will need to be injected with both the $xhr and the $route object like so:
-
-    PhotoGalleryCtrl.$inject = ['$route', '$xhr']
-
-This is because it sets us some CSRF preventions using $xhr as well.  Note that this information gets thrown into the controller scope, so `@$xhr` and `@$router` are available in inheriting controllers as well (regardless if inheriting explicitly (through `extends`) or implictly (by being nested in a deeper view tag)).
-
-Much of this is ripped from a demo by [Daniel Nelson](https://github.com/centresource/angularjs_rails_demo).
-
-Another thing added is a `resourceService` function.  This function is called like:
-
-	resourceService 'Photos', 'photographers/:photographer_id/galleries/:gallery_id/photos', 'index'
-	resourceService 'SelectedPhotos', 'selected_photos/:selected_photo_id'
-     
-This sets up angular services for the listed paths.  Also add to the end all the actions that you want it to support.  So far the accepted actions are 'index', 'update', 'create' and 'destroy'.  If you leave off all actions, it will automatically assume that you want to support all 4.
-
-This helper file adds some features to help parse results.
-
-* An `AngularModel` class.  All classes that inherit from this may be used to wrap the results returned from angular.  They also allow you to map hasMany associations like so (haven't needed belongsTo yet myself):
-
-		class @Todo extends AngularModel
-			schedule:(procrastinationTime)-> # postpone to future 
-
-		class @TodoList extends AngularModel
-			hasMany:
-				todos: Todo
-
-* An `autowrap` function added to global namespace.  This function takes a class to wrap the resource result in and optionally takes a function to pass it in to (i.e. if you need a real success function).  This function is passed in as the success function like so:
-
-		@all_todo_lists = TodoListService.get {}, autowrap(TodoList)
-
-A final thing added to this helper file is initialization of angularjs.  This way, if angularjs is added to asset pipeline, no `ng:autobind` tag needs to be (or should be) added.
+In an attempt to DRY up angular apps I added the angle-up javascript file to the assets path.  [angle-up](https://github.com/ludicast/angle-up) attempts to add some opinions to angular apps.
 
 ## Example Usage
 

data/lib/angular-rails/version.rb

@@ -1,3 +1,3 @@
 module AngularRails
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/generators/angular/install/install_generator.rb

@@ -14,7 +14,7 @@ module Angular
                                       
       def inject_angular
         append_to_file "app/assets/javascripts/application.js" do
-          "//= require angular.min\n//= require angular-helpers\n//= require_tree ./angular\n"
+          "//= require angular.min\n//= require angle-up\n//= require_tree ./angular\n"
         end
       end
     

data/test/angular-rails_test.rb

@@ -9,6 +9,7 @@ class AngularRailsTest < ActiveSupport::TestCase
     assert_not_nil @app.assets["angular.min"]
   end
 	test "angular-helpers.coffee is found as an asset" do
-    assert_not_nil @app.assets["angular-helpers"]
+    assert_not_nil @app.assets["angle-up"]
+		puts  @app.assets["angle-up"]
   end
 end

data/test/dummy/log/test.log

@@ -9,3 +9,4 @@ Compiled angular-helpers  (589ms)  (pid 50164)
 Compiled angular.min  (7ms)  (pid 50164)
 Compiled angular-helpers  (184ms)  (pid 56225)
 Compiled angular-helpers  (522ms)  (pid 4909)
+Compiled angle-up  (22ms)  (pid 17054)

data/test/generators/install_generator_test.rb

@@ -51,7 +51,7 @@ class InstallGeneratorTest < Rails::Generators::TestCase
     run_generator
     
     assert_file "app/assets/javascripts/application.js" do |application|
-      assert_match /require angular.min(.*)require angular-helpers(.*)require_tree \.\/angular/m, application
+      assert_match /require angular.min(.*)require angle-up(.*)require_tree \.\/angular/m, application
     end
   end  
   

data/test/tmp/app/assets/javascripts/application.js

@@ -2,5 +2,5 @@
 //= require jquery_ujs
 //= require_tree .
 //= require angular.min
-//= require angular-helpers
+//= require angle-up
 //= require_tree ./angular

data/vendor/assets/javascripts/angle-up.js

@@ -0,0 +1,149 @@
+
+(function() {
+  var __slice = Array.prototype.slice;
+
+  this.Router = (function() {
+
+    Router.prototype.initRoutes = function(routes) {
+      var info, routeName;
+      for (routeName in routes) {
+        info = routes[routeName];
+        if (routeName === "default") {
+          this.$route.otherwise({
+            redirectTo: info
+          });
+        } else {
+          this.$route.when(routeName, {
+            template: info.template,
+            controller: info.controller
+          });
+        }
+      }
+      return this.$route.parent(this);
+    };
+
+    Router.prototype.setupXhr = function() {
+      var token;
+      this.$xhr.defaults.headers.post['Content-Type'] = 'application/json';
+      this.$xhr.defaults.headers.put['Content-Type'] = 'application/json';
+      if (token = $("meta[name='csrf-token']").attr("content")) {
+        this.$xhr.defaults.headers.post['X-CSRF-Token'] = token;
+        this.$xhr.defaults.headers.put['X-CSRF-Token'] = token;
+        return this.$xhr.defaults.headers['delete']['X-CSRF-Token'] = token;
+      }
+    };
+
+    function Router($route, $xhr) {
+      this.$route = $route;
+      this.$xhr = $xhr;
+      this.setupXhr();
+      this.initRoutes(this.routes());
+    }
+
+    return Router;
+
+  })();
+
+  this.resourceService = function() {
+    var commandHash, methods, path, serviceName, type, _i, _len;
+    serviceName = arguments[0], path = arguments[1], methods = 3 <= arguments.length ? __slice.call(arguments, 2) : [];
+    if (methods.length === 0) {
+      methods.push('index', 'create', 'update', 'destroy', 'show');
+    }
+    commandHash = {};
+    for (_i = 0, _len = methods.length; _i < _len; _i++) {
+      type = methods[_i];
+      commandHash[type] = (function() {
+        switch (type) {
+          case 'index':
+            return {
+              method: 'GET',
+              isArray: true
+            };
+          case 'show':
+            return {
+              method: 'GET',
+              isArray: false
+            };
+          case 'create':
+            return {
+              method: 'POST'
+            };
+          case 'update':
+            return {
+              method: 'PUT'
+            };
+          case 'destroy':
+            return {
+              method: 'DELETE'
+            };
+        }
+      })();
+    }
+    return angular.service(serviceName, function($resource) {
+      return $resource(path, {}, commandHash);
+    });
+  };
+
+  angular.element(document).ready(function() {
+    return angular.compile(document)().$apply();
+  });
+
+  this.AngularModel = (function() {
+
+    function AngularModel() {}
+
+    AngularModel.prototype.initialize = function() {
+      var association, clazz, name, obj, _ref, _results;
+      if (this.hasMany) {
+        _ref = this.hasMany;
+        _results = [];
+        for (name in _ref) {
+          clazz = _ref[name];
+          association = this[name] || [];
+          _results.push((function() {
+            var _i, _len, _results2;
+            _results2 = [];
+            for (_i = 0, _len = association.length; _i < _len; _i++) {
+              obj = association[_i];
+              obj.__proto__ = new clazz();
+              _results2.push(typeof obj.initialize === "function" ? obj.initialize() : void 0);
+            }
+            return _results2;
+          })());
+        }
+        return _results;
+      }
+    };
+
+    return AngularModel;
+
+  })();
+
+  angular.service("eventuallyWork", (function($defer) {
+    var eventuallyWork;
+    eventuallyWork = function(func, timeout) {
+      try {
+        return func();
+      } catch (e) {
+        return $defer((function() {
+          return eventuallyWork(func, 2 * timeout);
+        }), timeout);
+      }
+    };
+    return function(func) {
+      return eventuallyWork(func, 10);
+    };
+  }), {
+    $inject: ['$defer']
+  });
+
+  this.autowrap = function(clazz, callback) {
+    return function(result) {
+      result.__proto__ = new clazz();
+      if (typeof result.initialize === "function") result.initialize();
+      if (callback) return callback(result);
+    };
+  };
+
+}).call(this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2011-12-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &3077760 !ruby/object:Gem::Requirement
+  requirement: &3077880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *3077760
+  version_requirements: *3077880
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &3077510 !ruby/object:Gem::Requirement
+  requirement: &3077630 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *3077510
+  version_requirements: *3077630
 description: Helpers for angularjs in a rails project (ripped from backbone-rails)
 email:
 - nate@ludicast.com
@@ -46,7 +46,7 @@ files:
 - lib/generators/angular/controller/templates/controller.coffee
 - lib/generators/angular/install/install_generator.rb
 - lib/generators/angular/resource_helpers.rb
-- vendor/assets/javascripts/angular-helpers.coffee
+- vendor/assets/javascripts/angle-up.js
 - vendor/assets/javascripts/angular-ie-compat.js
 - vendor/assets/javascripts/angular.min.js
 - MIT-LICENSE
@@ -89,8 +89,10 @@ files:
 - test/dummy/tmp/cache/assets/CE0/600/sprockets%2F7b3428bf74f80926f20a216683bf5b0f
 - test/dummy/tmp/cache/assets/D11/830/sprockets%2F376c8de111107498cc89fc305dac169a
 - test/dummy/tmp/cache/assets/D21/570/sprockets%2Fc943c801ce0caac77ad24200450912ae
+- test/dummy/tmp/cache/assets/D39/900/sprockets%2Fb8870fba4613fc84863ba75d021a0fb8
 - test/dummy/tmp/cache/assets/D3C/4A0/sprockets%2F55361a479acf3690d592c04adddfa507
 - test/dummy/tmp/cache/assets/D9F/120/sprockets%2Fe8a9852102a74db1afd5fe4dd860db93
+- test/dummy/tmp/cache/assets/D9F/C50/sprockets%2Ff1c6daf537a49ce6c96ef829b3000ad3
 - test/generators/controller_generator_test.rb
 - test/generators/fixtures/application.js
 - test/generators/generators_test_helper.rb
@@ -159,8 +161,10 @@ test_files:
 - test/dummy/tmp/cache/assets/CE0/600/sprockets%2F7b3428bf74f80926f20a216683bf5b0f
 - test/dummy/tmp/cache/assets/D11/830/sprockets%2F376c8de111107498cc89fc305dac169a
 - test/dummy/tmp/cache/assets/D21/570/sprockets%2Fc943c801ce0caac77ad24200450912ae
+- test/dummy/tmp/cache/assets/D39/900/sprockets%2Fb8870fba4613fc84863ba75d021a0fb8
 - test/dummy/tmp/cache/assets/D3C/4A0/sprockets%2F55361a479acf3690d592c04adddfa507
 - test/dummy/tmp/cache/assets/D9F/120/sprockets%2Fe8a9852102a74db1afd5fe4dd860db93
+- test/dummy/tmp/cache/assets/D9F/C50/sprockets%2Ff1c6daf537a49ce6c96ef829b3000ad3
 - test/generators/controller_generator_test.rb
 - test/generators/fixtures/application.js
 - test/generators/generators_test_helper.rb

data/vendor/assets/javascripts/angular-helpers.coffee

@@ -1,62 +0,0 @@
-class @Router
-  initRoutes:(routes)->
-    for routeName, info of routes
-      if routeName is "default"
-        @$route.otherwise redirectTo: info
-      else
-        @$route.when routeName,
-          template: info.template
-          controller: info.controller
-    @$route.parent @
-
-  setupXhr:->
-    @$xhr.defaults.headers.post['Content-Type'] = 'application/json'
-    @$xhr.defaults.headers.put['Content-Type'] = 'application/json'
-
-    token = $("meta[name='csrf-token']").attr("content")
-    @$xhr.defaults.headers.post['X-CSRF-Token'] = token
-    @$xhr.defaults.headers.put['X-CSRF-Token'] = token
-    @$xhr.defaults.headers['delete']['X-CSRF-Token'] = token
-
-  constructor:(@$route, @$xhr)->
-    @setupXhr()
-    @initRoutes @routes()
-
-@resourceService = (serviceName, path, resourceTypes...)->
-	if resourceTypes.length is 0
-		resourceTypes.push 'index', 'create', 'update', 'destroy', 'show'
-	commandHash = {}
-	for type in resourceTypes
-		commandHash[type] = switch type
-			when 'index'
-				{ method:'GET', isArray:true }
-			when 'show'
-				{ method:'GET', isArray:false }
-			when 'create'
-				{ method: 'POST' }
-			when 'update'
-				{ method: 'PUT' }
-			when 'destroy'
-				{ method: 'DELETE' }
-	
-	angular.service serviceName, ($resource)->
-		$resource path, {}, commandHash
-
-angular.element(document).ready ->
-	angular.compile(document)().$apply()
-
-class @AngularModel
-	initialize:->
-		if @hasMany
-			for name, clazz of @hasMany
-				association = @[name] or []
-				for obj in association
-					obj.__proto__ = new clazz()
-					obj.initialize?()
-
-@autowrap = (clazz, callback)->
-	(result)->
-		result.__proto__ = new clazz()
-		result.initialize?()
-		if callback
-			callback(result)