table_structure 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a208013676cd213826e9c8f6fd29ef6e364bd321f198a3f87424806c79d87b8
-  data.tar.gz: 4eda6349d9ab15a2d8183ec27678d19bcef4750376e2981e9feb15cf4d93d844
+  metadata.gz: af7a012ce96e50bfc67ff0360ba39b8f2c2f0b0772e0260b17729777b805eeb7
+  data.tar.gz: 4fd45259f91bde2016be845200cbd88ba3b50c3e7b6c75b257e228f4475a500a
 SHA512:
-  metadata.gz: d903f50237ef4323d81fbec517a3c9206a444fc14063e5aa12e4696fa361419f8955bebb0c5e74c77398db8b8ec7a5dcb871487752ad65344b0bcfedb334b7d1
-  data.tar.gz: 38de89299ff6745eb8ad32e12d8e64b081d36d6d510ef8e429b5189ec7bfabd33ce06768f08454e3e7cf576244ebb981506161e580440c7a010ef52eb3cd28cf
+  metadata.gz: dc61fd25875979c3c3e06ba9e0648bea2eed3abcf058072ef2802c1c0379b194aeee4213b76268ae10118368cbd0076303658ca3ce2d19c85ea366709ae6f3f5
+  data.tar.gz: 82203dac6eaf8418eecb9ee4ed62b550277f6c57d54f4f78d04b72edb317a7cec91b16f1f16fa43749d56a55ebb28d871be82e11bccf72ab3db128e45e3c6795

data/Gemfile.lock

@@ -1,18 +1,12 @@
 PATH
   remote: .
   specs:
-    table_structure (0.1.3)
+    table_structure (0.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
     diff-lcs (1.3)
-    jaro_winkler (1.5.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    rainbow (3.0.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -27,15 +21,6 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.2)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.6)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
@@ -44,7 +29,6 @@ DEPENDENCIES
   bundler (~> 1.17)
   rake (~> 10.0)
   rspec (~> 3.0)
-  rubocop (~> 0.74.0)
   table_structure!
 
 BUNDLED WITH

data/lib/table_structure/schema/column.rb

@@ -3,39 +3,18 @@
 module TableStructure
   module Schema
     class Column
-      class Error < ::TableStructure::Error
-        attr_reader :group_index
+      attr_reader :name, :key, :vlaue, :size
 
-        def initialize(error_message, group_index)
-          @group_index = group_index
-          super("#{error_message} [defined position: #{group_index + 1}]")
-        end
-      end
-
-      DEFAULT_DEFINITION = {
-        name: nil,
-        key: nil,
-        value: nil,
-        size: nil
-      }.freeze
-
-      DEFAULT_SIZE = 1
-
-      attr_reader :size, :group_index
-
-      def initialize(definition, group_index)
-        @group_index = group_index
-        definition = DEFAULT_DEFINITION.merge(definition)
-        validate(definition)
-        @name = definition[:name]
-        @key = definition[:key]
-        @value = definition[:value]
-        @size = determine_size(definition)
+      def initialize(name:, key:, value:, size:)
+        @name = name
+        @key = key
+        @value = value
+        @size = size
       end
 
       def name(header_context, table_context)
-        val = Utils.evaluate_callable(@name, header_context, table_context)
-        optimize_size(val)
+        name = Utils.evaluate_callable(@name, header_context, table_context)
+        optimize_size(name)
       end
 
       def key
@@ -43,48 +22,22 @@ module TableStructure
       end
 
       def value(row_context, table_context)
-        val = Utils.evaluate_callable(@value, row_context, table_context)
-        optimize_size(val)
+        value = Utils.evaluate_callable(@value, row_context, table_context)
+        optimize_size(value)
       end
 
       private
 
-      def validate(name:, key:, size:, **)
-        if !key && name.respond_to?(:call) && !size
-          raise Error.new('"size" must be specified, because column size cannot be determined.', @group_index)
-        end
-        if size && size < DEFAULT_SIZE
-          raise Error.new('"size" must be positive.', @group_index)
-        end
-      end
-
-      def determine_size(name:, key:, size:, **)
-        return size if size
-
-        [calculate_size(name), calculate_size(key)].max
-      end
-
-      def calculate_size(val)
-        if val.is_a?(Array)
-          return val.empty? ? DEFAULT_SIZE : val.size
-        end
-
-        DEFAULT_SIZE
-      end
-
-      def multiple?
-        @size > DEFAULT_SIZE
-      end
-
       def optimize_size(value)
-        return value unless multiple?
+        return value if @size == 1
 
-        values = value.is_a?(Array) ? value : [value]
+        values = [value].flatten
         actual_size = values.size
-        if actual_size > @size
-          values[0, @size]
-        elsif actual_size < @size
-          [].concat(values).fill(nil, actual_size, (@size - actual_size))
+        expected_size = @size
+        if actual_size > expected_size
+          values[0, expected_size]
+        elsif actual_size < expected_size
+          [].concat(values).fill(nil, actual_size, (expected_size - actual_size))
         else
           values
         end

data/lib/table_structure/schema/definition/error.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module TableStructure
+  module Schema
+    class Definition
+      class Error < ::TableStructure::Error
+        attr_reader :index
+
+        def initialize(error_message, index)
+          @index = index
+          super("#{error_message} [defined position of column(s): #{index + 1}]")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module TableStructure
+  module Schema
+    class Definition
+      class Validator
+        DEFAULT_SIZE = 1
+
+        def initialize(index, options)
+          @index = index
+          @options = options
+        end
+
+        def validate(name:, key:, size:, **)
+          if key.respond_to?(:call)
+            raise Error.new('"key" must not be lambda.', @index)
+          end
+          if !key && name.respond_to?(:call) && !size
+            raise Error.new('"size" must be specified, because column size cannot be determined.', @index)
+          end
+          if size && size < DEFAULT_SIZE
+            raise Error.new('"size" must be positive.', @index)
+          end
+          if @options[:result_type] == :hash && !key
+            raise Error.new('"key" must be specified when "result_type: :hash" is specified.', @index)
+          end
+
+          true
+        end
+      end
+    end
+  end
+end

data/lib/table_structure/schema/definition.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module TableStructure
+  module Schema
+    class Definition
+      DEFAULT_ATTRS = {
+        name: nil,
+        key: nil,
+        value: nil,
+        size: nil
+      }.freeze
+
+      DEFAULT_SIZE = 1
+
+      def initialize(definitions, options)
+        @definitions = definitions
+        @options = options
+      end
+
+      def compile(context = nil)
+        @definitions
+          .map { |definition| Utils.evaluate_callable(definition, context) }
+          .map.with_index do |definition, i|
+            validator = Validator.new(i, @options)
+
+            [definition]
+              .flatten
+              .map do |definition|
+                definition = DEFAULT_ATTRS.merge(definition)
+                validator.validate(definition)
+                definition[:size] = determine_size(definition)
+                definition
+              end
+          end
+          .flatten
+      end
+
+      private
+
+      def determine_size(name:, key:, size:, **)
+        return size if size
+
+        [calculate_size(name), calculate_size(key)].max
+      end
+
+      def calculate_size(val)
+        if val.is_a?(Array)
+          return val.empty? ? DEFAULT_SIZE : val.size
+        end
+
+        DEFAULT_SIZE
+      end
+    end
+  end
+end

data/lib/table_structure/schema/table.rb

@@ -8,11 +8,11 @@ module TableStructure
       attr_reader :columns, :column_converters, :result_builders
 
       def initialize(column_definitions, column_converters, result_builders, context, options)
-        @context = context
-        @options = DEFAULT_OPTIONS.merge(options)
-        @columns = build_columns(column_definitions)
+        options = DEFAULT_OPTIONS.merge(options)
+        @columns = build_columns(column_definitions, context, options)
         @column_converters = default_column_converters.merge(column_converters)
-        @result_builders = default_result_builders.merge(result_builders)
+        @result_builders = default_result_builders(options).merge(result_builders)
+        @context = context
       end
 
       def header(context)
@@ -25,24 +25,20 @@ module TableStructure
 
       private
 
-      def build_columns(definitions)
-        definitions
-          .map { |definition| Utils.evaluate_callable(definition, @context) }
-          .map.with_index do |definition, i|
-            [definition]
-              .flatten
-              .map { |definition| Column.new(definition, i) }
-          end
-          .flatten
+      def build_columns(definitions, context, options)
+        Definition
+          .new(definitions, options)
+          .compile(context)
+          .map { |attrs| Column.new(attrs) }
       end
 
       def default_column_converters
         {}
       end
 
-      def default_result_builders
+      def default_result_builders(options)
         result_builders = {}
-        if @options[:result_type] == :hash
+        if options[:result_type] == :hash
           result_builders[:to_h] = ->(array, *) { (@keys ||= keys).zip(array).to_h }
         end
         result_builders

data/lib/table_structure/version.rb

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

data/lib/table_structure.rb

@@ -10,6 +10,9 @@ module TableStructure
   require 'table_structure/schema/dsl/column_definition'
   require 'table_structure/schema/dsl/context_builder'
   require 'table_structure/schema/dsl/result_builder'
+  require 'table_structure/schema/definition'
+  require 'table_structure/schema/definition/error'
+  require 'table_structure/schema/definition/validator'
   require 'table_structure/schema/table'
   require 'table_structure/schema/column'
   require 'table_structure/schema/utils'

data/table_structure.gemspec

@@ -27,5 +27,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.17'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.74.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.74.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.74.0
 description: This gem creates and outputs table structure data. Useful for creating
   CSV.
 email:
@@ -87,6 +73,9 @@ files:
 - lib/table_structure.rb
 - lib/table_structure/schema.rb
 - lib/table_structure/schema/column.rb
+- lib/table_structure/schema/definition.rb
+- lib/table_structure/schema/definition/error.rb
+- lib/table_structure/schema/definition/validator.rb
 - lib/table_structure/schema/dsl/column_converter.rb
 - lib/table_structure/schema/dsl/column_definition.rb
 - lib/table_structure/schema/dsl/context_builder.rb