table_structure 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0044f8cb21e559ae23eed1f0eb6f28c1b0bc9dab9ed804088d17ff85f4040a4f
-  data.tar.gz: 97ef79ee4a4d71d1b6c20e56841a5e450f116777050e285e17ba11c2ddd43f1b
+  metadata.gz: c4e634ccdf9dc91b29a3080cc07dec5c621df20819e36f11ed6de4f862e92c6b
+  data.tar.gz: ba5d565b93e427c146b2e9bbb1ef2c3260e10558b596e57bee45546774c970ce
 SHA512:
-  metadata.gz: 8cff983c441e44cfb7d6d0fc525aeca0b210ea50806421b607d3b53c4c0947a04eca0030f6da6cfdb91e05975dc14cb8805d08b314d48b73ee3013b944d99ed0
-  data.tar.gz: 3310d0d8446fc608a2956d45fb6bea2e514a774f1f83e19b828cde4d11f2fc69d5ad9ff75546f811f3d5992f2e81bccf6dd2dfc4208b078095750162bc68d0ad
+  metadata.gz: f7c7de8a1c0cac9520e794c7c28ee8e7a07dae95498800b075f23e147004b7d53e4031c09d8215570bd83e54c9588a976f078d8ff67028cbd8cbc9990d9227e6
+  data.tar.gz: 4c012c0c4818641483766febaebc65a3a53e9378fe3cb6e9a78f9cd0c28c396e5e77a00ed3bd888bc291991ea740da44e51db35381a2709ffd4f079962abe608

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.6
+Changes:
+- `TableStructure::Schema`
+  - Improve performance when `context_builder` is not defined.
+
 # 0.3.5
 Changes:
 - `TableStructure::Schema`
@@ -29,7 +34,7 @@ Changes:
 # 0.3.2
 Changes:
 - `TableStructure::Writer`
-  - When `result_type: :hash` option is specified and `column(s)` key of the schema is undefined, index number is used as the key.
+  - When `result_type: :hash` option is specified and `column(s)` `:key` of the schema is undefined, index number is used as the key.
 
 # 0.3.1
 Changes:
@@ -49,7 +54,7 @@ Changes:
   - DSL
     - `column(s)`
       - Add `:omitted` option.
-      - Support nested schema.
+      - Support nested schemas.
 
 # 0.2.0
 Changes:

data/Gemfile.lock

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

data/README.md

@@ -2,8 +2,12 @@
 
 [![Build Status](https://travis-ci.org/jsmmr/ruby_table_structure.svg?branch=master)](https://travis-ci.org/jsmmr/ruby_table_structure)
 
-`TableStructure` has two major functions.
-The functions are `TableStructure::Schema` that defines the schema of a table using DSL and ` TableStructure::Writer` that converts and outputs data with the schema.
+- `TableStructure::Schema`
+  - Defines columns of a table using DSL.
+- `TableStructure::Writer`
+  - Converts data with the schema, and outputs it.
+- `TableStructure::Iterator`
+  - Converts data with the schema, and enumerates it.
 
 ## Installation
 
@@ -132,7 +136,7 @@ class SampleTableSchema
     end
   }
 
-  ## When nesting schemas, same key must not exist in parent and child schemas.
+  ## When nesting schemas, :key must be unique in parent and child schemas.
   ## This can also be avoided by specifying :key_prefix or :key_suffix option.
   # columns ->(table) { NestedSchema.new(context: table, key_prefix: 'foo_', key_suffix: '_bar') }
 
@@ -237,11 +241,11 @@ class SampleTableSchema
           value: ->(row, *) { row[:name] }
 
   columns ->(table) { PetsSchema.new(context: table) }
-  ## Same as above code
+  ## or
   # columns PetsSchema
 
   columns ->(table) { QuestionsSchema.new(context: table) }
-  ## Same as above code.
+  ## or
   # columns QuestionsSchema
 
   column_converter :to_s, ->(val, *) { val.to_s }
@@ -259,7 +263,7 @@ schema = SampleTableSchema.new(context: context)
 ```
 
 You can also use `context_builder`.
-This may be useful when `column` definition lambda is complicated.
+This may be useful when `column(s)` lambda is complicated.
 ```ruby
 class SampleTableSchema
   include TableStructure::Schema

data/lib/table_structure.rb

@@ -16,6 +16,8 @@ module TableStructure
   require 'table_structure/schema/definition/error'
   require 'table_structure/schema/definition/validator'
   require 'table_structure/schema/table'
+  require 'table_structure/schema/table/context_builder'
+  require 'table_structure/schema/table/key_decorator'
   require 'table_structure/schema/column'
   require 'table_structure/schema/column/attrs'
   require 'table_structure/schema/column/schema'

data/lib/table_structure/schema/definition.rb

@@ -25,8 +25,8 @@ module TableStructure
 
         @name = name
         @columns = create_columns(name, column_definitions, context, options)
-        @header_context_builder = context_builders[:header]
-        @row_context_builder = context_builders[:row]
+        @header_context_builder = Table::ContextBuilder.new(:header, context_builders[:header])
+        @row_context_builder = Table::ContextBuilder.new(:row, context_builders[:row])
         @header_converters = select_column_converters(:header, column_converters)
         @row_converters = select_column_converters(:row, column_converters)
         @result_builders = result_builders

data/lib/table_structure/schema/table.rb

@@ -16,49 +16,37 @@ module TableStructure
         options
       )
         @columns = columns
-        @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
+
+        if header_context_builder.available?
+          singleton_class.include header_context_builder
+        end
+        if row_context_builder.available?
+          singleton_class.include row_context_builder
+        end
       end
 
       def header(context: nil)
-        if @header_context_builder
-          context = @header_context_builder.call(context)
-        end
         values(:name, context, @header_converters)
       end
 
       def row(context: nil)
-        context = @row_context_builder.call(context) if @row_context_builder
         values(:value, context, @row_converters)
       end
 
       private
 
       def keys
-        @keys ||= obtain_keys
-      end
-
-      def obtain_keys
-        keys = @columns.map(&:keys).flatten
-        has_key_options? ? decorate_keys(keys) : keys
-      end
-
-      def has_key_options?
-        @options[:key_prefix] || @options[:key_suffix]
-      end
-
-      def decorate_keys(keys)
-        keys.map do |key|
-          next key unless key
-
-          decorated_key = "#{@options[:key_prefix]}#{key}#{@options[:key_suffix]}"
-          decorated_key = decorated_key.to_sym if key.is_a?(Symbol)
-          decorated_key
+        @keys ||= begin
+          keys = @columns.map(&:keys).flatten
+          KeyDecorator.new(
+            prefix: @options[:key_prefix],
+            suffix: @options[:key_suffix]
+          ).decorate(keys)
         end
       end
 

data/lib/table_structure/schema/table/context_builder.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module TableStructure
+  module Schema
+    class Table
+      class ContextBuilder < Module
+        def initialize(name, callable)
+          @available = !callable.nil?
+
+          return unless @available
+
+          define_method(name) do |context: nil|
+            super(context: callable.call(context))
+          end
+        end
+
+        def available?
+          @available
+        end
+      end
+    end
+  end
+end

data/lib/table_structure/schema/table/key_decorator.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module TableStructure
+  module Schema
+    class Table
+      class KeyDecorator
+        def initialize(prefix: nil, suffix: nil)
+          @prefix = prefix
+          @suffix = suffix
+        end
+
+        def decorate(keys)
+          return keys unless has_any_options?
+
+          keys.map do |key|
+            next key unless key
+
+            decorated_key = "#{@prefix}#{key}#{@suffix}"
+            decorated_key = decorated_key.to_sym if key.is_a?(Symbol)
+            decorated_key
+          end
+        end
+
+        private
+
+        def has_any_options?
+          @prefix || @suffix
+        end
+      end
+    end
+  end
+end

data/lib/table_structure/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,6 +86,8 @@ files:
 - lib/table_structure/schema/dsl/option.rb
 - lib/table_structure/schema/dsl/result_builder.rb
 - lib/table_structure/schema/table.rb
+- lib/table_structure/schema/table/context_builder.rb
+- lib/table_structure/schema/table/key_decorator.rb
 - lib/table_structure/schema/utils.rb
 - lib/table_structure/version.rb
 - lib/table_structure/writer.rb