active_scaffold_batch 3.4.0 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: af11e767025d20bb80b31cb2d330e2e33d6cb08f
-  data.tar.gz: 654aa97b3d6ea2482d31efe41e60f8a7d190821b
+SHA256:
+  metadata.gz: bad88227a4ac0b2587bb9c0cb3655fae85875efa4b6118c46ff20ca05339df6e
+  data.tar.gz: 710149c54582c7105cbd01b618e5bcdd74da32c8a554f2d5e5509ecb8b06aeb0
 SHA512:
-  metadata.gz: 638487d305e9fe5d42ef1fa5abad1757c7d97d94fadc3cad8776cbcf98caeb225a05b8c6b72590ade4c36f6baf9281f157bf91eda5a9a1bf60c7fe069f9bd874
-  data.tar.gz: 0222c76e3004511441843e213a759f305d9897c14ddd132ef8b8a47fddb1abeff7e7f81b103ff12acb00b8628614da77736e0e5f4f6a2042c274c39baa3ee15b
+  metadata.gz: b7c94c565133d16d892545a4389eb1f7ebfafe390e1fbbc83c200178da4b18ca49ac5a85371cdac0e9d36a0498436c2364875cb72d4747e96076261cdb809895
+  data.tar.gz: 856bd4207754a2db7488d5e687b49bc6d361e741285784aeba73079fe76be281ec5502b2b66b25f22803cc76c02ff17ef795584bbd192e95cb8055904a3f1af5

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,7 +3,7 @@
   <li class="form-element">
     <%= hidden_field_tag("batch_scope", (batch_scope || 'LISTED')) %>
   </li>
-  <% columns.each :for => @record do |column| %>
+  <% 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 -%>

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,7 +3,7 @@
   <li class="form-element">
     <%= render :partial => 'batch_update_form_attribute_scope' -%>
   </li>
-  <% columns.each :for => @record do |column| %>
+  <% 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 -%>

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

@@ -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_update.rb

@@ -174,7 +174,7 @@ module ActiveScaffold::Actions
     def update_attribute_values_from_params(columns, attributes)
       values = {}
       return values unless params_hash? attributes
-      columns.each :for => new_model, :crud_type => :update, :flatten => true do |column|
+      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] = value[:operator] == 'NULL' ? nil : column_value_from_param_value(nil, column, value[:value])
@@ -244,7 +244,7 @@ module ActiveScaffold::Actions
       current_value = record.send(column.name)
       {"number"=>"", "unit"=>"DAYS", "value"=>"November 16, 2010", "operator"=>"REPLACE"}
       if ActiveScaffold::Actions::BatchUpdate::GenericOperators.include?(calculation_info[:operator]) || ActiveScaffold::Actions::BatchUpdate::DateOperators.include?(calculation_info[:operator])
-        operand = self.class.condition_value_for_datetime(calculation_info[:value], column.column.type == :date ? :to_date : :to_time)
+        operand = self.class.condition_value_for_datetime(column, calculation_info[:value], column.column.type == :date ? :to_date : :to_time)
         case calculation_info[:operator]
         when 'REPLACE' then operand
         when 'NULL' then nil

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

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_batch
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.5
 platform: ruby
 authors:
 - Sergio Cambra
 - Volker Hochstein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -31,28 +31,14 @@ dependencies:
     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
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.6.0.pre
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
@@ -64,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
@@ -108,7 +94,7 @@ homepage: http://github.com/scambra/active_scaffold_batch
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -123,9 +109,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.9
+signing_key:
 specification_version: 4
 summary: Batch Processing for ActiveScaffold
 test_files: []