export_to 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcdb1f8a1a6dec33c36024fc0f577b1a492d7fe7e1bd7a8cf3d639be76814bde
-  data.tar.gz: 8b844513054aba11c5384dfc30a46ba9ae9abded9ed62001c9fb4af9d0e9a0d1
+  metadata.gz: 6e6900888a5e2ff9dc099b3f6327a4ce1b07869c80991afc86c48be902baa554
+  data.tar.gz: f5dc1916c65e52376fcce1de96699628262b340cfacb97c32576b0c5d9b5afeb
 SHA512:
-  metadata.gz: 58e3294ec055895590fe1766d0b0ab54b0c5176942481400ec9d142b25dc2680171888e0a8f9d8338d264bc75870f08ab8d564b198b0ee95d2bac26edacbc66c
-  data.tar.gz: e7dd88214c37584d37c164dc1be3ec418adaa7e51bf5fce99b8f60ad648646378584f95d79d9bb7347df8fd8370f8d51b92fc006a9f6a25829ce6319005ebd8d
+  metadata.gz: 100069ed5dc91b24173488fb30a2d7c821673184ddd9dfc68290756f7e752e0a5bb35611e1037e236d1e8040746ed20963a0db3840d26303d66f4ea8a6e3477c
+  data.tar.gz: a69f77a907acaec0f701ad692b10072b1060d1502aae48e15b5e9fc0c547947db97ca0a3b83ea2fd3ecccedc6692278aea6259a6c38cedc61b82faf6e6881c62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    export_to (0.1.2)
+    export_to (1.0.0)
       activesupport (>= 6, < 7)
       fast_excel
       iconv

data/lib/export_to/base.rb

@@ -3,7 +3,7 @@ module ExportTo
     class_attribute :options
     class_attribute :head_titles
     class_attribute :body_keys
-    class_attribute :column_formats
+    class_attribute :column_options
     class_attribute :body_column_proc
 
     class_attribute :presenter_klass
@@ -99,15 +99,15 @@ module ExportTo
         self.options = options
       end
 
-      def set(title, key, format: {}, &block)
+      def set(title, key, options={}, &block)
         self.head_titles ||= []
         self.body_keys ||= []
-        self.column_formats ||= []
+        self.column_options ||= []
         self.body_column_proc ||= []
 
         self.head_titles.push(title)
         self.body_keys.push(key)
-        self.column_formats.push(format)
+        self.column_options.push(options)
         self.body_column_proc.push(block)
       end
 

data/lib/export_to/exporter/xlsx.rb

@@ -4,7 +4,7 @@ module ExportTo
 
       def export
         rows.each! do |columns, model, x|
-          worksheet.set_row(x, height, nil)
+          worksheet.set_row(x, height, nil) if x > 0
           worksheet.write_row(x, columns)
         end
 
@@ -20,20 +20,20 @@ module ExportTo
       def worksheet
         @worksheet ||= begin
           ws = workbook.add_worksheet(options.fetch(:worksheet) { "Default" })
-          # 設定表頭樣式
-          ws.set_row(0, height, head_format)
 
           # 表身樣式
-          column_formats.each_with_index do |format, i|
-            next if format.blank?
-
-            width = format.delete(:width) { FastExcel::DEF_COL_WIDTH }
+          column_options.each_with_index do |column_options, i|
+            next if column_options.blank?
 
-            puts "#{i} -> #{width} -> #{format}"
+            width = column_options.fetch(:width) { FastExcel::DEF_COL_WIDTH }
+            format = column_options.fetch(:format) { {} }
 
             ws.set_column(i, i, width, workbook.add_format(format))
           end
 
+          # 設定表頭樣式
+          ws.set_row(0, height, head_format)
+
           ws
         end
       end
@@ -54,8 +54,8 @@ module ExportTo
         options.fetch(:height) { 20 }
       end
 
-      def column_formats
-        @column_formats ||= rows.class.column_formats.dup || []
+      def column_options
+        @column_options ||= rows.class.column_options
       end
     end
   end

data/lib/export_to/version.rb

@@ -1,3 +1,3 @@
 module ExportTo
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: export_to
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - eddie