chronic 0.4.1 → 0.5.0

data/.gitignore

@@ -0,0 +1,5 @@
+pkg
+*.rbc
+rdoc
+.yardoc
+doc

data/.yardopts

@@ -0,0 +1,3 @@
+-m markdown
+--readme README.md
+--title "Chronic - Natural language date/time parsing"

data/HISTORY.md

@@ -1,4 +1,38 @@
-# 0.4.1
+# TBA
+
+* Replace commas with spaces instead of removing the char (Thomas Walpole)
+* Added tests for RepeaterSeason
+* Re-factored tests. Now rather than having a test_parsing method for testing
+  all handlers, break them down independent of handler method. For example
+  with handler `handle_sm_sd_sy` the subsequent test would be
+  `test_handle_sm_sd_sy`
+* Added support for parsing ordinal-dates/month-names/year, ie:
+  `2nd of May 1995`
+* Added support for parsing ordinal-dates and month names, ie:
+  `22nd of February at 6:30pm`
+* Fix `Time.construct` leap year checking. Instead use `Date.leap?(year)`
+
+# 0.4.4 / 2011-06-12
+
+* Fix RepeaterYear for fetching past year offsets when the current day is
+  later than the last day of the same month in a past year (leap years) ie
+  on 29th/feb (leap year) `last year` should (and now does) return 28th/feb
+  instead of 1st/march
+* Opt in for gem testing http://test.rubygems.org/
+
+# 0.4.3 / 2011-06-08
+
+* Fix issue with parsing 1:xxPM -- Ensure 1 is treated as ambiguous, not
+  just >1
+
+# 0.4.2 / 2011-06-07
+
+* Fix MonthRepeater for fetching past month offsets when current day is
+  later than the last day of a past month (ie on 29th of March when parsing
+  `last month` Chronic would return March instead of February. Now Chronic
+  returns the last day of the past month)
+
+# 0.4.1 / 2011-06-05
 
 * Fix MiniDate ranges for parsing seasons (Thomas Walpole)
 
@@ -27,7 +61,7 @@
 * Fix undefined variable in RepeaterHour (Ryan Garver)
 * Added support for parsing 'Fourty' as another mis-spelling (Lee Reilly)
 * Added ordinal format support: ie 'February 14th, 2004' (Jeff Felchner)
-* Fix dates when working with daylight saving times Mike Mangino
+* Fix dates when working with daylight saving times (Mike Mangino)
 
 # 0.3.0 / 2010-10-22
 

data/Manifest.txt

@@ -1,9 +1,11 @@
+.gemtest
+.gitignore
+.yardopts
 HISTORY.md
 LICENSE
 Manifest.txt
 README.md
 Rakefile
-benchmark/benchmark.rb
 chronic.gemspec
 lib/chronic.rb
 lib/chronic/chronic.rb
@@ -31,6 +33,7 @@ lib/chronic/repeaters/repeater_weekday.rb
 lib/chronic/repeaters/repeater_weekend.rb
 lib/chronic/repeaters/repeater_year.rb
 lib/chronic/scalar.rb
+lib/chronic/season.rb
 lib/chronic/separator.rb
 lib/chronic/span.rb
 lib/chronic/tag.rb
@@ -48,6 +51,7 @@ test/test_RepeaterHour.rb
 test/test_RepeaterMinute.rb
 test/test_RepeaterMonth.rb
 test/test_RepeaterMonthName.rb
+test/test_RepeaterSeason.rb
 test/test_RepeaterTime.rb
 test/test_RepeaterWeek.rb
 test/test_RepeaterWeekday.rb
@@ -56,4 +60,4 @@ test/test_RepeaterYear.rb
 test/test_Span.rb
 test/test_Time.rb
 test/test_Token.rb
-test/test_parsing.rb
+test/test_parsing.rb

data/README.md

@@ -98,10 +98,14 @@ Complex
 * 3rd month next year
 * 3rd thursday this september
 * 4th day last week
+* fourteenth of june 2010 at eleven o'clock in the evening
+* may seventh '97 at three in the morning
 
 Specific Dates
 
 * January 5
+* 22nd of june
+* 5th may 2017
 * February twenty first
 * dec 25
 * may 27th
@@ -125,6 +129,7 @@ Specific Dates
 Specific Times (many of the above with an added time)
 
 * January 5 at 7pm
+* 22nd of june at 8am
 * 1979-05-27 05:00:00
 * etc
 
@@ -133,8 +138,9 @@ Specific Times (many of the above with an added time)
 
 Chronic allows you to set which Time class to use when constructing times. By
 default, the built in Ruby time class creates times in your system's local
-time zone. You can set this to something like ActiveSupport's TimeZone class
-to get full time zone support.
+time zone. You can set this to something like ActiveSupport's
+[TimeZone](http://api.rubyonrails.org/classes/ActiveSupport/TimeZone.html)
+class to get full time zone support.
 
     >> Time.zone = "UTC"
     >> Chronic.time_class = Time.zone

data/Rakefile

@@ -1,44 +1,10 @@
 require 'date'
 
-#############################################################################
-#
-# Helper functions
-#
-#############################################################################
-
-def name
-  @name ||= Dir['*.gemspec'].first.split('.').first
-end
-
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
-def rubyforge_project
-  name
-end
-
-def gemspec_file
-  "#{name}.gemspec"
+  contents = File.read File.expand_path('../lib/chronic.rb', __FILE__)
+  contents[/VERSION = "([^"]+)"/, 1]
 end
 
-def gem_file
-  "#{name}-#{version}.gem"
-end
-
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{$1}#{send(header_name)}'"}
-end
-
-#############################################################################
-#
-# Standard tasks
-#
-#############################################################################
-
-task :default => :test
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -54,33 +20,12 @@ task :coverage do
   sh "open coverage/index.html"
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "#{name} #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -Ilib -rchronic"
 end
 
-#############################################################################
-#
-# Custom tasks (add your own tasks here)
-#
-#############################################################################
-
-
-
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
+desc "Release Chronic version #{version}"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
@@ -90,51 +35,14 @@ task :release => :build do
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "gem push pkg/chronic-#{version}.gem"
 end
 
-task :build => :gemspec do
+desc "Build a gem from the gemspec"
+task :build do
   sh "mkdir -p pkg"
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-task :gemspec => :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-
-  #comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`.
-    split("\n").
-    sort.
-    reject { |file| file =~ /^\./ }.
-    reject { |file| file =~ /^(rdoc|pkg)/ }.
-    map { |file| "    #{file}" }.
-    join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
+  sh "gem build chronic.gemspec"
+  sh "mv chronic-#{version}.gem pkg"
 end
 
-task :validate do
-  libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
-  unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts "A `VERSION` file at root level violates Gem best practices."
-    exit!
-  end
-end
+task :default => :test

data/chronic.gemspec

@@ -1,83 +1,17 @@
+$:.unshift File.expand_path('../lib', __FILE__)
+require 'chronic'
+
 Gem::Specification.new do |s|
-  s.name              = 'chronic'
-  s.version           = '0.4.1'
+  s.name = 'chronic'
+  s.version = Chronic::VERSION
   s.rubyforge_project = 'chronic'
-
-  s.summary     = "Natural language date/time parsing."
-  s.description = "Chronic is a natural language date/time parser written in pure Ruby."
-
-  s.authors  = ["Tom Preston-Werner", "Lee Jarvis"]
+  s.summary     = 'Natural language date/time parsing.'
+  s.description = 'Chronic is a natural language date/time parser written in pure Ruby.'
+  s.authors  = ['Tom Preston-Werner', 'Lee Jarvis']
   s.email    = ['tom@mojombo.com', 'lee@jarvis.co']
   s.homepage = 'http://github.com/mojombo/chronic'
-
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.md HISTORY.md LICENSE]
-
-  # = MANIFEST =
-  s.files = %w[
-    HISTORY.md
-    LICENSE
-    Manifest.txt
-    README.md
-    Rakefile
-    benchmark/benchmark.rb
-    chronic.gemspec
-    lib/chronic.rb
-    lib/chronic/chronic.rb
-    lib/chronic/grabber.rb
-    lib/chronic/handlers.rb
-    lib/chronic/mini_date.rb
-    lib/chronic/numerizer.rb
-    lib/chronic/ordinal.rb
-    lib/chronic/pointer.rb
-    lib/chronic/repeater.rb
-    lib/chronic/repeaters/repeater_day.rb
-    lib/chronic/repeaters/repeater_day_name.rb
-    lib/chronic/repeaters/repeater_day_portion.rb
-    lib/chronic/repeaters/repeater_fortnight.rb
-    lib/chronic/repeaters/repeater_hour.rb
-    lib/chronic/repeaters/repeater_minute.rb
-    lib/chronic/repeaters/repeater_month.rb
-    lib/chronic/repeaters/repeater_month_name.rb
-    lib/chronic/repeaters/repeater_season.rb
-    lib/chronic/repeaters/repeater_season_name.rb
-    lib/chronic/repeaters/repeater_second.rb
-    lib/chronic/repeaters/repeater_time.rb
-    lib/chronic/repeaters/repeater_week.rb
-    lib/chronic/repeaters/repeater_weekday.rb
-    lib/chronic/repeaters/repeater_weekend.rb
-    lib/chronic/repeaters/repeater_year.rb
-    lib/chronic/scalar.rb
-    lib/chronic/separator.rb
-    lib/chronic/span.rb
-    lib/chronic/tag.rb
-    lib/chronic/time_zone.rb
-    lib/chronic/token.rb
-    test/helper.rb
-    test/test_Chronic.rb
-    test/test_DaylightSavings.rb
-    test/test_Handler.rb
-    test/test_MiniDate.rb
-    test/test_Numerizer.rb
-    test/test_RepeaterDayName.rb
-    test/test_RepeaterFortnight.rb
-    test/test_RepeaterHour.rb
-    test/test_RepeaterMinute.rb
-    test/test_RepeaterMonth.rb
-    test/test_RepeaterMonthName.rb
-    test/test_RepeaterTime.rb
-    test/test_RepeaterWeek.rb
-    test/test_RepeaterWeekday.rb
-    test/test_RepeaterWeekend.rb
-    test/test_RepeaterYear.rb
-    test/test_Span.rb
-    test/test_Time.rb
-    test/test_Token.rb
-    test/test_parsing.rb
-  ]
-  # = MANIFEST =
-
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^test\/test_.*\.rb/ }
-end
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- test`.split("\n")
+end