angularjs_scaffold 0.0.23 → 0.0.24

data/README.md

@@ -30,22 +30,4 @@ Now run the angularjs:scaffold command and it will rewrite everything the Angula
 
     $ rails g angularjs:scaffold Posts # adds everything needed using AngularJS
 
-The "AngularJS way", in my opinion, follows the Unobtrusive Javascript paradigm, but uses CoffeeScript in place of Javascript.  To me, Javascript is like programming in Assembler, while CoffeeScript is much more readable, and produces very high quality JS as output.  When combined with the Rails asset pipeline, CoffeeScript has a lot of advantages, and little or no downside.  What's not to like?  But, you have the install-time option --language=javascript.
-
-The name given the AngularJS app is based on the Rails app name, plus 'Client', so a rails app named 'Sue' would deploy an AngularJS app 'SueClient' to the browser.  
-
-Another change I made to this scaffold is adding the .erb extension on the generated template files, so 
-
-    index.html 
-
-becomes 
-
-    index.html.erb
-
-No big deal, but this makes it clear that the AngularJS templates can take advantage of 'server-side provisioning'.  If that term is unclear, I suggest you look at the file 
-
-    routes.coffee.erb
-
-where the AngularJS routes are populated by Rails route helpers.  It just makes sense that the server should specify to the view how it should be accessed.
-
 Enjoy!

data/lib/angularjs_scaffold/version.rb

@@ -1,3 +1,3 @@
 module AngularjsScaffold
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
 end

data/lib/generators/angularjs/scaffold/templates/plural_model_name.js

@@ -1,15 +1,19 @@
-angular.module('<%= @plural_model_name%>', ['ngResource']).
-  factory('<%= @model_name%>', ['$resource', function($resource) {
-  var <%= @model_name%> = $resource('/<%= @plural_model_name%>/:id', {id: '@id'},
-                       {
-                         update: { method: 'PUT' },
-                         destroy: { method: 'DELETE'}
-                       }
-                      );
+angular.module("<%= @plural_model_name %>", ["ngResource"]).
+  factory("<%= @model_name %>", ['$resource', function($resource) {
+    var <%= @model_name %>;
+    <%= @model_name %> = $resource("/<%= @plural_model_name %>/:id", 
+    { id: "@id" }, 
+    {
+      update: { method: "PUT" },
+      destroy: { method: "DELETE" }
+    });
 
-  <%= @model_name%>.prototype.destroy = function(cb) {
-    return <%= @model_name%>.remove({id: this.id}, cb);
-  };
+    <%= @model_name %>.prototype.destroy = function(cb) {
+      return <%= @model_name %>.remove({
+        id: this.id
+      }, cb);
+    };
 
-  return <%= @model_name%>;
-}]);
+    return <%= @model_name %>;
+  }
+]);

data/lib/generators/angularjs/scaffold/templates/plural_model_name_controller.js

@@ -1,63 +1,71 @@
-function <%= @controller%>IndexCtrl($scope, <%= @model_name%>) {
-  $scope.<%= @plural_model_name %> = <%= @model_name%>.query();
-
-  $scope.destroy = function() {
-    dconfirm = confirm('Are you sure?');
-    if(dconfirm){
-      var original = this.<%= @resource_name%>
-      this.<%= @resource_name%>.destroy(function() {
-        $scope.<%= @plural_model_name %> = _.without($scope.<%= @plural_model_name%>, original);
+<%= @controller %>IndexCtrl = function($scope, <%= @model_name %>) {
+  $scope.<%= @plural_model_name %> = <%= @model_name %>.query();
+  
+  return $scope.destroy = function() {
+    var original;
+    if (confirm("Are you sure?")) {
+      original = this.<%= @resource_name %>;
+      return this.<%= @resource_name %>.destroy(function() {
+        return $scope.<%= @plural_model_name %> = _.without($scope.<%= @plural_model_name %>, original);
       });
     }
   };
-}
+};
 
-<%= @controller%>IndexCtrl.$inject = ['$scope', '<%= @model_name%>'];
+<%= @controller %>IndexCtrl.$inject = ['$scope', '<%= @model_name %>'];
 
-function <%= @controller%>CreateCtrl($scope, $location, <%= @model_name%>) {
-  $scope.save = function() {
-    <%= @model_name%>.save($scope.<%= @resource_name%>, function(<%= @resource_name%>) {
-      $location.path('/<%= @plural_model_name %>/' + <%= @resource_name%>.id + '/edit');
+<%= @controller %>CreateCtrl = function($scope, $location, <%= @model_name %>) {
+  return $scope.save = function() {
+    return <%= @model_name %>.save($scope.<%= @resource_name %>, function(<%= @resource_name %>) {
+      return $location.path("/<%= @plural_model_name %>/" + <%= @resource_name %>.id + "/edit");
     });
-  }
-}
-
-<%= @controller%>CreateCtrl.$inject = ['$scope', '$location', '<%= @model_name%>'];
+  };
+};
 
-function <%= @controller%>ShowCtrl($scope, $location, $routeParams, <%= @model_name%>) {
-  <%= @model_name%>.get({id: $routeParams.id}, function(<%= @resource_name%>) {
-    self.original = <%= @resource_name%>;
-    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original);
-  });  
-}
+<%= @controller %>CreateCtrl.$inject = ['$scope', '$location', '<%= @model_name %>'];
 
-<%= @controller%>ShowCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name%>'];
+<%= @controller %>ShowCtrl = function($scope, $location, $routeParams, <%= @model_name %>) {
+  <%= @model_name %>.get({
+    id: $routeParams.id
+  }, function(<%= @resource_name %>) {
+    this.original = <%= @resource_name %>;
+    return $scope.<%= @resource_name %> = new <%= @model_name %>(this.original);
+  });
+  return $scope.destroy = function() {
+    if (confirm("Are you sure?")) {
+      return $scope.<%= @resource_name %>.destroy(function() {
+        return $location.path("/<%= @plural_model_name %>");
+      });
+    }
+  };
+};
 
-function <%= @controller%>EditCtrl($scope, $location, $routeParams, <%= @model_name%>) {
-  var self = this;
+<%= @controller %>ShowCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name %>'];
 
-  <%= @model_name%>.get({id: $routeParams.id}, function(<%= @resource_name%>) {
-    self.original = <%= @resource_name%>;
-    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original);
+<%= @controller %>EditCtrl = function($scope, $location, $routeParams, <%= @model_name %>) {
+  <%= @model_name %>.get({
+    id: $routeParams.id
+  }, function(<%= @resource_name %>) {
+    this.original = <%= @resource_name %>;
+    return $scope.<%= @resource_name %> = new <%= @model_name %>(this.original);
   });
-
   $scope.isClean = function() {
-    return angular.equals(self.original, $scope.<%= @resource_name%>);
-  }
-
+    return angular.equals(this.original, $scope.<%= @resource_name %>);
+  };
   $scope.destroy = function() {
-    dconfirm = confirm('Are you sure?');
-    if(dconfirm){
-      $scope.<%= @resource_name %>.destroy(function() {
-      $location.path('/<%= @plural_model_name %>');
-    });}
+    if (confirm("Are you sure?")) {
+      return $scope.<%= @resource_name %>.destroy(function() {
+        return $location.path("/<%= @plural_model_name %>");
+      });
+    }
   };
-
-  $scope.save = function() {
-    <%= @model_name%>.update($scope.<%= @resource_name%>, function(<%= @resource_name%>) {
-      $location.path('/<%= @plural_model_name %>');
+  return $scope.save = function() {
+    return <%= @model_name %>.update($scope.<%= @resource_name %>, function(<%= @resource_name %>) {
+      return $location.path("/<%= @plural_model_name %>");
     });
   };
-}
+};
+
+<%= @controller %>EditCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name %>'];
+
 
-<%= @controller%>EditCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name%>'];

data/lib/generators/angularjs/scaffold/templates/plural_model_name_controller.js.coffee

@@ -1,59 +1,62 @@
 
 root = global ? window
 
-<%= @controller%>IndexCtrl = ($scope, <%= @model_name%>) ->
-  $scope.<%= @plural_model_name %> = <%= @model_name%>.query()
+<%= @controller %>IndexCtrl = ($scope, <%= @model_name %>) ->
+  $scope.<%= @plural_model_name %> = <%= @model_name %>.query()
+
   $scope.destroy = ->
-    dconfirm = confirm("Are you sure?")
-    if dconfirm
-      original = @<%= @resource_name%>
-      @<%= @resource_name%>.destroy ->
+    if confirm("Are you sure?")
+      original = @<%= @resource_name %>
+      @<%= @resource_name %>.destroy ->
         $scope.<%= @plural_model_name %> = _.without($scope.<%= @plural_model_name %>, original)
+        
+<%= @controller %>IndexCtrl.$inject = ['$scope', '<%= @model_name %>'];
 
-<%= @controller%>IndexCtrl.$inject = ['$scope', '<%= @model_name%>'];
-
-<%= @controller%>CreateCtrl = ($scope, $location, <%= @model_name%>) ->
+<%= @controller %>CreateCtrl = ($scope, $location, <%= @model_name %>) ->
   $scope.save = ->
-    <%= @model_name%>.save $scope.<%= @resource_name%>, (<%= @resource_name%>) ->
-      $location.path "/<%= @plural_model_name %>/#{<%= @resource_name%>.id}/edit"
+    <%= @model_name %>.save $scope.<%= @resource_name %>, (<%= @resource_name %>) ->
+      $location.path "/<%= @plural_model_name %>/#{<%= @resource_name %>.id}/edit"
 
-<%= @controller%>CreateCtrl.$inject = ['$scope', '$location', '<%= @model_name%>'];
+<%= @controller %>CreateCtrl.$inject = ['$scope', '$location', '<%= @model_name %>'];
 
-<%= @controller%>ShowCtrl = ($scope, $location, $routeParams, <%= @model_name%>) ->
-  <%= @model_name%>.get
+<%= @controller %>ShowCtrl = ($scope, $location, $routeParams, <%= @model_name %>) ->
+  <%= @model_name %>.get
     id: $routeParams.id
-  , (<%= @resource_name%>) ->
-    self.original = <%= @resource_name%>
-    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original)
+  , (<%= @resource_name %>) ->
+    @original = <%= @resource_name %>
+    $scope.<%= @resource_name %> = new <%= @model_name %>(@original)
+
+  $scope.destroy = ->
+    if confirm("Are you sure?")
+      $scope.<%= @resource_name %>.destroy ->
+        $location.path "/<%= @plural_model_name %>"
 
-<%= @controller%>ShowCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name%>'];
+<%= @controller %>ShowCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name %>'];
 
-<%= @controller%>EditCtrl = ($scope, $location, $routeParams, <%= @model_name%>) ->
-  self = this
-  <%= @model_name%>.get
+<%= @controller %>EditCtrl = ($scope, $location, $routeParams, <%= @model_name %>) ->
+  <%= @model_name %>.get
     id: $routeParams.id
-  , (<%= @resource_name%>) ->
-    self.original = <%= @resource_name%>
-    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original)
+  , (<%= @resource_name %>) ->
+    @original = <%= @resource_name %>
+    $scope.<%= @resource_name %> = new <%= @model_name %>(@original)
 
   $scope.isClean = ->
-    angular.equals self.original, $scope.<%= @resource_name%>
+    console.log "[<%= @controller %>EditCtrl, $scope.isClean]"
+    angular.equals @original, $scope.<%= @resource_name %>
 
   $scope.destroy = ->
-    dconfirm = confirm("Are you sure?")
-    if dconfirm
-      $scope.<%= @resource_name%>.destroy ->
+    if confirm("Are you sure?")
+      $scope.<%= @resource_name %>.destroy ->
         $location.path "/<%= @plural_model_name %>"
 
-
   $scope.save = ->
-    <%= @model_name%>.update $scope.<%= @resource_name%>, (<%= @resource_name%>) ->
+    <%= @model_name %>.update $scope.<%= @resource_name %>, (<%= @resource_name %>) ->
       $location.path "/<%= @plural_model_name %>"
 
-<%= @controller%>EditCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name%>'];
+<%= @controller %>EditCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name %>'];
 
 # exports
-root.<%= @controller%>IndexCtrl  = <%= @controller%>IndexCtrl
-root.<%= @controller%>CreateCtrl = <%= @controller%>CreateCtrl
-root.<%= @controller%>ShowCtrl   = <%= @controller%>ShowCtrl
-root.<%= @controller%>EditCtrl   = <%= @controller%>EditCtrl 
+root.<%= @controller %>IndexCtrl  = <%= @controller %>IndexCtrl
+root.<%= @controller %>CreateCtrl = <%= @controller %>CreateCtrl
+root.<%= @controller %>ShowCtrl   = <%= @controller %>ShowCtrl
+root.<%= @controller %>EditCtrl   = <%= @controller %>EditCtrl 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angularjs_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-21 00:00:00.000000000 Z
+date: 2013-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 3.2.11
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement