fat_core 1.0.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b32e345632ac5b6bccac049d806eed45e6a2074b
-  data.tar.gz: e585990b0c1b6102e0d96f010107a5ec79b093a0
+  metadata.gz: e60f8326fe791c7c937d2bf069c82312f1a42d73
+  data.tar.gz: 74562c504f4b8104d8f4d5ad3915076f11475ba7
 SHA512:
-  metadata.gz: d57d6d4df7e207a6aec6801ce6af4dff27b696a9e1fa76d301b1d550c7904fa95bc6cd5e275f39ff9e9455d242c965bd6bbf5d04d31414a9f2f67ae4eb9fca9a
-  data.tar.gz: 804231e68d96590a6a898eb0de9e1fd206f1f8e1fbdaa95b59904f25702e971e8db6ba510f02fad2a4116e8e1cac94171dcd0f3f970077cdc4c222daca8a20e0
+  metadata.gz: 16619652648490f700cec9bd6f3f956d501e200e5a5f7606853bf35ec2a5eaa03c40a57dff89aff19d8233893c46b3e11b5cca44bc2c4c57eff873c554acf345
+  data.tar.gz: 2a873b09a9b550c3b58117241134ecc3d9a65e35d77f98fe4621aa52614c1c574a3fbf3ff67f1c5aa4e2eb0f2bcd74f267f5d46329555d2bc8bd6e9eb86124cb

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 /GPATH
 /GRTAGS
 /GTAGS
+/.rubocop_todo.yml

data/.rubocop.yml

@@ -0,0 +1,3 @@
+inherit_from:
+  - '~/.rubocop.yml'
+  - '.rubocop_todo.yml'

data/Rakefile

@@ -1,9 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec, :tag) do |t|
-  t.rspec_opts = "--tag ~online -f p"
+  t.rspec_opts = '--tag ~online -f p'
 end
 
 task :default => :spec

data/fat_core.gemspec

@@ -4,31 +4,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'fat_core/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "fat_core"
+  spec.name          = 'fat_core'
   spec.version       = FatCore::VERSION
-  spec.authors       = ["Daniel E. Doherty"]
-  spec.email         = ["ded@ddoherty.net"]
-  spec.summary       = %q{fat_core provides some useful core extensions}
-  spec.description   = %q{Write a longer description. Optional.}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.authors       = ['Daniel E. Doherty']
+  spec.email         = ['ded@ddoherty.net']
+  spec.summary       = 'fat_core provides some useful core extensions'
+  spec.description   = 'Write a longer description. Optional.'
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.files.reject! { |fn| fn =~ /^NYSE_closings.pdf/ }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "byebug"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rcodetools"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'byebug'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'pry-doc'
+  spec.add_development_dependency 'pry-byebug'
+  spec.add_development_dependency 'rcodetools'
 
-  spec.add_runtime_dependency "activesupport"
-  spec.add_runtime_dependency "erubis"
-  spec.add_runtime_dependency "damerau-levenshtein"
+  spec.add_runtime_dependency 'activesupport'
+  spec.add_runtime_dependency 'erubis'
+  spec.add_runtime_dependency 'damerau-levenshtein'
 end

data/lib/core_extensions/date/fat_core.rb

@@ -1,7 +1,6 @@
 module CoreExtensions
   module Date
     module FatCore
-
     end
   end
 end

data/lib/fat_core.rb

@@ -2,8 +2,9 @@
 require 'date'
 require 'active_support'
 require 'active_support/core_ext'
+require 'csv'
 
-require "fat_core/version"
+require 'fat_core/version'
 
 require 'fat_core/array'
 require 'fat_core/date'
@@ -17,3 +18,6 @@ require 'fat_core/period'
 require 'fat_core/range'
 require 'fat_core/string'
 require 'fat_core/symbol'
+require 'fat_core/evaluator'
+require 'fat_core/column'
+require 'fat_core/table'

data/lib/fat_core/column.rb

@@ -0,0 +1,197 @@
+module FatCore
+  # Column objects are just a thin wrapper around an Array to allow columns to
+  # be summed and have other operations performed on them, but compacting out
+  # nils before proceeding. My original attempt to do this by monkey-patching
+  # Array turned out badly.  This works much nicer.
+  class Column
+    attr_reader :header, :type, :items
+
+    TYPES = %w(NilClass TrueClass FalseClass Date DateTime Numeric String)
+
+    def initialize(header:, type: 'NilClass', items: [])
+      @header = header.as_sym
+      @type = type
+      raise "Unknown column type '#{type}" unless TYPES.include?(@type.to_s)
+      @items = items
+    end
+
+    def <<(itm)
+      items << convert_to_type(itm)
+    end
+
+    def [](k)
+      items[k]
+    end
+
+    def to_a
+      items
+    end
+
+    def size
+      items.size
+    end
+
+    def last_i
+      size - 1
+    end
+
+    # Return a new Column appending the items of other to our items, checking
+    # for type compatibility.
+    def +(other)
+      raise 'Cannot combine columns with different types' unless type == other.type
+      Column.new(header: header, type: type, items: items + other.items)
+    end
+
+    def first
+      items.compact.first
+    end
+
+    def last
+      items.compact.last
+    end
+
+    # Return a string that of the first and last values.
+    def rng_s
+      "#{first}..#{last}"
+    end
+
+    def sum
+      items.compact.sum
+    end
+
+    def min
+      items.compact.min
+    end
+
+    def max
+      items.compact.max
+    end
+
+    def avg
+      sum / items.compact.size.to_d
+    end
+
+    # Convert val to the type of key, a ruby class constant, such as Date,
+    # Numeric, etc. If type is NilClass, the type is open, and a non-blank val
+    # will attempt conversion to one of the allowed types, typing it as a String
+    # if no other type is recognized. If the val is blank, and the type is nil,
+    # the column type remains open. If the val is nil or a blank and the type is
+    # already determined, the val is set to nil, and should be filtered from any
+    # column computations. If the val is non-blank and the column type
+    # determined, raise an error if the val cannot be converted to the column
+    # type. Otherwise, returns the converted val as an object of the correct
+    # class.
+    def convert_to_type(val)
+      case type
+      when 'NilClass'
+        if val.blank?
+          # Leave the type of the column open
+          val = nil
+        else
+          # Only non-blank values are allowed to set the type of the column
+          val_class = val.class
+          val = convert_to_boolean(val) ||
+                convert_to_date_time(val) ||
+                convert_to_numeric(val) ||
+                convert_to_string(val)
+          @type =
+            if val.is_a?(Numeric)
+              'Numeric'
+            else
+              val.class.name
+            end
+          val
+        end
+      when 'TrueClass', 'FalseClass'
+        val_class = val.class
+        val = convert_to_boolean(val)
+        unless val
+          raise "Inconsistent value in a Boolean column #{key} has class #{val_class}"
+        end
+        val
+      when 'DateTime', 'Date'
+        val_class = val.class
+        val = convert_to_date_time(val)
+        unless val
+          raise "Inconsistent value in a DateTime column #{key} has class #{val_class}"
+        end
+        val
+      when 'Numeric'
+        val_class = val.class
+        val = convert_to_numeric(val)
+        unless val
+          raise "Inconsistent value in a Numeric column #{key} has class #{val_class}"
+        end
+        val
+      when 'String'
+        val_class = val.class
+        val = convert_to_string(val)
+        unless val
+          raise "Inconsistent value in a String column #{key} has class #{val_class}"
+        end
+        val
+      else
+        raise "Unknown object of class #{type} in Table"
+      end
+    end
+
+    # Convert the val to a boolean if it looks like one, otherwise return nil.
+    # Any boolean or a string of t, f, true, false, y, n, yes, or no, regardless
+    # of case is assumed to be a boolean.
+    def 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?
+      if val =~ /\Afalse|f|n|no/i
+        false
+      elsif val =~ /\Atrue|t|y|yes\z/i
+        true
+      end
+    end
+
+    # Convert the val to a DateTime if it is either a DateTime, a Date, or a
+    # String that can be parsed as a DateTime, otherwise return nil. It only
+    # recognizes strings that contain a something like '2016-01-14' or
+    # '2/12/1985' within them, otherwise DateTime.parse would treat many bare
+    # numbers as dates, such as '2841381', which it would recognize as a valid
+    # date, but the user probably does not intend it to be so treated.
+    def convert_to_date_time(val)
+      return val if val.is_a?(DateTime)
+      return val.to_datetime if val.is_a?(Date) && type == 'DateTime'
+      return val if val.is_a?(Date)
+      begin
+        val = val.to_s.clean
+        return nil if val.blank?
+        return nil unless val =~ %r{\b\d\d\d\d[-/]\d\d?[-/]\d\d?\b}
+        val = DateTime.parse(val.to_s.clean)
+        val = val.to_date if val.seconds_since_midnight.zero?
+        val
+      rescue ArgumentError
+        return nil
+      end
+    end
+
+    # Convert the val to a Numeric if is already a Numberic or is a String that
+    # looks like one. Any Float is promoted to a BigDecimal. Otherwise return
+    # nil.
+    def convert_to_numeric(val)
+      return BigDecimal.new(val, Float::DIG) if val.is_a?(Float)
+      return val if val.is_a?(Numeric)
+      # Eliminate any commas, $'s, or _'s.
+      val = val.to_s.clean.gsub(/[,_$]/, '')
+      return nil if val.blank?
+      case val
+      when /\A(\d+\.\d*)|(\d*\.\d+)\z/
+        BigDecimal.new(val.to_s.clean)
+      when /\A[\d]+\z/
+        val.to_i
+      when %r{\A(\d+)\s*[:/]\s*(\d+)\z}
+        Rational($1, $2)
+      end
+    end
+
+    def convert_to_string(val)
+      val.to_s
+    end
+  end
+end

data/lib/fat_core/date.rb

@@ -23,45 +23,41 @@ class Date
   # @param str [#to_s] a stringling of the form MM/DD/YYYY
   # @return [Date] the date represented by the string paramenter.
   def self.parse_american(str)
-    if str.to_s =~ %r{\A\s*(\d\d?)\s*/\s*(\d\d?)\s*/\s*(\d?\d?\d\d)\s*\z}
-      year, month, day = $3.to_i, $1.to_i, $2.to_i
-      if year < 100
-        year += 2000
-      end
-      Date.new(year, month, day)
-    else
+    unless str.to_s =~ %r{\A\s*(\d\d?)\s*/\s*(\d\d?)\s*/\s*(\d?\d?\d\d)\s*\z}
       raise ArgumentError, "date string must be of form 'MM?/DD?/YY(YY)?'"
     end
+    year = $3.to_i
+    month = $1.to_i
+    day = $2.to_i
+    year += 2000 if year < 100
+    Date.new(year, month, day)
   end
 
-=begin
-  Convert a 'date spec' to a Date.  A date spec is a short-hand way of
-  specifying a date, relative to the computer clock.  A date spec can
-  interpreted as either a 'from spec' or a 'to spec'.
-
-  @example
-  Assuming that Date.current at the time of execution is 2014-07-26 and
-  using the default spec_type of :from.  The return values are actually Date
-  objects, but are shown below as textual dates.
-
-  A fully specified date returns that date:
-      Date.parse_spec('2001-09-11')  # =>
-
-  Commercial weeks can be specified using, for example W32 or 32W, with the
-  week beginning on Monday, ending on Sunday.
-      Date.parse_spec('2012-W32')    # =>
-      Date.parse_spec('2012-W32', :to) # =>
-      Date.parse_spec('W32') # =>
-
-  A spec of the form Q3 or 3Q returns the beginning or end of calendar
-  quarters.
-      Date.parse_spec('Q3')         # =>
-
-  @param spec [#to_s] a stringling containing the spec to be interpreted
-  @param spec_type [:from, :to] interpret the spec as a from- or to-spec
-    respectively, defaulting to interpretation as a to-spec.
-  @return [Date] a date object equivalent to the date spec
-=end
+  # Convert a 'date spec' to a Date.  A date spec is a short-hand way of
+  # specifying a date, relative to the computer clock.  A date spec can
+  # interpreted as either a 'from spec' or a 'to spec'.
+  # @example
+  #
+  # Assuming that Date.current at the time of execution is 2014-07-26 and
+  # using the default spec_type of :from.  The return values are actually Date
+  # objects, but are shown below as textual dates.
+  #
+  # A fully specified date returns that date:
+  #     Date.parse_spec('2001-09-11')  # =>
+  # Commercial weeks can be specified using, for example W32 or 32W, with the
+  # week beginning on Monday, ending on Sunday.
+  #     Date.parse_spec('2012-W32')    # =>
+  #     Date.parse_spec('2012-W32', :to) # =>
+  #     Date.parse_spec('W32') # =>
+  #
+  # A spec of the form Q3 or 3Q returns the beginning or end of calendar
+  # quarters.
+  #     Date.parse_spec('Q3')         # =>
+  #
+  # @param spec [#to_s] a stringling containing the spec to be interpreted
+  # @param spec_type [:from, :to] interpret the spec as a from- or to-spec
+  #   respectively, defaulting to interpretation as a to-spec.
+  # @return [Date] a date object equivalent to the date spec
   def self.parse_spec(spec, spec_type = :from)
     spec = spec.to_s.strip
     unless [:from, :to].include?(spec_type)
@@ -78,16 +74,22 @@ class Date
       if week_num < 1 || week_num > 53
         raise ArgumentError, "invalid week number (1-53): 'W#{week_num}'"
       end
-      spec_type == :from ? Date.commercial(today.year, week_num).beginning_of_week :
+      if spec_type == :from
+        Date.commercial(today.year, week_num).beginning_of_week
+      else
         Date.commercial(today.year, week_num).end_of_week
+      end
     when /\A(\d\d\d\d)-W(\d\d?)\z/, /\A(\d\d\d\d)-(\d\d?)W\z/
       year = $1.to_i
       week_num = $2.to_i
       if week_num < 1 || week_num > 53
         raise ArgumentError, "invalid week number (1-53): 'W#{week_num}'"
       end
-      spec_type == :from ? Date.commercial(year, week_num).beginning_of_week :
+      if spec_type == :from
+        Date.commercial(year, week_num).beginning_of_week
+      else
         Date.commercial(year, week_num).end_of_week
+      end
     when /^(\d\d\d\d)-(\d)[Qq]$/, /^(\d\d\d\d)-[Qq](\d)$/
       # Year-Quarter
       year = $1.to_i
@@ -96,14 +98,21 @@ class Date
         raise ArgumentError, "bad date format: #{spec}"
       end
       month = quarter * 3
-      spec_type == :from ? Date.new(year, month, 1).beginning_of_quarter :
+      if spec_type == :from
+        Date.new(year, month, 1).beginning_of_quarter
+      else
         Date.new(year, month, 1).end_of_quarter
+      end
     when /^([1234])[qQ]$/, /^[qQ]([1234])$/
       # Quarter only
       this_year = today.year
       quarter = $1.to_i
       date = Date.new(this_year, quarter * 3, 15)
-      spec_type == :from ? date.beginning_of_quarter : date.end_of_quarter
+      if spec_type == :from
+        date.beginning_of_quarter
+      else
+        date.end_of_quarter
+      end
     when /^(\d\d\d\d)-(\d)[Hh]$/, /^(\d\d\d\d)-[Hh](\d)$/
       # Year-Half
       year = $1.to_i
@@ -112,25 +121,42 @@ class Date
         raise ArgumentError, "bad date format: #{spec}"
       end
       month = half * 6
-      spec_type == :from ? Date.new(year, month, 15).beginning_of_half :
+      if spec_type == :from
+        Date.new(year, month, 15).beginning_of_half
+      else
         Date.new(year, month, 1).end_of_half
+      end
     when /^([12])[hH]$/, /^[hH]([12])$/
       # Half only
       this_year = today.year
       half = $1.to_i
       date = Date.new(this_year, half * 6, 15)
-      spec_type == :from ? date.beginning_of_half : date.end_of_half
+      if spec_type == :from
+        date.beginning_of_half
+      else
+        date.end_of_half
+      end
     when /^(\d\d\d\d)-(\d\d?)*$/
       # Year-Month only
-      spec_type == :from ? Date.new($1.to_i, $2.to_i, 1) :
+      if spec_type == :from
+        Date.new($1.to_i, $2.to_i, 1)
+      else
         Date.new($1.to_i, $2.to_i, 1).end_of_month
+      end
     when /\A(\d\d?)\z/
       # Month only
-      spec_type == :from ? Date.new(today.year, $1.to_i, 1) :
+      if spec_type == :from
+        Date.new(today.year, $1.to_i, 1)
+      else
         Date.new(today.year, $1.to_i, 1).end_of_month
+      end
     when /^(\d\d\d\d)$/
       # Year only
-      spec_type == :from ? Date.new($1.to_i, 1, 1) : Date.new($1.to_i, 12, 31)
+      if spec_type == :from
+        Date.new($1.to_i, 1, 1)
+      else
+        Date.new($1.to_i, 12, 31)
+      end
     when /^(to|this_?)?day/
       today
     when /^(yester|last_?)?day/
@@ -138,45 +164,97 @@ class Date
     when /^(this_?)?week/
       spec_type == :from ? today.beginning_of_week : today.end_of_week
     when /last_?week/
-      spec_type == :from ? (today - 1.week).beginning_of_week :
+      if spec_type == :from
+        (today - 1.week).beginning_of_week
+      else
         (today - 1.week).end_of_week
+      end
     when /^(this_?)?biweek/
-      spec_type == :from ? today.beginning_of_biweek : today.end_of_biweek
+      if spec_type == :from
+        today.beginning_of_biweek
+      else
+        today.end_of_biweek
+      end
     when /last_?biweek/
-      spec_type == :from ? (today - 2.week).beginning_of_biweek :
+      if spec_type == :from
+        (today - 2.week).beginning_of_biweek
+      else
         (today - 2.week).end_of_biweek
+      end
     when /^(this_?)?semimonth/
       spec_type == :from ? today.beginning_of_semimonth : today.end_of_semimonth
     when /^last_?semimonth/
-      spec_type == :from ? (today - 15.days).beginning_of_semimonth :
+      if spec_type == :from
+        (today - 15.days).beginning_of_semimonth
+      else
         (today - 15.days).end_of_semimonth
+      end
     when /^(this_?)?month/
-      spec_type == :from ? today.beginning_of_month : today.end_of_month
+      if spec_type == :from
+        today.beginning_of_month
+      else
+        today.end_of_month
+      end
     when /^last_?month/
-      spec_type == :from ? (today - 1.month).beginning_of_month :
+      if spec_type == :from
+        (today - 1.month).beginning_of_month
+      else
         (today - 1.month).end_of_month
+      end
     when /^(this_?)?bimonth/
-      spec_type == :from ? today.beginning_of_bimonth : today.end_of_bimonth
+      if spec_type == :from
+        today.beginning_of_bimonth
+      else
+        today.end_of_bimonth
+      end
     when /^last_?bimonth/
-      spec_type == :from ? (today - 2.month).beginning_of_bimonth :
+      if spec_type == :from
+        (today - 2.month).beginning_of_bimonth
+      else
         (today - 2.month).end_of_bimonth
+      end
     when /^(this_?)?quarter/
-      spec_type == :from ? today.beginning_of_quarter : today.end_of_quarter
+      if spec_type == :from
+        today.beginning_of_quarter
+      else
+        today.end_of_quarter
+      end
     when /^last_?quarter/
-      spec_type == :from ? (today - 3.months).beginning_of_quarter :
+      if spec_type == :from
+        (today - 3.months).beginning_of_quarter
+      else
         (today - 3.months).end_of_quarter
+      end
     when /^(this_?)?half/
-      spec_type == :from ? today.beginning_of_half : today.end_of_half
+      if spec_type == :from
+        today.beginning_of_half
+      else
+        today.end_of_half
+      end
     when /^last_?half/
-      spec_type == :from ? (today - 6.months).beginning_of_half :
+      if spec_type == :from
+        (today - 6.months).beginning_of_half
+      else
         (today - 6.months).end_of_half
+      end
     when /^(this_?)?year/
-      spec_type == :from ? today.beginning_of_year : today.end_of_year
+      if spec_type == :from
+        today.beginning_of_year
+      else
+        today.end_of_year
+      end
     when /^last_?year/
-      spec_type == :from ? (today - 1.year).beginning_of_year :
+      if spec_type == :from
+        (today - 1.year).beginning_of_year
+      else
         (today - 1.year).end_of_year
+      end
     when /^forever/
-      spec_type == :from ? Date::BOT : Date::EOT
+      if spec_type == :from
+        Date::BOT
+      else
+        Date::EOT
+      end
     when /^never/
       nil
     else
@@ -198,7 +276,7 @@ class Date
 
   # Format as an ISO string.
   def iso
-    strftime("%Y-%m-%d")
+    strftime('%Y-%m-%d')
   end
 
   # Format date to TeX documents as ISO strings
@@ -208,23 +286,28 @@ class Date
 
   # Format as an all-numeric string, i.e. 'YYYYMMDD'
   def num
-    strftime("%Y%m%d")
+    strftime('%Y%m%d')
+  end
+
+  def format_by(fmt = '%Y-%m-%d')
+    fmt ||= '%Y-%m-%d'
+    strftime(fmt)
   end
 
   # Format as an inactive Org date (see emacs org-mode)
   def org
-    strftime("[%Y-%m-%d %a]")
+    strftime('[%Y-%m-%d %a]')
   end
 
   # Format as an English string
   def eng
-    strftime("%B %e, %Y")
+    strftime('%B %e, %Y')
   end
 
   # Format date in MM/DD/YYYY form, as typical for the short American
   # form.
   def american
-    strftime "%-m/%-d/%Y"
+    strftime '%-m/%-d/%Y'
   end
 
   # Does self fall on a weekend?
@@ -288,7 +371,7 @@ class Date
   # first day of the odd-numbered months.  E.g., 2014-01-01 to
   # 2014-02-28 is the first bimonth of 2014.
   def beginning_of_bimonth
-    if month % 2 == 1
+    if month.odd?
       beginning_of_month
     else
       (self - 1.month).beginning_of_month
@@ -300,7 +383,7 @@ class Date
   # day of the odd-numbered months.  E.g., 2014-01-01 to 2014-02-28 is
   # the first bimonth of 2014.
   def end_of_bimonth
-    if month % 2 == 1
+    if month.odd?
       (self + 1.month).end_of_month
     else
       end_of_month
@@ -334,7 +417,7 @@ class Date
   # Note: we use a Monday start of the week in the next two methods because
   # commercial week counting assumes a Monday start.
   def beginning_of_biweek
-    if cweek % 2 == 1
+    if cweek.odd?
       beginning_of_week(:monday)
     else
       (self - 1.week).beginning_of_week(:monday)
@@ -342,7 +425,7 @@ class Date
   end
 
   def end_of_biweek
-    if cweek % 2 == 1
+    if cweek.odd?
       (self + 1.week).end_of_week(:monday)
     else
       end_of_week(:monday)
@@ -374,13 +457,11 @@ class Date
   end
 
   def beginning_of_bimonth?
-    month % 2 == 1 &&
-      beginning_of_month == self
+    month.odd? && beginning_of_month == self
   end
 
   def end_of_bimonth?
-    month % 2 == 0 &&
-      end_of_month == self
+    month.even? && end_of_month == self
   end
 
   def beginning_of_month?
@@ -500,13 +581,11 @@ class Date
   #  executive-order-closing-executive-departments-and-agencies-federal-gover
   FED_DECREED_HOLIDAYS =
     [
-     Date.parse('2012-12-24')
-    ]
+      Date.parse('2012-12-24')
+    ].freeze
 
   def self.days_in_month(y, m)
-    if m < 1 || m > 12
-      raise ArgumentError, "illegal month number"
-    end
+    raise ArgumentError, 'illegal month number' if m < 1 || m > 12
     days = Time::COMMON_YEAR_DAYS_IN_MONTH[m]
     if m == 2
       Date.new(y, m, 1).leap? ? 29 : 28
@@ -519,20 +598,14 @@ class Date
     # Return the nth weekday in the given month
     # If n is negative, count from last day of month
     wday = wday.to_i
-    if wday < 0 || wday > 6
-      raise ArgumentError, "illegal weekday number"
-    end
+    raise ArgumentError, 'illegal weekday number' if wday < 0 || wday > 6
     month = month.to_i
-    if month < 1 || month > 12
-      raise ArgumentError, "illegal month number"
-    end
+    raise ArgumentError, 'illegal month number' if month < 1 || month > 12
     n = n.to_i
     if n > 0
       # Set d to the 1st wday in month
       d = Date.new(year, month, 1)
-      while d.wday != wday
-        d += 1
-      end
+      d += 1 while d.wday != wday
       # Set d to the nth wday in month
       nd = 1
       while nd != n
@@ -544,9 +617,7 @@ class Date
       n = -n
       # Set d to the last wday in month
       d = Date.new(year, month, 1).end_of_month
-      while d.wday != wday;
-        d -= 1
-      end
+      d -= 1 while d.wday != wday
       # Set d to the nth wday in month
       nd = 1
       while nd != n
@@ -576,11 +647,11 @@ class Date
     g = (b - f + 1) / 3
     h = (19 * a + b - d - g + 15) % 30
     i, k = c.divmod(4)
-    l = (32 + 2*e + 2*i - h - k) % 7
-    m = (a + 11*h + 22*l) / 451
-    n, p = (h + l - 7*m + 114).divmod(31)
+    l = (32 + 2 * e + 2 * i - h - k) % 7
+    m = (a + 11 * h + 22 * l) / 451
+    n, p = (h + l - 7 * m + 114).divmod(31)
     Date.new(y, n, p + 1)
-   end
+  end
 
   def easter_this_year
     # Return the date of Easter in self's year
@@ -595,7 +666,7 @@ class Date
   def nth_wday_in_month?(n, wday, month)
     # Is self the nth weekday in the given month of its year?
     # If n is negative, count from last day of month
-    self == Date.nth_wday_in_year_month(n, wday, self.year, month)
+    self == Date.nth_wday_in_year_month(n, wday, year, month)
   end
 
   #######################################################
@@ -626,7 +697,7 @@ class Date
     # rigged to fall on Monday except Thanksgiving
 
     # No moveable feasts in certain months
-    if [ 3, 4, 6, 7, 8, 12 ].include?(month)
+    if [3, 4, 6, 7, 8, 12].include?(month)
       false
     elsif monday?
       moveable_mondays = []
@@ -658,7 +729,7 @@ class Date
     return true if FED_DECREED_HOLIDAYS.include?(self)
 
     # Is self a fixed holiday
-    return true if (fed_fixed_holiday? || fed_moveable_feast?)
+    return true if fed_fixed_holiday? || fed_moveable_feast?
 
     if friday? && month == 12 && day == 26
       # If Christmas falls on a Thursday, apparently, the Friday after is
@@ -717,7 +788,7 @@ class Date
     # rigged to fall on Monday except Thanksgiving
 
     # No moveable feasts in certain months
-    return false if [ 6, 7, 8, 10, 12 ].include?(month)
+    return false if [6, 7, 8, 10, 12].include?(month)
 
     case month
     when 1
@@ -733,13 +804,11 @@ class Date
       # Good Friday
       if !friday?
         false
-      else
+      elsif [1898, 1906, 1907].include?(year)
         # Good Friday, the Friday before Easter, except certain years
-        if [1898, 1906, 1907].include?(year)
-          false
-        else
-          (self + 2).easter?
-        end
+        false
+      else
+        (self + 2).easter?
       end
     when 5
       # Memorial Day (Last Monday in May)
@@ -760,17 +829,16 @@ class Date
         if year <= 1968
           is_election_day
         elsif year <= 1980
-          is_election_day && (year % 4 == 0)
+          is_election_day && (year % 4).zero?
         else
           false
         end
       elsif thursday?
-        # Historically Thanksgiving (NYSE closed all day) had been declared to be
-        #   the last Thursday in November until 1938;
-        #   the next-to-last Thursday in November from 1939 to 1941
-        #     (therefore the 3rd Thursday in 1940 and 1941);
-        #   the last Thursday in November in 1942;
-        #   the fourth Thursday in November since 1943;
+        # Historically Thanksgiving (NYSE closed all day) had been declared to
+        #   be the last Thursday in November until 1938; the next-to-last
+        #   Thursday in November from 1939 to 1941 (therefore the 3rd Thursday
+        #   in 1940 and 1941); the last Thursday in November in 1942; the fourth
+        #   Thursday in November since 1943;
         if year < 1938
           nth_wday_in_month?(-1, 4, 11)
         elsif year <= 1941
@@ -895,19 +963,17 @@ class Date
   def nyse_workday?
     !nyse_holiday?
   end
-  alias :trading_day? :nyse_workday?
+  alias trading_day? nyse_workday?
 
   def add_fed_business_days(n)
-    d = self.dup
-    return d if n == 0
+    d = dup
+    return d if n.zero?
     incr = n < 0 ? -1 : 1
     n = n.abs
     while n > 0
       d += incr
-      if d.fed_workday?
-        n -= 1
-      end
-     end
+      n -= 1 if d.fed_workday?
+    end
     d
   end
 
@@ -920,37 +986,33 @@ class Date
   end
 
   def add_nyse_business_days(n)
-    d = self.dup
-    return d if n == 0
+    d = dup
+    return d if n.zero?
     incr = n < 0 ? -1 : 1
     n = n.abs
     while n > 0
       d += incr
-      if d.nyse_workday?
-        n -= 1
-      end
-     end
+      n -= 1 if d.nyse_workday?
+    end
     d
   end
-  alias :add_trading_days :add_nyse_business_days
+  alias add_trading_days add_nyse_business_days
 
   def next_nyse_workday
     add_nyse_business_days(1)
   end
-  alias :next_trading_day :next_nyse_workday
+  alias next_trading_day next_nyse_workday
 
   def prior_nyse_workday
     add_nyse_business_days(-1)
   end
-  alias :prior_trading_day :prior_nyse_workday
+  alias prior_trading_day prior_nyse_workday
 
   # Return self if its a trading day, otherwise skip back to the first prior
   # trading day.
   def prior_until_trading_day
     date = self
-    while !date.trading_day?
-      date -= 1
-    end
+    date -= 1 until date.trading_day?
     date
   end
 
@@ -958,9 +1020,7 @@ class Date
   # later trading day.
   def next_until_trading_day
     date = self
-    while !date.trading_day?
-      date += 1
-    end
+    date += 1 until date.trading_day?
     date
   end
 end