rails-timeago 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5d941da1caf43169e63ec9f60eb39d62944c400
-  data.tar.gz: 8999cb11c165d2476f3f9be8876c146c4030810b
+  metadata.gz: 8ddf7879b5c06eddc5a7dffb3ccb98e54b1fc0c4
+  data.tar.gz: dd2a443a4422c94ce1118270068d4f0405fc7573
 SHA512:
-  metadata.gz: 03bb5efa3e4004a110617651ebbfa328f138fc1f4a2bdf0367643522b84c231e83f3b6f4fe4b12d350c5231b49c26efbb729c4790c2ee2471d5993add0c081b1
-  data.tar.gz: 1584e598999e31124e6015943e619d90fcd16462b8ff6e72be3821a922842265d86c270f420d7bf348a37e545d7e338aa469aef05f60c4657b1b5d32b2198e77
+  metadata.gz: 7951655d4c6cf65ab5280b34ffc0f38e9760ce161458b045f1c28ed4c623db995e770a79d461b43ee72e8efcc23b65103a44f79cfe0d15753434c96031b3661e
+  data.tar.gz: 89e7bd80087ca1def02a99d8fd77c24272de8598742f57a8661d42f4716553a8e7aa89121db81027f49197bb4a43f3da4bfa34987ae9193744f36c437025790e

data/.gitignore

@@ -19,3 +19,4 @@ test/version_tmp
 tmp
 .rvmrc
 .ruby-version
+tags

data/lib/rails-timeago/helper.rb

@@ -1,3 +1,5 @@
+require 'active_support/time'
+
 module Rails
   module Timeago
     module Helper
@@ -45,7 +47,15 @@ module Rails
         end
         time_options[:limit] = time_options[:limit].call if time_options[:limit].is_a?(Proc)
 
-        if time_options[:force] or time_options[:limit].nil? or time_options[:limit] < time
+        time_range = unless time_options[:limit].nil?
+                       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)
         end
         time_tag time, timeago_tag_content(time, time_options), html_options

data/lib/rails-timeago/version.rb

@@ -2,7 +2,7 @@ module Rails
   module Timeago
     module VERSION
       MAJOR = 2
-      MINOR = 9
+      MINOR = 10
       PATCH = 0
       STAGE = nil
 

data/spec/spec_helper.rb

@@ -6,3 +6,6 @@ require File.dirname(__FILE__) + '/support/stub.rb'
 RSpec.configure do |config|
   config.mock_with :rspec
 end
+
+# Use UTC timezone for the duration of the tests
+Time.zone = 'UTC'

data/spec/timeago/helper_spec.rb

@@ -75,6 +75,21 @@ describe Rails::Timeago::Helper do
         should_not =~ /<time.*data-time-ago=".*".*>.*<\/time>/
     end
 
+    it 'should have data-time-ago attribute for times before given limit if limit is in the future' do
+      @stub.timeago_tag(5.days.from_now, :limit => 6.days.from_now).
+        should =~ /<time.*data-time-ago=".*".*>.*<\/time>/
+    end
+
+    it 'should have not data-time-ago attribute for times in the past if limit is in the future' do
+      @stub.timeago_tag(1.days.ago, :limit => 5.days.from_now).
+        should_not =~ /<time.*data-time-ago=".*".*>.*<\/time>/
+    end
+
+    it 'should have not data-time-ago attribute for times after given limit if limit is in the future' do
+      @stub.timeago_tag(6.days.from_now, :limit => 5.days.from_now).
+        should_not =~ /<time.*data-time-ago=".*".*>.*<\/time>/
+    end
+
     it 'should have data-time-ago attribute for times before limit if forced' do
       @stub.timeago_tag(6.days.ago, :force => true).
         should =~ /<time.*data-time-ago=".*".*>.*<\/time>/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-timeago
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport