active_scaffold_export 3.9.1 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 270c47817326448305acea738088f43e9fc7bd0b1ae0283915feb8fde4b8a478
-  data.tar.gz: b23ae05c9749d8708568b15eb2b4a44f02f59ecd23df0a57a76e46481300655e
+  metadata.gz: 17a2384e4ea87f37820137c5a5b4d77263e1c897b286229ed4c1c3da0ee1a5cd
+  data.tar.gz: 2b37e2b9b189725d3c3735d782d262a9d3df8e8f816a83dfe36a65545147da07
 SHA512:
-  metadata.gz: 2b6f90a0ed3d81463a12d3b62d35c65ac03cc09d0d0754f666441948f9e259f149778660213948d691f200f235192ad16f01859b5c0b5f9d557d613864e3f06e
-  data.tar.gz: 365fc9c8d0ad96bd8f577ec4959dc8fa4b97aa9cf7f16886d96833604b475a3ae38f47c48a7c93cfee0e2e6c9c6fc2d7bf08b37bce635ee32e699c13d45a201e
+  metadata.gz: aea5b9dd175581c8d730271cdb0067d7c7721c271ab57593a2c92de7bef9365356c923af7834d43b6d3adbc49b53135f79d5c22121223a560e1e59a1685036ea
+  data.tar.gz: 07f93b89c04d65fcfbc5630a1bf932e0aab23e0772b90569d3cc495aa19b1304b23fdeb87394a73822080243ee5cdca285d70fe76554b108168211385526a144

data/lib/active_scaffold/actions/export.rb

@@ -40,14 +40,15 @@ module ActiveScaffold::Actions
       # with field_search against a relation column, and that relation column is
       # not included in the set of export columns.
       @list_columns = @export_columns
+      @find_options = find_options_for_export
 
       # this is required if you want this to work with IE
       if request.env['HTTP_USER_AGENT'] =~ /msie/i
-        response.headers['Pragma'] = "public"
-        response.headers['Cache-Control'] = "no-cache, must-revalidate, post-check=0, pre-check=0"
-        response.headers['Expires'] = "0"
+        response.headers['pragma'] = "public"
+        response.headers['cache-control'] = "no-cache, must-revalidate, post-check=0, pre-check=0"
+        response.headers['expires'] = "0"
       end
-      response.headers['Content-Disposition'] = "attachment; filename=#{export_file_name}"
+      response.headers['content-disposition'] = "attachment; filename=#{export_file_name}"
 
       respond_to_action(:export)
     end
@@ -55,10 +56,11 @@ module ActiveScaffold::Actions
     protected
 
     def export_respond_to_csv
-      response.headers['Content-type'] = Mime[:csv]
+      response.headers['content-type'] = Mime[:csv]
+      response.headers['last-modified'] = '0'
       # start streaming output
       self.response_body = Enumerator.new do |y|
-        find_items_for_export do |records|
+        find_items_for_export(@find_options) do |records|
           @records = records
           str = render_to_string :partial => 'export', :layout => false, :formats => [:csv]
           y << str
@@ -68,7 +70,8 @@ module ActiveScaffold::Actions
     end
 
     def export_respond_to_xlsx
-      response.headers['Content-type'] = Mime[:xlsx]
+      response.headers['content-type'] = Mime[:xlsx]
+      response.headers['last-modified'] = '0'
       pkg = Axlsx::Package.new
       pkg.workbook.add_worksheet(name: worksheet_name) do |sheet|
         styles = @export_columns.collect { |column| view_context.export_column_header_style(column, :xlsx) }
@@ -77,7 +80,7 @@ module ActiveScaffold::Actions
           styles.map! { |style| pkg.workbook.styles.add_style style if style }
           sheet.add_row(@export_columns.collect { |column| view_context.format_export_column_header_name(column) }, style: styles, widths: widths)
         end
-        find_items_for_export do |records|
+        find_items_for_export(@find_options) do |records|
           records.each do |record|
             row = []
             styles = []
@@ -116,31 +119,29 @@ module ActiveScaffold::Actions
       @export_columns += sorting_columns
     end
 
-    # The actual algorithm to do the export
-    def find_items_for_export(&block)
-      find_options = { :sorting =>
-        active_scaffold_config.list.user.sorting.nil? ?
-          active_scaffold_config.list.sorting : active_scaffold_config.list.user.sorting,
-        :pagination => true
-      }
+    def find_options_for_export
+      find_options = {sorting: active_scaffold_config.list.sorting, pagination: true}
       do_search rescue nil
-      params[:segment_id] = session[:segment_id]
-      do_segment_search rescue nil
 
       if params[:full_download] == 'true'
-        find_options.merge!({
-          :per_page => 3000,
-          :page => 1
-        })
+        find_options.merge!(per_page: 3000, page: 1)
+      else
+        find_options.merge!(
+          pagination: active_scaffold_config.list.pagination,
+          per_page: active_scaffold_config.list.user.per_page,
+          page: active_scaffold_config.list.user.page
+        )
+      end
+      find_options
+    end
+
+    # The actual algorithm to do the export
+    def find_items_for_export(find_options, &block)
+      if params[:full_download] == 'true'
         find_page(find_options).pager.each do |page|
           yield page.items
         end
       else
-        find_options.merge!({
-          :pagination => active_scaffold_config.list.pagination,
-          :per_page => active_scaffold_config.list.user.per_page,
-          :page => active_scaffold_config.list.user.page
-        })
         yield find_page(find_options).items
       end
     end

data/lib/active_scaffold/config/export.rb

@@ -95,7 +95,7 @@ module ActiveScaffold::Config
     end
 
     def default_deselected_columns
-      self.default_deselected_columns = ActiveScaffold::DataStructures::Set.new if @default_deselected_columns.nil?
+      @default_deselected_columns ||= ActiveScaffold::DataStructures::Set.new unless frozen?
       @default_deselected_columns
     end
 
@@ -104,5 +104,21 @@ module ActiveScaffold::Config
     def multipart?
       false
     end
+
+    UserSettings.class_eval do
+      user_attr :show_form, :allow_full_download, :force_quotes, :default_file_format,
+                :default_delimiter, :default_skip_header, :default_file_format
+
+      def default_deselected_columns=(val)
+        @default_deselected_columns = ActiveScaffold::DataStructures::Set.new(*val)
+      end
+
+      def default_deselected_columns
+        if @default_deselected_columns.nil? && @conf.default_deselected_columns
+          return @conf.default_deselected_columns
+        end
+        @default_deselected_columns ||= ActiveScaffold::DataStructures::Set.new
+      end
+    end
   end
 end

data/lib/active_scaffold_export/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_export
 version: !ruby/object:Gem::Version
-  version: 3.9.1
+  version: 3.9.3
 platform: ruby
 authors:
 - Volker Hochstein
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-23 00:00:00.000000000 Z
+date: 2025-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold