timelord 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7118515e4197e09b3646071ed900c1bcbbf50fb3
+  data.tar.gz: 051c646d81d096f4974362d9339e7632e54d4afd
+SHA512:
+  metadata.gz: 481b6c8914443af20a384f980c433a106a52187cc063def396e2d53127310ea9e5b38f89a4d09e769c9c8d94f2583d0a28998e322256a6935429b69800c94244
+  data.tar.gz: 6531a4775bb7b6c8356755d0195fb19f0863266b7140b54d354ed59f24ff584061c9f5fbfdc571ca8cd02e424ff674fde824cafc096f54bc0fa263669c46e52e

data/Rakefile

@@ -1,13 +1,8 @@
-require 'bundler'
 require 'rdoc/task'
-require 'rubygems/package_task'
+require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 
-specification = Gem::Specification.load("timelord.gemspec")
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = FileList['spec/**/*_spec.rb']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'doc'
@@ -17,10 +12,4 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Gem::PackageTask.new(specification) do |pkg|
-  pkg.need_zip = false
-  pkg.need_tar = false
-end
-
-task :default => [:test]
-task :test => [:spec]
+task :default => [:spec]

data/lib/timelord.rb

@@ -1,16 +1,13 @@
 require 'date'
+require 'timelord/matcher'
+require 'timelord/no_matcher'
+require 'timelord/future'
+require 'timelord/next_weekday'
+require 'timelord/current_weekday'
+require 'timelord/matcher_loader'
 
 class Timelord
-  VERSION = "0.0.6"
-
-  SHORT_MONTHS = %w(jan feb mar apr may jun jul aug sep oct nov dec).freeze
-  LONG_MONTHS = %w(january febuary march april may june july august september october november december).freeze
-  SHORT_MATCHER = SHORT_MONTHS.join('|').freeze
-  LONG_MATCHER = LONG_MONTHS.join('|').freeze
-  ORDINAL_MATCHER = "st|nd|rd|th".freeze
-  DAY_NAMES = %w(monday tuesday wednesday thursday friday saturday sunday).freeze
-  SHORT_DAY_NAMES = %w(mon tue wed thu fri sat sun).freeze
-  DAY_MATCHER = (DAY_NAMES + SHORT_DAY_NAMES).join('|').freeze
+  VERSION = "0.0.7"
 
   def self.set_date(date)
     @today = date
@@ -24,6 +21,10 @@ class Timelord
     @today = Date.today
   end
 
+  def self.matchers
+    @matchers ||= MatcherLoader.new.load_all
+  end
+
   # Parses a date str. Second parameter switches between international and american date formats.
   #
   #   Timelord.parse("Tuesday").to_s # "2011-01-04"
@@ -32,88 +33,9 @@ class Timelord
   #
   # For more examples, check out the spec[https://github.com/halogenandtoast/timelord/blob/master/spec/timelord_spec.rb]
   def self.parse(str, format = :international)
-    if str =~ /\b(\d{4})\/(\d{1,2})\/(\d{1,2})\b/i
-      Date.civil($1.to_i, $2.to_i, $3.to_i)
-    elsif str =~ /\b(\d{4})\-(\d{1,2})\-(\d{1,2})\b/i
-      Date.civil($1.to_i, $2.to_i, $3.to_i)
-    elsif str =~ /\b(\d{1,2})\/(\d{1,2})\/(\d{2}(\d{2})?)\b/i
-      if format == :american
-        Date.civil($3.to_i, $1.to_i, $2.to_i)
-      else
-        Date.civil($3.to_i, $2.to_i, $1.to_i)
-      end
-    elsif str =~ /\b(\d{1,2})\/(\d{1,2})\b/i
-      date = if format == :american
-        Date.civil(today.year, $1.to_i, $2.to_i)
-      else
-        Date.civil(today.year, $2.to_i, $1.to_i)
-      end
-      set_to_future(date)
-    elsif str =~ /\b(\d{1,2})\s+(#{SHORT_MATCHER})\b/i
-      date = Date.civil(today.year, SHORT_MONTHS.index($2.downcase) + 1, $1.to_i)
-      set_to_future(date)
-    elsif str =~ /\b(#{SHORT_MATCHER})\s+(\d{1,2})\b/i
-      date = Date.civil(today.year, SHORT_MONTHS.index($1.downcase) + 1, $2.to_i)
-      set_to_future(date)
-    elsif str =~ /\b(\d{1,2})\s+(#{LONG_MATCHER})\b/i
-      date = Date.civil(today.year, LONG_MONTHS.index($2.downcase) + 1, $1.to_i)
-      set_to_future(date)
-    elsif str =~ /\b(#{LONG_MATCHER})\s+(\d{1,2})\b/i
-      date = Date.civil(today.year, LONG_MONTHS.index($1.downcase) + 1, $2.to_i)
-      set_to_future(date)
-    elsif str =~ /\b(\d{1,2})(#{ORDINAL_MATCHER})\b/i
-      date = Date.civil(today.year, today.month, $1.to_i)
-      set_to_future(date)
-    elsif str =~/\bnext (#{DAY_MATCHER})\b/i
-      expected_index = DAY_NAMES.index($1.downcase) || SHORT_DAY_NAMES.index($1.downcase)
-      next_weekday(expected_index)
-    elsif str =~/\bnext tues\b/
-      next_weekday(DAY_NAMES.index("tuesday"))
-    elsif str =~/\bnext (thur|thurs)\b/
-      next_weekday(DAY_NAMES.index("thursday"))
-    elsif str =~/\b(#{DAY_MATCHER})\b/i
-      expected_index = DAY_NAMES.index($1.downcase) || SHORT_DAY_NAMES.index($1.downcase)
-      current_weekday(expected_index)
-    elsif str =~/\btues\b/
-      current_weekday(DAY_NAMES.index("tuesday"))
-    elsif str =~/\b(thur|thurs)\b/
-      current_weekday(DAY_NAMES.index("thursday"))
-    elsif str =~ /\b(today|tod)\b/i
-      today
-    elsif str =~ /\b(tomorrow|tom)\b/i
-      today + 1
-    end
-  end
-
-  private
-
-  def self.next_weekday(date_index)
-    current_date = today.strftime("%A").downcase
-    current_index = DAY_NAMES.index(current_date)
-    if date_index <= current_index
-      today + (7 - current_index + date_index) + 7
-    else
-      diff = date_index - current_index
-      today + diff + 7
-    end
-  end
-
-  def self.current_weekday(date_index)
-    current_date = today.strftime("%A").downcase
-    current_index = DAY_NAMES.index(current_date)
-    if date_index <= current_index
-      today + (7 - current_index + date_index)
-    else
-      diff = date_index - current_index
-      today + diff
-    end
-  end
-
-  def self.set_to_future(date)
-    today = Date.today
-    if date && date < today
-      date = Date.civil(date.year + 1, date.month, date.day)
-    end
-    return date
+    matchers.
+      map { |matcher| matcher.new(str, format: format, today: today) }.
+      detect(&:matches?).
+      to_date
   end
 end

data/lib/timelord/current_weekday.rb

@@ -0,0 +1,33 @@
+class CurrentWeekday
+  ONE_WEEK = 7
+  ZERO_WEEKS = 0
+
+  def initialize(date_index, today)
+    @date_index = date_index
+    @today = today
+  end
+
+  def to_date
+    today + amount_to_increase
+  end
+
+  private
+  attr_reader :today, :date_index
+
+  def current_index
+    today.cwday - 1
+  end
+
+  def amount_to_increase
+    diff = date_index - current_index
+    diff + number_of_weeks
+  end
+
+  def number_of_weeks
+    if date_index <= current_index
+      ONE_WEEK
+    else
+      ZERO_WEEKS
+    end
+  end
+end

data/lib/timelord/future.rb

@@ -0,0 +1,20 @@
+class Future
+  def initialize(date)
+    @current_date = date.dup
+  end
+
+  def to_date
+    if current_date < today
+      current_date.next_year
+    else
+      current_date
+    end
+  end
+
+  private
+  attr_reader :current_date
+
+  def today
+    Date.today
+  end
+end

data/lib/timelord/matcher.rb

@@ -0,0 +1,24 @@
+class Matcher
+
+  SHORT_MONTHS = %w(jan feb mar apr may jun jul aug sep oct nov dec).freeze
+  LONG_MONTHS = %w(january febuary march april may june july august september october november december).freeze
+  SHORT_MATCHER = SHORT_MONTHS.join('|').freeze
+  LONG_MATCHER = LONG_MONTHS.join('|').freeze
+  ORDINAL_MATCHER = "st|nd|rd|th".freeze
+  DAY_NAMES = %w(monday tuesday wednesday thursday friday saturday sunday).freeze
+  SHORT_DAY_NAMES = %w(mon tue wed thu fri sat sun).freeze
+  DAY_MATCHER = (DAY_NAMES + SHORT_DAY_NAMES).join('|').freeze
+
+  def initialize(string, options = {})
+    @string = string
+    @format = options[:format] || :international
+    @today = options[:today] || Date.today
+  end
+
+  def matches?
+    @match ||= self.class::REGEX.match(string)
+  end
+
+  private
+  attr_reader :string, :match, :format, :today
+end

data/lib/timelord/matcher_loader.rb

@@ -0,0 +1,27 @@
+class MatcherLoader
+  def load_all
+    matchers = files.map { |file| get_class(file) }
+    sort_matchers(matchers) + [NoMatcher]
+  end
+
+  private
+
+  def files
+    Dir.glob(File.join(File.dirname(__FILE__), "matchers", "**"))
+  end
+
+  def get_class(file)
+    require file
+    Object.const_get(get_class_name(file))
+  end
+
+  def get_class_name(file)
+    File.basename(file, ".rb").
+      gsub(/(_[a-z])/) { |a| a[1..-1].upcase }.
+      gsub(/^[a-z]/) { |a| a.upcase }
+  end
+
+  def sort_matchers(matchers)
+    matchers.sort { |a, b| b::REGEX.to_s.length <=> a::REGEX.to_s.length }
+  end
+end

data/lib/timelord/matchers/current_thursday_matcher.rb

@@ -0,0 +1,13 @@
+class CurrentThursdayMatcher < Matcher
+  REGEX = /\b(thur|thurs)\b/
+
+  def to_date
+    CurrentWeekday.new(date_index, today).to_date
+  end
+
+  private
+
+  def date_index
+    DAY_NAMES.index("thursday")
+  end
+end

data/lib/timelord/matchers/current_tuesday_matcher.rb

@@ -0,0 +1,13 @@
+class CurrentTuesdayMatcher < Matcher
+  REGEX = /\btues\b/
+
+  def to_date
+    CurrentWeekday.new(date_index, today).to_date
+  end
+
+  private
+
+  def date_index
+    DAY_NAMES.index("tuesday")
+  end
+end

data/lib/timelord/matchers/current_weekday_matcher.rb

@@ -0,0 +1,13 @@
+class CurrentWeekdayMatcher < Matcher
+  REGEX = /\b(#{DAY_MATCHER})\b/i
+
+  def to_date
+    CurrentWeekday.new(date_index, today).to_date
+  end
+
+  private
+
+  def date_index
+    DAY_NAMES.index(match[1].downcase) || SHORT_DAY_NAMES.index(match[1].downcase)
+  end
+end

data/lib/timelord/matchers/day_long_month_matcher.rb

@@ -0,0 +1,13 @@
+class DayLongMonthMatcher < Matcher
+  REGEX = /\b(\d{1,2})\s+(#{LONG_MATCHER})\b/i
+
+  def to_date
+    Future.new(parse_date).to_date
+  end
+
+  private
+
+  def parse_date
+    Date.civil(today.year, LONG_MONTHS.index(match[2].downcase) + 1, match[1].to_i)
+  end
+end

data/lib/timelord/matchers/day_numeric_month_matcher.rb

@@ -0,0 +1,17 @@
+class DayNumericMonthMatcher < Matcher
+  REGEX = /\b(\d{1,2})\/(\d{1,2})\b/i
+
+  def to_date
+    Future.new(parse_date).to_date
+  end
+
+  private
+
+  def parse_date
+    if format == :american
+      Date.civil(today.year, match[1].to_i, match[2].to_i)
+    else
+      Date.civil(today.year, match[2].to_i, match[1].to_i)
+    end
+  end
+end

data/lib/timelord/matchers/day_short_month_matcher.rb

@@ -0,0 +1,13 @@
+class DayShortMonthMatcher < Matcher
+  REGEX = /\b(\d{1,2})\s+(#{SHORT_MATCHER})\b/i
+
+  def to_date
+    Future.new(parse_date).to_date
+  end
+
+  private
+
+  def parse_date
+    Date.civil(today.year, SHORT_MONTHS.index(match[2].downcase) + 1, match[1].to_i)
+  end
+end

data/lib/timelord/matchers/long_month_day_matcher.rb

@@ -0,0 +1,13 @@
+class LongMonthDayMatcher < Matcher
+  REGEX = /\b(#{LONG_MATCHER})\s+(\d{1,2})\b/i
+
+  def to_date
+    Future.new(parse_date).to_date
+  end
+
+  private
+
+  def parse_date
+    Date.civil(today.year, LONG_MONTHS.index(match[1].downcase) + 1, match[2].to_i)
+  end
+end

data/lib/timelord/matchers/next_thursday_matcher.rb

@@ -0,0 +1,7 @@
+class NextThursdayMatcher < Matcher
+  REGEX = /\bnext (thur|thurs)\b/
+
+  def to_date
+    NextWeekday.new(DAY_NAMES.index("thursday"), today).to_date
+  end
+end

data/lib/timelord/matchers/next_tuesday_matcher.rb

@@ -0,0 +1,7 @@
+class NextTuesdayMatcher < Matcher
+  REGEX = /\bnext tues\b/
+
+  def to_date
+    NextWeekday.new(DAY_NAMES.index("tuesday"), today).to_date
+  end
+end

data/lib/timelord/matchers/next_weekday_matcher.rb

@@ -0,0 +1,13 @@
+class NextWeekdayMatcher < Matcher
+  REGEX = /\bnext (#{DAY_MATCHER})\b/i
+
+  def to_date
+    NextWeekday.new(date_index, today).to_date
+  end
+
+  private
+
+  def date_index
+    DAY_NAMES.index(match[1].downcase) || SHORT_DAY_NAMES.index(match[1].downcase)
+  end
+end

data/lib/timelord/matchers/ordinal_matcher.rb

@@ -0,0 +1,13 @@
+class OrdinalMatcher < Matcher
+  REGEX = /\b(\d{1,2})(#{ORDINAL_MATCHER})\b/i
+
+  def to_date
+    Future.new(parse_date).to_date
+  end
+
+  private
+
+  def parse_date
+    Date.civil(today.year, today.month, match[1].to_i)
+  end
+end

data/lib/timelord/matchers/short_month_day_matcher.rb

@@ -0,0 +1,13 @@
+class ShortMonthDayMatcher < Matcher
+  REGEX = /\b(#{SHORT_MATCHER})\s+(\d{1,2})\b/i
+
+  def to_date
+    Future.new(parse_date).to_date
+  end
+
+  private
+
+  def parse_date
+    Date.civil(today.year, SHORT_MONTHS.index(match[1].downcase) + 1, match[2].to_i)
+  end
+end

data/lib/timelord/matchers/today_matcher.rb

@@ -0,0 +1,7 @@
+class TodayMatcher < Matcher
+  REGEX = /\b(today|tod)\b/i
+
+  def to_date
+    today
+  end
+end

data/lib/timelord/matchers/tomorrow_matcher.rb

@@ -0,0 +1,7 @@
+class TomorrowMatcher < Matcher
+  REGEX = /\b(tomorrow|tom)\b/i
+
+  def to_date
+    today + 1
+  end
+end

data/lib/timelord/matchers/year_first_matcher.rb

@@ -0,0 +1,7 @@
+class YearFirstMatcher < Matcher
+  REGEX = /\b(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})\b/i
+
+  def to_date
+    Date.civil(match[1].to_i, match[2].to_i, match[3].to_i)
+  end
+end

data/lib/timelord/matchers/year_last_matcher.rb

@@ -0,0 +1,11 @@
+class YearLastMatcher < Matcher
+  REGEX = /\b(\d{1,2})\/(\d{1,2})\/(\d{2}(\d{2})?)\b/i
+
+  def to_date
+    if format == :american
+      Date.civil(match[3].to_i, match[1].to_i, match[2].to_i)
+    else
+      Date.civil(match[3].to_i, match[2].to_i, match[1].to_i)
+    end
+  end
+end

data/lib/timelord/next_weekday.rb

@@ -0,0 +1,33 @@
+class NextWeekday
+  ONE_WEEK = 7
+  TWO_WEEKS = 14
+
+  def initialize(date_index, today)
+    @date_index = date_index
+    @today = today
+  end
+
+  def to_date
+    today + amount_to_increase
+  end
+
+  private
+  attr_reader :today, :date_index
+
+  def amount_to_increase
+    diff = date_index - current_index
+    diff + number_of_weeks
+  end
+
+  def number_of_weeks
+    if date_index <= current_index
+      TWO_WEEKS
+    else
+      ONE_WEEK
+    end
+  end
+
+  def current_index
+    today.cwday - 1
+  end
+end

data/lib/timelord/no_matcher.rb

@@ -0,0 +1,12 @@
+class NoMatcher
+  def initialize(string, options)
+  end
+
+  def matches?
+    true
+  end
+
+  def to_date
+    nil
+  end
+end

metadata

@@ -1,83 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: timelord
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - Matthew Mongeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-11 00:00:00.000000000Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70233931643220 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233931643220
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70233931641880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233931641880
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70233931640280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70233931640280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: halogenandtoast@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.rdoc
 - LICENSE
+- README.rdoc
 - Rakefile
 - lib/timelord.rb
+- lib/timelord/current_weekday.rb
+- lib/timelord/future.rb
+- lib/timelord/matcher.rb
+- lib/timelord/matcher_loader.rb
+- lib/timelord/matchers/current_thursday_matcher.rb
+- lib/timelord/matchers/current_tuesday_matcher.rb
+- lib/timelord/matchers/current_weekday_matcher.rb
+- lib/timelord/matchers/day_long_month_matcher.rb
+- lib/timelord/matchers/day_numeric_month_matcher.rb
+- lib/timelord/matchers/day_short_month_matcher.rb
+- lib/timelord/matchers/long_month_day_matcher.rb
+- lib/timelord/matchers/next_thursday_matcher.rb
+- lib/timelord/matchers/next_tuesday_matcher.rb
+- lib/timelord/matchers/next_weekday_matcher.rb
+- lib/timelord/matchers/ordinal_matcher.rb
+- lib/timelord/matchers/short_month_day_matcher.rb
+- lib/timelord/matchers/today_matcher.rb
+- lib/timelord/matchers/tomorrow_matcher.rb
+- lib/timelord/matchers/year_first_matcher.rb
+- lib/timelord/matchers/year_last_matcher.rb
+- lib/timelord/next_weekday.rb
+- lib/timelord/no_matcher.rb
 - spec/spec_helper.rb
 - spec/timelord_spec.rb
 homepage: http://github.com/halogenandtoast/timelord
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Pull dates out of strings
 test_files: []