table_structure 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b675232423fea16fcc7aaaeae505f782fd8db4371065e242eb794eeed07b0c9
-  data.tar.gz: c8f02884ae3ad9e768fde5253f9023299bd9967cb8b49406799a6f467ce1de17
+  metadata.gz: 5e9bf971b78fd68cbce2023d18033fcd397b1be4de329a5ba616df1c77baa62c
+  data.tar.gz: ad9e3d5a67d51239038d7fd711602fc4b518188adfd5fd5d1b1a67c3c3e703cd
 SHA512:
-  metadata.gz: 537a05a78c42d4250d5c64d51b839c9abfb16ee0055d2fdc2f59fb36e70d38f0a406d549c6d2ad00634a80812c2f9673064659829263cdb682e84c2ff5456429
-  data.tar.gz: e58886afb4755ef78a6520e7d4e07d941a4c5bc0c419fbe4e9f0bfd0739ed8005278a32bcb958c0284ae1e84d2dfcdca53db9d5b5c826682e367412a33c951ef
+  metadata.gz: b5f93b81fcff429a3899be7ce8e6a0b67bd638cfefea73e425097a08fcc5ddccee031c4f9c112c491cd4cf2dc1e761e3deaefbc1ba12bbab80a5b6ad37c88946
+  data.tar.gz: 36b8fa006be7530c21c747dc4c931e662161f60eac6e3c8b8a5dabe429c5bd5ce7bd8837dee05311fcba9f7b8e95fd4305be798e71ed38f5a512b459d3d535d8

data/CHANGELOG.md

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

data/Gemfile.lock

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

data/README.md

@@ -98,6 +98,7 @@ items = [
 ]
 
 ## When using `find_each` method of Rails
+# items = Item.enum_for(:find_each)
 # items = Enumerator.new { |y| Item.find_each { |item| y << item } }
 
 table = []
@@ -183,9 +184,6 @@ context = {
 
 schema = SampleTableSchema.new(context: context)
 iterator = TableStructure::Iterator.new(schema, result_type: :hash, header_omitted: true)
-## or
-# writer = TableStructure::Writer.new(schema, result_type: :hash, header_omitted: true)
-# iterator = TableStructure::Iterator.new(writer)
 ```
 
 Enumerate the items converted by the schema:
@@ -242,6 +240,33 @@ context = { admin: true }
 schema = SampleTableSchema.new(context: context)
 ```
 
+You can also omit columns by specifying `nil_definitions_ignored: true`.
+If this option is set to `true` and `column(s)` difinition returns `nil`, the difinition is ignored.
+```ruby
+class SampleTableSchema
+  include TableStructure::Schema
+
+  column  name: 'ID',
+          value: ->(row, *) { row[:id] }
+
+  column  name: 'Name',
+          value: ->(row, *) { row[:name] }
+
+  columns ->(table) {
+    if table[:pet_num].positive?
+      {
+        name: (1..table[:pet_num]).map { |num| "Pet #{num}" },
+        value: ->(row, *) { row[:pets] }
+      }
+    end
+  }
+end
+
+context = { pet_num: 0 }
+
+schema = SampleTableSchema.new(context: context, nil_definitions_ignored: true)
+```
+
 You can also nest schemas.
 ```ruby
 class PetTableSchema
@@ -340,13 +365,28 @@ end
 ```
 
 You can also use only `TableStructure::Schema`.
-```ruby
-schema = SampleTableSchema.new
-table = schema.create_table(result_type: :hash)
-header = table.header
-items.each do |item|
-  row = table.row(context: item)
-end
+```erb
+<% @schema.create_table(result_type: :array) do |table| %>
+  <table>
+    <thead>
+      <tr>
+        <% table.header.each do |val| %>
+          <th><%= val %></th>
+        <% end %>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% table.rows(@items).each do |row| %>
+        <tr>
+          <% row.each do |val| %>
+            <td><%= val %></td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>
 ```
 
 ## Contributing

data/lib/table_structure/schema.rb

@@ -1,7 +1,11 @@
 # frozen_string_literal: true
 
+require 'forwardable'
+
 module TableStructure
   module Schema
+    extend Forwardable
+
     def self.included(klass)
       klass.extend(DSL::ColumnConverter)
       klass.extend(DSL::ColumnDefinition)
@@ -18,6 +22,8 @@ module TableStructure
       nil_definitions_ignored: false
     }.freeze
 
+    def_delegators :@table_structure_schema_definition_, :create_table
+
     def initialize(context: nil, name: self.class.name, **options)
       column_definitions = [].concat(self.class.column_definitions)
       context_builders = {}.merge!(self.class.context_builders)
@@ -35,9 +41,5 @@ module TableStructure
           options
         )
     end
-
-    def create_table(**options)
-      @table_structure_schema_definition_.create_table(options)
-    end
   end
 end

data/lib/table_structure/schema/definition.rb

@@ -37,7 +37,11 @@ module TableStructure
         @column_converters.extend_methods_for(table)
         @result_builders.extend_methods_for(table)
 
-        table
+        if block_given?
+          yield table
+        else
+          table
+        end
       end
 
       private

data/lib/table_structure/schema/table.rb

@@ -25,6 +25,12 @@ module TableStructure
         values(:value, context)
       end
 
+      def rows(items)
+        Enumerator.new do |y|
+          items.each { |item| y << row(context: item) }
+        end
+      end
+
       private
 
       def keys

data/lib/table_structure/version.rb

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

data/lib/table_structure/writer.rb

@@ -15,18 +15,18 @@ module TableStructure
 
     def write(items, to:, **options)
       options = @options.merge(options)
-      table = @schema.create_table(options)
-      unless options[:header_omitted]
-        header = table.header(
-          context: options[:header_context]
-        )
-        header = yield header if block_given?
-        to.send(options[:method], header)
-      end
-      enumerize(items).each do |item|
-        row = table.row(context: item)
-        row = yield row if block_given?
-        to.send(options[:method], row)
+      @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)
+        end
+        table.rows(enumerize(items)).each do |row|
+          row = yield row if block_given?
+          to.send(options[:method], row)
+        end
       end
       nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2019-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler