RubyGems - extjs_scaffold - Versions diffs - 0.1.1 → 0.2.0 - Mend

extjs_scaffold 0.1.1 → 0.2.0

Files changed (12) hide show

data/README.md CHANGED Viewed

@@ -1,16 +1,23 @@
 # ExtjsScaffold
-Rails 3.1 Scaffold generator for Extjs 4
+Rails 3.2 Scaffold generator for Extjs 4.1
 ## Usage
 ### Install
+1) Add pagination gem to Gemfile
+	gem "kaminari"
+	or
+	gem "will_paginate", "~> 3.0.0"
-1) Install Sencha Extjs 4 into public
+2) Install Sencha Extjs 4 into public
 	public/extjs
-2) Add Extjs to app/views/layouts/application.html.erb
+3) Add Extjs to app/views/layouts/application.html.erb
 	<html>
 	<head>
@@ -28,7 +35,7 @@ Rails 3.1 Scaffold generator for Extjs 4
 	</body>
 	</html>
-3) Add Extjs MVC structure app/assets/javascripts/application.js
+4) Add Extjs MVC structure app/assets/javascripts/application.js
 		//= require_self
 		//= require_tree ./ux
@@ -39,7 +46,7 @@ Rails 3.1 Scaffold generator for Extjs 4
 		//= require_tree ./controller
 		//= require_tree .
-4) Run the install generator
+5) Run the install generator
 	rails generate extjs_scaffold:install

data/extjs_scaffold.gemspec CHANGED Viewed

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["mwinkler"]
   s.email       = ["mhwinkler@gmail.com"]
   s.homepage    = "https://github.com/mojomaze/extjs_scaffold"
-  s.summary     = "Scaffold Generator for Rails 3.1 and Extjs 4"
-  s.description = "Scaffold Generator for Rails 3.1 and Sencha Extjs 4"
+  s.summary     = "Scaffold Generator for Rails 3.2 and Extjs 4.1"
+  s.description = "Scaffold Generator for Rails 3.2 and Sencha Extjs 4.1"
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "cucumber"
   s.add_development_dependency "cucumber-rails"
   s.add_development_dependency "aruba", "< 0.4.7"
-  s.add_runtime_dependency "rails", "~> 3.1.0"
+  s.add_runtime_dependency "rails", "~> 3.2.0"
 end

data/features/scaffold_generator.feature CHANGED Viewed

@@ -13,7 +13,7 @@ Feature: Generate Extjs Install and Scaffold
 		And I append to "Gemfile" with:
 			"""
 			gem "haml"
-			gem "kaminari"
+			gem "kaminari", "~> 0.13.0"
 			gem "extjs_renderer", "~> 0.1.0"
 			gem 'extjs_scaffold', :path => '../../../'
@@ -74,6 +74,10 @@ Feature: Generate Extjs Install and Scaffold
 				| app/models/product.rb |
 				| app/views/products/index.html.erb |
 				| test/functional/products_controller_test.rb |
+		And I run `rails g scaffold team name:string`
+			Then the following files should exist:
+				| app/views/products/index.html.erb |
+				| test/functional/teams_controller_test.rb |
 		And I append to "Gemfile" with:
 			"""
 			gem "rspec", "~> 2.7.0"

data/lib/extjs_scaffold/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module ExtjsScaffold
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/generators/extjs_scaffold/install/install_generator.rb CHANGED Viewed

@@ -55,10 +55,6 @@ module ExtjsScaffold
         empty_directory File.join("app/assets/javascripts/ux", "grid")
         template 'GridPanel.js', File.join('app/assets/javascripts/ux/grid/', 'Panel.js')
-        #toolbar
-        empty_directory File.join("app/assets/javascripts/ux", "toolbar")
-        template 'ScrollingToolbar.js', File.join('app/assets/javascripts/ux/toolbar/', 'Scrolling.js')
         #window
         empty_directory File.join("app/assets/javascripts/ux", "window")
         template 'EditWindow.js', File.join('app/assets/javascripts/ux/window/', 'EditWindow.js')

data/lib/generators/extjs_scaffold/install/templates/GridPanel.js CHANGED Viewed

@@ -12,11 +12,6 @@ Ext.define('<%= app_name %>.ux.grid.Panel', {
 	*/
 	multiSelect: true,
-	// Use a PagingGridScroller
-	verticalScrollerType: 'paginggridscroller',
-	invalidateScrollerOnRefresh: false,
-	//disableSelection: true,
 	enableColumnHide: false,
 	enableColumnMove: false,
 	enableColumnResize: false,
@@ -114,17 +109,6 @@ Ext.define('<%= app_name %>.ux.grid.Panel', {
 			items: topitems
 		});
-		if (!me.hideBottomToolbar) {
-			toolbars.push({
-				xtype: 'scrollingtoolbar',
-				itemId: 'bottomtoolbar',
-				store: me.store,
-				dock: 'bottom',
-				displayInfo: true,
-				displayReload: me.enableStoreReload
-			});
-		}
 		return toolbars;
 	},

data/lib/generators/extjs_scaffold/install/templates/SearchField.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * @author Adapted from Ext.ux.form.SearchField example
+ * @author Ext.ux.form.SearchField example
  * http://www.sencha.com/
  * @class App.ux.form.field.SearchField
  * @extends Ext.form.field.Trigger
@@ -25,80 +25,74 @@
 */
 Ext.define('<%= app_name %>.ux.form.field.SearchField', {
 	extend: 'Ext.form.field.Trigger',
 	alias: 'widget.searchfield',
-	trigger1Cls: 'x-form-clear-trigger',
-	trigger2Cls: 'x-form-search-trigger',
+	trigger1Cls: Ext.baseCSSPrefix + 'form-clear-trigger',
+	trigger2Cls: Ext.baseCSSPrefix + 'form-search-trigger',
-	emptyText: '',
-	width: 180,
+	hasSearch : false,
+	paramName : 'query',
-	/**
-	* @cfg {store} store
-	* The associated data store to receive query
-	*/
-	store: '',
+	initComponent: function() {
+		var me = this;
-	/**
-	* @cfg {String} queryParam
-	* The query param name sent to store
-	* (defaults to <tt>query</tt>)
-	*/
-	queryParam: 'query',
+		me.callParent(arguments);
+		me.on('specialkey', function(f, e){
+			if (e.getKey() == e.ENTER) {
+				me.onTrigger2Click();
+			}
+		});
-	initComponent: function(){
-		this.callParent(arguments);
-		this.on('specialkey', this.checkEnterKey, this);
-	},
+		// We're going to use filtering
+		me.store.remoteFilter = true;
-	onRender: function() {
-		this.callParent(arguments);
-		this.triggerEl.elements[0].setDisplayed('none');
-	},
+		// Set up the proxy to encode the filter in the simplest way as a name/value pair
-	// Handle enter key presses, execute the search if the field has a value
-	checkEnterKey: function(field, e) {
-		var value = this.getValue();
-		if (e.getKey() === e.ENTER) {
-			this.search();
+		// If the Store has not been *configured* with a filterParam property, then use our filter parameter name
+		if (!me.store.proxy.hasOwnProperty('filterParam')) {
+			me.store.proxy.filterParam = me.paramName;
+		}
+		me.store.proxy.encodeFilters = function(filters) {
+			return filters[0].value;
 		}
 	},
-	onTrigger2Click: function() {
-		this.search();
-	},
-	onTrigger1Click: function() {
-		this.clearSearch();
+	afterRender: function(){
+		this.callParent();
+		this.triggerCell.item(0).setDisplayed(false);
 	},
-	search: function() {
+	onTrigger1Click : function(){
 		var me = this;
-		me.triggerEl.elements[0].setDisplayed('block');
-		var v = this.getRawValue();
-		if (v.length < 1){
-			me.clearSearch();
-			return;
-		}
-		if (me.store) {
-			var query = {}
-			query[me.queryParam] = v;
-			Ext.apply(me.store.proxy.extraParams, query);
-			me.store.load();
+		if (me.hasSearch) {
+			me.setValue('');
+			me.store.clearFilter();
+			me.hasSearch = false;
+			me.triggerCell.item(0).setDisplayed(false);
+			me.updateLayout();
 		}
-		me.doComponentLayout();
 	},
-	clearSearch: function() {
-		var me = this;
-		me.triggerEl.elements[0].setDisplayed('none');
-		me.setValue('');
-		if (me.store) {
-			var query = {}
-			query[me.queryParam] = '';
-			Ext.apply(me.store.proxy.extraParams, query);
-			me.store.load();
+	onTrigger2Click : function(){
+		var me = this,
+			store = me.store,
+			proxy = store.getProxy(),
+			value = me.getValue();
+		if (value.length > 0) {
+			// Param name is ignored here since we use custom encoding in the proxy.
+			// id is used by the Store to replace any previous filter
+			me.store.filter({
+				id: me.paramName,
+				property: me.paramName,
+				value: value
+			});
+			me.hasSearch = true;
+			me.triggerCell.item(0).setDisplayed(true);
+			me.updateLayout();
 		}
-		me.doComponentLayout();
 	}
 });

data/lib/generators/extjs_scaffold/scaffold_controller/scaffold_controller_generator.rb CHANGED Viewed

@@ -30,13 +30,14 @@ module ExtjsScaffold
           template "model.rb", "app/models/#{controller_file_name}_tmp.rb"
           f = File.open "#{destination_root}/app/models/#{controller_file_name}_tmp.rb", "r"
           model_methods = f.read
-          # insert after belongs_to or inject
-          refs = attributes.select{|attr| attr.reference? }.collect{|a| a.name}
+          # make related tables updateable - add to attr_accessible
+          refs = reference_attributes.map{|a| ":#{a.name}_id, :#{a.name}_#{reference_field(a)}"}
           if refs.size > 0
-            insert_into_file "app/models/#{singular_table_name}.rb", model_methods, :after => "belongs_to :#{refs.last}"
-          else
-            inject_into_class "app/models/#{singular_table_name}.rb", singular_table_name.capitalize, model_methods
+            refs_attr = refs.sort.join(", ")
+            insert_into_file "app/models/#{singular_table_name}.rb", ", "+refs_attr, :after => /attr_accessible.*/
           end
+          # add search with pagination class method
+          insert_into_file "app/models/#{singular_table_name}.rb", "\n"+model_methods, :after => /attr_accessible.*/
           remove_file "app/models/#{controller_file_name}_tmp.rb"
         end
       end
@@ -291,6 +292,29 @@ module ExtjsScaffold
       def updatefield_width(attribute)
         return %w(boolean date integer).include?(attribute.type.to_s) ? 275 : 575
       end
+      private
+        def resource_attributes
+          key_value singular_table_name, "{ #{attributes_hash} }"
+        end
+        def attributes_hash
+          return if accessible_attributes.empty?
+          accessible_attributes.map do |a|
+            name = a.name
+            key_value name, "@#{singular_table_name}.#{name}"
+          end.sort.join(', ')
+        end
+        def accessible_attributes
+          attributes.reject(&:reference?)
+        end
+        def reference_attributes
+          attributes.select(&:reference?)
+        end
     end
   end
 end

data/lib/generators/extjs_scaffold/scaffold_controller/templates/tests/controller_test.rb CHANGED Viewed

@@ -24,7 +24,7 @@ end
   test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, <%= singular_table_name %>: @<%= singular_table_name %>.attributes
+      post :create, <%= resource_attributes %>
     end
     assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
@@ -32,7 +32,7 @@ end
   test "should create <%= singular_table_name %> via xhr json requests" do
     assert_difference('<%= class_name %>.count') do
-      xhr :post, :create, <%= singular_table_name %>: @<%= singular_table_name %>.attributes, :format => :json
+      xhr :post, :create, <%= resource_attributes %>, :format => :json
     end
     json = ActiveSupport::JSON.decode(@response.body)
@@ -55,7 +55,7 @@ end
   end
   test "should update <%= singular_table_name %> via xhr json" do
-    xhr :put, :update, id: @<%= singular_table_name %>.to_param, <%= singular_table_name %>: @<%= singular_table_name %>.attributes, :format => :json
+    xhr :put, :update, id: @<%= singular_table_name %>.to_param, <%= resource_attributes %>, :format => :json
     json = ActiveSupport::JSON.decode(@response.body)
     assert json['success']
     assert_equal json['data']['id'], @<%= singular_table_name %>.id

data/spec/generators/install_spec.rb CHANGED Viewed

@@ -84,11 +84,6 @@ describe ExtjsScaffold::Generators::InstallGenerator do
                   contains "Ext.define('#{app_name}.ux.grid.Panel', {"
                 end
               end
-              directory "toolbar" do
-                file "Scrolling.js" do
-                  contains "Ext.define('#{app_name}.ux.toolbar.Scrolling', {"
-                end
-              end
               directory "window" do
                 file "EditWindow.js" do
                   contains "Ext.define('#{app_name}.ux.window.EditWindow', {"

metadata CHANGED Viewed

@@ -2,7 +2,7 @@
 name: extjs_scaffold
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - mwinkler
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00 Z
+date: 2012-06-27 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -97,10 +97,10 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
   type: :runtime
   version_requirements: *id008
-description: Scaffold Generator for Rails 3.1 and Sencha Extjs 4
+description: Scaffold Generator for Rails 3.2 and Sencha Extjs 4.1
 email:
 - mhwinkler@gmail.com
 executables: []
@@ -133,7 +133,6 @@ files:
 - lib/generators/extjs_scaffold/install/templates/GridPanel.js
 - lib/generators/extjs_scaffold/install/templates/ParentComboField.js
 - lib/generators/extjs_scaffold/install/templates/Rails.js
-- lib/generators/extjs_scaffold/install/templates/ScrollingToolbar.js
 - lib/generators/extjs_scaffold/install/templates/SearchField.js
 - lib/generators/extjs_scaffold/install/templates/UpdateWindow.js
 - lib/generators/extjs_scaffold/install/templates/Updateable.js
@@ -236,7 +235,7 @@ rubyforge_project:
 rubygems_version: 1.8.8
 signing_key:
 specification_version: 3
-summary: Scaffold Generator for Rails 3.1 and Extjs 4
+summary: Scaffold Generator for Rails 3.2 and Extjs 4.1
 test_files:
 - features/scaffold_generator.feature
 - features/step_definitions/aruba_ext_steps.rb

data/lib/generators/extjs_scaffold/install/templates/ScrollingToolbar.js DELETED Viewed

@@ -1,170 +0,0 @@
-/**
- * @author Mark H Winkler
- * @class App.ux.toolbar.Scrolling
- * @extends Ext.toolbar.Toolbar
- * <p>Extends toolbar.Toolbar</p>
- * <p>Stripped down version of Ext.toolbar.Paging that shows total recs from store</p>
-*/
-Ext.define('<%= app_name %>.ux.toolbar.Scrolling', {
-	extend: 'Ext.toolbar.Toolbar',
-	alias: 'widget.scrollingtoolbar',
-	requires: ['Ext.toolbar.TextItem'],
-	/**
-	* @cfg {String} displayMsg
-	* The paging status message to display
-	*/
-	displayMsg : 'Total: {0}',
-	/**
-	* @cfg {String} emptyMsg
-	* The message to display when no records are found (defaults to 'No data to display')
-	*/
-	emptyMsg : 'No data to display',
-	/**
-	* @cfg {String} refreshText
-	* The quicktip text displayed for the Refresh button (defaults to <tt>'Refresh'</tt>).
-	* <b>Note</b>: quick tips must be initialized for the quicktip to show.
-*/
-	refreshText : 'Refresh',
-	/**
-	* @cfg {boolean} displayReload
-	* add reload button to toolbar
-*/
-	displayReload: false,
-	initComponent : function(){
-		var me = this;
-		me.items = [];
-		if (me.displayReload) {
-			me.items.push({
-				tooltip: 'Refresh',
-				iconCls: 'x-tbar-loading',
-				scope: me,
-				handler: me.reload
-			});
-		}
-		if (me.displayInfo) {
-			me.items.push('->');
-			me.items.push({xtype: 'tbtext', itemId: 'displayItem'});
-		}
-		me.callParent();
-		me.on('afterlayout', me.onLoad, me, {single: true});
-		me.bindStore(me.store || 'ext-empty-store', true);
-	},
-	// private
-	updateInfo : function(){
-		var me = this,
-		displayItem = me.child('#displayItem'),
-		store = me.store,
-		totalCount = store.getTotalCount();
-		if (displayItem) {
-			count = store.getCount();
-			if (count === 0) {
-				msg = me.emptyMsg;
-			} else {
-				msg = Ext.String.format(
-					me.displayMsg,
-					totalCount
-				);
-			}
-			displayItem.setText(msg);
-			me.doComponentLayout();
-		}
-	},
-	// private
-	onLoad : function(){
-		var me = this;
-		if (!me.rendered) {
-			return;
-		}
-		me.updateInfo();
-	},
-	// private
-	onLoadError : function(){
-		if (!this.rendered) {
-			return;
-		}
-		this.child('#refresh').enable();
-	},
-	/**
-	* Refresh the current page, has the same effect as clicking the 'refresh' button.
-	*/
-	// doRefresh : function(){
-	//      var me = this,
-	//          current = me.store.currentPage;
-	//
-	//      if (me.fireEvent('beforechange', me, current) !== false) {
-	//          me.store.loadPage(current);
-	//      }
-	//  },
-	/**
-	* Binds the paging toolbar to the specified {@link Ext.data.Store}
-	* @param {Ext.data.Store} store The store to bind to this toolbar
-	* @param {Boolean} initial (Optional) true to not remove listeners
-	*/
-	bindStore : function(store, initial){
-		var me = this;
-		if (!initial && me.store) {
-			if (store !== me.store && me.store.autoDestroy) {
-				me.store.destroy();
-			} else {
-				me.store.un('load', me.onLoad, me);
-				me.store.un('exception', me.onLoadError, me);
-			}
-			if (!store) {
-				me.store = null;
-			}
-		}
-		if (store) {
-			store = Ext.data.StoreManager.lookup(store);
-			store.on({
-				scope: me,
-				load: me.onLoad,
-				exception: me.onLoadError
-			});
-		}
-		me.store = store;
-	},
-	// private
-	onDestroy : function(){
-		this.bindStore(null);
-		this.callParent();
-	},
-	updateTotal: function(total){
-		var me = this,
-			displayItem = me.child('#displayItem');
-		if (displayItem) {
-			count = total;
-			if (count === 0) {
-				msg = me.emptyMsg;
-			} else {
-				msg = Ext.String.format(
-					me.displayMsg,
-					count
-				);
-			}
-			displayItem.setText(msg);
-			me.doComponentLayout();
-		}
-	},
-	reload: function() {
-		var me = this;
-		me.store.load();
-	}
-});