xport 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a5b5e83d54d4375f6da647ca7d3e616f596a7c4
-  data.tar.gz: 9fea9bddb2e50d3df0f4fc715de80a9cf3f21f88
+  metadata.gz: 39dc26453cf66a1e44a8e7d892afc8520b047693
+  data.tar.gz: f2bbb24262740b94c5506c2f0f8575baab29bd35
 SHA512:
-  metadata.gz: b110ecaf9c4b1e7d80693814573203c0f6dbe0f09e23fc680810297059bf38b4343f34eca0e357ec9e2ed83709bf00d90c242aa6e509978446cdf73132af549a
-  data.tar.gz: 2fc859c208332803bbf7e14345414984b91a198a5402c11ff47297e999132dbd6514ecbff42eed735bbbc6ae8345ff29858a9b71baac409754a11df6eabcaae9
+  metadata.gz: f228fe115a80a74e06f1fe6b688d5b2d2527db71bcae23f06d96b5acad5990c97e9a4ee28660ba92a1da75072126352587cdf3723b0517687625d01398ea2542
+  data.tar.gz: 6afe887498bb0e73b65206f36136c50c8dfe5d2af3ef17c519d0696bf44b07d64b28702604fbab536c892527dc5e0dfb9cf65cd38becc19e1b6d55ac7f5d479e

data/lib/xport/export.rb

@@ -65,12 +65,14 @@ module Xport
     def preload!; end
 
     def write_contents(formatter, &block)
-      write_header(formatter)
-      write_body(formatter, &block)
-      write_widths(formatter)
+      formatter.add_worksheet do |worksheet|
+        write_header(formatter, worksheet)
+        write_body(formatter, worksheet, &block)
+        write_widths(formatter, worksheet)
+      end
     end
 
-    def write_header(formatter)
+    def write_header(formatter, worksheet)
       if builder.grouped?
         group_row = []
         builder.groups_with_offset_and_colspan.each do |group, offset, colspan|
@@ -79,25 +81,25 @@ module Xport
             group_row << nil
           end
         end
-        formatter.add_header_row group_row
+        formatter.add_header_row worksheet, group_row
 
         builder.groups_with_offset_and_colspan.each do |group, offset, colspan|
           colspan -= 1
-          formatter.merge_header_cells(offset..offset + colspan)
+          formatter.merge_header_cells(worksheet, offset..offset + colspan)
         end
       end
-      formatter.add_header_row header_row
+      formatter.add_header_row worksheet, header_row
     end
 
-    def write_body(formatter)
+    def write_body(formatter, worksheet)
       each_object do |object, rownum|
         yield rownum, objects.size if block_given?
-        formatter.add_row object_row(object)
+        formatter.add_row worksheet, object_row(object)
       end
     end
 
-    def write_widths(formatter)
-      formatter.column_widths(*builder.widths)
+    def write_widths(formatter, worksheet)
+      formatter.column_widths(worksheet, *builder.widths)
     end
 
     def find_in_batches?

data/lib/xport/formatters/axlsx.rb

@@ -14,7 +14,7 @@ module Xport
     end
 
     class Formatter
-      attr_reader :export, :workbook, :worksheet
+      attr_reader :export, :workbook
 
       delegate :builder, to: :export
 
@@ -22,7 +22,6 @@ module Xport
         @export    = export
         @package   = ::Axlsx::Package.new
         @workbook  = @package.workbook
-        @worksheet = @workbook.add_worksheet
 
         # Support Numbers and multiline strings in Excel Mac 2011
         # https://github.com/randym/axlsx/issues/252
@@ -33,11 +32,16 @@ module Xport
         @package.to_stream
       end
 
-      def add_header_row(row)
+      def add_worksheet
+        worksheet = @workbook.add_worksheet
+        yield worksheet
+      end
+
+      def add_header_row(worksheet, row)
         worksheet.add_row row, style: header_style
       end
 
-      def add_row(row)
+      def add_row(worksheet, row)
         values = row.map { |v| v.is_a?(Xport::Cell) ? v.value : v }
         axlsx_row = worksheet.add_row(values, style: styles, types: builder.types)
         row.each.with_index do |cell, i|
@@ -55,11 +59,11 @@ module Xport
         end
       end
 
-      def merge_header_cells(range)
+      def merge_header_cells(worksheet, range)
         worksheet.merge_cells worksheet.rows.first.cells[range]
       end
 
-      def column_widths(*widths)
+      def column_widths(worksheet, *widths)
         worksheet.column_widths(*widths)
       end
 

data/lib/xport/formatters/csv.rb

@@ -24,14 +24,18 @@ module Xport
         @io
       end
 
-      def add_row(row)
+      def add_worksheet
+        yield
+      end
+
+      def add_row(worksheet, row)
         values = row.map { |v| v.is_a?(Xport::Cell) ? v.value : v }
         @csv << values
       end
       alias_method :add_header_row, :add_row
 
-      def merge_header_cells(range); end
-      def column_widths(*widths); end
+      def merge_header_cells(worksheet, range); end
+      def column_widths(worksheet, *widths); end
     end
   end
 end

data/lib/xport/formatters/rubyxl.rb

@@ -14,14 +14,13 @@ module Xport
     end
 
     class Formatter
-      attr_reader :export, :workbook, :worksheet
+      attr_reader :export, :workbook
 
       delegate :builder, to: :export
 
       def initialize(export)
         @export    = export
         @workbook  = ::RubyXL::Workbook.new
-        @worksheet = @workbook.worksheets[0]
         @i = 0
       end
 
@@ -29,7 +28,12 @@ module Xport
         workbook.stream
       end
 
-      def add_row(row)
+      def add_worksheet
+        worksheet = workbook.worksheets[0]
+        yield worksheet
+      end
+
+      def add_row(worksheet, row)
         row.each.with_index do |v, j|
           value = v.is_a?(Xport::Cell) ? v.value : v
           worksheet.add_cell(@i, j, value)
@@ -38,11 +42,11 @@ module Xport
       end
       alias_method :add_header_row, :add_row
 
-      def merge_header_cells(range)
+      def merge_header_cells(worksheet, range)
         worksheet.merge_cells(0, range.first, 0, range.last)
       end
 
-      def column_widths(*widths)
+      def column_widths(worksheet, *widths)
         widths.each.with_index do |width, i|
           next unless width
           worksheet.change_column_width(i, width)

data/lib/xport/formatters/xlsxtream.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Xport
+  module Xlsxtream
+    extend ActiveSupport::Concern
+
+    included do
+      require 'xlsxtream'
+    end
+
+    def to_xlsx(&block)
+      formatter = Xport::Xlsxtream::Formatter.new(self)
+      to_file(formatter, &block)
+    end
+
+    class Formatter
+      attr_reader :export, :workbook
+
+      delegate :builder, to: :export
+
+      def initialize(export)
+        @io       = StringIO.new
+        @workbook = ::Xlsxtream::Workbook.new(@io)
+        @io.rewind
+      end
+
+      def to_file
+        workbook.close
+        @io.rewind
+        @io
+      end
+
+      def add_worksheet(&block)
+        workbook.write_worksheet('Sheet1', use_shared_strings: true, &block)
+      end
+
+      def add_row(worksheet, row)
+        values = row.map { |v| v.is_a?(Xport::Cell) ? v.value : v }
+        worksheet << values
+      end
+      alias_method :add_header_row, :add_row
+
+      def merge_header_cells(worksheet, range); end
+      def column_widths(worksheet, *widths); end
+    end
+  end
+end

data/lib/xport/version.rb

@@ -1,3 +1,3 @@
 module Xport
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/xport.rb

@@ -16,6 +16,7 @@ require 'xport/download_presenter'
 require 'xport/formatters/csv'
 require 'xport/formatters/axlsx'
 require 'xport/formatters/rubyxl'
+require 'xport/formatters/xlsxtream'
 
 module Xport
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xport
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Janis Vitols
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -99,6 +99,7 @@ files:
 - lib/xport/formatters/axlsx.rb
 - lib/xport/formatters/csv.rb
 - lib/xport/formatters/rubyxl.rb
+- lib/xport/formatters/xlsxtream.rb
 - lib/xport/version.rb
 homepage: 
 licenses: []