delayed_job_web 1.0.1 → 1.0.2

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/delayed_job_web.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{delayed_job_web}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Erick Schmitt"]
@@ -32,6 +32,7 @@ Gem::Specification.new do |s|
     "lib/delayed_job_web/application/public/images/poll.png",
     "lib/delayed_job_web/application/public/javascripts/application.js",
     "lib/delayed_job_web/application/public/javascripts/jquery-1.7.1.min.js",
+    "lib/delayed_job_web/application/public/javascripts/jquery.relatize_date.js",
     "lib/delayed_job_web/application/public/stylesheets/reset.css",
     "lib/delayed_job_web/application/public/stylesheets/style.css",
     "lib/delayed_job_web/application/views/enqueued.haml",

data/lib/delayed_job_web/application/public/javascripts/application.js

@@ -1,6 +1,35 @@
 $(function() {
   var poll_interval = 3;
 
+  var relatizer = function(){
+    var dt = $(this).text(), relatized = $.relatizeDate(this)
+    if ($(this).parents("a").length > 0 || $(this).is("a")) {
+      $(this).relatizeDate()
+      if (!$(this).attr('title')) {
+        $(this).attr('title', dt)
+      }
+    } else {
+      $(this)
+      .text('')
+      .append( $('<a href="#" class="toggle_format" title="' + dt + '" />')
+              .append('<span class="date_time">' + dt +
+                      '</span><span class="relatized_time">' +
+                        relatized + '</span>') )
+    }
+  };
+
+  $('.time').each(relatizer);
+
+  $('.time a.toggle_format .date_time').hide();
+
+  var format_toggler = function(){
+    $('.time a.toggle_format span').toggle();
+    $(this).attr('title', $('span:hidden',this).text());
+    return false;
+  };
+
+  $('.time a.toggle_format').click(format_toggler);
+
   $('ul li.job').hover(function() {
     $(this).addClass('hover');
   }, function() {

data/lib/delayed_job_web/application/public/javascripts/jquery.relatize_date.js

@@ -0,0 +1,94 @@
+// All credit goes to Rick Olson.
+(function($) {
+  $.fn.relatizeDate = function() {
+    return $(this).each(function() {
+      $(this).text( $.relatizeDate(this) )
+    })
+  }
+
+  $.relatizeDate = function(element) {
+    return $.relatizeDate.timeAgoInWords( new Date($(element).text()) )
+  }
+
+  // shortcut
+  $r = $.relatizeDate
+
+  $.extend($.relatizeDate, {
+    shortDays: [ 'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat' ],
+    days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+    shortMonths: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ],
+    months: [ 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December' ],
+
+    /**
+     * Given a formatted string, replace the necessary items and return.
+     * Example: Time.now().strftime("%B %d, %Y") => February 11, 2008
+     * @param {String} format The formatted string used to format the results
+     */
+    strftime: function(date, format) {
+      var day = date.getDay(), month = date.getMonth();
+      var hours = date.getHours(), minutes = date.getMinutes();
+
+      var pad = function(num) { 
+        var string = num.toString(10);
+        return new Array((2 - string.length) + 1).join('0') + string
+      };
+
+      return format.replace(/\%([aAbBcdHImMpSwyY])/g, function(part) {
+        switch(part[1]) {
+          case 'a': return $r.shortDays[day]; break;
+          case 'A': return $r.days[day]; break;
+          case 'b': return $r.shortMonths[month]; break;
+          case 'B': return $r.months[month]; break;
+          case 'c': return date.toString(); break;
+          case 'd': return pad(date.getDate()); break;
+          case 'H': return pad(hours); break;
+          case 'I': return pad((hours + 12) % 12); break;
+          case 'm': return pad(month + 1); break;
+          case 'M': return pad(minutes); break;
+          case 'p': return hours > 12 ? 'PM' : 'AM'; break;
+          case 'S': return pad(date.getSeconds()); break;
+          case 'w': return day; break;
+          case 'y': return pad(date.getFullYear() % 100); break;
+          case 'Y': return date.getFullYear().toString(); break;
+        }
+      })
+    },
+  
+    timeAgoInWords: function(targetDate, includeTime) {
+      return $r.distanceOfTimeInWords(targetDate, new Date(), includeTime);
+    },
+  
+    /**
+     * Return the distance of time in words between two Date's
+     * Example: '5 days ago', 'about an hour ago'
+     * @param {Date} fromTime The start date to use in the calculation
+     * @param {Date} toTime The end date to use in the calculation
+     * @param {Boolean} Include the time in the output
+     */
+    distanceOfTimeInWords: function(fromTime, toTime, includeTime) {
+      var delta = parseInt((toTime.getTime() - fromTime.getTime()) / 1000);
+      if (delta < 60) {
+          return 'less than a minute ago';
+      } else if (delta < 120) {
+          return 'about a minute ago';
+      } else if (delta < (45*60)) {
+          return (parseInt(delta / 60)).toString() + ' minutes ago';
+      } else if (delta < (120*60)) {
+          return 'about an hour ago';
+      } else if (delta < (24*60*60)) {
+          return 'about ' + (parseInt(delta / 3600)).toString() + ' hours ago';
+      } else if (delta < (48*60*60)) {
+          return '1 day ago';
+      } else {
+        var days = (parseInt(delta / 86400)).toString();
+        if (days > 5) {
+          var fmt  = '%B %d, %Y'
+          if (includeTime) fmt += ' %I:%M %p'
+          return $r.strftime(fromTime, fmt);
+        } else {
+          return days + " days ago"
+        }
+      }
+    }
+  })
+})(jQuery);

data/lib/delayed_job_web/application/views/enqueued.haml

@@ -8,4 +8,3 @@
   - @jobs.each do |job|
     = partial :job, {:job => job}
 = partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page
-= poll

data/lib/delayed_job_web/application/views/failed.haml

@@ -12,4 +12,3 @@
   - @jobs.each do |job|
     = partial :job, {:job => job}
 = partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page
-= poll

data/lib/delayed_job_web/application/views/job.haml

@@ -23,15 +23,15 @@
           = job.last_error
     - if job.run_at
       %dt Run At
-      %dd= job.run_at
+      %dd.time= job.run_at
     - if job.locked_at
       %dt Locked At
-      %dd= job.locked_at
-    - if job.locked_at
+      %dd.time= job.locked_at
+    - if job.locked_by
       %dt Locked By
       %dd= job.locked_by
-    -if job.failed_at
+    - if job.failed_at
       %dt Failed At
-      %dd= job.failed_at
+      %dd.time= job.failed_at
     %dt Created At
-    %dd= job.created_at
+    %dd.time= job.created_at

data/lib/delayed_job_web/application/views/layout.haml

@@ -19,4 +19,5 @@
         &
         %a{:href => 'https://github.com/ejschmitt/delayed_job_web'} delayed_job_web
     %script{:type => "text/javascript", :src  => u("javascripts/jquery-1.7.1.min.js")}
+    %script{:type => "text/javascript", :src  => u("javascripts/jquery.relatize_date.js")}
     %script{:type => "text/javascript", :src  => u("javascripts/application.js")}

data/lib/delayed_job_web/application/views/pending.haml

@@ -10,4 +10,3 @@
   - @jobs.each do |job|
     = partial :job, {:job => job}
 = partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page
-= poll

data/lib/delayed_job_web/application/views/working.haml

@@ -7,4 +7,3 @@
   - @jobs.each do |job|
     = partial :job, {:job => job}
 = partial :next_more, :start => start, :total_size => @all_jobs.count, :per_page => per_page
-= poll

metadata

@@ -2,7 +2,7 @@
 name: delayed_job_web
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Erick Schmitt
@@ -135,6 +135,7 @@ files:
 - lib/delayed_job_web/application/public/images/poll.png
 - lib/delayed_job_web/application/public/javascripts/application.js
 - lib/delayed_job_web/application/public/javascripts/jquery-1.7.1.min.js
+- lib/delayed_job_web/application/public/javascripts/jquery.relatize_date.js
 - lib/delayed_job_web/application/public/stylesheets/reset.css
 - lib/delayed_job_web/application/public/stylesheets/style.css
 - lib/delayed_job_web/application/views/enqueued.haml
@@ -163,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -672185974482577684
+      hash: -1684287865726047204
       segments: 
       - 0
       version: "0"