rext 0.6.0 → 0.6.1

data/History.rdoc

@@ -1,4 +1,11 @@
 
+0.6.1 / 2009-11-25
+==================
+
+  * Added Date#in_words_since[_now]
+  * Changed; Date/Time#in_words_since now returns nil when over 100 years
+  * Fixed Date/Time#in_words_since
+
 0.6.0 / 2009-11-18
 ==================
 

data/lib/rext/date/helpers.rb

@@ -8,4 +8,9 @@ class Date
     Time.send form, year, month, day
   end
   
+  def in_words_since *args
+    to_time.in_words_since *args
+  end
+  alias :in_words_since_now :in_words_since
+  
 end

data/lib/rext/time/helpers.rb

@@ -13,13 +13,14 @@ class Time
   #   5.seconds.ago.in_words_since_now  # => less than one minute
   #   5.days.ago.in_words_since_now     # => 5 days
   #   1.month.ago.in_words_since_now    # => 1 month
-  #   101.years.ago.in_words_since_now  # => hundreds of years
+  #   101.years.ago.in_words_since_now  # => nil
   #
-  #   "the article was published #{article.created_at.in_words_since_now} ago"  
+  #   "the article was published #{article.created_at.in_words_since_now || 'hundreds of years' } ago"  
   #   # => the article was published 15 minutes ago
   #
 
   def in_words_since time = Time.now
+    time = time.to_time
     return if self > time
     seconds = (time - self).to_i
     # TODO: abstract this out
@@ -28,14 +29,13 @@ class Time
       n == 1 ? "one #{type}" : "#{n} #{type}s"
     end
     case seconds
-    when 0..59                ; 'less than one minute'
-    when 1.minute..59.minutes ; pluralize[:minute]
-    when 1.hour..23.hours     ; pluralize[:hour]
-    when 1.day..6.days        ; pluralize[:day]
-    when 1.week..3.weeks      ; pluralize[:week]
-    when 1.month..11.months   ; pluralize[:month]
+    when 0..60                ; 'less than one minute'
+    when 1.minute..60.minutes ; pluralize[:minute]
+    when 1.hour..24.hours     ; pluralize[:hour]
+    when 1.day..7.days        ; pluralize[:day]
+    when 1.week..4.weeks      ; pluralize[:week]
+    when 1.month..12.months   ; pluralize[:month]
     when 1.year..99.years     ; pluralize[:year]
-    else 'hundreds of years'
     end
   end
   alias :in_words_since_now :in_words_since

data/lib/rext/version.rb

@@ -1,4 +1,4 @@
 
 module Rext
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/rext.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rext}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["TJ Holowaychuk"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2009-11-25}
   s.description = %q{Ruby extensions}
   s.email = %q{tj@vision-media.ca}
   s.extra_rdoc_files = ["README.rdoc", "lib/rext.rb", "lib/rext/all.rb", "lib/rext/array.rb", "lib/rext/array/helpers.rb", "lib/rext/date.rb", "lib/rext/date/helpers.rb", "lib/rext/enumerable.rb", "lib/rext/enumerable/helpers.rb", "lib/rext/hash.rb", "lib/rext/hash/helpers.rb", "lib/rext/integer.rb", "lib/rext/integer/helpers.rb", "lib/rext/module.rb", "lib/rext/module/helpers.rb", "lib/rext/numeric.rb", "lib/rext/numeric/bytes.rb", "lib/rext/numeric/time.rb", "lib/rext/object.rb", "lib/rext/object/helpers.rb", "lib/rext/object/metaclass.rb", "lib/rext/proc.rb", "lib/rext/proc/helpers.rb", "lib/rext/process.rb", "lib/rext/process/helpers.rb", "lib/rext/string.rb", "lib/rext/string/encode.rb", "lib/rext/string/helpers.rb", "lib/rext/symbol.rb", "lib/rext/symbol/helpers.rb", "lib/rext/time.rb", "lib/rext/time/helpers.rb", "lib/rext/version.rb", "tasks/benchmark.rake", "tasks/docs.rake", "tasks/gemspec.rake", "tasks/spec.rake"]

data/spec/time_spec.rb

@@ -15,7 +15,15 @@ describe Time do
         event -= 5.years
         event.in_words_since_now.should == '5 years'
         event -= 100.years
-        event.in_words_since_now.should == 'hundreds of years'
+        event.in_words_since_now.should be_nil
+        
+        event = Date.parse 'may 25 1987'
+        event.in_words_since_now.should == '22 years'
+        event.in_words_since(Date.parse('may 25 1989')).should == '2 years'
+        
+        event = DateTime.parse 'may 25th 1987'
+        event.in_words_since_now.should == '22 years'
+        event.in_words_since(Date.parse('may 25 1989')).should == '2 years'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rext
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 -08:00
+date: 2009-11-25 00:00:00 -08:00
 default_executable: 
 dependencies: []