wiser_date 0.1.9 → 0.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzhhYTk3MmZmYThiYmFmNGZjNzliMWI3YjNlYzUzMzNkZmVhY2Y5Mw==
+    YTA2OTgwZTg2ZDU0OWU0OGI0ZjBhNzNkMGFmMmYzZjdkYWZmN2FjYw==
   data.tar.gz: !binary |-
-    MDc0MDMzMGU4ZmFkN2Q1NGYyYTVhMjRjMmRiZDRiZDM0ZGIzZDVhYQ==
+    MDBlNGI2MzQ3ODg4YmYwMjczYjA1NDRkYTYxMmJlN2VmMjNmMzdhMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZTAyNDQ2OWU0ZjBkMWNmMTRjYjVjOTFiNDJlZGI1NjJlMTk3YzE4MGY1MzM3
-    NjA5ZmVlMDMwYjBiNzgzZTNhMDU3M2JjZDkzODNjMDFhOGE3OGI4OGRlMWZm
-    NzE1NzRhNWVmNGU4ZGQ4ZWE2Njg5MGNiNzhiNDM2MGUwNjAyNjA=
+    N2ZlZTgzZDY3Mjc0OGIxOTRmNjI4OWMzMTFlYzgyMmM1MDc0MWM2M2MzZWY1
+    ZmE5NTJlM2NiM2ZlMDY0MDExODE3Y2Y3ZTE0ZDY0NzkxMWY0NzAyMDBmMWI2
+    MmUwMWIyYTg5NjRiYzFjZmQyOTgwOGM1NzM2MDYwMjhiODk2MmY=
   data.tar.gz: !binary |-
-    Y2FlZDM4OGYwNTc5YzRiMTdhMzQ4NmYxOWU3ZTgxZjE1MDljZTc4ODBkY2Nh
-    NjZhZWNlOTA4MWU3N2I3MWJmMTc5NzYyZTE5ZmJhZTQxY2NmMDNiOWE0NjE0
-    NjY0YmIyOTZjOWNhNDc2MGU2ODAyZTcyNjhmY2MxYTAzNWY5YWM=
+    MWY0YzIzMWExNTczMzVmN2M0MTYzZDVlMDhiNTMzZmQ4ZTkwNjQ5YjdiNTdl
+    NTI5NjM3OWIxNWZmYWI4MmZkMDM2MDQ2YjhkMDM3ODMxZDA2ODg0NzdkMDQz
+    YjM1YmY3ODhkOTlhNWRjODRjZTk4NTc1OThjNzUzN2JhODMwYTI=

data/README.rdoc

@@ -1,11 +1,6 @@
 = Wiser Date for Rails
 
-WiserDate is a date formatting plugin written by Kenneth John Balgos (https://github.com/kennethjohnbalgos). Wiser Date features dynamic presentation of feed timestamps. Right now, it only displays the date statically. I'm writing the jQuery scripts to update the displayed dates in real-time and dynamic.
-
-
-== Installing Gem
-
-    gem "wiser_date"
+WiserDate is a date formatting plugin written by Kenneth John Balgos (https://github.com/kennethjohnbalgos). Wiser Date features dynamic presentation of feed timestamps. The plugin now supports real-time and dynamic date displays.
     
 
 == Dependency
@@ -13,7 +8,11 @@ WiserDate is a date formatting plugin written by Kenneth John Balgos (https://gi
 Rails >=3.1 and jQuery >=1.7 to make the real-time feature work.
 
 
-== Using the javascripts - Not Yet Available
+== Installation
+
+Install the gem.
+
+    gem "wiser_date"
 
 Require jquery.wiser_date in your app/assets/application.js file.
 
@@ -27,9 +26,10 @@ Use the wiser_date function in your views.
     <%= wiser_date @user.last_login_at %>
     # Sample display within few seconds: just now
     # Sample display within few minutes: about 30 minutes ago
-    # Sample display within the day: about 15 hours ago
+    # Sample display within the day: about 3 hours ago
+    # Sample display later within the day: today at 12:21pm
     # Sample display after the day: yesterday 12:21pm
-    # Sample display after 2 days: Sept 10, 2013 12:21pm
+    # Sample display after 2 days: September 10, 2013 12:21pm
     
 @user.last_login_at can be any timestamp you want to display.
 
@@ -40,12 +40,21 @@ Assume that the value is "Mon, 10 Sept 2012 12:21:16 UTC +00:00".
 
 You can customize the behavior of the date display by using the following options:
 
+* *real_time* - toggles the real-time updating of displayed dates [default: true]
+    
+    <%= wiser_date @user.last_login_at, :real_time => false %>
+
+* *interval* - custom real-time update interval in seconds [default: 20]
+    
+    <%= wiser_date @user.last_login_at, :interval => 60 %>
+
 * *date_format* - overrides the default date format [default: "%b %d, %Y"]
     
     <%= wiser_date @user.last_login_at, :date_format => "%Y-%m-%d" %>
     # Sample display within few seconds: just now
     # Sample display within few minutes: about 30 minutes ago
-    # Sample display within the day: about 15 hours ago
+    # Sample display within the day: about 3 hours ago
+    # Sample display later within the day: today at 12:21pm
     # Sample display after the day: yesterday 12:21pm
     # Sample display after 2 days: 2012-09-10 12:21pm
 
@@ -54,58 +63,59 @@ You can customize the behavior of the date display by using the following option
     <%= wiser_date @user.last_login_at, :time_format => "%H:%M:%S" %>
     # Sample display within few seconds: just now
     # Sample display within few minutes: about 30 minutes ago
-    # Sample display within the day: about 15 hours ago
+    # Sample display within the day: about 3 hours ago
+    # Sample display later within the day: today at 12:21:16
     # Sample display after the day: yesterday 12:21:16
-    # Sample display after 2 days: Sept 10, 2013 12:21:16
+    # Sample display after 2 days: September 10, 2013 12:21:16
 
 * *humanize* - converts date to more readable string [default: true]
     
     <%= wiser_date @user.last_login_at, :humanize => false %>
-    # Sample display within few seconds: Sept 10, 2013 12:21pm
-    # Sample display within few minutes: Sept 10, 2013 12:21pm
-    # Sample display within the day: Sept 10, 2013 12:21pm
-    # Sample display after the day: Sept 10, 2013 12:21pm
-    # Sample display after 2 days: Sept 10, 2013 12:21pm
+    # Sample display within few seconds: September 10, 2013 12:21pm
+    # Sample display within few minutes: September 10, 2013 12:21pm
+    # Sample display within the day: September 10, 2013 12:21pm
+    # Sample display later within the day: September 10, 2013 12:21pm
+    # Sample display after the day: September 10, 2013 12:21pm
+    # Sample display after 2 days: September 10, 2013 12:21pm
 
 * *time_first* - displays time first instead of date [default: false]
     
     <%= wiser_date @user.last_login_at, :time_first => true %>
     # Sample display within few seconds: just now
     # Sample display within few minutes: about 30 minutes ago
-    # Sample display within the day: about 15 hours ago
+    # Sample display within the day: about 3 hours ago
+    # Sample display later within the day: 12:21pm today
     # Sample display after the day: 12:21pm yesterday 
-    # Sample display after 2 days: 12:21pm Sept 10, 2013
+    # Sample display after 2 days: 12:21pm September 10, 2013
 
 * *hide_same_year* - will not display the year if the it is the same with the present year [default: false]
     
     <%= wiser_date @user.last_login_at, :hide_same_year => true %>
     # Sample display within few seconds: just now
     # Sample display within few minutes: about 30 minutes ago
-    # Sample display within the day: about 15 hours ago
+    # Sample display within the day: about 3 hours ago
+    # Sample display later within the day: today at 12:21pm
     # Sample display after the day: yesterday 12:21pm
-    # Sample display after 2 days: Sept 10, 12:21pm 
+    # Sample display after 2 days: September 10, 12:21pm 
 
 * *capitalize* - capitalizes the first letter of the date displayed [default: true]
     
     <%= wiser_date @user.last_login_at, :capitalize => true %>
     # Sample display within few seconds: Just now
     # Sample display within few minutes: About 30 minutes ago
-    # Sample display within the day: About 15 hours ago
+    # Sample display within the day: about 3 hours ago
+    # Sample display later within the day: Today at 12:21pm
     # Sample display after the day: Yesterday 12:21pm
-    # Sample display after 2 days: Sept 10, 12:21pm 
+    # Sample display after 2 days: September 10, 12:21pm 
 
 * *custom_class* - adds custom classes to the containter span of the date [default: nil]
     
     <%= wiser_date @user.last_login_at, :custom_class => "date_tooltip" %>
 
-* *time_now* - accepts complete timestamp as the basis of time distances [default: nil]
+* *time_now* - accepts complete timestamp as the basis of time distances [default: server_time]
     
     <%= wiser_date @user.last_login_at, :time_now => "2012-09-10 12:21:16 +0000" %>
 
 
-== Thanks
-Thanks to me for writing an awesome real-time date display plugin :p
-
-
 == Support
 Open an issue in https://github.com/kennethjohnbalgos/wiser_date if you need further support or want to report a bug.

data/lib/wiser_date/view_helpers.rb

@@ -1,25 +1,61 @@
 require 'date'
 
 module WiserDate
+  
   module ViewHelpers
+  
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::DateHelper
     include ActionView::Context    
+    
+    def wiser_date_global(options = {})
+      timezone = options.has_key?(:timezone) ? options[:timezone] : ""
+      interval = options.has_key?(:interval) ? options[:interval] : ""
+      time_now = options.has_key?(:time_now) ? options[:time_now] : ""
+      custom_class = options.has_key?(:custom_class) ? options[:custom_class] : ""
+    
+      cookies[:wiser_date_timezone] = timezone
+      cookies[:wiser_date_interval] = interval 
+      cookies[:wiser_date_time_now] = time_now
+      cookies[:wiser_date_custom_class] = custom_class
+    end
 
     def wiser_date(timestamp, options = {})
       # Options
       date_format = options.has_key?(:date_format) ? options[:date_format] : "%B %d, %Y"
       time_format = options.has_key?(:time_format) ? options[:time_format] : "%l:%M%P"
+      title = options.has_key?(:title) ? options[:title] : ""
       humanize = options.has_key?(:humanize) ? options[:humanize] : true
       time_first = options.has_key?(:time_first) ? options[:time_first] : false
       hide_same_year = options.has_key?(:hide_same_year) ? options[:hide_same_year] : false
+      
       capitalize = options.has_key?(:capitalize) ? options[:capitalize] : true
-      custom_class = options.has_key?(:custom_class) ? options[:custom_class] : nil
-      time_now = options.has_key?(:time_now) ? options[:time_now].to_datetime : Time.now
       real_time = options.has_key?(:real_time) ? options[:real_time] : true
-      interval = options.has_key?(:interval) ? options[:interval] : 20
+      
+      if cookies[:wiser_date_custom_class].present? && !cookies[:wiser_date_custom_class].blank?
+        custom_class = cookies[:wiser_date_custom_class]
+      else
+        custom_class = options.has_key?(:custom_class) ? options[:custom_class] : nil
+      end
+      
+      if cookies[:wiser_date_time_now].present? && !cookies[:wiser_date_time_now].blank?
+        time_now = cookies[:wiser_date_time_now]
+      else
+        time_now = options.has_key?(:time_now) ? options[:time_now].to_datetime : Time.now
+      end
+      
+      if cookies[:wiser_date_interval].present? && !cookies[:wiser_date_interval].blank?
+        interval = cookies[:wiser_date_interval]
+      else
+        interval = options.has_key?(:interval) ? options[:interval] : 20
+      end
 
+      if cookies[:wiser_date_timezone].present? && !cookies[:wiser_date_timezone].blank?
+        time_now = time_now.to_datetime.in_time_zone(ActiveSupport::TimeZone[cookies[:wiser_date_timezone]]) 
+        timestamp = timestamp.to_datetime.in_time_zone(ActiveSupport::TimeZone[cookies[:wiser_date_timezone]]) 
+      end
+    
       # Formats
       flat_format = "%Y%m%d%H%M%S"
       plain_format = "%Y-%m-%d %H:%M:%S"
@@ -29,6 +65,11 @@ module WiserDate
       custom_timestamp = timestamp.strftime(custom_format)
       plain_timestamp = timestamp.strftime(plain_format)
 
+      # Default Title
+      if title == ""
+        title = custom_timestamp
+      end
+      
       # Humanize Display
       if humanize
         time_diff_in_seconds = (time_now - timestamp.to_time).ceil
@@ -36,32 +77,39 @@ module WiserDate
         time_diff_in_days = (time_diff_in_seconds / (60*60*24))
         if time_diff_in_seconds < 60 && time_diff_in_seconds >= 0
           custom_timestamp = "just now"
+          custom_timestamp = "today" if time_format == ""
         elsif time_now.to_date - 1.day == timestamp.to_date 
           date_value = "yesterday"
           time_value = timestamp.strftime(time_format)
           custom_timestamp = time_first ? "#{time_value} #{date_value}" : "#{date_value} at #{time_value}"
+          custom_timestamp = date_value if time_format == ""
         elsif time_diff_in_days < 0
           if time_diff_in_days > -2
             date_value = "tomorrow"
             time_value = timestamp.strftime(time_format)
             custom_timestamp = time_first ? "#{time_value} #{date_value}" : "#{date_value} at #{time_value}"
+            custom_timestamp = date_value if time_format == ""
           elsif time_diff_in_days > -7
             date_value = "on " + timestamp.strftime('%A')
             time_value = timestamp.strftime(time_format)
             custom_timestamp = time_first ? "#{time_value} #{date_value}" : "#{date_value} at #{time_value}"
+            custom_timestamp = date_value if time_format == ""
           end
         elsif time_diff_in_days < 1
           if time_now.to_date == timestamp.to_date && time_diff_in_hours >= 8
             date_value = "today"
             time_value = timestamp.strftime(time_format)
             custom_timestamp = time_first ? "#{time_value} #{date_value}" : "#{date_value} at #{time_value}"
+            custom_timestamp = date_value if time_format == ""
           else
-            custom_timestamp = "#{distance_of_time_in_words(Time.now, timestamp.to_time)} ago"  
+            custom_timestamp = "#{distance_of_time_in_words(time_now, timestamp.to_time)} ago"
+            custom_timestamp = "today" if time_format == ""
           end
         elsif time_diff_in_days < 7
           date_value = "last " + timestamp.strftime('%A')
           time_value = timestamp.strftime(time_format)
           custom_timestamp = time_first ? "#{time_value} #{date_value}" : "#{date_value} at #{time_value}"
+          custom_timestamp = date_value if time_format == ""
         end
       end
 
@@ -81,26 +129,28 @@ module WiserDate
       classes << "humanize" if humanize
       classes << "capitalize" if capitalize
       classes << "real_time" if real_time
+      classes << "on" if real_time
+      classes << "-#{@timezone}-"
       classes = classes.join(' ')
-  
+
       uniq_id = Digest::SHA1.hexdigest([Time.now, rand].join)
       html = content_tag(:span, custom_timestamp, 
         "id" => uniq_id,
         "class" => classes, 
         "data-plain-timestamp" => plain_timestamp, 
         "data-date-format" => date_format,
-        "data-time-format" => time_format
+        "data-time-format" => time_format,
+        "title" => title
       )
 
+      formatted_time_now = time_now.strftime(plain_format)
       meta_vars = []
-      meta_vars << "data-value=\"#"+uniq_id+".real_time\""
-      meta_vars << "data-custom-format=\""+custom_format+"\""
-      meta_vars << "data-server-datetime=\""+time_now.strftime(plain_format)+"\""
-      meta_vars << "data-server-datetime=\""+time_now.strftime(plain_format)+"\""
-      meta_vars << "data-interval=\""+interval.to_s+"\""
+      meta_vars << "data-custom-format=\"" + custom_format + "\""
+      meta_vars << "data-server-datetime=\"" + formatted_time_now + "\""
+      meta_vars << "data-interval=\"" + interval.to_s + "\""
       meta_vars << "id=\"wiser_date\""
 
-      html += javascript_tag("jQuery(document).ready(function(){if(jQuery('body meta#wiser_date').size() == 0){$('body').prepend('<meta "+meta_vars.join(' ')+" />')}else{$('meta#wiser_date').attr('data-value',$('meta#wiser_date').attr('data-value')+', #"+uniq_id+".real_time')};  updateWiserDate(\""+uniq_id+".real_time\");});")
+      html += javascript_tag("make_it_wiser_date('#" + uniq_id + "', '" + meta_vars.join(' ') + "');")
       html.html_safe
     end
   end

data/vendor/assets/javascripts/jquery.wiser_date.js

@@ -1,27 +1,23 @@
+function make_it_wiser_date(id, meta_vars) {
+  jQuery(document).ready(function(){
+    if(jQuery('body meta#wiser_date').size() == 0){
+      jQuery('body').prepend("<meta " + meta_vars + " />")
+    };
+    updateWiserDate(id);
+  })
+}
+
 function updateWiserDate(id) {
-  if($('meta#wiser_date').attr('data-real-time-started') != "true"){
-    update_interval = parseInt($('meta#wiser_date').attr('data-interval')) * 1000;
+  if(jQuery('meta#wiser_date').attr('data-real-time-started') != "true"){
+    update_interval = parseInt(jQuery('meta#wiser_date').attr('data-interval')) * 1000;
     setInterval(function() {
       update_timer(update_interval)
-      span_ids = $('meta#wiser_date').attr('data-value').split(', ').filter(function(v){return v!==''});
-      $.each(span_ids, function(i, val){
-        if($(val).size() > 0){
-          updateDate($(val));
-        }else{
-          excludeElement($(val));
-        }
+      jQuery('.wiser_date.on').each(function(){
+        updateDate(jQuery(this));
       })
     },update_interval); 
   }
-  $('meta#wiser_date').attr('data-real-time-started','true');
-}
-
-function excludeElement(el){
-  el_id = '#'+$(el).attr('id')+'.real_time'
-  selector = $('meta#wiser_date').attr('data-value')
-  selector = selector.replace(el_id, "")
-  selector = selector.split(', ').filter(function(v){return v!==''}).join(', ')
-  $('meta#wiser_date').attr('data-value',selector)
+  jQuery('meta#wiser_date').attr('data-real-time-started','true');
 }
 
 function updateDate(el){
@@ -38,7 +34,7 @@ function prettyDate(element){
   humanize = element.hasClass('humanize')
   time_first = element.hasClass('time_first')
   
-  server_datetime = $('meta#wiser_date').attr('data-server-datetime')
+  server_datetime = jQuery('meta#wiser_date').attr('data-server-datetime')
   var time_now = new Date((server_datetime || "").replace(/-/g,"/").replace(/[TZ]/g," "));
   var timestamp = new Date((datetime || "").replace(/-/g,"/").replace(/[TZ]/g," "));
   var time_diff_in_seconds = ((time_now.getTime() - timestamp.getTime()) / 1000);
@@ -63,6 +59,9 @@ function prettyDate(element){
   }else if(humanize){
     if(time_diff_in_seconds < 60 && time_diff_in_seconds >= 0){
       custom_timestamp = "just now"
+      if(time_format == ""){
+        custom_timestamp = "today"
+      }
     }else if(custom_format(date_yesterday, plain_date_format) == custom_format(timestamp, plain_date_format)){
       date_value = "yesterday"
       time_value = custom_format(timestamp, time_format)
@@ -71,6 +70,9 @@ function prettyDate(element){
       }else{
         custom_timestamp = date_value + " at " + time_value;
       } 
+      if(time_format == ""){
+        custom_timestamp = date_value
+      }
     }else if(time_diff_in_days < 0){
       if(time_diff_in_days > -2){
         date_value = "tomorrow"
@@ -79,6 +81,9 @@ function prettyDate(element){
           custom_timestamp = time_value + " " + date_value;
         }else{
           custom_timestamp = date_value + " at " + time_value;
+        } 
+        if(time_format == ""){
+          custom_timestamp = date_value
         }
       }else if(time_diff_in_days > -7){
         date_value = "on " + custom_format(timestamp, "%A")
@@ -87,9 +92,12 @@ function prettyDate(element){
           custom_timestamp = time_value + " " + date_value;
         }else{
           custom_timestamp = date_value + " at " + time_value;
+        } 
+        if(time_format == ""){
+          custom_timestamp = date_value
         }
       }else{
-        excludeElement(element);
+        element.removeClass('on')
         custom_timestamp = regular_date_display
       }
     }else if(time_diff_in_days < 1){
@@ -100,9 +108,15 @@ function prettyDate(element){
           custom_timestamp = time_value + " " + date_value;
         }else{
           custom_timestamp = date_value + " at " + time_value;
+        } 
+        if(time_format == ""){
+          custom_timestamp = date_value
         }
       }else{
         custom_timestamp = humanize_format(time_diff_in_seconds, time_diff_in_days);
+        if(time_format == ""){
+          custom_timestamp = "today"
+        }
       }
     }else if(time_diff_in_days < 7){
       date_value = "last " + custom_format(timestamp, "%A")
@@ -111,13 +125,16 @@ function prettyDate(element){
         custom_timestamp = time_value + " " + date_value;
       }else{
         custom_timestamp = date_value + " at " + time_value;
+      } 
+      if(time_format == ""){
+        custom_timestamp = date_value
       }
     }else{
-      excludeElement(element);
+      element.removeClass('on')
       custom_timestamp = regular_date_display
     }
   }else{
-    excludeElement(element);
+    element.removeClass('on')
     custom_timestamp = regular_date_display
   }
   
@@ -133,12 +150,12 @@ function prettyDate(element){
 
 function update_timer(interval){
   if(!interval){interval = 1000;}
-  current_datetime = $('meta#wiser_date').attr('data-server-datetime');
+  current_datetime = jQuery('meta#wiser_date').attr('data-server-datetime');
   current_datetime = new Date((current_datetime || "").replace(/-/g,"/").replace(/[TZ]/g," "));
   current_datetime.setTime(current_datetime.getTime() + interval);
   current_datetime = custom_format(current_datetime, "%Y-%m-%d %H:%M:%S");
-  $('meta#wiser_date').attr('data-server-datetime', current_datetime);
-  $('#real_time').text('The actual server time is ' + current_datetime);
+  jQuery('meta#wiser_date').attr('data-server-datetime', current_datetime);
+  jQuery('#real_time').text('The actual server time is ' + current_datetime);
 }
 
 function humanize_format(sec_diff, day_diff){
@@ -225,4 +242,4 @@ function DateFmt() {
 
   return dateTxt
   }
-}
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiser_date
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.6
 platform: ruby
 authors:
 - Kenneth John Balgos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails