dotiw 2.0 → 3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7ac361d8ee4fa014e09e9f77026c08b4fecbe8c
-  data.tar.gz: 0dc62da9541e16dd15228c7659b502013cae5a49
+  metadata.gz: aed9b495f66627b6c68f2e8ca572e2958ef44bf8
+  data.tar.gz: d49193040ff64bb85cd25829666a47268fc9ccc8
 SHA512:
-  metadata.gz: 8effe0793345b5319dd18ccf19bb018c4940d1ffab22094e97490a951548f07e1b22c2273130f09a557ecaefe06572901b33b082d4b5940bd4ad50d0aea44ba4
-  data.tar.gz: b659b4568937f7dfc770dc271b9bdc894bd253c5008fed536f8d0aff65257e948d3ea9c45869365fac064020a5ef7a349ddbcdd9fcec56ca9be39be0684a91bc
+  metadata.gz: eb4f3572b53a3a6dad22d64fd9793ce6df58791664b8dc9a3a98e6f7745b1a6fdad38d6b7e9014de30e46f33ad472ea5bc96ab1cc4bd0de97e897ebdc5aad318
+  data.tar.gz: 6d19cfebf638180ddf0bd8d5f2479df83baeb3426220dd57c645deb40294950f71200ffa5c0199e31ea9905359e2c12f71aac8bd749fdee85a658fc7b658c375

data/README.markdown

@@ -36,11 +36,25 @@ world*:
 
 Oh, and did I mention it supports I18n? Oh yeah. Rock on!
 
+## Install
+
+Install it as a gem:
+
+```ruby
+gem 'dotiw'
+```
+
+Or from GitHub:
+
+```ruby
+gem 'dotiw', github: 'radar/dotiw'
+```
+
 ### Options
 
 #### :locale
 
-You can pass in a locale and it'll output it in whatever language you want (provided you have translations, otherwise it'll default to English):
+You can pass in a locale and it'll output it in whatever language you want (provided you have translations, otherwise it'll default to your app's default locale (the `config.i18n.default_locale` you have set in `/config/application.rb`):
 
     >> distance_of_time_in_words(Time.now, Time.now + 1.minute, false, :locale => :es)
     => "1 minuto"

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

@@ -5,9 +5,9 @@ module ActionView
 
       def distance_of_time_in_words_hash(from_time, to_time, options = {})
         from_time = from_time.to_time if !from_time.is_a?(Time) && from_time.respond_to?(:to_time)
-        to_time   = to_time.to_time   if !to_time.is_a?(Time)   && to_time.respond_to?(:to_time)
+        to_time = to_time.to_time if !to_time.is_a?(Time) && to_time.respond_to?(:to_time)
 
-        DOTIW::TimeHash.new((from_time - to_time).abs, from_time, to_time, options).to_hash
+        DOTIW::TimeHash.new(nil, from_time, to_time, options).to_hash
       end
 
       def distance_of_time(seconds, options = {})
@@ -40,35 +40,46 @@ module ActionView
         distance_of_time_in_words(from_time, Time.now, include_seconds_or_options)
       end
 
-    private
+      private
       def display_time_in_words(hash, options = {})
         options.reverse_merge!(
-          :include_seconds => false
+            :include_seconds => false
         ).symbolize_keys!
 
         include_seconds = options.delete(:include_seconds)
         hash.delete(:seconds) if !include_seconds && hash[:minutes]
 
-        options[:except] = Array.wrap(options[:except]).map!(&:to_s) if options[:except]
-        options[:only] = Array.wrap(options[:only]).map!(&:to_s) if options[:only]
+        options[:except] = Array.wrap(options[:except]).map!(&:to_sym) if options[:except]
+        options[:only] = Array.wrap(options[:only]).map!(&:to_sym) if options[:only]
 
         # Remove all the values that are nil or excluded. Keep the required ones.
         hash.delete_if do |key, value|
           value.nil? || value.zero? ||
-            (options[:except] && options[:except].include?(key.to_s)) ||
-            (options[:only] && !options[:only].include?(key.to_s))
+              (options[:except] && options[:except].include?(key)) ||
+              (options[:only] && !options[:only].include?(key))
         end
-        return I18n.t('datetime.distance_in_words.less_than_x_seconds', :count => 1, :locale => options[:locale]) if hash.empty?
-
-        options.delete(:except)
-        options.delete(:only)
 
         i18n_scope = options.delete(:scope) || DOTIW::DEFAULT_I18N_SCOPE
+        if hash.empty?
+          fractions = DOTIW::TimeHash::TIME_FRACTIONS
+          fractions = fractions & options[:only] if options[:only]
+          fractions = fractions - options[:except] if options[:except]
+
+          I18n.with_options :locale => options[:locale], :scope => i18n_scope do |locale|
+            # e.g. try to format 'less than 1 days', fallback to '0 days'
+            return locale.translate :less_than_x,
+                                    :distance => locale.translate(fractions.first, :count => 1),
+                                    :default => locale.translate(fractions.first, :count => 0)
+          end
+        end
+
         output = []
         I18n.with_options :locale => options[:locale], :scope => i18n_scope do |locale|
           output = hash.map { |key, value| locale.t(key, :count => value) }
         end
 
+        options.delete(:except)
+        options.delete(:only)
         highest_measures = options.delete(:highest_measures)
         highest_measures = 1 if options.delete(:highest_measure_only)
         if highest_measures
@@ -76,14 +87,14 @@ module ActionView
         end
 
         options[:words_connector] ||= I18n.translate :'datetime.dotiw.words_connector',
-          :default => :'support.array.words_connector',
-          :locale => options[:locale]
+                                                     :default => :'support.array.words_connector',
+                                                     :locale => options[:locale]
         options[:two_words_connector] ||= I18n.translate :'datetime.dotiw.two_words_connector',
-          :default => :'support.array.two_words_connector',
-          :locale => options[:locale]
+                                                         :default => :'support.array.two_words_connector',
+                                                         :locale => options[:locale]
         options[:last_word_connector] ||= I18n.translate :'datetime.dotiw.last_word_connector',
-          :default => :'support.array.last_word_connector',
-          :locale => options[:locale]
+                                                         :default => :'support.array.last_word_connector',
+                                                         :locale => options[:locale]
 
         output.to_sentence(options)
       end

data/lib/dotiw/locale/de.yml

@@ -0,0 +1,25 @@
+de:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 Sekunde
+        other: "%{count} Sekunden"
+      minutes:
+        one: 1 Minute
+        other: "%{count} Minuten"
+      hours:
+        one: 1 Stunde
+        other: "%{count} Stunden"
+      days:
+        one: 1 Tag
+        other: "%{count} Tage"
+      weeks:
+        one: 1 Woche
+        other: "%{count} Wochen"
+      months:
+        one: 1 Monat
+        other: "%{count} Monate"
+      years:
+        one: 1 Jahr
+        other: "%{count} Jahre"
+      less_than_x: "weniger als %{distance}"

data/lib/dotiw/locale/en.yml

@@ -22,3 +22,4 @@ en:
       years:
         one: 1 year
         other: "%{count} years"
+      less_than_x: "less than %{distance}"

data/{spec/translations → lib/dotiw/locale}/es.yml

@@ -2,10 +2,10 @@ es:
   datetime:
     dotiw:
       seconds:
-        one: uno segundo
+        one: un segundo
         other: "%{count} segundos"
       minutes:
-        one: uno minuto
+        one: un minuto
         other: "%{count} minutos"
       hours:
         one: una hora
@@ -22,3 +22,4 @@ es:
       years:
         one: un año
         other: "%{count} años"
+      less_than_x: "menos de %{distance}"

data/lib/dotiw/locale/it.yml

@@ -0,0 +1,24 @@
+it:
+  datetime:
+    dotiw:
+      seconds:
+        one: un secondo
+        other: "%{count} secondi"
+      minutes:
+        one: un minuto
+        other: "%{count} minuti"
+      hours:
+        one: una ora
+        other: "%{count} ore"
+      days:
+        one: un giorno
+        other: "%{count} giorni"
+      weeks:
+        one: una settimana
+        other: "%{count} settimane"
+      months:
+        one: un mese
+        other: "%{count} mesi"
+      years:
+        one: un anno
+        other: "%{count} anni"

data/lib/dotiw/locale/ja.yml

@@ -0,0 +1,24 @@
+ja:
+  datetime:
+    dotiw:
+      seconds:
+        one: "1秒"
+        other: "%{count}秒"
+      minutes:
+        one: "1分"
+        other: "%{count}分"
+      hours:
+        one: "1時間"
+        other: "%{count}時間"
+      days:
+        one: "1日間"
+        other: "%{count}日間"
+      weeks:
+        one: "1週間"
+        other: "%{count}週間"
+      months:
+        one: "1ヶ月"
+        other: "%{count}ヶ月"
+      years:
+        one: "1年間"
+        other: "%{count}年間"

data/lib/dotiw/locale/nb.yml

@@ -0,0 +1,25 @@
+nb:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 sekund
+        other: "%{count} sekunder"
+      minutes:
+        one: 1 minutt
+        other: "%{count} minutter"
+      hours:
+        one: 1 time
+        other: "%{count} timer"
+      days:
+        one: 1 dag
+        other: "%{count} dager"
+      weeks:
+        one: 1 uke
+        other: "%{count} uke"
+      months:
+        one: 1 måned
+        other: "%{count} måneder"
+      years:
+        one: 1 år
+        other: "%{count} år"
+      less_than_x: "mindre enn %{distance}"

data/lib/dotiw/locale/nl.yml

@@ -0,0 +1,25 @@
+nl:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 seconde
+        other: "%{count} seconden"
+      minutes:
+        one: 1 minuut
+        other: "%{count} minuten"
+      hours:
+        one: 1 uur
+        other: "%{count} uur"
+      days:
+        one: 1 dag
+        other: "%{count} dagen"
+      weeks:
+        one: 1 week
+        other: "%{count} weken"
+      months:
+        one: 1 maand
+        other: "%{count} maanden"
+      years:
+        one: 1 jaar
+        other: "%{count} jaar"
+      less_than_x: "minder dan %{distance}"

data/lib/dotiw/locale/pl.yml

@@ -0,0 +1,32 @@
+pl:
+  datetime:
+    dotiw:
+      seconds:
+        one: "1 sekunda"
+        few: "%{count} sekundy"
+        other: "%{count} sekund"
+      minutes:
+        one: "1 minuta"
+        few: "%{count} minuty"
+        other: "%{count} minut"
+      hours:
+        one: "1 godzina"
+        few: "%{count} godziny"
+        other: "%{count} godzin"
+      days:
+        one: "1 dzień"
+        few: "%{count} dni"
+        other: "%{count} dni"
+      weeks:
+        one: "1 tydzień"
+        few: "%{count} tygodnie"
+        other: "%{count} tygodni"
+      months:
+        one: "1 miesiąc"
+        few: "%{count} miesiące"
+        other: "%{count} miesięcy"
+      years:
+        one: "1 rok"
+        few: "%{count} lata"
+        other: "%{count} lat"
+      less_than_x: "mniej niż %{distance}"

data/lib/dotiw/locale/ru.yml

@@ -0,0 +1,39 @@
+ru:
+  datetime:
+    dotiw:
+      seconds:
+        one:   "%{count} секунда"
+        few:   "%{count} секунды"
+        many:  "%{count} секунд"
+        other: "%{count} секунды"
+      minutes:
+        one:   "%{count} минута"
+        few:   "%{count} минуты"
+        many:  "%{count} минут"
+        other: "%{count} минуты"
+      hours:
+        one:   "%{count} час"
+        few:   "%{count} часа"
+        many:  "%{count} часов"
+        other: "%{count} часа"
+      days:
+        one:   "%{count} день"
+        few:   "%{count} дня"
+        many:  "%{count} дней"
+        other: "%{count} дня"
+      weeks:
+        one:   "%{count} неделя"
+        few:   "%{count} недели"
+        many:  "%{count} недель"
+        other: "%{count} недели"
+      months:
+        one:   "%{count} месяц"
+        few:   "%{count} месяца"
+        many:  "%{count} месяцев"
+        other: "%{count} месяца"
+      years:
+        one:   "%{count} год"
+        few:   "%{count} года"
+        many:  "%{count} лет"
+        other: "%{count} года"
+      less_than_x: "меньше, чем %{distance}"

data/lib/dotiw/time_hash.rb

@@ -11,8 +11,17 @@ module DOTIW
       self.options    = options
       self.distance   = distance
       self.from_time  = from_time || Time.now
-      self.to_time    = to_time   || (self.from_time + self.distance.seconds)
+      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?
+      self.to_time   -= 1.hour if @to_time_not_given && !self.smallest.dst? && self.largest.dst?
+      self.smallest, self.largest = [self.from_time, self.to_time].minmax
+      self.distance ||= begin
+        d = largest - smallest
+        d -= 1.hour if self.smallest.dst? && !self.largest.dst?
+        d += 1.hour if !self.smallest.dst? && self.largest.dst?
+        d
+      end
 
       build_time_hash
     end
@@ -64,7 +73,7 @@ module DOTIW
     end
 
     def build_days
-      output[:days], self.distance = distance.divmod(1.day)
+      output[:days], self.distance = distance.divmod(1.day) if output[:days].nil?
     end
 
     def build_months
@@ -101,7 +110,9 @@ module DOTIW
       output[:months]  = months
       output[:days]    = days
 
-      total_days, self.distance = (from_time - to_time).abs.divmod(1.day)
+      total_days, self.distance = distance.abs.divmod(1.day)
+
+      [total_days, self.distance]
     end
   end # TimeHash
-end # DOTIW
+end # DOTIW

data/lib/dotiw/version.rb

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

data/spec/lib/dotiw_spec.rb

@@ -7,11 +7,12 @@ describe "A better distance_of_time_in_words" do
   include ActionView::Helpers::TextHelper
   include ActionView::Helpers::NumberHelper
 
+  START_TIME = "01-08-2009".to_time
+
   before do
     I18n.locale = :en
-    time = "01-08-2009".to_time
-    allow(Time).to receive(:now).and_return(time)
-    allow(Time.zone).to receive(:now).and_return(time)
+    allow(Time).to receive(:now).and_return(START_TIME)
+    allow(Time.zone).to receive(:now).and_return(START_TIME)
   end
 
   describe "distance of time" do
@@ -50,20 +51,20 @@ describe "A better distance_of_time_in_words" do
       [:years, :months, :days, :minutes, :seconds].each do |name|
         describe name do
           it "exactly" do
-            hash = distance_of_time_in_words_hash(Time.now, Time.now + 1.send(name))
+            hash = distance_of_time_in_words_hash(START_TIME, START_TIME + 1.send(name))
             expect(hash[name]).to eq(1)
           end
 
           it "two" do
-            hash = distance_of_time_in_words_hash(Time.now, Time.now + 2.send(name))
+            hash = distance_of_time_in_words_hash(START_TIME, START_TIME + 2.send(name))
             expect(hash[name]).to eq(2)
           end
         end
       end
 
       it "should be happy with lots of measurements" do
-        hash = distance_of_time_in_words_hash(Time.now,
-                                              Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds)
+        hash = distance_of_time_in_words_hash(START_TIME,
+                                              START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds)
         expect(hash[:years]).to eq(1)
         expect(hash[:months]).to eq(2)
         expect(hash[:days]).to eq(3)
@@ -76,20 +77,25 @@ describe "A better distance_of_time_in_words" do
 
   describe "real version" do
     it "debe hablar español" do
-      expect(distance_of_time_in_words(Time.now, Time.now + 1.days, true, :locale => :es)).to eq("un día")
-      expect(distance_of_time_in_words(Time.now, Time.now + 5.days, true, :locale => :es)).to eq("5 días")
+      expect(distance_of_time_in_words(START_TIME, START_TIME + 1.days, :locale => :es)).to eq("un día")
+      expect(distance_of_time_in_words(START_TIME, START_TIME + 5.days, :locale => :es)).to eq("5 días")
+    end
+
+    it "deve parlare l'italiano" do
+      expect(distance_of_time_in_words(START_TIME, START_TIME + 1.days, true, :locale => :it)).to eq("un giorno")
+      expect(distance_of_time_in_words(START_TIME, START_TIME + 5.days, true, :locale => :it)).to eq("5 giorni")
     end
 
     fragments = [
-      [Time.now, Time.now + 5.days + 3.minutes, "5 days and 3 minutes"],
-      [Time.now, Time.now + 1.minute, "1 minute"],
-      [Time.now, Time.now + 3.years, "3 years"],
-      [Time.now, Time.now + 10.years, "10 years"],
-      [Time.now, Time.now + 10.years, "10 years"],
-      [Time.now, Time.now + 3.hour, "3 hours"],
-      [Time.now, Time.now + 13.months, "1 year and 1 month"],
+      [START_TIME, START_TIME + 5.days + 3.minutes, "5 days and 3 minutes"],
+      [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 + 3.hour, "3 hours"],
+      [START_TIME, START_TIME + 13.months, "1 year and 1 month"],
       # Any numeric sequence is merely coincidental.
-      [Time.now, Time.now + 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.days + 4.hours + 5.minutes + 6.seconds, "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 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"],
@@ -104,26 +110,28 @@ describe "A better distance_of_time_in_words" do
 
     describe "accumulate on" do
       fragments = [
-        [Time.now,
-         Time.now + 10.minute,
+        [START_TIME,
+         START_TIME + 10.minute,
          :seconds,
          "600 seconds"],
-        [Time.now,
-         Time.now + 10.hour + 10.minute + 1.second,
+        [START_TIME,
+         START_TIME + 10.hour + 10.minute + 1.second,
          :minutes,
          "610 minutes and 1 second"],
-        [Time.now,
-         Time.now + 2.day + 10000.hour + 10.second,
+        [START_TIME,
+         START_TIME + 2.day + 10000.hour + 10.second,
          :hours,
          "10048 hours and 10 seconds"],
-        [Time.now,
-         Time.now + 2.day + 10000.hour + 10.second,
+        [START_TIME,
+         START_TIME + 2.day + 10000.hour + 10.second,
          :days,
          "418 days, 16 hours, and 10 seconds"],
-        [Time.now,
-         Time.now + 2.day + 10000.hour + 10.second,
+        [START_TIME,
+         START_TIME + 2.day + 10000.hour + 10.second,
          :months,
-         "13 months, 16 hours, and 10 seconds"]
+         "13 months, 22 days, 16 hours, and 10 seconds"],
+        ["2015-1-15".to_time, "2016-3-15".to_time, :months, "14 months"]
+
       ]
       fragments.each do |start, finish, accumulator, output|
         it "should be #{output}" do
@@ -155,77 +163,89 @@ describe "A better distance_of_time_in_words" do
   describe "with output options" do
     fragments = [
       # Any numeric sequence is merely coincidental.
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :words_connector => " - " },
        "1 year - 2 months - 3 days - 4 hours - 5 minutes, and 6 seconds"],
-      [Time.now,
-       Time.now + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 5.minutes + 6.seconds,
        { :two_words_connector => " - " },
        "5 minutes - 6 seconds"],
-      [Time.now,
-       Time.now + 4.hours +  5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 4.hours +  5.minutes + 6.seconds,
        { :last_word_connector => " - " },
        "4 hours, 5 minutes - 6 seconds"],
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :except => "minutes" },
        "1 year, 2 months, 3 days, 4 hours, and 6 seconds"],
-      [Time.now,
-       Time.now + 1.hour + 1.minute,
+      [START_TIME,
+       START_TIME + 1.hour + 1.minute,
        { :except => "minutes"}, "1 hour"],
-      [Time.now,
-       Time.now + 1.hour + 1.day + 1.minute,
+      [START_TIME,
+       START_TIME + 1.hour + 1.day + 1.minute,
        { :except => ["minutes", "hours"]},
        "1 day"],
-      [Time.now,
-       Time.now + 1.hour + 1.day + 1.minute,
+      [START_TIME,
+       START_TIME + 1.hour + 1.day + 1.minute,
        { :only => ["minutes", "hours"]},
        "1 hour and 1 minute"],
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :vague => true },
        "about 1 year"],
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :vague => "Yes please" },
        "about 1 year"],
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :vague => false },
        "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :vague => nil },
        "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
-      [Time.now,
-       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+      [START_TIME,
+       START_TIME + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
        { :except => "minutes" },
        "1 year, 2 months, 3 days, 4 hours, and 6 seconds"],
-      [Time.now,
-        Time.now + 1.hour + 2.minutes + 3.seconds,
+      [START_TIME,
+        START_TIME + 1.hour + 2.minutes + 3.seconds,
         { :highest_measure_only => true },
         "1 hour"],
-      [Time.now,
-       Time.now + 1.hours + 2.minutes + 3.seconds,
+      [START_TIME,
+       START_TIME + 1.hours + 2.minutes + 3.seconds,
        { :highest_measures => 1 },
        "1 hour"],
-      [Time.now,
-       Time.now + 2.year + 3.months + 4.days + 5.hours + 6.minutes + 7.seconds,
+      [START_TIME,
+       START_TIME + 2.year + 3.months + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :highest_measures => 3 },
        "2 years, 3 months, and 4 days"],
-      [Time.now,
-       Time.now + 2.year + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
+      [START_TIME,
+       START_TIME + 2.year + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
        { :highest_measures => 2 },
        "2 years and 25 days"],
-      [Time.now,
-       Time.now + 4.days + 6.minutes + 7.seconds,
+      [START_TIME,
+       START_TIME + 4.days + 6.minutes + 7.seconds,
        { :highest_measures => 3 },
        "4 days, 6 minutes, and 7 seconds"],
-      [Time.now,
-       Time.now + 1.year + 2.weeks,
+      [START_TIME,
+       START_TIME + 1.year + 2.weeks,
        { :highest_measures => 3 },
-       "1 year and 14 days"]
+       "1 year and 14 days"],
+      [START_TIME,
+       START_TIME + 1.days,
+       { :only => [:years, :months] },
+       "less than 1 month"],
+      [START_TIME,
+       START_TIME + 5.minutes,
+       { :except => [:hours, :minutes, :seconds] },
+       "less than 1 day"],
+      [START_TIME,
+       START_TIME + 1.days,
+       { :highest_measures => 1, :only => [:years, :months] },
+       "less than 1 month"]
     ]
     fragments.each do |start, finish, options, output|
       it "should be #{output}" do
@@ -235,12 +255,12 @@ describe "A better distance_of_time_in_words" do
 
     describe "include_seconds" do
       it "is ignored if only seconds have passed" do
-        expect(distance_of_time_in_words(Time.now, Time.now + 1.second, false)).to eq("1 second")
+        expect(distance_of_time_in_words(START_TIME, START_TIME + 1.second, false)).to eq("1 second")
       end
 
       it "removes seconds in all other cases" do
-        expect(distance_of_time_in_words(Time.now,
-                                  Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+        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")
       end
     end # include_seconds

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotiw
 version: !ruby/object:Gem::Version
-  version: '2.0'
+  version: '3.0'
 platform: ruby
 authors:
 - Ryan Bigg
@@ -109,12 +109,19 @@ files:
 - dotiw.gemspec
 - lib/dotiw.rb
 - lib/dotiw/action_view_ext/helpers/date_helper.rb
+- lib/dotiw/locale/de.yml
 - lib/dotiw/locale/en.yml
+- lib/dotiw/locale/es.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/ru.yml
 - lib/dotiw/time_hash.rb
 - lib/dotiw/version.rb
 - spec/lib/dotiw_spec.rb
 - spec/spec_helper.rb
-- spec/translations/es.yml
 homepage: 
 licenses: []
 metadata: {}
@@ -134,11 +141,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Better distance_of_time_in_words for Rails
 test_files:
 - spec/lib/dotiw_spec.rb
 - spec/spec_helper.rb
-- spec/translations/es.yml