dotiw 4.0.1 → 5.0.0

data/spec/spec_helper.rb

@@ -1,17 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 ROOT_PATH = File.join(File.dirname(__FILE__), '..')
-$:.unshift ROOT_PATH unless $:.include? ROOT_PATH
-
-# Files that are usually required by Rails, but in a testing context will not be.
-require 'erb'
-
-require 'active_support/all'
-require 'action_view'
+$LOAD_PATH.unshift ROOT_PATH unless $LOAD_PATH.include? ROOT_PATH
 
 require 'dotiw'
 
 Time.zone = 'UTC'
 
-I18n.load_path << Dir[File.join(File.dirname(__FILE__), 'translations', '*')]
 I18n.locale = :en

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: dotiw
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Ryan Bigg
 - Lauran Jansen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2020-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,7 +40,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,21 +68,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: tzinfo
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,33 +96,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.7
 description: |-
   dotiw is a gem for Rails that overrides the
                 default distance_of_time_in_words and provides
@@ -136,8 +136,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".rspec"
+- Appraisals
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -149,8 +151,10 @@ files:
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
+- gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/dotiw.rb
-- lib/dotiw/action_view_ext/helpers/date_helper.rb
+- lib/dotiw/action_view/helpers/date_helper.rb
 - lib/dotiw/locale/ar.yml
 - lib/dotiw/locale/da.yml
 - lib/dotiw/locale/de.yml
@@ -167,15 +171,16 @@ files:
 - lib/dotiw/locale/pt-BR.yml
 - lib/dotiw/locale/ru.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/spec_helper.rb
-homepage: https://github.com/radar/dotiw
+homepage: https://github.com/radar/distance_of_time_in_words
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,9 +195,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.1.3
+signing_key:
 specification_version: 4
 summary: Better distance_of_time_in_words for Rails
 test_files:

data/.travis.yml

@@ -1,27 +0,0 @@
-rvm:
-  - 2.4.0
-  - 2.3.0
-  - 2.2.4
-  - 2.1.8
-  - 2.0.0
-  - jruby-19mode
-gemfile:
-  - gemfiles/rails_4.gemfile
-  - gemfiles/rails_5.0.gemfile
-  - gemfiles/rails_5.1.gemfile
-before_install:
-  - gem update --system
-  - gem update bundler
-install: "bundle install"
-
-matrix:
-  exclude:
-    # Rails 5 requires Ruby >= 2.2.2
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.0.0
-      gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.1.8
-      gemfile: gemfiles/rails_5.0.gemfile
-    - rvm: 2.1.8
-      gemfile: gemfiles/rails_5.1.gemfile

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

@@ -1,103 +0,0 @@
-module ActionView
-  module Helpers
-    module DateHelper
-      alias_method :old_distance_of_time_in_words, :distance_of_time_in_words
-
-      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
-        return old_distance_of_time_in_words(from_time, to_time, options) if options.delete(:vague)
-        hash = distance_of_time_in_words_hash(from_time, to_time, options)
-        display_time_in_words(hash, options)
-      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
-
-      alias_method :old_time_ago_in_words, :time_ago_in_words
-
-      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] && 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 = fractions & options[:only] if options[:only]
-          fractions = 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)
-        if highest_measures
-          output = output[0...highest_measures]
-        end
-
-        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 # DateHelper
-  end # Helpers
-end # ActionView