table_structure 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f308e4cc6c48b759e040421bb73d27582bf63555bb3a7e8cffbe9d881409873e
-  data.tar.gz: e7661a42884ac86bd894e9fd9e542433b31627355d71812d525b9e0a66bdc6d0
+  metadata.gz: 8a208013676cd213826e9c8f6fd29ef6e364bd321f198a3f87424806c79d87b8
+  data.tar.gz: 4eda6349d9ab15a2d8183ec27678d19bcef4750376e2981e9feb15cf4d93d844
 SHA512:
-  metadata.gz: 4f042133eac79798923ac099a8108d29a9bfd43e36fe68d4811f2074ea9da9e638174e0381ac8fefcaeeea71d8e29a1504a439799e9ac5638d1b45fc040239a6
-  data.tar.gz: 9578b9cd2478a440fd3b8a0b6e84ade031cd0b298ae11e7766c39529e3b795340005bd20fade907cd961879da318166db958818c0b3a38284fd0b450f13a98f0
+  metadata.gz: d903f50237ef4323d81fbec517a3c9206a444fc14063e5aa12e4696fa361419f8955bebb0c5e74c77398db8b8ec7a5dcb871487752ad65344b0bcfedb334b7d1
+  data.tar.gz: 38de89299ff6745eb8ad32e12d8e64b081d36d6d510ef8e429b5189ec7bfabd33ce06768f08454e3e7cf576244ebb981506161e580440c7a010ef52eb3cd28cf

data/Gemfile

@@ -1,6 +1,8 @@
-source "https://rubygems.org"
+# frozen_string_literal: true
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+source 'https://rubygems.org'
+
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in table_structure.gemspec
 gemspec

data/Gemfile.lock

@@ -1,12 +1,18 @@
 PATH
   remote: .
   specs:
-    table_structure (0.1.2)
+    table_structure (0.1.3)
 
 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)
@@ -21,6 +27,15 @@ 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
@@ -29,6 +44,7 @@ DEPENDENCIES
   bundler (~> 1.17)
   rake (~> 10.0)
   rspec (~> 3.0)
+  rubocop (~> 0.74.0)
   table_structure!
 
 BUNDLED WITH

data/README.md

@@ -39,14 +39,14 @@ class SampleTableSchema
   columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
           value: ->(row, *) { row[:pets] }
 
-  columns ->(table) do
+  columns ->(table) {
     table[:questions].map do |question|
       {
         name: question[:id],
         value: ->(row, *) { row[:answers][question[:id]] }
       }
     end
-  end
+  }
 
   column_converter :to_s, ->(val, _row, _table) { val.to_s }
 end
@@ -126,7 +126,7 @@ class SampleTableSchema
   context_builder :row, ->(context) { RowContext.new(**context) }
 
   column  name: 'ID',
-          value: ->(row, _table) { row.id }
+          value: ->(row, *) { row.id }
 
   column  name: 'Name',
           value: ->(row, *) { row.name }
@@ -134,14 +134,14 @@ class SampleTableSchema
   columns name: ['Pet 1', 'Pet 2', 'Pet 3'],
           value: ->(row, *) { row.more_pets }
 
-  columns ->(table) do
+  columns ->(table) {
     table.questions.map do |question|
       {
         name: question[:id],
         value: ->(row, *) { row.answers[question[:id]] }
       }
     end
-  end
+  }
 
   column_converter :to_s, ->(val, *) { val.to_s }
 end
@@ -156,6 +156,16 @@ File.open('sample.csv', 'w') do |f|
 end
 ```
 
+You can also use only `TableStructure::Schema`.
+```ruby
+schema = SampleTableSchema.new
+header = schema.header
+items.each do |item|
+  row = schema.row(context: item)
+  ...
+end
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jsmmr/ruby_table_structure.

data/Rakefile

@@ -1,6 +1,8 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "table_structure"
+require 'bundler/setup'
+require 'table_structure'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "table_structure"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/table_structure.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TableStructure
   class Error < StandardError; end
 
@@ -12,5 +14,4 @@ module TableStructure
   require 'table_structure/schema/column'
   require 'table_structure/schema/utils'
   require 'table_structure/writer'
-
 end

data/lib/table_structure/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     def self.included(klass)

data/lib/table_structure/schema/column.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     class Column
-
       class Error < ::TableStructure::Error
         attr_reader :group_index
 
@@ -16,7 +17,7 @@ module TableStructure
         key: nil,
         value: nil,
         size: nil
-      }
+      }.freeze
 
       DEFAULT_SIZE = 1
 
@@ -48,43 +49,46 @@ module TableStructure
 
       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
+      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
-
-        def determine_size(name:, key:, size:, **)
-          return size if size
-          [calculate_size(name), calculate_size(key)].max
+        if size && size < DEFAULT_SIZE
+          raise Error.new('"size" must be positive.', @group_index)
         end
+      end
 
-        def calculate_size(val)
-          if val.kind_of?(Array)
-            return val.empty? ? DEFAULT_SIZE : val.size
-          end
-          DEFAULT_SIZE
-        end
+      def determine_size(name:, key:, size:, **)
+        return size if size
+
+        [calculate_size(name), calculate_size(key)].max
+      end
 
-        def multiple?
-          @size > DEFAULT_SIZE
+      def calculate_size(val)
+        if val.is_a?(Array)
+          return val.empty? ? DEFAULT_SIZE : val.size
         end
 
-        def optimize_size(value)
-          return value unless multiple?
-          values = value.kind_of?(Array) ? value : [value]
-          actual_size = values.size
-          if actual_size > @size
-            values[0, @size]
-          elsif actual_size < @size
-            [].concat(values).fill(nil, actual_size, (@size - actual_size))
-          else
-            values
-          end
+        DEFAULT_SIZE
+      end
+
+      def multiple?
+        @size > DEFAULT_SIZE
+      end
+
+      def optimize_size(value)
+        return value unless multiple?
+
+        values = value.is_a?(Array) ? value : [value]
+        actual_size = values.size
+        if actual_size > @size
+          values[0, @size]
+        elsif actual_size < @size
+          [].concat(values).fill(nil, actual_size, (@size - actual_size))
+        else
+          values
         end
+      end
     end
   end
 end

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     module DSL
       module ColumnConverter
         def column_converter(name, callable)
           column_converters[name] = callable
-          return
+          nil
         end
 
         def column_converters

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     module DSL
       module ColumnDefinition
         def column(definition)
           column_definitions << definition
-          return
+          nil
         end
 
         def columns(definition)

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     module DSL
       module ContextBuilder
         def context_builder(name, callable)
           context_builders[name] = callable
-          return
+          nil
         end
 
         def context_builders

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

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     module DSL
       module ResultBuilder
         def result_builder(name, callable)
           result_builders[name] = callable
-          return
+          nil
         end
 
         def result_builders

data/lib/table_structure/schema/table.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     class Table
-
-      DEFAULT_OPTIONS = { result_type: :array }
+      DEFAULT_OPTIONS = { result_type: :array }.freeze
 
       attr_reader :columns, :column_converters, :result_builders
 
@@ -24,45 +25,44 @@ 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
+      def build_columns(definitions)
+        definitions
+          .map { |definition| Utils.evaluate_callable(definition, @context) }
+          .map.with_index do |definition, i|
+            [definition]
               .flatten
-        end
-
-        def default_column_converters
-          {}
-        end
-
-        def default_result_builders
-          result_builders = {}
-          if @options[:result_type] == :hash
-            result_builders[:to_h] = ->(array, *) { (@keys ||= keys).zip(array).to_h }
+              .map { |definition| Column.new(definition, i) }
           end
-          result_builders
-        end
+          .flatten
+      end
 
-        def keys
-          @columns.map(&:key).flatten
-        end
+      def default_column_converters
+        {}
+      end
 
-        def values(method, context)
-          columns = @columns
-            .map { |column| column.send(method, context, @context) }
-            .flatten
-            .map { |val| reduce_callables(@column_converters, val, context) }
-          reduce_callables(@result_builders, columns, context)
+      def default_result_builders
+        result_builders = {}
+        if @options[:result_type] == :hash
+          result_builders[:to_h] = ->(array, *) { (@keys ||= keys).zip(array).to_h }
         end
+        result_builders
+      end
 
-        def reduce_callables(callables, val, context)
-          callables.reduce(val) { |val, (_, callable)| callable.call(val, context, @context) }
-        end
+      def keys
+        @columns.map(&:key).flatten
+      end
+
+      def values(method, context)
+        columns = @columns
+                  .map { |column| column.send(method, context, @context) }
+                  .flatten
+                  .map { |val| reduce_callables(@column_converters, val, context) }
+        reduce_callables(@result_builders, columns, context)
+      end
 
+      def reduce_callables(callables, val, context)
+        callables.reduce(val) { |val, (_, callable)| callable.call(val, context, @context) }
+      end
     end
   end
 end

data/lib/table_structure/schema/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module TableStructure
   module Schema
     module Utils
@@ -6,4 +8,4 @@ module TableStructure
       end
     end
   end
-end
+end

data/lib/table_structure/version.rb

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

data/lib/table_structure/writer.rb

@@ -1,11 +1,12 @@
+# frozen_string_literal: true
+
 module TableStructure
   class Writer
-
     DEFAULT_OPTIONS = {
       header_omitted: false,
       header_context: nil,
       method: :<<
-    }
+    }.freeze
 
     def initialize(schema, **options)
       @schema = schema
@@ -19,20 +20,20 @@ module TableStructure
         header = yield header if block_given?
         to.send(options[:method], header)
       end
-      to_enum(items).each do |item|
+      enumerize(items).each do |item|
         row = @schema.row(context: item)
         row = yield row if block_given?
         to.send(options[:method], row)
       end
-      return
+      nil
     end
 
     private
 
-      def to_enum(items)
-        items.respond_to?(:call) ?
-          Enumerator.new { |y| items.call(y) } :
-          items
-      end
+    def enumerize(items)
+      items.respond_to?(:call) ?
+        Enumerator.new { |y| items.call(y) } :
+        items
+    end
   end
 end

data/table_structure.gemspec

@@ -1,29 +1,31 @@
+# frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "table_structure/version"
+require 'table_structure/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "table_structure"
+  spec.name          = 'table_structure'
   spec.version       = TableStructure::VERSION
-  spec.authors       = ["jsmmr"]
-  spec.email         = ["jsmmr@icloud.com"]
+  spec.authors       = ['jsmmr']
+  spec.email         = ['jsmmr@icloud.com']
 
-  spec.summary       = %q{Create and output table structure data.}
-  spec.description   = %q{This gem creates and outputs table structure data. Useful for creating CSV.}
-  spec.homepage      = "https://github.com/jsmmr/ruby_table_structure"
-  spec.license       = "MIT"
+  spec.summary       = 'Create and output table structure data.'
+  spec.description   = 'This gem creates and outputs table structure data. Useful for creating CSV.'
+  spec.homepage      = 'https://github.com/jsmmr/ruby_table_structure'
+  spec.license       = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  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 '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.2
+  version: 0.1.3
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-17 00:00:00.000000000 Z
+date: 2019-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ 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: