punchcard 0.2.1 → 0.2.2

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/public/js/app.js

@@ -1,9 +1,19 @@
 // Update status for all people
 function update_status() {
+  var in_office = [];
   $.getJSON('/status.json', function(json) {
     $.each(json, function(index, person) {
       update_person(person);
     });
+    $('abbr.timeago').timeago();
+    
+    title = 'Punchcard.'
+    if ($('.gravatar.pending').size() > 0) {
+      title = 'In office: ' + $('.gravatar.pending').map(function() {
+        return $(this).attr('title');
+      }).get().join(', ');
+    }
+    $('head title').html(title);
   });
 };
 

data/lib/public/js/jquery.timeago.js

@@ -0,0 +1,141 @@
+/*
+ * timeago: a jQuery plugin, version: 0.9.2 (2010-09-14)
+ * @requires jQuery v1.2.3 or later
+ *
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Licensed under the MIT:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * Copyright (c) 2008-2010, Ryan McGeary (ryanonjavascript -[at]- mcgeary [*dot*] org)
+ */
+(function($) {
+  $.timeago = function(timestamp) {
+    if (timestamp instanceof Date) return inWords(timestamp);
+    else if (typeof timestamp == "string") return inWords($.timeago.parse(timestamp));
+    else return inWords($.timeago.datetime(timestamp));
+  };
+  var $t = $.timeago;
+
+  $.extend($.timeago, {
+    settings: {
+      refreshMillis: 60000,
+      allowFuture: false,
+      strings: {
+        prefixAgo: null,
+        prefixFromNow: null,
+        suffixAgo: "ago",
+        suffixFromNow: "from now",
+        seconds: "less than a minute",
+        minute: "about a minute",
+        minutes: "%d minutes",
+        hour: "about an hour",
+        hours: "about %d hours",
+        day: "a day",
+        days: "%d days",
+        month: "about a month",
+        months: "%d months",
+        year: "about a year",
+        years: "%d years",
+        numbers: []
+      }
+    },
+    inWords: function(distanceMillis) {
+      var $l = this.settings.strings;
+      var prefix = $l.prefixAgo;
+      var suffix = $l.suffixAgo;
+      if (this.settings.allowFuture) {
+        if (distanceMillis < 0) {
+          prefix = $l.prefixFromNow;
+          suffix = $l.suffixFromNow;
+        }
+        distanceMillis = Math.abs(distanceMillis);
+      }
+
+      var seconds = distanceMillis / 1000;
+      var minutes = seconds / 60;
+      var hours = minutes / 60;
+      var days = hours / 24;
+      var years = days / 365;
+
+      function substitute(stringOrFunction, number) {
+        var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+        var value = ($l.numbers && $l.numbers[number]) || number;
+        return string.replace(/%d/i, value);
+      }
+
+      var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+        seconds < 90 && substitute($l.minute, 1) ||
+        minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+        minutes < 90 && substitute($l.hour, 1) ||
+        hours < 24 && substitute($l.hours, Math.round(hours)) ||
+        hours < 48 && substitute($l.day, 1) ||
+        days < 30 && substitute($l.days, Math.floor(days)) ||
+        days < 60 && substitute($l.month, 1) ||
+        days < 365 && substitute($l.months, Math.floor(days / 30)) ||
+        years < 2 && substitute($l.year, 1) ||
+        substitute($l.years, Math.floor(years));
+
+      return $.trim([prefix, words, suffix].join(" "));
+    },
+    parse: function(iso8601) {
+      var s = $.trim(iso8601);
+      s = s.replace(/\.\d\d\d+/,""); // remove milliseconds
+      s = s.replace(/-/,"/").replace(/-/,"/");
+      s = s.replace(/T/," ").replace(/Z/," UTC");
+      s = s.replace(/([\+-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+      return new Date(s);
+    },
+    datetime: function(elem) {
+      // jQuery's `is()` doesn't play well with HTML5 in IE
+      var isTime = $(elem).get(0).tagName.toLowerCase() == "time"; // $(elem).is("time");
+      var iso8601 = isTime ? $(elem).attr("datetime") : $(elem).attr("title");
+      return $t.parse(iso8601);
+    }
+  });
+
+  $.fn.timeago = function() {
+    var self = this;
+    self.each(refresh);
+
+    var $s = $t.settings;
+    if ($s.refreshMillis > 0) {
+      setInterval(function() { self.each(refresh); }, $s.refreshMillis);
+    }
+    return self;
+  };
+
+  function refresh() {
+    var data = prepareData(this);
+    if (!isNaN(data.datetime)) {
+      $(this).text(inWords(data.datetime));
+    }
+    return this;
+  }
+
+  function prepareData(element) {
+    element = $(element);
+    if (!element.data("timeago")) {
+      element.data("timeago", { datetime: $t.datetime(element) });
+      var text = $.trim(element.text());
+      if (text.length > 0) element.attr("title", text);
+    }
+    return element.data("timeago");
+  }
+
+  function inWords(date) {
+    return $t.inWords(distance(date));
+  }
+
+  function distance(date) {
+    return (new Date().getTime() - date.getTime());
+  }
+
+  // fix for IE6 suckage
+  document.createElement("abbr");
+  document.createElement("time");
+})(jQuery);

data/lib/punchcard/person.rb

@@ -33,7 +33,7 @@ class Person < ActiveRecord::Base
       :email => email, 
       :gravatar_url => gravatar_url(:size => 80), 
       :pending => !!pending?, 
-      :checked_in_at => pending?.try(:checked_in_at)
+      :checked_in_at => pending? ? pending?.checked_in_at.getutc.iso8601 : nil
     }
   end
   

data/lib/punchcard.rb

@@ -10,7 +10,8 @@ ActiveRecord::Base.logger = Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = Logger::WARN
 ActiveRecord::Migration.verbose = false
 
-if ENV['DATABASE_URL']
+# Heroku-deployed apps will have this
+if File.exist?('config/database.yml')
   dbconfig = YAML.load(File.read('config/database.yml'))
   ActiveRecord::Base.establish_connection dbconfig[ENV['RACK_ENV']]
 else

data/lib/views/layout.haml

@@ -4,6 +4,7 @@
     %title Punchcard
     %script{:src => "http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js"}
     %script{:src => 'http://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.min.js'}
+    %script{:src => "/js/jquery.timeago.js"}
     %script{:src => "/js/app.js"}
     :plain
       <link rel="stylesheet" href="/css/blueprint.css" type="text/css" media="screen" />
@@ -14,7 +15,9 @@
         <li id="${_id}">
           <img src="${gravatar_url}" title="${name}" class="gravatar {{if pending == true}}pending{{/if}} ${pending}"/>
           <div class="person">${name}</div>
-          <div class="checked_in_at">{{if checked_in_at}}Checked in at ${checked_in_at}{{/if}}&nbsp;</div>
+          {{if checked_in_at}}
+            <abbr class="timeago" title="${checked_in_at}"></abbr>
+          {{/if}}
         </li>
       </script>
       

data/lib/views/screen.sass

@@ -8,11 +8,12 @@ $yellow: #fc0
 #main
   width: 800px
   margin-top: 30px
-  padding: 30px 20px
+  padding: 20px 20px 10px 20px
   margin-left: auto
   margin-right: auto
-  background: #eadab6 url('/cardbg.png') repeat-x
-  -moz-box-shadow: 3px 3px 4px #d2bd8e
+  background: #eadab6
+  border-top: 10px solid #f8bba6 
+  -moz-box-shadow: 3px 3px 0px #d2bd8e
 
 .clear
   clear: both
@@ -34,9 +35,12 @@ $yellow: #fc0
       .gravatar
         margin-bottom: 0
         
-    .checked_in_at
+    .timeago
       color: #888
       font-size: 16px
+      text-decoraion: none
+      border: none
+      display: block
       position: relative
       top: -10px
     

data/punchcard.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{punchcard}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Christoph Olszowka"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
      "lib/public/cardbg.png",
      "lib/public/css/blueprint.css",
      "lib/public/js/app.js",
+     "lib/public/js/jquery.timeago.js",
      "lib/punchcard.rb",
      "lib/punchcard/person.rb",
      "lib/punchcard/punch.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Christoph Olszowka
@@ -170,6 +170,7 @@ files:
 - lib/public/cardbg.png
 - lib/public/css/blueprint.css
 - lib/public/js/app.js
+- lib/public/js/jquery.timeago.js
 - lib/punchcard.rb
 - lib/punchcard/person.rb
 - lib/punchcard/punch.rb