active_scaffold 3.2.12 → 3.2.13

data/CHANGELOG

@@ -1,4 +1,17 @@
-= 3.2.12 (not released yet)
+= 3.2.13 (not released yet)
+- Fix destroy action, was broken in 3.2.12
+- Remove default :method sorting for associations, it wasn't useful and can be slow
+- Rescue from ActiveScaffold::ActionNotAllowed and ActiveScaffold::RecordNotAllowed with 401 response, it can be overrided with deny_access method in ApplicationController.
+- Allow to set arrays in search_sql so one column can search in multiple db columns, resulting sql chunks will be OR'ed
+- Hide text input on searching for null or not null
+- Add some classes to forms to improve CSS customization
+- Fix nested links for STI controllers with common configuration in a base controller
+- Fix adding routes twice in active_scaffold generator
+- Restore old behavior for action_link's security_method, ignore_method already hides the link 
+- Add data-cancel-refresh to action links, so nested scaffold's behaviour can be applied to other action links and when adapter is closed row will be refreshed.
+- fix support for tableless models in rails >= 3.2.5
+
+= 3.2.12
 - improve support for tableless models, add support for count
 - fix div id for nested scaffolds
 - add config.timestamped_messages and config.highlight_messages

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -72,8 +72,8 @@ jQuery(document).ready(function() {
     
     if (action_link) {
       var cancel_url = as_cancel.attr('href');
-      var refresh_data = as_cancel.attr('data-refresh');
-      if (refresh_data !== 'true' || !cancel_url) {
+      var refresh_data = action_link.tag.data('cancel-refresh');
+      if (!refresh_data || !cancel_url) {
         action_link.close();
         return false;
       }
@@ -166,11 +166,13 @@ jQuery(document).ready(function() {
   });
   
   jQuery('select.as_search_range_option').live('change', function(event) {
-    ActiveScaffold[jQuery(this).val() == 'BETWEEN' ? 'show' : 'hide'](jQuery(this).parent().find('.as_search_range_between'));
+    var element = jQuery(this);
+    ActiveScaffold[element.val() == 'BETWEEN' ? 'show' : 'hide'](element.closest('dd').find('.as_search_range_between'));
+    ActiveScaffold[(element.val() == 'null' || element.val() == 'not_null') ? 'hide' : 'show'](element.attr('id').replace(/_opt/, '_numeric'));
     return true;
   });
   
-  jQuery('select.as_search_range_option').live('change', function(event) {
+  jQuery('select.as_search_date_time_option').live('change', function(event) {
     var element = jQuery(this);
     ActiveScaffold[!(element.val() == 'PAST' || element.val() == 'FUTURE' || element.val() == 'RANGE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_numeric'));
     ActiveScaffold[(element.val() == 'PAST' || element.val() == 'FUTURE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_trend'));
@@ -440,7 +442,7 @@ var ActiveScaffold = {
   update_inplace_edit: function(element, value, empty) {
     if (typeof(element) == 'string') element = '#' + element;
     this.replace_html(jQuery(element), value);
-    if (empty) jQuery(element).closest('td').addClass('empty');
+    jQuery(element).closest('td')[empty ? 'addClass' : 'removeClass']('empty');
   },
   
   hide: function(element) {
@@ -971,7 +973,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.adapter = element;
     this.adapter.addClass('as_adapter');
     this.adapter.data('action_link', this);
-    if (this.refresh_url) jQuery('.as_cancel[data-refresh=true]', this.adapter).attr('href', this.refresh_url);
+    if (this.refresh_url) jQuery('.as_cancel', this.adapter).attr('href', this.refresh_url);
   }
 });
 

data/app/assets/javascripts/prototype/active_scaffold.js

@@ -95,10 +95,10 @@ document.observe("dom:loaded", function() {
     var action_link = ActiveScaffold.find_action_link(as_cancel);
     
     if (action_link) {
-      var refresh_data = as_cancel.readAttribute('data-refresh');
-      if (refresh_data === 'true' && action_link.refresh_url) {
+      var refresh_data = action_link.readAttribute('data-cancel-refresh');
+      if (refresh_data && action_link.refresh_url) {
         event.memo.url = action_link.refresh_url;
-      } else if (refresh_data === 'false' || as_cancel.readAttribute('href').blank()) {
+      } else if (!refresh_data || as_cancel.readAttribute('href').blank()) {
         action_link.close();
         event.stop();
       }
@@ -252,6 +252,7 @@ document.observe("dom:loaded", function() {
   document.on('change', 'select.as_search_range_option', function(event) {
     var element = event.findElement();
     Element[element.value == 'BETWEEN' ? 'show' : 'hide'](element.readAttribute('id').sub('_opt', '_between'));
+    Element[(element.value == 'null' || element.value == 'not_null') ? 'hide' : 'show'](element.readAttribute('id').sub('_opt', '_numeric'));
     return true;
   });
   document.on('change', 'select.as_search_date_time_option', function(event) {

data/config/locales/de.yml

@@ -96,7 +96,7 @@ de:
     months: 'Monate'
     years: 'Jahre'
     optional_attributes: 'Weitere'
-    null: 'Null'
+    :null: 'Null'
     not_null: 'Nicht Null'
     date_picker_options:
       weekHeader: 'Wo'

data/config/locales/en.yml

@@ -96,7 +96,7 @@ en:
     months: 'Months'
     years: 'Years'
     optional_attributes: 'Further Options'
-    null: 'Null'
+    :null: 'Null'
     not_null: 'Not Null'
     date_picker_options:
       weekHeader: 'Wk'

data/config/locales/es.yml

@@ -98,7 +98,7 @@ es:
     months: 'Meses'
     years: 'Años'
     optional_attributes: 'Más opciones'
-    null: 'Nulo'
+    :null: 'Nulo'
     not_null: 'No Nulo'
     date_picker_options:
       weekHeader: 'Sm'

data/config/locales/fr.yml

@@ -96,7 +96,7 @@ fr:
     months: 'Mois'
     years: 'Années'
     optional_attributes: 'Options additionnelles'
-    null: 'Nulle'
+    :null: 'Nulle'
     not_null: 'Non Nulle'
     date_picker_options: 
       weekHeader: 'Sm'

data/config/locales/hu.yml

@@ -96,7 +96,7 @@ hu:
     months: 'Months'
     years: 'Years'
     optional_attributes: 'Further Options'
-    null: 'Null'
+    :null: 'Null'
     not_null: 'Not Null'
     date_picker_options:
       weekHeader: 'Wk'

data/config/locales/ja.yml

@@ -96,7 +96,7 @@ ja:
     months: 'Months'
     years: 'Years'
     optional_attributes: 'Further Options'
-    null: 'Null'
+    :null: 'Null'
     not_null: 'Not Null'
     date_picker_options:
       weekHeader: 'Wk'

data/config/locales/ru.yml

@@ -38,7 +38,7 @@ ru:
     inplace_edit_handle: '--'
     live_search: 'Поиск'
     loading: 'Загрузка…'
-    mark_all_records: "Mark all"
+    mark_all_records: "Отметить все"
     next: 'Следующее'
     no_entries: 'Нет записей'
     no_options: 'Нет вариантов'
@@ -48,8 +48,10 @@ ru:
     previous: 'Предыдущее'
     print: 'Печать'
     records_marked:
-      one: "1 marked %{model}"
-      other: "%{count} marked %{model}"
+      one: "Отмечена 1 запись"
+      few: "Отмечено %{count} записи"
+      many: "Отмечено %{count} записей"
+      other: "Отмечено %{count} записи"
     refresh: 'Обновить'
     remove: 'Удалить'
     remove_file: 'Удалить или заменить файл'
@@ -100,7 +102,7 @@ ru:
     months: 'месяцев'
     years: 'лет'
     optional_attributes: 'Дополнительные настройки'
-    null: 'Пусто'
+    :null: 'Пусто'
     not_null: 'Не пусто'
     date_picker_options:
       weekHeader: 'Нед.'

data/frontends/default/views/_base_form.html.erb

@@ -20,7 +20,7 @@ options = {:onsubmit => onsubmit,
            :class => "as_form #{form_action.to_s}",
            :method => method,
            'data-loading' => true}
-cancel_options = {:class => 'as_cancel', 'data-refresh' => false}
+cancel_options = {:class => 'as_cancel'}
 
 cancel_options[:remote] = true if xhr #cancel link does nt have to care about multipart forms
 if xhr && multipart # file_uploads

data/frontends/default/views/_form_hidden_attribute.html.erb

@@ -1,2 +1,7 @@
 <% scope ||= nil %>
-<%= hidden_field :record, column.name, active_scaffold_input_options(column, scope) %>
+<dl style="display: none;">
+<dt></dt>
+<dd>
+  <%= hidden_field :record, column.name, active_scaffold_input_options(column, scope) %>
+</dd>
+</dl>

data/frontends/default/views/_horizontal_subform_header.html.erb

@@ -5,7 +5,7 @@
       hidden = column_renders_as(column) == :hidden
       next unless in_subform?(column, parent_record)
       -%>
-      <th class="<%= "#{'required' if column.required?} #{'hidden' if hidden}" %>"><label><%= column.label unless hidden %></label></th>
+      <th class="<%= "#{column.name}-column #{'required' if column.required?} #{'hidden' if hidden}" %>"><label><%= column.label unless hidden %></label></th>
     <% end -%>
   </tr>
 </thead>

data/frontends/default/views/_horizontal_subform_record.html.erb

@@ -24,7 +24,7 @@
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>
-      <p class="<%= column.name %>-input"><%= get_column_value(@record, column) -%></p>
+      <%= content_tag :span, get_column_value(@record, column), active_scaffold_input_options(column, scope).except(:name) -%>
     <% end -%>
   </td>
 <% end -%>

data/frontends/default/views/_list_inline_adapter.html.erb

@@ -12,7 +12,7 @@
 <tr class="inline-adapter" id="<%= element_row_id :action => :nested %>">
   <td colspan="<%= column_count %>" class="inline-adapter-cell">
     <div class="<%= "#{params[:action]}-view" if params[:action] %> <%= "#{nested? ? nested.name : id_from_controller(params[:controller])}-view" %> view">
-      <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close), 'data-refresh' => (action_name == 'index' ? true : false)) -%>
+      <%= link_to(as_(:close), '', :class => 'inline-adapter-close as_cancel', :remote => true, :title => as_(:close)) -%>
       <%= payload -%>
     </div>
   </td>

data/frontends/default/views/_render_field.js.erb

@@ -2,7 +2,7 @@
   column = if render_field.is_a? ActiveScaffold::DataStructures::Column
     render_field
   else
-    active_scaffold_config.columns[render_field.to_sym] unless render_field.is_a? ActiveScaffold::DataStructures::Column
+    active_scaffold_config.columns[render_field.to_sym]
   end
   @rendered ||= Set.new
   return if @rendered.include? column.name

data/frontends/default/views/_show.html.erb

@@ -3,6 +3,6 @@
 <%= render :partial => 'show_columns', :locals => {:columns => active_scaffold_config.show.columns} -%>
 
 <p class="form-footer">
-  <%= link_to as_(:close), main_path_to_return, :class => 'as_cancel', :remote => request.xhr?, 'data-refresh' => false %>
+  <%= link_to as_(:close), main_path_to_return, :class => 'as_cancel', :remote => request.xhr? %>
   <%= loading_indicator_tag(:action => :create, :id => params[:id]) %>
 </p>

data/frontends/default/views/_update_actions.html.erb

@@ -1,7 +1,7 @@
 <div class="active-scaffold-header">
   <div class="actions">
     <% active_scaffold_config.action_links.member.each do |link| -%>
-      <% next unless link.action == 'nested' -%>
+      <% next unless link.action == 'index' -%>
       <% next if skip_action_link(link) -%>
       <%= record.authorized_for?(:crud_type => link.crud_type, :action => link.action) ? render_action_link(link, url_options, record) : "<a class='disabled'>#{link.label}</a>" -%>
     <% end -%>

data/frontends/default/views/_vertical_subform_record.html.erb

@@ -24,7 +24,7 @@
     <% unless readonly and not @record.new_record? or not @record.authorized_for?(:crud_type => crud_type, :column => column.name) -%>
       <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope } -%>
     <% else -%>
-      <p class="<%= column.name %>-input"><%= get_column_value(@record, column) -%></p>
+      <%= content_tag :span, get_column_value(@record, column), active_scaffold_input_options(column, scope).except(:name) -%>
     <% end -%>
   </li>
 <% end -%>

data/lib/active_scaffold.rb

@@ -266,11 +266,11 @@ module ActiveScaffold
       unless controller.nil?
         options.reverse_merge! :label => column.label, :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : controller.controller_path), :column => column
         options[:parameters] ||= {}
-        options[:parameters].reverse_merge! :parent_scaffold => controller_path, :association => column.association.name
+        options[:parameters].reverse_merge! :association => column.association.name
         if column.plural_association?
           # note: we can't create nested scaffolds on :through associations because there's no reverse association.
           
-          ActiveScaffold::DataStructures::ActionLink.new('index', options) #unless column.through_association?
+          ActiveScaffold::DataStructures::ActionLink.new('index', options.merge(:refresh_on_close => true)) #unless column.through_association?
         else
           actions = controller.active_scaffold_config.actions unless controller == :polymorph
           actions ||= [:create, :update, :show] 
@@ -285,7 +285,7 @@ module ActiveScaffold
     def link_for_association_as_scope(scope, options = {})
       options.reverse_merge! :label => scope, :position => :after, :type => :member, :controller => controller_path
       options[:parameters] ||= {}
-      options[:parameters].reverse_merge! :parent_scaffold => controller_path, :named_scope => scope
+      options[:parameters].reverse_merge! :named_scope => scope
       ActiveScaffold::DataStructures::ActionLink.new('index', options)
     end
 

data/lib/active_scaffold/actions/core.rb

@@ -4,6 +4,7 @@ module ActiveScaffold::Actions
       base.class_eval do
         before_filter :register_constraints_with_action_columns, :if => :embedded?
         after_filter :clear_flashes
+        rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
       end
       base.helper_method :nested?
       base.helper_method :calculate
@@ -75,6 +76,10 @@ module ActiveScaffold::Actions
       end
     end
 
+    def each_marked_record(&block)
+      active_scaffold_config.model.find(marked_records.to_a).each &block
+    end
+
     def marked_records
       active_scaffold_session_storage[:marked_records] ||= Set.new
     end
@@ -193,16 +198,5 @@ module ActiveScaffold::Actions
         (default_formats + active_scaffold_config.formats).uniq
       end
     end
-
-    def response_code_for_rescue(exception)
-      case exception
-        when ActiveScaffold::RecordNotAllowed
-          "403 Record Not Allowed"
-        when ActiveScaffold::ActionNotAllowed
-          "403 Action Not Allowed"
-        else
-          super
-      end
-    end
   end
 end

data/lib/active_scaffold/actions/delete.rb

@@ -49,7 +49,6 @@ module ActiveScaffold::Actions
       @record ||= destroy_find_record
       begin
         self.successful = @record.destroy
-        @record.as_marked = false if successful?
       rescue Exception => ex
         flash[:warning] = as_(:cant_destroy_record, :record => @record.to_label)
         self.successful = false

data/lib/active_scaffold/actions/mark.rb

@@ -56,9 +56,9 @@ module ActiveScaffold::Actions
       if params[:id]
         find_if_allowed(params[:id], :read).as_marked = true
       elsif active_scaffold_config.mark.mark_all_mode == :page && !mark_all_scope_forced?
-        each_record_in_page {|record| marked_records << record.id}
+        each_record_in_page { |record| record.as_marked = true }
       else
-        each_record_in_scope {|record| marked_records << record.id}
+        each_record_in_scope { |record| record.as_marked = true }
       end
     end
 
@@ -66,12 +66,17 @@ module ActiveScaffold::Actions
       if params[:id]
         find_if_allowed(params[:id], :read).as_marked = false
       elsif active_scaffold_config.mark.mark_all_mode == :page
-        each_record_in_page {|record| marked_records.delete(record.id)}
+        each_record_in_page { |record| record.as_marked = false }
       else
-        each_record_in_scope {|record| marked_records.delete(record.id)}
+        each_record_in_scope { |record| record.as_marked = false }
       end
     end
     
+    def do_destroy
+      super
+      @record.as_marked = false if successful?
+    end
+    
     # The default security delegates to ActiveRecordPermissions.
     # You may override the method to customize.
     def mark_authorized?

data/lib/active_scaffold/bridges/date_picker.rb

@@ -8,7 +8,7 @@ module ActiveScaffold::Bridges
       ActiveScaffold.js_framework == :jquery
     end
     def self.localization
-        "jQuery(function($){
+      "jQuery(function($){
   if (typeof($.datepicker) === 'object') {
     #{Helper.date_options_for_locales}
     $.datepicker.setDefaults($.datepicker.regional['#{::I18n.locale}']);

data/lib/active_scaffold/bridges/date_picker/ext.rb

@@ -49,6 +49,13 @@ ActionView::Base.class_eval do
 end
 ActiveScaffold::Finder::ClassMethods.module_eval do
   include ActiveScaffold::Bridges::Shared::DateBridge::Finder::ClassMethods
+  def datetime_conversion_for_condition(column)
+    if column.search_ui == :date_picker
+      :to_date
+    else
+      super
+    end
+  end
   alias_method :condition_for_date_picker_type, :condition_for_date_bridge_type
   alias_method :condition_for_datetime_picker_type, :condition_for_date_picker_type
 end

data/lib/active_scaffold/bridges/date_picker/helper.rb

@@ -158,7 +158,7 @@ module ActiveScaffold::Bridges
           options = active_scaffold_input_text_options(options.merge(column.options))
           options[:class] << " #{column.search_ui.to_s}"
           options[:style] = (options[:show].nil? || options[:show]) ? nil : "display: none"
-          format = options.delete(:format) || column.form_ui == :date_picker ? :default : :picker
+          format = options.delete(:format) || column.search_ui == :date_picker ? :default : :picker
           datepicker_format_options(column, format, options)
           text_field_tag("#{options[:name]}[#{name}]", value ? l(value, :format => format) : nil, options.merge(:id => "#{options[:id]}_#{name}", :name => "#{options[:name]}[#{name}]"))
         end

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -112,15 +112,15 @@ module ActiveScaffold
                 column.search_sql.call(from_value, to_value, operator)
               else
                 unless operator.nil?
-                  ["#{column.search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
+                  ["%{search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
                 else
-                  ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
+                  ["%{search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? && to_value.nil?  
                 end
               end
             end
             
             def date_bridge_from_to(column, value)
-              conversion = column.column.type == :date ? :to_date : :to_time
+              conversion = datetime_conversion_for_condition(column)
               case value[:opt]
               when 'RANGE'
                 date_bridge_from_to_for_range(column, value).collect(&conversion)

data/lib/active_scaffold/config/nested.rb

@@ -21,7 +21,7 @@ module ActiveScaffold::Config
     def add_link(attribute, options = {})
       column = @core.columns[attribute.to_sym]
       unless column.nil? || column.association.nil?
-        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize}) 
+        options.reverse_merge! :security_method => :nested_authorized?, :label => column.association.klass.model_name.human({:count => 2, :default => column.association.klass.name.pluralize})
         action_link = @core.link_for_association(column, options)
         action_link.action ||= :index
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?

data/lib/active_scaffold/config/show.rb

@@ -11,7 +11,7 @@ module ActiveScaffold::Config
     # global level configuration
     # --------------------------
     cattr_accessor :link
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('show', :label => :show, :type => :member, :security_method => :show_authorized?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('show', :label => :show, :type => :member, :security_method => :show_authorized?, :ignore_method => :show_ignore?)
     # instance-level configuration
     # ----------------------------
 

data/lib/active_scaffold/config/update.rb

@@ -15,7 +15,7 @@ module ActiveScaffold::Config
     def self.link=(val)
       @@link = val
     end
-    @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?)
+    @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?, :ignore_method => :update_ignore?)
 
     # instance-level configuration
     # ----------------------------

data/lib/active_scaffold/data_structures/action_link.rb

@@ -82,6 +82,7 @@ module ActiveScaffold::DataStructures
     end
 
     # what method to call on the controller to see if this action_link should be visible
+    # if method return false, link will be disabled
     # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).
     attr_writer :security_method
     def security_method
@@ -91,7 +92,12 @@ module ActiveScaffold::DataStructures
     def security_method_set?
       !!@security_method
     end
+
+    # enable it to refresh the parent row when the view is closed
+    attr_accessor :refresh_on_close
     
+    # what method to call on the controller to see if this action_link should be visible
+    # if method return true, link won't be displayed
     attr_accessor :ignore_method
     
     # the crud type of the (eventual?) action. different than :method, because this crud action may not be imminent.

data/lib/active_scaffold/data_structures/action_links.rb

@@ -121,7 +121,12 @@ module ActiveScaffold::DataStructures
             first_action = false
           end
         elsif controller.nil? || !skip_action_link(controller, link, *(Array(options[:for])))
-          authorized = options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
+          security_method = link.security_method_set? || controller.respond_to?(link.security_method)
+          authorized = if security_method
+            controller.send(link.security_method, *args)
+          else
+            options[:for].nil? ? true : options[:for].authorized_for?(:crud_type => link.crud_type, :action => link.action)
+          end
           yield(self, link, {:authorized => authorized, :first_action => first_action, :level => options[:level]})
           first_action = false
         end
@@ -173,7 +178,7 @@ module ActiveScaffold::DataStructures
     protected
 
     def skip_action_link(controller, link, *args)
-      (!link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)) || ((link.security_method_set? or controller.respond_to? link.security_method) and !controller.send(link.security_method, *args))
+      !link.ignore_method.nil? && controller.respond_to?(link.ignore_method) && controller.send(link.ignore_method, *args)
     end
 
     # called during clone or dup. makes the clone/dup deeper.

data/lib/active_scaffold/data_structures/column.rb

@@ -179,7 +179,10 @@ module ActiveScaffold::DataStructures
     # describes how to search on a column
     #   search = true           default, uses intelligent search sql
     #   search = "CONCAT(a, b)" define your own sql for searching. this should be the "left-side" of a WHERE condition. the operator and value will be supplied by ActiveScaffold.
-    attr_writer :search_sql
+    #   search = [:a, :b]       searches in both fields
+    def search_sql=(value)
+      @search_sql = (value == true || value.is_a?(Proc)) ? value : Array(value)
+    end
     def search_sql
       self.initialize_search_sql if @search_sql === true
       @search_sql
@@ -281,6 +284,7 @@ module ActiveScaffold::DataStructures
     # instantiation is handled internally through the DataStructures::Columns object
     def initialize(name, active_record_class) #:nodoc:
       self.name = name.to_sym
+      @tableless = active_record_class < ActiveScaffold::Tableless
       @column = active_record_class.columns_hash[self.name.to_s]
       @association = active_record_class.reflect_on_association(self.name)
       @autolink = !@association.nil?
@@ -352,11 +356,7 @@ module ActiveScaffold::DataStructures
         # we don't automatically enable method sorting for virtual columns because it's slow, and we expect fewer complaints this way.
         self.sort = false
       else
-        if self.singular_association?
-          self.sort = {:method => "#{self.name}.to_s"}
-        elsif self.plural_association?
-          self.sort = {:method => "#{self.name}.join(',')"}
-        elsif @active_record_class.connection
+        if column && @tableless
           self.sort = {:sql => self.field}
         else
           self.sort = false
@@ -367,9 +367,9 @@ module ActiveScaffold::DataStructures
     def initialize_search_sql
       self.search_sql = unless self.virtual?
         if association.nil?
-          self.field.to_s unless @active_record_class.connection.nil?
+          self.field.to_s unless @tableless
         elsif !self.polymorphic_association?
-          [association.klass.quoted_table_name, association.klass.quoted_primary_key].join('.') unless association.klass.connection.nil?
+          [association.klass.quoted_table_name, association.klass.quoted_primary_key].join('.') unless association.klass < ActiveScaffold::Tableless
         end
       end
     end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -6,7 +6,11 @@ module ActiveScaffold::DataStructures
         nested_info[:name] = (params[:association] || params[:named_scope]).to_sym
         nested_info[:parent_scaffold] = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
         nested_info[:parent_model] = nested_info[:parent_scaffold].active_scaffold_config.model
-        nested_info[:parent_id] = params[nested_info[:parent_model].name.foreign_key]
+        nested_info[:parent_id] = if params[:association].nil?
+          params[nested_info[:parent_model].name.foreign_key]
+        else
+          params[nested_info[:parent_model].reflect_on_association(params[:association].to_sym).active_record.name.foreign_key]
+        end
         if nested_info[:parent_id]
           unless params[:association].nil?
             ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, nested_info)

data/lib/active_scaffold/extensions/action_controller_rendering.rb

@@ -15,8 +15,6 @@ module ActionController #:nodoc:
       end
     end
     alias_method_chain :render, :active_scaffold
-
-    # Rails 2.x implementation is post-initialization on :active_scaffold method
   end
 end
 

data/lib/active_scaffold/extensions/action_controller_rescueing.rb

@@ -0,0 +1,7 @@
+module ActionController #:nodoc:
+  class Base
+    def deny_access
+      head :unauthorized
+    end
+  end
+end

data/lib/active_scaffold/finder.rb

@@ -17,13 +17,18 @@ module ActiveScaffold
 
         where_clauses = []
         columns.each do |column|
-          where_clauses << ((column.column.nil? || column.column.text?) ? "#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?" : "#{column.search_sql} = ?")
+          Array(column.search_sql).each do |search_sql|
+            where_clauses << "#{search_sql} #{(column.column.nil? || column.column.text?) ? ActiveScaffold::Finder.like_operator : '='} ?"
+          end
         end
         phrase = where_clauses.join(' OR ')
 
         tokens.collect do |value|
           columns.inject([phrase]) do |condition, column|
-            condition.push((column.column.nil? || column.column.text?) ? like_pattern.sub('?', value) : column.column.type_cast(value))
+            Array(column.search_sql).size.times do
+              condition.push((column.column.nil? || column.column.text?) ? like_pattern.sub('?', value) : column.column.type_cast(value))
+            end
+            condition
           end
         end
       end
@@ -39,32 +44,37 @@ module ActiveScaffold
         return unless column and column.search_sql and not value.blank?
         search_ui = column.search_ui || column.column.try(:type)
         begin
-          if search_ui && self.respond_to?("condition_for_#{search_ui}_type")
+          sql, *values = if search_ui && self.respond_to?("condition_for_#{search_ui}_type")
             self.send("condition_for_#{search_ui}_type", column, value, like_pattern)
           else
-            unless column.search_sql.instance_of? Proc
+            if column.search_sql.instance_of? Proc
+              column.search_sql.call(value)
+            else
               case search_ui
-                when :boolean, :checkbox
-                  ["#{column.search_sql} = ?", column.column.type_cast(value)]
-                when :integer, :decimal, :float
-                  condition_for_numeric(column, value)
-                when :string, :range
-                  condition_for_range(column, value, like_pattern)
-                when :date, :time, :datetime, :timestamp
-                  condition_for_datetime(column, value)
-                when :select, :multi_select, :country, :usa_state
-                ["#{column.search_sql} in (?)", Array(value)]
+              when :boolean, :checkbox
+                ["%{search_sql} = ?", column.column ? column.column.type_cast(value) : value]
+              when :integer, :decimal, :float
+                condition_for_numeric(column, value)
+              when :string, :range
+                condition_for_range(column, value, like_pattern)
+              when :date, :time, :datetime, :timestamp
+                condition_for_datetime(column, value)
+              when :select, :multi_select, :country, :usa_state
+                ["%{search_sql} in (?)", [Array(value)]]
+              else
+                if column.column.nil? || column.column.text?
+                  ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
                 else
-                  if column.column.nil? || column.column.text?
-                    ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
-                  else
-                    ["#{column.search_sql} = ?", column.column.type_cast(value)]
-                  end
+                  ["%{search_sql} = ?", column.column.type_cast(value)]
+                end
               end
-            else
-              column.search_sql.call(value)
             end
           end
+          return nil unless sql
+
+          conditions = [column.search_sql.collect { |search_sql| sql % {:search_sql => search_sql} }.join(' OR ')]
+          conditions += values*column.search_sql.size if values.present?
+          conditions
         rescue Exception => e
           logger.error Time.now.to_s + "#{e.inspect} -- on the ActiveScaffold column :#{column.name}, search_ui = #{search_ui} in #{self.name}"
           raise e
@@ -73,33 +83,33 @@ module ActiveScaffold
 
       def condition_for_numeric(column, value)
         if !value.is_a?(Hash)
-          ["#{column.search_sql} = ?", condition_value_for_numeric(column, value)]
+          ["%{search_sql} = ?", condition_value_for_numeric(column, value)]
         elsif value[:from].blank? or not ActiveScaffold::Finder::NumericComparators.include?(value[:opt])
           nil
         elsif value[:opt] == 'BETWEEN'
-          ["#{column.search_sql} BETWEEN ? AND ?", condition_value_for_numeric(column, value[:from]), condition_value_for_numeric(column, value[:to])]
-         else
-          ["#{column.search_sql} #{value[:opt]} ?", condition_value_for_numeric(column, value[:from])]
+          ["(%{search_sql} BETWEEN ? AND ?)", condition_value_for_numeric(column, value[:from]), condition_value_for_numeric(column, value[:to])]
+        else
+          ["%{search_sql} #{value[:opt]} ?", condition_value_for_numeric(column, value[:from])]
         end
       end
 
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.column.nil? || column.column.text?
-            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
+            ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
-            ["#{column.search_sql} = ?", column.column.type_cast(value)]
+            ["%{search_sql} = ?", column.column.type_cast(value)]
           end
         elsif ActiveScaffold::Finder::NullComparators.include?(value[:opt])
           condition_for_null_type(column, value[:opt], like_pattern)
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
-          ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
+          ["%{search_sql} #{ActiveScaffold::Finder.like_operator} ?", value[:opt].sub('?', value[:from])]
         elsif value[:opt] == 'BETWEEN'
-          ["#{column.search_sql} BETWEEN ? AND ?", value[:from], value[:to]]
+          ["(%{search_sql} BETWEEN ? AND ?)", value[:from], value[:to]]
         elsif ActiveScaffold::Finder::NumericComparators.include?(value[:opt])
-          ["#{column.search_sql} #{value[:opt]} ?", value[:from]]
+          ["%{search_sql} #{value[:opt]} ?", value[:from]]
         else
           nil
         end
@@ -157,37 +167,45 @@ module ActiveScaffold
           value
         end
       end
+      
+      def datetime_conversion_for_condition(column)
+        if column.column
+          column.column.type == :date ? :to_date : :to_time
+        else
+          :to_time
+        end
+      end
             
       def condition_for_datetime(column, value, like_pattern = nil)
-        conversion = column.column.type == :date ? :to_date : :to_time
+        conversion = datetime_conversion_for_condition(column)
         from_value = condition_value_for_datetime(value[:from], conversion)
         to_value = condition_value_for_datetime(value[:to], conversion)
 
         if from_value.nil? and to_value.nil?
           nil
         elsif !from_value
-          ["#{column.search_sql} <= ?", to_value.to_s(:db)]
+          ["%{search_sql} <= ?", to_value.to_s(:db)]
         elsif !to_value
-          ["#{column.search_sql} >= ?", from_value.to_s(:db)]
+          ["%{search_sql} >= ?", from_value.to_s(:db)]
         else
-          ["#{column.search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)]
+          ["%{search_sql} BETWEEN ? AND ?", from_value.to_s(:db), to_value.to_s(:db)]
         end
       end
 
       def condition_for_record_select_type(column, value, like_pattern = nil)
         if value.is_a?(Array)
-          ["#{column.search_sql} IN (?)", value]
+          ["%{search_sql} IN (?)", value]
         else
-          ["#{column.search_sql} = ?", value]
+          ["%{search_sql} = ?", value]
         end
       end
       
       def condition_for_null_type(column, value, like_pattern = nil)
         case value.to_sym
         when :null
-          ["#{column.search_sql} is null"]
+          ["%{search_sql} is null", []]
         when :not_null
-          ["#{column.search_sql} is not null"]
+          ["%{search_sql} is not null", []]
         else
           nil
         end
@@ -218,8 +236,8 @@ module ActiveScaffold
       :ends_with   => '%?'
     }
     NullComparators = [
-      :null,
-      :not_null
+      'null',
+      'not_null'
     ]
     
     

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -73,8 +73,11 @@ module ActiveScaffold
         # Fix for keeping unique IDs in subform
         id_control = "record_#{column.name}_#{[params[:eid], params[:id]].compact.join '_'}"
         id_control += scope_id(scope) if scope
+        
+        classes = "#{column.name}-input"
+        classes += ' numeric-input' if column.number?
 
-        { :name => name, :class => "#{column.name}-input", :id => id_control}.merge(options)
+        { :name => name, :class => classes, :id => id_control}.merge(options)
       end
 
       def update_columns_options(column, scope, options)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -179,10 +179,12 @@ module ActiveScaffold
               options_for_select(select_options, opt_value),
               :id => "#{options[:id]}_opt",
               :class => "as_search_range_option")
-        html << ' ' << text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => text_field_size))
-        html << ' ' << content_tag(:span, (' - ' + text_field_tag("#{options[:name]}[to]", to_value,
+        html << content_tag("span", :id => "#{options[:id]}_numeric", :style => ActiveScaffold::Finder::NullComparators.include?(opt_value) ? "display: none" : nil) do
+          text_field_tag("#{options[:name]}[from]", from_value, active_scaffold_input_text_options(:id => options[:id], :size => text_field_size)) <<
+          content_tag(:span, (' - ' + text_field_tag("#{options[:name]}[to]", to_value,
               active_scaffold_input_text_options(:id => "#{options[:id]}_to", :size => text_field_size))).html_safe,
               :id => "#{options[:id]}_between", :class => "as_search_range_between", :style => (opt_value == 'BETWEEN') ? nil : "display: none")
+        end
         content_tag :span, html, :class => 'search_range'
       end
       alias_method :active_scaffold_search_integer, :active_scaffold_search_range

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -146,6 +146,7 @@ module ActiveScaffold
         html_options[:data][:confirm] = link.confirm(record.try(:to_label)) if link.confirm?
         html_options[:data][:position] = link.position if link.position and link.inline?
         html_options[:data][:action] = link.action if link.inline?
+        html_options[:data][:'cancel-refresh'] = true if link.inline? and link.refresh_on_close
         if link.popup?
           html_options[:data][:popup] = true
           html_options[:target] = '_blank'
@@ -189,11 +190,13 @@ module ActiveScaffold
       end
       
       def url_options_for_nested_link(column, record, link, url_options, options = {})
-        if column && column.association 
+        if column && column.association
+          url_options[:parent_scaffold] = controller_path
           url_options[column.association.active_record.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:id] = record.send(column.association.name).id if column.singular_association? && record.send(column.association.name).present?
           url_options[:eid] = nil # needed for nested scaffolds open from an embedded scaffold
         elsif link.parameters && link.parameters[:named_scope]
+          url_options[:parent_scaffold] = controller_path
           url_options[active_scaffold_config.model.name.foreign_key.to_sym] = url_options.delete(:id)
           url_options[:eid] = nil # needed for nested scaffolds open from an embedded scaffold
         end

data/lib/active_scaffold/tableless.rb

@@ -46,7 +46,6 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
 
   def self.columns; @columns ||= []; end
   def self.table_name; @table_name ||= ActiveModel::Naming.plural(self); end
-  def self.connection; nil; end
   def self.table_exists?; true; end
   self.abstract_class = true
   class << self

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 12
+    PATCH = 13
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/generators/active_scaffold/active_scaffold_generator.rb

@@ -5,6 +5,7 @@ module Rails
   module Generators
     class ActiveScaffoldGenerator < ResourceGenerator #metagenerator
       remove_hook_for :resource_controller
+      remove_hook_for :resource_route
       remove_class_option :actions
       
       def add_resource_route

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 3
   - 2
-  - 12
-  version: 3.2.12
+  - 13
+  version: 3.2.13
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-13 00:00:00 Z
+date: 2012-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development
@@ -29,8 +29,8 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id001
-  prerelease: false
   name: shoulda
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
@@ -45,8 +45,8 @@ dependencies:
         - 0
         version: 1.0.0
   version_requirements: *id002
-  prerelease: false
   name: bundler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
@@ -59,8 +59,8 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id003
-  prerelease: false
   name: rcov
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
@@ -75,8 +75,8 @@ dependencies:
         - 3
         version: 3.1.3
   version_requirements: *id004
-  prerelease: false
   name: rails
+  prerelease: false
 description: Save time and headaches, and create a more easily maintainable set of pages, with ActiveScaffold. ActiveScaffold handles all your CRUD (create, read, update, delete) user interface needs, leaving you more time to focus on more challenging (and interesting!) problems.
 email: activescaffold@googlegroups.com
 executables: []
@@ -274,6 +274,7 @@ files:
 - lib/active_scaffold/data_structures/sorting.rb
 - lib/active_scaffold/engine.rb
 - lib/active_scaffold/extensions/action_controller_rendering.rb
+- lib/active_scaffold/extensions/action_controller_rescueing.rb
 - lib/active_scaffold/extensions/action_view_rendering.rb
 - lib/active_scaffold/extensions/active_association_reflection.rb
 - lib/active_scaffold/extensions/active_record_offset.rb
@@ -442,7 +443,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Rails 3.1 Version of activescaffold supporting prototype and jquery