timelord 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7118515e4197e09b3646071ed900c1bcbbf50fb3
-  data.tar.gz: 051c646d81d096f4974362d9339e7632e54d4afd
+  metadata.gz: 9e16c0c0b745d53b8f4553109faf2a416b110265
+  data.tar.gz: 4986c60f6647d7bcb6534f197419544db9ad9fa0
 SHA512:
-  metadata.gz: 481b6c8914443af20a384f980c433a106a52187cc063def396e2d53127310ea9e5b38f89a4d09e769c9c8d94f2583d0a28998e322256a6935429b69800c94244
-  data.tar.gz: 6531a4775bb7b6c8356755d0195fb19f0863266b7140b54d354ed59f24ff584061c9f5fbfdc571ca8cd02e424ff674fde824cafc096f54bc0fa263669c46e52e
+  metadata.gz: f8a573e32f56e46f28e0003af6ec5775cac28cc9d0302119e9e37c13e75ed30bbe6fffd9f179c9180d91b4adbd4d3db9b2ffebc6f0a4c9a7a244bd3708081ef7
+  data.tar.gz: b89cdddbe2e9993578115c7125fe76d82a368266bac956f0ec67dfeb71c6f56f83de237cabe2e4f8c775dddb297b19e8cfc02ebb61a82f01390337b442dc4740

data/README.md

@@ -0,0 +1,33 @@
+# Timelord
+[![Code Climate](https://codeclimate.com/github/halogenandtoast/timelord.png)](https://codeclimate.com/github/halogenandtoast/timelord)
+[![Build Status](https://travis-ci.org/halogenandtoast/timelord.svg?branch=mm-matchers)](https://travis-ci.org/halogenandtoast/timelord)
+
+Timelord parses dates out of strings. The string itself can contain non-date text - for instance: "Call Matt on Tuesday"
+will return a date object for the upcoming Tuesday.
+
+## Usage
+
+```ruby
+require 'timelord'
+Timelord.parse("Tuesday").to_s # "2011-01-04"
+Timelord.parse("On Tuesday go for a walk").to_s # "2011-01-04"
+```
+
+
+For more examples, check out the [spec](https://github.com/halogenandtoast/timelord/blob/master/spec/timelord_spec.rb)
+
+## Date format
+
+The default date format is the international format. 11/01 is January 11th.
+
+To use the american date format pass in :american as the second parameter
+
+```ruby
+Timelord.parse("11/01").to_s # "2011-01-11"
+Timelord.parse("11/01", :american) # "2011-11-01"
+```
+
+## In the future
+
+As of version 0.0.1 all dates without a year automatically choose the next occurrence of that date. If there is demand
+for the ability to retrieve previous dates, then the functionality will be added.

data/lib/timelord.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'timelord/time_parser'
 require 'timelord/matcher'
 require 'timelord/no_matcher'
 require 'timelord/future'
@@ -6,24 +7,8 @@ require 'timelord/next_weekday'
 require 'timelord/current_weekday'
 require 'timelord/matcher_loader'
 
-class Timelord
-  VERSION = "0.0.7"
-
-  def self.set_date(date)
-    @today = date
-  end
-
-  def self.today
-    @today ||= Date.today
-  end
-
-  def self.reset
-    @today = Date.today
-  end
-
-  def self.matchers
-    @matchers ||= MatcherLoader.new.load_all
-  end
+module Timelord
+  VERSION = "0.0.9"
 
   # Parses a date str. Second parameter switches between international and american date formats.
   #
@@ -32,10 +17,7 @@ class Timelord
   #   Timelord.parse("11/01", :american) # "2011-11-01"
   #
   # For more examples, check out the spec[https://github.com/halogenandtoast/timelord/blob/master/spec/timelord_spec.rb]
-  def self.parse(str, format = :international)
-    matchers.
-      map { |matcher| matcher.new(str, format: format, today: today) }.
-      detect(&:matches?).
-      to_date
+  def self.parse(string, options = {})
+    TimeParser.new(string, options).to_date
   end
 end

data/lib/timelord/current_weekday.rb

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

data/lib/timelord/future.rb

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

data/lib/timelord/matcher.rb

@@ -1,24 +1,26 @@
-class Matcher
+module Timelord
+  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
+    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 initialize(string, options = {})
+      @string = string
+      @format = options[:format] || :international
+      @today = options[:today] || Date.today
+    end
 
-  def matches?
-    @match ||= self.class::REGEX.match(string)
-  end
+    def matches?
+      @match ||= self.class::REGEX.match(string)
+    end
 
-  private
-  attr_reader :string, :match, :format, :today
+    private
+    attr_reader :string, :match, :format, :today
+  end
 end

data/lib/timelord/matcher_loader.rb

@@ -1,27 +1,29 @@
-class MatcherLoader
-  def load_all
-    matchers = files.map { |file| get_class(file) }
-    sort_matchers(matchers) + [NoMatcher]
-  end
+module Timelord
+  class MatcherLoader
+    def load_all
+      matchers = files.map { |file| get_class(file) }
+      sort_matchers(matchers) + [NoMatcher]
+    end
 
-  private
+    private
 
-  def files
-    Dir.glob(File.join(File.dirname(__FILE__), "matchers", "**"))
-  end
+    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(file)
+      require file
+      Timelord.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 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 }
+    def sort_matchers(matchers)
+      matchers.sort { |a, b| b::REGEX.to_s.length <=> a::REGEX.to_s.length }
+    end
   end
 end

data/lib/timelord/matchers/current_thursday_matcher.rb

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

data/lib/timelord/matchers/current_tuesday_matcher.rb

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

data/lib/timelord/matchers/current_weekday_matcher.rb

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

data/lib/timelord/matchers/day_long_month_matcher.rb

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

data/lib/timelord/matchers/day_numeric_month_matcher.rb

@@ -1,17 +1,19 @@
-class DayNumericMonthMatcher < Matcher
-  REGEX = /\b(\d{1,2})\/(\d{1,2})\b/i
+module Timelord
+  class DayNumericMonthMatcher < Matcher
+    REGEX = /\b(\d{1,2})\/(\d{1,2})\b/i
 
-  def to_date
-    Future.new(parse_date).to_date
-  end
+    def to_date
+      Future.new(parse_date).to_date
+    end
 
-  private
+    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)
+    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
 end

data/lib/timelord/matchers/day_short_month_matcher.rb

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

data/lib/timelord/matchers/long_month_day_matcher.rb

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

data/lib/timelord/matchers/long_month_matcher.rb

@@ -0,0 +1,15 @@
+module Timelord
+  class LongMonthMatcher < Matcher
+    REGEX = /\b(#{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[1].downcase) + 1)
+    end
+  end
+end

data/lib/timelord/matchers/next_thursday_matcher.rb

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

data/lib/timelord/matchers/next_tuesday_matcher.rb

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

data/lib/timelord/matchers/next_weekday_matcher.rb

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

data/lib/timelord/matchers/ordinal_matcher.rb

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

data/lib/timelord/matchers/short_month_day_matcher.rb

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

data/lib/timelord/matchers/short_month_matcher.rb

@@ -0,0 +1,15 @@
+module Timelord
+  class ShortMonthMatcher < Matcher
+    REGEX = /\b(#{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[1].downcase) + 1)
+    end
+  end
+end

data/lib/timelord/matchers/today_matcher.rb

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

data/lib/timelord/matchers/tomorrow_matcher.rb

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

data/lib/timelord/matchers/year_first_matcher.rb

@@ -1,7 +1,9 @@
-class YearFirstMatcher < Matcher
-  REGEX = /\b(\d{4})[\/\-](\d{1,2})[\/\-](\d{1,2})\b/i
+module Timelord
+  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)
+    def to_date
+      Date.civil(match[1].to_i, match[2].to_i, match[3].to_i)
+    end
   end
 end

data/lib/timelord/matchers/year_last_matcher.rb

@@ -1,11 +1,13 @@
-class YearLastMatcher < Matcher
-  REGEX = /\b(\d{1,2})\/(\d{1,2})\/(\d{2}(\d{2})?)\b/i
+module Timelord
+  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)
+    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
 end

data/lib/timelord/next_weekday.rb

@@ -1,33 +1,35 @@
-class NextWeekday
-  ONE_WEEK = 7
-  TWO_WEEKS = 14
+module Timelord
+  class NextWeekday
+    ONE_WEEK = 7
+    TWO_WEEKS = 14
 
-  def initialize(date_index, today)
-    @date_index = date_index
-    @today = today
-  end
+    def initialize(date_index, today)
+      @date_index = date_index
+      @today = today
+    end
 
-  def to_date
-    today + amount_to_increase
-  end
+    def to_date
+      today + amount_to_increase
+    end
 
-  private
-  attr_reader :today, :date_index
+    private
+    attr_reader :today, :date_index
 
-  def amount_to_increase
-    diff = date_index - current_index
-    diff + number_of_weeks
-  end
+    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
+    def number_of_weeks
+      if date_index <= current_index
+        TWO_WEEKS
+      else
+        ONE_WEEK
+      end
     end
-  end
 
-  def current_index
-    today.cwday - 1
+    def current_index
+      today.cwday - 1
+    end
   end
 end

data/lib/timelord/no_matcher.rb

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

data/lib/timelord/time_parser.rb

@@ -0,0 +1,30 @@
+module Timelord
+  class TimeParser
+    def initialize(string, options)
+      @string = string
+      @options = options
+    end
+
+    def to_date
+      matchers.
+        map { |matcher| matcher.new(string, format: format, today: today) }.
+        detect(&:matches?).
+        to_date
+    end
+
+    private
+    attr_reader :string, :options
+
+    def matchers
+      @matchers ||= MatcherLoader.new.load_all
+    end
+
+    def today
+      @today ||= options.fetch(:today) { Date.today }
+    end
+
+    def format
+      @format||= options.fetch(:format, :international)
+    end
+  end
+end

data/spec/timelord_spec.rb

@@ -8,9 +8,7 @@ describe Timelord, 'parse' do
 
   it "can set today to a different value" do
     actual_date = Time.local(2010,12,5,10,5,0)
-    Timelord.set_date(actual_date)
-    Timelord.parse("today").should == actual_date
-    Timelord.set_date(Date.today)
+    Timelord.parse("today", today: actual_date).should == actual_date
   end
 
   it "returns nil when no time is present" do
@@ -51,12 +49,12 @@ describe Timelord, 'parse' do
 
   it "parses American style dates" do
     first_of_december = Date.today
-    Timelord.parse("On 12/1/2010 I need to do something.", :american).should == first_of_december
+    Timelord.parse("On 12/1/2010 I need to do something.", format: :american).should == first_of_december
   end
 
   it "parses Internation style dates by default" do
     first_of_december = Date.today
-    Timelord.parse("On 1/12/2010 I need to do something.", :international).should == first_of_december
+    Timelord.parse("On 1/12/2010 I need to do something.", format: :international).should == first_of_december
   end
 
   it "parses yyyy/mm/dd" do
@@ -81,10 +79,10 @@ describe Timelord, 'parse' do
 
   it "parses mm/dd" do
     first_of_december = Date.today
-    Timelord.parse("On 12/1 I need to do something.", :american).should == first_of_december
-    Timelord.parse("On 12/01 I need to do something.", :american).should == first_of_december
-    Timelord.parse("On 1/12 I need to do something.", :international).should == first_of_december
-    Timelord.parse("On 01/12 I need to do something.", :international).should == first_of_december
+    Timelord.parse("On 12/1 I need to do something.", format: :american).should == first_of_december
+    Timelord.parse("On 12/01 I need to do something.", format: :american).should == first_of_december
+    Timelord.parse("On 1/12 I need to do something.", format: :international).should == first_of_december
+    Timelord.parse("On 01/12 I need to do something.", format: :international).should == first_of_december
   end
 
   it "parses formats like 1st,2nd,3rd,4th,25th" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timelord
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Matthew Mongeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timecop
@@ -59,7 +59,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - lib/timelord.rb
 - lib/timelord/current_weekday.rb
@@ -73,17 +73,20 @@ files:
 - 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/long_month_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/short_month_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
+- lib/timelord/time_parser.rb
 - spec/spec_helper.rb
 - spec/timelord_spec.rb
 homepage: http://github.com/halogenandtoast/timelord

data/README.rdoc

@@ -1,26 +0,0 @@
-=Timelord
-
-Timelord parses dates out of strings. The string itself can contain non-date text - for instance: "Call Matt on Tuesday"
-will return a date object for the upcoming Tuesday.
-
-==Usage
-
-  require 'timelord'
-  Timelord.parse("Tuesday").to_s # "2011-01-04"
-  Timelord.parse("On Tuesday go for a walk").to_s # "2011-01-04"
-
-For more examples, check out the spec[https://github.com/halogenandtoast/timelord/blob/master/spec/timelord_spec.rb]
-
-==Date format
-
-The default date format is the international format. 11/01 is January 11th.
-
-To use the american date format pass in :american as the second parameter
-
-  Timelord.parse("11/01").to_s # "2011-01-11"
-  Timelord.parse("11/01", :american) # "2011-11-01"
-
-==In the future
-
-As of version 0.0.1 all dates without a year automatically choose the next occurrence of that date. If there is demand
-for the ability to retrieve previous dates, then the functionality will be added.