table_structure 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea80d58dcf58000e510c71d8eac9960ccb469256df07144c9e7845aec32512aa
-  data.tar.gz: 2ae14c91013b1cd2b84e177f3fd7ebb6948775230f019c5ca3f3c3677b892b33
+  metadata.gz: 8bffa1aa49a812a2f4c1998aac9a297eeabe871a0c49376da090546da3a47a2d
+  data.tar.gz: 8bd2243648e9c2768339813f407e81cf2a94bd5e858349f9de0eaeb52acb6bfc
 SHA512:
-  metadata.gz: 60a40d43594078d7d480e518a2e144d4fda1612ee07b3707e21646ea3f7785ac055de4e9b82509190fe22735c0fb887ee94b74a61536ec7adb102730a7fad28a
-  data.tar.gz: 49d45d82eb9cac83caaac09d1494b8957ac56683cf21a3f11b7f01600b4e0a2174207043ee651f8ce3464f4b0474b5130962690a671977eb55a4efc9d15b892a
+  metadata.gz: 523e57f201c4aad11b038156676fa3c0c8835248366a7bb49929dc580265001f73c4a858049e972a782bf99d7f0a664407a6e258bdf94c616225b633c5d3461c
+  data.tar.gz: e3620fdee15c2bdb77d22224426d31c83349ba469f386681926d58963d5ee986b50b98b527cbc7d23e74edd8fba0891d8db2dd9ec7e256e7421cfdae890bf224

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+# 0.4.1
+Changes:
+- `TableStructure::Iterator`
+- `TableStructure::Writer`
+- `TableStructure::CSV::Writer`
+  - Add `header: { step: n }` option. Header rows are output at intervals of step number.
+    - e.g. `TableStructure::Iterator.new(schema, header: { step: 10 })`
+
 # 0.4.0
 Changes:
 - Remove deprecated methods, arguments and options.
-- It is recommended that you update to 0.3.23 first. if you get warnings or errors, fix them and then update to 0.4.0.
+- It is recommended that you update to `0.3.23` first. If you get warnings or errors, fix them and then update to `0.4.0`.
 
 # 0.3.23
 Changes:

data/Gemfile.lock

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

data/lib/table_structure.rb

@@ -30,7 +30,6 @@ module TableStructure
   require 'table_structure/table/column_converter'
   require 'table_structure/table/context_builder'
   require 'table_structure/table/row_builder'
-  require 'table_structure/table/iterator'
   require 'table_structure/writer'
   require 'table_structure/csv/writer'
   require 'table_structure/iterator'

data/lib/table_structure/csv/writer.rb

@@ -9,7 +9,7 @@ module TableStructure
         schema,
         bom: false,
         csv_options: {},
-        header: { context: nil }
+        header: { context: nil, step: nil }
       )
         require 'csv'
 

data/lib/table_structure/iterator.rb

@@ -2,16 +2,26 @@
 
 module TableStructure
   class Iterator
+    class HeaderOptions
+      attr_reader :enabled, :context, :step
+      alias enabled? enabled
+
+      def initialize(options)
+        @enabled = !!options
+        if options.is_a?(Hash)
+          @context = options[:context]
+          @step = options[:step]
+        end
+      end
+    end
+
     def initialize(
       schema,
-      header: { context: nil },
+      header: { context: nil, step: nil },
       row_type: :array
     )
-      @schema = schema
-      @options = {
-        header: header,
-        row_type: row_type
-      }
+      @table = Table.new(schema, row_type: row_type)
+      @header_options = HeaderOptions.new(header)
     end
 
     def iterate(items, &block)
@@ -19,22 +29,29 @@ module TableStructure
         raise ::TableStructure::Error, "Must be enumerable. #{items}"
       end
 
-      enum =
-        Table::Iterator
-        .new(
-          Table.new(@schema, row_type: @options[:row_type]),
-          header: @options[:header]
-        )
-        .iterate(items)
-
-      if block_given?
-        enum =
-          enum
-          .lazy
-          .map { |row| block.call(row) }
+      table_enum = ::Enumerator.new do |y|
+        body_enum = @table.body(items)
+
+        if @header_options.enabled?
+          header_row = @table.header(context: @header_options.context)
+          y << header_row
+
+          if @header_options.step&.positive?
+            loop do
+              @header_options.step.times { y << body_enum.next }
+              y << header_row
+            end
+          else
+            body_enum.each { |row| y << row }
+          end
+        else
+          body_enum.each { |row| y << row }
+        end
       end
 
-      enum
+      table_enum = table_enum.lazy.map(&block) if block_given?
+
+      table_enum
     end
   end
 end

data/lib/table_structure/version.rb

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

data/lib/table_structure/writer.rb

@@ -4,7 +4,7 @@ module TableStructure
   class Writer
     def initialize(
       schema,
-      header: { context: nil },
+      header: { context: nil, step: nil },
       method: :<<,
       row_type: :array
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,6 @@ files:
 - lib/table_structure/table.rb
 - lib/table_structure/table/column_converter.rb
 - lib/table_structure/table/context_builder.rb
-- lib/table_structure/table/iterator.rb
 - lib/table_structure/table/row_builder.rb
 - lib/table_structure/version.rb
 - lib/table_structure/writer.rb

data/lib/table_structure/table/iterator.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module TableStructure
-  class Table::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