dotiw 4.0.1 → 5.3.1

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

@@ -0,0 +1,48 @@
+vi:
+  datetime:
+    dotiw:
+      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: "í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

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+module DOTIW
+  module Methods
+    extend self
+
+    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)
+
+      DOTIW::TimeHash.new(nil, from_time, to_time, options).to_hash
+    end
+
+    def distance_of_time(seconds, options = {})
+      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
+
+    def time_ago_in_words(from_time, include_seconds_or_options = {})
+      distance_of_time_in_words(from_time, Time.current, include_seconds_or_options)
+    end
+
+    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 = options.reverse_merge(
+        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_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]&.include?(key) ||
+          (options[:only] && !options[:only].include?(key))
+      end
+
+      i18n_scope = options.delete(:scope) || DOTIW::DEFAULT_I18N_SCOPE
+      if hash.empty?
+        fractions = DOTIW::TimeHash::TIME_FRACTIONS
+        fractions &= options[:only] if options[:only]
+        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)
+      output = output[0...highest_measures] if highest_measures
+
+      options[:words_connector] ||= I18n.translate :"#{i18n_scope}.words_connector",
+                                                   default: :'support.array.words_connector',
+                                                   locale: options[:locale]
+      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 :"#{i18n_scope}.last_word_connector",
+                                                       default: :'support.array.last_word_connector',
+                                                       locale: options[:locale]
+
+      output.to_sentence(options.except(:accumulate_on, :compact))
+    end
+  end
+end

data/lib/dotiw/time_hash.rb

@@ -1,25 +1,25 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module DOTIW
   class TimeHash
-    TIME_FRACTIONS = [:seconds, :minutes, :hours, :days, :weeks, :months, :years]
-
-    attr_accessor :distance, :smallest, :largest, :from_time, :to_time
-
-    def initialize(distance, from_time = nil, to_time = nil, options = {})
-      self.output     = ActiveSupport::OrderedHash.new
-      self.options    = options
-      self.distance   = distance
-      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?
-      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
+    TIME_FRACTIONS = %i[seconds minutes hours days weeks months years].freeze
+
+    attr_reader :distance, :smallest, :largest, :from_time, :to_time
+
+    def initialize(distance, from_time, to_time = nil, options = {})
+      @output     = {}
+      @options    = options.dup
+      @distance   = distance
+      @from_time  = from_time || Time.current
+      @to_time    = to_time   || (@to_time_not_given = true && @from_time + distance.seconds)
+      @smallest, @largest = [@from_time, @to_time].minmax
+      @to_time   += 1.hour if @to_time_not_given && smallest.dst? && !largest.dst?
+      @to_time   -= 1.hour if @to_time_not_given && !smallest.dst? && largest.dst?
+      @smallest, @largest = [@from_time, @to_time].minmax
+      @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 -= 1.hour if smallest.dst? && !largest.dst?
+        d += 1.hour if !smallest.dst? && largest.dst?
         d
       end
 
@@ -30,27 +30,33 @@ module DOTIW
       output
     end
 
-  private
-    attr_accessor :options, :output
+    private
+
+    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
-        if accumulate_on == :years
-          return build_time_hash
-        end
-        TIME_FRACTIONS.index(accumulate_on).downto(0) { |i| self.send("build_#{TIME_FRACTIONS[i]}") }
+        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
@@ -63,23 +69,23 @@ module DOTIW
 
     def build_seconds
       output[:seconds] = distance.to_i
-      self.distance = 0
+      @distance = 0
     end
 
     def build_minutes
-      output[:minutes], self.distance = distance.divmod(1.minute.to_i)
+      output[:minutes], @distance = distance.divmod(ONE_MINUTE.to_i)
     end
 
     def build_hours
-      output[:hours], self.distance = distance.divmod(1.hour.to_i)
+      output[:hours], @distance = distance.divmod(ONE_HOUR.to_i)
     end
 
     def build_days
-      output[:days], self.distance = distance.divmod(1.day.to_i) if output[:days].nil?
+      output[:days], @distance = distance.divmod(ONE_DAY.to_i) unless output[:days]
     end
 
     def build_weeks
-      output[:weeks], self.distance = distance.divmod(1.week.to_i) if output[:weeks].nil?
+      output[:weeks], @distance = distance.divmod(ONE_WEEK.to_i) unless output[:weeks]
     end
 
     def build_months
@@ -110,7 +116,7 @@ module DOTIW
       if weeks < 0
         # Convert the last month to a week and add to total
         months -= 1
-        last_month = largest.advance(:months => -1)
+        last_month = largest.advance(months: -1)
         days_in_month = Time.days_in_month(last_month.month, last_month.year)
         weeks += days_in_month / 7
         days += days_in_month % 7
@@ -118,6 +124,12 @@ module DOTIW
           days -= 7
           weeks += 1
         end
+
+        if weeks == -1
+          months -= 1
+          weeks = 4
+          days -= 4
+        end
       end
 
       if months < 0
@@ -131,9 +143,9 @@ module DOTIW
       output[:weeks]   = weeks
       output[:days]    = days
 
-      total_days, self.distance = distance.abs.divmod(1.day.to_i)
+      total_days, @distance = distance.abs.divmod(ONE_DAY.to_i)
 
-      [total_days, self.distance]
+      [total_days, @distance]
     end
-  end # TimeHash
-end # DOTIW
+  end
+end