dotiw 3.0 → 5.0.0

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
 require 'bundler'
@@ -9,4 +11,4 @@ Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/dotiw.gemspec

@@ -1,30 +1,35 @@
-# dotiw.gemspec
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
-$:.push File.expand_path("../lib", __FILE__)
+$LOAD_PATH.push File.expand_path('lib', __dir__)
 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{2010-12-23}
-  s.description = "Better distance_of_time_in_words for Rails"
-  s.summary = "Better distance_of_time_in_words for Rails"
-  s.email = "radarlistener@gmail.com"
+  s.authors = ["Ryan Bigg", "Lauran Jansen"]
+  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', 'github@lauranjansen.com']
+  s.homepage = 'https://github.com/radar/distance_of_time_in_words'
 
-  s.add_dependency "actionpack", ">= 3"
-  s.add_dependency "i18n"
+  s.add_dependency 'i18n'
+  s.add_dependency 'activesupport'
 
-  s.add_development_dependency "rake"
-  s.add_development_dependency "bundler"
-  s.add_development_dependency "rspec", "~> 3.0"
-  s.add_development_dependency "tzinfo"
+  s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'tzinfo', '~> 1.2.7'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 end
-

data/gemfiles/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_RETRY: "1"

data/gemfiles/rails_4.gemfile

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

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_5.1.gemfile

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# This file was generated by Appraisal
+
+source 'http://rubygems.org'
+
+gem 'rails', '~> 5.1.0'
+
+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

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

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/ko.yml

@@ -0,0 +1,25 @@
+ko:
+  datetime:
+    dotiw:
+      seconds:
+        one: 일 초
+        other: "%{count} 초"
+      minutes:
+        one: 일 분
+        other: "%{count} 분"
+      hours:
+        one: 한 시간
+        other: "%{count} 시간"
+      days:
+        one: 하루
+        other: "%{count} 일"
+      weeks:
+        one: 일주
+        other: "%{count} 주"
+      months:
+        one: 한 달
+        other: "%{count} 달"
+      years:
+        one: 일년
+        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/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/locale/zh-CN.yml

@@ -0,0 +1,25 @@
+zh-CN:
+  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}"