explainer_angularjs_scaffold 0.0.21 → 0.0.22

data/lib/angularjs_scaffold/version.rb

@@ -1,3 +1,3 @@
 module AngularjsScaffold
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

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

@@ -11,8 +11,19 @@ module Angularjs
       desc: "Choose your preferred language, 'coffeescript' or 'javascript' "
 
     def init_angularjs
-      copy_file "application.css", "app/assets/stylesheets/application.css"
-      copy_file "application.js", "app/assets/javascripts/application.js"
+      if File.exist?('app/assets/javascripts/application.js')
+        insert_into_file "app/assets/javascripts/application.js",
+          "//= require_tree ./angularjs/\n", :after => "jquery_ujs\n"
+      else
+        copy_file "application.js", "app/assets/javascripts/application.js"
+      end
+      @application_css_file ='app/assets/stylesheets/application.css'
+      if (!(File.exist?('app/assets/stylesheets/application.css')) &&
+          File.exist?('app/assets/stylesheets/application.css.scss'))
+        @application_css_file ='app/assets/stylesheets/application.css.scss'
+      elsif !File.exist?('app/assets/stylesheets/application.css')
+        create_file @application_css_file
+      end
       directory "underscore", "app/assets/javascripts/underscore/"
       directory "angularjs", "app/assets/javascripts/angularjs/"
       if options["no-jquery"]
@@ -32,15 +43,15 @@ module Angularjs
         directory "bootstrap/css", "app/assets/stylesheets/bootstrap/"
         directory "bootstrap/js", "app/assets/javascripts/bootstrap/"
         directory "bootstrap/img", "app/assets/javascripts/img/"
-        insert_into_file "app/assets/stylesheets/application.css",
-          " *= require bootstrap/bootstrap.min.css\n", after: "require_self\n"
-        insert_into_file "app/assets/stylesheets/application.css",
+        insert_into_file @application_css_file,
+          " *= require bootstrap/bootstrap.min.css\n", :after => "require_self\n"
+        insert_into_file @application_css_file,
           " *= require bootstrap/bootstrap-responsive.min.css\n",
-          after: "bootstrap.min.css\n"
-        insert_into_file "app/assets/stylesheets/application.css",
+          :after => "bootstrap.min.css\n"
+        insert_into_file @application_css_file,
           " *= require fontawesome/font-awesome.css\n",
-          after: "bootstrap-responsive.min.css\n"
-        append_to_file "app/assets/stylesheets/application.css",
+          :after => "bootstrap-responsive.min.css\n"
+        append_to_file @application_css_file,
           "\nbody { padding-top: 60px; }\n"
         unless options["no-jquery"]
           insert_into_file "app/assets/javascripts/application.js",
@@ -58,9 +69,7 @@ module Angularjs
     end
 
     def generate_welcome_controller
-      @app_name = Rails.application.class.parent_name
-      #Rails.logger.info "#{__FILE__}, #{__LINE__}, @app_name: #{@app_name}"
-      remove_file "public/index.html" 
+      remove_file "public/index.html"
       uncomment_lines 'config/routes.rb', /root :to => 'welcome#index'/
         run "rails g controller welcome index"
       copy_file "AngularJS-medium.png", "app/assets/images/AngularJS-medium.png"
@@ -69,8 +78,9 @@ module Angularjs
       empty_directory "app/assets/templates/welcome"
       copy_file "index_welcome.html.erb", "app/assets/templates/welcome/index.html.erb"
       if @language == 'coffeescript'
-        remove_file 'app/assets/javascripts/routes.js.erb' 
-        # Rails.logger.info "#{__FILE__}, #{__LINE__}, @app_name: #{@app_name}"
+        if File.exists?('app/assets/javascripts/routes.js.erb')
+          remove_file 'app/assets/javascripts/routes.js.erb' 
+        end
         copy_file "routes.coffee.erb", "app/assets/javascripts/routes.coffee.erb"
         insert_into_file "app/assets/javascripts/routes.coffee.erb", @app_name, before: 'Client'
         ['csrf', 'welcome'].each do |prefix| 
@@ -80,7 +90,9 @@ module Angularjs
         end
         # insert_into_file "app/assets/javascripts/welcome_controller.js.coffee", @app_name, before: 'Client'
       else # javascript
-        remove_file 'app/assets/javascripts/routes.coffee.erb' #if File.exists?('app/assets/javascripts/routes.coffee.erb')
+        if File.exists?('app/assets/javascripts/routes.coffee.erb')
+          remove_file 'app/assets/javascripts/routes.coffee.erb' 
+        end
         copy_file "routes.js.erb", "app/assets/javascripts/routes.js.erb" #if File.exists?("app/assets/javascripts/routes.js.erb")
         # Rails.logger.info "#{__FILE__}, #{__LINE__}, @app_name: #{@app_name}"
         insert_into_file "app/assets/javascripts/routes.js.erb", @app_name, before: 'Client'
@@ -91,11 +103,11 @@ module Angularjs
         end
         # insert_into_file "app/assets/javascripts/welcome_controller.js", @app_name, before: 'Client'
       end
-      append_to_file "app/assets/javascripts/application.js",
-        "//= require routes\n"
-      append_to_file "app/assets/javascripts/application.js",
-        "//= require welcome_controller\n"
-      append_to_file "app/assets/stylesheets/application.css",
+      # append_to_file "app/assets/javascripts/application.js",
+      #   "//= require routes\n"
+      # append_to_file "app/assets/javascripts/application.js",
+      #   "//= require welcome_controller\n"
+      append_to_file @application_css_file,
         ".center {text-align: center;}\n"
       insert_into_file "app/controllers/application_controller.rb",
 %{

data/lib/generators/angularjs/install/templates/application.html.erb

@@ -49,9 +49,13 @@
           <!-- templates load here -->
             <div class="span3">
               <div class="well sidebar-nav">
+                <h3>Sidebar</h3>
                 <ul class="nav nav-list">
                   <li class="nav-header">Sidebar</li>
                   <!-- sidebar menu models -->
+                  <li><%%= link_to "Link1", "/path1"  %></li>
+                  <li><%%= link_to "Link2", "/path2"  %></li>
+                  <li><%%= link_to "Link3", "/path3"  %></li>
                 </ul>
               </div><!--/.well -->
             </div><!--/span-->

data/lib/generators/angularjs/install/templates/application.js

@@ -14,7 +14,4 @@
 //= require jquery_ujs
 //= require_tree ./underscore/
 //= require_tree ./angularjs/
-//= require_tree ./bootstrap/
-//= require_tree .
-//= require routes
-//= require welcome_controller
+

data/lib/generators/angularjs/install/templates/csrf_controller.js

@@ -1,15 +1,18 @@
 // Generated by CoffeeScript 1.4.0
+
 (function() {
-  var CsrfCtrl, root;
+  var CsrfCtrl, angular, root;
 
   root = typeof global !== "undefined" && global !== null ? global : window;
 
-  CsrfCtrl = [
-    "$cookieStore", function($cookieStore) {
-      return $cookieStore.put("XSRF-TOKEN", angular.element(document.getElementById("csrf")).attr("data-csrf"));
-    }
-  ];
-  // exports
+  angular = root.angular;
+
+  CsrfCtrl = function($cookieStore) {
+    return $cookieStore.put("XSRF-TOKEN", angular.element(document.getElementById("csrf")).attr("data-csrf"));
+  };
+
+  CsrfCtrl.$inject = ['$cookieStore'];
+
   root.CsrfCtrl = CsrfCtrl;
 
 }).call(this);

data/lib/generators/angularjs/install/templates/csrf_controller.js.coffee

@@ -1,8 +1,10 @@
 root = global ? window
+angular = root.angular
+
+CsrfCtrl = ($cookieStore) ->
+  $cookieStore.put "XSRF-TOKEN", angular.element(document.getElementById("csrf")).attr("data-csrf")
+
+CsrfCtrl.$inject = ['$cookieStore'];
 
-CsrfCtrl = ["$cookieStore", ($cookieStore) ->
-  $cookieStore.put "XSRF-TOKEN", 
-  angular.element(document.getElementById("csrf")).attr("data-csrf")
-]
 # exports
 root.CsrfCtrl = CsrfCtrl

data/lib/generators/angularjs/install/templates/routes.coffee.erb

@@ -1,15 +1,15 @@
 root = global ? window
 angular = root.angular
 
-thisApp = angular.module("Client", ["ngCookies"]).config(($routeProvider, $locationProvider) ->
+thisApp = angular.module("Client", ['ngCookies']).config(['$routeProvider', '$locationProvider' , 
+($routeProvider, $locationProvider) ->
+  #$locationProvider.hashPrefix('');
   $locationProvider.html5Mode true
   $routeProvider.when("/",
     controller: "WelcomeCtrl"
     templateUrl: "<%= asset_path('welcome/index.html') %>"
   ).otherwise redirectTo: "/"
-)
-# exports
-root.thisApp = thisApp
-
+])
 
+root.thisApp = thisApp
 

data/lib/generators/angularjs/install/templates/routes.js.erb

@@ -1,3 +1,4 @@
+// Generated by CoffeeScript 1.4.0
 (function() {
   var angular, root, thisApp;
 
@@ -5,15 +6,17 @@
 
   angular = root.angular;
 
-  thisApp = angular.module("Client", ["ngCookies"]).config(function($routeProvider, $locationProvider) {
-    $locationProvider.html5Mode(true);
-    return $routeProvider.when("/", {
-      controller: "WelcomeCtrl",
-      templateUrl: "<%= asset_path('welcome/index.html') %>"
-    }).otherwise({
-      redirectTo: "/"
-    });
-  });
+  thisApp = angular.module("Client", ['ngCookies']).config([
+    '$routeProvider', '$locationProvider', function($routeProvider, $locationProvider) {
+      $locationProvider.html5Mode(true);
+      return $routeProvider.when("/", {
+        controller: "WelcomeCtrl",
+        templateUrl: "<%= asset_path('welcome/index.html') %>"
+      }).otherwise({
+        redirectTo: "/"
+      });
+    }
+  ]);
 
   root.thisApp = thisApp;
 

data/lib/generators/angularjs/install/templates/welcome_controller.js

@@ -1,12 +1,11 @@
 // Generated by CoffeeScript 1.4.0
 (function() {
-  var WelcomeCtrl, root;
+  var root, thisApp;
 
   root = typeof global !== "undefined" && global !== null ? global : window;
 
-  WelcomeCtrl = ["$scope", function($scope) {}];
+  thisApp = root.thisApp;
 
-  // exports
-  root.thisApp.controller("WelcomeCtrl", WelcomeCtrl);
+  thisApp.controller("WelcomeCtrl", function() {});
 
 }).call(this);

data/lib/generators/angularjs/install/templates/welcome_controller.js.coffee

@@ -1,7 +1,7 @@
 root = global ? window
 
-WelcomeCtrl = ["$scope", ($scope) ->
-]
-# exports
-root.thisApp.controller "WelcomeCtrl", WelcomeCtrl
+thisApp = root.thisApp
+
+thisApp.controller "WelcomeCtrl", ->
+
 

data/lib/generators/angularjs/scaffold/scaffold_generator.rb

@@ -16,17 +16,10 @@ module Angularjs
     end
 
     def init_vars
-      # Rails.logger.info "--> init_vars"
       @model_name = controller_name.singularize #"Post"
-      # Rails.logger.info "@model_name: #{@model_name}"
       @controller = controller_name #"Posts"
-      # Rails.logger.info "@controller: #{@controller}"
       @resource_name = @model_name.demodulize.underscore #post
-      # Rails.logger.info "@resource_name: #{@resource_name}"
       @plural_model_name = @resource_name.pluralize #posts
-      # Rails.logger.info "@plural_model_name: #{@plural_model_name}"
-      @language = language_option # 'coffeescript or javascript'
-      # Rails.logger.info "@language: #{@language}"
     end
 
     def columns
@@ -47,42 +40,40 @@ module Angularjs
     end
 
     def generate
-      #Rails.logger.info "columns: #{columns}"
-      remove_file "app/assets/stylesheets/scaffolds.css.scss" 
-      append_to_file "app/assets/javascripts/application.js",
-        "//= require #{@plural_model_name}_controller\n"
-      append_to_file "app/assets/javascripts/application.js",
-        "//= require #{@plural_model_name}\n"
-      if @language == 'coffeescript'
+      remove_file "app/assets/stylesheets/scaffolds.css.scss"
+      # append_to_file "app/assets/javascripts/application.js",
+      #   "//= require #{@plural_model_name}_controller\n"
+      # append_to_file "app/assets/javascripts/application.js",
+      #   "//= require #{@plural_model_name}\n"
+      if language_option == 'coffeescript'
         insert_into_file "app/assets/javascripts/routes.coffee.erb",
-        ", \'#{@plural_model_name}\'", before: "]"
+          ", \'#{@plural_model_name}\'", :after => "'ngCookies'"
         insert_into_file "app/assets/javascripts/routes.coffee.erb",
 %{when("/#{@plural_model_name}", 
-    controller: \'#{@controller}IndexCtrl\'
-    templateUrl: "<%= asset_path(\'#{@plural_model_name}/index.html\') %>"
+    controller: #{@controller}IndexCtrl
+    templateUrl: '<%= asset_path(\"#{@plural_model_name}/index.html\") %>'
   ).when("/#{@plural_model_name}/new",
-    controller: \'#{@controller}CreateCtrl\'
-    templateUrl: "<%= asset_path(\'#{@plural_model_name}/new.html\') %>"
+    controller: #{@controller}CreateCtrl
+    templateUrl: '<%= asset_path(\"#{@plural_model_name}/new.html\") %>'
   ).when("/#{@plural_model_name}/:id",
-    controller: \'#{@controller}ShowCtrl\'
-    templateUrl: "<%= asset_path(\'#{@plural_model_name}/show.html\') %>"
+    controller: #{@controller}ShowCtrl
+    templateUrl: '<%= asset_path(\"#{@plural_model_name}/show.html\") %>'
   ).when("/#{@plural_model_name}/:id/edit",
-    controller: \'#{@controller}EditCtrl\'
-    templateUrl: "<%= asset_path(\'#{@plural_model_name}/edit.html\') %>"
-  ).}, before: 'otherwise'
+    controller: #{@controller}EditCtrl
+    templateUrl: '<%= asset_path(\"#{@plural_model_name}/edit.html\") %>'
+  ).}, :before => 'otherwise'
       else
         insert_into_file "app/assets/javascripts/routes.js.erb",
-        ", '#{@plural_model_name}'", after: "'ngCookies'"
+          ", '#{@plural_model_name}'", :after => "'ngCookies'"
         insert_into_file "app/assets/javascripts/routes.js.erb",
-%{    when('/#{@plural_model_name}', {controller: \'#{@controller}IndexCtrl\',
-         templateUrl:'<%= asset_path("#{@plural_model_name}/index.html") %>'}).
-    when('/#{@plural_model_name}/new', {controller: \'#{@controller}CreateCtrl\',
-                templateUrl:'<%= asset_path("#{@plural_model_name}/new.html") %>'}).
-    when('/#{@plural_model_name}/:id', {controller: \'#{@controller}ShowCtrl\',
-         templateUrl:'<%= asset_path("#{@plural_model_name}/show.html") %>'}).
-    when('/#{@plural_model_name}/:id/edit', {controller: \'#{@controller}EditCtrl\',
-         templateUrl:'<%= asset_path("#{@plural_model_name}/edit.html") %>'}).\n
-}, before: 'otherwise'
+%{\n    when('/#{@plural_model_name}', {controller:#{@controller}IndexCtrl,
+      templateUrl:'<%= asset_path("#{@plural_model_name}/index.html") %>'}).
+    when('/#{@plural_model_name}/new', {controller:#{@controller}CreateCtrl,
+      templateUrl:'<%= asset_path("#{@plural_model_name}/new.html") %>'}).
+    when('/#{@plural_model_name}/:id', {controller:#{@controller}ShowCtrl,
+      templateUrl:'<%= asset_path("#{@plural_model_name}/show.html") %>'}).
+    when('/#{@plural_model_name}/:id/edit', {controller:#{@controller}EditCtrl,
+      templateUrl:'<%= asset_path("#{@plural_model_name}/edit.html") %>'}).}, :before => 'otherwise'
       end
       
       inject_into_class "app/controllers/#{@plural_model_name}_controller.rb",
@@ -104,18 +95,20 @@ module Angularjs
       insert_into_file "app/views/layouts/application.html.erb",  model_index_link,
         after: "<!-- main menu models -->"
       
-      if @language == 'coffeescript'
+      if language_option == 'coffeescript'
         remove_file "app/assets/javascripts/#{@plural_model_name}.js"
         remove_file "app/assets/javascripts/#{@plural_model_name}_controller.js"
         template "plural_model_name.js.coffee", "app/assets/javascripts/#{@plural_model_name}.js.coffee"
         template "plural_model_name_controller.js.coffee",
           "app/assets/javascripts/#{@plural_model_name}_controller.js.coffee"
       else
-        remove_file "app/assets/javascripts/#{@plural_model_name}.coffee"
-        remove_file "app/assets/javascripts/#{@plural_model_name}_controller.coffee"
+        remove_file "app/assets/javascripts/#{@plural_model_name}.js.coffee"
+        remove_file "app/assets/javascripts/#{@plural_model_name}_controller.js.coffee"
         template "plural_model_name.js", "app/assets/javascripts/#{@plural_model_name}.js"
         template "plural_model_name_controller.js",
           "app/assets/javascripts/#{@plural_model_name}_controller.js"
+        # remove the default .js.coffee file added by rails.
+        remove_file "app/assets/javascripts/#{@plural_model_name}.js.coffee"
       end
     end
   end

data/lib/generators/angularjs/scaffold/templates/edit.html.erb

@@ -38,7 +38,7 @@
               class="btn btn-danger">
               <i class="icon-trash"></i>Delete
       </button>
-      <a href="/<%= @resource_name%>s" class="btn">
+      <a href="/<%= @plural_model_name%>" class="btn">
         Back to <%= @plural_model_name%>
       </a>
     </div>

data/lib/generators/angularjs/scaffold/templates/new.html.erb

@@ -38,7 +38,7 @@
               class="btn btn-danger">
               <i class="icon-trash"></i> Delete
       </button>
-      <a href="/<%= @resource_name%>s" class="btn">Back to <%= @resource_name%>s</a>
+      <a href="/<%= @plural_model_name%>" class="btn">Back to <%= @plural_model_name%></a>
     </div>
   </fieldset>
 </form>

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

@@ -1,15 +1,15 @@
-angular.module('<%= @plural_model_name %>', ['ngResource']).
-  factory('<%= @model_name %>', function($resource) {
-  var <%= @model_name %> = $resource('/<%= @plural_model_name %>/:id', {id: '@id'},
+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'}
                        }
                       );
 
-  <%= @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.js.coffee

@@ -1,7 +1,7 @@
 root = global ? window
 
-angular.module("<%= @plural_model_name %>", ["ngResource"]).factory "<%= @model_name %>", ($resource) ->
-  <%= @model_name %> = $resource("/<%= @plural_model_name %>/:id",
+angular.module("<%= @plural_model_name %>", ["ngResource"]).factory "<%= @model_name %>", ['$resource', ($resource) ->
+  <%= "#{@model_name}" %> = $resource("/<%= @plural_model_name %>/:id",
     id: "@id"
   ,
     update:
@@ -10,11 +10,11 @@ angular.module("<%= @plural_model_name %>", ["ngResource"]).factory "<%= @model_
     destroy:
       method: "DELETE"
   )
-  <%= @model_name %>::destroy = (cb) ->
-    <%= @model_name %>.remove
+  <%= "#{@model_name}" %>::destroy = (cb) ->
+    <%= "#{@model_name}" %>.remove
       id: @id
     , cb
 
-  <%= @model_name %>
-
+  <%= "#{@model_name}" %>
+]
 root.angular = angular

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

@@ -1,42 +1,48 @@
- <%= @controller %>IndexCtrl = ['$scope', '<%= @model_name %>', function($scope, <%= @model_name %>) {
-  $scope.<%= @plural_model_name %> = <%= @model_name %>.query();
+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);
+      var original = this.<%= @resource_name%>
+      this.<%= @resource_name%>.destroy(function() {
+        $scope.<%= @plural_model_name %> = _.without($scope.<%= @plural_model_name%>, original);
       });
     }
   };
-}];
+}
 
-<%= @controller %>CreateCtrl = ['$scope', '$location', '<%= @model_name %>', function ($scope, $location, <%= @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');
+    <%= @model_name%>.save($scope.<%= @resource_name%>, function(<%= @resource_name%>) {
+      $location.path('/<%= @plural_model_name %>/' + <%= @resource_name%>.id + '/edit');
     });
   }
-}];
+}
+
+<%= @controller%>CreateCtrl.$inject = ['$scope', '$location', '<%= @model_name%>'];
 
-<%= @controller %>ShowCtrl = ['$scope', '$location', '$routeParams', '<%= @model_name %>', function ($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);
+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 %>EditCtrl = ['$scope', '$location', '$routeParams', '<%= @model_name %>', function ($scope, $location, $routeParams, <%= @model_name %>) {
+<%= @controller%>ShowCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name%>'];
+
+function <%= @controller%>EditCtrl($scope, $location, $routeParams, <%= @model_name%>) {
   var self = this;
 
-  <%= @model_name %>.get({id: $routeParams.id}, function(<%= @resource_name %>) {
-    self.original = <%= @resource_name %>;
-    $scope.<%= @resource_name %> = new <%= @model_name %>(self.original);
+  <%= @model_name%>.get({id: $routeParams.id}, function(<%= @resource_name%>) {
+    self.original = <%= @resource_name%>;
+    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original);
   });
 
   $scope.isClean = function() {
-    return angular.equals(self.original, $scope.<%= @resource_name %>);
+    return angular.equals(self.original, $scope.<%= @resource_name%>);
   }
 
   $scope.destroy = function() {
@@ -48,8 +54,10 @@
   };
 
   $scope.save = function() {
-    <%= @model_name %>.update($scope.<%= @resource_name %>, function(<%= @resource_name %>) {
+    <%= @model_name%>.update($scope.<%= @resource_name%>, function(<%= @resource_name%>) {
       $location.path('/<%= @plural_model_name %>');
     });
   };
-}];
+}
+
+<%= @controller%>EditCtrl.$inject = ['$scope', '$location', '$routeParams', '<%= @model_name%>'];

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

@@ -1,54 +1,59 @@
+
 root = global ? window
 
-<%= @controller %>IndexCtrl = ["$scope", "<%= @model_name %>", ($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 ->
+      original = @<%= @resource_name%>
+      @<%= @resource_name%>.destroy ->
         $scope.<%= @plural_model_name %> = _.without($scope.<%= @plural_model_name %>, original)
 
-]
-<%= @controller %>CreateCtrl = ["$scope", "$location", "<%= @model_name %>", ($scope, $location, <%= @model_name %>) ->
+<%= @controller%>IndexCtrl.$inject = ['$scope', '<%= @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 %>ShowCtrl = ["$scope", "$location", "$routeParams", "<%= @model_name %>", ($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%>) ->
+    self.original = <%= @resource_name%>
+    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original)
 
-]
-<%= @controller %>EditCtrl = ["$scope", "$location", "$routeParams", "<%= @model_name %>", ($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
+  <%= @model_name%>.get
     id: $routeParams.id
-  , (<%= @resource_name %>) ->
-    self.original = <%= @resource_name %>
-    $scope.<%= @resource_name %> = new <%= @model_name %>(self.original)
+  , (<%= @resource_name%>) ->
+    self.original = <%= @resource_name%>
+    $scope.<%= @resource_name%> = new <%= @model_name%>(self.original)
 
   $scope.isClean = ->
-    angular.equals self.original, $scope.<%= @resource_name %>
+    angular.equals self.original, $scope.<%= @resource_name%>
 
   $scope.destroy = ->
     dconfirm = confirm("Are you sure?")
     if dconfirm
-      $scope.<%= @resource_name %>.destroy ->
+      $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%>'];
+
 # 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 

data/lib/generators/angularjs/scaffold/templates/show.html.erb

@@ -15,7 +15,7 @@
   <button ng-click="destroy()" class="btn btn-danger">
     <i class="icon-trash"></i> Delete
   </button>
-  <a href="/<%= @resource_name%>s" class="btn">
+  <a href="/<%= @plural_model_name%>" class="btn">
     Back to <%= @plural_model_name%>
   </a>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: explainer_angularjs_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Angularjs scaffolding.