fat_table 0.9.5 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10cc3b0171ec07f74b9e7067c0204c4f828271d18e648bf540664fdaa33b7af9
-  data.tar.gz: a95c4ab0fc7bfda4a00df537c2ad06383d67c77eb9b5b5007c9033008459d679
+  metadata.gz: baa77411122a8531eae63a312545846cb1a496a808e57aa8e2660dc720950144
+  data.tar.gz: d4000cda7c6b01dc18bf0baf8a9b6150882ae2189f2e3a1ccfcc750cc8f952d2
 SHA512:
-  metadata.gz: c3dd880a234f88c9c507b01854397e458b4987786cac9c5667f4697253dc4781b1833976251c95cfdfdd3c4ff6e9d033911e2ba02bcb6d04b92567f1beab8c3b
-  data.tar.gz: 6fb2f3309586c0053dc89cddee3509e934943ee70a2ffc105fd1b257eaec1ce81ff3deffce5ae5a389cf4461f716c54d6ae661102530ad4f3624bec34632e74e
+  metadata.gz: 56752060d0e589fb35b71d31f046a01fd307f6958f6383d6ae564dfcd12981f7ed41223b0266f693df281ef04fb412bc748bb448d7b65fceb4331135a6d87816
+  data.tar.gz: f54634a20445d7715cb8608bd4eef5851229e2a2085dd1924bb8279c6f2779db879aec281de57d810715fee388e116abba70ff7f0956d70a8d2f8de9fa76cf01

data/.envrc

@@ -0,0 +1 @@
+PATH_add .bundle/bin

data/.gitignore

@@ -26,3 +26,4 @@
 /GTAGS
 /TAGS
 /README.pyg
+/.ruby-version

data/.rubocop.yml

@@ -2,6 +2,9 @@ inherit_from:
   - ~/.rubocop.yml
 
 AllCops:
+  Include:
+    - 'lib/**/*'
+    - 'spec/**/*'
   Exclude:
     - 'test/tmp/**/*'
     - 'vendor/bundle/**/*'
@@ -14,3 +17,9 @@ Style/MethodCallWithArgsParentheses:
 Style/ClassAndModuleChildren:
   Exclude:
     - 'test/**/*'
+
+Naming/VariableName:
+  Enabled: false
+
+RSpec/VariableName:
+  Enabled: false

data/Gemfile

@@ -4,3 +4,18 @@ gem 'rubocop-shopify', require: false
 
 # Specify your gem's dependencies in fat_table.gemspec
 gemspec
+
+gem 'bundler'
+gem 'debug', '>= 1.0.0'
+gem 'pry'
+gem 'pry-doc'
+gem 'rake', '~> 13.0'
+gem 'redcarpet'
+gem 'pg'
+gem 'sqlite3'
+gem 'rspec', '~> 3.0'
+gem 'rubocop'
+gem 'rubocop-rspec'
+gem 'rubocop-rake'
+gem 'rubocop-performance'
+gem 'simplecov'

data/README.org

@@ -79,90 +79,10 @@ org-mode buffer as an org-table, ready for processing by other code blocks.
   - [[#quick-start][Quick Start]]
   - [[#a-word-about-the-examples][A Word About the Examples]]
   - [[#anatomy-of-a-table][Anatomy of a Table]]
-    - [[#columns][Columns]]
-    - [[#headers][Headers]]
-    - [[#groups][Groups]]
   - [[#constructing-tables][Constructing Tables]]
-    - [[#empty-tables][Empty Tables]]
-      - [[#without-headers][Without Headers]]
-      - [[#with-headers][With Headers]]
-      - [[#forcing-string-type][Forcing String Type]]
-      - [[#designating-tolerant-columns][Designating "Tolerant" Columns]]
-    - [[#from-csv-or-org-mode-files-or-strings][From CSV or Org Mode files or strings]]
-    - [[#from-arrays-of-arrays][From Arrays of Arrays]]
-      - [[#in-ruby-code][In Ruby Code]]
-      - [[#in-emacs-org-files][In Emacs Org Files]]
-    - [[#from-arrays-of-hashes][From Arrays of Hashes]]
-    - [[#from-sql-queries][From SQL queries]]
-    - [[#marking-groups-in-input][Marking Groups in Input]]
-      - [[#manually][Manually]]
-      - [[#when-reading-in-tables][When Reading in Tables]]
   - [[#accessing-parts-of-tables][Accessing Parts of Tables]]
-    - [[#rows][Rows]]
-    - [[#columns-1][Columns]]
-    - [[#cells][Cells]]
-    - [[#other-table-attributes][Other table attributes]]
   - [[#operations-on-tables][Operations on Tables]]
-    - [[#example-input-tables][Example Input Tables]]
-    - [[#select][Select]]
-      - [[#selecting-existing-columns-also-of-omni][Selecting Existing Columns (Also of :omni)]]
-      - [[#copying-and-renaming-existing-columns][Copying and Renaming Existing Columns.]]
-      - [[#adding-new-columns][Adding New Columns]]
-      - [[#adding-constant-strings-and-other-types-in-select][Adding Constant Strings and Other Types in select]]
-      - [[#custom-instance-variables-and-hooks][Custom Instance Variables and Hooks]]
-      - [[#argument-order-and-boundaries][Argument Order and Boundaries]]
-    - [[#where][Where]]
-    - [[#order_by][Order_by]]
-    - [[#order_with][Order_with]]
-    - [[#group_by][Group_by]]
-    - [[#join][Join]]
-      - [[#join-types][Join Types]]
-      - [[#join-expressions][Join Expressions]]
-      - [[#join-examples][Join Examples]]
-        - [[#inner-joins][Inner Joins]]
-        - [[#left-and-right-joins][Left and Right Joins]]
-        - [[#full-join][Full Join]]
-        - [[#cross-join][Cross Join]]
-    - [[#set-operations][Set Operations]]
-      - [[#unions][Unions]]
-      - [[#intersections][Intersections]]
-      - [[#set-differences-with-except][Set Differences with Except]]
-    - [[#uniq-aka-distinct][Uniq (aka Distinct)]]
-    - [[#remove-groups-with-degroup][Remove groups with degroup!]]
   - [[#formatting-tables][Formatting Tables]]
-    - [[#available-formatter-output-targets][Available Formatter Output Targets]]
-      - [[#output-media][Output Media]]
-      - [[#examples][Examples]]
-        - [[#to-text][To Text]]
-        - [[#to-org][To Org]]
-        - [[#to-term][To Term]]
-        - [[#to-latex][To LaTeX]]
-        - [[#to-aoa-array-of-arrays][To AoA (Array of Arrays)]]
-        - [[#to-aoh-array-of-hashes][To AoH (Array of Hashes)]]
-    - [[#formatting-directives][Formatting Directives]]
-      - [[#all-types-as-strings][All Types as Strings]]
-      - [[#numeric][Numeric]]
-      - [[#datetime][DateTime]]
-      - [[#boolean][Boolean]]
-      - [[#nilclass][NilClass]]
-    - [[#the-format-and-format_for-methods][The ~format~ and ~format_for~ methods]]
-      - [[#table-locations][Table Locations]]
-      - [[#location-priority][Location priority]]
-      - [[#type-and-column-priority][Type and Column priority]]
-    - [[#footers][Footers]]
-      - [[#adding-footers][Adding Footers]]
-      - [[#dynamic-labels][Dynamic Labels]]
-      - [[#aggregators][Aggregators]]
-      - [[#footer-objects][Footer objects]]
-      - [[#footer-examples][Footer Examples]]
-        - [[#built-in-aggregators][Built-in Aggregators]]
-        - [[#string-aggregators][String Aggregators]]
-        - [[#ruby-objects][Ruby Objects]]
-        - [[#lambdas][Lambdas]]
-    - [[#invoking-formatters][Invoking Formatters]]
-      - [[#by-instantiating-a-formatter][By Instantiating a Formatter]]
-      - [[#by-using-fattable-module-level-method-calls][By Using ~FatTable~ module-level method calls]]
-      - [[#by-calling-methods-on-table-objects][By Calling Methods on Table Objects]]
 - [[#development][Development]]
 - [[#contributing][Contributing]]
 

data/Rakefile

@@ -2,6 +2,10 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rdoc/task'
 
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
 RDoc::Task.new do |rdoc|
   rdoc.main = 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'lib')
@@ -9,4 +13,4 @@ end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
+task :default => [:spec, :rubocop]

data/fat_table.gemspec

@@ -55,7 +55,7 @@ Gem::Specification.new do |spec|
       'public gem pushes.'
   end
 
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = %x(git ls-files -z).split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
   spec.bindir        = 'bin'
@@ -63,21 +63,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.metadata['yard.run'] = 'yri' # use "yard" to build full HTML docs.
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'debug', '>= 1.0.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-doc'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'redcarpet'
-  spec.add_development_dependency 'pg'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'simplecov'
-
-  spec.add_runtime_dependency 'fat_core', '>= 4.9.0'
-  spec.add_runtime_dependency 'rainbow'
-  spec.add_runtime_dependency 'sequel'
-  spec.add_runtime_dependency 'gem-path'
+  spec.add_dependency 'csv'
+  spec.add_dependency 'fat_core', '>= 4.9.0'
+  spec.add_dependency 'gem-path'
+  spec.add_dependency 'rainbow'
+  spec.add_dependency 'sequel'
 end

data/lib/ext/array.rb

@@ -18,11 +18,11 @@ class Array
       compact.select { |i| i.is_a?(TrueClass) || i.is_a?(FalseClass) }
     elsif typ == 'DateTime'
       compact.select { |i| i.is_a?(Date) || i.is_a?(DateTime) || i.is_a?(Time) }
-        .map { |i| i.to_datetime }
+        .map(&:to_datetime)
     elsif typ == 'Numeric'
       compact.select { |i| i.is_a?(Numeric) }
     elsif typ == 'String'
-      map { |i| i.to_s }
+      map(&:to_s)
     elsif typ == 'NilClass'
       self
     else

data/lib/fat_table/column.rb

@@ -174,9 +174,9 @@ module FatTable
     # Yield each item in the Column in the order in which they appear in the
     # Column. This makes Columns Enumerable, so all the Enumerable methods are
     # available on a Column.
-    def each
-      if block_given?
-        items.each { |itm| yield itm }
+    def each(&block)
+      if block
+        items.each(&block)
         self
       else
         to_enum(:each)
@@ -201,7 +201,7 @@ module FatTable
     # Return the first non-nil item in the Column, or nil if all items are
     # nil.  Works with any Column type.
     def first
-      return nil if items.all?(&:nil?)
+      return if items.all?(&:nil?)
 
       if type == 'String'
         items.reject(&:blank?).first
@@ -214,7 +214,7 @@ module FatTable
 
     # Return the last non-nil item in the Column.  Works with any Column type.
     def last
-      return nil if items.all?(&:nil?)
+      return if items.all?(&:nil?)
 
       if type == 'String'
         items.reject(&:blank?).last
@@ -231,7 +231,7 @@ module FatTable
       return items.size if items.all?(&:nil?)
 
       if type == 'String'
-        items.reject(&:blank?).count.to_d
+        items.count { |i| !i.blank? }
       else
         items.filter_to_type(type).count.to_d
       end
@@ -270,7 +270,7 @@ module FatTable
     # Columns.
     def range
       only_with('range', 'NilClass', 'Numeric', 'String', 'DateTime')
-      return nil if items.all?(&:nil?)
+      return if items.all?(&:nil?)
 
       Range.new(min, max)
     end
@@ -304,7 +304,7 @@ module FatTable
       itms = items.filter_to_type(type)
       size = itms.size.to_d
       if type == 'DateTime'
-        avg_jd = itms.map(&:jd).sum / size
+        avg_jd = itms.sum(&:jd) / size
         DateTime.jd(avg_jd)
       else
         itms.sum / size
@@ -331,6 +331,7 @@ module FatTable
         end
       n = count
       return BigDecimal('0.0') if n <= 1
+
       mu = Column.new(header: :mu, items: all_items).avg
       sq_dev = BigDecimal('0.0')
       all_items.each do |itm|
@@ -353,6 +354,7 @@ module FatTable
       only_with('var', 'DateTime', 'Numeric')
       n = items.filter_to_type(type).size.to_d
       return BigDecimal('0.0') if n <= 1
+
       var * ((n - 1) / n)
     end
 
@@ -471,6 +473,7 @@ module FatTable
     def +(other)
       msg = 'cannot combine columns with different types'
       raise UserError, msg unless type == other.type
+
       Column.new(header: header, items: items + other.items)
     end
 

data/lib/fat_table/convert.rb

@@ -38,6 +38,7 @@ module FatTable
           if new_val.nil?
             raise IncompatibleTypeError
           end
+
           new_val
         end
       when 'DateTime'
@@ -48,6 +49,7 @@ module FatTable
           if new_val.nil?
             raise IncompatibleTypeError
           end
+
           new_val
         end
       when 'Numeric'
@@ -58,6 +60,7 @@ module FatTable
           if new_val.nil?
             raise IncompatibleTypeError
           end
+
           new_val
         end
       when 'String'
@@ -68,6 +71,7 @@ module FatTable
           if new_val.nil?
             raise IncompatibleTypeError
           end
+
           new_val
         end
       else
@@ -80,8 +84,10 @@ module FatTable
     # of case is assumed to be a boolean.
     def self.convert_to_boolean(val)
       return val if val.is_a?(TrueClass) || val.is_a?(FalseClass)
+
       val = val.to_s.clean
-      return nil if val.blank?
+      return if val.blank?
+
       if val.match?(/\A(false|f|n|no)\z/i)
         false
       elsif val.match?(/\A(true|t|y|yes)\z/i)
@@ -94,7 +100,7 @@ module FatTable
                 (?<dy>\d\d?)\s*
                 (T?\s*\d\d:\d\d(:\d\d)?\s*
                 ([-+](\d\d?)(:\d\d?))?)?\s*
-                ((mon|tue|wed|thu|fri|sat|sun)[a-zA-z]*)?\s*
+                ((mon|tue|wed|thu|fri|sat|sun)[a-zA-Z]*)?\s*
                 \z}xi
 
     AMR_DATE_RE = %r{\A(?<dy>\d\d?)[-/](?<mo>\d\d?)[-/](?<yr>\d\d\d\d)\s*
@@ -103,7 +109,7 @@ module FatTable
     # A Date like 'Tue, 01 Nov 2016' or 'Tue 01 Nov 2016' or '01 Nov 2016'.
     # These are emitted by Postgresql, so it makes from_sql constructor
     # possible without special formatting of the dates.
-    INV_DATE_RE = %r{\A((mon|tue|wed|thu|fri|sat|sun)[a-zA-z]*,?)?\s+  # looks like dow
+    INV_DATE_RE = %r{\A((mon|tue|wed|thu|fri|sat|sun)[a-zA-Za-z]*,?)?\s+  # looks like dow
     (?<dy>\d\d?)\s+  # one or two-digit day
     (?<mo_name>[jfmasondJFMASOND][A-Za-z]{2,})\s+  # looks like a month name
     (?<yr>\d\d\d\d) # and a 4-digit year
@@ -122,20 +128,25 @@ module FatTable
 
       begin
         str = val.to_s.clean.sub(/\A[\[\(\{\<]\s*/, '').sub(/[\]\)\}\>]\s*\z/, '')
-        return nil if str.blank?
+        return if str.blank?
 
         if str.match(ISO_DATE_RE)
           date = DateTime.parse(val)
         elsif str =~ AMR_DATE_RE
-          date = DateTime.new(Regexp.last_match[:yr].to_i,
-                              Regexp.last_match[:mo].to_i,
-                              Regexp.last_match[:dy].to_i)
+          date = DateTime.new(
+            Regexp.last_match[:yr].to_i,
+            Regexp.last_match[:mo].to_i,
+            Regexp.last_match[:dy].to_i,
+          )
         elsif str =~ INV_DATE_RE
           mo = Date.mo_name_to_num(last_match[:mo_name])
-          date = DateTime.new(Regexp.last_match[:yr].to_i, mo,
-                              Regexp.last_match[:dy].to_i)
+          date = DateTime.new(
+            Regexp.last_match[:yr].to_i,
+            mo,
+            Regexp.last_match[:dy].to_i,
+          )
         else
-          return nil
+          return
         end
         # val = val.to_date if
         date.seconds_since_midnight.zero? ? date.to_date : date
@@ -155,7 +166,7 @@ module FatTable
       cursym = Regexp.quote(FatTable.currency_symbol)
       clean_re = /[,_#{cursym}]/
       val = val.to_s.clean.gsub(clean_re, '')
-      return nil if val.blank?
+      return if val.blank?
 
       case val
       when /\A[-+]?\d+\.\z/

data/lib/fat_table/evaluator.rb

@@ -50,11 +50,14 @@ module FatTable
     # errors simply return nil as the result.  This can happen, for example,
     # when a string gets into an otherwise numeric column because the column
     # is set to tolerant.
+    #
+    # rubocop:disable  Security/Eval
     def evaluate(expr = '', locals: {})
       eval(expr, local_vars(binding, locals))
-    rescue NoMethodError, TypeError => ex
+    rescue NoMethodError, TypeError
       nil
     end
+    # rubocop:enable  Security/Eval
 
     private
 

data/lib/fat_table/footer.rb

@@ -13,18 +13,20 @@ module FatTable
     # Initialize a labeled footer, optionally specifying a column for the
     # label and whether the footer is to be a group footer. One or more values
     # for the footer are added later with the #add_value method.
-    def initialize(label = 'Total', table, label_col: nil, group: false)
+    def initialize(table, label: 'Total', label_col: nil, group: false)
       @label = label
 
       unless table.is_a?(Table)
         raise ArgumentError, 'Footer.new needs a table argument'
       end
+
       if label_col.nil?
         @label_col = table.headers.first
       else
         unless table.headers.include?(label_col.as_sym)
           raise ArgumentError, "Footer.new label column '#{label_col}' not a header of table."
         end
+
         @label_col = label_col.as_sym
       end
       @table = table
@@ -77,7 +79,7 @@ module FatTable
     # header.
     def [](key)
       key = key.as_sym
-      if values.keys.include?(key)
+      if values.key?(key)
         if group
           values[key]
         else
@@ -140,8 +142,6 @@ module FatTable
           hsh[h] =
             if values[h]
               values[h].first
-            else
-              nil
             end
         end
       end
@@ -243,9 +243,12 @@ module FatTable
           end
         else
           if k
-            raise ArgumentError, "group footer label proc may only have 0, 1, or 2 arguments for group number k and containing footer f"
+            m = "group footer label proc may only have 0, 1, or 2 arguments for group number k and containing footer f"
+            raise ArgumentError, m
+
           else
-            raise ArgumentError, "a non-group footer label proc may only have 0 or 1 arguments for the containing footer f"
+            raise ArgumentError,
+                  "a non-group footer label proc may only have 0 or 1 arguments for the containing footer f"
           end
         end
       else

data/lib/fat_table/formatters/aoa_formatter.rb

@@ -40,7 +40,7 @@ module FatTable
     # eval'ed, we need to escape any single-quotes (') that appear in the
     # string.
     def quote_cell(val)
-      if val.match?(/'/)
+      if val.include?("'")
         # Use a negative look-behind to only quote single-quotes that are not
         # already preceded by a backslash
         val.gsub(/(?<!\\)'/, "'" => "\\'")

data/lib/fat_table/formatters/aoh_formatter.rb

@@ -40,7 +40,7 @@ module FatTable
     # eval'ed, we need to escape any single-quotes (') that appear in the
     # string.
     def quote_cell(val)
-      if val.match?(/'/)
+      if val.include?("'")
         # Use a negative look-behind to only quote single-quotes that are not
         # already preceded by a backslash
         val.gsub(/(?<!\\)'/, "'" => "\\'")