Fixed ext_rspec_scaffold generator - was underscoring some classnames…

… when they should have been camel case

generators/rspec_ext_scaffold/templates/controllers/_controller.js

@@ -1,10 +1,8 @@
-<%= namespace %>.controllers.<%= controller_class_name %>Controller = Ext.extend(CrudController, {
+<%= namespace %>.controllers.<%= controller_class_name %>Controller = Ext.extend(Ext.ux.MVC.controller.CrudController, {
   constructor: function(config) {
     <%= namespace %>.controllers.<%= controller_class_name %>Controller.superclass.constructor.call(this, {
       model      : <%= namespace %>.models.<%= class_name %>, 
-      indexPanel : <%= namespace %>.views.<%= table_name %>.Index,
-      editPanel  : <%= namespace %>.views.<%= table_name %>.Edit,
-      newPanel   : <%= namespace %>.views.<%= table_name %>.New
+      namespace  : '<%= namespace %>'
     });
   }
 });

generators/rspec_ext_scaffold/templates/views/edit.js

@@ -1,17 +1,17 @@
 /**
- * <%= namespace %>.views.<%= file_name %>.Edit
+ * <%= namespace %>.views.<%= class_name %>.Edit
  * @extends Ext.ux.MVC.view.DefaultEditForm
  * <%= class_name %> Edit Form
  */
-<%= namespace %>.views.<%= file_name %>.Edit = function(config) {
+<%= namespace %>.views.<%= class_name %>.Edit = function(config) {
   var config = config || {};
 
   Ext.applyIf(config, {
     model: <%= namespace %>.models.<%= class_name %>,
-    items: <%= namespace %>.views.<%= file_name %>.FormFields
+    items: <%= namespace %>.views.<%= class_name %>.FormFields
   });
 
-  <%= namespace %>.views.<%= file_name %>.Edit.superclass.constructor.call(this, config);
+  <%= namespace %>.views.<%= class_name %>.Edit.superclass.constructor.call(this, config);
 };
-Ext.extend(<%= namespace %>.views.<%= file_name %>.Edit, Ext.ux.MVC.view.DefaultEditForm);
-Ext.reg('<%= file_name %>_edit}', <%= namespace %>.views.<%= file_name %>.Edit);
+Ext.extend(<%= namespace %>.views.<%= class_name %>.Edit, Ext.ux.MVC.view.DefaultEditForm);
+Ext.reg('<%= file_name %>_edit}', <%= namespace %>.views.<%= class_name %>.Edit);

generators/rspec_ext_scaffold/templates/views/form_items.js

@@ -1,4 +1,4 @@
-<%= namespace %>.views.<%= file_name %>.FormFields = [
+<%= namespace %>.views.<%= class_name %>.FormFields = [
 <%- field_collection.fields.each do |f| -%><%-   if f.field_type == 'boolean' %>
   {
     xtype: '<%= f.ext_field_type %>',

generators/rspec_ext_scaffold/templates/views/index.js

@@ -1,9 +1,9 @@
 /**
- * <%= namespace %>.views.<%= file_name %>.Index
+ * <%= namespace %>.views.<%= class_name %>.Index
  * @extends Ext.ux.MVC.view.DefaultPagingGridWithTopToolbar
  * Grid view for the <%= class_name %> model
  */
-<%= namespace %>.views.<%= file_name %>.Index = function(config) {
+<%= namespace %>.views.<%= class_name %>.Index = function(config) {
   var config = config || {};
 
   Ext.applyIf(config, {
@@ -13,7 +13,7 @@
     ]
   });
 
-  <%= namespace %>.views.<%= file_name %>.Index.superclass.constructor.call(this, config);
+  <%= namespace %>.views.<%= class_name %>.Index.superclass.constructor.call(this, config);
 };
-Ext.extend(<%= namespace %>.views.<%= file_name %>.Index, Ext.ux.MVC.view.DefaultPagingGridWithTopToolbar);
-Ext.reg('<%= file_name %>_index}', <%= namespace %>.views.<%= file_name %>.Index);
+Ext.extend(<%= namespace %>.views.<%= class_name %>.Index, Ext.ux.MVC.view.DefaultPagingGridWithTopToolbar);
+Ext.reg('<%= file_name %>_index}', <%= namespace %>.views.<%= class_name %>.Index);

generators/rspec_ext_scaffold/templates/views/new.js

@@ -1,17 +1,17 @@
 /**
- * <%= namespace %>.views.<%= file_name %>.New
+ * <%= namespace %>.views.<%= class_name %>.New
  * @extends Ext.ux.MVC.view.DefaultNewForm
  * New <%= class_name %> form
  */
-<%= namespace %>.views.<%= file_name %>.New = function(config) {
+<%= namespace %>.views.<%= class_name %>.New = function(config) {
   var config = config || {};
 
   Ext.applyIf(config, {
     model: <%= namespace %>.models.<%= class_name %>,
-    items: <%= namespace %>.views.<%= file_name %>.FormFields
+    items: <%= namespace %>.views.<%= class_name %>.FormFields
   });
 
-  <%= namespace %>.views.<%= file_name %>.New.superclass.constructor.call(this, config);
+  <%= namespace %>.views.<%= class_name %>.New.superclass.constructor.call(this, config);
 };
-Ext.extend(<%= namespace %>.views.<%= file_name %>.New, Ext.ux.MVC.view.DefaultNewForm);
-Ext.reg('<%= file_name %>_new', <%= namespace %>.views.<%= file_name %>.New);
+Ext.extend(<%= namespace %>.views.<%= class_name %>.New, Ext.ux.MVC.view.DefaultNewForm);
+Ext.reg('<%= file_name %>_new', <%= namespace %>.views.<%= class_name %>.New);

init.rb

@@ -3,6 +3,7 @@
 require 'ext_tree_extensions/active_record/base'
 require 'ext_tree_extensions/action_controller/base'
 require 'ext_datetime_extensions/active_record/base'
+require 'routing/routes'
 
 ActiveRecord::Base.send(:include, ExtScaffoldCoreExtensions::ActiveRecord::Base)
 ActiveRecord::Base.send(:include, ExtTreeExtensions::ActiveRecord::Base)

lib/routing/routes.rb

@@ -0,0 +1,13 @@
+# FIXME: NOT ACTUALLY FUNCTIONAL YET, GIVES AN ERROR
+class << ActionController::Routing::RouteSet::Mapper; self;end.class_eval do
+  def batch_destroy *resources
+    resources.each do |r|
+      self.send("batch_destroy_#{r}", "/admin/batch_destroy_#{r}.:format", :controller => "admin", :action => 'destroy_batch', :model => r, :conditions => {:method => :delete})
+    end
+  end
+
+  def ext_tree *resources
+    resources.each {|r| self.send("connect", "/admin/#{r}/tree.:format", :controller => "Admin::#{r.to_s.classify.pluralize}", :action => 'tree', :model => r)}
+    resources.each {|r| self.send("connect", "/admin/#{r}/reorder/:id.:format", :controller => "Admin::#{r.to_s.classify.pluralize}", :action => 'reorder', :model => r)}
+  end 
+end