table_structure 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54e6d65c5123ccefa563ba83cfa9ef28fe25ee407224c0838afe17158afe5bbc
-  data.tar.gz: bb6cdd925323a59eb93d77c610a09b2136c6ee96e6cf618e2b0502171f2bdd4d
+  metadata.gz: ccde21d51d86d14d5aba71a9924bcc8d3669032b380005019866699cf5a9fd87
+  data.tar.gz: 31d7f45528e0972886db3a2f07f53cd030671bbabc79dda03e6728262da56d95
 SHA512:
-  metadata.gz: 5c2c95aed368f8e5afa555e4fc335b96d69e4ec307626bd00bc57a71f1b15b0601074f80321d02652a38ae74ece1d548be6277722786b7ba1c431813d8716f2c
-  data.tar.gz: fcb0d97b7f2d92ce49fab996d5472272db653163eaade94ab08a165b70ab04a9c1a0ffc732783e6375ea8eed65708d2e010a09c28503d103ca9791112d1c8aaa
+  metadata.gz: '04844310bb6ebc8eb89aa78d9ee4f350ffa566d581d3acd555bdef70271326d674cb2e8dad9843b243a46daea29f0fe0ac879eeaa15da7b68b34c5c93dc670e4'
+  data.tar.gz: aebff92798ac40979500d660e4392eb567bcf4f0efbbc825859fc9a60b5b8be52e458776adab3665243706df995314834512335a7e0aa01f0b526b65d6509f6e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.11
+Changes:
+- `TableStructure::CSV::Writer`
+  - Add `:csv_options` option. This option's value is simply passed to `::CSV.new`'s options.
+
 # 0.3.10
 Changes:
 - `TableStructure::Writer`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_structure (0.3.10)
+    table_structure (0.3.11)
 
 GEM
   remote: https://rubygems.org/

data/lib/table_structure/csv/writer.rb

@@ -5,27 +5,51 @@ module TableStructure
     class Writer
       DEFAULT_OPTIONS = {
         bom: false,
-        header_omitted: false,
-        header_context: nil
+        csv_options: {}
       }.freeze
 
-      FIXED_OPTIONS = {
-        result_type: :array,
-        method: :<<
-      }.freeze
+      INNER_WRITER_DEFAULT_OPTIONS = ::TableStructure::Writer::DEFAULT_OPTIONS
+      INNER_WRITER_IGNORED_OPTION_KEYS = %i[
+        result_type
+        method
+      ].freeze
 
       BOM = "\uFEFF"
 
       def initialize(schema, **options)
         require 'csv'
-        @options = DEFAULT_OPTIONS.merge(options).merge(FIXED_OPTIONS)
-        @writer = ::TableStructure::Writer.new(schema, **@options)
+        @options = DEFAULT_OPTIONS.merge(select_csv_writer_options(options))
+        inner_writer_options = select_inner_writer_options(options)
+        @writer = ::TableStructure::Writer.new(schema, **inner_writer_options)
       end
 
       def write(items, to:, **options, &block)
-        options = @options.merge(options).merge(FIXED_OPTIONS)
-        to.send(options[:method], BOM) if options[:bom]
-        @writer.write(items, to: ::CSV.new(to), **options, &block)
+        csv_writer_options = @options.merge(select_csv_writer_options(options))
+        inner_writer_options = select_inner_writer_options(options)
+        if csv_writer_options[:bom]
+          to.send(INNER_WRITER_DEFAULT_OPTIONS[:method], BOM)
+        end
+        csv = ::CSV.new(to, **csv_writer_options[:csv_options])
+        @writer.write(items, to: csv, **inner_writer_options, &block)
+      end
+
+      private
+
+      def select_csv_writer_options(options)
+        options
+          .select { |k, _v| DEFAULT_OPTIONS.include?(k) }
+      end
+
+      def select_inner_writer_options(options)
+        options
+          .select { |k, _v| INNER_WRITER_DEFAULT_OPTIONS.include?(k) }
+          .reject do |k, v|
+            ignored = INNER_WRITER_IGNORED_OPTION_KEYS.include?(k)
+            if ignored
+              warn "[TableStructure] #{self.class.name} ignores `#{k}:#{v}` option."
+            end
+            ignored
+          end
       end
     end
   end

data/lib/table_structure/schema/column/attrs.rb

@@ -14,13 +14,13 @@ module TableStructure
           @options = options
         end
 
-        def name(header_context, table_context)
-          name = Utils.evaluate_callable(@name, header_context, table_context)
+        def name(context, table_context)
+          name = Utils.evaluate_callable(@name, context, table_context)
           optimize_size(name, @size)
         end
 
-        def value(row_context, table_context)
-          value = Utils.evaluate_callable(@value, row_context, table_context)
+        def value(context, table_context)
+          value = Utils.evaluate_callable(@value, context, table_context)
           optimize_size(value, @size)
         end
 

data/lib/table_structure/schema/table.rb

@@ -3,7 +3,7 @@
 module TableStructure
   module Schema
     class Table
-      # TODO: Following `attr_reader` will be removed after version 1.4.0.
+      # TODO: Remove following `attr_reader`.
       attr_reader :header_column_converters, :row_column_converters, :result_builders
 
       def initialize(
@@ -55,11 +55,11 @@ module TableStructure
       end
 
       def header(context: nil)
-        values(:name, context, @header_column_converters)
+        values(:name, context)
       end
 
       def row(context: nil)
-        values(:value, context, @row_column_converters)
+        values(:value, context)
       end
 
       private
@@ -75,10 +75,10 @@ module TableStructure
       end
 
       def size
-        @size ||= @columns.map(&:size).reduce(0) { |memo, size| memo + size }
+        @size ||= @columns.map(&:size).reduce(0, &:+)
       end
 
-      def values(method, context, _converters)
+      def values(method, context)
         @columns
           .map { |column| column.send(method, context, @context) }
           .flatten

data/lib/table_structure/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableStructure
-  VERSION = '0.3.10'
+  VERSION = '0.3.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler