dotiw 5.1.0 → 5.3.2

data/lib/dotiw/locale/nl.yml

@@ -23,3 +23,38 @@ nl:
         one: 1 jaar
         other: "%{count} jaar"
       less_than_x: "minder dan %{distance}"
+    dotiw_compact:
+      seconds:
+        one: 1s
+        other: "%{count}s"
+      minutes:
+        one: 1m
+        other: "%{count}m"
+      hours:
+        one: 1u
+        other: "%{count}u"
+      days:
+        one: 1d
+        other: "%{count}d"
+      weeks:
+        one: 1w
+        other: "%{count}w"
+      months:
+        one: 1ma
+        other: "%{count}ma"
+      years:
+        one: 1j
+        other: "%{count}j"
+      less_than_x: "<%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: ~1j
+        any: "~%{count}j"
+      over_x_years:
+        one: ">1j"
+        other: ">%{count}j"
+      almost_x_years:
+        one: ~1j
+        any: "~%{count}j"

data/lib/dotiw/locale/pl.yml

@@ -37,3 +37,38 @@ pl:
         many: "%{count} lat"
         other: "%{count} lat"
       less_than_x: "mniej niż %{distance}"
+    dotiw_compact:
+      seconds:
+        one: 1s
+        other: "%{count}s"
+      minutes:
+        one: 1m
+        other: "%{count}m"
+      hours:
+        one: 1g
+        other: "%{count}g"
+      days:
+        one: 1d
+        other: "%{count}d"
+      weeks:
+        one: 1t
+        other: "%{count}t"
+      months:
+        one: 1mi
+        other: "%{count}mi"
+      years:
+        one: 1r
+        other: "%{count}l"
+      less_than_x: "<%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: ~1r
+        any: "~%{count}r"
+      over_x_years:
+        one: ">1r"
+        other: ">%{count}r"
+      almost_x_years:
+        one: ~1r
+        any: "~%{count}r"

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

@@ -23,3 +23,38 @@ pt-BR:
         one: 1 ano
         other: "%{count} anos"
       less_than_x: "menos de %{distance}"
+    dotiw_compact:
+      seconds:
+        one: 1s
+        other: "%{count}s"
+      minutes:
+        one: 1m
+        other: "%{count}m"
+      hours:
+        one: 1h
+        other: "%{count}h"
+      days:
+        one: 1d
+        other: "%{count}d"
+      weeks:
+        one: 1s
+        other: "%{count}s"
+      months:
+        one: 1mê
+        other: "%{count}mê"
+      years:
+        one: 1a
+        other: "%{count}a"
+      less_than_x: "<%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: ~1a
+        any: "~%{count}a"
+      over_x_years:
+        one: ">1a"
+        other: ">%{count}a"
+      almost_x_years:
+        one: ~1a
+        any: "~%{count}a"

data/lib/dotiw/locale/ru.yml

@@ -37,3 +37,40 @@ ru:
         many:  "%{count} лет"
         other: "%{count} года"
       less_than_x: "меньше, чем %{distance}"
+    dotiw_compact:
+      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:   "%{count}г"
+        few:   "%{count}г"
+        many:  "%{count}л"
+        other: "%{count}г"
+      less_than_x: "<%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: ~1г
+        any: "~%{count}г"
+      over_x_years:
+        one: ">1г"
+        other: ">%{count}г"
+      almost_x_years:
+        one: ~1г
+        any: "~%{count}г"

data/lib/dotiw/locale/sv.yml

@@ -0,0 +1,48 @@
+sv:
+  datetime:
+    dotiw:
+      seconds:
+        one: 1 sekund
+        other: "%{count} sekunder"
+      minutes:
+        one: 1 minut
+        other: "%{count} minuter"
+      hours:
+        one: 1 timme
+        other: "%{count} timmar"
+      days:
+        one: 1 dag
+        other: "%{count} dagar"
+      weeks:
+        one: 1 vecka
+        other: "%{count} veckor"
+      months:
+        one: 1 månad
+        other: "%{count} månader"
+      years:
+        one: 1 år
+        other: "%{count} år"
+      less_than_x: "mindre än %{distance}"
+    dotiw_compact:
+      seconds:
+        one: 1s
+        other: "%{count}s"
+      minutes:
+        one: 1m
+        other: "%{count}m"
+      hours:
+        one: 1t
+        other: "%{count}t"
+      days:
+        one: 1d
+        other: "%{count}d"
+      weeks:
+        one: 1v
+        other: "%{count}v"
+      months:
+        one: 1m
+        other: "%{count}m"
+      years:
+        one: 1å
+        other: "%{count}å"
+      less_than_x: "<%{distance}"

data/lib/dotiw/locale/vi.yml

@@ -23,3 +23,26 @@ vi:
         one: 1 năm
         other: "%{count} năm"
       less_than_x: "ít hơn %{distance}"
+    dotiw_compact:
+      seconds:
+        one: 1 giây
+        other: "%{count}giây"
+      minutes:
+        one: 1 phút
+        other: "%{count}phút"
+      hours:
+        one: 1 giờ
+        other: "%{count}giờ"
+      days:
+        one: 1 ngày
+        other: "%{count}ngày"
+      weeks:
+        one: 1 tuần
+        other: "%{count}tuần"
+      months:
+        one: 1 tháng
+        other: "%{count}tháng"
+      years:
+        one: 1 năm
+        other: "%{count}năm"
+      less_than_x: "< %{distance}"

data/lib/dotiw/locale/zh-CN.yml

@@ -23,3 +23,26 @@ zh-CN:
         one: 1 年
         other: "%{count} 年"
       less_than_x: "小于 %{distance}"
+    dotiw_compact:
+      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}年"
+      less_than_x: "小于 %{distance}"

data/lib/dotiw/locale/zh-TW.yml

@@ -0,0 +1,60 @@
+zh-TW:
+  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} 年"
+      less_than_x: "小於 %{distance}"
+    dotiw_compact:
+      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}年"
+      less_than_x: "小於%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: 約1年
+        any: "約%{count}年"
+      over_x_years:
+        one: "大於1年"
+        other: "大於%{count}年"
+      almost_x_years:
+        one: 將近1年
+        any: "將近%{count}年"

data/lib/dotiw/methods.rb

@@ -12,18 +12,25 @@ module DOTIW
     end
 
     def distance_of_time(seconds, options = {})
-      options[:include_seconds] ||= true
+      options = options_with_scope(options).reverse_merge(
+        include_seconds: true
+      )
+      options.delete(:compact)
       _display_time_in_words DOTIW::TimeHash.new(seconds, nil, nil, options).to_hash, options
     end
 
     def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {})
+      raise ArgumentError, "nil can't be converted to a Time value" if from_time.nil? || to_time.nil?
+
       if include_seconds_or_options.is_a?(Hash)
         options = include_seconds_or_options
       else
+        options = options.dup
         options[:include_seconds] ||= !!include_seconds_or_options
       end
       return distance_of_time(from_time, options) if to_time == 0
 
+      options = options_with_scope(options)
       hash = distance_of_time_in_words_hash(from_time, to_time, options)
       _display_time_in_words(hash, options)
     end
@@ -34,8 +41,16 @@ module DOTIW
 
     private
 
+    def options_with_scope(options)
+      if options.key?(:compact)
+        options.merge(scope: DOTIW::DEFAULT_I18N_SCOPE_COMPACT)
+      else
+        options
+      end
+    end
+
     def _display_time_in_words(hash, options = {})
-      options.reverse_merge!(
+      options = options.reverse_merge(
         include_seconds: false
       ).symbolize_keys!
 
@@ -77,17 +92,17 @@ module DOTIW
       highest_measures = 1 if options.delete(:highest_measure_only)
       output = output[0...highest_measures] if highest_measures
 
-      options[:words_connector] ||= I18n.translate :'datetime.dotiw.words_connector',
+      options[:words_connector] ||= I18n.translate :"#{i18n_scope}.words_connector",
                                                    default: :'support.array.words_connector',
                                                    locale: options[:locale]
-      options[:two_words_connector] ||= I18n.translate :'datetime.dotiw.two_words_connector',
+      options[:two_words_connector] ||= I18n.translate :"#{i18n_scope}.two_words_connector",
                                                        default: :'support.array.two_words_connector',
                                                        locale: options[:locale]
-      options[:last_word_connector] ||= I18n.translate :'datetime.dotiw.last_word_connector',
+      options[:last_word_connector] ||= I18n.translate :"#{i18n_scope}.last_word_connector",
                                                        default: :'support.array.last_word_connector',
                                                        locale: options[:locale]
 
-      output.to_sentence(options)
+      output.to_sentence(options.except(:accumulate_on, :compact))
     end
   end
-end # DOTIW
+end

data/lib/dotiw/time_hash.rb

@@ -8,7 +8,7 @@ module DOTIW
 
     def initialize(distance, from_time, to_time = nil, options = {})
       @output     = {}
-      @options    = options
+      @options    = options.dup
       @distance   = distance
       @from_time  = from_time || Time.current
       @to_time    = to_time   || (@to_time_not_given = true && @from_time + distance.seconds)
@@ -34,23 +34,29 @@ module DOTIW
 
     attr_reader :options, :output
 
+    ONE_MINUTE = 1.minute.freeze
+    ONE_HOUR = 1.hour.freeze
+    ONE_DAY = 1.day.freeze
+    ONE_WEEK = 7.days.freeze
+    FOUR_WEEKS = 28.days.freeze
+
     def build_time_hash
-      if accumulate_on = options.delete(:accumulate_on)
+      if accumulate_on = options[:accumulate_on]
         accumulate_on = accumulate_on.to_sym
         return build_time_hash if accumulate_on == :years
 
         TIME_FRACTIONS.index(accumulate_on).downto(0) { |i| send("build_#{TIME_FRACTIONS[i]}") }
       else
         while distance > 0
-          if distance < 1.minute
+          if distance < ONE_MINUTE
             build_seconds
-          elsif distance < 1.hour
+          elsif distance < ONE_HOUR
             build_minutes
-          elsif distance < 1.day
+          elsif distance < ONE_DAY
             build_hours
-          elsif distance < 7.days
+          elsif distance < ONE_WEEK
             build_days
-          elsif distance < 28.days
+          elsif distance < FOUR_WEEKS
             build_weeks
           else # greater than a week
             build_years_months_weeks_days
@@ -67,19 +73,19 @@ module DOTIW
     end
 
     def build_minutes
-      output[:minutes], @distance = distance.divmod(1.minute.to_i)
+      output[:minutes], @distance = distance.divmod(ONE_MINUTE.to_i)
     end
 
     def build_hours
-      output[:hours], @distance = distance.divmod(1.hour.to_i)
+      output[:hours], @distance = distance.divmod(ONE_HOUR.to_i)
     end
 
     def build_days
-      output[:days], @distance = distance.divmod(1.day.to_i) unless output[:days]
+      output[:days], @distance = distance.divmod(ONE_DAY.to_i) unless output[:days]
     end
 
     def build_weeks
-      output[:weeks], @distance = distance.divmod(1.week.to_i) unless output[:weeks]
+      output[:weeks], @distance = distance.divmod(ONE_WEEK.to_i) unless output[:weeks]
     end
 
     def build_months
@@ -137,9 +143,9 @@ module DOTIW
       output[:weeks]   = weeks
       output[:days]    = days
 
-      total_days, @distance = distance.abs.divmod(1.day.to_i)
+      total_days, @distance = distance.abs.divmod(ONE_DAY.to_i)
 
       [total_days, @distance]
     end
-  end # TimeHash
-end # DOTIW
+  end
+end

data/lib/dotiw/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DOTIW
-  VERSION = '5.1.0'
+  VERSION = '5.3.2'
 end

data/lib/dotiw.rb

@@ -17,6 +17,7 @@ module DOTIW
   extend self
 
   DEFAULT_I18N_SCOPE = :'datetime.dotiw'
+  DEFAULT_I18N_SCOPE_COMPACT = :'datetime.dotiw_compact'
 
   def init_i18n!
     I18n.load_path.unshift(*locale_files)
@@ -36,7 +37,7 @@ module DOTIW
   def files(directory, ext)
     Dir[File.join File.dirname(__FILE__), directory, ext]
   end
-end # DOTIW
+end
 
 DOTIW.init_i18n!