rails-timeago 2.0.0.beta1 → 2.1.0

data/README.md

@@ -8,7 +8,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rails-timeago', '~> 2.0.0.beta1'
+gem 'rails-timeago', '~> 2.0'
 ```
 
 And then execute:
@@ -64,6 +64,10 @@ Force time ago tag ignoring limit option.
 String that will be returned if time is nil.
 (default: '-')
 
+**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] })
+
 All other options will be given as options to the time tag helper.
 The above options can be assigned globally as defaults using
 
@@ -104,7 +108,7 @@ Do not forget to require the needed locale files by either require `rails-timeag
 
 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:
 
-	jQuery.timeago.settings.string["en"] = {
+	jQuery.timeago.settings.strings["en"] = {
 		...
 	}
 

data/lib/rails-timeago.rb

@@ -5,7 +5,7 @@ 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
@@ -47,19 +47,29 @@ module Rails
     #   (default: '-')
     #
     def self.default_options(opts = nil)
-      @defaults ||= {
+      @defaults ||= self.option_hash
+      if opts
+        @defaults.merge! opts.extract!(*@defaults.keys.select{|k| opts.include?(k)})
+      else
+        @defaults
+      end
+    end
+
+    # Reset options to default values
+    def self.reset_default_options
+      @defaults = self.option_hash
+    end
+
+    def self.option_hash
+      {
         :nojs      => false,
         :force     => false,
         :format    => :default,
         :limit     => proc { 4.days.ago },
         :date_only => true,
-        :default   => '-'
+        :default   => '-',
+        :title     => proc { |time, options| I18n.l time, :format => options[:format] }
       }
-      if opts
-        @defaults.merge! opts.extract!(*@defaults.keys.select{|k| opts.include?(k)})
-      else
-        @defaults
-      end
     end
   end
 end

data/lib/rails-timeago/helper.rb

@@ -39,7 +39,9 @@ module Rails
         time_options = time_options.merge html_options.extract!(*time_options.keys.select{|k| html_options.include?(k)})
         return time_options[:default] if time.nil?
 
-        html_options.merge! :title => I18n.l(time, :format => time_options[:format])
+        if time_options[:title]
+          html_options.merge! :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)
 
         if time_options[:force] or time_options[:limit].nil? or time_options[:limit] < time

data/lib/rails-timeago/version.rb

@@ -2,9 +2,9 @@ module Rails
   module Timeago
     module VERSION
       MAJOR = 2
-      MINOR = 0
+      MINOR = 1
       PATCH = 0
-      STAGE = 'beta1'
+      STAGE = nil
 
       def self.to_s
         [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join '.'

data/spec/timeago/helper_spec.rb

@@ -3,18 +3,53 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Rails::Timeago::Helper do
   before { @stub = TimeagoStub.new }
+  after  { Rails::Timeago.reset_default_options }
+  let(:time) { Time.now }
 
   context "#timeago_tag" do
     it 'should create a time tag' do
-      @stub.timeago_tag(Time.now).should =~ /<time.*>.*<\/time>/
+      @stub.timeago_tag(time).should =~ /<time.*>.*<\/time>/
     end
 
     it 'should have title attribute' do
-      @stub.timeago_tag(Time.now).should =~ /<time.*title=".*".*>.*<\/time>/
+      @stub.timeago_tag(time).should =~ /<time.*title=".*".*>.*<\/time>/
+    end
+
+    it 'should have human readable datetime as title attribute' do
+      @stub.timeago_tag(time).should include("title=\"#{I18n.l time}\"")
+    end
+
+    it 'should have human readable datetime as title attribute with given format' do
+      @stub.timeago_tag(time, :format => :short).should include("title=\"#{I18n.l time, :format => :short}\"")
+    end
+
+    it 'should have human readable datetime as title attribute with global format' do
+      Rails::Timeago.default_options :format => :short
+      @stub.timeago_tag(time).should include("title=\"#{I18n.l time, :format => :short}\"")
+    end
+
+    it 'should have no title attribute if title is set to false globally' do
+      Rails::Timeago.default_options :title => false
+      @stub.timeago_tag(time).should_not =~ /<time.*title=".*".*>.*<\/time>/
+    end
+
+    it 'should have no title attribute if title is set to nil globally' do
+      Rails::Timeago.default_options :title => nil
+      @stub.timeago_tag(time).should_not =~ /<time.*title=".*".*>.*<\/time>/
+    end
+
+    it 'should have title attribute with proc value globally' do
+      Rails::Timeago.default_options :title => proc { |time, options| options[:format] }
+      @stub.timeago_tag(time, :format => :short).should =~ /<time.*title="short".*>.*<\/time>/
+    end
+
+    it 'should have title attribute with proc value locally' do
+      @stub.timeago_tag(time, :format => :long,
+        :title => proc { |time, options| options[:format] }).should =~ /<time.*title="long".*>.*<\/time>/
     end
 
     it 'should have data-time-ago attribute' do
-      @stub.timeago_tag(Time.now).should =~ /<time.*data-time-ago=".*".*>.*<\/time>/
+      @stub.timeago_tag(time).should =~ /<time.*data-time-ago=".*".*>.*<\/time>/
     end
 
     it 'should not have data-time-ago attribute for times before limit' do
@@ -58,7 +93,7 @@ describe Rails::Timeago::Helper do
     end
 
     it 'should pass html option to tag helper' do
-      @stub.timeago_tag(Time.now, :myattr => 'abc').should =~ /<time.*myattr="abc".*>.*<\/time>/
+      @stub.timeago_tag(time, :myattr => 'abc').should =~ /<time.*myattr="abc".*>.*<\/time>/
     end
 
     it "should allow to set global options" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails-timeago
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
-  prerelease: 6
+  version: 2.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-24 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,9 +132,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24