kronic 0.2.0 → 0.2.1

data/HISTORY

@@ -1,3 +1,7 @@
+0.2.1
+  * Removed dependency on active_support, no external dependencies!
+  * Dates in the future with a year specified are parsed correctly
+
 0.2.0
   * Support "tomorrow"
   * Support "this monday"

data/lib/kronic.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext'
+require 'date'
 
 class Kronic
   # Public: Converts a human readable day (Today, yesterday) to a Date.
@@ -44,20 +44,20 @@ class Kronic
 
     # Examples
     #
-    #   month_from_name("January") # => 1
-    #   month_from_name("Jan")     # => 1
+    #   month_from_name("january") # => 1
+    #   month_from_name("jan")     # => 1
     def month_from_name(month)
-      return nil unless month
+      f = lambda {|months| months.compact.map {|x| x.downcase }.index(month) }
 
-      human_month = month.downcase.humanize
-      Date::MONTHNAMES.index(human_month) || Date::ABBR_MONTHNAMES.index(human_month)
+      month = f[Date::MONTHNAMES] || f[Date::ABBR_MONTHNAMES]
+      month ? month + 1 : nil
     end
 
     # Parse "Today", "Tomorrow" and "Yesterday"
     def parse_nearby_days(string, today)
-      return today         if string == 'today'
-      return today - 1.day if string == 'yesterday'
-      return today + 1.day if string == 'tomorrow'
+      return today     if string == 'today'
+      return today - 1 if string == 'yesterday'
+      return today + 1 if string == 'tomorrow'
     end
 
     # Parse "Last Monday", "This Monday"
@@ -66,7 +66,7 @@ class Kronic
 
       if %w(last this).include?(tokens[0])
         days = (1..7).map {|x| 
-          today + (tokens[0] == 'last' ? -x.days : x.days)
+          today + (tokens[0] == 'last' ? -x : x)
         }.inject({}) {|a, x| 
           a.update(x.strftime("%A").downcase => x) 
         }
@@ -91,7 +91,7 @@ class Kronic
         return nil unless day && month && year
 
         result = Date.new(year, month, day)
-        result -= 1.year if result > today
+        result = result << 12 if result > today && !tokens[2]
         result
       end
     end

data/spec/kronic_spec.rb

@@ -19,7 +19,8 @@ describe Kronic do
       :last_monday => Date.new(2010, 9, 13),
       :next_monday => Date.new(2010, 9, 20),
       :sep_4  => Date.new(2010, 9, 4),
-      :sep_20 => Date.new(2009, 9, 20)
+      :sep_20 => Date.new(2009, 9, 20),
+      :sep_28 => Date.new(2010, 9, 28)
     }.fetch(key)
   end
 
@@ -31,14 +32,15 @@ describe Kronic do
   should_parse(:today,        date(:today))
   should_parse('today',       date(:today))
   should_parse('  Today',     date(:today))
-  should_parse('Yesterday',   date(:today) - 1.day)
-  should_parse('Tomorrow',    date(:today) + 1.day)
+  should_parse('Yesterday',   date(:today) - 1)
+  should_parse('Tomorrow',    date(:today) + 1)
   should_parse('Last Monday', date(:last_monday))
   should_parse('This Monday', date(:next_monday))
   should_parse('4 Sep',       date(:sep_4))
   should_parse('4  Sep',      date(:sep_4))
   should_parse('4 September', date(:sep_4))
   should_parse('20 Sep',      date(:sep_20))
+  should_parse('28 Sep 2010', date(:sep_28))
   should_parse('14 Sep 2008', Date.new(2008, 9, 14))
   should_parse('bogus',       nil)
   should_parse('14',          nil)
@@ -46,8 +48,8 @@ describe Kronic do
   should_parse('14 June oen', nil)
 
   should_format('Today',       date(:today))
-  should_format('Yesterday',   date(:today) - 1.day)
-  should_format('Tomorrow',    date(:today) + 1.day)
+  should_format('Yesterday',   date(:today) - 1)
+  should_format('Tomorrow',    date(:today) + 1)
   should_format('Last Monday', date(:last_monday))
   should_format('This Monday', date(:next_monday))
   should_format('14 September 2008', Date.new(2008, 9, 14))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Xavier Shay
@@ -17,36 +17,10 @@ cert_chain: []
 date: 2010-09-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: i18n
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,11 +33,11 @@ dependencies:
         - 16
         version: 2.0.0.beta.16
   type: :development
-  version_requirements: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: timecop
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,7 +46,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id002
 description: 
 email: 
 - hello@xaviershay.com