active_scaffold 3.4.32 → 3.4.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6004a079b687a908646771e73d99729c021c96ee
-  data.tar.gz: eac7053cc13b120de1dc2103238b30244c591cde
+  metadata.gz: 60cdf903df7b52febfb72af4ada25aa1dde35832
+  data.tar.gz: f91b93961a06dc90b8f637a377e0e1c766086b8b
 SHA512:
-  metadata.gz: 825c92099164fb09b36c7bc96a949658b189bd53a135767b17e12051f35eeb7ac5ab5683aa3f6f82394d98e29778d5fc6dfa3862263fff5418e18d76268f1b21
-  data.tar.gz: 5bced1d19c67d2c2b6d9d7eb0abe8c41445ff82acc5932a35e6b58ade664b401a94d4844a7e250a2bd0ce4233b35193647f216cf3895b7e1b19585113f85cc79
+  metadata.gz: 3fbd34b94bbf32f7bce0acf7473eebe3a95969a184eb6a5144c0962edc13dd36466f7de6ef10a089b9bc12e7b57314b059eea4eb28e5c88994109f0ffa60626c
+  data.tar.gz: 0f831be90516eb337de6f593dd8ae7fa0bebdbdf9ae525ca10afd2c7d2b3a190f5d1f7fdb4b2cf758c75a936f3710ec2e684e9b22fe3b6e975465c2955c2246c

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 3.4.33
+- Fix _base_form when used with actions, so :multipart and :persistent can set to false instead of getting them from action config
+- Copy update.columns from create.columns, if not defined
+- Ensure ajax:complete is called to enable form after render_form_field request, even if element is removed
+
+= 3.4.32
 - Add ActiveScaffold.reload_embedded JS method, to reload an embedded scaffold
 - Fix nested on composite primary key associations
 - Fix render :super on partials rendered with :collection (like _list_record)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2015 Richard White, Sergio Cambra and contributors
+Copyright © 2006—2016 Richard White, Sergio Cambra and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,6 +5,7 @@ Overview
 [![Test Coverage](https://codeclimate.com/github/activescaffold/active_scaffold/badges/coverage.svg)](https://codeclimate.com/github/activescaffold/active_scaffold)
 [![Dependency Status](https://gemnasium.com/activescaffold/active_scaffold.svg)](https://gemnasium.com/activescaffold/active_scaffold)
 [![Gem Version](https://badge.fury.io/rb/active_scaffold.svg)](https://badge.fury.io/rb/active_scaffold)
+[![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 
 ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails 3.2 and 4.x are supported, ruby >= 1.9 required. For rails 4 is recommended >= 4.0.5.
 

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

@@ -984,7 +984,8 @@ var ActiveScaffold = {
       complete: function(xhr, status) {
         element = as_form.find('#'+element.attr('id'));
         element.nextAll('img.loading-indicator').css('visibility','hidden');
-        element.trigger('ajax:complete', [xhr, status]);
+        var complete_element = element.length ? element : as_form; 
+        complete_element.trigger('ajax:complete', [xhr, status]);
         if (ActiveScaffold.last_focus) {
           var item = jQuery(ActiveScaffold.last_focus);
           if (item.closest('body').length == 0 && item.attr('id')) item = jQuery('#' + item.attr('id'));

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

@@ -3,9 +3,10 @@
    url_options ||= params_for(:action => form_action)
    xhr = request.xhr? if xhr.nil?
    if active_scaffold_config.actions.include? form_action
-     multipart ||= active_scaffold_config.send(form_action).multipart?
-     columns ||= active_scaffold_config.send(form_action).columns
-     persistent ||= active_scaffold_config.send(form_action).persistent
+     action_config = active_scaffold_config.send(form_action)
+     multipart ||= action_config.multipart? unless local_assigns.has_key? :multipart
+     columns ||= action_config.columns unless local_assigns.has_key? :columns
+     persistent ||= action_config.persistent unless local_assigns.has_key? :persistent
    else
      multipart ||= false
      columns ||= nil

data/lib/active_scaffold/config/base.rb

@@ -81,11 +81,15 @@ module ActiveScaffold::Config
     private
 
     def build_action_columns(val)
-      ActiveScaffold::DataStructures::ActionColumns.new(*val).tap do |columns|
-        columns.action = self
-        columns.set_columns(@core.columns)
-        columns
-      end
+      columns =
+        if val.is_a?(ActiveScaffold::DataStructures::ActionColumns)
+          val.dup
+        else
+          ActiveScaffold::DataStructures::ActionColumns.new(*val)
+        end
+      columns.action = self
+      columns.set_columns(@core.columns)
+      columns
     end
 
     def self.columns_accessor(*names, &block)

data/lib/active_scaffold/config/core.rb

@@ -161,7 +161,7 @@ module ActiveScaffold::Config
       content_columns = Set.new(model.content_columns.map(&:name))
       @columns.exclude(*self.class.ignore_columns)
       @columns.exclude(*@columns.find_all { |c| c.column && content_columns.exclude?(c.column.name) }.collect(&:name))
-      @columns.exclude(*model.reflect_on_all_associations.collect { |a| :"#{a.name}_type" if a.options[:polymorphic] }.compact)
+      @columns.exclude(*model.reflect_on_all_associations.collect { |a| a.foreign_type.to_sym if a.options[:polymorphic] }.compact)
 
       # inherit the global frontend
       @frontend = self.class.frontend

data/lib/active_scaffold/config/update.rb

@@ -17,6 +17,8 @@ module ActiveScaffold::Config
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?, :ignore_method => :update_ignore?)
 
+    columns_accessor :columns, :copy => :create
+
     # instance-level configuration
     # ----------------------------
 

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -153,7 +153,7 @@ module ActiveScaffold
 
       def render_action_link(link, record = nil, options = {})
         if link.action.nil? || link.column.try(:polymorphic_association?)
-          link = action_link_to_inline_form(link, record)
+          link = action_link_to_inline_form(link, record) if link.column.try(:association)
           options[:authorized] = false if link.action.nil? || link.controller.nil?
           options.delete :link if link.crud_type == :create
         end

data/lib/active_scaffold/version.rb

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

data/test/config/create_test.rb

@@ -11,6 +11,10 @@ module Config
       @config.create.link = @default_link
     end
 
+    def test_default_columns
+      assert_equal [:a, :d, :other_model, :other_models], @config.create.columns.names
+    end
+
     def test_default_options
       refute @config.create.persistent
       assert @config.create.action_after_create.nil?

data/test/config/update_test.rb

@@ -6,6 +6,14 @@ module Config
       @config = ActiveScaffold::Config::Core.new :model_stub
     end
 
+    def test_copy_columns_from_create
+      @config.create.columns = [:a, :c, :d]
+      assert_equal [:a, :d], @config.create.columns.names
+      @config.update.columns = @config.create.columns
+      @config._load_action_columns
+      assert_equal [:a, :c, :d], @config.update.columns.names
+    end
+
     def test__params_for_columns__returns_all_params
       @config._load_action_columns
       @config.columns[:a].params.add :keep_a, :a_temp

data/test/model_stub.rb

@@ -4,8 +4,9 @@ class ModelStub < ActiveRecord::Base
   has_many :other_models, :class_name => 'ModelStub'
 
   cattr_accessor :stubbed_columns
-  self.stubbed_columns = [:a, :b, :c, :d, :id]
+  self.stubbed_columns = [:a, :b, :c, :d, :id, :created_at]
   attr_accessor *stubbed_columns
+  self.primary_key = :id
 
   @@nested_scope_calls = []
   cattr_accessor :nested_scope_calls
@@ -34,7 +35,11 @@ class ModelStub < ActiveRecord::Base
   end
 
   def self.columns
-    @columns ||= stubbed_columns.map { |c| ColumnMock.new(c.to_s, '', 'varchar(255)') }
+    @columns ||= stubbed_columns.map do |c|
+      column = ColumnMock.new(c.to_s, '', 'varchar(255)')
+      column.primary = true if c.to_s == self.primary_key.to_s && column.respond_to?(:primary=)
+      column
+    end
   end
 
   def self.columns_hash
@@ -42,10 +47,13 @@ class ModelStub < ActiveRecord::Base
   end
 
   # column-level security methods, used for testing
-  def self.a_authorized_for_bar?(user)
+  def self.a_authorized_for_bar?
     true
   end
-  def self.b_authorized?(user)
+  def self.b_authorized?
+    false
+  end
+  def self.c_authorized_for_create?
     false
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.4.32
+  version: 3.4.33
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-29 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: brakeman
-  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: bundler
   requirement: !ruby/object:Gem::Requirement