table_structure 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e966906136bf9907efb5bf1ad6fc1f2181ded3e4c6bbd6f76c19750198ecadd
-  data.tar.gz: c1f11210056449c18d31c693e758872659d603b1e9d1a28013cf0e35baff8776
+  metadata.gz: f880b928161f99c6d4346f06304cb9cfe4a1c44f8ffb307243a70d74ec5e400d
+  data.tar.gz: 9d1a30376429abe0906e3e0879eb230e4daf51c5c7de87cf28b63673433df83e
 SHA512:
-  metadata.gz: a98e9de6bd5d32941ee5730a8f34294d459a04ebc5e22a547887225421f7f91fcbbce59b026c6af5a96fa6215e38f0be6ed03b6155e04365418576f982d15873
-  data.tar.gz: b57d5dc8e40f0937ea14c06c08fb54d720bbd3215186b9357fc0f9f28705ea905938f238157999ecb62221ae84fd41d28872c63653557919b2be92a2162bc468
+  metadata.gz: 3b5ee4c95815cb891a25ac377ec72359d70394da3ea1aaf58ea71f77618ffaaa8a5443fff95366ab0ca8ecccd871aa33bafbbe134ccb8109645146392dcbc4fa
+  data.tar.gz: 422e6db13c3940bdf873535c1f02d3f32211cca6a81ced5d1aebf678504f14daeda50c8de46d47762be33fcad79f90cb924d6d175a3a19c2029406d02d5a5a43

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.3.1
+Changes:
+- `TableStructure::Schema`
+  - Make `:result_type` option available for `TableStructure::Write` and `TableStructure::Iterator`.
+    - `:result_type` option for `TableStructure::Schema` is deprecated.
+
 # 0.3.0
 Changes:
 - `TableStructure::Schema`

data/Gemfile.lock

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

data/README.md

@@ -147,10 +147,10 @@ context = {
   ]
 }
 
-schema = SampleTableSchema.new(context: context, result_type: :hash) # default is :array
-iterator = TableStructure::Iterator.new(schema, header_omitted: true)
+schema = SampleTableSchema.new(context: context)
+iterator = TableStructure::Iterator.new(schema, result_type: :hash, header_omitted: true)
 ## or
-# writer = TableStructure::Writer.new(schema, header_omitted: true)
+# writer = TableStructure::Writer.new(schema, result_type: :hash, header_omitted: true)
 # iterator = TableStructure::Iterator.new(writer)
 
 items = [
@@ -293,7 +293,7 @@ class SampleTableSchema
 end
 ```
 
-If you want to convert CSV character code, you do so within block of `write` method.
+If you want to convert CSV character code, you can do so within block of `write` method.
 ```ruby
 File.open('sample.csv', 'w') do |f|
   writer.write(items, to: CSV.new(f)) do |row_values|

data/lib/table_structure/iterator.rb

@@ -13,8 +13,8 @@ module TableStructure
       end
     end
 
-    def iterate(items)
-      Enumerator.new { |y| @writer.write(items, to: y) }
+    def iterate(items, **options)
+      Enumerator.new { |y| @writer.write(items, to: y, **options) }
     end
   end
 end

data/lib/table_structure/schema/definition.rb

@@ -37,9 +37,10 @@ module TableStructure
                   definition
                 elsif Utils.schema_instance?(definition)
                   definition
-                # elsif Utils.schema_class?(definition)
-                #   # TODO: This doesn't work as expected when result_type: :hash is specified.
-                #   definition.new(context: context, **@options)
+                elsif Utils.schema_class?(definition)
+                  definition.new(context: context)
+                else
+                  raise Error.new('Invalid definition.', i)
                 end
               end
           end

data/lib/table_structure/schema/table.rb

@@ -3,26 +3,30 @@
 module TableStructure
   module Schema
     class Table
-      attr_reader :columns, :column_converters, :result_builders
+      RESULT_BUILDERS = {
+        hash: ->(values, keys, *) { keys.zip(values).to_h }
+      }.freeze
+
+      attr_reader :columns, :column_converters, :result_builders, :options
 
       def initialize(column_definitions, column_converters, result_builders, context, options)
         @columns = build_columns(column_definitions, context, options)
-        @column_converters = default_column_converters.merge(column_converters)
-        @result_builders = default_result_builders(options).merge(result_builders)
+        @column_converters = column_converters
+        @result_builders = result_builders
         @context = context
         @options = options
       end
 
-      def header_values(context)
-        values(:name, context)
+      def header_values(context, result_type = nil) # TODO
+        values(:name, result_type, context)
       end
 
-      def row_values(context)
-        values(:value, context)
+      def row_values(context, result_type = nil) # TODO
+        values(:value, result_type, context)
       end
 
       def keys
-        @columns.map(&:key).flatten
+        @keys ||= @columns.map(&:key).flatten
       end
 
       private
@@ -34,28 +38,23 @@ module TableStructure
           .map { |definition| Column.create(definition, options) }
       end
 
-      def default_column_converters
-        {}
-      end
-
-      def default_result_builders(options)
-        result_builders = {}
-        if options[:result_type] == :hash
-          result_builders[:to_h] = ->(array, *) { (@keys ||= keys).zip(array).to_h }
-        end
-        result_builders
-      end
-
-      def values(method, context)
-        columns = @columns
-                  .map { |column| column.send(method, context, @context) }
-                  .flatten
-                  .map { |val| reduce_callables(@column_converters, val, context) }
-        reduce_callables(@result_builders, columns, context)
-      end
-
-      def reduce_callables(callables, val, context)
-        callables.reduce(val) { |val, (_, callable)| callable.call(val, context, @context) }
+      def values(method, result_type, context)
+        columns =
+          @columns
+          .map { |column| column.send(method, context, @context) }
+          .flatten
+          .map do |val|
+            @column_converters.reduce(val) do |val, (_, column_converter)|
+              column_converter.call(val, context, @context)
+            end
+          end
+
+        RESULT_BUILDERS
+          .select { |k, _v| k == result_type }
+          .merge(@result_builders)
+          .reduce(columns) do |columns, (_, result_builder)|
+            result_builder.call(columns, keys, context, @context)
+          end
       end
     end
   end

data/lib/table_structure/schema.rb

@@ -11,7 +11,7 @@ module TableStructure
     end
 
     DEFAULT_OPTIONS = {
-      result_type: :array,
+      result_type: :array, # deprecated: Change to pass as argument of method.
       key_prefix: nil,
       key_suffix: nil
     }.freeze
@@ -32,14 +32,18 @@ module TableStructure
         )
     end
 
-    def header(context: nil)
+    def header(context: nil, result_type: nil)
+      # TODO
+      result_type ||= @table_structure_schema_table_.options[:result_type]
       context = self.class.context_builders[:header].call(context)
-      @table_structure_schema_table_.header_values(context)
+      @table_structure_schema_table_.header_values(context, result_type)
     end
 
-    def row(context: nil)
+    def row(context: nil, result_type: nil)
+      # TODO
+      result_type ||= @table_structure_schema_table_.options[:result_type]
       context = self.class.context_builders[:row].call(context)
-      @table_structure_schema_table_.row_values(context)
+      @table_structure_schema_table_.row_values(context, result_type)
     end
 
     def column_converters

data/lib/table_structure/version.rb

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

data/lib/table_structure/writer.rb

@@ -5,6 +5,7 @@ module TableStructure
     DEFAULT_OPTIONS = {
       header_omitted: false,
       header_context: nil,
+      result_type: nil, # TODO: :array
       method: :<<
     }.freeze
 
@@ -16,12 +17,18 @@ module TableStructure
     def write(items, to:, **options)
       options = @options.merge(options)
       unless options[:header_omitted]
-        header = @schema.header(context: options[:header_context])
+        header = @schema.header(
+          context: options[:header_context],
+          result_type: options[:result_type]
+        )
         header = yield header if block_given?
         to.send(options[:method], header)
       end
       enumerize(items).each do |item|
-        row = @schema.row(context: item)
+        row = @schema.row(
+          context: item,
+          result_type: options[:result_type]
+        )
         row = yield row if block_given?
         to.send(options[:method], row)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Creates and outputs table structured data.