active_scaffold_export 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a839bd6f44ec26aa73f8da128adc2678f87f65dc
-  data.tar.gz: 0377be1f4026ebbae123d012b7faa1938fef34f3
+SHA256:
+  metadata.gz: e9f7f034474f62c9c156d57118a1cf6c36b8f704d3e3d39b9df7ca352c238d4a
+  data.tar.gz: f1d0c02ad1a4e503a00bc55459771a6853597cc99b5e1c869b22a11fc8539f43
 SHA512:
-  metadata.gz: 75e352107ecc0d1fb6e4f80444f56806cc62a3d6a3fb18eb3a5ab68a0fbeac02ce8248595b65c4563e1b3c0995b21e8cfb73d80fb1488265e876541eab65d480
-  data.tar.gz: 15964ca9effd8a6b8fba7d48d86ee7cf9f381be1d486ec65179278872c047bb6aaa065fe979c3003b23bf9518fb5190cf7301e66c46e6f0859b9abd28039bbfb
+  metadata.gz: 428f1456d4c2c96d756bc1bc9007de918233d6fb5104e4915a329a64a9e09e434db5c0e29babec790ba7facc4539d928c02d890e48dc1416fe96a8315a9baccd
+  data.tar.gz: a4cd29b6d36228116cb2064592b8323a26aea1689fb27d6119432775b1f611474138adadfd1f27c2d147f44c69e8c4b16ba8855aa47e39cd1eac3c9306bceeae

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

@@ -1,12 +1,12 @@
 <% export_config = active_scaffold_config.export %>
 <h3><%=as_(:columns_for_export)%></h3>
-<% if ActiveScaffold.js_framework == :jquery %>
-<%= link_to as_(:select_all), '#', onclick: 'jQuery(".columnCheckbox").prop("checked", true);', class: 'active-scaffold-footer' %>
+<% if ActiveScaffold.js_framework == :jquery # TODO: use JS asset instead of inline JS %>
+<%= link_to as_(:select_all), '#', onclick: 'jQuery(".columnCheckbox").prop("checked", true); return false', class: 'active-scaffold-footer' %>
  |
-<%= link_to as_(:select_none), '#', onclick: 'jQuery(".columnCheckbox").prop("checked", false);', class: 'active-scaffold-footer' %>
+<%= link_to as_(:select_none), '#', onclick: 'jQuery(".columnCheckbox").prop("checked", false); return false', class: 'active-scaffold-footer' %>
 <% end %>
 <div class="columns checkbox-list">
-<% export_config.columns.each do |column| -%>
+<% export_config.columns.each_column do |column| -%>
   <div class="column checkbox-wrapper">
     <%= content_tag(:label, check_box_tag("export_columns[#{column.name}]", 1, !export_config.default_deselected_columns.include?(column.name), :class => 'columnCheckbox') + "&nbsp;#{column.label}".html_safe) %>
   </div>

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

@@ -4,4 +4,5 @@
                                                 :method => :post,
                                                 :cancel_link => true,
                                                 :headline => as_(:export),
-                                                :body_partial => 'export_form_body'} %>
+                                                :body_partial => 'export_form_body',
+                                                :loading => false} %>

data/lib/active_scaffold/actions/export.rb

@@ -1,13 +1,8 @@
 module ActiveScaffold::Actions
   module Export
     def self.included(base)
-      base.before_filter :export_authorized?, :only => [:export]
-      base.before_filter :show_export_authorized?, :only => [:show_export]
-      base.before_filter :init_session_var
-    end
-
-    def init_session_var
-      session[:search] = params[:search] if !params[:search].nil? || params[:commit] == as_('Search')
+      base.before_action :export_authorized?, :only => [:export]
+      base.before_action :show_export_authorized?, :only => [:show_export]
     end
 
     # display the customization form or skip directly to export
@@ -28,9 +23,7 @@ module ActiveScaffold::Actions
       export_config = active_scaffold_config.export
       if params[:export_columns].nil?
         export_columns = {}
-        export_config.columns.each { |col|
-          export_columns[col.name.to_sym] = 1
-        }
+        export_config.columns.each { |col| export_columns[col.to_sym] = 1 }
         options = {
           :export_columns => export_columns,
           :full_download => export_config.default_full_download.to_s,
@@ -40,9 +33,7 @@ module ActiveScaffold::Actions
         params.merge!(options)
       end
 
-      @export_columns = export_config.columns.reject { |col| params[:export_columns][col.name.to_sym].nil? }
-      includes_for_export_columns = @export_columns.collect{ |col| col.includes }.flatten.uniq.compact
-      self.active_scaffold_includes.concat includes_for_export_columns
+      set_includes_for_columns(:export)
       @export_config = export_config
       # Make sure active_scaffold's find_page is dealing with the same list of
       # columns. Prevents an invalid SQL query when exporting after filtering
@@ -83,7 +74,7 @@ module ActiveScaffold::Actions
             sheet.add_row(@export_columns.collect { |column| view_context.format_export_column_header_name(column) }, style: header) unless params[:skip_header]
             find_items_for_export do |records|
               records.each do |record|
-                sheet.add_row @export_columns.collect{|column| view_context.get_export_column_value(record, column, false)}
+                sheet.add_row @export_columns.collect { |column| view_context.get_export_column_value(record, column, false) }
               end
             end
           end
@@ -97,6 +88,15 @@ module ActiveScaffold::Actions
     end
 
     protected
+    def export_columns
+      return @export_columns if defined? @export_columns
+      @export_columns = active_scaffold_config.export.columns.reject { |col| params[:export_columns][col.to_sym].nil? }
+      sorting = active_scaffold_config.list.user.sorting || active_scaffold_config.list.sorting
+      sorting_columns = sorting.reject { |col, _| @export_columns.include?(col.name) }.map(&:first)
+      @export_columns.map! { |col| active_scaffold_config.columns[col] }
+      @export_columns += sorting_columns
+    end
+
     # The actual algorithm to do the export
     def find_items_for_export(&block)
       find_options = { :sorting =>
@@ -104,7 +104,6 @@ module ActiveScaffold::Actions
           active_scaffold_config.list.sorting : active_scaffold_config.list.user.sorting,
         :pagination => true
       }
-      params[:search] = session[:search]
       do_search rescue nil
       params[:segment_id] = session[:segment_id]
       do_segment_search rescue nil
@@ -130,7 +129,7 @@ module ActiveScaffold::Actions
     # The default name of the downloaded file.
     # You may override the method to specify your own file name generation.
     def export_file_name
-      filename = self.controller_name
+      filename = self.controller_name.clone
 
       if params[:format]
         if params[:format].to_sym == :xlsx

data/lib/active_scaffold/config/export.rb

@@ -69,15 +69,7 @@ module ActiveScaffold::Config
       Gem::Specification::find_all_by_name('axlsx_rails').any?
     end
 
-    # provides access to the list of columns specifically meant for this action to use
-    def columns
-      self.columns = @core.columns._inheritable unless @columns
-      @columns
-    end
-    def columns=(val)
-      @columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
-      @columns.action = self
-    end
+    columns_accessor :columns
 
     def multipart?
       false

data/lib/active_scaffold/helpers/export_helpers.rb

@@ -17,12 +17,11 @@ module ActiveScaffold
 
           if column.association.nil? or column_empty?(raw_value)
             csv ? format_export_column(raw_value) : raw_value # xlsx needs original data type
-          else
-            case column.association.macro
-            when :has_one, :belongs_to
-              format_singular_association_export_column(raw_value)
-            when :has_many, :has_and_belongs_to_many
+          elsif column.association
+            if column.association.collection?
               format_plural_association_export_column(raw_value)
+            else
+              format_singular_association_export_column(raw_value)
             end
           end
         end

data/lib/active_scaffold_export/config/core.rb

@@ -15,6 +15,6 @@ ActiveScaffold::Config::Core.class_eval do
       :export_default_delimiter, :export_default_skip_header, 
       :export_default_file_format, :export_xlsx_avaliable
 
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:show_export] = :get
-  ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:export] = :post
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:show_export] = :get
+  ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection][:export] = :post
 end

data/lib/active_scaffold_export/version.rb

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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_export
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Volker Hochstein
 - Sergio Cambra
 - Hernan Astudillo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-04 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc
+        version: 3.6.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0.rc
+        version: 3.6.0.pre
 description: Exporting Records with ActiveScaffold
 email: activescaffold@googlegroups.com
 executables: []
@@ -34,11 +34,8 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.md
 files:
-- ".document"
 - LICENSE.txt
 - README.md
-- Rakefile
-- active_scaffold_export.gemspec
 - app/assets/images/export.png
 - app/assets/stylesheets/active_scaffold_export.css.erb
 - app/assets/stylesheets/export-stylesheet-ie.css
@@ -46,7 +43,6 @@ files:
 - app/views/active_scaffold_overrides/_export_form_body.html.erb
 - app/views/active_scaffold_overrides/_show_export.html.erb
 - app/views/active_scaffold_overrides/show_export.html.erb
-- init.rb
 - lib/active_scaffold/actions/export.rb
 - lib/active_scaffold/config/export.rb
 - lib/active_scaffold/helpers/export_helpers.rb
@@ -54,11 +50,11 @@ files:
 - lib/active_scaffold_export/config/core.rb
 - lib/active_scaffold_export/engine.rb
 - lib/active_scaffold_export/version.rb
-homepage: http://github.com/naaano/active_scaffold_export
+homepage: http://github.com/active_scaffold/active_scaffold_export
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,9 +69,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.9
+signing_key:
 specification_version: 4
 summary: Ability to export records to CSV/XLSX with ActiveScaffold
 test_files: []

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/Rakefile

@@ -1,55 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-require './lib/active_scaffold_export/version.rb'
-
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "active_scaffold_export"
-  gem.version = ActiveScaffoldExport::Version::STRING
-  gem.homepage = "http://github.com/naaano/active_scaffold_export"
-  gem.license = "MIT"
-  gem.summary = %Q{Exporting Records with ActiveScaffold}
-  gem.description = %Q{Exporting Records with ActiveScaffold}
-  gem.email = "activescaffold@googlegroups.com"
-  gem.authors = ["Volker Hochstein", "Sergio Cambra", "Hernan Astudillo"]
-  gem.add_runtime_dependency 'active_scaffold', '~> 3.1'
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "active_scaffold_export #{ActiveScaffoldExport::Version::STRING}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/active_scaffold_export.gemspec

@@ -1,44 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "active_scaffold_export"
-  s.version = "3.3.2"
-
-  s.authors = ["Volker Hochstein", "Sergio Cambra", "Hernan Astudillo"]
-  s.description = "Exporting Records with ActiveScaffold"
-  s.email = "activescaffold@googlegroups.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "init.rb",
-    "active_scaffold_export.gemspec",
-    "app/assets/images/export.png",
-    "app/assets/stylesheets/active_scaffold_export.css.erb",
-    "app/assets/stylesheets/export-stylesheet-ie.css",
-    "app/views/active_scaffold_overrides/_export.csv.erb",
-    "app/views/active_scaffold_overrides/_export_form_body.html.erb",
-    "app/views/active_scaffold_overrides/_show_export.html.erb",
-    "app/views/active_scaffold_overrides/show_export.html.erb",
-    "lib/active_scaffold/actions/export.rb",
-    "lib/active_scaffold/config/export.rb",
-    "lib/active_scaffold/helpers/export_helpers.rb",
-    "lib/active_scaffold_export.rb",
-    "lib/active_scaffold_export/config/core.rb",
-    "lib/active_scaffold_export/engine.rb",
-    "lib/active_scaffold_export/version.rb"
-  ]
-  s.homepage = "http://github.com/naaano/active_scaffold_export"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.summary = "Ability to export records to CSV/XLSX with ActiveScaffold"
-  s.add_runtime_dependency 'active_scaffold', '>= 3.3.0.rc'
-end

data/init.rb

@@ -1,7 +0,0 @@
-require 'active_scaffold_export'
-
-begin
-  ActiveScaffoldAssets.copy_to_public(ActiveScaffoldExport.root)
-rescue
-  raise $! unless Rails.env == 'production'
-end