active_scaffold_export 3.5.1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27bb01b27b1106e740763ee7c02e9d3deb1df2afb70a8ecccded8fa87c229496
-  data.tar.gz: 37cb223e2a416d8560f5727d03884f29591d8200b7bbde0fbb0147fe5038cab4
+  metadata.gz: 1b39cbb961c15eaa44301788a0fde3bdd54615acc8547d8c74604a5629f1768d
+  data.tar.gz: 62806e6733c7562294d7ef265be602e085e3bae56d0a6d4738e4336a21c340dd
 SHA512:
-  metadata.gz: c30862703c29a5703f994b8793eadc49b4a8a6d21f05618679a31bc0f3f7e3a870c1d5fa2f38a72c3c56fd78d3be7ec42029099ad975cae935761accf56c39a0
-  data.tar.gz: 00f36259a4cf5876a678638560105991e139e5d289f3e4b9d5e00a65aaa0ebd50a00b41b92e3d19cc4ab8a3aa9b8d086b753aa8a7892137a9e88a9dc79a1e7a2
+  metadata.gz: 864b39ba6cb5855e0437b34dd211fb87e0317cc493c6e887ba7a6e523d1f48040e5e476cbeddf646a84de54846dcf43aa74879354f091d60758cbdd5180da756
+  data.tar.gz: 67f530f45b91f63eaa04bd31ad88022edf86e709caaf232bb96c57ab1f5f613e746ac08dc42a013b3dce3169a40c37ba78cbdc5062604751790f8abfc0a409f9

data/app/views/active_scaffold_overrides/_export.csv.erb

@@ -12,7 +12,7 @@
     csv << fcsv_options[:headers] unless params[:skip_header] == 'true'
     @records.each do |record|
       csv << @export_columns.collect { |column|
-        get_export_column_value(record, column)
+        get_export_column_value(record, column, :csv)
       }
     end
   end

data/lib/active_scaffold/actions/export.rb

@@ -53,41 +53,42 @@ module ActiveScaffold::Actions
         Mime::Type.register "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", :xlsx
       end
 
-      respond_to do |format|
-        format.csv do
-          response.headers['Content-type'] = 'text/csv'
-          # start streaming output
-          self.response_body = Enumerator.new do |y|
-            find_items_for_export do |records|
-              @records = records
-              str = render_to_string :partial => 'export', :layout => false, :formats => [:csv]
-              y << str
-              params[:skip_header] = 'true' # skip header on the next run
-            end
-          end
+      respond_to_action(:export)
+    end
+
+    protected
+
+    def export_respond_to_csv
+      response.headers['Content-type'] = 'text/csv'
+      # start streaming output
+      self.response_body = Enumerator.new do |y|
+        find_items_for_export do |records|
+          @records = records
+          str = render_to_string :partial => 'export', :layout => false, :formats => [:csv]
+          y << str
+          params[:skip_header] = 'true' # skip header on the next run
         end
-        format.xlsx do 
-          response.headers['Content-type'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-          p = Axlsx::Package.new
-          header = p.workbook.styles.add_style sz: 11, b: true,:bg_color => "69B5EF", :fg_color => "FF", alignment: { horizontal: :center }
-          p.workbook.add_worksheet(name: active_scaffold_config.label) do |sheet|
-            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) }
-              end
-            end
-          end
-          stream = p.to_stream # when adding rows to sheet, they won't pass to this stream if declared before. axlsx issue?
-          self.response_body = Enumerator.new do |y|
-            y << stream.read 
+      end
+    end
+
+    def export_respond_to_xlsx
+      response.headers['Content-type'] = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      pkg = Axlsx::Package.new
+      header = pkg.workbook.styles.add_style sz: 11, b: true,:bg_color => "69B5EF", :fg_color => "FF", alignment: { horizontal: :center }
+      pkg.workbook.add_worksheet(name: active_scaffold_config.label) do |sheet|
+        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, :xlsx) }
           end
         end
-
+      end
+      stream = pkg.to_stream # when adding rows to sheet, they won't pass to this stream if declared before. axlsx issue?
+      self.response_body = Enumerator.new do |y|
+        y << stream.read
       end
     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? }
@@ -154,5 +155,9 @@ module ActiveScaffold::Actions
       export_authorized?
     end
 
+    def export_formats
+      active_scaffold_config.export.formats
+    end
+
   end
 end

data/lib/active_scaffold/config/export.rb

@@ -4,6 +4,7 @@ module ActiveScaffold::Config
 
     def initialize(core_config)
       @core = core_config
+      @formats = [:csv, :xlsx]
     end
 
     # global level configuration

data/lib/active_scaffold/helpers/export_helpers.rb

@@ -9,14 +9,14 @@ module ActiveScaffold
       # format_export_column(raw_value)
       # format_singular_association_export_column(association_record)
       # format_plural_association_export_column(association_records)
-      def get_export_column_value(record, column, csv = true)
-        if export_column_override? column
-          send(export_column_override(column), record)
+      def get_export_column_value(record, column, format)
+        if (method = export_column_override(column))
+          send(method, record)
         else
           raw_value = record.send(column.name)
 
           if column.association.nil? or column_empty?(raw_value)
-            csv ? format_export_column(raw_value) : raw_value # xlsx needs original data type
+            format_export_column(raw_value, format)
           elsif column.association
             if column.association.collection?
               format_plural_association_export_column(raw_value)
@@ -28,19 +28,16 @@ module ActiveScaffold
       end
 
       def export_column_override(column)
-        "#{column.name.to_s.gsub('?', '')}_export_column" # parse out any question marks (see issue 227)
+        override_helper column, 'export_column'
       end
 
-      def export_column_override?(column)
-        respond_to?(export_column_override(column))
-      end
-
-      def format_export_column(raw_value)
-        format_value_for_csv(raw_value) 
+      def format_export_column(raw_value, format)
+        method = "format_value_for_#{format}"
+        respond_to?(method) ? send(method, raw_value) : raw_value
       end
 
       def format_value_for_csv(column_value)
-        value = if column_empty?(column_value)
+        if column_empty?(column_value)
           active_scaffold_config.list.empty_field_text
         elsif column_value.is_a?(Time) || column_value.is_a?(Date)
           l(column_value, :format => :default)

data/lib/active_scaffold_export/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldExport
   module Version
     MAJOR = 3
-    MINOR = 5
-    PATCH = 1
+    MINOR = 6
+    PATCH = 0
 
     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.5.1
+  version: 3.6.0
 platform: ruby
 authors:
 - Volker Hochstein
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold