table_structure 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ba1e6952eaa875b8f55c7b2af3f18fad6030c4cbbd8ae1caaec81ae20a1be3c
-  data.tar.gz: 53b87d0b36b8eada62c881e3e286396b4dc82afae9a713feccab2da1258dfbf2
+  metadata.gz: 0044f8cb21e559ae23eed1f0eb6f28c1b0bc9dab9ed804088d17ff85f4040a4f
+  data.tar.gz: 97ef79ee4a4d71d1b6c20e56841a5e450f116777050e285e17ba11c2ddd43f1b
 SHA512:
-  metadata.gz: 3c07d1f99a48b990fad463b4ab87a82f6ece8ad4e58eab86499a32266bc3580e6bbf9d83444956244f4c89e561998ae84c27441d7063efd46fd8b9daadcb6990
-  data.tar.gz: 8003a4609435158f876752ad1b42a7b3d00eab319a17f765234fafc105c7ccae9888eccc75a2382a80d641f0aa837bf950e45bb665aa35bf9a30e87d87ec73fd
+  metadata.gz: 8cff983c441e44cfb7d6d0fc525aeca0b210ea50806421b607d3b53c4c0947a04eca0030f6da6cfdb91e05975dc14cb8805d08b314d48b73ee3013b944d99ed0
+  data.tar.gz: 3310d0d8446fc608a2956d45fb6bea2e514a774f1f83e19b828cde4d11f2fc69d5ad9ff75546f811f3d5992f2e81bccf6dd2dfc4208b078095750162bc68d0ad

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 0.3.5
+Changes:
+- `TableStructure::Schema`
+  - Add following options:
+    - `:name_prefix`
+    - `:name_suffix`
+  - DSL
+    - `column_converter`
+      - Add `:header` and `:row` options.
+        - If `header: false`, the converter is not applied to header values.
+        - If `row: false`, the converter is not applied to row values.
+        - Both options default to true.
+
 # 0.3.4
 Changes:
 - `TableStructure::Writer`
@@ -30,11 +43,13 @@ Changes:
 # 0.3.0
 Changes:
 - `TableStructure::Schema`
-  - Add `:omitted` key for `column(s)` DSL.
-  - Support nested schema.
-  - Add following options for schema initialization:
+  - Add following options:
     - `:key_prefix`
     - `:key_suffix`
+  - DSL
+    - `column(s)`
+      - Add `:omitted` option.
+      - Support nested schema.
 
 # 0.2.0
 Changes:

data/Gemfile.lock

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

data/README.md

@@ -237,8 +237,12 @@ class SampleTableSchema
           value: ->(row, *) { row[:name] }
 
   columns ->(table) { PetsSchema.new(context: table) }
+  ## Same as above code
+  # columns PetsSchema
 
   columns ->(table) { QuestionsSchema.new(context: table) }
+  ## Same as above code.
+  # columns QuestionsSchema
 
   column_converter :to_s, ->(val, *) { val.to_s }
 end

data/lib/table_structure/schema/definition.rb

@@ -9,7 +9,7 @@ module TableStructure
         }
       }.freeze
 
-      attr_reader :columns, :options
+      attr_reader :options
 
       def initialize(
         name,
@@ -25,8 +25,10 @@ module TableStructure
 
         @name = name
         @columns = create_columns(name, column_definitions, context, options)
-        @context_builders = context_builders
-        @column_converters = column_converters
+        @header_context_builder = context_builders[:header]
+        @row_context_builder = context_builders[:row]
+        @header_converters = select_column_converters(:header, column_converters)
+        @row_converters = select_column_converters(:row, column_converters)
         @result_builders = result_builders
         @context = context
         @options = options
@@ -34,6 +36,10 @@ module TableStructure
 
       def create_table(result_type: :array, **options)
         options = @options.merge(options)
+
+        header_converters =
+          optional_header_converters(options).merge(@header_converters)
+
         result_builders =
           RESULT_BUILDERS
           .select { |k, _v| k == result_type }
@@ -41,8 +47,10 @@ module TableStructure
 
         Table.new(
           @columns,
-          @context_builders,
-          @column_converters,
+          @header_context_builder,
+          @row_context_builder,
+          header_converters,
+          @row_converters,
           result_builders,
           @context,
           options
@@ -57,6 +65,29 @@ module TableStructure
           .compile(context)
           .map { |definition| Column.create(definition, options) }
       end
+
+      def select_column_converters(type, column_converters)
+        column_converters
+          .select { |_k, v| v[:options][type] }
+          .map { |k, v| [k, v[:callable]] }
+          .to_h
+      end
+
+      def optional_header_converters(options)
+        converters = {}
+        if options[:name_prefix]
+          converters[:_prepend_prefix] = lambda { |val, *|
+            val.nil? ? val : "#{options[:name_prefix]}#{val}"
+          }
+        end
+        if options[:name_suffix]
+          converters[:_append_suffix] = lambda { |val, *|
+            val.nil? ? val : "#{val}#{options[:name_suffix]}"
+          }
+        end
+
+        converters
+      end
     end
   end
 end

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

@@ -4,8 +4,17 @@ module TableStructure
   module Schema
     module DSL
       module ColumnConverter
-        def column_converter(name, callable)
-          column_converters[name] = callable
+        DEFAULT_OPTIONS = {
+          header: true,
+          row: true
+        }.freeze
+
+        def column_converter(name, callable, **options)
+          options = DEFAULT_OPTIONS.merge(options)
+          column_converters[name] = {
+            callable: callable,
+            options: options
+          }
           nil
         end
 

data/lib/table_structure/schema/table.rb

@@ -3,20 +3,23 @@
 module TableStructure
   module Schema
     class Table
-      attr_reader :column_converters, :result_builders
+      attr_reader :header_converters, :row_converters, :result_builders
 
       def initialize(
         columns,
-        context_builders,
-        column_converters,
+        header_context_builder,
+        row_context_builder,
+        header_converters,
+        row_converters,
         result_builders,
         context,
         options
       )
         @columns = columns
-        @header_context_builder = context_builders[:header]
-        @row_context_builder = context_builders[:row]
-        @column_converters = column_converters
+        @header_context_builder = header_context_builder
+        @row_context_builder = row_context_builder
+        @header_converters = header_converters
+        @row_converters = row_converters
         @result_builders = result_builders
         @context = context
         @options = options
@@ -26,12 +29,12 @@ module TableStructure
         if @header_context_builder
           context = @header_context_builder.call(context)
         end
-        values(:name, context)
+        values(:name, context, @header_converters)
       end
 
       def row(context: nil)
         context = @row_context_builder.call(context) if @row_context_builder
-        values(:value, context)
+        values(:value, context, @row_converters)
       end
 
       private
@@ -63,14 +66,14 @@ module TableStructure
         @size ||= @columns.map(&:size).reduce(0) { |memo, size| memo + size }
       end
 
-      def values(method, context)
+      def values(method, context, converters)
         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)
+            converters.reduce(val) do |val, (_, converter)|
+              converter.call(val, context, @context)
             end
           end
 

data/lib/table_structure/schema.rb

@@ -11,6 +11,8 @@ module TableStructure
     end
 
     DEFAULT_OPTIONS = {
+      name_prefix: nil,
+      name_suffix: nil,
       key_prefix: nil,
       key_suffix: nil
     }.freeze

data/lib/table_structure/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler