ajax_scaffold_generator 3.1.3 → 3.1.4

data/CHANGELOG

@@ -0,0 +1,90 @@
+
+3.1.4 =========
+
+* Removed some vestigal CSS styling of textarea's that was setting the height
+* Added unit and functional tests (Thanks to Nic Williams)
+* Fixed bug with CamelCased model names not being converted to underscored names correctly
+
+3.1.3 =========
+
+* Fixed the generated test code so that it doesn't fail (even though there aren't any tests in there)
+* Fixed a problem with a column sort direction not resetting when you select a new column to sort
+* Fixed the "parenthesize method" warning messages
+* Changed component.rhtml to rely on a variable for determining whether to display the scaffold wrapper elements instead of simply using request.xhr?
+* ScaffoldColumns will escape column data (If you set :eval then it is your responsibility to wrap it in h() if necessary).
+* Added the disabling of the add/edit forms on submit
+* Moved calls to update_params up into a before_filter
+
+3.1.2 =========
+
+* Fixed bug with default sort not working for non-standard (overridden) table names.
+* Fixed bug that allowed models to be generated in the plural form and in subdirectories.
+* Fixed bug with edit/delete links not working for non-standard primary keys.
+* Removed test methods from the controller functional test since they were all outdated and broken anyways.
+* Changed the helper methods for column header and element row id's to be more properly namespaced.
+* Changed controller actions to explicitly call RJS templates so there aren't any errors with conflicting RHTML templates.
+
+3.1.1 =========
+
+* Fixed two bugs with :eval and :sort_sql introspection in ScaffoldColumn. Should fix problems people have been having with 
+  underscored table names.
+* Made the code that gets the @sort_by for a component more robust so that invalid values in the session doesn't continue
+  to hose scaffolds.
+
+3.1.0 =========
+
+* Added support for defining your own scaffold columns in models by assigning an array of ScaffoldColumn's to @scaffold_columns.
+  If @scaffold_columns is not defined it will be created defaulting to columns for model.content_columns. See more about
+  ScaffoldColumns in lib/ajax_scaffold.rb or by reading the documentation on the site. Model classes now must "require 'ajax_scaffold'"
+  to support this new functionality. 
+* Added cancel as an action. There was enough inline code in _new_edit.rhtml that I thought, for consistency, it should be
+  refactored into a server-side method.
+* Refactoring: All common server side code has been moved into lib/ajax_scaffold.rb. 
+  This replaces the previous helpers/ajax_scaffold_helper.rb with an include in the helpers to AjaxScaffold::Helper
+* Changed CSS styling of sorted columns to a more subtle darker blue from the yellow
+
+3.0.4 =========
+
+* Pagination loading indicator was not being namespaced using the scaffold_id. Caused all pagination loaders to show when 
+  any pagination links were clicked.
+* Fixed more issues related to controllers in subdirectories. Relative path controller names caused problems as well so
+  all url hashes now have a leading / on all controller names
+  
+3.0.3 =========
+
+* Fixed a bug where destroy.rjs was throwing element not found errors
+
+3.0.2 =========
+
+* Added loading indicators for sorting and pagination
+* Fixed a major bug that was causing problems with scaffolds generated with :: seperated controller names (eg Admin::Widgets)
+* Refactored the default page size into AjaxScaffoldUtil library
+
+3.0.1 =========
+
+* Removed hardcoded controller value from ajax_scaffold_helper.rb that was left in there by accident.
+
+3.0.0 ==========
+
+* Generated scaffold uses RJS templates. This should make adding and changing behavior much easier, but this also means that Rails 1.1+ is now required.
+* Sorting & Pagination support.
+
+2.2.1 ==========
+
+* Bug Fix : Generated scaffolds using controllers in modules no longer throw RoutingErrors.
+
+2.2.0 ==========
+
+* Graceful degredation in the absence of Javascript support.
+
+2.1.0 ==========
+
+* Safari: no longer crashes browser when editing the last row.
+* Row colors always alternate instead of being overwritten by Effect.Highlight.
+* Works when you generate with different controller and model parameters.
+* Creating a new places that new element where its create form previously was, not at the top as it was previously.
+* Now have the option to enable or disable highlighting via the generated scaffold
+
+2.0.0 ==========
+
+* Initial release of overhauled generator

data/ajax_scaffold_generator.rb

@@ -64,7 +64,7 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
       # Model class, unit test, and fixtures.
       m.template 'model.rb',      File.join('app/models', "#{singular_name}.rb")
       m.template 'unit_test.rb',  File.join('test/unit', "#{singular_name}_test.rb")
-      m.template 'fixtures.yml',  File.join('test/fixtures', "#{plural_name}.yml")
+      m.template 'fixtures.yml',  File.join('test/fixtures', "#{table_name}.yml")
       
       # Scaffolded forms.
       m.complex_template 'form.rhtml',

data/templates/functional_test.rb

@@ -7,14 +7,110 @@ class <%= controller_class_name %>Controller; def rescue_action(e) raise e end;
 class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   fixtures :<%= table_name %>
 
-  def setup
-    @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
+	NEW_<%= class_name.upcase %> = {}	# e.g. {:name => 'Test <%= class_name %>', :description => 'Dummy'}
+	REDIRECT_TO_MAIN = {:action => 'list'} # put hash or string redirection that you normally expect
+
+	def setup
+		@controller = <%= controller_class_name %>Controller.new
+		@request    = ActionController::TestRequest.new
+		@response   = ActionController::TestResponse.new
+		# Retrieve fixtures via their name
+		# @first = <%= table_name %>(:first)
+		@first = <%= class_name %>.find_first
+	end
+
+  def test_component
+    get :component
+    assert_response :success
+    assert_template '<%= base_controller_file_path %>/component'
+    <%= table_name %> = check_attrs(%w(<%= table_name %>))
+    assert_equal <%= class_name %>.find(:all).length, <%= table_name %>.length, "Incorrect number of <%= table_name %> shown"
+  end
+
+  def test_component_update
+    get :component_update
+    assert_response :redirect
+    assert_redirected_to REDIRECT_TO_MAIN
+  end
+
+  def test_component_update_xhr
+    xhr :get, :component_update
+    assert_response :success
+    assert_template '<%= base_controller_file_path %>/component'
+    <%= table_name %> = check_attrs(%w(<%= table_name %>))
+    assert_equal <%= class_name %>.find(:all).length, <%= table_name %>.length, "Incorrect number of <%= table_name %> shown"
+  end
+
+  def test_create
+  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
+    post :create, {:<%= class_name.upcase.swapcase %> => NEW_<%= class_name.upcase %>}
+    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
+    assert_response :redirect
+    assert_redirected_to REDIRECT_TO_MAIN
+    assert_equal <%= class_name.upcase.swapcase %>_count + 1, <%= class_name %>.find(:all).length, "Expected an additional <%= class_name %>"
+  end
+
+  def test_create_xhr
+  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
+    xhr :post, :create, {:<%= class_name.upcase.swapcase %> => NEW_<%= class_name.upcase %>}
+    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
+    assert_response :success
+    assert_template 'create.rjs'
+    assert_equal <%= class_name.upcase.swapcase %>_count + 1, <%= class_name %>.find(:all).length, "Expected an additional <%= class_name %>"
+  end
+
+  def test_update
+  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
+    post :update, {:id => @first.id, :<%= class_name.upcase.swapcase %> => @first.attributes.merge(NEW_<%= class_name.upcase %>)}
+    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
+    <%= class_name.upcase.swapcase %>.reload
+   	NEW_<%= class_name.upcase %>.each do |attr_name|
+      assert_equal NEW_<%= class_name.upcase %>[attr_name], <%= class_name.upcase.swapcase %>.attributes[attr_name], "@<%= class_name.upcase.swapcase %>.#{attr_name.to_s} incorrect"
+    end
+    assert_equal <%= class_name.upcase.swapcase %>_count, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be the same"
+    assert_response :redirect
+    assert_redirected_to REDIRECT_TO_MAIN
+  end
+
+  def test_update_xhr
+  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
+    xhr :post, :update, {:id => @first.id, :<%= class_name.upcase.swapcase %> => @first.attributes.merge(NEW_<%= class_name.upcase %>)}
+    <%= class_name.upcase.swapcase %> = check_attrs(%w(<%= class_name.upcase.swapcase %>))
+    <%= class_name.upcase.swapcase %>.reload
+   	NEW_<%= class_name.upcase %>.each do |attr_name|
+      assert_equal NEW_<%= class_name.upcase %>[attr_name], <%= class_name.upcase.swapcase %>.attributes[attr_name], "@<%= class_name.upcase.swapcase %>.#{attr_name.to_s} incorrect"
+    end
+    assert_equal <%= class_name.upcase.swapcase %>_count, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be the same"
+    assert_response :success
+    assert_template 'update.rjs'
+  end
+
+  def test_destroy
+  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
+    post :destroy, {:id => @first.id}
+    assert_response :redirect
+    assert_equal <%= class_name.upcase.swapcase %>_count - 1, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be one less"
+    assert_redirected_to REDIRECT_TO_MAIN
+  end
+
+  def test_destroy_xhr
+  	<%= class_name.upcase.swapcase %>_count = <%= class_name %>.find(:all).length
+    xhr :post, :destroy, {:id => @first.id}
+    assert_response :success
+    assert_equal <%= class_name.upcase.swapcase %>_count - 1, <%= class_name %>.find(:all).length, "Number of <%= class_name %>s should be one less"
+    assert_template 'destroy.rjs'
   end
 
-  # A better generator might actually keep updated tests in here, until then its probably better to have nothing than something broken
-  def test_truth
-     assert true
+protected
+	# Could be put in a Helper library and included at top of test class
+  def check_attrs(attr_list)
+    attrs = []
+    attr_list.each do |attr_sym|
+      attr = assigns(attr_sym.to_sym)
+      assert_not_nil attr,       "Attribute @#{attr_sym} should not be nil"
+      assert !attr.new_record?,  "Should have saved the @#{attr_sym} obj" if attr.class == ActiveRecord
+      attrs << attr
+    end
+    attrs.length > 1 ? attrs : attrs[0]
   end
 end

data/templates/lib_ajax_scaffold.rb

@@ -8,7 +8,7 @@ module AjaxScaffold
     # based on the given class.    
     def initialize(klass, options)
       @name = options[:name]
-      @eval = options[:eval].nil? ?  "h(#{klass.to_s.downcase}.#{@name})" : options[:eval]
+      @eval = options[:eval].nil? ?  "h(#{Inflector.underscore(klass.to_s)}.#{@name})" : options[:eval] 
       @label = options[:label].nil? ? Inflector.titleize(@name) : options[:label]      
       @sortable = options[:sortable].nil? ? true : options[:sortable]      
       @sort_sql = options[:sort_sql].nil? ? Inflector.tableize(klass.to_s) + "." + @name : options[:sort_sql] unless !@sortable

data/templates/unit_test.rb

@@ -3,8 +3,48 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_hel
 class <%= class_name %>Test < Test::Unit::TestCase
   fixtures :<%= table_name %>
 
-  # Replace this with your real tests.
-  def test_truth
-    assert true
+	NEW_<%= class_name.upcase %> = {}	# e.g. {:name => 'Test <%= class_name %>', :description => 'Dummy'}
+	REQ_ATTR_NAMES 			 = %w( ) # name of fields that must be present, e.g. %(name description)
+	DUPLICATE_ATTR_NAMES = %w( ) # name of fields that cannot be a duplicate, e.g. %(name description)
+
+  def setup
+    # Retrieve fixtures via their name
+    # @first = <%= table_name %>(:first)
+  end
+
+  def test_raw_validation
+    <%= class_name.upcase.swapcase %> = <%= class_name %>.new
+    assert <%= class_name.upcase.swapcase %>.valid?, "<%= class_name %> should be valid without initialisation parameters"
+    # If <%= class_name %> has validation, then use the following:
+    #assert !<%= class_name.upcase.swapcase %>.valid?, "<%= class_name %> should not be valid without initialisation parameters"
+    #REQ_ATTR_NAMES.each {|attr_name| assert forum.errors.invalid?(attr_name.to_sym), "Should be an error message for :#{attr_name}"}
+  end
+
+  def test_new
+    <%= class_name.upcase.swapcase %> = <%= class_name %>.new(NEW_<%= class_name.upcase %>)
+    assert <%= class_name.upcase.swapcase %>.valid?, "<%= class_name %> should be valid"
+   	NEW_<%= class_name.upcase %>.each do |attr_name|
+      assert_equal NEW_FORUM[attr_name], forum.attributes[attr_name], "<%= class_name %>.@#{attr_name.to_s} incorrect"
+    end
+  end
+
+  def test_validates_presence_of
+   	REQ_ATTR_NAMES.each do |attr_name|
+      tmp_<%= class_name.upcase.swapcase %> = NEW_<%= class_name.upcase %>.clone
+      tmp_<%= class_name.upcase.swapcase %>.delete attr_name.to_sym
+      <%= class_name.upcase.swapcase %> = <%= class_name %>.new(tmp_<%= class_name.upcase.swapcase %>)
+      assert !<%= class_name.upcase.swapcase %>.valid?, "<%= class_name %> should be invalid, as @#{attr_name} is invalid"
+      assert forum.errors.invalid?(attr_name.to_sym), "Should be an error message for :#{attr_name}"
+    end
+  end
+
+  def test_duplicate
+    current_<%= class_name.upcase.swapcase %> = <%= class_name %>.find_first
+    DUPLICATE_ATTR_NAMES.each do |attr_name|
+      <%= class_name.upcase.swapcase %> = <%= class_name %>.new(NEW_<%= class_name.upcase %>.merge(attr_name.to_sym => current_<%= class_name.upcase.swapcase %>[attr_name]))
+      assert !<%= class_name.upcase.swapcase %>.valid?, "<%= class_name %> should be invalid, as @#{attr_name} is a duplicate"
+      assert forum.errors.invalid?(attr_name.to_sym), "Should be an error message for :#{attr_name}"
+    end
   end
 end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: ajax_scaffold_generator
 version: !ruby/object:Gem::Version 
-  version: 3.1.3
-date: 2006-07-13 00:00:00 -06:00
+  version: 3.1.4
+date: 2006-07-14 00:00:00 -06:00
 summary: Ajax scaffold generator is a rails generator for ajaxified scaffolds
 require_paths: 
   - lib
@@ -29,6 +29,7 @@ cert_chain:
 authors: []
 files: 
   - README
+  - CHANGELOG
   - MIT-LICENSE
   - ajax_scaffold_generator.rb
   - templates/