active_scaffold_batch 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 315bc6bae86fcc614c4d42ec9281c4e77b04bf03
-  data.tar.gz: d68dcac19cb8e728015cc8307c4c4326180cb334
+  metadata.gz: af11e767025d20bb80b31cb2d330e2e33d6cb08f
+  data.tar.gz: 654aa97b3d6ea2482d31efe41e60f8a7d190821b
 SHA512:
-  metadata.gz: 2848273ba0912eefc100f95c16862f672fe1d6a665b24981b2fed40689a4146031113397cf1466b63624d4a619dba6f1af8c204f5f891063c54ecfce7e24b286
-  data.tar.gz: 7ccca54e85cfcf4be69da73449721ce730bc6228e75775de035a2e5b22f5faa899c1e0fc178abef759db978a6a704b3c2f849d263d979735650f372b2bacbb96
+  metadata.gz: 638487d305e9fe5d42ef1fa5abad1757c7d97d94fadc3cad8776cbcf98caeb225a05b8c6b72590ade4c36f6baf9281f157bf91eda5a9a1bf60c7fe069f9bd874
+  data.tar.gz: 0222c76e3004511441843e213a759f305d9897c14ddd132ef8b8a47fddb1abeff7e7f81b103ff12acb00b8628614da77736e0e5f4f6a2042c274c39baa3ee15b

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/views/active_scaffold_overrides/_batch_create_form_body.html.erb

@@ -4,7 +4,7 @@
     <%= 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)) %>
+  <% 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_update_form_body.html.erb

@@ -4,7 +4,7 @@
     <%= 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)) %>
+  <% 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_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)

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)
+      return values unless params_hash? attributes
       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'
+        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_batch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_batch
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,22 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2017-03-22 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
   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'
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
@@ -86,17 +114,17 @@ 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
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Batch Processing for ActiveScaffold