tabular 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce838dbb77478ecdf4a58442fb9fee69e859d8f3493d5c54b311c6b30ca180d
-  data.tar.gz: e449231b4f9803f3ec9054165383da2f598815cc309706c42c40698b6e82b55a
+  metadata.gz: c5c35d4ee76851e8d43c72b1caaabbc44764b70ccbeb05ce513262209f5b28d3
+  data.tar.gz: 48f2bc1d8234c3c869cab6f3c595b823029220c2bc949f573a0012c5b583e01c
 SHA512:
-  metadata.gz: 31c9d86d64bfc59100a556a89ca6d0b7751540362d2a45e9a0bd7c4d75b581e00937cbe0d22f8df4039b0241e83366deed590ca65faead606750b354e7d0dcbb
-  data.tar.gz: 24a656adf8b0321694fcfc27f2301a060488de6339eb47fa0752609123f5fb9a1f2fa63d784fc46cc3e160c859540cb1e032f18f709e8661a293533fc9f6dbd9
+  metadata.gz: f360ad4dcf92ea57edbc925f2ed1de3785a7acdf26f0cd8258d9d3973586afce38d7c4395b1a725802bb0d565c222aefbdf05965d374972d789a0f52d86df128
+  data.tar.gz: cac61fba15e8858ef709f1c1634e9acd2bed3410f0c438cdb1f328e0c0c46b40485b533aaebbd8e17a688ea9ef9865333c4449378f4b5f959dbb4d4c04b6c18c

data/Gemfile

@@ -1,10 +1,16 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
+ruby ">= 2.4.0"
+
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-gem "minitest", "~> 5.8"
-gem "rake", "~> 10.4"
-gem "roo-xls", "~> 0.0.1", github: "roo-rb/roo-xls", ref: "a316a88d042ca6e28a83c46a0db1906a9feebb62"
-gem "roo", "~> 2.0", github: "roo-rb/roo", ref: "12f3f7b1b9c7cc31cada36db360125531d408405"
+gem "bundler", ">= 2.0"
+gem "bundler-audit"
+gem "minitest"
+gem "rake"
+gem "roo", github: "scottwillson/roo"
+gem "roo-xls"
 
 gemspec

data/Gemfile.lock

@@ -1,49 +1,51 @@
 GIT
-  remote: https://github.com/roo-rb/roo-xls.git
-  revision: a316a88d042ca6e28a83c46a0db1906a9feebb62
-  ref: a316a88d042ca6e28a83c46a0db1906a9feebb62
+  remote: https://github.com/scottwillson/roo.git
+  revision: 7affb556878466faf1a476f2ed5802f6af5b1066
   specs:
-    roo-xls (0.0.1)
-      nokogiri
-      roo (>= 2.0.0)
-      spreadsheet (> 0.9.0)
-
-GIT
-  remote: https://github.com/roo-rb/roo.git
-  revision: 12f3f7b1b9c7cc31cada36db360125531d408405
-  ref: 12f3f7b1b9c7cc31cada36db360125531d408405
-  specs:
-    roo (2.0.0)
-      nokogiri
-      rubyzip (>= 1.0.0)
+    roo (2.8.2)
+      nokogiri (~> 1)
+      rubyzip (>= 1.2.1, < 2.0.0)
 
 PATH
   remote: .
   specs:
-    tabular (0.4.3)
+    tabular (0.4.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 0.18)
     mini_portile2 (2.4.0)
     minitest (5.11.3)
-    nokogiri (1.10.0)
+    nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
-    rake (10.5.0)
-    ruby-ole (1.2.12.1)
+    rake (12.3.2)
+    roo-xls (1.2.0)
+      nokogiri
+      roo (>= 2.0.0, < 3)
+      spreadsheet (> 0.9.0)
+    ruby-ole (1.2.12.2)
     rubyzip (1.2.2)
-    spreadsheet (1.1.8)
+    spreadsheet (1.2.3)
       ruby-ole (>= 1.0)
+    thor (0.20.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  minitest (~> 5.8)
-  rake (~> 10.4)
-  roo (~> 2.0)!
-  roo-xls (~> 0.0.1)!
+  bundler (>= 2.0)
+  bundler-audit
+  minitest
+  rake
+  roo!
+  roo-xls
   tabular!
 
+RUBY VERSION
+   ruby 2.6.0p0
+
 BUNDLED WITH
    2.0.1

data/README

@@ -62,6 +62,7 @@ There's basic test coverage. More comprehensive test coverage needs to be extrac
 
 Changes
 -------
+0.4.6 Gem updates. Lint.
 0.4.3 Gem updates
 0.4.2 Refactor minor ugly things. No behavior changes.
 0.4.0 rchristensen: Add sheet argument to Table.read

data/Rakefile

@@ -1,21 +1,23 @@
-require 'rubygems'
-require 'rake'
+# frozen_string_literal: true
 
-require 'rake/testtask'
+require "rubygems"
+require "rake"
+
+require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
+  test.libs << "lib" << "test"
+  test.pattern = "test/**/*_test.rb"
   test.verbose = true
 end
 
-task :default => :test
+task default: :test
 
-require 'rdoc/task'
+require "rdoc/task"
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?("VERSION") ? File.read("VERSION") : ""
 
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = "rdoc"
   rdoc.title = "tabular #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end

data/lib/tabular.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rubygems"
 
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}/../lib")

data/lib/tabular/blank.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Tabular
   # Don't mess with Object
   module Blank
-    def is_blank?(object)
+    def is_blank?(object) # rubocop:disable Naming/PredicateName
       case object
       when NilClass
         true

data/lib/tabular/column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
   class Column
     attr_reader :key, :column_type
@@ -10,13 +12,13 @@ module Tabular
       @table = table
       @key = self.columns.column_mapper.map(key)
 
-      if @key && @key.to_s["date"]
-        @column_type = :date
-      elsif @key && @key.to_s[/\?\z/]
-        @column_type = :boolean
-      else
-        @column_type = :string
-      end
+      @column_type = if @key && @key.to_s["date"]
+                       :date
+                     elsif @key && @key.to_s[/\?\z/]
+                       :boolean
+                     else
+                       :string
+                     end
     end
 
     def rows
@@ -35,7 +37,7 @@ module Tabular
 
     # Number of zeros to the right of the decimal point. Useful for formtting time data.
     def precision
-      @precision ||= cells.map(&:to_f).map {|n| n.round(3) }.map {|n| n.to_s.split(".").last.gsub(/0+$/, "").length }.max
+      @precision ||= cells.map(&:to_f).map { |n| n.round(3) }.map { |n| n.to_s.split(".").last.gsub(/0+$/, "").length }.max
     end
 
     # Widest string in column
@@ -65,7 +67,6 @@ module Tabular
       key.to_s
     end
 
-
     protected
 
     def columns

data/lib/tabular/column_mapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
   class ColumnMapper
     include Tabular::Blank
@@ -5,22 +7,21 @@ module Tabular
     # Convert +key+ to normalized symbol. Subclass for more complex mapping.
     def map(key)
       return nil if is_blank?(key)
+
       symbolize key
     end
 
     def symbolize(key)
-      begin
-        key.to_s.strip.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-          gsub(/([a-z\d])([A-Z])/,'\1_\2').
-          tr("-", "_").
-          gsub(/ +/, "_").
-          delete(";").
-          downcase.
-          to_sym
-      rescue
-        nil
-      end
+      key.to_s.strip.gsub(/::/, "/")
+         .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+         .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+         .tr("-", "_")
+         .gsub(/ +/, "_")
+         .delete(";")
+         .downcase
+         .to_sym
+    rescue StandardError
+      nil
     end
   end
 end

data/lib/tabular/columns.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
   # The Table's header: a list of Columns.
   class Columns
@@ -5,8 +7,8 @@ module Tabular
     include Tabular::Blank
     include Tabular::Keys
 
-    attr_accessor :column_mapper
-    attr_accessor :renderer
+    attr_writer :column_mapper
+    attr_writer :renderer
 
     # +table+ -- Table
     # +data+ -- array of header names
@@ -28,9 +30,7 @@ module Tabular
     def set_columns(table = Table.new, names = [])
       index = 0
 
-      if names.respond_to?(:keys)
-        names = names.keys
-      end
+      names = names.keys if names.respond_to?(:keys)
 
       @columns = names.map do |name|
         new_column = Tabular::Column.new(table, self, name)
@@ -38,14 +38,23 @@ module Tabular
           @column_indexes[new_column.key] = index
           @columns_by_key[new_column.key] = new_column
         end
-        index = index + 1
+        index += 1
         new_column
       end
     end
 
+    def empty?
+      size.zero?
+    end
+
+    # Deprecated
+    def has_key?(key) # rubocop:disable Naming/PredicateName
+      key? key
+    end
+
     # Is the a Column with this key? Keys are lower-case, underscore symbols.
     # Example: :postal_code
-    def has_key?(key)
+    def key?(key)
       @columns.any? { |column| column.key == key }
     end
 
@@ -67,12 +76,12 @@ module Tabular
     # Add a new Column with +key+
     def <<(key)
       column = Column.new(@table, self, key)
-      unless is_blank?(column.key) || has_key?(key)
-        @column_indexes[column.key] = @columns.size
-        @column_indexes[@columns.size] = column
-        @columns_by_key[column.key] = column
-        @columns << column
-      end
+      return if is_blank?(column.key) || key?(key)
+
+      @column_indexes[column.key] = @columns.size
+      @column_indexes[@columns.size] = column
+      @columns_by_key[column.key] = column
+      @columns << column
     end
 
     def delete(key)

data/lib/tabular/keys.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Tabular
   module Keys
     # Return Symbol for +key+. Translate Column and String. Return +key+ unmodified for anything else.
     def key_to_sym(key)
-      _key = case key
+      case key
       when Column
         key.key
       when String

data/lib/tabular/renderer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
   # Custom display of cells. By default, return to_s.
   #

data/lib/tabular/row.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "date"
 
 module Tabular
@@ -38,7 +40,7 @@ module Tabular
 
     # Set cell value. Adds cell to end of Row and adds new Column if there is no Column for +key_
     def []=(key, value)
-      if columns.has_key?(key)
+      if columns.key?(key)
         @array[columns.index(key)] = value
       else
         @array << value
@@ -52,6 +54,11 @@ module Tabular
       @array.each(&block)
     end
 
+    # Call +block+ for each key
+    def each_key(&block)
+      keys.each(&block)
+    end
+
     # Call +block+ for each cell
     def each_with_key(&block)
       hash.each(&block)
@@ -74,9 +81,7 @@ module Tabular
 
     # Previous Row
     def previous
-      if index > 0
-        @table.rows[index - 1]
-      end
+      @table.rows[index - 1] if index.positive?
     end
 
     # Next Row
@@ -113,13 +118,13 @@ module Tabular
     end
 
     def to_space_delimited
-      _cells = []
+      cells = []
 
-      hash.each do |key, _|
-        _cells << (render(key) || "").ljust(columns[key].width)
+      hash.each_key do |key|
+        cells << (render(key) || "").ljust(columns[key].width)
       end
 
-      _cells.join "   "
+      cells.join "   "
     end
 
     def inspect
@@ -130,7 +135,6 @@ module Tabular
       @array.join(", ").to_s
     end
 
-
     protected
 
     def hash #:nodoc:
@@ -138,13 +142,11 @@ module Tabular
     end
 
     def build_hash #:nodoc:
-      _hash = Hash.new
+      hash = {}
       columns.each do |column|
-        if column.key
-          _hash[column.key] = value_for_hash(column)
-        end
+        hash[column.key] = value_for_hash(column) if column.key
       end
-      _hash
+      hash
     end
 
     def value_for_hash(column) #:nodoc:
@@ -155,7 +157,7 @@ module Tabular
 
       case column.column_type
       when :boolean
-        [ 1, "1", true, "true" ].include?(value)
+        [1, "1", true, "true"].include?(value)
       when :date
         if date?(value)
           value
@@ -167,7 +169,6 @@ module Tabular
       end
     end
 
-
     private
 
     def date?(value)
@@ -181,11 +182,7 @@ module Tabular
         Date.parse(value.to_s, true)
       rescue ArgumentError
         date = parse_invalid_date(value)
-        if date
-          date
-        else
-          raise ArgumentError, "'#{key}' index #{index} #{value}' is not a valid date"
-        end
+        date || raise(ArgumentError, "'#{key}' index #{index} #{value}' is not a valid date")
       end
     end
 

data/lib/tabular/table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
   # Simple Enumerable list of Hashes. Use Table.read(file_path) to read file. Can also create a Table with Table.new. Either
   # pass in data or set options and then call row=.
@@ -7,9 +9,8 @@ module Tabular
     include Tabular::Tables::FileReading
     include Tabular::Zero
 
-    attr_accessor :column_mapper
     attr_accessor :row_mapper
-    attr_reader   :rows
+    attr_reader :column_mapper
 
     def self.read(file, options = {})
       table = Table.new
@@ -29,13 +30,11 @@ module Tabular
 
     # Set table rows. Calls row <<, which creates columns and links the source rows to Row#source.
     def rows=(source_rows = [])
-      return [] unless source_rows
+      return unless source_rows
 
       source_rows.each do |row|
         self.<< row
       end
-
-      rows
     end
 
     # Return Row at zero-based index, or nil if Row is out of bounds
@@ -47,25 +46,23 @@ module Tabular
     # To control how source data is added to the Table, use Table#mapper= to set a class that
     # implements map(row) and returns a Hash.
     def <<(row)
-      if row_mapper
-        cells = row_mapper.map(row)
-      else
-        cells = row
-      end
+      cells = if row_mapper
+                row_mapper.map(row)
+              else
+                row
+              end
 
-      if @columns.nil? || @columns.size == 0
+      if @columns.nil? || @columns.empty?
         @columns = Tabular::Columns.new(self, cells, column_mapper)
-        if !cells.respond_to?(:keys)
-          return columns
-        end
+        return columns unless cells.respond_to?(:keys)
       end
 
-      _row = Tabular::Row.new(self, cells, row)
-      _row.keys.each do |key|
+      new_row = Tabular::Row.new(self, cells, row)
+      new_row.each_key do |key|
         columns << key
       end
-      rows << _row
-      _row
+      rows << new_row
+      new_row
     end
 
     def inspect
@@ -78,27 +75,25 @@ module Tabular
     end
 
     # Remove all columns that only contain a blank string, zero, or nil
-    def delete_blank_columns!(*_options)
-      exceptions = extract_exceptions(_options)
+    def delete_blank_columns!(*options)
+      exceptions = extract_exceptions(options)
 
       (columns.map(&:key) - exceptions).each do |key|
-        if rows.all? { |row| is_blank?(row[key]) || is_zero?(row[key]) }
+        if rows.all? { |row| is_blank?(row[key]) || is_zero?(row[key]) } # rubocop:disable Style/IfUnlessModifier
           delete_column key
         end
       end
     end
 
     # Remove all columns that contain the same value in all rows
-    def delete_homogenous_columns!(*_options)
+    def delete_homogenous_columns!(*options)
       return if rows.size < 2
 
-      exceptions = extract_exceptions(_options)
+      exceptions = extract_exceptions(options)
 
       (columns.map(&:key) - exceptions).each do |key|
         value = rows.first[key]
-        if rows.all? { |row| row[key] == value }
-          delete_column key
-        end
+        delete_column key if rows.all? { |row| row[key] == value }
       end
     end
 
@@ -142,9 +137,7 @@ module Tabular
     end
 
     def column_mapper=(mapper)
-      if rows.nil? || rows.size == 0
-        @columns = nil
-      end
+      @columns = nil if rows.nil? || rows.empty?
       @column_mapper = mapper
     end
 
@@ -154,14 +147,13 @@ module Tabular
     end
 
     def to_space_delimited
-      ([ columns ] + rows).map(&:to_space_delimited).join("\n") << "\n"
+      ([columns] + rows).map(&:to_space_delimited).join("\n") << "\n"
     end
 
     def to_s
       "#<#{self.class} #{rows.size}>"
     end
 
-
     private
 
     def extract_exceptions(options)

data/lib/tabular/tables/file_reading.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
   module Tables
     module FileReading
@@ -12,43 +14,39 @@ module Tabular
         format ||= format_from(format, file_path)
 
         self.rows = case format
-        when :xls, :xlsx
-          # Set to first sheet if undefined.
-          sheet ||= 0
-          read_spreadsheet file_path, format, sheet
-        when :txt
-          read_txt file_path
-        when :csv
-          read_csv file_path
-        else
-          raise "Cannot read '#{format}' format. Expected :xls, :xlsx, :txt, or :csv"
-        end
+                    when :xls, :xlsx
+                      # Set to first sheet if undefined.
+                      sheet ||= 0
+                      read_spreadsheet file_path, format, sheet
+                    when :txt
+                      read_txt file_path
+                    when :csv
+                      read_csv file_path
+                    else
+                      raise "Cannot read '#{format}' format. Expected :xls, :xlsx, :txt, or :csv"
+                    end
       end
 
       def format_from(as_option, file_path)
-        if as_option
-          as_option
-        else
-          case File.extname(file_path)
-          when ".xls"
-            :xls
-          when ".xlsx"
-            :xlsx
-          when ".txt"
-            :txt
-          when ".csv"
-            :csv
-          end
-        end
+        as_option || case File.extname(file_path)
+                     when ".xls"
+                       :xls
+                     when ".xlsx"
+                       :xlsx
+                     when ".txt"
+                       :txt
+                     when ".csv"
+                       :csv
+                     end
       end
 
       def to_file_path(file)
         file_path = case file
-        when File
-           file.path
-        else
-          file
-        end
+                    when File
+                      file.path
+                    else
+                      file
+                    end
 
         raise "Could not find '#{file_path}'" unless File.exist?(file_path)
 
@@ -68,7 +66,7 @@ module Tabular
         # Row#to_a coerces Excel data to Strings, but we want Dates and Numbers
         data = []
         excel.sheet(sheet).each do |excel_row|
-          data << excel_row.inject([]) { |row, cell| row << cell; row }
+          data << excel_row.each_with_object([]) { |cell, row| row << cell }
         end
         data
       end

data/lib/tabular/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tabular
-  VERSION = "0.4.4"
+  VERSION = "0.4.6"
 end

data/lib/tabular/zero.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 module Tabular
   module Zero
-    def is_zero?(object)
-      if object.respond_to?(:zero?)
-        return object.zero?
-      end
-  
+    def is_zero?(object) # rubocop:disable Naming/PredicateName
+      return object.zero? if object.respond_to?(:zero?)
+
       case object
       when NilClass, FalseClass, TrueClass
         false

data/tabular.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("../lib", __FILE__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 require "tabular/version"
 
@@ -9,9 +11,9 @@ Gem::Specification.new do |s|
   s.authors = ["Scott Willson"]
   s.description = "Tabular is a Ruby library for reading, writing, and manipulating CSV, tab-delimited and Excel data."
   s.email = "scott.willson@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README"
+  s.extra_rdoc_files = %w[
+    LICENSE
+    README
   ]
   s.files = [
     "Gemfile",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabular
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Scott Willson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-05-19 00:00:00.000000000 Z
 dependencies: []
 description: Tabular is a Ruby library for reading, writing, and manipulating CSV,
   tab-delimited and Excel data.
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Read, write, and manipulate CSV, tab-delimited and Excel data