Merge pull request #22 from aki77/0.11.0

0.11.0

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.11.0
+
+- Consider `Csb.configuration` as initial value for `Csb::Builder`
+
 ## 0.10.0
 
 - Drop support for rails 6.1

lib/csb/builder.rb

@@ -8,12 +8,12 @@ class Builder
     attr_reader :output, :utf8_bom, :items, :cols, :csv_options
     attr_accessor :items
 
-    def initialize(output = '', items: [], utf8_bom: false, csv_options: {})
+    def initialize(output = '', items: [], **kwargs)
       @output = output
-      @utf8_bom = utf8_bom
       @cols = Cols.new
       @items = items
-      @csv_options = csv_options
+      @utf8_bom = kwargs.fetch(:utf8_bom) { Csb.configuration.utf8_bom }
+      @csv_options = kwargs.fetch(:csv_options) { Csb.configuration.csv_options }
     end
 
     def build

lib/csb/handler.rb

@@ -12,9 +12,7 @@ def self.call(template, source = nil)
 
       <<~RUBY
         csv = ::Csb::Template.new(
-          utf8_bom: ::Csb.configuration.utf8_bom,
           streaming: ::Csb.configuration.streaming,
-          csv_options: ::Csb.configuration.csv_options,
         )
         #{source}
         controller.send(:send_file_headers!, type: 'text/csv', filename: csv.filename)

lib/csb/template.rb

@@ -2,10 +2,8 @@ module Csb
   class Template
     attr_accessor :utf8_bom, :filename, :streaming, :items, :cols, :csv_options
 
-    def initialize(utf8_bom:, streaming:, csv_options:)
-      @utf8_bom = utf8_bom
+    def initialize(streaming:)
       @streaming = streaming
-      @csv_options = csv_options
       @cols = Cols.new
       @items = []
     end
@@ -20,16 +18,24 @@ def streaming?
 
     private
 
+    def builder_options
+      {
+        items: items,
+        utf8_bom: utf8_bom,
+        csv_options: csv_options,
+      }.compact
+    end
+
     def build_string
-      builder = Builder.new(utf8_bom: utf8_bom, items: items, csv_options: csv_options)
+      builder = Builder.new(**builder_options)
       builder.cols.copy!(cols)
       builder.build
     end
 
     def build_enumerator
       Enumerator.new do |y|
         begin
-          builder = Builder.new(y, utf8_bom: utf8_bom, items: items, csv_options: csv_options)
+          builder = Builder.new(y, **builder_options)
           builder.cols.copy!(cols)
           builder.build
         rescue => error

lib/csb/version.rb

@@ -1,3 +1,3 @@
 module Csb
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

spec/lib/csb/template_spec.rb

@@ -16,7 +16,7 @@
     context 'Streaming' do
       subject(:enum) { template.build }
 
-      let(:template) { Csb::Template.new(streaming: true, utf8_bom: false, csv_options: {}) }
+      let(:template) { Csb::Template.new(streaming: true) }
 
       it 'Is a Enumerator' do
         expect(enum).to be_a Enumerator
@@ -29,15 +29,19 @@
     context 'Not streaming' do
       subject { template.build }
 
-      let(:template) { Csb::Template.new(streaming: false, utf8_bom: false, csv_options: {}) }
+      let(:template) { Csb::Template.new(streaming: false) }
 
       it { is_expected.to eq "Name,Email,Dummy\ntester1,[email protected],\ntester2,[email protected],\n" }
     end
 
     context 'with csv_options' do
       subject { template.build }
 
-      let(:template) { Csb::Template.new(streaming: false, utf8_bom: false, csv_options: { row_sep: "\r\n" }) }
+      let(:template) do
+        template = Csb::Template.new(streaming: false)
+        template.csv_options = { row_sep: "\r\n" }
+        template
+      end
 
       it { is_expected.to eq "Name,Email,Dummy\r\ntester1,[email protected],\r\ntester2,[email protected],\r\n" }
     end