table_structure 0.3.23 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a864d676c51d4ccee8e848b3b0483237965049fbdb52969c588c86184408bf05
-  data.tar.gz: 7fae6ca29a4060713cdbbac7af3ddd3962f6d7fdf2b09a7117af95cbec4570aa
+  metadata.gz: ea80d58dcf58000e510c71d8eac9960ccb469256df07144c9e7845aec32512aa
+  data.tar.gz: 2ae14c91013b1cd2b84e177f3fd7ebb6948775230f019c5ca3f3c3677b892b33
 SHA512:
-  metadata.gz: 5cd0a1099904f07b64eae3afab05fb103106442bba5e8457afd041d828c83308c668c299d580d38d3dd2a2c56512d30966fd55caa21d00b2089fbdf0f2115ee2
-  data.tar.gz: 4a852f24b066de0d0841211c9b291596f88a8f4b9202a8e4f6e8139c7f99c51de056f634bcf5ce81996479a25d08b301eb52e11cad4664343c4c54ea4f016158
+  metadata.gz: 60a40d43594078d7d480e518a2e144d4fda1612ee07b3707e21646ea3f7785ac055de4e9b82509190fe22735c0fb887ee94b74a61536ec7adb102730a7fad28a
+  data.tar.gz: 49d45d82eb9cac83caaac09d1494b8957ac56683cf21a3f11b7f01600b4e0a2174207043ee651f8ce3464f4b0474b5130962690a671977eb55a4efc9d15b892a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.0
+Changes:
+- Remove deprecated methods, arguments and options.
+- It is recommended that you update to 0.3.23 first. if you get warnings or errors, fix them and then update to 0.4.0.
+
 # 0.3.23
 Changes:
 - `TableStructure::CSV::Writer`

data/Gemfile.lock

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

data/README.md

@@ -256,6 +256,10 @@ Initialize a table with the schema and render the table:
 <% end %>
 ```
 
+### Sample with docker
+
+https://github.com/jsmmr/ruby_table_structure_sample
+
 ### Advanced
 
 You can add definitions when initializing the schema.
@@ -472,10 +476,6 @@ concatenated_schema = (UserTableSchema + PetTableSchema + QuestionTableSchema).n
 merged_schema = UserTableSchema.merge(PetTableSchema, QuestionTableSchema).new(context: context)
 ```
 
-## Sample with docker
-
-https://github.com/jsmmr/ruby_table_structure_sample
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/jsmmr/ruby_table_structure.

data/lib/table_structure.rb

@@ -10,7 +10,6 @@ module TableStructure
   require 'table_structure/schema/dsl/column_converter'
   require 'table_structure/schema/dsl/column_definition'
   require 'table_structure/schema/dsl/context_builder'
-  require 'table_structure/schema/dsl/option'
   require 'table_structure/schema/dsl/row_builder'
   require 'table_structure/schema/definition/column_converter'
   require 'table_structure/schema/definition/context_builder'

data/lib/table_structure/csv/writer.rb

@@ -9,32 +9,19 @@ module TableStructure
         schema,
         bom: false,
         csv_options: {},
-        header: { context: nil },
-        **deprecated_options
+        header: { context: nil }
       )
-        if deprecated_options.key?(:header_omitted)
-          header_omitted = deprecated_options[:header_omitted]
-          warn "[TableStructure] `header_omitted: #{!!header_omitted}` option has been deprecated. Use `header: #{!header_omitted}` option instead."
-          header = !header_omitted
-        end
-
-        if deprecated_options.key?(:header_context)
-          header_context = deprecated_options[:header_context]
-          warn '[TableStructure] `:header_context` option has been deprecated. Use `header: { context: ... }` option instead.'
-          header = { context: header_context }
-        end
-
         require 'csv'
 
         @options = {
           bom: bom,
           csv_options: csv_options
         }
-        @inner_options = {
+        inner_options = {
           header: header
         }
 
-        @writer = ::TableStructure::Writer.new(schema, **@inner_options)
+        @writer = ::TableStructure::Writer.new(schema, **inner_options)
       end
 
       def write(
@@ -42,35 +29,12 @@ module TableStructure
         to:,
         bom: @options[:bom],
         csv_options: @options[:csv_options],
-        **deprecated_options,
         &block
       )
-        header = nil
-
-        if deprecated_options.key?(:header)
-          header = deprecated_options[:header]
-          warn '[TableStructure] Specify :header option as an argument for initialize method.'
-        end
-
-        if deprecated_options.key?(:header_omitted)
-          header_omitted = deprecated_options[:header_omitted]
-          warn "[TableStructure] `header_omitted: #{!!header_omitted}` option has been deprecated. Use `header: #{!header_omitted}` option instead."
-          header = !header_omitted
-        end
-
-        if deprecated_options.key?(:header_context)
-          header_context = deprecated_options[:header_context]
-          warn '[TableStructure] `:header_context` option has been deprecated. Use `header: { context: ... }` option instead.'
-          header = { context: header_context }
-        end
-
-        inner_options = {}
-        inner_options[:header] = header if header
-
         to << BOM if bom
 
         csv = ::CSV.new(to, **csv_options)
-        @writer.write(items, to: csv, **inner_options, &block)
+        @writer.write(items, to: csv, &block)
       end
     end
   end

data/lib/table_structure/iterator.rb

@@ -5,30 +5,8 @@ module TableStructure
     def initialize(
       schema,
       header: { context: nil },
-      row_type: :array,
-      **deprecated_options
+      row_type: :array
     )
-      if deprecated_options.key?(:header_omitted)
-        header_omitted = deprecated_options[:header_omitted]
-        warn "[TableStructure] `header_omitted: #{!!header_omitted}` option has been deprecated. Use `header: #{!header_omitted}` option instead."
-        header = !header_omitted
-      end
-
-      if deprecated_options.key?(:header_context)
-        header_context = deprecated_options[:header_context]
-        warn '[TableStructure] `:header_context` option has been deprecated. Use `header: { context: ... }` option instead.'
-        header = { context: header_context }
-      end
-
-      if deprecated_options.key?(:result_type)
-        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
-        row_type = deprecated_options[:result_type]
-      end
-
-      unless schema.is_a?(Schema)
-        raise ::TableStructure::Error, "Must be use Schema. #{schema}"
-      end
-
       @schema = schema
       @options = {
         header: header,
@@ -36,48 +14,16 @@ module TableStructure
       }
     end
 
-    def iterate(
-      items,
-      **deprecated_options,
-      &block
-    )
-      header = @options[:header]
-      row_type = @options[:row_type]
-
-      if deprecated_options.key?(:header)
-        header = deprecated_options[:header]
-        warn '[TableStructure] Use :header option on initialize method.'
-      end
-
-      if deprecated_options.key?(:header_omitted)
-        header_omitted = deprecated_options[:header_omitted]
-        warn "[TableStructure] `header_omitted: #{!!header_omitted}` option has been deprecated. Use `header: #{!header_omitted}` option instead."
-        header = !header_omitted
-      end
-
-      if deprecated_options.key?(:header_context)
-        header_context = deprecated_options[:header_context]
-        warn '[TableStructure] `:header_context` option has been deprecated. Use `header: { context: ... }` option instead.'
-        header = { context: header_context }
-      end
-
-      if deprecated_options.key?(:row_type)
-        row_type = deprecated_options[:row_type]
-        warn '[TableStructure] Use :row_type option on initialize method.'
-      end
-
-      if deprecated_options.key?(:result_type)
-        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
-        row_type = deprecated_options[:result_type]
+    def iterate(items, &block)
+      unless items.respond_to?(:each)
+        raise ::TableStructure::Error, "Must be enumerable. #{items}"
       end
 
-      items = enumerize(items)
-
       enum =
         Table::Iterator
         .new(
-          Table.new(@schema, row_type: row_type),
-          header: header
+          Table.new(@schema, row_type: @options[:row_type]),
+          header: @options[:header]
         )
         .iterate(items)
 
@@ -90,18 +36,5 @@ module TableStructure
 
       enum
     end
-
-    private
-
-    def enumerize(items)
-      if items.respond_to?(:each)
-        items
-      elsif items.respond_to?(:call)
-        warn "[TableStructure] Use `Enumerator` to wrap items instead of `lambda`. The use of `lambda` has been deprecated. #{items}"
-        Enumerator.new { |y| items.call(y) }
-      else
-        raise ::TableStructure::Error, "Must be enumerable. #{items}"
-      end
-    end
   end
 end

data/lib/table_structure/schema.rb

@@ -6,7 +6,6 @@ module TableStructure
       klass.extend(DSL::ColumnConverter)
       klass.extend(DSL::ColumnDefinition)
       klass.extend(DSL::ContextBuilder)
-      klass.extend(DSL::Option)
       klass.extend(DSL::RowBuilder)
       klass.extend(ClassMethods)
     end
@@ -36,31 +35,8 @@ module TableStructure
       key_prefix: nil,
       key_suffix: nil,
       nil_definitions_ignored: false,
-      **deprecated_options,
       &block
     )
-      if deprecated_options.key?(:row_type)
-        raise ::TableStructure::Error, 'Use :row_type option with Table, Writer or Iterator.'
-      end
-
-      if deprecated_options.key?(:result_type)
-        raise ::TableStructure::Error, ':result_type option has been deprecated. Use :row_type option instead.'
-      end
-
-      options =
-        [
-          self.class.options,
-          {
-            name_prefix: name_prefix,
-            name_suffix: name_suffix,
-            key_prefix: key_prefix,
-            key_suffix: key_suffix,
-            nil_definitions_ignored: nil_definitions_ignored
-          },
-          deprecated_options
-        ]
-        .reduce({}, &:merge!)
-
       schema_classes = [self.class]
 
       if block_given?
@@ -82,14 +58,14 @@ module TableStructure
         .reduce({}, &:merge!)
         .merge(
           ColumnConverter.create_optional_converters(
-            name_prefix: options.delete(:name_prefix),
-            name_suffix: options.delete(:name_suffix)
+            name_prefix: name_prefix,
+            name_suffix: name_suffix
           )
         )
 
       @key_converter = KeyConverter.new(
-        prefix: options.delete(:key_prefix),
-        suffix: options.delete(:key_suffix)
+        prefix: key_prefix,
+        suffix: key_suffix
       )
 
       @row_builders =
@@ -104,24 +80,9 @@ module TableStructure
         .new(
           name,
           schema_classes.map(&:column_definitions).reduce([], &:concat),
-          { nil_definitions_ignored: options.delete(:nil_definitions_ignored) }
+          { nil_definitions_ignored: nil_definitions_ignored }
         )
         .compile(@context)
-
-      @options = options
-    end
-
-    def create_table(row_type: :array, **deprecated_options, &block)
-      warn '[TableStructure] `TableStructure::Schema#create_table` has been deprecated. Use `TableStructure::Table.new` instead.'
-
-      options = @options.merge(deprecated_options)
-
-      if options.key?(:result_type)
-        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
-        options[:row_type] = options[:result_type]
-      end
-
-      ::TableStructure::Table.new(self, row_type: options[:row_type] || row_type, &block)
     end
 
     def contain_callable?(attribute)

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

@@ -6,23 +6,10 @@ module TableStructure
       module ColumnConverter
         def column_converter(
           name,
-          callable = nil,
           header: true,
           body: true,
-          **deprecated_options,
           &block
         )
-          if deprecated_options.key?(:row)
-            warn '[TableStructure] `:row` option has been deprecated. Use `:body` option instead.'
-            body = deprecated_options[:row]
-          end
-
-          if callable
-            warn "[TableStructure] Use `block` instead of #{callable}."
-          end
-
-          block ||= callable
-
           column_converters[name] =
             ::TableStructure::Schema::Definition::ColumnConverter.new(
               header: header,

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

@@ -5,13 +5,7 @@ module TableStructure
     module DSL
       module ContextBuilder
         # TODO: Change definition style
-        def context_builder(name, callable = nil, &block)
-          if callable
-            warn "[TableStructure] Use `block` instead of #{callable}."
-          end
-
-          block ||= callable
-
+        def context_builder(name, &block)
           context_builders[name] =
             ::TableStructure::Schema::Definition::ContextBuilder.new(
               &block

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

@@ -6,16 +6,9 @@ module TableStructure
       module RowBuilder
         def row_builder(
           name,
-          callable = nil,
           enabled_row_types: %i[array hash],
           &block
         )
-          if callable
-            warn "[TableStructure] Use `block` instead of #{callable}."
-          end
-
-          block ||= callable
-
           row_builders[name] =
             ::TableStructure::Schema::Definition::RowBuilder.new(
               enabled_row_types: enabled_row_types,

data/lib/table_structure/table.rb

@@ -39,16 +39,6 @@ module TableStructure
       end
     end
 
-    def rows(items)
-      warn '[TableStructure] `TableStructure::Table#rows(items)` has been deprecated. Use `TableStructure::Table#body(items)` instead.'
-      body(items)
-    end
-
-    def row(context: nil)
-      warn '[TableStructure] `TableStructure::Table#row(context: ...)` has been deprecated. Use `TableStructure::Table#body(items)` instead.'
-      data(context: context)
-    end
-
     private
 
     def data(context: nil)

data/lib/table_structure/version.rb

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

data/lib/table_structure/writer.rb

@@ -6,26 +6,8 @@ module TableStructure
       schema,
       header: { context: nil },
       method: :<<,
-      row_type: :array,
-      **deprecated_options
+      row_type: :array
     )
-      if deprecated_options.key?(:header_omitted)
-        header_omitted = deprecated_options[:header_omitted]
-        warn "[TableStructure] `header_omitted: #{!!header_omitted}` option has been deprecated. Use `header: #{!header_omitted}` option instead."
-        header = !header_omitted
-      end
-
-      if deprecated_options.key?(:header_context)
-        header_context = deprecated_options[:header_context]
-        warn '[TableStructure] `:header_context` option has been deprecated. Use `header: { context: ... }` option instead.'
-        header = { context: header_context }
-      end
-
-      if deprecated_options.key?(:result_type)
-        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
-        row_type = deprecated_options[:result_type]
-      end
-
       @schema = schema
       @options = {
         header: header,
@@ -38,43 +20,16 @@ module TableStructure
       items,
       to:,
       method: @options[:method],
-      **deprecated_options,
       &block
     )
-      header = @options[:header]
-      row_type = @options[:row_type]
-
-      if deprecated_options.key?(:header)
-        header = deprecated_options[:header]
-        warn '[TableStructure] Use :header option on initialize method.'
-      end
-
-      if deprecated_options.key?(:header_omitted)
-        header_omitted = deprecated_options[:header_omitted]
-        warn "[TableStructure] `header_omitted: #{!!header_omitted}` option has been deprecated. Use `header: #{!header_omitted}` option instead."
-        header = !header_omitted
-      end
-
-      if deprecated_options.key?(:header_context)
-        header_context = deprecated_options[:header_context]
-        warn '[TableStructure] `:header_context` option has been deprecated. Use `header: { context: ... }` option instead.'
-        header = { context: header_context }
-      end
-
-      if deprecated_options.key?(:row_type)
-        row_type = deprecated_options[:row_type]
-        warn '[TableStructure] Use :row_type option on initialize method.'
-      end
-
-      if deprecated_options.key?(:result_type)
-        warn '[TableStructure] `:result_type` option has been deprecated. Use `:row_type` option instead.'
-        row_type = deprecated_options[:result_type]
-      end
-
       output = Output.new(to, method: method)
 
       Iterator
-        .new(@schema, header: header, row_type: row_type)
+        .new(
+          @schema,
+          header: @options[:header],
+          row_type: @options[:row_type]
+        )
         .iterate(items, &block)
         .each { |row| output.write(row) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_structure
 version: !ruby/object:Gem::Version
-  version: 0.3.23
+  version: 0.4.0
 platform: ruby
 authors:
 - jsmmr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-31 00:00:00.000000000 Z
+date: 2020-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,6 @@ files:
 - lib/table_structure/schema/dsl/column_converter.rb
 - lib/table_structure/schema/dsl/column_definition.rb
 - lib/table_structure/schema/dsl/context_builder.rb
-- lib/table_structure/schema/dsl/option.rb
 - lib/table_structure/schema/dsl/row_builder.rb
 - lib/table_structure/schema/key_converter.rb
 - lib/table_structure/schema/row_builder.rb

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

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module TableStructure
-  module Schema
-    module DSL
-      module Option
-        def option(name, value)
-          warn "[TableStructure] The use of `option` DSL has been deprecated. #{caller_locations(1, 1)}"
-          options[name] = value
-          nil
-        end
-
-        def options
-          @__options__ ||= {}
-        end
-      end
-    end
-  end
-end