table_structure 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77197fdbfa164e9f532b190b4e94750354595f9e51d155b91ed36ea2f43aeef2
-  data.tar.gz: 52ab0ab962584d0d7e8e10788a6c949369926ec8869577e797a462e90eb76487
+  metadata.gz: c8794a66493988290a6ddeea36604322559a519ba3f0f261af4243fd56687663
+  data.tar.gz: 57f9279940767cc9c0612a9ffda469711ac070d086a8780aeef4a23c8dafef7d
 SHA512:
-  metadata.gz: 99774b00f0260b64ed8a3ea670cf24d79e222c8b75fab7545932fbb248516561078f2908a081bae925e7baf44502d115711974d5b7458937e6db1e0961be0152
-  data.tar.gz: ca70303e5f5ec9ae437e9dccd9554b027c48aa68b7cb9c0f0239f6fa1ca0259321c9ea942310ac7a320e8d80ef6b996ef02a1cfb5ac0afa3a317534b351ecd85
+  metadata.gz: e906e4e3bdb277218db13fc90b028470f794ae9f346de456a84c524219aeaf63a184d9a8e4802ed3cc0dab55f7891fe0b6a5012144b236d6da1f3a02c3abebe0
+  data.tar.gz: c68e1178bce24e496b77ab1b3cb3674120129b86b1e352ef6233f29504b11e7355d93a4975c3e3445fd88e03ed19ac1bf05f4f86dc38331a8e256a2d273356f2

data/.travis.yml

@@ -8,4 +8,4 @@ rvm:
   - 2.5
   - 2.4
   - 2.3
-before_install: gem install bundler:2.1.1
+before_install: gem install bundler:2.1.2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.3.16
+Changes:
+- `TableStructure::Schema`
+  - Enable to add definitions in a block when initializing the schema.
+  - Add `merge` class method.
+  - Change `+` class method not to overwrite the definitions (`column_converter`, `context_builder`) by the last one with the same name. If you expect the same behavior as before, use `merge` instead.
+
 # 0.3.15
 Changes:
 - `TableStructure::Schema`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_structure (0.3.15)
+    table_structure (0.3.16)
 
 GEM
   remote: https://rubygems.org/
@@ -32,4 +32,4 @@ DEPENDENCIES
   table_structure!
 
 BUNDLED WITH
-   2.1.1
+   2.1.2

data/README.md

@@ -268,7 +268,24 @@ context = { pet_num: 0 }
 schema = SampleTableSchema.new(context: context, nil_definitions_ignored: true)
 ```
 
-You can also nest schemas.
+You can add definitions when initializing the schema.
+```ruby
+class UserTableSchema
+  include TableStructure::Schema
+
+  column  name: 'ID',
+          value: ->(row, _table) { row[:id] }
+
+  column  name: 'Name',
+          value: ->(row, *) { row[:name] }
+end
+
+schema = UserTableSchema.new do
+  column_converter :to_s, ->(val, *) { val.to_s }
+end
+```
+
+You can also nest the schemas.
 ```ruby
 class PetTableSchema
   include TableStructure::Schema
@@ -290,7 +307,7 @@ class QuestionTableSchema
   }
 end
 
-class SampleTableSchema
+class UserTableSchema
   include TableStructure::Schema
 
   column  name: 'ID',
@@ -316,11 +333,17 @@ context = {
   ]
 }
 
-schema = SampleTableSchema.new(context: context)
+schema = UserTableSchema.new(context: context)
 ```
 
-You can also concatenate schemas.
-If there are some definitions of `column_converter` with the same name in the schemas to be concatenated, the one in the schema that is concatenated last will be used.
+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` or `context_builder` works only to columns in the schema that they was defined.
+- `merge`
+  - If there are some definitions of `column_converter` or `context_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
   include TableStructure::Schema
@@ -338,7 +361,7 @@ class PetTableSchema
   columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
           value: ->(row, *) { row[:pets] }
 
-  column_converter :same_name, ->(val, *) { 'This definition will not be used.' }
+  column_converter :same_name, ->(val, *) { "pet: #{val}" }
 end
 
 class QuestionTableSchema
@@ -353,7 +376,7 @@ class QuestionTableSchema
     end
   }
 
-  column_converter :same_name, ->(val, *) { 'This definition will be used.' }
+  column_converter :same_name, ->(val, *) { "question: #{val}" }
 end
 
 context = {
@@ -364,7 +387,9 @@ context = {
   ]
 }
 
-schema = (UserTableSchema + PetTableSchema + QuestionTableSchema).new(context: context)
+concatenated_schema = (UserTableSchema + PetTableSchema + QuestionTableSchema).new(context: context)
+
+merged_schema = UserTableSchema.merge(PetTableSchema, QuestionTableSchema).new(context: context)
 ```
 
 You can also use `context_builder`.
@@ -404,7 +429,7 @@ class SampleTableSchema
 end
 ```
 
-If you want to convert CSV character code, you can do so within block of `write` method.
+If you want to convert CSV character code, you can do so in a 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/schema/class_methods.rb

@@ -3,30 +3,48 @@
 module TableStructure
   module Schema
     module ClassMethods
-      def +(schema)
-        self_schema = self
-        Class.new do
-          include ::TableStructure::Schema
+      def +(other)
+        unless ::TableStructure::Schema::Utils.schema_class?(other)
+          raise ::TableStructure::Error, "Must be a schema class. #{other}"
+        end
+
+        self_class = self
+
+        ::TableStructure::Schema.create_class do
+          columns self_class
+          columns other
+        end
+      end
+
+      def merge(*others)
+        others.each do |other|
+          unless ::TableStructure::Schema::Utils.schema_class?(other)
+            raise ::TableStructure::Error, "Must be a schema class. #{other}"
+          end
+        end
+
+        schema_classes = [self, *others]
 
-          @__column_definitions__ = [
-            self_schema.column_definitions,
-            schema.column_definitions
-          ].flatten
+        ::TableStructure::Schema.create_class do
+          @__column_definitions__ =
+            schema_classes
+            .map(&:column_definitions)
+            .flatten
 
           @__context_builders__ =
-            {}
-            .merge!(self_schema.context_builders)
-            .merge!(schema.context_builders)
+            schema_classes
+            .map(&:context_builders)
+            .reduce({}, &:merge!)
 
           @__column_converters__ =
-            {}
-            .merge!(self_schema.column_converters)
-            .merge!(schema.column_converters)
+            schema_classes
+            .map(&:column_converters)
+            .reduce({}, &:merge!)
 
           @__result_builders__ =
-            {}
-            .merge!(self_schema.result_builders)
-            .merge!(schema.result_builders)
+            schema_classes
+            .map(&:result_builders)
+            .reduce({}, &:merge!)
         end
       end
     end

data/lib/table_structure/schema.rb

@@ -11,6 +11,16 @@ module TableStructure
       klass.extend(ClassMethods)
     end
 
+    def self.create_class(&block)
+      raise ::TableStructure::Error, 'No block given.' unless block
+
+      schema_module = self
+      Class.new do
+        include schema_module
+        class_eval(&block)
+      end
+    end
+
     Definition = Struct.new(
       'Definition',
       :name,
@@ -30,7 +40,8 @@ module TableStructure
       key_prefix: nil,
       key_suffix: nil,
       nil_definitions_ignored: false,
-      **deprecated_options
+      **deprecated_options,
+      &block
     )
       unless deprecated_options.empty?
         caller_location = caller_locations(1, 1)
@@ -47,12 +58,30 @@ module TableStructure
         nil_definitions_ignored: nil_definitions_ignored
       }.merge!(self.class.options).merge!(deprecated_options)
 
-      context_builders = ContextBuilders.new({}.merge!(self.class.context_builders))
-      column_converters = ColumnConverters.new({}.merge!(self.class.column_converters))
-      result_builders = ResultBuilders.new({}.merge!(self.class.result_builders))
+      schema_classes = [self.class]
 
-      context = context_builders.build_for_table(context)
-      columns = Column::Factory.create(name, self.class.column_definitions, context, options)
+      if block_given?
+        schema_classes << ::TableStructure::Schema.create_class(&block)
+      end
+
+      context_builders = ContextBuilders.new(
+        schema_classes.map(&:context_builders).reduce({}, &:merge!)
+      )
+
+      column_converters = ColumnConverters.new(
+        schema_classes.map(&:column_converters).reduce({}, &:merge!)
+      )
+
+      result_builders = ResultBuilders.new(
+        schema_classes.map(&:result_builders).reduce({}, &:merge!)
+      )
+
+      columns = Column::Factory.create(
+        name,
+        schema_classes.map(&:column_definitions).reduce([], &:concat),
+        context_builders.build_for_table(context),
+        options
+      )
 
       @_definition_ =
         Definition.new(

data/lib/table_structure/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2019-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler