daru_lite 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fca8a59ee849230424502a8ffa2f986134ccf522d15d53ab3807c22b64b30f8
-  data.tar.gz: 8c4e8048ea8171c463b048ac9dff8b86a8b19e3ec5dd62f16bf72311e7b03b38
+  metadata.gz: bebf18b1b341f84a4728386060168694ffb47fdd49af1c4621db8a4a3591aa44
+  data.tar.gz: 1f1bbf2e6ef445496d1f7c58a79e8b74054a78b6cfdcf1f8e4431870cddce437
 SHA512:
-  metadata.gz: 403d6cfe869dcd152f083ea0878be37f6a8b40212f6ba5f80ece21bcadf51a4f13471f529bbddcf66b593568f31ec52f3e308c39160f0bd87bac9af6d95b30f6
-  data.tar.gz: dfbc2d7b5e63c54980c704c0df3d96ae8d079b921fc0ff51a34f109126a2a382d531457321737e83a2b03bc114b741e3018d0beb9cb00554aa822345d94f3144
+  metadata.gz: e1a020700e73fb9a48bfefb225ab79d465658df60fd95bed92ad4053533a0f6f4d6ea1d4e7b5e4dd10a11b79d7f2a5ade80345a87a81efb2eea5124db29d77be
+  data.tar.gz: 148611db5a2ef6c16b2974131f1c7a1e8298f7537d9868d26a248181478266bae61ce2e1810f6d513391fbfa7deaf66c239491102eae56d698791da26665827a

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 3.1
+        ruby-version: 3.4
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
     - name: Run linters
       run: |
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.1']
+        ruby-version: ['3.4']
 
     steps:
     - uses: actions/checkout@v3

data/.rubocop.yml

@@ -16,10 +16,10 @@ AllCops:
     - 'profile/*'
     - 'tmp/*'
   DisplayCopNames: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.4
   NewCops: enable
 
-require:
+plugins:
   - rubocop-performance
   - rubocop-rspec
 

data/benchmarks/db_loading.rb

@@ -3,7 +3,6 @@ $:.unshift File.expand_path("../../lib", __FILE__)
 require 'benchmark'
 require 'daru_lite'
 require 'sqlite3'
-require 'dbi'
 require 'active_record'
 
 db_name = 'daru_lite_test.sqlite'

data/daru_lite.gemspec

@@ -28,29 +28,27 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency 'activerecord', '~> 6.0'
+  spec.add_development_dependency 'activerecord', '~> 8.0'
   spec.add_development_dependency 'awesome_print', '~> 1.9.2'
-  spec.add_development_dependency 'bundler', '~> 2.1', '>= 2.1.4'
-  spec.add_development_dependency 'dbd-sqlite3', '~> 1.2.5'
-  spec.add_development_dependency 'dbi', '~> 0.4.5'
+  spec.add_development_dependency 'bundler', '~> 2.6'
+  spec.add_development_dependency 'csv', '~> 3.3.4'
+  spec.add_development_dependency 'debug', '>= 1.0.0'
   spec.add_development_dependency 'distribution', '~> 0.8'
   spec.add_development_dependency 'matrix', '~> 0.4.2'
-  spec.add_development_dependency 'nokogiri', '~> 1.16.2'
+  spec.add_development_dependency 'nokogiri', '~> 1.18.0'
   spec.add_development_dependency 'prime', '~> 0.1.2'
-  spec.add_development_dependency 'pry', '~> 0.14'
-  spec.add_development_dependency 'pry-byebug', '~> 3.10.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.11'
-  spec.add_development_dependency 'rspec-its', '~> 1.3.0'
+  spec.add_development_dependency 'rspec-its', '~> 2.0.0'
   spec.add_development_dependency 'rubocop', '~> 1.60'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.20.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.25'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.25.0'
+  spec.add_development_dependency 'rubocop-rspec', '~> 3.6'
   spec.add_development_dependency 'ruby-prof', '~> 1.7.0'
   spec.add_development_dependency 'simplecov', '~> 0.22.0'
   spec.add_development_dependency 'simplecov_json_formatter', '~> 0.1.4'
   spec.add_development_dependency 'spreadsheet', '~> 1.3.0'
-  spec.add_development_dependency 'sqlite3', '~> 1.7.2'
+  spec.add_development_dependency 'sqlite3', '~> 2.6.0'
   # issue : https://github.com/SciRuby/daru/issues/493 occured
   # with latest version of sqlite3
-  spec.add_development_dependency 'webmock', '~> 3.20.0'
+  spec.add_development_dependency 'webmock', '~> 3.25.0'
 end

data/lib/daru_lite/accessors/array_wrapper.rb

@@ -7,13 +7,13 @@ module DaruLite
 
       def_delegators :@data, :slice!
 
-      def each(&block)
-        @data.each(&block)
+      def each(&)
+        @data.each(&)
         self
       end
 
-      def map!(&block)
-        @data.map!(&block)
+      def map!(&)
+        @data.map!(&)
         self
       end
 

data/lib/daru_lite/core/merge.rb

@@ -1,6 +1,14 @@
 module DaruLite
   module Core
     class MergeFrame
+      LEFT_RIGHT_COMBINATIONS = {
+        #       left   right
+        inner: [false, false],
+        left: [true, false],
+        right: [false, true],
+        outer: [true, true]
+      }.freeze
+
       class NilSorter
         include Comparable
 
@@ -55,14 +63,6 @@ module DaruLite
 
       attr_accessor :merge_key
 
-      LEFT_RIGHT_COMBINATIONS = {
-        #       left   right
-        inner: [false, false],
-        left: [true, false],
-        right: [false, true],
-        outer: [true, true]
-      }.freeze
-
       def init_opts(opts)
         @on = opts[:on]
         @keep_left, @keep_right = extract_left_right(opts[:how])

data/lib/daru_lite/data_frame/calculatable.rb

@@ -110,8 +110,8 @@ module DaruLite
       #   # 4 555
       #   # 5 666
       #   # 6 777
-      def vector_by_calculation(&block)
-        a = each_row.map { |r| r.instance_eval(&block) }
+      def vector_by_calculation(&)
+        a = each_row.map { |r| r.instance_eval(&) }
 
         DaruLite::Vector.new a, index: @index
       end

data/lib/daru_lite/data_frame/filterable.rb

@@ -68,8 +68,8 @@ module DaruLite
       #   df.filter(:row) do |row|
       #     row[:a] + row[:d] < 100
       #   end
-      def filter(axis = :vector, &block)
-        dispatch_to_axis_pl axis, :filter, &block
+      def filter(axis = :vector, &)
+        dispatch_to_axis_pl(axis, :filter, &)
       end
 
       # Returns a dataframe in which rows with any of the mentioned values
@@ -113,8 +113,8 @@ module DaruLite
       end
 
       # creates a new vector with the data of a given field which the block returns true
-      def filter_vector(vec, &block)
-        DaruLite::Vector.new(each_row.select(&block).map { |row| row[vec] })
+      def filter_vector(vec, &)
+        DaruLite::Vector.new(each_row.select(&).map { |row| row[vec] })
       end
 
       # Iterates over each row and retains it in a new DataFrame if the block returns

data/lib/daru_lite/data_frame/i_o_able.rb

@@ -32,8 +32,8 @@ module DaruLite
         #     :col_sep           => ',',
         #     :converters        => :numeric
         #   }
-        def from_csv(path, opts = {}, &block)
-          DaruLite::IO.from_csv path, opts, &block
+        def from_csv(path, opts = {}, &)
+          DaruLite::IO.from_csv(path, opts, &)
         end
 
         # Read data from an Excel file into a DataFrame.
@@ -45,28 +45,30 @@ module DaruLite
         # == Options
         #
         # *:worksheet_id - ID of the worksheet that is to be read.
-        def from_excel(path, opts = {}, &block)
-          DaruLite::IO.from_excel path, opts, &block
+        def from_excel(path, opts = {}, &)
+          DaruLite::IO.from_excel(path, opts, &)
         end
 
         # Read a database query and returns a Dataset
         #
-        # @param dbh [DBI::DatabaseHandle, String] A DBI connection OR Path to a SQlite3 database.
+        # @param arh [ActiveRecord::ConnectionAdapters::AbstractAdapter, String] An ActiveRecord connection
+        # OR Path to a SQlite3 database.
         # @param query [String] The query to be executed
         #
         # @return A dataframe containing the data resulting from the query
         #
         # USE:
         #
-        #  dbh = DBI.connect("DBI:Mysql:database:localhost", "user", "password")
+        #  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "path/to/sqlite.db")
+        #  arh = ActiveRecord::Base.connection
         #  DaruLite::DataFrame.from_sql(dbh, "SELECT * FROM test")
         #
         #  #Alternatively
         #
-        #  require 'dbi'
+        #  require 'active_record'
         #  DaruLite::DataFrame.from_sql("path/to/sqlite.db", "SELECT * FROM test")
-        def from_sql(dbh, query)
-          DaruLite::IO.from_sql dbh, query
+        def from_sql(arh, query)
+          DaruLite::IO.from_sql arh, query
         end
 
         # Read a dataframe from AR::Relation
@@ -149,16 +151,17 @@ module DaruLite
       #
       # == Arguments
       #
-      # * dbh - DBI database connection object.
+      # * arh - ActiveRecord database connection object.
       # * query - Query string.
       #
       # == Usage
       #
       #  ds = DaruLite::DataFrame.new({:id=>DaruLite::Vector.new([1,2,3]), :name=>DaruLite::Vector.new(["a","b","c"])})
-      #  dbh = DBI.connect("DBI:Mysql:database:localhost", "user", "password")
-      #  ds.write_sql(dbh,"test")
-      def write_sql(dbh, table)
-        DaruLite::IO.dataframe_write_sql self, dbh, table
+      #  ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: "path/to/sqlite.db")
+      #  arh = ActiveRecord::Base.connection
+      #  ds.write_sql(arh,"test")
+      def write_sql(arh, table)
+        DaruLite::IO.dataframe_write_sql self, arh, table
       end
 
       # Use marshalling to save dataframe to a file.

data/lib/daru_lite/data_frame/iterable.rb

@@ -68,8 +68,8 @@ module DaruLite
       #
       # * +axis+ - The axis to iterate over. Can be :vector (or :column)
       # or :row. Default to :vector.
-      def each(axis = :vector, &block)
-        dispatch_to_axis axis, :each, &block
+      def each(axis = :vector, &)
+        dispatch_to_axis(axis, :each, &)
       end
 
       # Iterate over a row or vector and return results in a DaruLite::Vector.
@@ -87,8 +87,8 @@ module DaruLite
       #
       # * +axis+ - The axis to iterate over. Can be :vector (or :column)
       # or :row. Default to :vector.
-      def collect(axis = :vector, &block)
-        dispatch_to_axis_pl axis, :collect, &block
+      def collect(axis = :vector, &)
+        dispatch_to_axis_pl(axis, :collect, &)
       end
 
       # Map over each vector or row of the data frame according to
@@ -107,8 +107,8 @@ module DaruLite
       #
       # * +axis+ - The axis to map over. Can be :vector (or :column) or :row.
       # Default to :vector.
-      def map(axis = :vector, &block)
-        dispatch_to_axis_pl axis, :map, &block
+      def map(axis = :vector, &)
+        dispatch_to_axis_pl(axis, :map, &)
       end
 
       # Destructive map. Modifies the DataFrame. Each run of the block
@@ -119,11 +119,11 @@ module DaruLite
       #
       # * +axis+ - The axis to map over. Can be :vector (or :column) or :row.
       # Default to :vector.
-      def map!(axis = :vector, &block)
+      def map!(axis = :vector, &)
         if %i[vector column].include?(axis)
-          map_vectors!(&block)
+          map_vectors!(&)
         elsif axis == :row
-          map_rows!(&block)
+          map_rows!(&)
         end
       end
 
@@ -144,8 +144,8 @@ module DaruLite
       #
       # * +axis+ - The axis to map over. Can be :vector (or :column) or :row.
       # Default to :vector.
-      def recode(axis = :vector, &block)
-        dispatch_to_axis_pl axis, :recode, &block
+      def recode(axis = :vector, &)
+        dispatch_to_axis_pl(axis, :recode, &)
       end
 
       # Replace specified values with given value

data/lib/daru_lite/data_frame/queryable.rb

@@ -31,9 +31,9 @@ module DaruLite
       #   df.any?(:row) do |row|
       #     row[:a] < 3 and row[:b] == 'b'
       #   end #=> true
-      def any?(axis = :vector, &block)
+      def any?(axis = :vector, &)
         if %i[vector column].include?(axis)
-          @data.any?(&block)
+          @data.any?(&)
         elsif axis == :row
           each_row do |row|
             return true if yield(row)
@@ -53,11 +53,11 @@ module DaruLite
       #   df.all?(:row) do |row|
       #     row[:a] < 10
       #   end #=> true
-      def all?(axis = :vector, &block)
+      def all?(axis = :vector, &)
         if %i[vector column].include?(axis)
-          @data.all?(&block)
+          @data.all?(&)
         elsif axis == :row
-          each_row.all?(&block)
+          each_row.all?(&)
         else
           raise ArgumentError, "Unidentified axis #{axis}"
         end

data/lib/daru_lite/dataframe.rb

@@ -38,6 +38,8 @@ module DaruLite
     include DaruLite::Maths::Arithmetic::DataFrame
     include DaruLite::Maths::Statistics::DataFrame
 
+    AXES = %i[row vector].freeze
+
     attr_accessor(*Configuration::INSPECT_OPTIONS_KEYS)
 
     extend Gem::Deprecate
@@ -289,8 +291,8 @@ module DaruLite
     def delete_at_position(position)
       raise IndexError, "Position #{position} does not exist." unless position < size
 
-      each_vector { |vector| vector.delete_at_position(position) }
       @index = @index.delete_at(position)
+      each_vector { |vector| vector.delete_at_position(position) }
 
       set_size
     end
@@ -478,15 +480,17 @@ module DaruLite
       self
     end
 
-    def method_missing(name, *args, &block)
-      if /(.+)=/.match?(name)
-        name = name[/(.+)=/].delete('=')
+    def method_missing(name, *args, &)
+      stringified_name = name.to_s
+
+      if /^([^=]+)=/.match?(stringified_name)
+        name = stringified_name[/^([^=]+)=/].delete('=')
         name = name.to_sym unless has_vector?(name)
         insert_or_modify_vector [name], args[0]
       elsif has_vector?(name)
         self[name]
-      elsif has_vector?(name.to_s)
-        self[name.to_s]
+      elsif has_vector?(stringified_name)
+        self[stringified_name]
       else
         super
       end
@@ -527,28 +531,26 @@ module DaruLite
       end
     end
 
-    def dispatch_to_axis(axis, method, *args, &block)
+    def dispatch_to_axis(axis, method, *, &)
       if %i[vector column].include?(axis)
-        send(:"#{method}_vector", *args, &block)
+        send(:"#{method}_vector", *, &)
       elsif axis == :row
-        send(:"#{method}_row", *args, &block)
+        send(:"#{method}_row", *, &)
       else
         raise ArgumentError, "Unknown axis #{axis}"
       end
     end
 
-    def dispatch_to_axis_pl(axis, method, *args, &block)
+    def dispatch_to_axis_pl(axis, method, *, &)
       if %i[vector column].include?(axis)
-        send(:"#{method}_vectors", *args, &block)
+        send(:"#{method}_vectors", *, &)
       elsif axis == :row
-        send(:"#{method}_rows", *args, &block)
+        send(:"#{method}_rows", *, &)
       else
         raise ArgumentError, "Unknown axis #{axis}"
       end
     end
 
-    AXES = %i[row vector].freeze
-
     def extract_axis(names, default = :vector)
       if AXES.include?(names.last)
         names.pop

data/lib/daru_lite/date_time/index.rb

@@ -30,7 +30,7 @@ module DaruLite
         (
           (?<offset>MONTH|YEAR|S|H|MB|ME|M|D|YB|YE) |
           (?<offset>W)(-(?<weekday>#{DOW_REGEXP}))?
-        )$/x.freeze
+        )$/x
 
       # Generates a DaruLite::DateOffset object for generic offsets or one of the
       # specialized classed within DaruLite::Offsets depending on the 'frequency'
@@ -131,7 +131,7 @@ module DaruLite
         end
       end
 
-      DATE_PRECISION_REGEXP = /^(\d\d\d\d)(-\d{1,2}(-\d{1,2}( \d{1,2}(:\d{1,2}(:\d{1,2})?)?)?)?)?$/.freeze
+      DATE_PRECISION_REGEXP = /^(\d\d\d\d)(-\d{1,2}(-\d{1,2}( \d{1,2}(:\d{1,2}(:\d{1,2})?)?)?)?)?$/
       DATE_PRECISIONS = [nil, :year, :month, :day, :hour, :min, :sec].freeze
 
       def determine_date_precision_of(date_string)
@@ -222,8 +222,8 @@ module DaruLite
       new(source, freq: :infer) if source && ArrayHelper.array_of?(source, ::DateTime)
     end
 
-    def each(&block)
-      to_a.each(&block)
+    def each(&)
+      to_a.each(&)
     end
 
     attr_reader :frequency, :offset, :periods, :keys
@@ -367,20 +367,20 @@ module DaruLite
       end
     end
 
-    def pos(*args)
+    def pos(*)
       # to filled
-      out = self[*args]
+      out = self[*]
       return out if out.is_a? Numeric
 
       out.map { |date| self[date] }
     end
 
-    def subset(*args)
-      self[*args]
+    def subset(*)
+      self[*]
     end
 
-    def valid?(*args)
-      self[*args]
+    def valid?(*)
+      self[*]
       true
     rescue IndexError
       false

data/lib/daru_lite/extensions/which_dsl.rb

@@ -12,8 +12,8 @@ module DaruLite
     # df.which{ (`NameTitle` == 'Dr') & (`Sex` == 'female') }
     # equals
     # df.where( df['NameTitle'].eq('Dr') & df['Sex'].eq('female') )
-    def which(&block)
-      WhichQuery.new(self, &block).exec
+    def which(&)
+      WhichQuery.new(self, &).exec
     end
   end
 

data/lib/daru_lite/index/index.rb

@@ -20,7 +20,7 @@ module DaruLite
 
     # We over-ride the .new method so that any sort of Index can be generated
     # from DaruLite::Index based on the types of arguments supplied.
-    def self.new(*args, &block)
+    def self.new(*args, &)
       # FIXME: I'm not sure this clever trick really deserves our attention.
       # Most of common ruby libraries just avoid it in favor of usual
       # factor method, like `Index.create`. When `Index.new(...).class != Index`
@@ -29,7 +29,7 @@ module DaruLite
 
       MultiIndex.try_from_tuples(source) ||
         DateTimeIndex.try_create(source) ||
-        allocate.tap { |i| i.send :initialize, *args, &block }
+        allocate.tap { |i| i.send(:initialize, *args, &) }
     end
 
     def self.coerce(maybe_index)
@@ -200,7 +200,7 @@ module DaruLite
     end
 
     def to_a
-      @keys
+      @keys.dup
     end
 
     def key(value)
@@ -377,7 +377,7 @@ module DaruLite
     def numeric_pos(key)
       if @relation_hash.key?(key)
         @relation_hash[key]
-      elsif key.is_a?(Numeric) && (key < size && key >= -size)
+      elsif key.is_a?(Numeric) && key < size && key >= -size
         key
       else
         raise IndexError, "Specified index #{key.inspect} does not exist"

data/lib/daru_lite/index/multi_index.rb

@@ -1,11 +1,11 @@
 module DaruLite
   class MultiIndex < Index # rubocop:disable Metrics/ClassLength
-    def each(&block)
-      to_a.each(&block)
+    def each(&)
+      to_a.each(&)
     end
 
-    def map(&block)
-      to_a.map(&block)
+    def map(&)
+      to_a.map(&)
     end
 
     attr_reader :labels, :name
@@ -196,6 +196,15 @@ module DaruLite
       DaruLite::MultiIndex.from_tuples(to_a + [indexes])
     end
 
+    # Takes a positional value and returns a new Index without the element at given position
+    # @param position [Integer] positional value
+    # @return [object] index object
+    def delete_at(position)
+      indexes = to_a
+      indexes.delete_at(position)
+      self.class.from_tuples(indexes)
+    end
+
     def reorder(new_order)
       from = to_a
       MultiIndex.from_tuples(new_order.map { |i| from[i] })

data/lib/daru_lite/io/io.rb

@@ -1,7 +1,11 @@
 module DaruLite
   require_relative 'csv/converters'
+
   module IOHelpers
     class << self
+      INT_PATTERN = /^[-+]?\d+$/
+      FLOAT_PATTERN = /^[-+]?\d+[,.]?\d*(e-?\d+)?$/
+
       def process_row(row, empty)
         row.to_a.map do |c|
           if empty.include?(c)
@@ -23,9 +27,6 @@ module DaruLite
 
       private
 
-      INT_PATTERN = /^[-+]?\d+$/.freeze
-      FLOAT_PATTERN = /^[-+]?\d+[,.]?\d*(e-?\d+)?$/.freeze
-
       def try_string_to_number(s)
         case s
         when INT_PATTERN
@@ -41,6 +42,8 @@ module DaruLite
 
   module IO
     class << self
+      DARU_OPT_KEYS = %i[clone order index name].freeze
+
       # Functions for loading/writing Excel files.
 
       def from_excel(path, opts = {})
@@ -124,7 +127,8 @@ module DaruLite
 
       # Execute a query and create a data frame from the result
       #
-      # @param db [DBI::DatabaseHandle, String] A DBI connection OR Path to a SQlite3 database.
+      # @param db [ActiveRecord::ConnectionAdapters::AbstractAdapter, String] An ActiveRecord connection
+      # OR Path to a SQlite3 database.
       # @param query [String] The query to be executed
       #
       # @return A dataframe containing the data resulting from the query
@@ -134,7 +138,6 @@ module DaruLite
       end
 
       def dataframe_write_sql(ds, dbh, table)
-        require 'dbi'
         query = "INSERT INTO #{table} (#{ds.vectors.to_a.join(',')}) VALUES (#{(['?'] * ds.vectors.size).join(',')})"
         sth   = dbh.prepare(query)
         ds.each_row { |c| sth.execute(*c.to_a) }
@@ -196,8 +199,6 @@ module DaruLite
         DaruLite.error "\nInstall the #{name} gem version #{version} for using  #{name} functions."
       end
 
-      DARU_OPT_KEYS = %i[clone order index name].freeze
-
       def from_csv_prepare_opts(opts)
         opts[:col_sep]           ||= ','
         opts[:skip_blanks]       ||= true
@@ -245,7 +246,7 @@ module DaruLite
       def html_parse_table(table)
         headers, headers_size = html_scrape_tag(table, 'th')
         data, size = html_scrape_tag(table, 'td')
-        data = data.keep_if { |x| x.count == size }
+        data.keep_if { |x| x.count == size }
         order, indice = html_parse_hash(headers, size, headers_size) if headers_size >= size
         return unless (indice.nil? || indice.count == data.count) && !order.nil? && order.count.positive?
 
@@ -272,7 +273,7 @@ module DaruLite
       end
 
       def html_search(table, match = nil)
-        match.nil? ? true : (table.to_s.include? match)
+        match.nil? || (table.to_s.include? match)
       end
 
       # Allows user to override the scraped order / index / data