ajax_scaffold_generator 3.1.2 → 3.1.3

data/ajax_scaffold_generator.rb

@@ -52,7 +52,6 @@ class AjaxScaffoldGenerator < ScaffoldGenerator
       m.class_collisions class_path, class_name, "#{singular_name}Test"
 
       # Model, controller, helper, views, and test directories.
-      m.directory File.join('app/models', class_path)
       m.directory File.join('test/unit', class_path)
       m.directory File.join('test/fixtures', class_path)
       m.directory File.join('app/controllers', controller_class_path)
@@ -65,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', "#{singular_name}.yml")
+      m.template 'fixtures.yml',  File.join('test/fixtures', "#{plural_name}.yml")
       
       # Scaffolded forms.
       m.complex_template 'form.rhtml',

data/templates/controller.rb

@@ -2,18 +2,16 @@ class <%= controller_class_name %>Controller < ApplicationController
   include AjaxScaffold::Controller
   
   after_filter :clear_flashes
+  before_filter :update_params_filter
   
+  def update_params_filter
+    update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
+  end
 <% unless suffix -%>
   def index
     redirect_to :action => 'list'
   end
 <% end -%>
-
-<% for action in unscaffolded_actions -%>
-  def <%= action %><%= suffix %>
-  end
-<% end -%>
-
   def return_to_main
     # If you have multiple scaffolds on the same view then you will want to change this to
     # to whatever controller/action shows all the views 
@@ -25,21 +23,20 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
   
   # All posts to change scaffold level variables like sort values or page changes go through this action
-  def component_update  
+  def component_update
+    @show_wrapper = false # don't show the outer wrapper elements if we are just updating an existing scaffold 
     if request.xhr?
       # If this is an AJAX request then we just want to delegate to the component to rerender itself
       component
     else
       # If this is from a client without javascript we want to update the session parameters and then delegate
       # back to whatever page is displaying the scaffold, which will then rerender all scaffolds with these update parameters
-      update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
       return_to_main
     end
   end
 
-  def component
-    update_params :default_scaffold_id => "<%= singular_name %>", :default_sort => nil, :default_sort_direction => "asc"
-     
+  def component  
+    @show_wrapper = true if @show_wrapper.nil?
     @sort_sql = <%= model_name %>.scaffold_columns_hash[current_sort(params)].sort_sql rescue nil
     @sort_by = @sort_sql.nil? ? "#{<%= model_name %>.table_name}.#{<%= model_name %>.primary_key} asc" : @sort_sql  + " " + current_sort_direction(params)
     @paginator, @<%= plural_name %> = paginate(:<%= plural_name %>, :order => @sort_by, :per_page => default_per_page)
@@ -51,7 +48,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_name %> = <%= model_name %>.new
     @successful = true
 
-    return render :action => 'new.rjs' if request.xhr?
+    return render(:action => 'new.rjs') if request.xhr?
 
     # Javascript disabled fallback
     if @successful
@@ -70,7 +67,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return render :action => 'create.rjs' if request.xhr?
+    return render(:action => 'create.rjs') if request.xhr?
     if @successful
       return_to_main
     else
@@ -87,7 +84,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return render :action => 'edit.rjs' if request.xhr?
+    return render(:action => 'edit.rjs') if request.xhr?
 
     if @successful
       @options = { :scaffold_id => params[:scaffold_id], :action => "update", :id => params[:id] }
@@ -105,7 +102,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return render :action => 'update.rjs' if request.xhr?
+    return render(:action => 'update.rjs') if request.xhr?
 
     if @successful
       return_to_main
@@ -122,7 +119,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       flash[:error], @successful  = $!.to_s, false
     end
     
-    return render :action => 'destroy.rjs' if request.xhr?
+    return render(:action => 'destroy.rjs') if request.xhr?
     
     # Javascript disabled fallback
     return_to_main
@@ -131,7 +128,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   def cancel
     @successful = true
     
-    return render :action => 'cancel.rjs' if request.xhr?
+    return render(:action => 'cancel.rjs') if request.xhr?
     
     return_to_main
   end

data/templates/functional_test.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '<%= "/.." * controller_class_nesting_depth %>/../test_helper'
-require '<%= controller_file_path %>_controller'
+require '<%= base_controller_file_path %>_controller'
 
 # Re-raise errors caught by the controller.
 class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
@@ -14,5 +14,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   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
+  end
 end

data/templates/lib_ajax_scaffold.rb

@@ -8,10 +8,11 @@ module AjaxScaffold
     # based on the given class.    
     def initialize(klass, options)
       @name = options[:name]
-      @eval = options[:eval].nil? ? Inflector.tableize(klass.to_s).singularize + "." + @name : options[:eval]
+      @eval = options[:eval].nil? ?  "h(#{klass.to_s.downcase}.#{@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? ? klass.table_name + "." + @name : options[:sort_sql] unless !@sortable
+      @sort_sql = options[:sort_sql].nil? ? Inflector.tableize(klass.to_s) + "." + @name : options[:sort_sql] unless !@sortable
+      @class = options[:class] unless options[:class].nil?
     end
     
     def sortable? 
@@ -54,9 +55,7 @@ module AjaxScaffold
   module Controller
     include AjaxScaffold::Common
   
-    def default_per_page
-      25
-    end
+    # Filters
  
     def clear_flashes 
     #We want to clear flashes so they don't appear on a page reload
@@ -67,6 +66,12 @@ module AjaxScaffold
       end
     end
   
+    # Helper Methods
+
+    def default_per_page
+      5
+    end
+  
     def store_or_get_from_session(id_key, value_key)
       session[id_key][value_key] = params[value_key] if !params[value_key].nil?
       params[value_key] ||= session[id_key][value_key]
@@ -131,6 +136,12 @@ module AjaxScaffold
   
     def column_sort_direction(column_name, params)
       column_name && current_sort_direction(params) == "asc" ? "desc" : "asc"
+      
+      if column_name && column_name == current_sort(params)
+        current_sort_direction(params) == "asc" ? "desc" : "asc"
+      else
+        "asc"
+      end
     end
   
     def column_class(column_name, column_value, sort_column)
@@ -141,8 +152,7 @@ module AjaxScaffold
     end
   
     def loading_indicator_tag(options)
-      image_filename = "indicator.gif"
-      "<img src=\"/images/#{image_filename}\" style=\"display: none;\" id=\"#{loading_indicator_id(options)}\" alt=\"loading indicator\" class=\"loading-indicator\" />"
+      image_tag "indicator.gif", :style => "display:none;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
     end  
   
     # The following are a bunch of helper methods to produce the common scaffold view id's

data/templates/partial_new_edit.rhtml

@@ -6,7 +6,7 @@
   <td id="<%%= element_cell_id(@options) %>" class="<%%= @options[:action] %>" colspan="<%%= num_columns %>">
   
     <%%= form_remote_tag :url => @options.merge(:controller => '<%= controller_file_path %>'), 
-    			:loading => "Element.show('#{loading_indicator_id(@options)}');",
+    			:loading => "Element.show('#{loading_indicator_id(@options)}'); Form.disable('#{element_form_id(@options)}');",
     			:html => { :href => url_for(@options.merge(:controller => '<%= controller_file_path %>')),
                      :id => element_form_id(@options) } %>
       

data/templates/rjs_create.rjs

@@ -11,6 +11,7 @@ if @successful
   page.replace_html scaffold_messages_id(@options), :partial => 'messages'
 else
   page.replace_html element_messages_id(@create_options), :partial => 'form_messages'
+  page << "Form.enable('#{element_form_id(@create_options)}');"
   page.hide loading_indicator_id(@create_options)
 end
 

data/templates/rjs_update.rjs

@@ -12,6 +12,7 @@ if @successful
   page.replace_html scaffold_messages_id(@options), :partial => 'messages'
 else
   page.replace_html element_messages_id(@update_options), :partial => 'form_messages'
+  page << "Form.enable('#{element_form_id(@update_options)}');"
   page.hide loading_indicator_id(@update_options)
 end
 

data/templates/view_component.rhtml

@@ -1,4 +1,4 @@
-<%% if not request.xhr? %>
+<%% if @show_wrapper %>
 <div id="<%%= params[:scaffold_id] %>" class="ajax-scaffold">
   <div id="<%%= scaffold_content_id(params) %>">
 <%% end %>
@@ -41,10 +41,9 @@
 <div class="ajax-scaffold-footer">
   <%%= render :partial => 'pagination_links', :locals => { :paginator => @paginator } %>
 </div>
-<%% if not request.xhr? %>
+<%% if @show_wrapper %>
 </div>
 </div>
-
 <script type="text/javascript">
 Rico.Corner.round('<%%= params[:scaffold_id] %>', {color: '#005CB8', bgColor: '#fff', compact: true});
 </script>

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.2
-date: 2006-04-27 00:00:00 -04:00
+  version: 3.1.3
+date: 2006-07-13 00:00:00 -06:00
 summary: Ajax scaffold generator is a rails generator for ajaxified scaffolds
 require_paths: 
   - lib
@@ -50,8 +50,6 @@ files:
   - templates/partial_form_messages.rhtml
   - templates/partial_column_headings.rhtml
   - templates/model.rb
-  - templates/lib_content_column_patch.rb
-  - templates/lib_ajax_scaffold_util.rb
   - templates/lib_ajax_scaffold.rb
   - templates/layout.rhtml
   - templates/information.gif

data/templates/lib_ajax_scaffold_util.rb

@@ -1,30 +0,0 @@
-module AjaxScaffoldUtil
-
-  def default_per_page
-    25
-  end
-
-  def clear_flashes 
-    #We want to clear flashes so they don't appear on a page reload
-    if request.xhr? 
-      flash.keys.each do |flash_key|
-       flash[flash_key] = nil
-      end
-    end
-  end
-  
-  def store_or_get_from_session(id_key, value_key)
-    session[id_key][value_key] = params[value_key] if !params[value_key].nil?
-    params[value_key] ||= session[id_key][value_key]
-  end
-  
-  def update_params(options)
-    @scaffold_id = params[:scaffold_id] ||= options[:default_scaffold_id]
-    session[@scaffold_id] ||= {:sort => options[:default_sort], :sort_direction => options[:default_sort_direction], :page => 1}
-    
-    store_or_get_from_session(@scaffold_id, :sort)
-    store_or_get_from_session(@scaffold_id, :sort_direction)
-    store_or_get_from_session(@scaffold_id, :page)
-  end
-  
-end

data/templates/lib_content_column_patch.rb

@@ -1,10 +0,0 @@
-class ActiveRecord::Base
-  def self.get_desired_columns(wanted, cache=nil)
-    cache ||= nil
-    if cache.nil?
-      h= columns_hash
-      cache = wanted.collect { |n| h[n] }
-    end
-    cache 
-  end
-end