active_scaffold_batch 3.3.4 → 3.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 315bc6bae86fcc614c4d42ec9281c4e77b04bf03
-  data.tar.gz: d68dcac19cb8e728015cc8307c4c4326180cb334
+SHA256:
+  metadata.gz: 6682c4f57d85297bde0f373eea697058af433332ef1dd589d08ec57c55a30bf2
+  data.tar.gz: 0284ed6ea296322340d47685837e58b96cebc59eac33709430b761f278199541
 SHA512:
-  metadata.gz: 2848273ba0912eefc100f95c16862f672fe1d6a665b24981b2fed40689a4146031113397cf1466b63624d4a619dba6f1af8c204f5f891063c54ecfce7e24b286
-  data.tar.gz: 7ccca54e85cfcf4be69da73449721ce730bc6228e75775de035a2e5b22f5faa899c1e0fc178abef759db978a6a704b3c2f849d263d979735650f372b2bacbb96
+  metadata.gz: 7632a402c2ae1c0ca45e4b42c372bee61aae6f7c972e03d26b7bc7eae532cd26d61efaf70d9efbe62d73f6d7360af7546c75682ce3a934b37c1965cb4072b4e9
+  data.tar.gz: f8c39f5bfde77928e78693008848b53de9a9c087fc92cc6f58a6c92027223b012ffd8b7bf5d652f7d0ca49a895c5221f996e95c8621d5b8ebcd20601bd67c0c3

data/README

@@ -2,6 +2,9 @@ ActiveScaffold batch is a gem which adds batch_update, batch_create and batch_de
 
 gem 'active_scaffold_batch'
 
+It works with ActiveScaffold >= 3.4.18 and rails >= 4.0.
+Use 3.3.x for rails 3.2.x.
+
 In the config block of an activescaffold you can add any of the following lines:
 
     config.actions.add :batch_create

data/app/assets/stylesshets/{active_scaffold_batch.css → active_scaffold_batch.scss}

@@ -9,7 +9,7 @@
   border-top: 0;
 }
 .active-scaffold .multiple .form_record a.remove {
-  background-image: url("/assets/active_scaffold/cross.png");
+  background-image: image-url("active_scaffold/cross.png");
   display: block;
   font-weight: bold;
   height: 16px;
@@ -27,7 +27,7 @@
 .active-scaffold-header div.actions > a.batch_new {
   background-position: 5px 50%;
   background-repeat: no-repeat;
-  background-image: url("/assets/active_scaffold/add.png");
+  background-image: image-url("active_scaffold/add.png");
   margin: 0;
   padding: 5px 5px 5px 25px;
 }

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

@@ -3,8 +3,8 @@
   <li class="form-element">
     <%= hidden_field_tag("batch_scope", (batch_scope || 'LISTED')) %>
   </li>
-  <% columns.each :for => @record do |column| %>
-  <% next if column.plural_association? || (column.association && [:has_one].include?(column.association.macro)) %>
+  <% columns.each_column(for: @record) do |column| %>
+  <% next unless column.association.nil? || column.association.belongs_to? %>
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
@@ -13,7 +13,7 @@
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id} %>
     <%= link_to_visibility_toggle(subsection_id, {:default_visible => !column.collapsed}) -%>
   </li>
-  <% elsif column.readonly_association?
+  <% elsif column.association.try(:readonly?)
     next %>
   <% else
     renders_as = :field if renders_as == :subform -%>

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

@@ -1,6 +1,6 @@
 <thead>
   <tr>
-    <% columns.each :flatten => true do |column| -%>
+    <% columns.each_column(flatten: true) do |column| -%>
     <% next if column_renders_as(column) == :hidden -%>
       <th class="<%= 'required' if column.required? %>"><label><%= column.label %></label></th>
     <% end -%>

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

@@ -7,7 +7,7 @@
 </tr>
 <% end %>
 <tr class="form_record">
-<% columns.each :flatten => true do |column| -%>
+<% columns.each_column(flatten: true) do |column| -%>
 <%
   next if column_renders_as(column) == :hidden
   next unless record.authorized_for?(:crud_type => :create, :column => column.name) 

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

@@ -3,8 +3,8 @@
   <li class="form-element">
     <%= render :partial => 'batch_update_form_attribute_scope' -%>
   </li>
-  <% columns.each :for => @record do |column| %>
-  <% next if column.plural_association? || (column.association && [:has_one].include?(column.association.macro)) %>
+  <% columns.each_column(for: @record) do |column| %>
+  <% next unless column.association.nil? || column.association.belongs_to? %>
   <% renders_as = column_renders_as(column) %>
   <% if renders_as == :subsection -%>
     <% subsection_id = sub_section_id(:sub_section => column.label) %>
@@ -13,7 +13,7 @@
     <%= render :partial => 'form', :locals => { :columns => column, :subsection_id => subsection_id } %>
     <%= link_to_visibility_toggle(subsection_id, :default_visible => !column.collapsed) -%>
   </li>
-  <% elsif column.readonly_association?
+  <% elsif column.association.try(:readonly?)
     next %>
   <% else
     renders_as = :field if renders_as == :subform -%>

data/lib/active_scaffold/actions/batch_base.rb

@@ -104,7 +104,7 @@ module ActiveScaffold::Actions
       if respond_to? "#{action_name}_respond_to_xml", true
         send("#{action_name}_respond_to_xml")
       else
-        render :xml => response_object.to_xml(:only => active_scaffold_config.send(action_name).columns.names), :content_type => Mime::XML, :status => response_status
+        render :xml => response_object.to_xml(:only => active_scaffold_config.send(action_name).columns.visible_columns_names), :content_type => Mime::XML, :status => response_status
       end
     end
 
@@ -112,7 +112,7 @@ module ActiveScaffold::Actions
       if respond_to? "#{action_name}_respond_to_json", true
         send("#{action_name}_respond_to_json")
       else
-        render :text => response_object.to_json(:only => active_scaffold_config.send(action_name).columns.names), :content_type => Mime::JSON, :status => response_status
+        render :text => response_object.to_json(:only => active_scaffold_config.send(action_name).columns.visible_columns_names), :content_type => Mime::JSON, :status => response_status
       end
     end
 
@@ -120,7 +120,7 @@ module ActiveScaffold::Actions
       if respond_to? "#{action_name}_respond_to_yaml", true
         send("#{action_name}_respond_to_yaml")
       else
-        render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.send(action_name).columns.names)).to_yaml, :content_type => Mime::YAML, :status => response_status
+        render :text => Hash.from_xml(response_object.to_xml(:only => active_scaffold_config.send(action_name).columns.visible_columns_names)).to_yaml, :content_type => Mime::YAML, :status => response_status
       end
     end
 

data/lib/active_scaffold/actions/batch_create.rb

@@ -3,7 +3,7 @@ module ActiveScaffold::Actions
 
     def self.included(base)
       base.send :include, ActiveScaffold::Actions::BatchBase unless base < ActiveScaffold::Actions::BatchBase
-      base.before_filter :batch_create_authorized_filter, :only => [:batch_new, :batch_create]
+      base.before_action :batch_create_authorized_filter, :only => [:batch_new, :batch_create]
       base.helper_method :batch_create_values
       base.helper_method :batch_create_by_column
       base.helper_method :batch_create_by_records
@@ -49,7 +49,7 @@ module ActiveScaffold::Actions
       if @batch_create_by_records.nil?
         if marked_records_parent
           column = active_scaffold_config.columns[batch_create_by_column.to_sym]
-          @batch_create_by_records = if column.polymorphic_association?
+          @batch_create_by_records = if column.association.polymorphic?
             active_scaffold_config_for(params[:batch_create_by].singularize).model.find(marked_records_parent.keys)
           else
             column_plural_assocation_value_from_value(column, marked_records_parent.keys)
@@ -212,7 +212,7 @@ module ActiveScaffold::Actions
     def create_attribute_values_from_params(columns, attributes)
       values = {}
       parent_record = active_scaffold_config.model.new
-      columns.each :for => active_scaffold_config.model, :crud_type => :create, :flatten => true do |column|
+      columns.each_column(for: active_scaffold_config.model, crud_type: :create, flatten: true) do |column|
         next unless attributes.has_key?(column.name)
         if column == batch_create_by_column.to_sym
           @batch_create_by_records = batch_values_for_column(column, attributes[column.name])

data/lib/active_scaffold/actions/batch_destroy.rb

@@ -3,7 +3,7 @@ module ActiveScaffold::Actions
 
     def self.included(base)
       base.send :include, ActiveScaffold::Actions::BatchBase unless base < ActiveScaffold::Actions::BatchBase
-      base.before_filter :batch_destroy_authorized_filter, :only => [:batch_destroy]
+      base.before_action :batch_destroy_authorized_filter, :only => [:batch_destroy]
     end
 
     def batch_destroy

data/lib/active_scaffold/actions/batch_update.rb

@@ -23,7 +23,7 @@ module ActiveScaffold::Actions
     
     def self.included(base)
       base.send :include, ActiveScaffold::Actions::BatchBase unless base < ActiveScaffold::Actions::BatchBase
-      base.before_filter :batch_update_authorized_filter, :only => [:batch_edit, :batch_update]
+      base.before_action :batch_update_authorized_filter, :only => [:batch_edit, :batch_update]
       base.helper_method :batch_update_values
     end
 
@@ -166,13 +166,18 @@ module ActiveScaffold::Actions
       return sql_set, update_value
     end
 
+    # TODO: delete when ActiveScaffold 3.5 is released and required
+    def params_hash?(value)
+      value.is_a?(Hash) || (Rails.version >= '5.0' && value.is_a?(ActionController::Parameters))
+    end
+
     def update_attribute_values_from_params(columns, attributes)
       values = {}
-      attributes = {} unless attributes.is_a?(Hash)
-      columns.each :for => new_model, :crud_type => :update, :flatten => true do |column|
-        next unless attributes[column.name].is_a?(Hash) && params[:record][column.name][:operator] != 'NO_UPDATE'
+      return values unless params_hash? attributes
+      columns.each_column(for: new_model, crud_type: :update, flatten: true) do |column|
+        next unless params_hash?(attributes[column.name]) && attributes[column.name][:operator] != 'NO_UPDATE'
         value = attributes[column.name]
-        value = value.merge(:value => (value[:operator] == 'NULL') ? nil : column_value_from_param_value(nil, column, value[:value]))
+        value[:value] = value[:operator] == 'NULL' ? nil : column_value_from_param_value(nil, column, value[:value])
         values[column.name] = {:column => column, :value => value}
       end
       values

data/lib/active_scaffold/config/batch_destroy.rb

@@ -3,11 +3,7 @@ module ActiveScaffold::Config
     self.crud_type = :delete
     
     def initialize(core_config)
-      @core = core_config
-
-      # start with the ActionLink defined globally
-      @link = self.class.link.map(&:clone) unless self.class.link.nil?
-      @action_group = self.class.action_group.clone if self.class.action_group
+      super
       @action_group ||= 'collection.batch.destroy'
       @process_mode = self.class.process_mode
     end

data/lib/active_scaffold/helpers/batch_create_column_helpers.rb

@@ -35,6 +35,16 @@ module ActiveScaffold
       def batch_create_multiple_layout
         "batch_create_form_#{active_scaffold_config.batch_create.layout}"
       end
+
+      def current_form_columns(record, scope, subform_controller = nil)
+        columns = super
+        return columns if columns
+        if %i[batch_new batch_create].include? action_name.to_sym
+          active_scaffold_config.batch_create.columns.visible_columns_names
+        elsif %i[batch_edit batch_update].include? action_name.to_sym
+          active_scaffold_config.batch_update.columns.visible_columns_names
+        end
+      end
     end
   end
 end

data/lib/active_scaffold_batch/config/core.rb

@@ -1,13 +1,13 @@
 # Need to open the AS module carefully due to Rails 2.3 lazy loading
 ActiveScaffold::Config::Core.class_eval do
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_edit] = :get
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_update] = :post
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_new] = :get
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_create] = :post
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_add] = :get
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_edit] = :get
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_update] = :post
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_new] = :get
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_create] = :post
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_add] = :get
   #not working because routing picks show route instead
-  #ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_destroy] = :get
+  #ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_destroy] = :get
   #you may define a route for your controller before resource routes
   #match 'players/batch_destroy' => 'players#batch_destroy', :via => [:get]
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_destroy] = :delete
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:batch_destroy] = :delete
 end

data/lib/active_scaffold_batch/version.rb

@@ -1,7 +1,7 @@
 module ActiveScaffoldBatch
   module Version
     MAJOR = 3
-    MINOR = 3
+    MINOR = 4
     PATCH = 4
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

metadata

@@ -1,30 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_batch
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.4
 platform: ruby
 authors:
 - Sergio Cambra
 - Volker Hochstein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: active_scaffold
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 3.6.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 3.6.0.pre
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
@@ -36,7 +50,7 @@ files:
 - README
 - app/assets/javascripts/jquery/active_scaffold_batch.js
 - app/assets/javascripts/prototype/active_scaffold_batch.js
-- app/assets/stylesshets/active_scaffold_batch.css
+- app/assets/stylesshets/active_scaffold_batch.scss
 - app/views/active_scaffold_overrides/_batch_create_form.html.erb
 - app/views/active_scaffold_overrides/_batch_create_form_attribute.html.erb
 - app/views/active_scaffold_overrides/_batch_create_form_body.html.erb
@@ -80,24 +94,24 @@ homepage: http://github.com/scambra/active_scaffold_batch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.9
+signing_key:
 specification_version: 4
 summary: Batch Processing for ActiveScaffold
 test_files: []