timelord 0.0.5 → 0.0.6

data/Rakefile

@@ -1,20 +1,15 @@
-require 'rake'
-require 'spec/rake/spectask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'bundler'
+require 'rdoc/task'
+require 'rubygems/package_task'
+require 'rspec/core/rake_task'
 
 specification = Gem::Specification.load("timelord.gemspec")
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Rake::GemPackageTask.new(specification) do |package|
-  package.need_zip = true
-  package.need_tar = true
-end
-
-Rake::RDocTask.new(:rdoc) do |rdoc|
+RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = 'Timelord'
   rdoc.options << '--line-numbers' << '--inline-source'
@@ -22,5 +17,10 @@ Rake::RDocTask.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]

data/lib/timelord.rb

@@ -1,14 +1,29 @@
 require 'date'
 
 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
 
+  def self.set_date(date)
+    @today = date
+  end
+
+  def self.today
+    @today ||= Date.today
+  end
+
+  def self.reset
+    @today = Date.today
+  end
+
   # Parses a date str. Second parameter switches between international and american date formats.
   #
   #   Timelord.parse("Tuesday").to_s # "2011-01-04"
@@ -17,7 +32,6 @@ 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)
-    today = Date.today
     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
@@ -41,6 +55,12 @@ class Timelord
     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)
@@ -67,10 +87,6 @@ class Timelord
 
   private
 
-  def self.today
-    Date.today
-  end
-
   def self.next_weekday(date_index)
     current_date = today.strftime("%A").downcase
     current_index = DAY_NAMES.index(current_date)

data/spec/timelord_spec.rb

@@ -6,6 +6,13 @@ describe Timelord, 'parse' do
     Timecop.freeze(local_time)
   end
 
+  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)
+  end
+
   it "returns nil when no time is present" do
     Timelord.parse("No time here").should == nil
   end
@@ -118,6 +125,11 @@ describe Timelord, 'parse' do
     Timelord.parse("On 1 Jan I need to do something.").should == first_of_january
   end
 
+  it 'parses month_name day format' do
+    first_of_march = Date.civil(2011,3,1)
+    Timelord.parse("March 1 I need to do stuff.").should == first_of_march
+  end
+
   after do
     Timecop.return
   end

metadata

@@ -1,72 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: timelord
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 5
-  version: 0.0.5
+version: !ruby/object:Gem::Version
+  version: 0.0.6
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Matthew Mongeau
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-09 00:00:00 -04:00
-default_executable: 
-dependencies: []
-
+date: 2012-02-11 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &70233931643220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70233931643220
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70233931641880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70233931641880
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70233931640280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70233931640280
 description: 
 email: halogenandtoast@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.rdoc
 - LICENSE
 - Rakefile
 - lib/timelord.rb
 - spec/spec_helper.rb
 - spec/timelord_spec.rb
-has_rdoc: true
 homepage: http://github.com/halogenandtoast/timelord
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
 summary: Pull dates out of strings
 test_files: []
-