rack-oauth2-server 2.0.0.beta5 → 2.0.0.beta6

data/Rakefile

@@ -2,8 +2,17 @@ require "rake/testtask"
 
 spec = Gem::Specification.load(Dir["*.gemspec"].first)
 
+desc "Run this in development mode when updating the CoffeeScript file"
+task :coffee do
+  sh "coffee -w -o lib/rack/oauth2/admin/js/ lib/rack/oauth2/admin/js/application.coffee"
+end
+
+task :compile do
+  sh "coffee -c -l -o lib/rack/oauth2/admin/js/ lib/rack/oauth2/admin/js/application.coffee"
+end
+
 desc "Build the Gem"
-task :build do
+task :build=>:compile do
   sh "gem build #{spec.name}.gemspec"
 end
 
@@ -37,6 +46,7 @@ Rake::TestTask.new do |task|
     task.ruby_opts << "-I."
 end
 
+RUBIES = %w{1.8.7 1.9.2}
 namespace :test do
   task :all=>["test:sinatra", "test:rails2", "test:rails3"]
   desc "Run all tests against Sinatra"
@@ -55,6 +65,15 @@ namespace :test do
   task :rails3 do
     sh "env BUNDLE_GEMFILE=Rails3 bundle exec rake test FRAMEWORK=rails"
   end
+
+  desc "Test in all supported RVMs"
+  task :rubies do
+    RUBIES.each do |ruby|
+      puts "*** #{ruby} ***"
+      sh "rvm #{ruby}@rack-oauth2-server rake test:all"
+      puts
+    end
+  end
 end
 task :default=>"test:all"
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta5
+2.0.0.beta6

data/bin/oauth2-server

@@ -57,6 +57,7 @@ when "setup"
   fail "No database. Use the --db option to tell us which database to use" unless Server.database
   puts "Where would you mount the Web console? This is a URL that must end with /admin,"
   puts "for example, http://example.com/oauth/admin"
+  print ": "
   uri = URI.parse($stdin.gets)
   begin
     uri.normalize!
@@ -143,6 +144,26 @@ when "practice"
     map("/oauth/admin") { run Server::Admin.new }
   end.start
 
+when "migrate"
+
+  fail "No database. Use the --db option to tell us which database to use" unless Server.database
+  puts "Set all clients to this scope (can change later by calling Client.register):"
+  print ": "
+  scope = $stdin.gets.strip.split
+  puts "Updating Client scope to #{scope.join(", ")}"
+  Server::Client.collection.find({ :scope=>{ :$exists=>false } }, :fields=>[]).each do |client|
+    update = { :scope=>scope,
+      :tokens_granted=>Server::AccessToken.count(:client_id=>client["_id"]),
+      :tokens_revoked=>Server::AccessToken.count(:client_id=>client["_id"], :revoked=>true) }
+    Server::Client.collection.update({ :_id=>client["_id"] }, { :$set=>update })
+  end
+  [Server::AccessToken, Server::AccessGrant, Server::AuthRequest].each do |mod|
+    puts "Updating #{mod.name} scope from string to array"
+    mod.collection.find({ :scope=>{ :$type=>2 } }, :fields=>[]).each do |token|
+      scope = token["scope"].split
+      mod.collection.update({ :_id=>token["_id"] }, { :$set=>{ :scope=>scope } })
+    end
+  end
 else
 
   print <<-TEXT
@@ -151,6 +172,7 @@ Version #{Server::VERSION}
 
 Commands:
   list            Lists all active clients
+  migrate         Run this when migrating from 1.x to 2.x
   practice        Runs a dummy OAuth 2.0 server, use this to test your OAuth 2.0 client
   register        Register a new client application
   setup           Create new admin account and help you setup the OAuth Web console

data/lib/rack/oauth2/admin/css/screen.css

@@ -114,7 +114,7 @@ button:active { background: -webkit-gradient(linear, 0% 0%, 0% 100%, from(rgba(0
   height: 32px;
   vertical-align: bottom;
 }
-#header .signout {
+#header .signout, #header .signin {
   color: #C8E9F3;
   float: right;
   font-size: 11pt;
@@ -161,7 +161,7 @@ table td {
 table tr:hover td {
   background: #ddf;
 }
-table td.created, table td.revoke {
+table td.created, table td.revoke, table td.accessed {
   width: 6em;
 }
 table tr.revoked td, table tr.revoked a {
@@ -209,6 +209,7 @@ table.tokens td.token {
   width: 36em;
 }
 table.tokens td.scope {
+  float: none;
 }
 
 .pagination {

data/lib/rack/oauth2/admin/js/application.coffee

@@ -0,0 +1,219 @@
+Sammy "#main", (app) ->
+  @.use Sammy.Tmpl
+  @.use Sammy.Session
+  @.use Sammy.Title
+  @.setTitle "OAuth Admin - "
+  @.use Sammy.OAuth2
+  @.authorize = "#{document.location.pathname}/authorize"
+
+  # All XHR errors we don't catch explicitly handled here
+  $(document).ajaxError (evt, xhr)->
+    if xhr.status == 401
+      app.loseAccessToken()
+    app.trigger("notice", xhr.responseText)
+  # Show something when XHR request in progress
+  $(document).ajaxStart (evt)-> $("#throbber").show()
+  $(document).ajaxStop (evt)-> $("#throbber").hide()
+
+  @.requireOAuth()
+  # Show error message if access denied
+  @bind "oauth.denied", (evt, error)-> 
+    app.partial("admin/views/no_access.tmpl", { error: error.message })
+  # Show signout link if authenticated, hide if not
+  @.bind "oauth.connected", ()->
+    $("#header .signin").hide()
+    $("#header .signout").show()
+  @.bind "oauth.disconnected", ()->
+    $("#header .signin").show()
+    $("#header .signout").hide()
+
+  api = "#{document.location.pathname}/api"
+  # Takes array of string with scope names (typically request parameters) and
+  # normalizes them into an array of scope names.
+  mergeScope = (scope) ->
+    if $.isArray(scope)
+      scope = scope.join(" ")
+    scope = (scope || "").trim().split(/\s+/)
+    if scope.length == 1 && scope[0] == "" then [] else _.uniq(scope).sort()
+  commonScope = null
+  # Run callback with list of common scopes. First time, make an API call to
+  # retrieve that list and cache is in memory, since it rarely changes.
+  withCommonScope = (cb) ->
+    if commonScope
+      cb commonScope
+    else
+      $.getJSON "#{api}/clients", (json)-> cb(commonScope = json.scope)
+
+  # View all clients
+  @.get "#/", (context)->
+    context.title "All Clients"
+    $.getJSON "#{api}/clients", (clients)->
+      commonScope = clients.scope
+      context.partial("admin/views/clients.tmpl", { clients: clients.list, tokens: clients.tokens }).
+        load(clients.history).
+        then( (json)-> $("#fig").chart(json.data, "granted") )
+
+  # View single client
+  @.get "#/client/:id", (context)->
+    $.getJSON "#{api}/client/#{context.params.id}", (client)->
+      context.title client.displayName
+      client.notes = (client.notes || "").split(/\n\n/)
+      context.partial("admin/views/client.tmpl", client).
+        load(client.history).then((json)-> $("#fig").chart(json.data, "granted"))
+  # With pagination
+  @.get "#/client/:id/page/:page", (context)->
+    $.getJSON "#{api}/client/#{context.params.id}?page=#{context.params.page}", (client)->
+      context.title client.displayName
+      client.notes = client.notes.split(/\n\n/)
+      context.partial("admin/views/client.tmpl", client).
+        load(client.history).then((json)-> $("#fig").chart(json.data, "granted"))
+
+  # Revoke token
+  @.post "#/token/:id/revoke", (context)->
+    $.post "#{api}/token/#{context.params.id}/revoke", ()->
+      context.redirect "#/"
+
+  # Edit client
+  @.get "#/client/:id/edit", (context)->
+    $.getJSON "#{api}/client/#{context.params.id}", (client)->
+      context.title client.displayName
+      withCommonScope (scope)->
+        client.common = scope
+        context.partial "admin/views/edit.tmpl", client
+  @.put "#/client/:id", (context)->
+    context.params.scope = mergeScope(context.params.scope)
+    $.ajax
+      type: "put"
+      url: "#{api}/client/#{context.params.id}"
+      data:
+        displayName: context.params.displayName
+        link: context.params.link
+        imageUrl: context.params.imageUrl
+        redirectUri: context.params.redirectUri
+        notes: context.params.notes
+        scope: context.params.scope
+      success: (client)->
+        context.redirect "#/client/#{context.params.id}"
+        app.trigger "notice", "Saved your changes"
+      error: (xhr)->
+        withCommonScope (scope)->
+          context.params.common = scope
+          context.partial "admin/views/edit.tmpl", context.params
+
+  # Delete client
+  @.del "#/client/:id", (context)->
+    $.ajax
+      type: "post"
+      url: "#{api}/client/#{context.params.id}"
+      data: { _method: "delete" }
+      success: ()-> context.redirect("#/")
+
+  # Revoke client
+  @.post "#/client/:id/revoke", (context)->
+    $.post "#{api}/client/#{context.params.id}/revoke", ()->
+      context.redirect "#/"
+
+  # Create new client
+  @.get "#/new", (context)->
+    context.title "Add New Client"
+    withCommonScope (scope)->
+      context.partial "admin/views/edit.tmpl", { common: scope, scope: scope }
+  @.post "#/clients", (context)->
+    context.title "Add New Client"
+    context.params.scope = mergeScope(context.params.scope)
+    $.ajax
+      type: "post"
+      url: "#{api}/clients"
+      data:
+        displayName: context.params.displayName
+        link: context.params.link
+        imageUrl: context.params.imageUrl
+        redirectUri: context.params.redirectUri
+        notes: context.params.notes
+        scope: context.params.scope
+      success: (client)->
+        app.trigger "notice", "Added new client application #{client.displayName}"
+        context.redirect "#/"
+      error: (xhr)->
+        withCommonScope (scope)->
+          context.params.common = scope
+          context.partial "admin/views/edit.tmpl", context.params
+
+  # Signout
+  @.get "#/signout", (context)->
+    context.loseAccessToken()
+    context.redirect "#/"
+
+  # Links that use forms for various methods (i.e. post, delete).
+  $("a[data-method]").live "click", (evt)->
+    evt.preventDefault
+    link = $(this)
+    if link.attr("data-confirm") && !confirm(link.attr("data-confirm"))
+      return false
+    method = link.attr("data-method") || "get"
+    form = $("<form>", { style: "display:none", method: method, action: link.attr("href") })
+    if method != "get" && method != "post"
+      form.append($("<input name='_method' type='hidden' value='#{method}'>"))
+    app.$element().append form
+    form.submit()
+    false
+
+  # Error/notice at top of screen
+  noticeTimeout = null
+  app.bind "notice", (evt, message)->
+    if !message || message.trim() == ""
+      message = "Got an error, but don't know why"
+    $("#notice").text(message).fadeIn("fast")
+    if noticeTimeout
+      clearTimeout noticeTimeout
+      noticeTimeout = null
+    noticeTimeout = setTimeout ()->
+      noticeTimeout = null
+      $("#notice").fadeOut("slow")
+    , 5000
+  $("#notice").live "click", ()-> $(@).fadeOut("slow")
+
+
+# Adds thousands separator to integer or float (can also pass formatted string
+# if you care about precision).
+$.thousands = (integer)->
+  integer.toString().replace(/^(\d+?)((\d{3})+)$/g, (x,a,b)-> a + b.replace(/(\d{3})/g, ",$1") ).
+    replace(/\.((\d{3})+)(\d+)$/g, (x,a,b,c)-> "." + a.replace(/(\d{3})/g, "$1,") + c )
+
+# Returns abbr element with short form of the date (e.g. "Nov 21 2010"). THe
+# title attribute provides the full date/time instance, so you can see more
+# details by hovering over the element.
+$.shortdate = (integer)->
+  date = new Date(integer * 1000)
+  "<abbr title='#{date.toLocaleString()}'>#{date.toDateString().substring(0,10)}</abbr>"
+
+# Draw chart inside the specified container element.
+# data -- Array of objects, each one having a timestamp (ts) and some value we
+# want to chart
+# series -- Name of the value we want to chart
+$.fn.chart = (data, series)->
+  canvas = $(@)
+  w = canvas.width()
+  h = canvas.height()
+  today = Math.floor(new Date() / 86400000)
+  x = pv.Scale.linear(today - 60, today + 1).range(0, w)
+  max = pv.max(data, (d)-> d[series])
+  y = pv.Scale.linear(0, pv.max([max, 10])).range(0, h)
+
+  # The root panel.
+  vis = new pv.Panel().width(w).height(h).bottom(20).left(20).right(10).top(5)
+  # X-axis ticks.
+  vis.add(pv.Rule).data(x.ticks()).left(x).strokeStyle("#fff").
+    add(pv.Rule).bottom(-5).height(5).strokeStyle("#000").
+    anchor("bottom").add(pv.Label).text((d)-> pv.Format.date("%b %d").format(new Date(d * 86400000)) )
+  # Y-axis ticks.
+  vis.add(pv.Rule).data(y.ticks(3)).bottom(y).strokeStyle((d)-> if d then "#ddd" else "#000").
+    anchor("left").add(pv.Label).text(y.tickFormat)
+  # If we only have one data point, can't show a line so show dot instead
+  if data.length == 1
+    vis.add(pv.Dot).data(data).
+      left((d)-> x(new Date(d.ts)) ).bottom((d)-> y(d[series])).radius(3).lineWidth(2)
+  else
+    vis.add(pv.Line).data(data).interpolate("linear").
+      left((d)-> x(new Date(d.ts)) ).bottom((d)-> y(d[series]) ).lineWidth(3)
+  vis.canvas(canvas[0]).render()

data/lib/rack/oauth2/admin/js/application.js

@@ -1,210 +1,259 @@
-Sammy("#main", function(app) {
-  this.use(Sammy.Tmpl);
-  this.use(Sammy.Session);
-  this.use(Sammy.Title);
-  this.setTitle("OAuth Admin - ");
-  this.use(Sammy.OAuth2);
-  this.authorize = document.location.pathname + "/authorize";
-
-  $(document).ajaxError(function(evt, xhr) { app.trigger("notice", xhr.responseText); });
-  $(document).ajaxStart(function(evt) { $("#throbber").show(); });
-  $(document).ajaxStop(function(evt) { $("#throbber").hide(); });
-
-  // For all request (except callback), if we don't have an OAuth access token,
-  this.requireOAuth();
-  this.bind("oauth.denied", function(evt, error) {
-    this.partial("admin/views/no_access.tmpl", { error: error.message });
-  });
-  this.bind("oauth.connected", function() { $("#header .signout").show() });
-  this.bind("oauth.disconnected", function() { $("#header .signout").hide() });
-
-  var api = document.location.pathname + "/api";
-  // Takes array of string with scope names (typically request parameters) and
-  // normalizes them into an array of scope names.
-  function mergeScope(scope) {
-    if ($.isArray(scope))
-      scope = scope.join(" ");
-    scope = (scope || "").trim().split(/\s+/);
-    return scope.length == 1 && scope[0] == "" ? [] : _.uniq(scope).sort();
-  }
-  var commonScope;
-  function withCommonScope(cb) {
-    if (commonScope)
-      cb(commonScope)
-    else
-      $.getJSON(api + "/clients", function(json) { cb(commonScope = json.scope); })
-  }
-
-  // View all clients
-  this.get("#/", function(context) {
-    context.title("All Clients");
-    $.getJSON(api + "/clients", function(clients) {
-      commonScope = clients.scope;
-      context.partial("admin/views/clients.tmpl", { clients: clients.list, tokens: clients.tokens }).
-        load(clients.history).then(function(json) { $("#fig").chart(json.data, "granted"); });
+(function() {
+  Sammy("#main", function(app) {
+    var api, commonScope, mergeScope, noticeTimeout, withCommonScope;
+    this.use(Sammy.Tmpl);
+    this.use(Sammy.Session);
+    this.use(Sammy.Title);
+    this.setTitle("OAuth Admin - ");
+    this.use(Sammy.OAuth2);
+    this.authorize = ("" + (document.location.pathname) + "/authorize");
+    $(document).ajaxError(function(evt, xhr) {
+      if (xhr.status === 401) {
+        app.loseAccessToken();
+      }
+      return app.trigger("notice", xhr.responseText);
     });
-  });
-  // View single client
-  this.get("#/client/:id", function(context) {
-    $.getJSON(api + "/client/" + context.params.id, function(client) {
-      context.title(client.displayName);
-      client.notes = (client.notes || "").split(/\n\n/);
-      context.partial("admin/views/client.tmpl", client).
-        load(client.history).then(function(json) { $("#fig").chart(json.data, "granted"); });
+    $(document).ajaxStart(function(evt) {
+      return $("#throbber").show();
     });
-  });
-  this.get("#/client/:id/page/:page", function(context) {
-    $.getJSON(api + "/client/" + context.params.id + "?page=" + context.params.page, function(client) {
-      context.title(client.displayName);
-      client.notes = client.notes.split(/\n\n/);
-      context.partial("admin/views/client.tmpl", client).
-        load(client.history).then(function(json) { $("#fig").chart(json.data, "granted"); });
+    $(document).ajaxStop(function(evt) {
+      return $("#throbber").hide();
     });
-  });
-  // Edit client
-  this.get("#/client/:id/edit", function(context) {
-    $.getJSON(api + "/client/" + context.params.id, function(client) {
-      context.title(client.displayName);
-      withCommonScope(function(scope) {
-        client.common = scope;
-        context.partial("admin/views/edit.tmpl", client)
-      })
-    })
-  });
-  this.put("#/client/:id", function(context) {
-    context.params.scope = mergeScope(context.params.scope);
-    $.ajax({ type: "put", url: api + "/client/" + context.params.id,
-      data: {
-        displayName: context.params.displayName,
-        link: context.params.link,
-        imageUrl: context.params.imageUrl,
-        redirectUri: context.params.redirectUri,
-        notes: context.params.notes,
-        scope: context.params.scope
-      },
-      success: function(client) {
-        context.redirect("#/client/" + context.params.id);
-        app.trigger("notice", "Saved your changes");
-      },
-      error: function(xhr) {
-        withCommonScope(function(scope) {
-          context.params.common = scope;
-          context.partial("admin/views/edit.tmpl", context.params);
-        });
+    this.requireOAuth();
+    this.bind("oauth.denied", function(evt, error) {
+      return app.partial("admin/views/no_access.tmpl", {
+        error: error.message
+      });
+    });
+    this.bind("oauth.connected", function() {
+      $("#header .signin").hide();
+      return $("#header .signout").show();
+    });
+    this.bind("oauth.disconnected", function() {
+      $("#header .signin").show();
+      return $("#header .signout").hide();
+    });
+    api = ("" + (document.location.pathname) + "/api");
+    mergeScope = function(scope) {
+      if ($.isArray(scope)) {
+        scope = scope.join(" ");
       }
-    })
-  });
-  // Delete/revoke client
-  this.del("#/client/:id", function(context) {
-    $.ajax({ type: "post", url: api + "/client/" + context.params.id,
-      data: { _method: "delete" },
-      success: function() { context.redirect("#/") }
+      scope = (scope || "").trim().split(/\s+/);
+      return scope.length === 1 && scope[0] === "" ? [] : _.uniq(scope).sort();
+    };
+    commonScope = null;
+    withCommonScope = function(cb) {
+      return commonScope ? cb(commonScope) : $.getJSON("" + (api) + "/clients", function(json) {
+        return cb(commonScope = json.scope);
+      });
+    };
+    this.get("#/", function(context) {
+      context.title("All Clients");
+      return $.getJSON("" + (api) + "/clients", function(clients) {
+        commonScope = clients.scope;
+        return context.partial("admin/views/clients.tmpl", {
+          clients: clients.list,
+          tokens: clients.tokens
+        }).load(clients.history).then(function(json) {
+          return $("#fig").chart(json.data, "granted");
+        });
+      });
     });
-  });
-  this.post("#/client/:id/revoke", function(context) {
-    $.post(api + "/client/" + context.params.id + "/revoke", function() { app.refresh() });
-  });
-  // Revoke token
-  this.post("#/token/:id/revoke", function(context) {
-    $.post(api + "/token/" + context.params.id + "/revoke", function() { app.refresh() });
-  });
-  // Create new client
-  this.get("#/new", function(context) {
-    context.title("Add New Client");
-    withCommonScope(function(scope) {
-      context.partial("admin/views/edit.tmpl", { common: scope, scope: scope });
+    this.get("#/client/:id", function(context) {
+      return $.getJSON("" + (api) + "/client/" + (context.params.id), function(client) {
+        context.title(client.displayName);
+        client.notes = (client.notes || "").split(/\n\n/);
+        return context.partial("admin/views/client.tmpl", client).load(client.history).then(function(json) {
+          return $("#fig").chart(json.data, "granted");
+        });
+      });
     });
-  });
-  this.post("#/clients", function(context) {
-    context.title("Add New Client");
-    context.params.scope = mergeScope(context.params.scope);
-    $.ajax({ type: "post", url: api + "/clients",
-      data: {
-        displayName: context.params.displayName,
-        link: context.params.link,
-        imageUrl: context.params.imageUrl,
-        redirectUri: context.params.redirectUri,
-        notes: context.params.notes,
-        scope: context.params.scope
-      },
-      success: function(client) {
-        app.trigger("notice", "Added new client application " + client.displayName);
-        context.redirect("#/");
-      },
-      error: function(xhr) {
-        withCommonScope(function(scope) {
-          context.params.common = scope;
-          context.partial("admin/views/edit.tmpl", context.params);
+    this.get("#/client/:id/page/:page", function(context) {
+      return $.getJSON("" + (api) + "/client/" + (context.params.id) + "?page=" + (context.params.page), function(client) {
+        context.title(client.displayName);
+        client.notes = client.notes.split(/\n\n/);
+        return context.partial("admin/views/client.tmpl", client).load(client.history).then(function(json) {
+          return $("#fig").chart(json.data, "granted");
+        });
+      });
+    });
+    this.post("#/token/:id/revoke", function(context) {
+      return $.post("" + (api) + "/token/" + (context.params.id) + "/revoke", function() {
+        return context.redirect("#/");
+      });
+    });
+    this.get("#/client/:id/edit", function(context) {
+      return $.getJSON("" + (api) + "/client/" + (context.params.id), function(client) {
+        context.title(client.displayName);
+        return withCommonScope(function(scope) {
+          client.common = scope;
+          return context.partial("admin/views/edit.tmpl", client);
         });
+      });
+    });
+    this.put("#/client/:id", function(context) {
+      context.params.scope = mergeScope(context.params.scope);
+      return $.ajax({
+        type: "put",
+        url: ("" + (api) + "/client/" + (context.params.id)),
+        data: {
+          displayName: context.params.displayName,
+          link: context.params.link,
+          imageUrl: context.params.imageUrl,
+          redirectUri: context.params.redirectUri,
+          notes: context.params.notes,
+          scope: context.params.scope
+        },
+        success: function(client) {
+          context.redirect("#/client/" + (context.params.id));
+          return app.trigger("notice", "Saved your changes");
+        },
+        error: function(xhr) {
+          return withCommonScope(function(scope) {
+            context.params.common = scope;
+            return context.partial("admin/views/edit.tmpl", context.params);
+          });
+        }
+      });
+    });
+    this.del("#/client/:id", function(context) {
+      return $.ajax({
+        type: "post",
+        url: ("" + (api) + "/client/" + (context.params.id)),
+        data: {
+          _method: "delete"
+        },
+        success: function() {
+          return context.redirect("#/");
+        }
+      });
+    });
+    this.post("#/client/:id/revoke", function(context) {
+      return $.post("" + (api) + "/client/" + (context.params.id) + "/revoke", function() {
+        return context.redirect("#/");
+      });
+    });
+    this.get("#/new", function(context) {
+      context.title("Add New Client");
+      return withCommonScope(function(scope) {
+        return context.partial("admin/views/edit.tmpl", {
+          common: scope,
+          scope: scope
+        });
+      });
+    });
+    this.post("#/clients", function(context) {
+      context.title("Add New Client");
+      context.params.scope = mergeScope(context.params.scope);
+      return $.ajax({
+        type: "post",
+        url: ("" + (api) + "/clients"),
+        data: {
+          displayName: context.params.displayName,
+          link: context.params.link,
+          imageUrl: context.params.imageUrl,
+          redirectUri: context.params.redirectUri,
+          notes: context.params.notes,
+          scope: context.params.scope
+        },
+        success: function(client) {
+          app.trigger("notice", "Added new client application " + (client.displayName));
+          return context.redirect("#/");
+        },
+        error: function(xhr) {
+          return withCommonScope(function(scope) {
+            context.params.common = scope;
+            return context.partial("admin/views/edit.tmpl", context.params);
+          });
+        }
+      });
+    });
+    this.get("#/signout", function(context) {
+      context.loseAccessToken();
+      return context.redirect("#/");
+    });
+    $("a[data-method]").live("click", function(evt) {
+      var form, link, method;
+      evt.preventDefault;
+      link = $(this);
+      if (link.attr("data-confirm") && !confirm(link.attr("data-confirm"))) {
+        return false;
       }
+      method = link.attr("data-method") || "get";
+      form = $("<form>", {
+        style: "display:none",
+        method: method,
+        action: link.attr("href")
+      });
+      if (method !== "get" && method !== "post") {
+        form.append($("<input name='_method' type='hidden' value='" + (method) + "'>"));
+      }
+      app.$element().append(form);
+      form.submit();
+      return false;
+    });
+    noticeTimeout = null;
+    app.bind("notice", function(evt, message) {
+      if (!message || message.trim() === "") {
+        message = "Got an error, but don't know why";
+      }
+      $("#notice").text(message).fadeIn("fast");
+      if (noticeTimeout) {
+        clearTimeout(noticeTimeout);
+        noticeTimeout = null;
+      }
+      return (noticeTimeout = setTimeout(function() {
+        noticeTimeout = null;
+        return $("#notice").fadeOut("slow");
+      }, 5000));
+    });
+    return $("#notice").live("click", function() {
+      return $(this).fadeOut("slow");
     });
   });
-  // Signout
-  this.get("#/signout", function(context) {
-    context.loseAccessToken();
-    context.redirect("#/");
-  });
-
-  // Links that use forms for various methods (i.e. post, delete).
-  $("a[data-method]").live("click", function(evt) {
-    evt.preventDefault();
-    var link = $(this);
-    if (link.attr("data-confirm") && !confirm(link.attr("data-confirm")))
-      return fasle;
-    var method = link.attr("data-method") || "get",
-        form = $("<form>", { style: "display:none", method: method, action: link.attr("href") });
-    app.$element().append(form);
-    form.submit();
-  });
-  // Error/notice at top of screen
-  var noticeTimeout;
-  app.bind("notice", function(evt, message) {
-    if (!message || message.trim() == "")
-      message = "Got an error, but don't know why";
-    $("#notice").text(message).fadeIn("fast");
-    if (noticeTimeout) {
-      cancelTimeout(noticeTimeout);
-      noticeTimeout = null;
+  $.thousands = function(integer) {
+    return integer.toString().replace(/^(\d+?)((\d{3})+)$/g, function(x, a, b) {
+      return a + b.replace(/(\d{3})/g, ",$1");
+    }).replace(/\.((\d{3})+)(\d+)$/g, function(x, a, b, c) {
+      return "." + a.replace(/(\d{3})/g, "$1,") + c;
+    });
+  };
+  $.shortdate = function(integer) {
+    var date;
+    date = new Date(integer * 1000);
+    return "<abbr title='" + (date.toLocaleString()) + "'>" + (date.toDateString().substring(0, 10)) + "</abbr>";
+  };
+  $.fn.chart = function(data, series) {
+    var canvas, h, max, today, vis, w, x, y;
+    canvas = $(this);
+    w = canvas.width();
+    h = canvas.height();
+    today = Math.floor(new Date() / 86400000);
+    x = pv.Scale.linear(today - 60, today + 1).range(0, w);
+    max = pv.max(data, function(d) {
+      return d[series];
+    });
+    y = pv.Scale.linear(0, pv.max([max, 10])).range(0, h);
+    vis = new pv.Panel().width(w).height(h).bottom(20).left(20).right(10).top(5);
+    vis.add(pv.Rule).data(x.ticks()).left(x).strokeStyle("#fff").add(pv.Rule).bottom(-5).height(5).strokeStyle("#000").anchor("bottom").add(pv.Label).text(function(d) {
+      return pv.Format.date("%b %d").format(new Date(d * 86400000));
+    });
+    vis.add(pv.Rule).data(y.ticks(3)).bottom(y).strokeStyle(function(d) {
+      return d ? "#ddd" : "#000";
+    }).anchor("left").add(pv.Label).text(y.tickFormat);
+    if (data.length === 1) {
+      vis.add(pv.Dot).data(data).left(function(d) {
+        return x(new Date(d.ts));
+      }).bottom(function(d) {
+        return y(d[series]);
+      }).radius(3).lineWidth(2);
+    } else {
+      vis.add(pv.Line).data(data).interpolate("linear").left(function(d) {
+        return x(new Date(d.ts));
+      }).bottom(function(d) {
+        return y(d[series]);
+      }).lineWidth(3);
     }
-    noticeTimeout = setTimeout(function() {
-      noticeTimeout = null;
-      $("#notice").fadeOut("slow");
-    }, 5000);
-  });
-  $("#notice").live("click", function() { $(this).fadeOut("slow") });
-});
-
-// Adds thousands separator to integer or float (can also pass formatted string
-// if you care about precision).
-$.thousands = function(integer) {
-  return integer.toString().replace(/^(\d+?)((\d{3})+)$/g, function(x,a,b) { return a + b.replace(/(\d{3})/g, ",$1") })
-    .replace(/\.((\d{3})+)(\d+)$/g, function(x,a,b,c) { return "." + a.replace(/(\d{3})/g, "$1,") + c })
-}
-
-$.shortdate = function(integer) {
-  var date = new Date(integer * 1000);
-  return "<span title='" + date.toLocaleString() + "'>" + date.toISOString().substring(0,10) + "</span>";
-}
-
-$.fn.chart = function(data, series) {
-  /* Sizing and scales. */
-  var canvas = $(this),
-      w = canvas.width(), h = canvas.height(),
-      today = new Date() / 86400000,
-      x = pv.Scale.linear(today - 60, today).range(0, w),
-      max = pv.max(data, function(d) { return d[series] }),
-      y = pv.Scale.linear(0, pv.max([max, 10])).range(0, h);
-
-  /* The root panel. */
-  var vis = new pv.Panel().width(w).height(h).bottom(20).left(20).right(10).top(5);
-  /* X-axis ticks. */
-  vis.add(pv.Rule).data(x.ticks()).visible(function(d) { return d > 0 }).left(x).strokeStyle("#fff")
-    .add(pv.Rule).bottom(-5).height(5).strokeStyle("#000")
-    .anchor("bottom").add(pv.Label).text(function(d) { return pv.Format.date("%b %d").format(new Date(d * 86400000)) }); 
-  /* Y-axis ticks. */
-  vis.add(pv.Rule).data(y.ticks(3)).bottom(y).strokeStyle(function(d) { return d ? "#fff" : "#000" })
-    .anchor("left").add(pv.Label).text(y.tickFormat);
-  /* The line. */
-  vis.add(pv.Line).data(data).interpolate("linear").left(function(d) { return x(new Date(d.ts)) }).bottom(function(d) { return y(d[series]) }).lineWidth(3);
-  vis.canvas(canvas[0]).render();
-}
+    return vis.canvas(canvas[0]).render();
+  };
+}).call(this);