icalPal 3.1.1 → 3.3.0

data/lib/event.rb

@@ -22,13 +22,13 @@ module ICalPal
     # @param k [String] Key/property name
     def [](k)
       case k
-      when 'age' then           # pseudo-property
+      when 'age'                # pseudo-property
         @self['sdate'].year - @self['edate'].year
 
-      when 'availability' then  # Integer -> String
-        EventKit::EKEventAvailability.select { |k, v| v == @self['availability'] }.keys
+      when 'availability'       # Integer -> String
+        EventKit::EKEventAvailability.select { |_k, v| v == @self['availability'] }.keys
 
-      when 'datetime' then      # date[ at time[ - time]]
+      when 'datetime'           # date[ at time[ - time]]
         unless $opts[:sd] || $opts[:days] == 1
           t = @self['sdate'].to_s
           t += ' at ' unless @self['all_day'].positive?
@@ -41,22 +41,22 @@ module ICalPal
         end
         t
 
-      when 'location' then      # location[ address]
-        @self['location']? [ @self['location'], @self['address'] ].join(' ').chop : nil
+      when 'location'           # location[ address]
+        (@self['location'])? [ @self['location'], @self['address'] ].join(' ').chop : nil
 
-      when 'notes' then         # \n -> :nnr
-        @self['notes']? @self['notes'].strip.gsub(/\n/, $opts[:nnr]) : nil
+      when 'notes'              # \n -> :nnr
+        (@self['notes'])? @self['notes'].strip.gsub(/\n/, $opts[:nnr]) : nil
 
-      when 'sday' then        # pseudo-property
+      when 'sday'               # pseudo-property
         ICalPal::RDT.new(*@self['sdate'].to_a[0..2])
 
-      when 'status' then        # Integer -> String
-        EventKit::EKEventStatus.select { |k, v| v == @self['status'] }.keys[0]
+      when 'status'             # Integer -> String
+        EventKit::EKEventStatus.select { |_k, v| v == @self['status'] }.keys[0]
 
-      when 'title' then         # title[ (age N)]
-        @self['title'] + ((@self['calendar'] == 'Birthdays')? " (age #{self['age']})" : "")
+      when 'title'              # title[ (age N)]
+        @self['title'] + ((@self['calendar'] == 'Birthdays')? " (age #{self['age']})" : '')
 
-      when 'uid' then           # for icalBuddy
+      when 'uid'                # for icalBuddy
         @self['UUID']
 
       else @self[k]
@@ -72,20 +72,22 @@ module ICalPal
     def initialize(obj)
       # Placeholder for days with no events
       return @self = {
-               $opts[:sep] => obj,
-               'sdate' => obj,
-               'placeholder' => true,
-               'title' => 'Nothing.',
-             } if DateTime === obj
+        $opts[:sep] => obj,
+        'sdate' => obj,
+        'placeholder' => true,
+        'title' => 'Nothing.',
+      } if DateTime === obj
 
       @self = {}
-      obj.keys.each { |k| @self[k] = obj[k] }
+      obj.each_key { |k| @self[k] = obj[k] }
 
       # Convert JSON arrays to Arrays
       @self['attendees'] = JSON.parse(obj['attendees'])
+      # rubocop: disable Lint/UselessAssignment
       @self['xdate'] = JSON.parse(obj['xdate']).map do |k|
         k = RDT.new(*Time.at(k + ITIME).to_a.reverse[4..]) if k
       end
+      # rubocop: enable Lint/UselessAssignment
 
       # Convert iCal dates to normal dates
       obj.keys.select { |i| i.end_with? '_date' }.each do |k|
@@ -94,7 +96,7 @@ module ICalPal
       end
 
       if @self['start_tz'] == '_float'
-        tzoffset = Time.zone_offset($now.zone())
+        tzoffset = Time.zone_offset($now.zone)
 
         @self['sdate'] = RDT.new(*(@self['sdate'].to_time - tzoffset).to_a.reverse[4..], $now.zone)
         @self['edate'] = RDT.new(*(@self['edate'].to_time - tzoffset).to_a.reverse[4..], $now.zone)
@@ -116,19 +118,19 @@ module ICalPal
     def non_recurring
       events = []
 
-      nDays = (self['duration'] / 86400).to_i
+      nDays = (self['duration'] / 86_400).to_i
 
       # Sanity checks
-      return events if nDays > 100000
+      return events if nDays > 100_000
 
       # Repeat for multi-day events
       (nDays + 1).times do |i|
         break if self['sdate'] > $opts[:to]
 
-        $log.debug("multi-day event #{i + 1}") if (i > 0)
+        $log.debug("multi-day event #{i + 1}") if (i.positive?)
 
         self['daynum'] = i + 1
-        events.push(clone) if in_window?(self['sdate'])
+        events.push(clone) if in_window?(self['sdate'], self['edate'])
 
         self['sdate'] += 1
         self['edate'] += 1
@@ -145,9 +147,9 @@ module ICalPal
       stop = [ $opts[:to], (self['rdate'] || $opts[:to]) ].min
 
       # See if event ends before we start
-      if stop < $opts[:from] then
+      if stop < $opts[:from]
         $log.debug("#{stop} < #{$opts[:from]}")
-        return(Array.new)
+        return([])
       end
 
       # Get changes to series
@@ -159,11 +161,12 @@ module ICalPal
 
       while self['sdate'] <= stop
         # count
-        break if self['count'].positive? and count > self['count']
+        break if self['count'].positive? && count > self['count']
+
         count += 1
 
         # Handle specifier or clone self
-        if self['specifier'] and self['specifier'].length.positive?
+        if self['specifier'] && self['specifier'].length.positive?
           occurrences = get_occurrences(changes)
         else
           occurrences = [ clone ]
@@ -173,18 +176,20 @@ module ICalPal
         occurrences.each do |occurrence|
           changes.each do |change|
             next if change['orig_date'] == self['sdate'].to_i - ITIME
+
             events.push(occurrence) if in_window?(occurrence['sdate'], occurrence['edate'])
           end
         end
 
         break if self['specifier']
+
         apply_frequency!
       end
 
       # Remove exceptions
       events.delete_if { |event| event['xdate'].any?(event['sdate']) }
 
-      return(events)
+      events
     end
 
     private
@@ -192,15 +197,15 @@ module ICalPal
     # @!visibility public
 
     # @return a deep clone of self
-    def clone()
+    def clone
       Marshal.load(Marshal.dump(self))
     end
 
     # Get next occurences of a recurring event from a specifier
     #
-    # @param changes [Array] Recurrence changes for the event
+    # @param _changes [Array] Recurrence changes for the event
     # @return [Array<IcalPal::Event>]
-    def get_occurrences(changes)
+    def get_occurrences(_changes)
       occurrences = []
 
       dow = DOW.keys
@@ -208,7 +213,7 @@ module ICalPal
       moy = 1..12
       nth = nil
 
-      specifier = self['specifier']? self['specifier'] : []
+      specifier = (self['specifier'])? self['specifier'] : []
 
       # Deconstruct specifier
       specifier.split(';').each do |k|
@@ -226,7 +231,7 @@ module ICalPal
 
       # Build array of DOWs
       dows = [ nil ]
-      dow.each { |d| dows.push(DOW[d[-2..-1].to_sym]) }
+      dow.each { |d| dows.push(DOW[d[-2..].to_sym]) }
 
       # Months of the year (O)
       moy.each do |m|
@@ -249,16 +254,14 @@ module ICalPal
           self['sdate'] = ICalPal.nth(nth, dows, nsdate)
           self['edate'] = ICalPal.nth(nth, dows, nedate)
           occurrences.push(clone)
-        else
-          if dows[0]
-            self['sdate'] = RDT.new(nsdate.year, m.to_i, nsdate.wday)
-            self['edate'] = RDT.new(nedate.year, m.to_i, nedate.wday)
-            occurrences.push(clone)
-          end
+        elsif dows[0]
+          self['sdate'] = RDT.new(nsdate.year, m.to_i, nsdate.wday)
+          self['edate'] = RDT.new(nedate.year, m.to_i, nedate.wday)
+          occurrences.push(clone)
         end
       end
 
-      return(occurrences)
+      occurrences
     end
 
     # Apply frequency and interval
@@ -284,27 +287,25 @@ module ICalPal
     # @param s [RDT] Event start
     # @param e [RDT] Event end
     # @return [Boolean]
-    def in_window?(s, e = s)
-      if $opts[:n] then
-        if ($now >= s && $now < e) then
+    def in_window?(s, e)
+      if $opts[:now]
+        if ($now >= s && $now < e)
           $log.debug("now: #{s} to #{e} vs. #{$now}")
-          return(true)
+          true
         else
           $log.debug("not now: #{s} to #{e} vs. #{$now}")
-          return(false)
+          false
         end
+      elsif ([ s, e ].max >= $opts[:from] && s < $opts[:to])
+        $log.debug("in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+        true
       else
-        if ([ s, e ].max >= $opts[:from] && s < $opts[:to]) then
-          $log.debug("in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
-          return(true)
-        else
-          $log.debug("not in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
-          return(false)
-        end
+        $log.debug("not in window: #{s} to #{e} vs. #{$opts[:from]} to #{$opts[:to]}")
+        false
       end
     end
 
-    QUERY = <<~SQL
+    QUERY = <<~SQL.freeze
 SELECT DISTINCT
 
 Store.name AS account,

data/lib/icalPal.rb

@@ -9,7 +9,6 @@ require_relative 'store'
 # Encapsulate the _Store_ (accounts), _Calendar_ and _CalendarItem_
 # tables of a Calendar database, and the _Reminder_ table of a
 # Reminders database
-
 module ICalPal
   attr_reader :self
 
@@ -57,19 +56,21 @@ module ICalPal
 
     rescue SQLite3::BusyException => e
       $log.error("Non-fatal error closing database #{db.filename}")
+      raise e
 
     rescue SQLite3::CantOpenException => e
       $log.debug("Can't open #{db_file}")
+      raise e
 
     rescue SQLite3::SQLException => e
       $log.info("#{db_file}: #{e}")
+      raise e
 
     rescue SQLite3::Exception => e
       abort("#{db_file}: #{e}")
-
     end
 
-    return(rows)
+    rows
   end
 
   # @param obj [ICalPal] A +Store+ or +Calendar+
@@ -93,9 +94,9 @@ module ICalPal
   # @return [CSV::Row] The +Store+, +Calendar+, or +CalendarItem+ as a CSV::Row
   def to_csv(headers)
     values = []
-    headers.each { |h| values.push(@self[h].respond_to?(:gsub)? @self[h].gsub(/\n/, '\n') : @self[h]) }
+    headers.each { |h| values.push((@self[h].respond_to?(:gsub))? @self[h].gsub(/\n/, '\n') : @self[h]) }
 
-    CSV::Row::new(headers, values)
+    CSV::Row.new(headers, values)
   end
 
   # Convert +self+ to XML
@@ -103,44 +104,12 @@ module ICalPal
   # @return [String] All fields in a simple XML format: <field>value</field>.
   # Fields with empty values return <field/>.
   def to_xml
-    retval = ""
-    @self.keys.each { |k| retval += xmlify(k, @self[k]) }
+    retval = ''
+    @self.each_key { |k| retval += xmlify(k, @self[k]) }
 
     retval
   end
 
-  # Convert a key/value pair to XML.  The value should be +nil+, +String+,
-  # +Integer+, +Array+, or +ICalPal::RDT+
-  #
-  # @param key The key
-  # @param value The value
-  # @return [String] The key/value pair in a simple XML format
-  def xmlify(key, value)
-    case value
-    # Nil
-    when NilClass then return("<#{key}/>")
-
-    # String, Integer
-    when String then return("<#{key}>#{value}</#{key}>")
-    when Integer then return("<#{key}>#{value}</#{key}>")
-
-    # Array
-    when Array then
-      # Treat empty arrays as nil values
-      return(xmlify(key, nil)) if value[0] == nil 
-
-      retval = ""
-      value.each { |x| retval += xmlify("#{key}0", x) }
-      return("<#{key}>#{retval}</#{key}>")
-
-    # RDT
-    when ICalPal::RDT then return("<#{key}>#{value.to_s}</#{key}>")
-
-    # Unknown
-    else return("<#{key}>#{value.to_s}</#{key}>")
-    end
-  end
-
   # Get the +n+'th +dow+ in month +m+
   #
   # @param n [Integer] Integer between -4 and +4
@@ -150,7 +119,7 @@ module ICalPal
   def self.nth(n, dow, m)
     # Get the number of days in the month
     a = [ ICalPal::RDT.new(m.year, m.month, 1) ] # First of this month
-    a[1] = (a[0] >> 1) - 1      # First of next month, minus 1 day
+    a[1] = (a[0] >> 1) - 1                       # First of next month, minus 1 day
 
     # Reverse it if going backwards
     a.reverse! if n.negative?
@@ -164,17 +133,28 @@ module ICalPal
   end
 
   # Epoch + 31 years
-  ITIME = 978307200
+  ITIME = 978_307_200
 
   # Days of the week abbreviations used in recurrence rules
   #
   # <tt><i>SU, MO, TU, WE, TH, FR, SA</i></tt>
-  DOW = { 'SU': 0, 'MO': 1, 'TU': 2, 'WE': 3, 'TH': 4, 'FR': 5, 'SA': 6 }
+  DOW = { 'SU': 0, 'MO': 1, 'TU': 2, 'WE': 3, 'TH': 4, 'FR': 5, 'SA': 6 }.freeze
 
   # @!group Accessors
-  def [](k) @self[k] end
-  def []=(k, v) @self[k] = v end
-  def keys() @self.keys end
-  def values() @self.values end
+  def [](k)
+    @self[k]
+  end
+
+  def []=(k, v)
+    @self[k] = v
+  end
+
+  def keys
+    @self.keys
+  end
+
+  def values
+    @self.values
+  end
   # @!endgroup
 end

data/lib/options.rb

@@ -1,3 +1,5 @@
+# rubocop: disable Style/FormatString, Style/FormatStringToken
+
 require 'optparse'
 
 require_relative 'defaults'
@@ -18,12 +20,13 @@ module ICalPal
   #
   # Options can be abbreviated as long as they are unique.
   class Options
+
     # Define the OptionParser
     def initialize
       # prologue
       @op = OptionParser.new
       @op.summary_width = 23
-      @op.banner += " [-c] COMMAND"
+      @op.banner += ' [-c] COMMAND'
       @op.version = ICalPal::VERSION
 
       @op.accept(ICalPal::RDT) { |s| ICalPal::RDT.conv(s) }
@@ -31,30 +34,30 @@ module ICalPal
       # head
       @op.on_head("\nCOMMAND must be one of the following:\n\n")
 
-      @op.on("%s%s %sPrint events" % pad('events'))
-      @op.on("%s%s %sPrint tasks" % pad('tasks'))
-      @op.on("%s%s %sPrint calendars" % pad('calendars'))
-      @op.on("%s%s %sPrint accounts" % pad('accounts'))
+      @op.on('%s%s %sPrint events' % pad('events'))
+      @op.on('%s%s %sPrint tasks' % pad('tasks'))
+      @op.on('%s%s %sPrint calendars' % pad('calendars'))
+      @op.on('%s%s %sPrint accounts' % pad('accounts'))
 
       @op.separator('')
-      @op.on("%s%s %sPrint events occurring today" % pad('eventsToday'))
-      @op.on("%s%s %sPrint events occurring between today and NUM days into the future" % pad('eventsToday+NUM'))
-      @op.on("%s%s %sPrint events occurring at present time" % pad('eventsNow'))
-      @op.on("%s%s %sPrint tasks with a due date" % pad('datedTasks'))
-      @op.on("%s%s %sPrint tasks with no due date" % pad('undatedTasks'))
+      @op.on('%s%s %sPrint events occurring today' % pad('eventsToday'))
+      @op.on('%s%s %sPrint events occurring between today and NUM days into the future' % pad('eventsToday+NUM'))
+      @op.on('%s%s %sPrint events occurring at present time' % pad('eventsNow'))
+      @op.on('%s%s %sPrint tasks with a due date' % pad('datedTasks'))
+      @op.on('%s%s %sPrint tasks with no due date' % pad('undatedTasks'))
 
       # global
       @op.separator("\nGlobal options:\n\n")
 
       @op.on('-c=COMMAND', '--cmd=COMMAND', COMMANDS, 'Command to run')
-      @op.on('--db=DB', "Use DB file instead of Calendar",
+      @op.on('--db=DB', 'Use DB file instead of Calendar',
              "(default: #{$defaults[:common][:db]}",
              'For the tasks commands this should be a directory containing .sqlite files',
              "(default: #{$defaults[:tasks][:db]})")
       @op.on('--cf=FILE', "Set config file path (default: #{$defaults[:common][:cf]})")
       @op.on('-o', '--output=FORMAT', OUTFORMATS,
-            "Print as FORMAT (default: #{$defaults[:common][:output]})", "[#{OUTFORMATS.join(', ')}]")
-      
+             "Print as FORMAT (default: #{$defaults[:common][:output]})", "[#{OUTFORMATS.join(', ')}]")
+
       # include/exclude
       @op.separator("\nIncluding/excluding accounts, calendars, items:\n\n")
 
@@ -64,7 +67,7 @@ module ICalPal
       @op.separator('')
       @op.on('--it=TYPES', Array, 'List of calendar types to include')
       @op.on('--et=TYPES', Array, 'List of calendar types to exclude',
-            "[#{EventKit::EKSourceType.map { |i| i[:name] }.join(', ') }]")
+             "[#{EventKit::EKSourceType.map { |i| i[:name] }.join(', ')}]")
 
       @op.separator('')
       @op.on('--ic=CALENDARS', Array, 'List of calendars to include')
@@ -82,12 +85,12 @@ module ICalPal
 
       @op.on('--from=DATE', ICalPal::RDT, 'List events starting on or after DATE')
       @op.on('--to=DATE', ICalPal::RDT, 'List events starting on or before DATE',
-            'DATE can be yesterday, today, tomorrow, +N, -N, or anything accepted by DateTime.parse()',
-            'See https://ruby-doc.org/stdlib-2.6.1/libdoc/date/rdoc/DateTime.html#method-c-parse')
+             'DATE can be yesterday, today, tomorrow, +N, -N, or anything accepted by DateTime.parse()',
+             'See https://ruby-doc.org/stdlib-2.6.1/libdoc/date/rdoc/DateTime.html#method-c-parse')
       @op.separator('')
       @op.on('-n', 'Include only events from now on')
       @op.on('--days=N',  OptionParser::DecimalInteger,
-            'Show N days of events, including start date')
+             'Show N days of events, including start date')
       @op.on('--sed', 'Show empty dates with --sd')
       @op.on('--ia', 'Include only all-day events')
       @op.on('--ea', 'Exclude all-day events')
@@ -102,7 +105,7 @@ module ICalPal
       @op.on('--itp=PROPERTIES', Array, 'List of task properties to include')
       @op.on('--etp=PROPERTIES', Array, 'List of task properties to exclude')
       @op.on('--atp=PROPERTIES', Array, 'List of task properties to include in addition to the default list',
-            'Included for backwards compatability, these are aliases for --iep, --eep, and --aep')
+             'Included for backwards compatability, these are aliases for --iep, --eep, and --aep')
       @op.separator('')
 
       @op.on('--uid', 'Show event UIDs')
@@ -114,12 +117,10 @@ module ICalPal
       @op.on('--nrd', 'No relative dates')
 
       @op.separator('')
-      @op.separator(@op.summary_indent + 'Properties are listed in the order specified')
+      @op.separator("#{@op.summary_indent}Properties are listed in the order specified")
       @op.separator('')
-      @op.separator(@op.summary_indent +
-                   "Use 'all' for PROPERTIES to include all available properties (except any listed in --eep)")
-      @op.separator(@op.summary_indent +
-                   "Use 'list' for PROPERTIES to list all available properties and exit")
+      @op.separator("#{@op.summary_indent}Use 'all' for PROPERTIES to include all available properties (except any listed in --eep)")
+      @op.separator("#{@op.summary_indent}Use 'list' for PROPERTIES to list all available properties and exit")
 
       # formatting
       @op.separator("\nFormatting the output:\n\n")
@@ -144,7 +145,7 @@ module ICalPal
       @op.separator('')
       @op.on('--df=FORMAT', String, 'Set date format')
       @op.on('--tf=FORMAT', String, 'Set time format',
-            'See https://ruby-doc.org/stdlib-2.6.1/libdoc/date/rdoc/DateTime.html#method-i-strftime for details')
+             'See https://ruby-doc.org/stdlib-2.6.1/libdoc/date/rdoc/DateTime.html#method-i-strftime for details')
 
       @op.separator('')
       @op.on('-b', '--bullet=STRING', String, 'Use STRING for bullets')
@@ -160,16 +161,16 @@ module ICalPal
       @op.separator("\nHelp:\n\n")
 
       @op.on('-h', '--help', 'Show this message') { @op.abort(@op.help) }
-      @op.on('-V', '-v', '--version', "Show version and exit (#{@op.version})") { @op.abort(@op.version)  }
+      @op.on('-V', '-v', '--version', "Show version and exit (#{@op.version})") { @op.abort(@op.version) }
       @op.on('-d', '--debug=LEVEL', /#{Regexp.union(Logger::SEV_LABEL[0..-2]).source}/i,
-            "Set the logging level (default: #{Logger::SEV_LABEL[$defaults[:common][:debug]].downcase})",
-            "[#{Logger::SEV_LABEL[0..-2].join(', ').downcase}]")
+             "Set the logging level (default: #{Logger::SEV_LABEL[$defaults[:common][:debug]].downcase})",
+             "[#{Logger::SEV_LABEL[0..-2].join(', ').downcase}]")
 
       # environment variables
       @op.on_tail("\nEnvironment variables:\n\n")
 
-      @op.on_tail("%s%s %sAdditional arguments" % pad('ICALPAL'))
-      @op.on_tail("%s%s %sAdditional arguments from a file" % pad('ICALPAL_CONFIG'))
+      @op.on_tail('%s%s %sAdditional arguments' % pad('ICALPAL'))
+      @op.on_tail('%s%s %sAdditional arguments from a file' % pad('ICALPAL_CONFIG'))
       @op.on_tail("%s%s %s(default: #{$defaults[:common][:cf]})" % pad(''))
     end
 
@@ -196,7 +197,7 @@ module ICalPal
 
         # Parse eventsNow and eventsToday commands
         cli[:cmd].match('events(Now|Today)(\+[0-9]+)?') do |m|
-          cli[:n] = true if m[1] == 'Now'
+          cli[:now] = true if m[1] == 'Now'
           cli[:days] = (m[1] == 'Today')? m[2].to_i + 1 : 1
 
           cli[:from] = $today
@@ -218,8 +219,8 @@ module ICalPal
           .merge(cli)
 
         # datedTasks and undatedTasks
-        opts[:cmd] = "tasks" if opts[:cmd] == "datedTasks"
-        opts[:cmd] = "tasks" if opts[:cmd] == "undatedTasks"
+        opts[:cmd] = 'tasks' if opts[:cmd] == 'datedTasks'
+        opts[:cmd] = 'tasks' if opts[:cmd] == 'undatedTasks'
 
         # Make sure opts[:db] and opts[:tasks] are Arrays
         opts[:db] = [ opts[:db] ] unless opts[:db].is_a?(Array)
@@ -248,7 +249,7 @@ module ICalPal
         end
 
         # Sorting
-        opts[:sort] = 'due_date' if opts[:std] or opts[:stda]
+        opts[:sort] = 'due_date' if opts[:std] || opts[:stda]
         opts[:reverse] = true if opts[:std]
 
         # Colors
@@ -276,10 +277,10 @@ module ICalPal
     end
 
     # Commands that can be run
-    COMMANDS = %w{events eventsToday eventsNow tasks datedTasks undatedTasks calendars accounts stores}
+    COMMANDS = %w[events eventsToday eventsNow tasks datedTasks undatedTasks calendars accounts stores].freeze
 
     # Supported output formats
-    OUTFORMATS = %w{ansi csv default hash html json md rdoc remind toc xml yaml}
+    OUTFORMATS = %w[ansi csv default hash html json md rdoc remind toc xml yaml].freeze
 
     private
 
@@ -288,7 +289,10 @@ module ICalPal
     # @param t [String] Text on the left side
     # @return [String] Text indented by summary_indent, and padded according to summary_width
     def pad(t)
-      [ @op.summary_indent, t, " " * (@op.summary_width - t.length) ]
+      [ @op.summary_indent, t, ' ' * (@op.summary_width - t.length) ]
     end
+
   end
 end
+
+# rubocop: enable Style/FormatString, Style/FormatStringToken

data/lib/rdt.rb

@@ -3,6 +3,7 @@ require 'date'
 module ICalPal
   # Child class of DateTime that adds support for relative dates (<em><b>R</b>elative<b>D</b>ate<b>T</b>ime</em>).
   class RDT < DateTime
+
     # Convert a String to an RDT
     #
     # @param str [String] can be +yesterday+, +today+, +tomorrow+,
@@ -14,8 +15,8 @@ module ICalPal
       when 'yesterday' then $today - 1
       when 'today' then $today
       when 'tomorrow' then $today + 1
-      when /^\+([0-9]+)/ then $today + $1.to_i
-      when /^\-([0-9]+)/ then $today - $1.to_i
+      when /^\+([0-9]+)/ then $today + Regexp.last_match(1).to_i
+      when /^-([0-9]+)/ then $today - Regexp.last_match(1).to_i
       else parse(str)
       end
     end
@@ -40,7 +41,7 @@ module ICalPal
     end
 
     alias inspect to_s
- 
+
     # @see Time.to_a
     #
     # @return [Array] Self as an array
@@ -56,8 +57,9 @@ module ICalPal
     # @see ICalPal::RDT.to_s
     #
     # @return [Boolean]
-    def ==(obj)
-      self.to_s == obj.to_s
+    def ==(other)
+      self.to_s == other.to_s
     end
+
   end
 end