dotiw 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 268158a7bbfdd70af4db14b42aa6f0bf24869a4eda6cefd0eb528598e1f0dfbd
-  data.tar.gz: 9ee5ba47781f5aa16796641251a02e68997dae148f1b3f4b36f7f7a98a3d7ba6
+  metadata.gz: 6c3178c4c07b2647581895e344418e9ce40e3da5d9e3cc1fda714f9817b852e8
+  data.tar.gz: cef2e7944c792c501181789e3ed9f0155e12be6954e40664f495bcb298f40709
 SHA512:
-  metadata.gz: 4c376145f1d7e62acb4ed59e2ff6ed0a2fd427507a72c69785fd4d01b6efa6a5269f3d1979ce7b3087608d537bc3857c6298b93beafdbca10c701d870578cb0f
-  data.tar.gz: ab46caf7a03f8ccd459948d3102a363eb0a3978b1e9a76c1344682a89f9b3bd5691090024860a58668ccb89e4566c13b996ae56cc9f64fd8e673b8bdce1da9d3
+  metadata.gz: 2db64efc0d3189bca7be013a3faff83820392bcfc69bf111497ea3543d67eba53f3792f62e6c43b1d39b73a6d6fb32811b6ae4f511f04c19d069283cdd18f355
+  data.tar.gz: a9bae3a175fada3623c8275abec2052e377716db914dadd0b2908a33fbff67fa95191062cb37cb20d15a90478b61ddc9647140d04dc37f0be73fd44b833e7957

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 5.1.0 (2020/08/05)
+
+* [#111](https://github.com/radar/distance_of_time_in_words/pull/111): Fix: `NoMethodError` when calling `ActionController::Base.helpers.distance_of_time_in_words` - [@denisahearn](https://github.com/denisahearn).
+* [#106](https://github.com/radar/distance_of_time_in_words/pull/106): Add Vietnamese language support - [@runlevel5 ](https://github.com/runlevel5).
+
 ## 5.0.0 (2020/05/07)
 
 * [#105](https://github.com/radar/distance_of_time_in_words/pull/105): Support for Ruby w/o Rails - [@dblock](https://github.com/dblock).

data/dotiw.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.version = DOTIW::VERSION
   s.licenses = ['MIT']
 
-  s.authors = ["Ryan Bigg", "Lauran Jansen"]
+  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
@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.email = ['radarlistener@gmail.com', 'github@lauranjansen.com']
   s.homepage = 'https://github.com/radar/distance_of_time_in_words'
 
-  s.add_dependency 'i18n'
   s.add_dependency 'activesupport'
+  s.add_dependency 'i18n'
 
   s.add_development_dependency 'appraisal'
   s.add_development_dependency 'bundler'

data/lib/dotiw.rb

@@ -23,11 +23,18 @@ module DOTIW
     I18n.reload!
   end
 
-  protected
+  def languages
+    @languages ||= (locale_files.map { |path| path.split(%r{[/.]})[-2].to_sym })
+  end
 
-  # Returns all locale files shipped with library
   def locale_files
-    Dir[File.join(File.dirname(__FILE__), 'dotiw', 'locale', '**/*')]
+    files 'dotiw/locale', '*.yml'
+  end
+
+  protected
+
+  def files(directory, ext)
+    Dir[File.join File.dirname(__FILE__), directory, ext]
   end
 end # DOTIW
 

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

@@ -10,7 +10,7 @@ module ActionView
 
       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
+        DOTIW::Methods.distance_of_time_in_words(from_time, to_time, include_seconds_or_options, options)
       end
 
       def distance_of_time_in_percent(from_time, current_time, to_time, options = {})

data/lib/dotiw/locale/vi.yml

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

data/lib/dotiw/methods.rb

@@ -2,6 +2,8 @@
 
 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)

data/lib/dotiw/version.rb

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

data/spec/lib/dotiw_spec.rb

@@ -7,6 +7,8 @@ describe 'A better distance_of_time_in_words' do
     include ActionView::Helpers::DateHelper
     include ActionView::Helpers::TextHelper
     include ActionView::Helpers::NumberHelper
+
+    require 'action_controller'
   else
     include DOTIW::Methods
   end
@@ -19,7 +21,7 @@ describe 'A better distance_of_time_in_words' do
     allow(Time.zone).to receive(:now).and_return(START_TIME)
   end
 
-  describe 'distance of time' do
+  describe '#distance_of_time' do
     [
       [0.5.minutes, '30 seconds'],
       [4.5.minutes, '4 minutes and 30 seconds'],
@@ -48,7 +50,7 @@ describe 'A better distance_of_time_in_words' do
     end
   end
 
-  describe 'hash version' do
+  describe '#distance_of_time_in_words_hash' do
     describe 'giving correct numbers of' do
       %i[years months weeks days minutes seconds].each do |name|
         describe name do
@@ -80,15 +82,50 @@ describe 'A better distance_of_time_in_words' do
     end
   end
 
-  describe 'real version' do
-    it 'debe hablar español' do
-      expect(distance_of_time_in_words(START_TIME, START_TIME + 1.days, locale: :es)).to eq('un día')
-      expect(distance_of_time_in_words(START_TIME, START_TIME + 5.days, locale: :es)).to eq('5 días')
+  describe '#time_ago_in_words' do
+    it 'aliases to distance_of_time_in_words' do
+      expect(time_ago_in_words(Time.now - 3.days - 14.minutes)).to eq('3 days and 14 minutes')
     end
+  end
+
+  describe '#distance_of_time_in_words' do
+    context 'locale' do
+      it 'includes known languages' do
+        expect(DOTIW.languages).to include :en
+        expect(DOTIW.languages).to include :ru
+      end
 
-    it "deve parlare l'italiano" do
-      expect(distance_of_time_in_words(START_TIME, START_TIME + 1.days, true, locale: :it)).to eq('un giorno')
-      expect(distance_of_time_in_words(START_TIME, START_TIME + 5.days, true, locale: :it)).to eq('5 giorni')
+      it 'includes all the languages in specs' do
+        languages = Dir[File.join(File.dirname(__FILE__), 'i18n', '*.yml')].map { |f| File.basename(f, '.yml') }
+        expect(DOTIW.languages.map(&:to_s).sort).to eq languages.sort
+      end
+
+      DOTIW.languages.each do |lang|
+        context lang do
+          YAML.safe_load(
+            File.read(
+              File.join(
+                File.dirname(__FILE__), 'i18n', "#{lang}.yml"
+              )
+            )
+          ).each_pair do |category, fixtures|
+            context category do
+              fixtures.each_pair do |k, v|
+                it v do
+                  expect(
+                    distance_of_time_in_words(
+                      START_TIME,
+                      START_TIME + eval(k),
+                      true,
+                      locale: lang
+                    )
+                  ).to eq(v)
+                end
+              end
+            end
+          end
+        end
+      end
     end
 
     [
@@ -145,7 +182,7 @@ describe 'A better distance_of_time_in_words' do
       end
     end
 
-    describe 'accumulate on' do
+    describe 'accumulate_on:' do
       [
         [START_TIME,
          START_TIME + 10.minute,
@@ -298,6 +335,21 @@ describe 'A better distance_of_time_in_words' do
             expect(distance_of_time_in_words(start, finish, true, options)).to eq(output)
           end
         end
+
+        context 'via ActionController::Base.helpers' do
+          it '#distance_of_time_in_words' do
+            end_time = START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds
+            expected = '1 year, 2 months, 3 weeks, 4 days, 5 hours, 6 minutes, and 7 seconds'
+            actual = ActionController::Base.helpers.distance_of_time_in_words(START_TIME, end_time, true, { vague: false })
+            expect(actual).to eq(expected)
+          end
+
+          it '#time_ago_in_words' do
+            expected = '3 days and 14 minutes'
+            actual = ActionController::Base.helpers.time_ago_in_words(Time.now - 3.days - 14.minutes)
+            expect(actual).to eq(expected)
+          end
+        end
       end
     end
 
@@ -307,9 +359,13 @@ describe 'A better distance_of_time_in_words' do
       end
 
       it 'removes seconds in all other cases' do
-        expect(distance_of_time_in_words(START_TIME,
-                                         START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
-                                         false)).to eq('1 year, 2 months, 3 weeks, 4 days, 5 hours, and 6 minutes')
+        expect(
+          distance_of_time_in_words(
+            START_TIME,
+            START_TIME + 1.year + 2.months + 3.weeks + 4.days + 5.hours + 6.minutes + 7.seconds,
+            false
+          )
+        ).to eq('1 year, 2 months, 3 weeks, 4 days, 5 hours, and 6 minutes')
       end
     end # include_seconds
   end

data/spec/lib/i18n/ar.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: ثانية واحدة

data/spec/lib/i18n/da.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 sekund

data/spec/lib/i18n/de.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 Sekunde

data/spec/lib/i18n/en.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 second

data/spec/lib/i18n/es.yml

@@ -0,0 +1,3 @@
+days:
+  1.day: un día
+  5.days: 5 días

data/spec/lib/i18n/fr.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 seconde

data/spec/lib/i18n/id.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 detik

data/spec/lib/i18n/it.yml

@@ -0,0 +1,3 @@
+days:
+  1.day: un giorno
+  5.days: 5 giorni

data/spec/lib/i18n/ja.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1秒

data/spec/lib/i18n/ko.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 일 초

data/spec/lib/i18n/nb.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 sekund

data/spec/lib/i18n/nl.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 seconde

data/spec/lib/i18n/pl.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 sekunda

data/spec/lib/i18n/pt-BR.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 segundo

data/spec/lib/i18n/ru.yml

@@ -0,0 +1,5 @@
+seconds:
+  0.5.seconds: меньше, чем 1 секунда
+  1.second: 1 секунда
+minutes:
+  1.minute: 1 минута

data/spec/lib/i18n/vi.yml

@@ -0,0 +1,22 @@
+seconds:
+  0.5.second: ít hơn 1 giây
+  1.second: 1 giây
+  3.seconds: 3 giây
+minutes:
+  1.minute: 1 phút
+  10.minutes: 10 phút
+hours:
+  1.hour: 1 giờ
+  2.hours: 2 giờ
+days:
+  1.day: 1 ngày
+  2.days: 2 ngày
+weeks:
+  1.week: 1 tuần
+  2.weeks: 2 tuần
+months:
+  1.month: 1 tháng
+  2.months: 2 tháng
+years:
+  1.year: 1 năm
+  2.years: 2 năm

data/spec/lib/i18n/zh-CN.yml

@@ -0,0 +1,2 @@
+seconds:
+  1.second: 1 秒

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dotiw
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Ryan Bigg
@@ -9,10 +9,10 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-06 00:00:00.000000000 Z
+date: 2020-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -170,11 +170,29 @@ files:
 - lib/dotiw/locale/pl.yml
 - lib/dotiw/locale/pt-BR.yml
 - lib/dotiw/locale/ru.yml
+- lib/dotiw/locale/vi.yml
 - lib/dotiw/locale/zh-CN.yml
 - lib/dotiw/methods.rb
 - lib/dotiw/time_hash.rb
 - lib/dotiw/version.rb
 - spec/lib/dotiw_spec.rb
+- spec/lib/i18n/ar.yml
+- spec/lib/i18n/da.yml
+- spec/lib/i18n/de.yml
+- spec/lib/i18n/en.yml
+- spec/lib/i18n/es.yml
+- spec/lib/i18n/fr.yml
+- spec/lib/i18n/id.yml
+- spec/lib/i18n/it.yml
+- spec/lib/i18n/ja.yml
+- spec/lib/i18n/ko.yml
+- spec/lib/i18n/nb.yml
+- spec/lib/i18n/nl.yml
+- spec/lib/i18n/pl.yml
+- spec/lib/i18n/pt-BR.yml
+- spec/lib/i18n/ru.yml
+- spec/lib/i18n/vi.yml
+- spec/lib/i18n/zh-CN.yml
 - spec/spec_helper.rb
 homepage: https://github.com/radar/distance_of_time_in_words
 licenses:
@@ -195,10 +213,27 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Better distance_of_time_in_words for Rails
 test_files:
 - spec/lib/dotiw_spec.rb
+- spec/lib/i18n/ar.yml
+- spec/lib/i18n/da.yml
+- spec/lib/i18n/de.yml
+- spec/lib/i18n/en.yml
+- spec/lib/i18n/es.yml
+- spec/lib/i18n/fr.yml
+- spec/lib/i18n/id.yml
+- spec/lib/i18n/it.yml
+- spec/lib/i18n/ja.yml
+- spec/lib/i18n/ko.yml
+- spec/lib/i18n/nb.yml
+- spec/lib/i18n/nl.yml
+- spec/lib/i18n/pl.yml
+- spec/lib/i18n/pt-BR.yml
+- spec/lib/i18n/ru.yml
+- spec/lib/i18n/vi.yml
+- spec/lib/i18n/zh-CN.yml
 - spec/spec_helper.rb