dotiw 4.0.1 → 5.3.1

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/benchmarks/time_hash_bench.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'benchmark/ips'
+require 'benchmark/memory'
+require 'active_support/core_ext/numeric'
+require 'active_support/core_ext/integer'
+
+require_relative '../lib/dotiw/time_hash'
+
+from = Time.now
+to = Time.now + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds
+
+%i[ips memory].each do |type|
+  Benchmark.public_send(type) do |x|
+    x.report('master') { DOTIW::TimeHash.new(nil, from, to) }
+
+    x.compare!
+  end
+end

data/dotiw.gemspec

@@ -1,37 +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.licenses = ['MIT']
 
-  s.authors = ["Ryan Bigg", "Lauran Jansen"]
-  s.date = %q{2016-03-08}
+  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/dotiw"
+  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", ">= 4"
-  s.add_dependency "i18n"
+  s.add_dependency 'activesupport'
+  s.add_dependency 'i18n'
 
-  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 "pry"
+  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/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,49 @@
-# 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'
+  DEFAULT_I18N_SCOPE_COMPACT = :'datetime.dotiw_compact'
 
-  def init_i18n
+  def init_i18n!
     I18n.load_path.unshift(*locale_files)
     I18n.reload!
   end
 
-protected
-  # Returns all locale files shipped with library
+  def languages
+    @languages ||= (locale_files.map { |path| path.split(%r{[/.]})[-2].to_sym })
+  end
+
   def locale_files
-    Dir[File.join(File.dirname(__FILE__), 'dotiw', 'locale', '**/*')]
+    files 'dotiw/locale', '*.yml'
   end
-end # DOTIW
 
-DOTIW.init_i18n
+  protected
+
+  def files(directory, ext)
+    Dir[File.join File.dirname(__FILE__), directory, ext]
+  end
+end
+
+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,32 @@
+# frozen_string_literal: true
+
+module ActionView
+  module Helpers
+    module DateHelper
+      alias _distance_of_time_in_words distance_of_time_in_words
+      alias _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[:vague]
+
+        DOTIW::Methods.distance_of_time_in_words(from_time, to_time, include_seconds_or_options, options.except(:vague))
+      end
+
+      def distance_of_time_in_words_to_now(to_time = 0, include_seconds_or_options = {}, options = {})
+        return _distance_of_time_in_words(Time.now, to_time, options) if options[:vague]
+
+        DOTIW::Methods.distance_of_time_in_words(Time.now, to_time, include_seconds_or_options, options.except(:vague))
+      end
+
+      def distance_of_time_in_percent(from_time, current_time, to_time, options = {})
+        options[:precision] ||= 0
+        options = options_with_scope(options)
+        distance = to_time - from_time
+        result = ((current_time - from_time) / distance) * 100
+        number_with_precision(result, options).to_s + '%'
+      end
+    end
+  end
+end

data/lib/dotiw/locale/ar.yml

@@ -2,45 +2,103 @@ 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: يومان
+        zero: يوم
+        one: يوم واحد
+        two: يومين
         few: "%{count} أيام"
-        many: "%{count} أيام"
-        other: "%{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} أقل من"
+  dotiw_compact:
+    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

@@ -21,3 +21,38 @@ da:
         other: "%{count} måneder"
       years: "%{count} år"
       less_than_x: "mindre end %{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: 1u
+        other: "%{count}u"
+      months:
+        one: 1må
+        other: "%{count}må"
+      years:
+        one: 1år
+        other: "%{count}år"
+      less_than_x: "<%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: ~1y
+        any: "~%{count}y"
+      over_x_years:
+        one: ">1y"
+        other: ">%{count}y"
+      almost_x_years:
+        one: ~1y
+        any: "~%{count}y"

data/lib/dotiw/locale/de.yml

@@ -22,4 +22,39 @@ de:
       years:
         one: 1 Jahr
         other: "%{count} Jahre"
-      less_than_x: "weniger als %{distance}"
+      less_than_x: "weniger als %{distance}"
+    dotiw_compact:
+      seconds:
+        one: 1s
+        other: "%{count}s"
+      minutes:
+        one: 1m
+        other: "%{count}m"
+      hours:
+        one: 1std
+        other: "%{count}std"
+      days:
+        one: 1t
+        other: "%{count}t"
+      weeks:
+        one: 1w
+        other: "%{count}w"
+      months:
+        one: 1mo
+        other: "%{count}mo"
+      years:
+        one: 1j
+        other: "%{count}j"
+      less_than_x: "<%{distance}"
+      words_connector: ""
+      two_words_connector: ""
+      last_word_connector: ""
+      about_x_years:
+        one: ~1y
+        any: "~%{count}y"
+      over_x_years:
+        one: ">1y"
+        other: ">%{count}y"
+      almost_x_years:
+        one: ~1y
+        any: "~%{count}y"