table_structure 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d536a6af5a6f759f6e2460568aa1822edc3b15812b4d84c821a5d9750e4275
-  data.tar.gz: d12f7463aa3b5ee12cfe8023ef77f0ef0ccf1f2d59692f392696ceeef47dc948
+  metadata.gz: b76264ce64e9ba5706af0a933cda2a9bbd64d7c4f49a88ac8cf57c2c96a87d7e
+  data.tar.gz: e78fa085177724b1fc7a6a5561455588611159226d170840fb4a8ac908feb7aa
 SHA512:
-  metadata.gz: 5f8008644303fdea9135a1d1a6d7e26cac50c388062982723c7e9564589c96d3eb70346a2a12a216c2fc2c13abe52e4f0d8b7860fbc652ff1878cce70b505b74
-  data.tar.gz: 719615ac3af76a63c0fa616f4fc2e8195d806dd4e773987ce0f4274eff58647ddab6b460b6a13fbfb72d7709d93e26ca30f427202132e8ab4ddd13cedf7f9c3d
+  metadata.gz: a767059b75a19a19ad4eff6fb16134ac4cc345bb5dd0878f7d434db274e9ae37c0a708b73e52611eea83deb0e78edd1ed891bcccef666674726c67f43bec699c
+  data.tar.gz: 94c598813253ca9ae1d20d5853567cfb3d45ef4bb161c69b879988f144265449291b3a3130ca894c8a0aac2545eb13e77e1433ba48fa539cc6541d3cddaa7804

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.18
+Changes:
+- Minor improvements.
+
 # 0.3.17
 Changes:
 - `TableStructure::Schema`

data/Gemfile.lock

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

data/README.md

@@ -219,10 +219,10 @@ enum.each do |item|
 end
 
 enum.map(&:itself)
-# => [{:id=>"1", :name=>"Taro", :pet1=>"🐱", :pet2=>"🐶", :pet3=>"", :q1=>"⭕️", :q2=>"❌", :q3=>"⭕️"}, {:id=>"2", :name=>"Hanako", :pet1=>"🐇", :pet2=>"🐢", :pet3=>"🐿", :q1=>"⭕️", :q2=>"⭕️", :q3=>"❌"}]
+# => [{:id=>1, :name=>"Taro", :pet1=>"🐱", :pet2=>"🐶", :pet3=>nil, :q1=>"⭕️", :q2=>"❌", :q3=>"⭕️"}, {:id=>2, :name=>"Hanako", :pet1=>"🐇", :pet2=>"🐢", :pet3=>"🐿", :q1=>"⭕️", :q2=>"⭕️", :q3=>"❌"}]
 
 enum.lazy.select { |item| item[:q1] == '⭕️' }.take(1).force
-# => [{:id=>"1", :name=>"Taro", :pet1=>"🐱", :pet2=>"🐶", :pet3=>"", :q1=>"⭕️", :q2=>"❌", :q3=>"⭕️"}]
+# => [{:id=>1, :name=>"Taro", :pet1=>"🐱", :pet2=>"🐶", :pet3=>nil, :q1=>"⭕️", :q2=>"❌", :q3=>"⭕️"}]
 ```
 
 ### Advanced

data/lib/table_structure.rb

@@ -24,11 +24,12 @@ module TableStructure
   require 'table_structure/schema/column_converters'
   require 'table_structure/schema/context_builders'
   require 'table_structure/schema/row_builders'
-  require 'table_structure/schema/table'
   require 'table_structure/schema/keys_generator'
+  require 'table_structure/schema/table'
   require 'table_structure/schema/columns/attributes'
   require 'table_structure/schema/columns/schema'
   require 'table_structure/schema/utils'
+  require 'table_structure/table/iterator'
   require 'table_structure/writer'
   require 'table_structure/csv/writer'
   require 'table_structure/iterator'

data/lib/table_structure/iterator.rb

@@ -7,13 +7,15 @@ module TableStructure
         schema = schema_or_writer
         @writer = Writer.new(schema, **options)
       elsif schema_or_writer.is_a?(Writer)
+        warn "[TableStructure] Pass Writer as an argument has been deprecated. Pass Schema instead. #{caller_locations(1, 1)}"
         @writer = schema_or_writer
       else
-        raise ::TableStructure::Error, "Must be either a schema or a writer. #{schema_or_writer}"
+        raise ::TableStructure::Error, "Must be either Schema or Writer. #{schema_or_writer}"
       end
     end
 
     def iterate(items, **options, &block)
+      # TODO: Change not to use Writer.
       Enumerator.new { |y| @writer.write(items, to: y, **options, &block) }
     end
   end

data/lib/table_structure/schema.rb

@@ -45,7 +45,7 @@ module TableStructure
       unless deprecated_options.empty?
         caller_location = caller_locations(1, 1)
         deprecated_options.keys.each do |k|
-          warn "[TableStructure] Specify :#{k} option on the writer or the iterator. #{caller_location}"
+          warn "[TableStructure] Specify :#{k} option on Writer or Iterator. #{caller_location}"
         end
       end
 
@@ -96,9 +96,8 @@ module TableStructure
         )
     end
 
-    # TODO: Specify options using keyword arguments.
-    def create_table(**options)
-      options = @_definition_.options.merge(options)
+    def create_table(row_type: :array, **deprecated_options)
+      options = @_definition_.options.merge(deprecated_options)
 
       if options.key?(:result_type)
         warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
@@ -134,7 +133,7 @@ module TableStructure
         .extend_methods_for(table, **column_converters_options)
 
       row_builders_options = {
-        row_type: options[:row_type]
+        row_type: options[:row_type] || row_type
       }
 
       @_definition_

data/lib/table_structure/table/iterator.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module TableStructure
+  module Table
+    class Iterator
+      def initialize(table, header: { context: nil })
+        @table = table
+        @header_options = header
+      end
+
+      def iterate(items)
+        ::Enumerator.new do |y|
+          if @header_options
+            header_context = @header_options.is_a?(Hash) ? @header_options[:context] : nil
+            y << @table.header(context: header_context)
+          end
+          @table
+            .body(items)
+            .each { |row| y << row }
+        end
+      end
+    end
+  end
+end

data/lib/table_structure/version.rb

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

data/lib/table_structure/writer.rb

@@ -2,37 +2,88 @@
 
 module TableStructure
   class Writer
-    DEFAULT_OPTIONS = {
+    def initialize(
+      schema,
       header_omitted: false,
       header_context: nil,
-      method: :<<
-    }.freeze
+      method: :<<,
+      row_type: :array,
+      **deprecated_options
+    )
+      if deprecated_options.key?(:result_type)
+        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
+        row_type = deprecated_options[:result_type]
+      end
 
-    def initialize(schema, **options)
       @schema = schema
-      @options = DEFAULT_OPTIONS.merge(options)
+      @options = {
+        header_omitted: header_omitted,
+        header_context: header_context,
+        method: method,
+        row_type: row_type
+      }
     end
 
-    def write(items, to:, **options)
-      options = @options.merge(options)
-      @schema.create_table(**options) do |table|
-        unless options[:header_omitted]
-          header = table.header(
-            context: options[:header_context]
-          )
-          header = yield header if block_given?
-          to.send(options[:method], header)
+    def write(
+      items,
+      to:,
+      method: @options[:method],
+      header_omitted: @options[:header_omitted],
+      header_context: @options[:header_context],
+      row_type: @options[:row_type],
+      **deprecated_options,
+      &block
+    )
+      if deprecated_options.key?(:result_type)
+        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
+        row_type = deprecated_options[:result_type]
+      end
+
+      items = enumerize(items)
+
+      header_options =
+        if header_omitted
+          false
+        else
+          { context: header_context }
         end
-        table.body(enumerize(items)).each do |row|
-          row = yield row if block_given?
-          to.send(options[:method], row)
+
+      @schema.create_table(row_type: row_type) do |table|
+        output = Output.new(to, method: method)
+
+        enum =
+          Table::Iterator
+          .new(
+            table,
+            header: header_options
+          )
+          .iterate(items)
+
+        if block_given?
+          enum =
+            enum
+            .lazy
+            .map { |row| block.call(row) }
         end
+
+        enum.each { |row| output.write(row) }
       end
       nil
     end
 
     private
 
+    class Output
+      def initialize(output, method: :<<)
+        @output = output
+        @method = method
+      end
+
+      def write(values)
+        @output.send(@method, values)
+      end
+    end
+
     def enumerize(items)
       if items.respond_to?(:each)
         items

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/table_structure/schema/row_builders.rb
 - lib/table_structure/schema/table.rb
 - lib/table_structure/schema/utils.rb
+- lib/table_structure/table/iterator.rb
 - lib/table_structure/version.rb
 - lib/table_structure/writer.rb
 - table_structure.gemspec