table_structure 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f36abaa1bc4478901ea51a27e0e22b00ecf70ecbfd18b4c785c2e86e08ca1d
-  data.tar.gz: 26990e2f8ac30764a3d571dbf8a35e422ce163989f9eda5e92aa3c2b9e5cf498
+  metadata.gz: bebf267d2cae044dd2f493b213950954c88b384d2b3e6dd15c09b7947b104eb7
+  data.tar.gz: cbe61559035246eb4dc80edf4e34b1b67a0e1f8db16749368e81d23e48bd2b81
 SHA512:
-  metadata.gz: 288ea6944e5efa303a3c39e4502dce7b0d2994504796a7de0b69b28d8b0cd91f878670db9846a51cbb57d16797bb8124e50f2162db00ec89b49d83de3a345030
-  data.tar.gz: 72d983aef1de40282befe38d230806b1fb3deec4ecf08801822867d43ea656a6a307ad53c46ae87f2661bcc90ef5c6f0b3d8c5ea515eb80ddeb78e559b552585
+  metadata.gz: cd6f1e4299eda55eb1959c38248911c9fc052dee5cb541cc3b1517cb00947f069e5896ca9d69e792fa2258f6bb636aaee251efedb11af96cd55241cf44ab3dd1
+  data.tar.gz: 0e52a02afa1dc1c669233edc2e900cdfae5e5085bd6138bd2055aa57f4fadfdf0c587228f5eb560b5ba857555d34bbdc4477c1128fd193f144625e8f099a2cf7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.3
+Changes:
+- `TableStructure::Schema`
+  - Change to be able to use a block with `columns` DSL.
+
 # 0.4.2
 Changes:
 - `TableStructure::Schema`

data/Gemfile.lock

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

data/README.md

@@ -44,19 +44,19 @@ class SampleTableSchema
   column  name: 'Name',
           value: ->(row, *) { row[:name] }
 
-  columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
+  column  name: ['Pet 1', 'Pet 2', 'Pet 3'],
           value: ->(row, *) { row[:pets] }
 
-  columns ->(table) {
+  columns do |table|
     table[:questions].map do |question|
       {
         name: question[:id],
         value: ->(row, *) { row[:answers][question[:id]] }
       }
     end
-  }
+  end
 
-  column_converter :to_s do |val, _row, _table|
+  column_builder :to_s do |val, _row, _table|
     val.to_s
   end
 end
@@ -159,7 +159,6 @@ Define a schema:
 class SampleTableSchema
   include TableStructure::Schema
 
-  # If `:header` is set to `false`, `:name` is optional.
   column  name: 'ID',
           key: :id,
           value: ->(row, *) { row[:id] }
@@ -168,11 +167,11 @@ class SampleTableSchema
           key: :name,
           value: ->(row, *) { row[:name] }
 
-  columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
+  column  name: ['Pet 1', 'Pet 2', 'Pet 3'],
           key: %i[pet1 pet2 pet3],
           value: ->(row, *) { row[:pets] }
 
-  columns ->(table) {
+  columns do |table|
     table[:questions].map do |question|
       {
         name: question[:id],
@@ -180,7 +179,7 @@ class SampleTableSchema
         value: ->(row, *) { row[:answers][question[:id]] }
       }
     end
-  }
+  end
 end
 ```
 
@@ -275,7 +274,7 @@ class UserTableSchema
 end
 
 schema = UserTableSchema.new do
-  column_converter :to_s do |val, *|
+  column_builder :to_s do |val|
     val.to_s
   end
 end
@@ -314,14 +313,14 @@ class SampleTableSchema
   column  name: 'Name',
           value: ->(row, *) { row[:name] }
 
-  columns ->(table) {
+  columns do |table|
     if table[:pet_num].positive?
       {
         name: (1..table[:pet_num]).map { |num| "Pet #{num}" },
         value: ->(row, *) { row[:pets] }
       }
     end
-  }
+  end
 end
 
 context = { pet_num: 0 }
@@ -346,7 +345,7 @@ class SampleTableSchema
     TableContext.new(**context)
   end
 
-  context_builder :row, :value do |context|
+  context_builder :row do |context|
     RowContext.new(**context)
   end
 
@@ -356,17 +355,17 @@ class SampleTableSchema
   column  name: 'Name',
           value: ->(row, *) { row.name }
 
-  columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
+  column  name: ['Pet 1', 'Pet 2', 'Pet 3'],
           value: ->(row, *) { row.increase_pets }
 
-  columns ->(table) {
+  columns do |table|
     table.questions.map do |question|
       {
         name: question[:id],
         value: ->(row, *) { row.answers[question[:id]] }
       }
     end
-  }
+  end
 end
 ```
 
@@ -392,13 +391,13 @@ class SampleTableSchema
 
   columns UserTableSchema
 
-  columns ->(table) {
+  columns do |table|
     UserTableSchema.new(context: table, name_prefix: 'Friend ', key_prefix: 'friend_') do
       context_builder :row do |context|
         context[:friend]
       end
     end
-  }
+  end
 end
 
 items = [
@@ -420,9 +419,9 @@ You can also concatenate or merge the schema classes.
 Both create a schema class, with a few differences.
 - `+`
   - Similar to nesting the schemas.
-    `column_converter` works only to columns in the schema that they was defined.
+    `column_builder` works only to columns in the schema that they was defined.
 - `merge`
-  - If there are some definitions of `column_converter` with the same name in the schemas to be merged, the one in the schema that is merged last will work to all columns.
+  - If there are some definitions of `column_builder` with the same name in the schemas to be merged, the one in the schema that is merged last will work to all columns.
 
 ```ruby
 class UserTableSchema
@@ -438,10 +437,10 @@ end
 class PetTableSchema
   include TableStructure::Schema
 
-  columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
+  column  name: ['Pet 1', 'Pet 2', 'Pet 3'],
           value: ->(row, *) { row[:pets] }
 
-  column_converter :same_name do |val, *|
+  column_builder :same_name do |val|
     "pet: #{val}"
   end
 end
@@ -449,16 +448,16 @@ end
 class QuestionTableSchema
   include TableStructure::Schema
 
-  columns ->(table) {
+  columns do |table|
     table[:questions].map do |question|
       {
         name: question[:id],
         value: ->(row, *) { row[:answers][question[:id]] }
       }
     end
-  }
+  end
 
-  column_converter :same_name do |val, *|
+  column_builder :same_name do |val|
     "question: #{val}"
   end
 end

data/lib/table_structure/schema/class_methods.rb

@@ -4,13 +4,11 @@ module TableStructure
   module Schema
     module ClassMethods
       def +(other)
-        unless ::TableStructure::Schema::Utils.schema_class?(other)
-          raise ::TableStructure::Error, "Must be a schema class. #{other}"
-        end
+        raise ::TableStructure::Error, "Must be a schema class. [#{other}]" unless Utils.schema_class?(other)
 
         self_class = self
 
-        ::TableStructure::Schema.create_class do
+        Schema.create_class do
           columns self_class
           columns other
         end
@@ -18,33 +16,16 @@ module TableStructure
 
       def merge(*others)
         others.each do |other|
-          unless ::TableStructure::Schema::Utils.schema_class?(other)
-            raise ::TableStructure::Error, "Must be a schema class. #{other}"
-          end
+          raise ::TableStructure::Error, "Must be a schema class. [#{other}]" unless Utils.schema_class?(other)
         end
 
-        schema_classes = [self, *others]
-
-        ::TableStructure::Schema.create_class do
-          @__column_definitions__ =
-            schema_classes
-            .map(&:column_definitions)
-            .flatten
-
-          @__context_builders__ =
-            schema_classes
-            .map(&:context_builders)
-            .reduce({}, &:merge!)
-
-          @__column_builders__ =
-            schema_classes
-            .map(&:column_builders)
-            .reduce({}, &:merge!)
+        schema_class = CompositeClass.new.compose(self, *others)
 
-          @__row_builders__ =
-            schema_classes
-            .map(&:row_builders)
-            .reduce({}, &:merge!)
+        Schema.create_class do
+          @__column_definitions__ = schema_class.column_definitions
+          @__context_builders__ = schema_class.context_builders
+          @__column_builders__ = schema_class.column_builders
+          @__row_builders__ = schema_class.row_builders
         end
       end
     end

data/lib/table_structure/schema/column_builder_factory.rb

@@ -18,7 +18,7 @@ module TableStructure
           optional_builders[:_name_prepender_] =
             ::TableStructure::Utils::TypedProc.new(
               types: :header
-            ) do |val, *|
+            ) do |val|
               val.nil? ? val : "#{name_prefix}#{val}"
             end
         end
@@ -27,7 +27,7 @@ module TableStructure
           optional_builders[:_name_appender_] =
             ::TableStructure::Utils::TypedProc.new(
               types: :header
-            ) do |val, *|
+            ) do |val|
               val.nil? ? val : "#{val}#{name_suffix}"
             end
         end

data/lib/table_structure/schema/composite_class.rb

@@ -15,7 +15,7 @@ module TableStructure
       def column_definitions
         @classes
           .map(&:column_definitions)
-          .reduce([], &:concat)
+          .flatten
       end
 
       def context_builders

data/lib/table_structure/schema/definition/columns/validator.rb

@@ -13,7 +13,7 @@ module TableStructure
           end
 
           def validate(name:, key:, size:, **)
-            raise Error.new('"key" must not be lambda.', @name, @index) if key.respond_to?(:call)
+            raise Error.new('"key" must not be callable.', @name, @index) if key.respond_to?(:call)
             if !key && name.respond_to?(:call) && !size
               raise Error.new('"size" must be defined, because column size cannot be determined.', @name, @index)
             end

data/lib/table_structure/schema/dsl/column_definition.rb

@@ -5,12 +5,22 @@ module TableStructure
     module DSL
       module ColumnDefinition
         def column(definition)
+          unless definition.is_a?(Hash)
+            warn "[TableStructure] Use `columns` instead of `column`.", uplevel: 1
+          end
           column_definitions << definition
           nil
         end
 
-        def columns(definition)
-          column(definition)
+        def columns(definition = nil, &block)
+          if definition.is_a?(Hash)
+            warn "[TableStructure] Use `column` instead of `columns`.", uplevel: 1
+          end
+          if Utils.callable?(definition)
+            warn "[TableStructure] Use `block` instead of `lambda` or `proc`.", uplevel: 1
+          end
+          column_definitions << (block || definition)
+          nil
         end
 
         def column_definitions

data/lib/table_structure/schema/row_context_builder_factory.rb

@@ -12,18 +12,14 @@ module TableStructure
         return unless @schema.contain_name_callable?
         return unless @builders.key?(:header)
 
-        proc do |context|
-          @builders[:header].call(context)
-        end
+        proc { |context| @builders[:header].call(context) }
       end
 
       def create_data_builder
         return unless @schema.contain_value_callable?
         return unless @builders.key?(:row)
 
-        proc do |context|
-          @builders[:row].call(context)
-        end
+        proc { |context| @builders[:row].call(context) }
       end
     end
   end

data/lib/table_structure/table.rb

@@ -5,7 +5,7 @@ module TableStructure
     DEFAULT_ROW_BUILDERS = {
       _to_hash_: Utils::TypedProc.new(
         types: :hash
-      ) do |values, keys, *|
+      ) do |values, keys|
         keys.map.with_index { |key, i| [key || i, values[i]] }.to_h
       end
     }.freeze

data/lib/table_structure/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-26 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler