rails-timeago 2.16.0 → 2.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e222f14c7d1cb6e5c1866fa9155239acf3de0cd5
-  data.tar.gz: 1fb324458d3a7f7d080bee1a675432abf74c31f9
+SHA256:
+  metadata.gz: 2a461a19bf99a6641dd323cc311fbe23639a4eded603978e60eeac161bd3c881
+  data.tar.gz: 36cd1871b9bba6edd02c1d2d61d4feba89e0975e5929ea69cb7997f0faa848e6
 SHA512:
-  metadata.gz: 9feab0dd1ff9b30c4e43a9f8b5019375bbec20631f89a5a0e632b9880232328c2ced4b7e42863fc7978248ad02dd84702442a4e48e2d503e59926dd7f0444541
-  data.tar.gz: 65e9377f69879575f6b35a93daf1ba2578e50bbd1b2043f13df52f20186bbde6952bef21e4c7be018f4541d6992860520a249941491ea86905132af7f46017f5
+  metadata.gz: 387c7200e0aaf52c67f96e7f04b73188912e284dc6778802971dd25b84f6da64328c50eb62377036b1c34bf0c566a69a5384cdd954306704ee1f1f351ebabceb
+  data.tar.gz: f29914c87ee1d593a383d16e1c3bb113df347708e1b3263efe3d3d71de2d1211fb4440687cabcb5de562e40c6dfbb7862401b104df4ffb72aaaaa0e6767382b9

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,12 +1,24 @@
-sudo: false
 dist: trusty
 language: ruby
 rvm:
-  - '2.4.1'
-  - '2.3.4'
-  - '2.2.7'
-  - '2.1.10'
-  - 'jruby-9.1.8.0'
+- 2.6.0
+- 2.5.3
+- 2.4.5
+- 2.3.8
 before_install:
-  - gem update --system
-  - gem install bundler
+- gem install bundler
+jobs:
+  include:
+  - stage: Release
+    rvm: 2.6.0
+    env: []
+    script: skip
+    install: skip
+    deploy:
+      provider: rubygems
+      api_key:
+        secure: XYbT9MB6DNzKu95OqrA5qIV2rD1L6RLpfCb9s/3YnhKY8tTP1NcitvmXLHtNLAoHldYrb9AmSfNh5wFgFnfoqFkpz4B94SBrkQtGZ9wzIj4otxMgntGsrGd6qLBfnXGG8rctngeJlo0eVKkE/3fJtiXb5mEx72fvxd2+/fYfubY=
+      gem: rails-timeago
+      on:
+        tags: true
+        repo: jgraichen/rails-timeago

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 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

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rails-timeago.gemspec
@@ -8,11 +10,7 @@ group :development do
 end
 
 group :test do
-  gem 'rspec', '~> 3.5'
   gem 'capybara', '~> 2.8'
   gem 'poltergeist', '~> 1.10'
+  gem 'rspec', '~> 3.5'
 end
-
-gem 'rack', '~> 1.0' # Otherwise requires Ruby > 2.2.
-
-gem 'rubysl', platform: :rbx

data/Rakefile

@@ -1,45 +1,47 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 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,9 +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
@@ -54,12 +56,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/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.

data/lib/rails-timeago/version.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Rails
   module Timeago
     module VERSION
       MAJOR = 2
-      MINOR = 16
-      PATCH = 0
+      MINOR = 17
+      PATCH = 1
       STAGE = nil
       STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 

data/rails-timeago.gemspec

@@ -1,21 +1,23 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require File.expand_path('../lib/rails-timeago/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Jan Graichen"]
-  gem.email         = ["jan.graichen@altimos.de"]
-  gem.description   = %q{jQuery Timeago helper for Rails 3}
-  gem.summary       = %q{A Rails Helper to create time tags usable for jQuery Timeago plugin}
-  gem.homepage      = "https://github.com/jgraichen/rails-timeago"
+  gem.authors       = ['Jan Graichen']
+  gem.email         = ['jan.graichen@altimos.de']
+  gem.description   = 'jQuery Timeago helper for Rails 3'
+  gem.summary       = 'A Rails Helper to create time tags usable for jQuery Timeago plugin'
+  gem.homepage      = 'https://github.com/jgraichen/rails-timeago'
   gem.license       = 'MIT'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n").reject{|file| file =~ /^scripts/}
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map {|f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n").reject {|file| file =~ /^scripts/ }
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "rails-timeago"
-  gem.require_paths = ["lib"]
+  gem.name          = 'rails-timeago'
+  gem.require_paths = ['lib']
   gem.version       = Rails::Timeago::VERSION
 
-  gem.add_dependency "activesupport", ">= 3.1"
-  gem.add_dependency "actionpack", ">= 3.1"
+  gem.add_dependency 'activesupport', '>= 3.1'
+  gem.add_dependency 'actionpack', '>= 3.1'
 end

data/spec/rails-timeago_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 RSpec.describe 'rails-timeago', type: :feature, js: true do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext'
 

data/spec/support/stub.rb

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 class TimeagoStub
   include Rails::Timeago::Helper
 
-  I18n.backend.store_translations :en, :hello => 'World'
+  I18n.backend.store_translations :en, hello: 'World'
 
   def time_tag(time, content, options = {})
-    options = options.map { |k,v| "#{k}=\"#{v}\""}
+    options = options.map {|k, v| "#{k}=\"#{v}\"" }
     "<time datetime=\"#{time.iso8601}\" #{options.join ' '}>#{content}</time>"
   end
 
-  def time_ago_in_words(time)
-    "%time_ago_in_words%"
+  def time_ago_in_words(_time)
+    '%time_ago_in_words%'
   end
 
   def javascript_tag(source)
@@ -21,7 +23,7 @@ class Application
   attr_accessor :render
 
   ASSET_BASE = Pathname.new(File.expand_path('../../..', __FILE__))
-  ASSET_DIRECTORIES = %w(lib/assets vendor/assets spec/support/assets)
+  ASSET_DIRECTORIES = %w[lib/assets vendor/assets spec/support/assets].freeze
 
   def initialize
     @helper = TimeagoStub.new
@@ -39,10 +41,10 @@ class Application
 
   def call_render
     body = if @render
-      @render.call(@helper, @request)
-    else
-      '<noscript></noscript>'
-    end
+             @render.call(@helper, @request)
+           else
+             '<noscript></noscript>'
+           end
 
     <<-HTML
       <html>