wiser_date 0.1.3 → 0.1.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGE0MThiYjFiMzE2MWNlY2M4NzdmZGEzZTdjZmJlNThiMDUxZDM4MA==
+    MDY2OWUyNzY1OTRlYTYxNWU1ZGE1MjMxN2ZkOGJiODNmOWU0ZjA4OQ==
   data.tar.gz: !binary |-
-    NDJjMWFkMDk2M2M3NDRlMmU1ZTVjNzUwNWY2ZTI1OTUyYWUwNmU0Yg==
+    M2U1ZGVjMjU2MmMzMDY4YmFjZWRkOWZlNWVhZWEwODc0YTg3NWIxNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2MxMDZjNGYyNzU3YzdjNDc1YWQ3YzlmNDljOTFiZjczMDNhODFmYTkxMzNm
-    NGJjMWYwYjEzY2FlMmU3NDk2MWJiOTk0NzJhYzkwMDQxNDIyZTQ4MGY5NjUw
-    ODc5MTFkYThhZmQ2ZWI3OWZkMGQ4MGE0NWMyNmVmMDFjZDMzNzg=
+    MGNkNjY1ZmVlMGY3ZWYyMGVlNWMwNjcwOWY3YmI5N2M2M2Y0M2FmODQ0MThh
+    MGQ5Yjc5YjQ2NzUzNjMyOGVhMzk0NmQ2ODhkZDNkMGRiY2I3NzI4MjIxNWNj
+    NGM4NzJlNmJlOWRkN2VkYTdhMDNiNDhlYmQ5ZTM5NDJkZTZiNTk=
   data.tar.gz: !binary |-
-    NDc4MTk3NTNhYjRlMmRmNTU3Mzg4YzljMTI5NzRiY2Q3ZGI5YWI3MmJjYWMz
-    MWE5Y2ZiYmEwYmI1ODczMjY2OGM0ZmZjMzM4ZWZkMDIyOTAxZTBhODk5N2Ey
-    YWE5YTVlYzM3MWE2MGEwN2RmZmExMTc4Zjg5YjBhZjVkOWQ3ZDI=
+    ODYxNDNlMDAzNmViMmRiOTZiY2IwZWJiNTYyMDg5ZDMyMjdlOWEwZjJjZDdk
+    MGExZjNlZjQ0YzNmZGUyNWRlYTMzMDE1ZDBhYjI2ZDUzZTY0OTk0MzJjMzI4
+    ZGQ3YmIzYzBlYWYxMjEyOGE3ODU3MmI1YjgxODlkYzg4YWE4NmY=

data/README.rdoc

@@ -7,11 +7,10 @@ WiserDate is a date formatting plugin written by Kenneth John Balgos (https://gi
 
     gem "wiser_date"
     
-    
 
 == Dependency
 
-The Rails application should have jQuery to make the real-time feature work.
+Rails >=3.1 and jQuery >=1.7 to make the real-time feature work.
 
 
 == Using the javascripts - Not Yet Available
@@ -95,6 +94,14 @@ You can customize the behavior of the date display by using the following option
     # Sample display after the day: Yesterday 12:21pm
     # Sample display after 2 days: Sept 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]
+    
+    <%= 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

data/lib/wiser_date/railtie.rb

@@ -1,6 +1,8 @@
 require "wiser_date/view_helpers"
-
 module WiserDate
+  class Engine < ::Rails::Engine
+  end
+  
   class Railtie < Rails::Railtie
     initializer "wiser_date.view_helpers" do |app|
       ActionView::Base.send :include, ViewHelpers

data/lib/wiser_date/view_helpers.rb

@@ -2,7 +2,6 @@ require 'date'
 
 module WiserDate
   module ViewHelpers
-  
     include ActionView::Helpers::JavaScriptHelper
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::DateHelper
@@ -10,7 +9,7 @@ module WiserDate
 
     def wiser_date(timestamp, options = {})
       # Options
-      date_format = options.has_key?(:date_format) ? options[:date_format] : "%b %d, %Y"
+      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"
       humanize = options.has_key?(:humanize) ? options[:humanize] : true
       time_first = options.has_key?(:time_first) ? options[:time_first] : false
@@ -18,6 +17,8 @@ module WiserDate
       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
 
       # Formats
       flat_format = "%Y%m%d%H%M%S"
@@ -31,47 +32,75 @@ module WiserDate
       # Humanize Display
       if humanize
         time_diff_in_seconds = (time_now - timestamp.to_time).ceil
+        time_diff_in_hours = (time_diff_in_seconds / (60*60))
         time_diff_in_days = (time_diff_in_seconds / (60*60*24))
-        if time_diff_in_seconds <= 30 && time_diff_in_seconds >= 0
+        if time_diff_in_seconds < 60 && time_diff_in_seconds >= 0
           custom_timestamp = "just now"
         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} #{time_value}"
-        elsif time_diff_in_days <= 1.0 && time_diff_in_days >= 0
-          custom_timestamp = "#{distance_of_time_in_words(Time.now, timestamp.to_time)} ago"
-        elsif hide_same_year && time_now.year == timestamp.year 
-          custom_timestamp = custom_timestamp.gsub(", #{time_now.year.to_s}", '')
+          custom_timestamp = time_first ? "#{time_value} #{date_value}" : "#{date_value} at #{time_value}"
+        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}"
+          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}"
+          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}"
+          else
+            custom_timestamp = "#{distance_of_time_in_words(Time.now, timestamp.to_time)} ago"  
+          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}"
         end
       end
-  
+
+      # Hide Same Year
+      if hide_same_year && time_now.year == timestamp.year 
+        custom_timestamp = custom_timestamp.gsub(", #{time_now.year.to_s} ", ' at')
+      end
       # Capitalize
       if capitalize
-        custom_timestamp = custom_timestamp.to_s.capitalize
+        custom_timestamp[0] = custom_timestamp[0].upcase
       end
 
+      classes = ["wiser_date"]
+      classes << custom_class if custom_class.present?
+      classes << "time_first" if time_first
+      classes << "hide_same_year" if hide_same_year
+      classes << "humanize" if humanize
+      classes << "capitalize" if capitalize
+      classes << "real_time" if real_time
+      classes = classes.join(' ')
     
       uniq_id = Digest::SHA1.hexdigest([Time.now, rand].join)
       html = content_tag(:span, custom_timestamp, 
         "id" => uniq_id,
-        "class" => "wiser_date #{custom_class if custom_class.present?}", 
+        "class" => classes, 
         "data-plain-timestamp" => plain_timestamp, 
-        "data-custom-timestamp" => custom_timestamp,
-        "data-new-custom-timestamp" => custom_timestamp
+        "data-date-format" => date_format,
+        "data-time-format" => time_format
       )
-    
+  
       meta_vars = []
       meta_vars << "data-value=\"#"+uniq_id+"\""
       meta_vars << "data-custom-format=\""+custom_format+"\""
-      meta_vars << "data-date-format=\""+date_format+"\""
-      meta_vars << "data-time-format=\""+time_format+"\""
-      meta_vars << "data-humanize=\""+humanize.to_s+"\""
-      meta_vars << "data-hide-same-year=\""+hide_same_year.to_s+"\""
-      meta_vars << "data-time-first=\""+time_first.to_s+"\""
-      meta_vars << "data-capitalize=\""+capitalize.to_s+"\""
+      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 << "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+"')}});")
+  
+      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+"')};  updateWiserDate(\""+uniq_id+"\");});")
       html.html_safe
     end
   end

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

@@ -0,0 +1,215 @@
+function updateWiserDate(id) {
+  if($('meta#wiser_date').attr('data-real-time-started') != "true"){
+    update_interval = parseInt($('meta#wiser_date').attr('data-interval')) * 1000;
+    setInterval(function() {
+      update_timer(update_interval)
+      span_ids = $('meta#wiser_date').attr('data-value');
+      $(span_ids).each(function(){
+        if($(this).hasClass('real_time'))
+          updateDate($(this));
+      })
+    },update_interval); 
+  }
+  $('meta#wiser_date').attr('data-real-time-started','true');
+}
+
+function updateDate(el){
+  el.text(prettyDate(el));
+}
+
+function prettyDate(element){
+  datetime = element.attr('data-plain-timestamp')
+  date_format = element.attr('data-date-format')
+  time_format = element.attr('data-time-format')
+  
+  hide_same_year = element.hasClass('hide_same_year')
+  capitalize = element.hasClass('capitalize')
+  humanize = element.hasClass('humanize')
+  time_first = element.hasClass('time_first')
+  
+  server_datetime = $('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);
+  var time_diff_in_hours = Math.floor(time_diff_in_seconds / 3600);
+  var time_diff_in_days = Math.floor(time_diff_in_seconds / 86400);
+  
+  date_yesterday = time_now;
+  date_yesterday.setDate(time_now.getDate() - 1);
+
+  flat_format = "%Y%m%d%H%M%S"
+  plain_date_format = "%Y-%m-%d"
+  plain_format = "%Y-%m-%d %H:%M:%S"
+
+  if(time_first){
+    regular_date_display = custom_format(timestamp, time_format + " " + date_format);
+  }else{
+    regular_date_display = custom_format(timestamp, date_format + " " + time_format);
+  }
+  
+  if(isNaN(time_diff_in_days)){
+    custom_timestamp = datetime;
+  }else if(humanize){
+    if(time_diff_in_seconds < 60 && time_diff_in_seconds >= 0){
+      custom_timestamp = "just now"
+    }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)
+      if(time_first){
+        custom_timestamp = time_value + " " + date_value;
+      }else{
+        custom_timestamp = date_value + " at " + time_value;
+      } 
+    }else if(time_diff_in_days < 0){
+      if(time_diff_in_days > -2){
+        date_value = "tomorrow"
+        time_value = custom_format(timestamp, time_format)
+        if(time_first){
+          custom_timestamp = time_value + " " + date_value;
+        }else{
+          custom_timestamp = date_value + " at " + time_value;
+        }
+      }else if(time_diff_in_days > -7){
+        date_value = "on " + custom_format(timestamp, "%A")
+        time_value = custom_format(timestamp, time_format)
+        if(time_first){
+          custom_timestamp = time_value + " " + date_value;
+        }else{
+          custom_timestamp = date_value + " at " + time_value;
+        }
+      }else{
+        custom_timestamp = regular_date_display
+      }
+    }else if(time_diff_in_days < 1){
+      if(time_diff_in_hours >= 8){
+        date_value = "today"
+        time_value = custom_format(timestamp, time_format)
+        if(time_first){
+          custom_timestamp = time_value + " " + date_value;
+        }else{
+          custom_timestamp = date_value + " at " + time_value;
+        }
+      }else{
+        custom_timestamp = humanize_format(time_diff_in_seconds, time_diff_in_days);
+      }
+    }else if(time_diff_in_days < 7){
+      date_value = "last " + custom_format(timestamp, "%A")
+      time_value = custom_format(timestamp, time_format)
+      if(time_first){
+        custom_timestamp = time_value + " " + date_value;
+      }else{
+        custom_timestamp = date_value + " at " + time_value;
+      }
+    }else{
+      element.removeClass('real_time')
+      custom_timestamp = regular_date_display
+    }
+  }else{
+    custom_timestamp = regular_date_display
+  }
+  
+  if(hide_same_year){
+    custom_timestamp = custom_timestamp.replace(", "+time_now.getFullYear(), ' at')
+  }
+  if(capitalize){
+    custom_timestamp = custom_timestamp[0].toUpperCase() + custom_timestamp.slice(1);
+  }
+  
+  return custom_timestamp; // + " - ["+time_diff_in_seconds.toString()+":"+time_diff_in_days+"]";
+}
+
+function update_timer(interval){
+  if(!interval){interval = 1000;}
+  current_datetime = $('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);
+}
+
+function humanize_format(sec_diff, day_diff){
+  return day_diff == 0 && (
+          sec_diff < 60 && "just now" ||
+          sec_diff < 120 && "1 minute ago" ||
+          sec_diff < 3600 && Math.floor( sec_diff / 60 ) + " minutes ago" ||
+          sec_diff < 7200 && "about 1 hour ago" ||
+          sec_diff < 86400 && "about " + Math.floor( sec_diff / 3600 ) + " hours ago") ||
+          day_diff == 1 && "Yesterday" ||
+          day_diff < 7 && day_diff + " days ago" ||
+          day_diff < 31 && Math.ceil( day_diff / 7 ) + " week ago";
+}
+
+function custom_format(timestamp, format){
+  func = new DateFmt();
+  datetime = format;
+  datetime = datetime.replace("%Y", func.format(timestamp,"%Y"));
+  datetime = datetime.replace("%m", func.format(timestamp,"%m"));
+  datetime = datetime.replace("%d", func.format(timestamp,"%d"));
+  datetime = datetime.replace("%b", func.format(timestamp,"%b"));
+  datetime = datetime.replace("%B", func.format(timestamp,"%B"));
+  datetime = datetime.replace("%H", func.format(timestamp,"%H"));
+  datetime = datetime.replace("%M", func.format(timestamp,"%M"));
+  datetime = datetime.replace("%S", func.format(timestamp,"%S"));
+  datetime = datetime.replace("%A", func.format(timestamp,"%A"));
+  datetime = datetime.replace("%a", func.format(timestamp,"%a"));
+  if(timestamp.getHours() > 12){
+    datetime = datetime.replace("%l", lead_zero(timestamp.getHours() - 12, " "));
+    datetime = datetime.replace("%P", "pm");
+    datetime = datetime.replace("%p", "PM");
+  }else{
+    datetime = datetime.replace("%l", lead_zero(timestamp.getHours(), " "));
+    datetime = datetime.replace("%P", "am");
+    datetime = datetime.replace("%p", "AM");
+  }
+  return datetime;
+}
+
+function lead_zero(val, extra){
+  str_val = parseInt(val);
+  if(!extra){extra = "0";}
+  if(str_val < 10){
+    return extra + str_val;
+  }else{
+    return str_val;
+  }
+}
+
+function DateFmt() {
+  this.dateMarkers = { 
+     d:['getDate',function(v) { return ("0"+v).substr(-2,2)}], 
+     m:['getMonth',function(v) { return ("0"+(v+1)).substr(-2,2)}],
+     b:['getMonth',function(v) {
+         var mthNames = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"];
+         return mthNames[v];
+         }],
+     B:['getMonth',function(v) {
+         var mthNames = ["January","February","March","April","May","June","July","August","September","October","Novovember","December"];
+         return mthNames[v];
+         }],
+     a:['getDay',function(v) {
+         var dayNames = ["Sun","Mon","Tue","Wed","Thu","Fri","Sat"];
+         return dayNames[v];
+         }],
+     A:['getDay',function(v) {
+         var dayNames = ["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"];
+         return dayNames[v];
+         }],
+     Y:['getFullYear'],
+     H:['getHours',function(v) { return ("0"+v).substr(-2,2)}],
+     M:['getMinutes',function(v) { return ("0"+v).substr(-2,2)}],
+     S:['getSeconds',function(v) { return ("0"+v).substr(-2,2)}],
+     i:['toISOString',null]
+  };
+
+  this.format = function(date, fmt) {
+    var dateMarkers = this.dateMarkers
+    var dateTxt = fmt.replace(/%(.)/g, function(m, p){
+    var rv = date[(dateMarkers[p])[0]]()
+    if ( dateMarkers[p][1] != null ) rv = dateMarkers[p][1](rv)
+    return rv
+  });
+
+  return dateTxt
+  }
+}

metadata

@@ -1,21 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: wiser_date
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.8
 platform: ruby
 authors:
 - Kenneth John Balgos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-25 00:00:00.000000000 Z
-dependencies: []
+date: 2012-05-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Display dates in the coolest format.
 email: kennethjohnbalgos@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- vendor/assets/javascripts/jquery.wiser_date.js
 - lib/wiser_date/view_helpers.rb
 - lib/wiser_date/railtie.rb
 - lib/wiser_date.rb