rails-timeago 2.14.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d3b70af4baab360c1b875e4befe0cbfbc37150f1
-  data.tar.gz: e019a05591543be2575f99b63513a32c6c753ddc
+SHA256:
+  metadata.gz: 5653983cf12f0fdc7e6a9652e32a0b416c7df3467e10c94e7cffb4a89d7bd46b
+  data.tar.gz: 48da15e4a1f7b9d6a9ddbc05574927d560f92eea17b9e578139f9ed17c142f59
 SHA512:
-  metadata.gz: b186f571498592c5fbaad53e5a0da60cdabbd14b32859dd850136847eb60db66fc6a9d274d97f2c8e5588a4a6722eea9d280884eec4fd525bfe7b5e85192df54
-  data.tar.gz: 190adb567aae0f61fe61353f747662478be56ff59335a2bb22bfaaacefdbd0ca7623603645ea869387211889b80c8fe34f92d7c1cec49bc799aa09f47effc57b
+  metadata.gz: 9240a67ff85cf0d11264efcfed29846f988a164a45fca5a576e52d94eba0a6d67fe1ce6c63b0bd1d9ea42d856818573036ccfb6fdca0e0bb5c8ed63aaf35e1d5
+  data.tar.gz: 7103a15660b81043bdd7a1e1b0aeda93c94ae5c43098b3376794dd86dea26ec96aaf9201091b15d662baa394eee792e4a0ad29f37c7134acdf9f882809d8dfb7

data/.rubocop.yml

@@ -0,0 +1,53 @@
+AllCops:
+  Include:
+    - '**/*.rb'
+  TargetRubyVersion: 2.1
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Metrics/LineLength:
+  Exclude:
+    - 'spec/**/*_spec.rb'
+
+Style/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Style/BracesAroundHashParameters:
+  EnforcedStyle: context_dependent
+
+Style/SpaceInsideHashLiteralBraces:
+  EnforcedStyle: no_space
+
+Style/RaiseArgs:
+  EnforcedStyle: compact
+
+Style/Documentation:
+  Enabled: false
+
+Style/SpaceInsideBlockBraces:
+  EnforcedStyle: space
+  EnforcedStyleForEmptyBraces: no_space
+  SpaceBeforeBlockParameters: false
+
+Style/SignalException:
+  EnforcedStyle: only_raise
+
+Style/CaseIndentation:
+  EnforcedStyle: end
+  SupportedStyles:
+    - case
+    - end
+  IndentOneStep: true
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Style/TrivialAccessors:
+  AllowPredicates: true
+
+Style/FileName:
+  Exclude:
+    - Rakefile
+    - Gemfile

data/.travis.yml

@@ -1,11 +1,9 @@
+---
+dist: xenial
 language: ruby
 rvm:
-  - '2.3.0'
-  - '2.2'
-  - '2.1'
-  - '2.0'
-  - '1.9.3'
-  - 'rbx-2'
-  - 'jruby'
-before_install:
-  - gem install bundler
+  - 2.7.1
+  - 2.6.6
+  - 2.5.8
+  - 2.4.10
+  - 2.3.8

data/CHANGELOG.md

@@ -1,5 +1,31 @@
 # Changelog
 
+## 2.19.0
+
+* Update jquery-timeago and locales from upstream
+* Reinitialize on ajaxSuccess event too (#34)
+
+## 2.18.0
+
+* Update jquery-timeago and locales from upstream
+
+## 2.17.1
+
+* Maintenance release without code changes
+
+## 2.17.0
+
+* Update jquery-timeago and locales from upstream
+
+## 2.16.0
+
+* Update jquery-timeago and locales from upstream
+
+## 2.15.0
+
+* Update jquery-timeago and locales from upstream
+* Remove an use of deprecated "ready" event (compatible with jQuery 3.0) (#40)
+
 ## 2.14.0
 
 * Update jquery-timeago and locales from upstream

data/Gemfile

@@ -1,10 +1,17 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails-timeago.gemspec
 gemspec
 
 group :development do
-  gem "rake"
+  gem 'rake'
+  gem 'rake-release'
 end
 
-gem 'rubysl', platform: :rbx
+group :test do
+  gem 'capybara', '~> 3.14'
+  gem 'poltergeist', '~> 1.10'
+  gem 'rspec', '~> 3.5'
+end

data/README.md

@@ -1,9 +1,7 @@
 # rails-timeago
 
-[![Gem Version](https://badge.fury.io/rb/rails-timeago.svg)](http://badge.fury.io/rb/rails-timeago)
-[![Build Status](https://travis-ci.org/jgraichen/rails-timeago.svg?branch=master)](https://travis-ci.org/jgraichen/rails-timeago)
-[![Code Climate](https://codeclimate.com/github/jgraichen/rails-timeago.svg)](https://codeclimate.com/github/jgraichen/rails-timeago)
-[![Dependency Status](https://gemnasium.com/jgraichen/rails-timeago.svg)](https://gemnasium.com/jgraichen/rails-timeago)
+[![Gem Version](https://img.shields.io/gem/v/rails-timeago?logo=ruby)](https://rubygems.org/gems/rails-timeago)
+[![Build Status](https://img.shields.io/travis/jgraichen/rails-timeago/master?logo=travis)](https://travis-ci.org/jgraichen/rails-timeago)
 
 **rails-timeago** provides a timeago_tag helper to create time tags usable for
 [jQuery Timeago](https://github.com/rmm5t/jquery-timeago) plugin.
@@ -34,21 +32,23 @@ Use the following to also include all available locale files:
 
     //= require rails-timeago-all
 
+If using a recent Rails with `rails-ujs`, jQuery might not be present anymore. You need to add `jquery-rails` to your `Gemfile` and load it, e.g.:
+
+    //= require jquery
+    //= require rails-timeago
+    //= require rails-timeago-all
+
 ## Usage
 
 Use the timeago_tag helper like any other regular tag helper:
 
 ```erb
-<%= timeago_tag Time.zone.now, :nojs => true, :limit => 10.days.ago %>
+<%= timeago_tag Time.zone.now limit: 10.days.ago %>
 ```
 
 
 ### Available options:
 
-**nojs**
-Add time ago in words as time tag content instead of absolute time.
-(default: `false`)
-
 **date_only**
 Only print date as tag content instead of full time.
 (default: `true`)
@@ -71,13 +71,13 @@ String that will be returned if time is `nil`.
 
 **title**
 A string or block that will be used to create a title attribute for timeago tags. It set to nil or false no title attribute will be set.
-(default: `proc { |time, options| I18n.l time, :format => options[:format] }`)
+(default: `proc { |time, options| I18n.l time, format: options[:format] }`)
 
 All other options will be given as options to the time tag helper.
 The above options can be assigned globally as defaults using
 
 ```ruby
-Rails::Timeago.default_options :limit => proc { 20.days.ago }, :nojs => true
+Rails::Timeago.default_options limit: proc { 20.days.ago }
 ```
 
 A global limit should always be given as a block that will be evaluated each time the rails `timeago_tag` helper is called. That avoids the limit becoming smaller the longer the application runs.
@@ -87,7 +87,7 @@ A global limit should always be given as a block that will be evaluated each tim
 **rails-timeago 2** ships with a modified version of jQuery timeago that allows to include all locale files at once and set the locale via an option or per element via the `lang` attribute:
 
 ```erb
-<%= timeago_tag Time.zone.now, :lang => :de %>
+<%= timeago_tag Time.zone.now, lang: :de %>
 ```
 
 The following snippet will print a script tag that set the jQuery timeago locale according to your `I18n.locale`:
@@ -113,8 +113,6 @@ Do not forget to require the needed locale files by either require `rails-timeag
 
 **rails-timeago** includes locale files for the following locales taken from [jQuery Timeago](https://github.com/rmm5t/jquery-timeago).
 
-> de cy pl mk zh-CN bs en-short it fi es uk lt zh-TW sk hy ca pt el sv ar no fa fr pt-br tr he bg ko uz cz sl hu id hr ru nl fr-short da ja ro th
-
 Your customized jQuery locale files must be changed to work with **rails-timeago 2**. Instead of defining your locale strings as `jQuery.timeago.settings.strings` you need to define them like this:
 
 ```js

data/Rakefile

@@ -1,45 +1,47 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'rake/release'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec
 
 desc 'Update jquery-timeago from upstream'
 task :update do
-  puts "Clone repository.."
+  puts 'Clone repository..'
   puts `mkdir ./tmp`
   puts `git clone https://github.com/rmm5t/jquery-timeago.git ./tmp`
 
-  puts "Patch jquery timeago..."
+  puts 'Patch jquery timeago...'
   puts `cd ./tmp && patch -p1 < ../scripts/jquery.timeago.js.patch`
 
   print 'Patch locale files ... '
   `rm ./tmp/locales/jquery.timeago.en.js`
 
-  is_mac = RUBY_PLATFORM.downcase.include?("darwin")
+  is_mac = RUBY_PLATFORM.downcase.include?('darwin')
 
-  Dir["./tmp/locales/*.js"].each do |file|
+  Dir['./tmp/locales/*.js'].each do |file|
     if file =~ /jquery\.timeago\.(.+)\.js$/
-      `sed -i#{(is_mac)? " ''": nil} "s/timeago.settings.strings/timeago.settings.strings[\\"#{$1}\\"]/" #{file}`
-      print "#{$1} "
+      `sed -i#{is_mac ? " ''" : nil} "s/timeago.settings.strings/timeago.settings.strings[\\"#{Regexp.last_match(1)}\\"]/" #{file}`
+      print "#{Regexp.last_match(1)} "
     end
   end
   puts
 
-  puts "Copying asset files..."
+  puts 'Copying asset files...'
   puts `cp ./tmp/jquery.timeago.js ./vendor/assets/javascripts/`
   puts `rm ./vendor/assets/javascripts/locales/*`
   puts `cp ./tmp/locales/*.js ./vendor/assets/javascripts/locales`
 
-  puts "Generate rails-timeago-all.js..."
+  puts 'Generate rails-timeago-all.js...'
   `echo "// Rails timeago bootstrap with all locales" > ./lib/assets/javascripts/rails-timeago-all.js`
   `echo "//= require rails-timeago" >> ./lib/assets/javascripts/rails-timeago-all.js`
-  Dir["./vendor/assets/javascripts/locales/*.js"].sort.each do |file|
+  Dir['./vendor/assets/javascripts/locales/*.js'].sort.each do |file|
     `echo "//= require locales/#{File.basename(file)}" >> ./lib/assets/javascripts/rails-timeago-all.js`
   end
 
-  puts "Clean up..."
+  puts 'Clean up...'
   puts `rm -rf ./tmp`
 end

data/lib/assets/javascripts/rails-timeago-all.js

@@ -1,7 +1,11 @@
 // Rails timeago bootstrap with all locales
 //= require rails-timeago
 //= require locales/jquery.timeago.af.js
+//= require locales/jquery.timeago.am.js
 //= require locales/jquery.timeago.ar.js
+//= require locales/jquery.timeago.az-short.js
+//= require locales/jquery.timeago.az.js
+//= require locales/jquery.timeago.be.js
 //= require locales/jquery.timeago.bg.js
 //= require locales/jquery.timeago.bs.js
 //= require locales/jquery.timeago.ca.js
@@ -13,6 +17,7 @@
 //= require locales/jquery.timeago.dv.js
 //= require locales/jquery.timeago.el.js
 //= require locales/jquery.timeago.en-short.js
+//= require locales/jquery.timeago.eo.js
 //= require locales/jquery.timeago.es-short.js
 //= require locales/jquery.timeago.es.js
 //= require locales/jquery.timeago.et.js
@@ -33,6 +38,7 @@
 //= require locales/jquery.timeago.it.js
 //= require locales/jquery.timeago.ja.js
 //= require locales/jquery.timeago.jv.js
+//= require locales/jquery.timeago.ka.js
 //= require locales/jquery.timeago.ko.js
 //= require locales/jquery.timeago.ky.js
 //= require locales/jquery.timeago.lt.js
@@ -52,12 +58,14 @@
 //= require locales/jquery.timeago.si.js
 //= require locales/jquery.timeago.sk.js
 //= require locales/jquery.timeago.sl.js
+//= require locales/jquery.timeago.sq.js
 //= require locales/jquery.timeago.sr.js
 //= require locales/jquery.timeago.sv.js
 //= require locales/jquery.timeago.th.js
 //= require locales/jquery.timeago.tr-short.js
 //= require locales/jquery.timeago.tr.js
 //= require locales/jquery.timeago.uk.js
+//= require locales/jquery.timeago.ur.js
 //= require locales/jquery.timeago.uz.js
 //= require locales/jquery.timeago.vi.js
 //= require locales/jquery.timeago.zh-CN.js

data/lib/assets/javascripts/rails-timeago.js

@@ -4,7 +4,9 @@
 //= require jquery.timeago
 
 (function($) {
-	$(document).on('ready turbolinks:load page:load ajax:success', function() {
+	var fn = function() {
 		$('time[data-time-ago]').timeago();
-	});
+	};
+	$(fn);
+	$(document).on('turbolinks:load page:load ajax:success ajaxSuccess', fn);
 })(jQuery);

data/lib/rails-timeago.rb

@@ -1,11 +1,13 @@
-require "rails-timeago/version"
-require "rails-timeago/helper"
+# frozen_string_literal: true
+
+require 'rails-timeago/version'
+require 'rails-timeago/helper'
 
 module Rails
   module Timeago
     if defined?(::Rails::Engine)
       class Engine < ::Rails::Engine # :nodoc:
-        initializer 'rails-timeago', :group => :all do |app|
+        initializer 'rails-timeago', group: :all do |_app|
           ActiveSupport.on_load(:action_controller) do
             include Rails::Timeago::Helper
           end
@@ -17,8 +19,8 @@ module Rails
       end
     end
 
-    # Read or write global rails-timeago default options. If no options are given
-    # the current defaults will be returned.
+    # Read or write global rails-timeago default options. If no options are
+    # given the current defaults will be returned.
     #
     # Available options:
     # [:+nojs+]
@@ -34,8 +36,9 @@ module Rails
     #   (default: :default)
     #
     # [:+limit+]
-    #   Set a limit for time ago tags. All dates before given limit will not be converted.
-    #   Global limit should be given as a block to reevaluate limit each time timeago_tag is called.
+    #   Set a limit for time ago tags. All dates before given limit will not
+    #   be converted. Global limit should be given as a block to reevaluate
+    #   limit each time timeago_tag is called.
     #   (default: proc { 4.days.ago })
     #
     # [:+force+]
@@ -47,9 +50,10 @@ module Rails
     #   (default: '-')
     #
     def self.default_options(opts = nil)
-      @defaults ||= self.option_hash
+      @defaults ||= option_hash
       if opts
-        @defaults.merge! opts.extract!(*@defaults.keys.select{|k| opts.include?(k)})
+        @defaults.merge! \
+          opts.extract!(*@defaults.keys.select {|k| opts.include?(k) })
       else
         @defaults
       end
@@ -57,18 +61,18 @@ module Rails
 
     # Reset options to default values
     def self.reset_default_options
-      @defaults = self.option_hash
+      @defaults = option_hash
     end
 
     def self.option_hash
       {
-        :nojs      => false,
-        :force     => false,
-        :format    => :default,
-        :limit     => proc { 4.days.ago },
-        :date_only => true,
-        :default   => '-',
-        :title     => proc { |time, options| I18n.l time, :format => options[:format] }
+        nojs: false,
+        force: false,
+        format: :default,
+        limit: proc { 4.days.ago },
+        date_only: true,
+        default: '-',
+        title: proc {|time, options| I18n.l time, format: options[:format] }
       }
     end
   end

data/lib/rails-timeago/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/time'
 
 module Rails
@@ -6,7 +8,9 @@ module Rails
       # Create a time tag usable for jQuery timeago plugin.
       #
       #   timeago_tag Time.zone.now
-      #   => "<time datetime="2012-03-10T12:07:07+01:00" title="Sat, 10 Mar 2012 12:07:07 +0100" data-time-ago="2012-03-10T12:07:07+01:00">2012-03-10</time>"
+      #   => "<time datetime="2012-03-10T12:07:07+01:00"
+      #             title="Sat, 10 Mar 2012 12:07:07 +0100"
+      #             data-time-ago="2012-03-10T12:07:07+01:00">2012-03-10</time>"
       #
       # Available options:
       # [:+nojs+]
@@ -22,7 +26,8 @@ module Rails
       #   (default: :default)
       #
       # [:+limit+]
-      #   Set a limit for time ago tags. All dates before given limit will not be converted.
+      #   Set a limit for time ago tags. All dates before given limit
+      #   will not be converted.
       #   (default: 4.days.ago)
       #
       # [:+force+]
@@ -38,12 +43,12 @@ module Rails
       def timeago_tag(time, html_options = {})
         time_options = Rails::Timeago.default_options
 
-        time_options = time_options.merge html_options.extract!(*time_options.keys.select{|k| html_options.include?(k)})
+        time_options = time_options.merge html_options.extract!(*time_options.keys.select {|k| html_options.include?(k) })
         return time_options[:default] if time.nil?
 
         time_options[:format] = time_options[:format].call(time, time_options) if time_options[:format].is_a?(Proc)
         if time_options[:title]
-          html_options.merge! :title => time_options[:title].is_a?(Proc) ? time_options[:title].call(time, time_options) : time_options[:title]
+          html_options[:title] = time_options[:title].is_a?(Proc) ? time_options[:title].call(time, time_options) : time_options[:title]
         end
         time_options[:limit] = time_options[:limit].call if time_options[:limit].is_a?(Proc)
 
@@ -51,21 +56,19 @@ module Rails
                        now = Time.zone.now
                        limit = time_options[:limit]
                        limit < now ? limit...now : now...limit
-                     else
-                       nil
                      end
 
-        if time_options[:force] or time_range.nil? or time_range.cover?(time)
-          html_options.merge!('data-time-ago' => time.iso8601)
+        if time_options[:force] || time_range.nil? || time_range.cover?(time)
+          html_options['data-time-ago'] = time.iso8601
         end
         time_tag time, timeago_tag_content(time, time_options), html_options
       end
 
       def timeago_tag_content(time, time_options = {}) # :nodoc:
         time = time.to_date            if time_options[:date_only]
-        return time_ago_in_words(time) if time_options[:nojs] and (time_options[:limit].nil? or time_options[:limit] < time)
+        return time_ago_in_words(time) if time_options[:nojs] && (time_options[:limit].nil? || time_options[:limit] < time)
 
-        I18n.l time, :format => time_options[:format]
+        I18n.l time, format: time_options[:format]
       end
 
       # Return a JavaScript tag to set jQuery timeago locale.