wordnik_ruby_helpers 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wordnik_ruby_helpers (0.1.1)
+    wordnik_ruby_helpers (0.1.4)
       RedCloth (>= 4.2.3)
       rails
 
@@ -9,6 +9,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.7)
+    ZenTest (4.5.0)
     abstract (1.0.0)
     actionmailer (3.0.7)
       actionpack (= 3.0.7)
@@ -36,7 +37,10 @@ GEM
       activemodel (= 3.0.7)
       activesupport (= 3.0.7)
     activesupport (3.0.7)
-    arel (2.0.9)
+    arel (2.0.10)
+    autotest (4.4.6)
+      ZenTest (>= 4.4.1)
+    autotest-rails-pure (4.1.2)
     builder (2.1.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
@@ -49,7 +53,7 @@ GEM
       treetop (~> 1.4.8)
     mime-types (1.16)
     polyglot (0.3.1)
-    rack (1.2.2)
+    rack (1.2.3)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
@@ -67,7 +71,7 @@ GEM
       activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -79,11 +83,13 @@ GEM
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.27)
+    tzinfo (0.3.29)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  autotest
+  autotest-rails-pure
   rspec
   wordnik_ruby_helpers!

data/lib/wordnik_ruby_helpers.rb

@@ -18,18 +18,35 @@ module WordnikRubyHelpers
     end
 
     # Use words if within the last week, otherwise use date (show year if not this year)
-    def time_ago_in_words_or_date(date,options={})
-      return unless date
-      date = Date.parse(date)
-      if (Date.today-date)/60/60/24 < 7
-        time_ago_in_words(date) + " ago"
-      elsif date.year == Time.now.year
-        options[:short_format] ? date.strftime(options[:short_format]) : date.strftime("%b %e").gsub("  ", " ")
-      else
-        options[:long_format] ? date.strftime(options[:long_format]) : date.strftime("%b %e, %Y").gsub("  ", " ")
+    # Good for SEO and humans.. see http://timeago.yarp.com
+    #
+    # Usage:
+    # timeago(Time.now)
+    # timeago(time, :relative_for => 30.days)
+    def timeago(time, *args)
+      time = Time.parse(time) unless time.class == Time
+      
+      defaults = {
+        :relative_for => 1.week,
+        :title => time.getutc.iso8601,
+        :class => ""
+      }
+      options = defaults.merge(args.extract_options!)
+
+      # Add a 'relative' CSS class unless it's way old
+      if Time.now-time < options[:relative_for]
+        options[:class] = options[:class].to_s.squeeze(' ').split(' ').push('relative').join(' ')
       end
+
+      # Take `relative_for` option out so it doesn't become an HTML attribute.. 
+      options.delete(:relative_for)
+
+      html_tag(:abbr, time.strftime('%b %e, %Y'), options)
     end
 
+    # Legacy support..
+    alias :time_ago_in_words_or_date :timeago
+
     # Output an easily styleable key-value pair
     def info_pair(label, value)
       value = content_tag(:span, "None", :class => "blank") if value.blank?

data/lib/wordnik_ruby_helpers/version.rb

@@ -1,3 +1,3 @@
 module WordnikRubyHelpers
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/wordnik_ruby_helpers_spec.rb

@@ -25,21 +25,44 @@ describe WordnikRubyHelpers do
 
   end
   
-  context "time_ago_in_words_or_date" do
-    it "should get relative times right" do
-      time_ago_in_words_or_date(Time.now - 10.minutes).should == "10 minutes ago"
-      time_ago_in_words_or_date(Time.now - 1.day).should == "1 day ago"
-      time_ago_in_words_or_date(Time.now - 2.days).should == "2 days ago"
-    end
+  context "timeago" do
     
-    it "should use short format for non-relative dates in the last year" do
-      time_ago_in_words_or_date(Time.now - 8.days).should =~ /\w{3} \d+/i
-      time_ago_in_words_or_date(Time.now - 6.months).should =~ /\w{3} \d+/i
+    context "relative dates" do
+
+      it "returns nil if given bad input" do
+        expect { timeago("wonkalonka") }.to raise_error
+        expect { timeago(nil) }.to raise_error
+        expect { timeago(123) }.to raise_error
+      end
+      
+      it "supports legacy time_ago_in_words_or_date method name" do
+        timeago("05-07-2009 19:00").should be_a(String)
+      end
+      
+      it "accepts string input" do
+        timeago("05-07-2009 19:00").should be_a(String)
+        timeago("2006-12-24T17:58:58.000+0000").should be_a(String)
+      end
+      
+      it "uses a human-friendly format in the display text, eg. 'Dec 24, 2006'" do
+        timeago("2006-12-24T17:58:58.000+0000").should =~ /Dec 24, 2006/
+      end
+      
+      it "renders an abbr tag" do
+        timeago(1.year.ago).should =~ /^\<abbr/
+      end
+      
+      it "renders a title tag" do
+        timeago(1.year.ago).should =~ /title=/
+      end
+
+      it "should render a css relative tag if within the last week" do
+        timeago(Time.now - 6.days).should =~ /class=\"relative\"/
+        timeago(Time.now - 8.days).should_not =~ /relative/
+      end
+      
     end
     
-    it "should display year format for non-relative dates beyond one year ago" do
-      time_ago_in_words_or_date(Time.now - 13.months).should =~ /\w{3} \d+, \d{4}/i
-    end
   end
   
   context "generate_table" do

data/wordnik_ruby_helpers.gemspec

@@ -18,7 +18,13 @@ Gem::Specification.new do |s|
   s.add_dependency 'RedCloth', '>= 4.2.3'
   
   s.add_development_dependency 'rspec'
-
+  
+  # Optional..
+  s.add_development_dependency 'autotest'  
+  s.add_development_dependency 'autotest-rails-pure'
+  # s.add_development_dependency 'autotest-growl'
+  # s.add_development_dependency 'autotest-fsevent'
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

metadata

@@ -2,7 +2,7 @@
 name: wordnik_ruby_helpers
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -07:00
+date: 2011-07-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,28 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: autotest-rails-pure
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: A handful of monkey patches and view helpers that we use in our rails projects
 email: 
 - zeke@wordnik.com