active_scaffold 3.4.8 → 3.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5de5babbd2447c2a706b2627e7e1cb09966e563
-  data.tar.gz: 371b743005cc81c284a673ee82e9fd23048bf8e3
+  metadata.gz: c83a7d7ce3f57146d10cbf6134cc41c46f4753e3
+  data.tar.gz: 4e19dd8122bde0ded7a956146709fa981d05a9bd
 SHA512:
-  metadata.gz: 1c3156bc03652f0b4efdfe075dd5019648ada5087474e17d49c6fdfd0bdf0e4dc1465eec783638154f22dcaa62d98eb9eeb54ce3b01b6ec04b732931bf495237
-  data.tar.gz: 797149d0738f3e7f995bd13e367fb589e8fa9956d1954b65b90b3e15925631a763ac630227df4ffb6c5c8ebbeb6b466571874601c841eee4506dd3868abc70b5
+  metadata.gz: 397d444554b333a865f9c9302655a3d5519c48dcc1dd768be0317a66e94c29d4b70f087809ac4cca049a2ed295b4b53971811a1fcbd7c3e42a9536bea2b41de2
+  data.tar.gz: 2e5a2a8706e97af1a82f35335e55a4abc6e97c9156e3d23ef2ad093ca868c473f9f8b425ce926600a4d013b9b05d586b31e87e22b5d8b97ab726d4dceb95aaff

data/CHANGELOG

@@ -1,4 +1,14 @@
-= 3.4.8 (not released yet)
+= 3.4.9
+- update parent data when changing a column in subform of edit form, so parent has data from form as it works in new form
+- use :only and :except options from resource line on as_routes and as_association_routes, so activescaffold actions can be selected
+- focus first element of subform record added
+- changes on destroy:
+  - destroy.js.erb uses main_path_to_return to get url to reload if page empty
+  - delete_record_row can be called without url
+- messages_id and form_selector on create, update and destroy JS views can be overrided when calling render :super
+- element_row_id on list_record partial can be overrided when calling render :super with :row_id local
+
+= 3.4.8
 - set parent data when adding new record on subform of a create form on a embedded or nested list
 - trigger ajax:* events on ajax call to render_field
 

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

@@ -396,7 +396,8 @@ if (typeof(jQuery.fn.delayedObserver) === 'undefined') {
               else {
                 if (el.data('timer')) { clearTimeout(el.data('timer')); }
                 el.data('timer', setTimeout(function(){
-                  el.data('callback').apply(el);
+                  var callback = el.data('callback')
+                  if (callback) callback.apply(el);
                 }, el.data('delay') * 1000));
                 el.data('oldval', el.val());
               }
@@ -598,10 +599,10 @@ var ActiveScaffold = {
     jQuery("input[data-remove-disabled],select[data-remove-disabled],textarea[data-remove-disabled]", as_form).removeAttr('disabled data-remove-disabled');
   },  
   
-  focus_first_element_of_form: function(form_element) {
+  focus_first_element_of_form: function(form_element, form_selector) {
     if (typeof(form_element) == 'string') form_element = '#' + form_element;
-    var form_selector = jQuery(form_element).is('form') ? '' : 'form ';
-    jQuery(form_selector + ":input[type!=hidden]:first", jQuery(form_element)).focus();
+    if (typeof(form_selector) == 'undefined') form_selector = jQuery(form_element).is('form') ? '' : 'form ';
+    jQuery(form_selector + ":input:visible:first", jQuery(form_element)).focus();
   },
     
   create_record_row: function(active_scaffold_id, html, options) {
@@ -660,7 +661,7 @@ var ActiveScaffold = {
     ActiveScaffold.remove(row, function() {
       ActiveScaffold.stripe(tbody);
       ActiveScaffold.decrement_record_count(tbody.closest('div.active-scaffold'));
-      ActiveScaffold.reload_if_empty(tbody, page_reload_url);
+      if (page_reload_url) ActiveScaffold.reload_if_empty(tbody, page_reload_url);
     });
   },
 
@@ -768,7 +769,6 @@ var ActiveScaffold = {
         var tfoot = element.children('tfoot');
         if (tfoot.length) tfoot.before(content);
         else element.append(content);
-        content.trigger('as:element_created');
       }
     } else {
       var current = jQuery('#' + element.attr('id') + ' .sub-form-record')
@@ -776,9 +776,10 @@ var ActiveScaffold = {
         this.replace(current[0], content);
       } else {
         element.prepend(content);
-        content.trigger('as:element_created');
       }
     }
+    ActiveScaffold.focus_first_element_of_form(content, '');
+    content.trigger('as:element_created');
   },
   
   render_form_field: function(source, content, options) {

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

@@ -1,11 +1,12 @@
 <%
 record = list_record if local_assigns[:list_record] # compat with render :partial :collection
 columns ||= list_columns
+row_id ||= element_row_id(:action => :list, :id => record.id)
 tr_class = cycle("", "even-record") + ' ' + list_row_class(record)
 action_links ||= active_scaffold_config.action_links.member
 data_refresh ||= record.to_param
 -%>
-<tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= data_refresh %>">
+<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 -%>

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

@@ -1,4 +1,4 @@
-<% messages_id = active_scaffold_messages_id %>
+<% messages_id ||= active_scaffold_messages_id %>
 <% if successful? %>
   <% if render_parent? %>
     <% if render_parent_action == :row %>
@@ -17,7 +17,11 @@
   <% elsif (active_scaffold_config.delete.refresh_list) %>
     <%= render :partial => 'refresh_list' %>
   <% else %>
-    ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max)) %>');
+    <%
+      url = main_path_to_return
+      url[:page] = [active_scaffold_config.list.user.page.to_i - 1, 1].max if url.is_a? Hash
+    %>
+    ActiveScaffold.delete_record_row('<%= element_row_id(:action => 'list', :id => params[:id]) %>', '<%= url_for(url) %>');
     <%= render :partial => 'update_calculations', :formats => [:js] %>
   <% end %>
 <% else %>

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

@@ -1,6 +1,6 @@
 try {
 var action_link;
-<% form_selector = "#{element_form_id(:action => :create)}"
+<% form_selector ||= "#{element_form_id(:action => :create)}"
 insert_at ||= :top -%>
 <% if active_scaffold_config.list.always_show_create -%>
 <%= render :partial => 'update_messages' %>

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

@@ -1,5 +1,5 @@
 try {
-<% form_selector = "#{element_form_id(:action => :update, :id => @record.try(:id) || params[:id])}" %>
+<% form_selector ||= "#{element_form_id(:action => :update, :id => @record.try(:id) || params[:id])}" %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector %>');
 action_link.update_flash_messages('<%= escape_javascript(render(:partial => 'messages')) %>');
 <% if successful? %>

data/lib/active_scaffold/actions/core.rb

@@ -83,7 +83,7 @@ module ActiveScaffold::Actions
           @record.send "#{@column.name}=", value
           @record.id = params[:id]
         end
-        set_parent(@record) if @record.id.nil? && params[:parent_controller] && @scope
+        set_parent(@record) if params[:parent_controller] && @scope
 
         after_render_field(@record, @column)
       end
@@ -98,7 +98,7 @@ module ActiveScaffold::Actions
         copy_attributes(parent_model.find(params[:parent_id]), parent) if params[:parent_id]
         parent.id = params[:parent_id]
         parent = update_record_from_params(parent, active_scaffold_config_for(parent_model).send(params[:parent_id] ? :update : :create).columns, params[:record], true) if @column.send_form_on_update_column
-        apply_constraints_to_record(parent) if params[:parent_id]
+        apply_constraints_to_record(parent) unless params[:parent_id]
         if record.class.reflect_on_association(association).collection?
           record.send(association) << parent
         else
@@ -114,7 +114,7 @@ module ActiveScaffold::Actions
         attributes.each { |attr, value| dst.send :write_attribute, attr, value if orig.class.accessible_attributes.deny? attr }
         attributes = attributes.slice(*orig.class.accessible_attributes)
       elsif orig.class.respond_to? :protected_attributes
-        orig.class.protected_attributes.each { |attr| dst.send :write_attribute, attr, orig[attr] }
+        orig.class.protected_attributes.each { |attr| dst.send :write_attribute, attr, orig[attr] if attr.present? }
         attributes = attributes.except(*orig.class.protected_attributes)
       end
       dst.attributes = attributes

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -8,25 +8,49 @@ module ActionDispatch
         :collection => {:edit_associated => :get, :new_existing => :get, :add_existing => :post},
         :member => {:edit_associated => :get, :destroy_existing => :delete}
     }
+    
     class Mapper
-      module Base
-        def as_routes(options = {:association => true})
-          collection do
-            ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each {|name, type| match(name, :via => type)}
+      module Resources
+        class ActiveScaffold < Resource
+          def default_actions
+            @default_actions ||= (ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].keys + ACTIVE_SCAFFOLD_CORE_ROUTING[:member].keys).uniq
           end
-          member do
-            ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each {|name, type| match(name, :via => type)}
-            get 'list', :action => :index
+        end
+        class ActiveScaffoldAssociation < Resource
+          def default_actions
+            @default_actions ||= (ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].keys + ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].keys).uniq
+          end
+        end
+
+        def as_routes(opts = {:association => true})
+          resource_scope(:resource, ActiveScaffold.new(parent_resource.name, parent_resource.options)) do
+            collection do
+              ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each do |name, type|
+                match(name, :via => type) if parent_resource.actions.include? name
+              end
+            end
+            member do
+              ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each do |name, type|
+                match(name, :via => type) if parent_resource.actions.include? name
+              end
+              get 'list', :action => :index if parent_resource.actions.include? :index
+            end
           end
-          as_association_routes if options[:association]
+          as_association_routes if opts[:association]
         end
         
         def as_association_routes
-          collection do 
-            ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each {|name, type| send(type, name)}
-          end
-          member do
-            ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each {|name, type| send(type, name)}
+          resource_scope(:resource, ActiveScaffoldAssociation.new(parent_resource.name, parent_resource.options)) do
+            collection do 
+              ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each do |name, type|
+                match(name, :via => type) if parent_resource.actions.include? name
+              end
+            end
+            member do
+              ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each do |name, type|
+                match(name, :via => type) if parent_resource.actions.include? name
+              end
+            end
           end
         end
         

data/lib/active_scaffold/version.rb

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

data/test/extensions/routing_mapper_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class RoutingMapperTest < ActionController::TestCase
+  test 'rails routes' do
+    assert_routing 'addresses', :controller => 'addresses', :action => 'index'
+    assert_routing 'addresses/1', :controller => 'addresses', :action => 'show', :id => '1'
+    assert_routing 'addresses/1/edit', :controller => 'addresses', :action => 'edit', :id => '1'
+    assert_routing({:method => :put, :path => 'addresses/1'}, {:controller => 'addresses', :action => 'update', :id => '1'})
+    assert_routing({:method => :delete, :path => 'addresses/1'}, {:controller => 'addresses', :action => 'destroy', :id => '1'})
+    assert_routing({:method => :post, :path => 'addresses'}, {:controller => 'addresses', :action => 'create'})
+  end
+
+  test 'active scaffold routes' do
+    assert_routing 'addresses/show_search', :controller => 'addresses', :action => 'show_search'
+    assert_routing({:method => 'post', :path => 'addresses/render_field'}, :controller => 'addresses', :action => 'render_field')
+    assert_routing({:method => 'post', :path => 'addresses/2/render_field'}, :controller => 'addresses', :action => 'render_field', :id => '2')
+    assert_routing 'addresses/2/render_field', :controller => 'addresses', :action => 'render_field', :id => '2'
+    assert_routing 'addresses/edit_associated', :controller => 'addresses', :action => 'edit_associated'
+    assert_routing 'addresses/2/edit_associated', :controller => 'addresses', :action => 'edit_associated', :id => '2'
+  end
+end

data/test/mock_app/config/routes.rb

@@ -1,3 +1,6 @@
 RailsApp::Application.routes.draw do
+  resources :addresses do
+    as_routes
+  end
   match ':controller(/:action(/:id))', :via => :any
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.8
+  version: 3.4.9
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -364,6 +364,7 @@ files:
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
 - test/extensions/active_record_test.rb
+- test/extensions/routing_mapper_test.rb
 - test/helpers/form_column_helpers_test.rb
 - test/helpers/list_column_helpers_test.rb
 - test/helpers/pagination_helpers_test.rb
@@ -470,6 +471,7 @@ test_files:
 - test/data_structures/validation_reflection_test.rb
 - test/data_structures/virtual_column_test.rb
 - test/extensions/active_record_test.rb
+- test/extensions/routing_mapper_test.rb
 - test/helpers/form_column_helpers_test.rb
 - test/helpers/list_column_helpers_test.rb
 - test/helpers/pagination_helpers_test.rb