rails-timeago 1.1.0 → 1.1.1

data/lib/rails-timeago/helper.rb

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

@@ -3,7 +3,7 @@ module Rails
     module VERSION
       MAJOR = 1
       MINOR = 1
-      PATCH = 0
+      PATCH = 1
 
       def self.to_s
         [MAJOR, MINOR, PATCH].join '.'

data/spec/timeago_spec.rb

@@ -81,4 +81,8 @@ describe Rails::Timeago::Helper do
     @stub.timeago_tag(time, :limit => 4.days.ago).
       should_not =~ /<time.*data-time-ago=".*".*>.*<\/time>/
   end
+
+  it "should return default string if time is nil" do
+    @stub.timeago_tag(nil).should == '-'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-timeago
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &15835140 !ruby/object:Gem::Requirement
+  requirement: &12945340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15835140
+  version_requirements: *12945340
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &15834280 !ruby/object:Gem::Requirement
+  requirement: &12944560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *15834280
+  version_requirements: *12944560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15833840 !ruby/object:Gem::Requirement
+  requirement: &12944120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15833840
+  version_requirements: *12944120
 description: jQuery Timeago helper for Rails 3
 email:
 - jan.graichen@altimos.de