dotiw 3.0.1 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a8e04cc6ea63912711e2a1fc4394513eaad843
-  data.tar.gz: 04fe6b44d6d5b34cdf2949bd44eebfbf055743bd
+  metadata.gz: 0b71e3935ad86d61036e453b41579881ac1a8f3b
+  data.tar.gz: 26e1ce49677a8dead460ac3c3b0b4db93f3e196b
 SHA512:
-  metadata.gz: 8fa225fca7fcf4f3e7aa8a948ca0b5080f780e0b1f16450f9456b052e3f11aab5828390f64278f239491cbb4e0afb131283cf2277ae8eb0d17b127b560410b51
-  data.tar.gz: 4d932e653886ebfbf9ee830bcf70aa817ef608d0759244eee579c19a4f9429583f79a5254c7d6d2b17a0aa49b53198bc9e320afc99642eeae0e85bd858a4924b
+  metadata.gz: d6157f043c6114509982a82b1bc5c6973b81bbcb7cb4293a8388dd1736cac3427c578301f866d86f685a201fdc7e1163067c9ef4e32d2a738804578290a4c6b8
+  data.tar.gz: 837d5ec5c403dcb288bba9b3be908b98ad9d6e7191b3f777014f5b77242c84ff5d48fb43ce25c4614bcd2ff6659b34d2e8b74f4400e7e213c41dc8fe9a8ccdb8

data/.travis.yml

@@ -1,5 +1,11 @@
 rvm:
-  - 2.1.3
+  - 2.3.0
+  - 2.2.4
+  - 2.1.8
   - 2.0.0
   - 1.9.3
   - jruby-19mode
+before_install:
+  - gem update --system
+  - gem update bundler
+install: "bundle install"

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+## 3.1.1 (2016/03/08)
+* Add CHANGELOG.md
+
+## 3.1.0 (2016/03/07)
+
+* [#68](https://github.com/radar/dotiw/pull/68): Add support for weeks - [@lauranjansen](https://github.com/lauranjansen)
+* [#69](https://github.com/radar/dotiw/pull/69): Add Indonesian language support - [@avidmaulanas](https://github.com/avidmaulanas)
+* [#70](https://github.com/radar/dotiw/pull/70): Add French language support - [@geo1004](https://github.com/geo1004)
+* [#72](https://github.com/radar/dotiw/pull/72): Add Danish language support - [@kaspernj](https://github.com/kaspernj)
+* [#71](https://github.com/radar/dotiw/pull/71): Update bundler and ruby versions for Travis CI - [@lauranjansen](https://github.com/lauranjansen)

data/CONTRIBUTING.md

@@ -0,0 +1,34 @@
+DOTIW is an open source project and we encourage contributions.
+
+## Filing an issue
+
+When filing an issue on the DOTIW project, please provide these details:
+
+* A comprehensive list of steps to reproduce the issue.
+* What you're *expecting* to happen compared with what's *actually* happening.
+* Your application's complete `Gemfile.lock`, and `Gemfile.lock` as text in a [Gist](https://gist.github.com) (*not as an image*)
+* Any relevant stack traces ("Full trace" preferred)
+
+In 99% of cases, this information is enough to determine the cause and solution
+to the problem that is being described.
+
+Please remember to format code using triple backticks (\`) so that it is neatly
+formatted when the issue is posted.
+
+## Pull requests
+
+We gladly accept pull requests to add documentation, fix bugs and, in some circumstances,
+add new features to DOTIW.
+
+Here's a quick guide:
+
+1. Fork the repo.
+
+2. Run the tests. We only take pull requests with passing tests, and it's great
+to know that you have a clean slate.
+
+3. Create new branch then make changes and add tests for your changes. Only
+refactoring and documentation changes require no new tests. If you are adding
+functionality or fixing a bug, we need tests!
+
+4. Push to your fork and submit a pull request.

data/README.markdown

@@ -2,14 +2,14 @@
 
 dotiw is a gem for Rails that overrides the default `distance_of_time_in_words` and provides a more accurate output. Do you crave accuracy down to the second? So do I. That's why I made this gem. Take this for a totally kickass example:
 
-    >> distance_of_time_in_words(Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, true)
-    => "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"
-     
+    >> distance_of_time_in_words(Time.now, Time.now + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds, true)
+    => "1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds"
+
 Also if one of the measurement is zero it will not output it:
 
-    >> distance_of_time_in_words(Time.now, Time.now + 1.year + 2.months + 4.hours + 5.minutes + 6.seconds, true)
-    => "1 year, 2 months, 4 hours, 5 minutes, and 6 seconds"
-     
+    >> distance_of_time_in_words(Time.now, Time.now + 1.year + 2.months + 5.hours + 6.minutes + 7.seconds, true)
+    => "1 year, 2 months, 4 days, 6 minutes, and 7 seconds"
+
 Better than "about 1 year", am I right? Of course I am.
 
 "But Ryan!", you say, "What happens if the time is only in seconds but because of the default the seconds aren't shown? Won't it be blank?"
@@ -21,7 +21,7 @@ Better than "about 1 year", am I right? Of course I am.
 The third argument for this method is whether or not to include seconds. By default this is `false` (because in Rails' `distance_of_time_in_words` it is), you can turn it on though by passing `true` as the third argument:
 
     >> distance_of_time_in_words(Time.now, Time.now + 1.year + 1.second, true)
-    => "1 year, and 1 second" 
+    => "1 year, and 1 second"
 
 Yes this could just be merged into the options hash but I'm leaving it here to ensure "backwards-compatibility",
 because that's just an insanely radical thing to do. \m/
@@ -58,7 +58,7 @@ You can pass in a locale and it'll output it in whatever language you want (prov
 
     >> distance_of_time_in_words(Time.now, Time.now + 1.minute, false, :locale => :es)
     => "1 minuto"
-    
+
 This will also be passed to `to_sentence`
 
 #### :vague
@@ -95,7 +95,7 @@ Culling a whole group of measurements of time:
 
     >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.day + 1.minute, false, :except => [:minutes, :hours])
     => "1 day"
-    
+
 #### :highest\_measure\_only
 
 For times when Rails `distance_of_time_in_words` is not precise enough and `DOTIW` is too precise. For instance, if you only want to know the highest time part (measure) that elapsed between two dates.
@@ -125,7 +125,7 @@ Using something other than a comma:
 
     >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute + 1.second, true, :words_connector => ' - ')
     => "1 hour - 1 minute, and 1 second"
-    
+
 #### :two\_words\_connector
 
 **This is an option for `to_sentence`, defaults to ' and '**
@@ -135,7 +135,7 @@ Using something other than 'and':
     >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute, true, :two_words_connector => ' plus ')
     => "1 hour plus 1 minute"
 
-#### :last\_word\_connector 
+#### :last\_word\_connector
 
 **This is an option for `to_sentence`, defaults to ', and '**
 
@@ -155,17 +155,17 @@ If you have simply a number of seconds you can get the "stringified" version of
 
 Don't like any format you're given? That's cool too! Here, have an indifferent hash version:
 
-    >> distance_of_time_in_words_hash(Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds)
-    => {:days => 3, :seconds => 6, :minutes => 5, :years => 1, :hours => 4, :months => 2}
+    >> distance_of_time_in_words_hash(Time.now, Time.now + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds)
+    => {:days => 4, :weeks => 3, :seconds => 7, :minutes => 6, :years => 1, :hours => 5, :months => 2}
 
 Indifferent means that you can access all keys by their `String` or `Symbol` version.
-    
+
 ## distance\_of\_time\_in\_percent
 
 If you want to calculate a distance of time in percent, use `distance_of_time_in_percent`. The first argument is the beginning time, the second argument the "current" time and the third argument is the end time. This method takes the same options as [`number_with_precision`](http://api.rubyonrails.org/classes/ActionView/Helpers/NumberHelper.html#method-i-number_with_precision).
 
     distance_of_time_in_percent("04-12-2009".to_time, "29-01-2010".to_time, "04-12-2010".to_time, options)
-    
+
 
 ## Contributors
 

data/dotiw.gemspec

@@ -7,12 +7,18 @@ require 'dotiw/version'
 Gem::Specification.new do |s|
   s.name = 'dotiw'
   s.version = DOTIW::VERSION
+  s.licenses = ["MIT"]
 
-  s.authors = ["Ryan Bigg"]
-  s.date = %q{2015-04-09}
-  s.description = "Better distance_of_time_in_words for Rails"
+  s.authors = ["Ryan Bigg", "Lauran Jansen"]
+  s.date = %q{2016-03-08}
+  s.description = "dotiw is a gem for Rails that overrides the
+              default distance_of_time_in_words and provides
+              a more accurate output. Do you crave accuracy
+              down to the second? So do I. That's why I made
+              this gem. - Ryan"
   s.summary = "Better distance_of_time_in_words for Rails"
-  s.email = "radarlistener@gmail.com"
+  s.email = ["radarlistener@gmail.com", "github@lauranjansen.com"]
+  s.homepage = "https://github.com/radar/dotiw"
 
   s.add_dependency "actionpack", ">= 3"
   s.add_dependency "i18n"
@@ -27,4 +33,3 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
-

data/lib/dotiw/action_view_ext/helpers/date_helper.rb

@@ -37,7 +37,7 @@ module ActionView
       alias_method :old_time_ago_in_words, :time_ago_in_words
 
       def time_ago_in_words(from_time, include_seconds_or_options = {})
-        distance_of_time_in_words(from_time, Time.now, include_seconds_or_options)
+        distance_of_time_in_words(from_time, Time.current, include_seconds_or_options)
       end
 
       private

data/lib/dotiw/locale/da.yml

@@ -0,0 +1,23 @@
+da:
+  datetime:
+    dotiw:
+      seconds:
+        one: "1 sekund"
+        other: "%{count} sekunder"
+      minutes:
+        one: "1 minut"
+        other: "%{count} minutter"
+      hours:
+        one: "1 time"
+        other: "%{count} timer"
+      days:
+        one: "1 dag"
+        other: "%{count} dage"
+      weeks:
+        one: "1 uge"
+        other: "%{count} uger"
+      months:
+        one: "1 måned"
+        other: "%{count} måneder"
+      years: "%{count} år"
+      less_than_x: "mindre end %{distance}"

data/lib/dotiw/locale/fr.yml

@@ -0,0 +1,25 @@
+fr:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 seconde
+        other: "%{count} secondes"
+      minutes:
+        one: 1 minute
+        other: "%{count} minutes"
+      hours:
+        one: 1 heure
+        other: "%{count} heures"
+      days:
+        one: 1 jour
+        other: "%{count} jours"
+      weeks:
+        one: 1 semaine
+        other: "%{count} semaines"
+      months:
+        one: 1 mois
+        other: "%{count} mois"
+      years:
+        one: 1 an
+        other: "%{count} ans"
+      less_than_x: "moins de %{distance}"

data/lib/dotiw/locale/id.yml

@@ -0,0 +1,25 @@
+id:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 detik
+        other: "%{count} detik"
+      minutes:
+        one: 1 menit
+        other: "%{count} menit"
+      hours:
+        one: 1 jam
+        other: "%{count} jam"
+      days:
+        one: 1 hari
+        other: "%{count} hari"
+      weeks:
+        one: 1 minggu
+        other: "%{count} minggu"
+      months:
+        one: 1 bulan
+        other: "%{count} bulan"
+      years:
+        one: 1 tahun
+        other: "%{count} tahun"
+      less_than_x: "kurang dari %{distance}"

data/lib/dotiw/locale/pt-BR.yml

@@ -0,0 +1,25 @@
+pt-BR:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 segundo
+        other: "%{count} segundos"
+      minutes:
+        one: 1 minuto
+        other: "%{count} minutos"
+      hours:
+        one: 1 hora
+        other: "%{count} horas"
+      days:
+        one: 1 dia
+        other: "%{count} dias"
+      weeks:
+        one: 1 semana
+        other: "%{count} semanas"
+      months:
+        one: 1 mês
+        other: "%{count} meses"
+      years:
+        one: 1 ano
+        other: "%{count} anos"
+      less_than_x: "menos de %{distance}"

data/lib/dotiw/time_hash.rb

@@ -2,7 +2,7 @@
 
 module DOTIW
   class TimeHash
-    TIME_FRACTIONS = [:seconds, :minutes, :hours, :days, :months, :years]
+    TIME_FRACTIONS = [:seconds, :minutes, :hours, :days, :weeks, :months, :years]
 
     attr_accessor :distance, :smallest, :largest, :from_time, :to_time
 
@@ -10,7 +10,7 @@ module DOTIW
       self.output     = ActiveSupport::OrderedHash.new
       self.options    = options
       self.distance   = distance
-      self.from_time  = from_time || Time.now
+      self.from_time  = from_time || Time.current
       self.to_time    = to_time   || (@to_time_not_given = true && self.from_time + self.distance.seconds)
       self.smallest, self.largest = [self.from_time, self.to_time].minmax
       self.to_time   += 1.hour if @to_time_not_given && self.smallest.dst? && !self.largest.dst?
@@ -48,10 +48,12 @@ module DOTIW
             build_minutes
           elsif distance < 1.day
             build_hours
-          elsif distance < 28.days
+          elsif distance < 7.days
             build_days
-          else # greater than a month
-            build_years_months_days
+          elsif distance < 28.days
+            build_weeks
+          else # greater than a week
+            build_years_months_weeks_days
           end
         end
       end
@@ -76,28 +78,46 @@ module DOTIW
       output[:days], self.distance = distance.divmod(1.day) if output[:days].nil?
     end
 
+    def build_weeks
+      output[:weeks], self.distance = distance.divmod(1.week) if output[:weeks].nil?
+    end
+
     def build_months
-      build_years_months_days
+      build_years_months_weeks_days
 
       if (years = output.delete(:years)) > 0
         output[:months] += (years * 12)
       end
     end
 
-    def build_years_months_days
+    def build_years_months_weeks_days
       months = (largest.year - smallest.year) * 12 + (largest.month - smallest.month)
       years, months = months.divmod(12)
 
       days = largest.day - smallest.day
 
+      weeks, days = days.divmod(7)
+      
       # Will otherwise incorrectly say one more day if our range goes over a day.
       days -= 1 if largest.hour < smallest.hour
 
       if days < 0
-        # Convert the last month to days and add to total
+        # Convert a week to days and add to total
+        weeks -= 1
+        days += 7
+      end
+
+      if weeks < 0
+        # Convert the last month to a week and add to total
         months -= 1
         last_month = largest.advance(:months => -1)
-        days += Time.days_in_month(last_month.month, last_month.year)
+        days_in_month = Time.days_in_month(last_month.month, last_month.year)
+        weeks += days_in_month / 7
+        days += days_in_month % 7
+        if days >= 7
+          days -= 7
+          weeks += 1
+        end
       end
 
       if months < 0
@@ -108,6 +128,7 @@ module DOTIW
 
       output[:years]   = years
       output[:months]  = months
+      output[:weeks]   = weeks
       output[:days]    = days
 
       total_days, self.distance = distance.abs.divmod(1.day)

data/lib/dotiw/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module DOTIW
-  VERSION = "3.0.1"
+  VERSION = "3.1.1"
 end

data/spec/lib/dotiw_spec.rb

@@ -23,8 +23,9 @@ describe "A better distance_of_time_in_words" do
       [10.minutes.to_i, "10 minutes"],
       [1.hour.to_i, "1 hour"],
       [1.hour + 30.seconds, "1 hour and 30 seconds"],
-      [4.weeks.to_i, "28 days"],
-      [24.weeks.to_i, "5 months and 15 days"]
+      [4.weeks.to_i, "4 weeks"],
+      [4.weeks + 2.days, "4 weeks and 2 days"],
+      [24.weeks.to_i, "5 months, 2 weeks, and 1 day"]
     ]
     fragments.each do |number, result|
       it "#{number} == #{result}" do
@@ -38,7 +39,7 @@ describe "A better distance_of_time_in_words" do
         expect(distance_of_time(2.5.hours + 30.seconds, except: 'seconds')).to eq("2 hours and 30 minutes")
       end
 
-      it "except:seconds har higher presedence than include_seconds:true" do
+      it "except:seconds has higher precedence than include_seconds:true" do
         expect(distance_of_time(1.2.minute, include_seconds: true, except: 'seconds')).to eq('1 minute')
       end
     end
@@ -48,7 +49,7 @@ describe "A better distance_of_time_in_words" do
   describe "hash version" do
     describe "giving correct numbers of" do
 
-      [:years, :months, :days, :minutes, :seconds].each do |name|
+      [:years, :months, :weeks, :days, :minutes, :seconds].each do |name|
         describe name do
           it "exactly" do
             hash = distance_of_time_in_words_hash(START_TIME, START_TIME + 1.send(name))
@@ -64,13 +65,14 @@ describe "A better distance_of_time_in_words" do
 
       it "should be happy with lots of measurements" do
         hash = distance_of_time_in_words_hash(START_TIME,
-                                              START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds)
+                                              START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds)
         expect(hash[:years]).to eq(1)
         expect(hash[:months]).to eq(2)
-        expect(hash[:days]).to eq(3)
-        expect(hash[:hours]).to eq(4)
-        expect(hash[:minutes]).to eq(5)
-        expect(hash[:seconds]).to eq(6)
+        expect(hash[:weeks]).to eq(3)
+        expect(hash[:days]).to eq(4)
+        expect(hash[:hours]).to eq(5)
+        expect(hash[:minutes]).to eq(6)
+        expect(hash[:seconds]).to eq(7)
       end
     end
   end
@@ -91,14 +93,14 @@ describe "A better distance_of_time_in_words" do
       [START_TIME, START_TIME + 1.minute, "1 minute"],
       [START_TIME, START_TIME + 3.years, "3 years"],
       [START_TIME, START_TIME + 10.years, "10 years"],
-      [START_TIME, START_TIME + 10.years, "10 years"],
+      [START_TIME, START_TIME + 8.months, "8 months"],
       [START_TIME, START_TIME + 3.hour, "3 hours"],
       [START_TIME, START_TIME + 13.months, "1 year and 1 month"],
       # Any numeric sequence is merely coincidental.
-      [START_TIME, START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
+      [START_TIME, START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds, "1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds"],
       ["2009-3-16".to_time, "2008-4-14".to_time, "11 months and 2 days"],
       ["2009-3-16".to_time + 1.minute, "2008-4-14".to_time, "11 months, 2 days, and 1 minute"],
-      ["2009-4-14".to_time, "2008-3-16".to_time, "1 year and 29 days"],
+      ["2009-4-14".to_time, "2008-3-16".to_time, "1 year, 4 weeks, and 1 day"],
       ["2009-2-01".to_time, "2009-3-01".to_time, "1 month"],
       ["2008-2-01".to_time, "2008-3-01".to_time, "1 month"]
     ]
@@ -126,10 +128,14 @@ describe "A better distance_of_time_in_words" do
          START_TIME + 2.day + 10000.hour + 10.second,
          :days,
          "418 days, 16 hours, and 10 seconds"],
+        [START_TIME,
+         START_TIME + 2.day + 10000.hour + 10.second,
+         :weeks,
+         "59 weeks, 5 days, 16 hours, and 10 seconds"],
         [START_TIME,
          START_TIME + 2.day + 10000.hour + 10.second,
          :months,
-         "13 months, 22 days, 16 hours, and 10 seconds"],
+         "13 months, 3 weeks, 1 day, 16 hours, and 10 seconds"],
         ["2015-1-15".to_time, "2016-3-15".to_time, :months, "14 months"]
 
       ]
@@ -148,8 +154,9 @@ describe "A better distance_of_time_in_words" do
         [5.minutes.to_i, "5 minutes"],
         [10.minutes.to_i, "10 minutes"],
         [1.hour.to_i, "1 hour"],
-        [4.weeks.to_i, "28 days"],
-        [24.weeks.to_i, "5 months and 15 days"]
+        [6.days.to_i, "6 days"],
+        [4.weeks.to_i, "4 weeks"],
+        [24.weeks.to_i, "5 months, 2 weeks, and 1 day"]
       ]
       fragments.each do |start, output|
         it "should be #{output}" do
@@ -164,9 +171,9 @@ describe "A better distance_of_time_in_words" do
     fragments = [
       # Any numeric sequence is merely coincidental.
       [START_TIME,
-       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :words_connector => " - " },
-       "1 year - 2 months - 3 days - 4 hours - 5 minutes, and 6 seconds"],
+       "1 year - 2 months - 3 weeks - 4 days - 5 hours - 6 minutes, and 7 seconds"],
       [START_TIME,
        START_TIME + 5.minutes + 6.seconds,
        { :two_words_connector => " - " },
@@ -191,25 +198,25 @@ describe "A better distance_of_time_in_words" do
        { :only => ["minutes", "hours"]},
        "1 hour and 1 minute"],
       [START_TIME,
-       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :vague => true },
        "about 1 year"],
       [START_TIME,
-       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :vague => "Yes please" },
        "about 1 year"],
       [START_TIME,
-       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :vague => false },
-       "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
+       "1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds"],
       [START_TIME,
-       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :vague => nil },
-       "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
+       "1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds"],
       [START_TIME,
-       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :except => "minutes" },
-       "1 year, 2 months, 3 days, 4 hours, and 6 seconds"],
+       "1 year, 2 months, 3 weeks, 4 days, 5 hours, and 7 seconds"],
       [START_TIME,
         START_TIME + 1.hour + 2.minutes + 3.seconds,
         { :highest_measure_only => true },
@@ -225,7 +232,7 @@ describe "A better distance_of_time_in_words" do
       [START_TIME,
        START_TIME + 2.year + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :highest_measures => 2 },
-       "2 years and 25 days"],
+       "2 years and 3 weeks"],
       [START_TIME,
        START_TIME + 4.days + 6.minutes + 7.seconds,
        { :highest_measures => 3 },
@@ -233,7 +240,7 @@ describe "A better distance_of_time_in_words" do
       [START_TIME,
        START_TIME + 1.year + 2.weeks,
        { :highest_measures => 3 },
-       "1 year and 14 days"],
+       "1 year and 2 weeks"],
       [START_TIME,
        START_TIME + 1.days,
        { :only => [:years, :months] },
@@ -260,8 +267,8 @@ describe "A better distance_of_time_in_words" do
 
       it "removes seconds in all other cases" do
         expect(distance_of_time_in_words(START_TIME,
-                                  START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
-                                  false)).to eq("1 year, 2 months, 3 days, 4 hours, and 5 minutes")
+                                  START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
+                                  false)).to eq("1 year, 2 months, 3 weeks, 4 days, 5 hours, and 6 minutes")
       end
     end # include_seconds
   end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dotiw
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.1
 platform: ruby
 authors:
 - Ryan Bigg
+- Lauran Jansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -94,14 +95,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Better distance_of_time_in_words for Rails
-email: radarlistener@gmail.com
+description: |-
+  dotiw is a gem for Rails that overrides the
+                default distance_of_time_in_words and provides
+                a more accurate output. Do you crave accuracy
+                down to the second? So do I. That's why I made
+                this gem. - Ryan
+email:
+- radarlistener@gmail.com
+- github@lauranjansen.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - MIT-LICENSE
 - README.markdown
@@ -109,21 +119,26 @@ files:
 - dotiw.gemspec
 - lib/dotiw.rb
 - lib/dotiw/action_view_ext/helpers/date_helper.rb
+- lib/dotiw/locale/da.yml
 - lib/dotiw/locale/de.yml
 - lib/dotiw/locale/en.yml
 - lib/dotiw/locale/es.yml
+- lib/dotiw/locale/fr.yml
+- lib/dotiw/locale/id.yml
 - lib/dotiw/locale/it.yml
 - lib/dotiw/locale/ja.yml
 - lib/dotiw/locale/nb.yml
 - lib/dotiw/locale/nl.yml
 - lib/dotiw/locale/pl.yml
+- lib/dotiw/locale/pt-BR.yml
 - lib/dotiw/locale/ru.yml
 - lib/dotiw/time_hash.rb
 - lib/dotiw/version.rb
 - spec/lib/dotiw_spec.rb
 - spec/spec_helper.rb
-homepage: 
-licenses: []
+homepage: https://github.com/radar/dotiw
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -141,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Better distance_of_time_in_words for Rails