active_scaffold 3.4.11 → 3.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e19f95fd4ac370c29a8d8774e4b3c94083e6df2a
-  data.tar.gz: 419230d149a695aebf92be0aa1d6c1455868ddac
+  metadata.gz: 3e90634abde41880d285eb02b74524c356bb44ba
+  data.tar.gz: 10e6bd5dcdd6ca95f8bbfc43cb6b65e6a162293e
 SHA512:
-  metadata.gz: d763e9f014fc3b43cfa5f81218d50a5f4f276d56f97522c1631c7771ad9ae6793318ee9b112dc691d73f80541b4a39ab73b8ba6e6f7413fcab4b15510c66c66b
-  data.tar.gz: 77add87ef5f5ce6260296e9272fdae39de94407ff9071fdd3250f5f7219262660a2485889dc6f498ad043cf8da39a696d07095c69d662f56f694b30017f1675c
+  metadata.gz: ec33031cbabe0367c55e532adff3557527c309a700404bd0e19570e76ad4e199ae257f49fe4668a0550f33906aa5cdbeab2a0475b90222de85df356dd36ed38e
+  data.tar.gz: cdaf43ba742dddfa274acc83610e2a7895cf471139da9868eb588c46c20c723a12c261567f8e2b1e212ebdd587a10017d8c3fc90e0ba2d3d65801de943315c6a

data/CHANGELOG

@@ -1,3 +1,7 @@
+= 3.4.12
+- Workaround for counter_cache bug on polymorphic associations on rails4
+- Improve use of CRUD actions without list action
+
 = 3.4.11
 - Fix refresh-link on main form (not subform)
 - Workaround for counter_cache bug on rails4 (https://github.com/rails/rails/pull/14849)

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

@@ -932,8 +932,8 @@ var ActiveScaffold = {
       if (send_form == 'row') base = element.closest('.association-record, form');
       if (selector = element.data('update_send_form_selector'))
         params = base.find(selector).serialize();
-      else if (send_form != as_form) params = base.find(':input').serialize();
-      else base.serialize();
+      else if (base != as_form) params = base.find(':input').serialize();
+      else params = base.serialize();
       params += '&_method=&' + jQuery.param({"source_id": source_id});
       if (additional_params) params += '&' + additional_params;
     } else {

data/app/views/active_scaffold_overrides/_list_record.html.erb

@@ -9,7 +9,7 @@ data_refresh ||= record.to_param
 <tr class="record <%= tr_class %>" id="<%= row_id %>" data-refresh="<%= data_refresh %>">
   <% columns.each do |column| %>
     <% authorized = record.authorized_for?(:crud_type => :read, :column => column.name) -%>
-    <% column_value = authorized ? get_column_value(record, column) : active_scaffold_config.list.empty_field_text -%>
+    <% column_value = authorized ? get_column_value(record, column) : empty_field_text -%>
 
     <%= content_tag :td, column_attributes(column, record).merge(:class => column_class(column, column_value, record)) do %>
       <%= authorized ? render_list_column(column_value, column, record) : column_value %>

data/app/views/active_scaffold_overrides/_update_calculations.js.erb

@@ -1,5 +1,5 @@
 <% calculations_id ||= active_scaffold_calculations_id -%>
-<% if active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
+<% if active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.columns.any? {|c| c.calculation?} %>
 <% params.delete(:id) %>
   ActiveScaffold.replace('<%= calculations_id %>', '<%= escape_javascript(render(:partial => 'list_calculations')) %>');
 <% end %>

data/app/views/active_scaffold_overrides/destroy.js.erb

@@ -19,7 +19,7 @@
   <% else %>
     <%
       url = main_path_to_return
-      url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a? Hash
+      url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a?(Hash) && active_scaffold_config.actions.include?(:list)
     %>
     ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url_for(url) %>');
     <%= render :partial => 'update_calculations', :formats => [:js] %>

data/app/views/active_scaffold_overrides/on_create.js.erb

@@ -1,8 +1,11 @@
 try {
 var action_link;
-<% form_selector ||= "#{element_form_id(:action => :create)}"
-insert_at ||= :top -%>
-<% if active_scaffold_config.list.always_show_create -%>
+<%
+  form_selector ||= "#{element_form_id(:action => :create)}"
+  insert_at ||= :top 
+  always_show_create ||= active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
+-%>
+<% if always_show_create -%>
 <%= render :partial => 'update_messages' %>
 <% else -%>
 action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
@@ -26,7 +29,7 @@ action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'mes
   <% end %>
 
   <% unless render_parent? %>
-    <% if active_scaffold_config.list.always_show_create %>
+    <% if always_show_create %>
       ActiveScaffold.reset_form('<%= form_selector %>');
     <% elsif params[:dont_close] %>
       ActiveScaffold.replace('<%= form_selector %>','<%= escape_javascript(render(:partial => 'create_form', :locals => {:xhr => true})) %>');

data/lib/active_scaffold/actions/core.rb

@@ -71,7 +71,7 @@ module ActiveScaffold::Actions
           @record = new_model
           copy_attributes(record, @record) if record
           apply_constraints_to_record(@record) unless @scope
-          @record = update_record_from_params(@record, @main_columns, hash, true)
+          @record = update_record_from_params(@record, @main_columns, hash || {}, true)
         else
           @record = params[:id] ? find_if_allowed(params[:id], :read) : new_model
           if @record.new_record?
@@ -229,6 +229,66 @@ module ActiveScaffold::Actions
       model.respond_to?(:build) ? model.build(build_options || {}) : model.new
     end
 
+    def get_row(crud_type_or_security_options = :read)
+      klass = beginning_of_chain.preload(active_scaffold_preload)
+      @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
+    end
+
+    # call this method in your action_link action to simplify processing of actions
+    # eg for member action_link :fire
+    # process_action_link_action do |record|
+    #   record.update_attributes(:fired => true)
+    #   self.successful = true
+    #   flash[:info] = 'Player fired'
+    # end
+    def process_action_link_action(render_action = :action_update, crud_type_or_security_options = nil)
+      if request.get?
+        # someone has disabled javascript, we have to show confirmation form first
+        @record = find_if_allowed(params[:id], :read) if params[:id]
+        respond_to_action(:action_confirmation)
+      else
+        @action_link = active_scaffold_config.action_links[action_name]
+        if params[:id]
+          crud_type_or_security_options ||= {:crud_type => (request.post? || request.put?) ? :update : :delete, :action => action_name}
+          get_row(crud_type_or_security_options)
+          unless @record.nil?
+            yield @record
+          else
+            self.successful = false
+            flash[:error] = as_(:no_authorization_for_action, :action => action_name)
+          end
+        else
+          yield
+        end
+        respond_to_action(render_action)
+      end
+    end
+
+    def action_confirmation_respond_to_html(confirm_action = action_name.to_sym)
+      link = active_scaffold_config.action_links[confirm_action]
+      render :action => 'action_confirmation', :locals => {:record => @record, :link => link}
+    end
+
+    def action_update_respond_to_html
+      redirect_to :action => 'index'
+    end
+
+    def action_update_respond_to_js
+      render(:action => 'on_action_update')
+    end
+
+    def action_update_respond_to_xml
+      render :xml => successful? ? "" : response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::XML, :status => response_status
+    end
+
+    def action_update_respond_to_json
+      render :text => successful? ? "" : response_object.to_json(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::JSON, :status => response_status
+    end
+
+    def action_update_respond_to_yaml
+      render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
+    end
+
     def objects_for_etag
       @last_modified ||= @record.updated_at
       [@record, ('xhr' if request.xhr?)]

data/lib/active_scaffold/actions/list.rb

@@ -78,8 +78,7 @@ module ActiveScaffold::Actions
 
     def get_row(crud_type_or_security_options = :read)
       set_includes_for_columns
-      klass = beginning_of_chain.preload(active_scaffold_preload)
-      @record = find_if_allowed(params[:id], crud_type_or_security_options, klass)
+      super
     end
 
     # The actual algorithm to prepare for the list view
@@ -141,62 +140,11 @@ module ActiveScaffold::Actions
       authorized_for?(:crud_type => :read)
     end
 
-    # call this method in your action_link action to simplify processing of actions
-    # eg for member action_link :fire
-    # process_action_link_action do |record|
-    #   record.update_attributes(:fired => true)
-    #   self.successful = true
-    #   flash[:info] = 'Player fired'
-    # end
-    def process_action_link_action(render_action = :action_update, crud_type_or_security_options = nil)
-      if request.get?
-        # someone has disabled javascript, we have to show confirmation form first
-        @record = find_if_allowed(params[:id], :read) if params[:id]
-        respond_to_action(:action_confirmation)
-      else
-        @action_link = active_scaffold_config.action_links[action_name]
-        if params[:id]
-          crud_type_or_security_options ||= {:crud_type => (request.post? || request.put?) ? :update : :delete, :action => action_name}
-          get_row(crud_type_or_security_options)
-          unless @record.nil?
-            yield @record
-          else
-            self.successful = false
-            flash[:error] = as_(:no_authorization_for_action, :action => action_name)
-          end
-        else
-          yield
-        end
-        respond_to_action(render_action)
-      end
-    end
-
-    def action_confirmation_respond_to_html(confirm_action = action_name.to_sym)
-      link = active_scaffold_config.action_links[confirm_action]
-      render :action => 'action_confirmation', :locals => {:record => @record, :link => link}
-    end
-
-    def action_update_respond_to_html
-      redirect_to :action => 'index'
-    end
-
     def action_update_respond_to_js
       do_refresh_list unless @record.present?
-      render(:action => 'on_action_update')
-    end
-
-    def action_update_respond_to_xml
-      render :xml => successful? ? "" : response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::XML, :status => response_status
-    end
-
-    def action_update_respond_to_json
-      render :text => successful? ? "" : response_object.to_json(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names)), :content_type => Mime::JSON, :status => response_status
-    end
-
-    def action_update_respond_to_yaml
-      render :text => successful? ? "" : Hash.from_xml(response_object.to_xml(:only => list_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(list_columns_names), :methods => virtual_columns(list_columns_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
+      super
     end
-
+    
     def objects_for_etag
       objects = if @list_columns
         if active_scaffold_config.list.calculate_etag

data/lib/active_scaffold/actions/update.rb

@@ -32,6 +32,7 @@ module ActiveScaffold::Actions
     def edit_respond_to_js
       render(:partial => 'update_form')
     end
+    
     def update_respond_to_html
       if params[:iframe]=='true' # was this an iframe post ?
         do_refresh_list if successful? && active_scaffold_config.update.refresh_list && !render_parent?
@@ -41,18 +42,19 @@ module ActiveScaffold::Actions
       else # just a regular post
         if successful?
           message = as_(:updated_model, :model => @record.to_label)
-	  if params[:dont_close]
-	    flash.now[:info] = message
-	    render(:action => 'update')
-	  else
-	    flash[:info] = message
-	    return_to_main
-	  end
+          if params[:dont_close]
+            flash.now[:info] = message
+            render(:action => 'update')
+          else
+            flash[:info] = message
+            return_to_main
+          end
         else
           render(:action => 'update')
         end
       end
     end
+    
     def update_respond_to_js
       if successful?
         if !render_parent? && active_scaffold_config.actions.include?(:list)
@@ -68,12 +70,15 @@ module ActiveScaffold::Actions
       end
       render :action => 'on_update'
     end
+    
     def update_respond_to_xml
       render :xml => response_object.to_xml(:only => update_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(update_columns_names), :methods => virtual_columns(update_columns_names)), :content_type => Mime::XML, :status => response_status
     end
+    
     def update_respond_to_json
       render :text => response_object.to_json(:only => update_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(update_columns_names), :methods => virtual_columns(update_columns_names)), :content_type => Mime::JSON, :status => response_status
     end
+    
     def update_respond_to_yaml
       render :text => Hash.from_xml(response_object.to_xml(:only => update_columns_names + [active_scaffold_config.model.primary_key], :include => association_columns(update_columns_names), :methods => virtual_columns(update_columns_names))).to_yaml, :content_type => Mime::YAML, :status => response_status
     end

data/lib/active_scaffold/attribute_params.rb

@@ -33,25 +33,42 @@ module ActiveScaffold
   module AttributeParams
     protected
     # workaround to update counters when belongs_to changes on persisted record on Rails 3
-    # TODO remove when rails3 support is removed
-    def rails3_counter_cache_hack(parent_record, column, value)
+    # workaround to update counters when polymorphic has_many changes on persisted record
+    # TODO remove when rails3 support is removed and counter cache for polymorphic has_many association works on rails4 (works on rails4.2)
+    def has_many_counter_cache_hack(parent_record, column, value)
       association = parent_record.association(column.name)
-      if association.send(:has_cached_counter?)
-        counter_attr = association.send(:cached_counter_attribute_name)
-        difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
+      counter_attr = association.send(:cached_counter_attribute_name)
+      difference = value.select(&:persisted?).size - parent_record.send(counter_attr)
 
-        if parent_record.new_record?
+      if parent_record.new_record?
+        if Rails.version < '4.2'
           parent_record.send "#{counter_attr}=", difference
+          parent_record.send "#{column.name}=", value
         else
-          # don't decrement counter for deleted records, on destroy they will update counter
-          difference += (parent_record.send(column.name) - value).size
-          association.send :update_counter, difference unless difference == 0
+          parent_record.send "#{column.name}=", value
+          parent_record.send "#{counter_attr}_will_change!"
         end
+      else
+        # don't decrement counter for deleted records, on destroy they will update counter
+        difference += (parent_record.send(column.name) - value).size
+        association.send :update_counter, difference unless difference == 0
+      end
 
-        # update counters on old parents if belongs_to is changed
-        value.select(&:persisted?).each do |record|
-          key = record.send(column.association.foreign_key)
-          parent_record.class.decrement_counter counter_attr, key if key != parent_record.id
+      # update counters on old parents if belongs_to is changed
+      value.select(&:persisted?).each do |record|
+        key = record.send(column.association.foreign_key)
+        parent_record.class.decrement_counter counter_attr, key if key && key != parent_record.id
+      end
+      parent_record.send "#{column.name}=", value if parent_record.persisted?
+    end
+    
+    # TODO remove when has_many_counter_cache_hack is not needed
+    def has_many_counter_cache_hack?(parent_record, column)
+      if column.association.try(:macro) == :has_many && parent_record.association(column.name).send(:has_cached_counter?)
+        if Rails.version < '4.0' # rails 3 needs this hack always
+          true
+        else # rails 4 needs this hack for polymorphic has_many
+          column.association.options[:as]
         end
       end
     end
@@ -59,7 +76,9 @@ module ActiveScaffold
     # workaround for updating counters twice bug on rails4 (https://github.com/rails/rails/pull/14849)
     # TODO remove when pull request is merged and no version with bug is supported
     def counter_cache_hack?(column, value)
-      Rails.version >= '4.0' && column.association.try(:belongs_to?) && column.association.options[:counter_cache] && !value.is_a?(Hash)
+      if Rails.version >= '4.0' && !value.is_a?(Hash)
+        column.association.try(:belongs_to?) && column.association.options[:counter_cache] && !column.association.options[:polymorphic]
+      end
     end
 
     # Takes attributes (as from params[:record]) and applies them to the parent_record. Also looks for
@@ -89,24 +108,7 @@ module ActiveScaffold
           if multi_parameter_attributes.has_key? column.name.to_s
             parent_record.send(:assign_multiparameter_attributes, multi_parameter_attributes[column.name.to_s])
           elsif attributes.has_key? column.name
-            value = column_value_from_param_value(parent_record, column, attributes[column.name], avoid_changes)
-            if avoid_changes && column.plural_association?
-              parent_record.association(column.name).target = value
-            elsif counter_cache_hack?(column, attributes[column.name])
-              parent_record.send "#{column.association.foreign_key}=", value.try(:id)
-              parent_record.association(column.name).target = value
-            else
-              begin
-                rails3_counter_cache_hack(parent_record, column, value) if Rails.version < '4.0' && column.plural_association?
-                parent_record.send "#{column.name}=", value
-              rescue ActiveRecord::RecordNotSaved
-                parent_record.errors.add column.name, :invalid
-                parent_record.association(column.name).target = value if column.association
-              end
-            end
-            if column.association && [:has_one, :has_many].include?(column.association.macro) && column.association.reverse
-              Array(value).each { |v| v.send("#{column.association.reverse}=", parent_record) if v.new_record? }
-            end
+            value = update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
           end
         rescue
           logger.error "#{$!.class.name}: #{$!.message} -- on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect}#{" with value #{value}" if value}"
@@ -117,6 +119,31 @@ module ActiveScaffold
       flash[:warning] = parent_record.errors.to_a.join("\n") if parent_record.errors.present?
       parent_record
     end
+    
+    def update_column_from_params(parent_record, column, attribute, avoid_changes = false)
+      value = column_value_from_param_value(parent_record, column, attribute, avoid_changes)
+      if avoid_changes && column.plural_association?
+        parent_record.association(column.name).target = value
+      elsif counter_cache_hack?(column, attribute)
+        parent_record.send "#{column.association.foreign_key}=", value.try(:id)
+        parent_record.association(column.name).target = value
+      else
+        begin
+          if has_many_counter_cache_hack?(parent_record, column)
+            has_many_counter_cache_hack(parent_record, column, value)
+          else
+            parent_record.send "#{column.name}=", value
+          end
+        rescue ActiveRecord::RecordNotSaved
+          parent_record.errors.add column.name, :invalid
+          parent_record.association(column.name).target = value if column.association
+        end
+      end
+      if column.association && [:has_one, :has_many].include?(column.association.macro) && column.association.reverse
+        Array(value).each { |v| v.send("#{column.association.reverse}=", parent_record) if v.new_record? }
+      end
+      value
+    end
 
     def column_value_from_param_value(parent_record, column, value, avoid_changes = false)
       # convert the value, possibly by instantiating associated objects

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -48,7 +48,7 @@ module ActiveScaffold
             render_action_link(link, record, :link => text, :authorized => link.action.nil? || column_link_authorized?(link, column, record, associated))
           elsif inplace_edit?(record, column)
             active_scaffold_inplace_edit(record, column, {:formatted_column => text})
-          elsif active_scaffold_config.list.wrap_tag
+          elsif active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.wrap_tag
             content_tag active_scaffold_config.list.wrap_tag, text
           else
             text
@@ -176,7 +176,7 @@ module ActiveScaffold
 
       def format_value(column_value, options = {})
         value = if column_empty?(column_value)
-          active_scaffold_config.list.empty_field_text
+          empty_field_text
         elsif column_value.is_a?(Time) || column_value.is_a?(Date)
           l(column_value, :format => options[:format] || :default)
         elsif [FalseClass, TrueClass].include?(column_value.class)

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -492,7 +492,7 @@ module ActiveScaffold
         @_column_classes ||= {}
         @_column_classes[column.name] ||= begin
           classes = "#{column.name}-column "
-          classes << 'sorted ' if active_scaffold_config.list.user.sorting.sorts_on?(column)
+          classes << 'sorted ' if active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.user.sorting.sorts_on?(column)
           classes << 'numeric ' if column.number?
           classes << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
         end
@@ -522,9 +522,13 @@ module ActiveScaffold
       def column_empty?(column_value)
         empty = column_value.nil?
         empty ||= false != column_value && column_value.blank?
-        empty ||= ['&nbsp;', active_scaffold_config.list.empty_field_text].include? column_value if String === column_value
+        empty ||= ['&nbsp;', empty_field_text].include? column_value if String === column_value
         return empty
       end
+      
+      def empty_field_text
+        active_scaffold_config.list.empty_field_text if active_scaffold_config.actions.include?(:list)
+      end
 
       def column_calculation(column)
         unless column.calculate.instance_of? Proc

data/lib/active_scaffold/version.rb

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

data/test/helpers/list_column_helpers_test.rb

@@ -10,7 +10,7 @@ class ListColumnHelpersTest < ActionView::TestCase
     @column = ActiveScaffold::DataStructures::Column.new(:a, ModelStub)
     @column.form_ui = :select
     @record = stub(:a => 'value_2')
-    @config = stub(:list => stub(:empty_field_text => '-', :association_join_text => ', '))
+    @config = stub(:list => stub(:empty_field_text => '-', :association_join_text => ', '), :actions => [:list])
     @association_column = ActiveScaffold::DataStructures::Column.new(:b, ModelStub)
     @association_column.stubs(:association).returns(stub(:collection? => true))
   end

data/test/misc/attribute_params_test.rb

@@ -45,7 +45,7 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal 'First', model.first_name
     assert_nil model.last_name
     assert_equal buildings.map(&:id), model.building_ids
-    assert_equal buildings, model.buildings
+    assert_equal buildings.map(&:id), model.buildings.map(&:id)
     assert model.save
     assert_equal 2, model.reload.buildings_count
 
@@ -332,26 +332,76 @@ class AttributeParamsTest < MiniTest::Test
     assert_equal person.id, model.contactable_id
     assert_equal person, model.contactable
     assert model.save
+    assert_equal 1, person.reload.contacts_count
 
     model = update_record_from_params(model, :update, :first_name, :contactable_type, :contactable, :first_name => 'Name', :contactable_type => person.class.name, :contactable => '')
     assert_equal 'Name', model.first_name
-    assert_nil model.contactable_type
     assert_nil model.contactable_id, 'contactable should be cleared'
     assert_nil model.contactable, 'contactable should be cleared'
     assert_equal person.id, Contact.find(model.id).contactable_id, 'contact should not be saved yet'
     assert model.save
     assert_nil Contact.find(model.id).contactable_id, 'contact should be saved'
+    assert_equal 0, person.reload.contacts_count
+  end
+
+  def test_saving_has_many_polymorphic_select
+    contacts = 2.times.map { Contact.create }
+    
+    model = update_record_from_params(Person.new, :create, :first_name, :contacts, :first_name => 'Me', :contacts => ['', contacts.first.id.to_s])
+    assert_equal 'Me', model.first_name
+    assert model.contacts.present?
+    assert model.save
+    assert_equal [model.id], model.contacts.map(&:contactable_id)
+    assert_equal model.id, contacts.first.reload.contactable.id, 'contactable should be saved'
+    assert_equal 1, model.reload.contacts_count
+    
+    model = update_record_from_params(model, :update, :first_name, :contacts, :first_name => 'Name', :contacts => ['', *contacts.map{|c| c.id.to_s}])
+    assert_equal 'Name', model.first_name
+    assert model.contacts.present?
+    assert model.save
+    assert_equal [model.id]*2, model.contacts.map(&:contactable_id)
+    assert_equal [model.id]*2, contacts.map {|c| c.reload.contactable.id}, 'contactable should be saved'
+    assert_equal 2, model.reload.contacts_count
+    
+    model = update_record_from_params(model, :update, :first_name, :contacts, :first_name => 'Name', :contacts => [''])
+    assert_equal 'Name', model.first_name
+    assert model.contacts.empty?
+    assert model.save
+    assert_equal [nil]*2, contacts.map {|c| c.reload.contactable}, 'contactable should be saved'
+    assert_equal 0, model.reload.contacts_count
+  end
+
+  def test_saving_habtm_select
+    roles = 2.times.map { Role.create }
+    
+    model = update_record_from_params(Person.new, :create, :first_name, :roles, :first_name => 'Me', :roles => ['', roles.first.id.to_s])
+    assert_equal 'Me', model.first_name
+    assert model.roles.present?
+    assert model.save
+    assert_equal [[model.id]], model.roles.map(&:person_ids)
+    assert_equal [model.id], roles.first.reload.person_ids, 'role should be saved'
+    
+    model = update_record_from_params(model, :update, :first_name, :roles, :first_name => 'Name', :roles => ['', *roles.map{|c| c.id.to_s}])
+    assert_equal 'Name', model.first_name
+    assert model.roles.present?
+    assert model.save
+    assert_equal [[model.id]]*2, model.roles.map(&:person_ids)
+    assert_equal [[model.id]]*2, roles.map {|r| r.reload.person_ids}, 'roles should be saved'
+    
+    model = update_record_from_params(model, :update, :first_name, :roles, :first_name => 'Name', :roles => [''])
+    assert_equal 'Name', model.first_name
+    assert model.roles.empty?
+    assert model.save
+    assert roles.all? {|r| r.reload.people.empty?}, 'roles should be saved'
   end
 
   protected
-  MODELS = [Address, Building, Car, Contact, Floor, Person]
   def update_record_from_params(record, action, *columns, &block)
     params = columns.extract_options!.with_indifferent_access
     new_record = nil
     record.class.transaction do
       record = record.class.find(record.id) if record.persisted?
       new_record = @controller.update_record_from_params(record, build_action_columns(record, action, columns), params)
-      MODELS.each { |model| model.any_instance.unstub(:save) }
       yield if block_given?
       Thread.current[:constraint_columns] = nil
     end

data/test/misc/tableless_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class TablelessTest < MiniTest::Test
   def test_find_all
-    assert_equal [], FileModel.all
+    assert FileModel.all.to_a.empty?
   end
   
   def test_find_by_id
@@ -12,7 +12,7 @@ class TablelessTest < MiniTest::Test
   end
   
   def test_find_with_association
-    assert_equal [], Person.new.files
+    assert Person.new.files.empty?
   end
 end
   

data/test/mock_app/app/models/contact.rb

@@ -1,3 +1,3 @@
 class Contact < ActiveRecord::Base
-  belongs_to :contactable, :polymorphic => true
+  belongs_to :contactable, :polymorphic => true, :counter_cache => true
 end

data/test/mock_app/app/models/person.rb

@@ -6,6 +6,7 @@ class Person < ActiveRecord::Base
 
   has_many :contacts, :as => :contactable
   has_one :car, :dependent => :destroy
+  has_and_belongs_to_many :roles
   
   has_many :files, :dependent => :destroy, :class_name => 'FileModel'
 end

data/test/mock_app/app/models/role.rb

@@ -0,0 +1,3 @@
+class Role < ActiveRecord::Base
+  has_and_belongs_to_many :people
+end

data/test/mock_app/db/schema.rb

@@ -47,8 +47,20 @@ ActiveRecord::Schema.define do
     t.string 'last_name'
     t.integer 'buildings_count', :null => false, :default => 0
     t.integer 'floors_count', :null => false, :default => 0
+    t.integer 'contacts_count', :null => false, :default => 0
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
+  create_table 'roles' do |t|
+    t.string 'name'
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table 'people_roles', :id => false do |t|
+    t.integer 'person_id'
+    t.integer 'role_id'
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.11
+  version: 3.4.12
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -38,20 +38,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +68,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- CHANGELOG
+- MIT-LICENSE
+- README.md
 - app/assets/images/active_scaffold/add.png
 - app/assets/images/active_scaffold/arrow_down.png
 - app/assets/images/active_scaffold/arrow_up.png
@@ -312,27 +301,6 @@ files:
 - lib/generators/active_scaffold_controller/templates/helper.rb
 - public/blank.html
 - shoulda_macros/macros.rb
-- vendor/assets/images/ui-bg_diagonals-thick_18_b81900_40x40.png
-- vendor/assets/images/ui-bg_diagonals-thick_20_666666_40x40.png
-- vendor/assets/images/ui-bg_flat_10_000000_40x100.png
-- vendor/assets/images/ui-bg_glass_100_f6f6f6_1x400.png
-- vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
-- vendor/assets/images/ui-bg_glass_65_ffffff_1x400.png
-- vendor/assets/images/ui-bg_gloss-wave_35_f6a828_500x100.png
-- vendor/assets/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
-- vendor/assets/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
-- vendor/assets/images/ui-icons_222222_256x240.png
-- vendor/assets/images/ui-icons_228ef1_256x240.png
-- vendor/assets/images/ui-icons_ef8c08_256x240.png
-- vendor/assets/images/ui-icons_ffd27a_256x240.png
-- vendor/assets/images/ui-icons_ffffff_256x240.png
-- vendor/assets/javascripts/getprototypeof.js
-- vendor/assets/javascripts/jquery-ui-timepicker-addon.js
-- vendor/assets/stylesheets/jquery-ui-theme.css.erb
-- vendor/assets/stylesheets/jquery-ui.css
-- MIT-LICENSE
-- CHANGELOG
-- README.md
 - test/bridges/bridge_test.rb
 - test/bridges/date_picker_test.rb
 - test/bridges/paperclip_test.rb
@@ -394,6 +362,7 @@ files:
 - test/mock_app/app/models/file_model.rb
 - test/mock_app/app/models/floor.rb
 - test/mock_app/app/models/person.rb
+- test/mock_app/app/models/role.rb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb
@@ -415,6 +384,24 @@ files:
 - test/model_stub.rb
 - test/run_all.rb
 - test/test_helper.rb
+- vendor/assets/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+- vendor/assets/images/ui-bg_diagonals-thick_20_666666_40x40.png
+- vendor/assets/images/ui-bg_flat_10_000000_40x100.png
+- vendor/assets/images/ui-bg_glass_100_f6f6f6_1x400.png
+- vendor/assets/images/ui-bg_glass_100_fdf5ce_1x400.png
+- vendor/assets/images/ui-bg_glass_65_ffffff_1x400.png
+- vendor/assets/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+- vendor/assets/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+- vendor/assets/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+- vendor/assets/images/ui-icons_222222_256x240.png
+- vendor/assets/images/ui-icons_228ef1_256x240.png
+- vendor/assets/images/ui-icons_ef8c08_256x240.png
+- vendor/assets/images/ui-icons_ffd27a_256x240.png
+- vendor/assets/images/ui-icons_ffffff_256x240.png
+- vendor/assets/javascripts/getprototypeof.js
+- vendor/assets/javascripts/jquery-ui-timepicker-addon.js
+- vendor/assets/stylesheets/jquery-ui-theme.css.erb
+- vendor/assets/stylesheets/jquery-ui.css
 homepage: http://activescaffold.com
 licenses:
 - MIT
@@ -435,7 +422,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rails 3.2 and 4.0 version of activescaffold supporting prototype and jquery
@@ -501,6 +488,7 @@ test_files:
 - test/mock_app/app/models/file_model.rb
 - test/mock_app/app/models/floor.rb
 - test/mock_app/app/models/person.rb
+- test/mock_app/app/models/role.rb
 - test/mock_app/config.ru
 - test/mock_app/config/application.rb
 - test/mock_app/config/boot.rb