dotiw 4.0.1 → 5.0.0

data/gemfiles/rails_4.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "rails", "~> 4.0"
+gem 'rails', '~> 4.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5.0.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "rails", "~> 5.0.0"
+gem 'rails', '~> 5.0.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5.1.gemfile

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "rails", "~> 5.1"
+gem 'rails', '~> 5.1.0'
 
-gemspec path: "../"
+gemspec path: '../'

data/gemfiles/rails_5.2.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 5.2.0'
+
+gemspec path: '../'

data/gemfiles/rails_6.0.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 6.0.0'
+
+gemspec path: '../'

data/lib/dotiw.rb

@@ -1,30 +1,41 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'i18n'
 
-# Rails hacks
-if defined?(ActionView::Helpers)
-  require 'dotiw/action_view_ext/helpers/date_helper'
-end
+require 'active_support'
+require 'active_support/core_ext'
 
 module DOTIW
+  extend ActiveSupport::Autoload
+
+  eager_autoload do
+    autoload :VERSION, 'dotiw/version'
+    autoload :TimeHash, 'dotiw/time_hash'
+    autoload :Methods, 'dotiw/methods'
+  end
+
   extend self
-  
-  autoload :VERSION, 'dotiw/version'
-  autoload :TimeHash, 'dotiw/time_hash'
 
   DEFAULT_I18N_SCOPE = :'datetime.dotiw'
 
-  def init_i18n
+  def init_i18n!
     I18n.load_path.unshift(*locale_files)
     I18n.reload!
   end
 
-protected
+  protected
+
   # Returns all locale files shipped with library
   def locale_files
     Dir[File.join(File.dirname(__FILE__), 'dotiw', 'locale', '**/*')]
   end
 end # DOTIW
 
-DOTIW.init_i18n
+DOTIW.init_i18n!
+
+begin
+  require 'action_view'
+  require_relative 'dotiw/action_view/helpers/date_helper'
+rescue LoadError
+  # TODO: don't rely on exception
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module ActionView
+  module Helpers
+    module DateHelper
+      alias_method :_distance_of_time_in_words, :distance_of_time_in_words
+      alias_method :_time_ago_in_words, :time_ago_in_words
+
+      include DOTIW::Methods
+
+      def distance_of_time_in_words(from_time, to_time = 0, include_seconds_or_options = {}, options = {})
+        return _distance_of_time_in_words(from_time, to_time, options) if options.delete(:vague)
+        super
+      end
+
+      def distance_of_time_in_percent(from_time, current_time, to_time, options = {})
+        options[:precision] ||= 0
+        distance = to_time - from_time
+        result = ((current_time - from_time) / distance) * 100
+        number_with_precision(result, options).to_s + '%'
+      end
+    end # DateHelper
+  end # Helpers
+end # ActionView

data/lib/dotiw/locale/ar.yml

@@ -2,45 +2,52 @@ ar:
   datetime:
     dotiw:
       seconds:
-        one: ثانية
+        zero: ثانية
+        one: ثانية واحدة
         two: ثانيتين
-        few: "%{count} ثواني"
-        many: "%{count} ثواني"
-        other: "%{count} ثواني"
+        few: "%{count} توانٍ"
+        many: "%{count} ثانية"
+        other: "%{count} ثانية"
       minutes:
-        one: دقيقة
+        zero: دقيقة
+        one: دقيقة واحدة
         two: دقيقتين
         few: "%{count} دقائق"
-        many: "%{count} دقائق"
-        other: "%{count} دقائق"
+        many: "%{count} دقيقة"
+        other: "%{count} دقيقة"
       hours:
-        one: ساعة
+        zero: ساعة
+        one: ساعة واحدة
         two: ساعتين
         few: "%{count} ساعات"
-        many: "%{count} ساعات"
-        other: "%{count} ساعات"
+        many: "%{count} ساعة"
+        other: "%{count} ساعة"
       days:
-        one: يوم
-        two: يومان
-        few: "%{count} أيام"
-        many: "%{count} أيام"
-        other: "%{count} أيام"
+        zero: يوم
+        one: يوم واحد
+        two: يومين
+        few: "%{count} أيام"        
+        many: "%{count} يومًا"
+        other: "%{count} يوم"
       weeks:
-        one: أسبوع
-        two: إسبوعين
+        zero: أسبوع
+        one: أسبوع واحدة
+        two: أسبوعين
         few: "%{count} أسابيع"
         many: "%{count} أسابيع"
-        other: "%{count} أسابيع"
+        other: "%{count} أسيوع"
       months:
-        one: شهر
+        zero: شهر
+        one: شهر واحد 
         two: شهرين
         few: "%{count} أشهر"
-        many: "%{count} أشهر"
-        other: "%{count} أشهر"
+        many: "%{count} شهراً"
+        other: "%{count} شهر"
       years:
-        one: سنة
-        two: سنتان
-        few: "%{count} سنوات"
-        many: "%{count} سنوات"
-        other: "%{count} سنوات"
-      less_than_x: أقل من %{distance}
+        zero: عام
+        one: عام واحد 
+        two: عامين
+        few: "%{count} أعوام"
+        many: "%{count} عاماً"
+        other: "%{count} عام"
+      less_than_x: "%{distance} أقل من"

data/lib/dotiw/locale/pl.yml

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

data/lib/dotiw/methods.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module DOTIW
+  module Methods
+    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[:include_seconds] ||= true
+      _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 = {})
+      if include_seconds_or_options.is_a?(Hash)
+        options = include_seconds_or_options
+      else
+        options[:include_seconds] ||= !!include_seconds_or_options
+      end
+      return distance_of_time(from_time, options) if to_time == 0
+
+      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 _display_time_in_words(hash, 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 :'datetime.dotiw.words_connector',
+                                                   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]
+      options[:last_word_connector] ||= I18n.translate :'datetime.dotiw.last_word_connector',
+                                                       default: :'support.array.last_word_connector',
+                                                       locale: options[:locale]
+
+      output.to_sentence(options)
+    end
+  end
+end # DOTIW

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
+      @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,16 +30,16 @@ module DOTIW
       output
     end
 
-  private
-    attr_accessor :options, :output
+    private
+
+    attr_reader :options, :output
 
     def build_time_hash
       if accumulate_on = options.delete(: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
@@ -63,23 +63,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(1.minute.to_i)
     end
 
     def build_hours
-      output[:hours], self.distance = distance.divmod(1.hour.to_i)
+      output[:hours], @distance = distance.divmod(1.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(1.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(1.week.to_i) unless output[:weeks]
     end
 
     def build_months
@@ -110,7 +110,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 +118,12 @@ module DOTIW
           days -= 7
           weeks += 1
         end
+
+        if weeks == -1
+          months -= 1
+          weeks = 4
+          days -= 4
+        end
       end
 
       if months < 0
@@ -131,9 +137,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(1.day.to_i)
 
-      [total_days, self.distance]
+      [total_days, @distance]
     end
   end # TimeHash
 end # DOTIW