time_ago_in_words 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17816bdfb96d3a2e1e9ba53f3dd6e2db69a31682
-  data.tar.gz: c68a369e2faeb1db7aed0dbe215eb63fbe72d492
+  metadata.gz: 3643c74e96a16cf5b7a3052eec2cf8b0041d89c4
+  data.tar.gz: b835b4a256c661bfb5133da03e55cbceccdb6b75
 SHA512:
-  metadata.gz: 8eac441414aecb182c726f1bf80e7398f642a3c74a461cf78843207abb69ad8878e04e9f0d183703b460e4fdc011ba69a9e7eb6c5d715c368a59ca7722e52ff6
-  data.tar.gz: e80b0d1598bacb957ac0d493c54a60cd47a974448a2426a516ba1722b312526bd0fa942d463989f2fd8277e7622c052f0671a9295d969a4c29b15875a3eb99c3
+  metadata.gz: 434184bf95eed3f42cf0cdaf0c04340c35fb9dbe661cf0296e80f819c5aa4b0d48bf70deeba089e4d3cfc3a2e828d2060d77854d818769973116c647a5542c67
+  data.tar.gz: 3cb1145b769db7a50b466c36bf192b47afa12ede96692da37116a2387186306badb6121523e9149fde2e1d884b71ecd43c52238f58ffae5501c4b337e621b4e2

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [In git](https://github.com/elgalu/time_ago_in_words/compare/v0.0.1...HEAD)
+## [In git](https://github.com/elgalu/time_ago_in_words/compare/v0.1.0...HEAD)
 
 ### New Features
 * n/a
@@ -9,6 +9,17 @@
 ### Chores
 * n/a
 
+## [v0.1.0](https://github.com/elgalu/time_ago_in_words/tree/v0.1.0)
+
+### New Features
+* n/a
+
+### Bugfixes
+* Removed support for ruby 1.8.7 due to 'time ouf of range' errors. (Leo Gallucci)
+
+### Chores
+* Applied Extract Method refactor on Time#ago_in_words(). (Leo Gallucci)
+
 ## [v0.0.1](https://github.com/elgalu/time_ago_in_words/tree/v0.0.1)
 
 ## First gem release

data/lib/time_ago_in_words/methods.rb

@@ -20,22 +20,34 @@ module TimeAgoInWords
   #
   # @note Inspired from http://stackoverflow.com/a/4136485/511069
   def ago_in_words
+    return 'a very very long time ago' if self.year < 1800
     secs = Time.now - self
     return 'just now' if secs > -1 && secs < 1
     return '' if secs <= -1
-    return 'a very very long time ago' if secs > 60*60*24*100_000
-    ary = [[60, :seconds], [60, :minutes], [24, :hours], [100_000, :days]].map{ |count, name|
+    pair = ago_in_words_pair(secs)
+    ary = ago_in_words_singularize(pair)
+    ary.size == 0 ? '' : ary.join(' and ') << ' ago'
+  end
+
+  private
+
+  # @private
+  def ago_in_words_pair(secs)
+    [[60, :seconds], [60, :minutes], [24, :hours], [100_000, :days]].map{ |count, name|
       if secs > 0
         secs, n = secs.divmod(count)
         "#{n.to_i} #{name}"
       end
     }.compact.reverse[0..1]
-    if ary.size == 1
-      ary.map! {|part| part[0, 2].to_i == 1 ? part.chomp('s') : part }
+  end
+
+  # @private
+  def ago_in_words_singularize(pair)
+    if pair.size == 1
+      pair.map! {|part| part[0, 2].to_i == 1 ? part.chomp('s') : part }
     else
-      ary.map! {|part| part[0, 2].to_i == 1 ? part.chomp('s') : part[0, 2].to_i == 0 ? nil : part }
+      pair.map! {|part| part[0, 2].to_i == 1 ? part.chomp('s') : part[0, 2].to_i == 0 ? nil : part }
     end
-    ary.compact!
-    ary.size == 0 ? '' : ary.join(' and ') << ' ago'
+    pair.compact
   end
 end

data/lib/time_ago_in_words/version.rb

@@ -1,3 +1,3 @@
 module TimeAgoInWords
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/time_ago_in_words_spec.rb

@@ -16,15 +16,15 @@ describe TimeAgoInWords do
       it "returns empty string on future dates" do
         (Time.now + 1.6).ago_in_words.should == ''
         (Time.now + 100).ago_in_words.should == ''
-        (Time.now + 100_000).ago_in_words.should == ''
+        (Time.now + 9999).ago_in_words.should == ''
       end
 
-      it "returns 'a very very long time ago' when more than 250 years ago" do
-        (Time.now - 60*60*24*100_001).ago_in_words.should == 'a very very long time ago'
+      it "returns 'a very very long time ago' when more than 300 years ago" do
+        Time.local(1713,01,01).ago_in_words.should == 'a very very long time ago'
       end
 
       it "can handle many days ago" do
-        (Time.now - 60*60*24*99_999).ago_in_words.should == '99999 days ago'
+        (Time.now - 60*60*24*9999).ago_in_words.should == '9999 days ago'
       end
 
       it "returns N seconds ago, N seconds ago!" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: time_ago_in_words
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Leo Gallucci