chronic 0.4.2 → 0.4.3

data/.gitignore

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

data/.yardopts

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

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'
@@ -59,20 +25,7 @@ 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!"
@@ -82,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"
+  sh "gem build chronic.gemspec"
+  sh "mv chronic-#{version}.gem 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}"
-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.2'
+  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

data/lib/chronic.rb

@@ -28,7 +28,7 @@ require 'date'
 #
 # @author Tom Preston-Werner, Lee Jarvis
 module Chronic
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 
   class << self
 

data/lib/chronic/chronic.rb

@@ -108,7 +108,7 @@ module Chronic
     #
     # @param [String] text The string to normalize
     # @return [String] A new string ready for Chronic to parse
-    def pre_normalize(text) #:nodoc:
+    def pre_normalize(text)
       text = text.to_s.downcase
       text.gsub!(/['"\.,]/, '')
       text.gsub!(/\bsecond (of|day|month|hour|minute|second)\b/, '2nd \1')
@@ -235,7 +235,7 @@ module Chronic
       tokens.select { |token| token.tagged? }
     end
 
-    def tokens_to_span(tokens, options) #:nodoc:
+    def tokens_to_span(tokens, options)
       definitions = definitions(options)
 
       (definitions[:date] + definitions[:endian]).each do |handler|

data/lib/chronic/grabber.rb

@@ -8,8 +8,8 @@ module Chronic
     # @param [Hash] options Options specified in {Chronic.parse}
     # @return [Array] list of tokens
     def self.scan(tokens, options)
-      tokens.each_index do |i|
-        if t = scan_for_all(tokens[i]) then tokens[i].tag(t); next end
+      tokens.each do |token|
+        if t = scan_for_all(token) then token.tag(t); next end
       end
     end
 

data/lib/chronic/ordinal.rb

@@ -8,9 +8,9 @@ module Chronic
     # @param [Hash] options Options specified in {Chronic.parse}
     # @return [Array] list of tokens
     def self.scan(tokens, options)
-      tokens.each_index do |i|
-        if t = scan_for_ordinals(tokens[i]) then tokens[i].tag(t) end
-        if t = scan_for_days(tokens[i]) then tokens[i].tag(t) end
+      tokens.each do |token|
+        if t = scan_for_ordinals(token) then token.tag(t) end
+        if t = scan_for_days(token) then token.tag(t) end
       end
     end
 

data/lib/chronic/pointer.rb

@@ -8,8 +8,8 @@ module Chronic
     # @param [Hash] options Options specified in {Chronic.parse}
     # @return [Array] list of tokens
     def self.scan(tokens, options)
-      tokens.each_index do |i|
-        if t = scan_for_all(tokens[i]) then tokens[i].tag(t) end
+      tokens.each do |token|
+        if t = scan_for_all(token) then token.tag(t) end
       end
     end
 

data/lib/chronic/repeater.rb

@@ -8,13 +8,13 @@ module Chronic
     # @param [Hash] options Options specified in {Chronic.parse}
     # @return [Array] list of tokens
     def self.scan(tokens, options)
-      tokens.each_index do |i|
-        if t = scan_for_season_names(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_month_names(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_day_names(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_day_portions(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_times(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_units(tokens[i]) then tokens[i].tag(t); next end
+      tokens.each do |token|
+        if t = scan_for_season_names(token) then token.tag(t); next end
+        if t = scan_for_month_names(token) then token.tag(t); next end
+        if t = scan_for_day_names(token) then token.tag(t); next end
+        if t = scan_for_day_portions(token) then token.tag(t); next end
+        if t = scan_for_times(token) then token.tag(t); next end
+        if t = scan_for_units(token) then token.tag(t); next end
       end
     end
 

data/lib/chronic/repeaters/repeater_time.rb

@@ -37,7 +37,7 @@ module Chronic
           hours == 12 ? Tick.new(0 * 60 * 60, true) : Tick.new(hours * 60 * 60, true)
         when 3
           hours = t[0..0].to_i
-          ambiguous = hours > 1
+          ambiguous = hours > 0
           Tick.new((hours * 60 * 60) + (t[1..2].to_i * 60), ambiguous)
         when 4
           ambiguous = time =~ /:/ && t[0..0].to_i != 0 && t[0..1].to_i <= 12

data/lib/chronic/separator.rb

@@ -8,12 +8,12 @@ module Chronic
     # @param [Hash] options Options specified in {Chronic.parse}
     # @return [Array] list of tokens
     def self.scan(tokens, options)
-      tokens.each_index do |i|
-        if t = scan_for_commas(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_slash_or_dash(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_at(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_in(tokens[i]) then tokens[i].tag(t); next end
-        if t = scan_for_on(tokens[i]) then tokens[i].tag(t); next end
+      tokens.each do |token|
+        if t = scan_for_commas(token) then token.tag(t); next end
+        if t = scan_for_slash_or_dash(token) then token.tag(t); next end
+        if t = scan_for_at(token) then token.tag(t); next end
+        if t = scan_for_in(token) then token.tag(t); next end
+        if t = scan_for_on(token) then token.tag(t); next end
       end
     end
 

data/lib/chronic/tag.rb

@@ -1,13 +1,17 @@
 module Chronic
   # Tokens are tagged with subclassed instances of this class when
   # they match specific criteria
-  class Tag #:nodoc:
+  class Tag
+
+    # @return [Symbol]
     attr_accessor :type
 
+    # @param [Symbol] type
     def initialize(type)
       @type = type
     end
 
+    # @param [Time] s Set the start timestamp for this Tag
     def start=(s)
       @now = s
     end
@@ -15,6 +19,11 @@ module Chronic
     class << self
       private
 
+      # @param [Token] token
+      # @param [Class] klass The class instance to create
+      # @param [Regexp, Hash] items
+      # @return [Object, nil] either a new instance of `klass` or `nil` if
+      #   no match is found
       def scan_for(token, klass, items={})
         case items
         when Regexp

data/lib/chronic/time_zone.rb

@@ -8,8 +8,8 @@ module Chronic
     # @param [Hash] options Options specified in {Chronic.parse}
     # @return [Array] list of tokens
     def self.scan(tokens, options)
-      tokens.each_index do |i|
-        if t = scan_for_all(tokens[i]) then tokens[i].tag(t); next end
+      tokens.each do |token|
+        if t = scan_for_all(token) then token.tag(t); next end
       end
     end
 

data/test/test_parsing.rb

@@ -274,6 +274,12 @@ class TestParsing < Test::Unit::TestCase
     time = parse_now("13:45")
     assert_equal Time.local(2006, 8, 17, 13, 45), time
 
+    time = parse_now("1:01pm")
+    assert_equal Time.local(2006, 8, 16, 13, 01), time
+
+    time = parse_now("2:01pm")
+    assert_equal Time.local(2006, 8, 16, 14, 01), time
+
     time = parse_now("november")
     assert_equal Time.local(2006, 11, 16), time
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chronic
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.4.2
+  hash: 9
+  prerelease: false
+  segments: 
+  - 0
+  - 4
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -11,7 +16,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 Z
+date: 2011-06-08 00:00:00 +01:00
+default_executable: 
 dependencies: []
 
 description: Chronic is a natural language date/time parser written in pure Ruby.
@@ -27,6 +33,8 @@ extra_rdoc_files:
 - HISTORY.md
 - LICENSE
 files: 
+- .gitignore
+- .yardopts
 - HISTORY.md
 - LICENSE
 - Manifest.txt
@@ -86,6 +94,7 @@ files:
 - test/test_Time.rb
 - test/test_Token.rb
 - test/test_parsing.rb
+has_rdoc: true
 homepage: http://github.com/mojombo/chronic
 licenses: []
 
@@ -99,21 +108,28 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: chronic
-rubygems_version: 1.8.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Natural language date/time parsing.
 test_files: 
+- test/helper.rb
 - test/test_Chronic.rb
 - test/test_DaylightSavings.rb
 - test/test_Handler.rb