murlsh 0.9.0 → 0.10.0

data/README.textile

@@ -8,7 +8,7 @@ Site for sharing and archiving links.
 * embeds Flash mp3 player for mp3 urls
 * looks good on iPhone
 * PubSubHubbub notification
-* plug-in interface
+* plugin interface
 * rack interface
 * Gravatar support
 
@@ -22,6 +22,8 @@ h1. Installation
 
 h2. Phusion Passenger
 
+DESTINATION_DIRECTORY is the web directory to install the murlsh site to.
+
 <pre>
 <code>
 gem sources -a http://gemcutter.org/
@@ -33,6 +35,36 @@ rake init
 </code>
 </pre>
 
+h1. Updating
+
+If you are using the gem and it gets updated to a new version you should run
+the murlsh command again from your web directory to update plugins, javascript
+and css. It will prompt before overwriting anything in case you have made
+modifications.
+
+h1. Plugins
+
+Classes in the plugins directory can be used to change behavior at certain
+points. Each class that extends Murlsh::Plugin and sets an instance variable
+called @hook will be called for that hook. Each plugin has a run() method that
+accepts arguments and returns something. These methods will be called in the
+order of their class names sorted lexically. Some hooks pass the output of their
+run() method to the next plugin for that hook so that the data can be passed
+through a chain of methods that each do something to it.
+
+A lot of the standard behavior is implemented as plugins. See the plugins
+directory for examples.
+
+Plugin hooks
+
+|Hook|Description|run() arguments|Returns|
+|add_pre|called before a new url is saved|url, config hash|undefined|
+|add_post|called after a new url is saved|config hash|undefined|
+|hostrec|post process the domain that is shown after links|domain, url, title|text to display|
+|html_parse|parse HTML using something like Hpricot or Nokogiri|parseable|parsed HTML, only first plugin is run (cannot be chained)|
+|time|convert the time of a post into a string for display|time|time display text|
+|via|convert a via url into a string for display|via url|via url display text|
+
 h1. PubSubHubbub
 
 Murlsh can notify "PubSubHubbub":http://code.google.com/p/pubsubhubbub/ hubs
@@ -52,11 +84,4 @@ subscribe_url is what gets put in the feed as link rel="hub"
 
 This will make updates to your feed show up in Google Reader instantly.
 
-h1. Updating
-
-If you are using the gem and it gets updated to a new version you should run
-the murlsh command again from your web directory to update plugins, javascript
-and css. It will prompt before overwriting anything in case you have made
-modifications.
-
 Questions and comments: "matthewm@boedicker.org":mailto:matthewm@boedicker.org

data/Rakefile

@@ -154,23 +154,47 @@ namespace :user do
 
 end
 
-desc "Validate XHTML."
-task :validate do
-  net_http = Net::HTTP.new('validator.w3.org', 80)
-  #net_http.set_debug_output(STDOUT)
-
-  check_url = config.fetch('root_url')
-
-  print "validating #{check_url} : "
+# Validate a document with the W3C validation service.
+def validate(check_url, options={})
+  opts = {
+    :validator_host => 'validator.w3.org',
+    :validator_port => 80,
+    :validator_path =>
+      "/check?uri=#{CGI::escape(check_url)}&charset=(detect+automatically)&doctype=Inline&group=0",
+  }.merge(options)
+
+  net_http = Net::HTTP.new(opts[:validator_host], opts[:validator_port])
+  # net_http.set_debug_output(STDOUT)
 
   net_http.start do |http|
-    resp = http.request_head(
-      "/check?uri=#{CGI::escape(check_url)}&charset=(detect+automatically)&doctype=Inline&group=0")
-    result = resp['X-W3C-Validator-Status']
-    errors = resp['X-W3C-Validator-Errors']
-    warnings = resp['X-W3C-Validator-Warnings']
+    resp = http.request_head(opts[:validator_path])
+    result = {
+      :response => resp
+    }
+    if Net::HTTPSuccess === resp
+      result.merge!(
+        :status =>  resp['X-W3C-Validator-Status'],
+        :errors => resp['X-W3C-Validator-Errors'],
+        :warnings => resp['X-W3C-Validator-Warnings']
+      )
+    end
+    result
+  end
 
-    puts "#{result} (#{errors} errors, #{warnings} warnings)"
+end
+
+namespace :validate do
+
+  desc 'Validate XHTML.'
+  task :xhtml do
+    check_url = config['root_url']
+    print "validating #{check_url} : "
+    result = validate(check_url)
+    if Net::HTTPSuccess === result[:response]
+      puts "#{result[:status]} (#{result[:errors]} errors, #{result[:warnings]} warnings)"
+    else
+      puts result[:response]
+    end
   end
 
 end
@@ -294,6 +318,9 @@ begin
     gemspec.authors = ['Matthew M. Boedicker']
     gemspec.executables = %w{murlsh}
 
+    # gemspec.signing_key = '/home/mmb/src/keys/gem-private_key.pem'
+    # gemspec.cert_chain = %w{/home/mmb/src/keys/gem-public_cert.pem}
+
     %w{
       activerecord 2.3.4
       bcrypt-ruby 2.1.2
@@ -301,6 +328,7 @@ begin
       hpricot 0.8.1
       htmlentities 4.2.0
       json 1.2.3
+      push-notify 0.1.0
       rack 1.0.0
       rack-cache 0.5.2
       rack-throttle 0.3.0
@@ -310,5 +338,5 @@ begin
 
   end
 rescue LoadError
-  puts 'Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com'
+  puts "Jeweler not available. Install it with: gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/config.yaml

@@ -1,7 +1,11 @@
 --- 
+apple_icon_hosts: []
+
 auth_file: murlsh_users
 cache_entitystore: file:tmp/cache/rack/body
 cache_metastore: file:tmp/cache/rack/meta
+config_js: 
+- apple_icon_hosts
 css_files: 
 - css/jquery.jgrowl.css
 - css/screen.css

data/lib/murlsh/config_server.rb

@@ -0,0 +1,32 @@
+%w{
+digest/sha1
+
+json
+rack
+}.each { |m| require m }
+
+module Murlsh
+
+  # Serve a JSON subset of the configuration.
+  #
+  # Will include all config keys contained in the config key named config_js.
+  class ConfigServer
+
+    def initialize(config)
+      @config_json =
+        config.reject { |k,v| !config.fetch('config_js', []).
+          include?(k) }.to_json
+
+      @headers = {
+        'Content-Type' => 'application/json',
+        'ETag' => "\"#{Digest::SHA1.hexdigest(@config_json)}\"",
+        'Last-Modified' => Time.now.httpdate
+      }
+    end
+
+    # Serve a JSON subset of the configuration.
+    def get(req); Rack::Response.new(@config_json, 200, @headers); end
+
+  end
+
+end

data/lib/murlsh/dispatch.rb

@@ -20,6 +20,7 @@ module Murlsh
       db = ActiveRecord::Base.connection.instance_variable_get(:@connection)
 
       url_server = Murlsh::UrlServer.new(@config, db)
+      config_server = Murlsh::ConfigServer.new(@config)
       flickr_server = Murlsh::FlickrServer.new(@config)
       twitter_server = Murlsh::TwitterServer.new
 
@@ -28,8 +29,9 @@ module Murlsh
       @dispatch = [
         [%r{^GET #{root_path}(url)?$}, url_server.method(:get)],
         [%r{^POST #{root_path}(url)?$}, url_server.method(:post)],
-        [%r{^GET /flickr$}, flickr_server.method(:get)],
-        [%r{^GET /twitter/.+$}, twitter_server.method(:get)],
+        [%r{^GET #{root_path}config$}, config_server.method(:get)],
+        [%r{^GET #{root_path}flickr$}, flickr_server.method(:get)],
+        [%r{^GET #{root_path}twitter/.+$}, twitter_server.method(:get)],
       ]
     end
 

data/murlsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murlsh}
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew M. Boedicker"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-08-05}
   s.default_executable = %q{murlsh}
   s.description = %q{url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding}
   s.email = %q{matthewm@boedicker.org}
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "config.yaml",
      "lib/murlsh.rb",
      "lib/murlsh/auth.rb",
+     "lib/murlsh/config_server.rb",
      "lib/murlsh/dispatch.rb",
      "lib/murlsh/doc.rb",
      "lib/murlsh/etag_add_encoding.rb",
@@ -63,6 +64,7 @@ Gem::Specification.new do |s|
      "plugins/via_50_domain.rb",
      "public/css/jquery.jgrowl.css",
      "public/css/screen.css",
+     "public/js/comments.json",
      "public/js/jquery-1.4.2.min.js",
      "public/js/jquery.jgrowl_compressed.js",
      "public/js/js.js",
@@ -107,6 +109,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<hpricot>, [">= 0.8.1"])
       s.add_runtime_dependency(%q<htmlentities>, [">= 4.2.0"])
       s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
+      s.add_runtime_dependency(%q<push-notify>, [">= 0.1.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<rack-cache>, [">= 0.5.2"])
       s.add_runtime_dependency(%q<rack-throttle>, [">= 0.3.0"])
@@ -119,6 +122,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<hpricot>, [">= 0.8.1"])
       s.add_dependency(%q<htmlentities>, [">= 4.2.0"])
       s.add_dependency(%q<json>, [">= 1.2.3"])
+      s.add_dependency(%q<push-notify>, [">= 0.1.0"])
       s.add_dependency(%q<rack>, [">= 1.0.0"])
       s.add_dependency(%q<rack-cache>, [">= 0.5.2"])
       s.add_dependency(%q<rack-throttle>, [">= 0.3.0"])
@@ -132,6 +136,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<hpricot>, [">= 0.8.1"])
     s.add_dependency(%q<htmlentities>, [">= 4.2.0"])
     s.add_dependency(%q<json>, [">= 1.2.3"])
+    s.add_dependency(%q<push-notify>, [">= 0.1.0"])
     s.add_dependency(%q<rack>, [">= 1.0.0"])
     s.add_dependency(%q<rack-cache>, [">= 0.5.2"])
     s.add_dependency(%q<rack-throttle>, [">= 0.3.0"])

data/plugins/add_post_60_notify_hubs.rb

@@ -13,23 +13,14 @@ module Murlsh
       hubs = config.fetch('pubsubhubbub_hubs', [])
 
       unless hubs.empty?
-        require 'eventmachine'
-        require 'pubsubhubbub'
+        require 'push-notify'
 
         feed_url = URI.join(config['root_url'], config['feed_file'])
-
-        hubs.each do |hub|
-          EventMachine.run {
-            pub = EventMachine::PubSubHubbub.new(hub['publish_url']).publish(
-              feed_url)
-
-            pub.callback { EventMachine.stop  }
-            pub.errback { EventMachine.stop }
-          }
+        begin
+          PushNotify::Content.new(feed_url).tell(*hubs.map { |h| h['publish_url'] })
+        rescue Exception
         end
-
       end
-
     end
 
   end

data/public/css/screen.css

@@ -12,6 +12,10 @@ img {
   width : 600px;
 }
 
+ul.comments {
+  list-style-type : none;
+}
+
 li {
   clear : both;
   float : left;
@@ -49,9 +53,6 @@ div.name {
 img.thumb, li object {
   float : left;
   margin-right : 10px;
-  border : 1px solid #808080;
-  -moz-border-radius : 5px;
-  -webkit-border-radius : 5px;
 }
 
 img.thumb.twitter {
@@ -59,6 +60,11 @@ img.thumb.twitter {
   width : 48px;
 }
 
+img.thumb.apple {
+  height : 48px;
+  width : 48px;
+}
+
 span.host {
   color : #808080;
   font-family : monospace;
@@ -88,7 +94,7 @@ fieldset#add label {
 }
 
 a.feed {
-  background-color : #fb9e3a;
+  background : #fb9e3a;
   border-top : 1px solid #fba141;
   border-right : 1px solid #bc4d04;
   border-bottom : 1px solid #bc4d04;
@@ -129,7 +135,7 @@ div.jGrowl div.jGrowl-closer {
     width : 290px;
   }
 
-  #urls li {
+  #urls>li {
     overflow : hidden;
     border-bottom : 1px solid #ccc;
   }

data/public/js/comments.json

@@ -0,0 +1,12 @@
+{
+    "http://url/being/commented/on": [
+        {
+            "authorAvatar": "http://url/of/your/avatar/image",
+            "authorName": "yourname",
+            "authorUrl": "http://url/of/your/site",
+            "comment": "your comment",
+            "createdTime": 1275005075,
+            "updatedTime": 1275005075
+        },
+    ],
+}

data/public/js/js.js

@@ -1,347 +1,434 @@
-/*global $, window*/
+/*global $, document, navigator, window*/
 
 "use strict";
 
-var Murlsh = {};
-
-Murlsh.img = function(src, text) {
-    text = text || '';
-    return $('<img />', {
-        src : src,
-        alt : text,
-        title : text
-    });
-};
+var Murlsh = function (config, $, navigator, window) {
+    var my = {},
+        hrefRes = {
+            flickr :
+                /^http:\/\/(?:www\.)?flickr\.com\/photos\/[@\w\-]+?\/([\d]+)/i,
+            imageshack :
+                /^(http:\/\/img\d+\.imageshack\.us\/img\d+\/\d+\/\w+\.)(jpe?g|gif|png)$/i,
+            imgur :
+                /^(http:\/\/(?:i\.)?imgur\.com\/[a-z\d]+)(\.(?:jpe?g|gif|png))$/i,
+            mp3 :
+                /\.mp3$/i,
+            s3 :
+                /^(http:\/\/static\.mmb\.s3\.amazonaws\.com\/[\w\-]+\.)(jpe?g|gif|pdf|png)$/i,
+            twitter :
+                /^https?:\/\/twitter\.com\/\w+\/status(?:es)?\/(\d+)$/i,
+            vimeo :
+                /^http:\/\/(?:www\.)?vimeo\.com\/(\d+)$/i,
+            youtube :
+                /^http:\/\/(?:(?:www|uk)\.)?youtube\.com\/watch\?v=([\w\-]+)(?:&|$)/i
+        },
+        hostRe = /^http:\/\/([a-z\d\.\-]+(?::\d+)?)\//i;
+
+    function autoLink(s) {
+        // turn urls into links
+        var result = s.replace(
+            /https?:\/\/(?:[0-9a-z](?:[0-9a-z\-]{0,61}[0-9a-z])?\.)+[a-z]+\/[0-9a-z$_.+!*'(),\/?#\-]*/gi,
+            '<a href="$&">$&</a>');
+
+        return result;
+    }
 
-Murlsh.makeFit = function(e, maxWidth, maxHeight) {
-    var height = e.height();
-    var scale;
-    var width = e.width();
+    function escapeXml(s) {
+        return s.replace(/&/g, '&amp;');
+    }
 
-    if (width > maxWidth || height > maxHeight) {
-        scale = Math.min(maxWidth / width, maxHeight / height);
-        e.width(Math.round(width * scale));
-        e.height(Math.round(height * scale));
+    function img(src, text) {
+        text = text || '';
+        return $('<img />', {
+            src : src,
+            alt : text,
+            title : text
+        });
     }
-};
 
-Murlsh.closerAdd = function(x, header) {
-    var html = (typeof x === 'object') ? $('<div />').append(x).html() : x;
-
-    $.jGrowl(html, {
-        closeTemplate : 'X',
-        glue : 'before',
-        header : header,
-        sticky : true,
-        beforeOpen : function(e) {
-            e.find('.message img').load(function() {
-                Murlsh.makeFit($(this),
-                    Math.round($(window).width() / 2),
-                    Math.round($(window).height() - 100));
-            });
+    function makeFit(e, maxWidth, maxHeight) {
+        var height = e.height(),
+            scale,
+            width = e.width();
+
+        if (width > maxWidth || height > maxHeight) {
+            scale = Math.min(maxWidth / width, maxHeight / height);
+            e.width(Math.round(width * scale));
+            e.height(Math.round(height * scale));
         }
-    });
-};
+    }
 
-Murlsh.escapeXml = function(s) {
-    return s.replace(/&/g, '&amp;');
-};
+    function objectTag(data, height, width, params) {
+        // this does not use jQuery to build tags because building object
+        // tags is broken in IE
+        var result = '<object data="' + escapeXml(data) +
+            '" height="' + height +
+            '" type="application/x-shockwave-flash" width="' + width + '">';
 
-Murlsh.objectTag = function(data, height, width, params) {
-    // this does not use jQuery to build tags because building object
-    // tags is broken in IE
-    var result = '<object data="' + Murlsh.escapeXml(data) +
-        '" height="' + height +
-        '" type="application/x-shockwave-flash" width="' + width + '">';
+        $.each(params, function (i, v) {
+            result += '<param name="' + v.name + '" value="' +
+                escapeXml(v.value) + '" />';
+        });
 
-    $.each(params, function(i, v) {
-        result += '<param name="' + v.name + '" value="' +
-            Murlsh.escapeXml(v.value) + '" />';
-    });
+        result += '</object>';
 
-    result += '</object>';
+        return result;
+    }
 
-    return result;
-};
+    function appleThumb(host) {
+        return img('http://' + host + '/apple-touch-icon.png', '').addClass(
+            'thumb apple');
+    }
 
-Murlsh.flickrThumb = function(d) {
-    var base;
-    var owner;
-    var photo = d.photo;
-    var zoom;
+    function closerAdd(x, header) {
+        var html = (typeof x === 'object') ? $('<div />').append(x).html() : x;
+
+        $.jGrowl(html, {
+            closeTemplate : 'X',
+            glue : 'before',
+            header : header,
+            sticky : true,
+            beforeOpen : function (e) {
+                e.find('.message img').load(function () {
+                    makeFit($(this), Math.round($(window).width() / 2),
+                        Math.round($(window).height() - 100));
+                });
+            }
+        });
+    }
+
+    function flickrClick() {
+        closerAdd(img($(this).data('zoom')));
+    }
 
-    if (d.stat === 'ok') {
-        base = 'http://farm' + photo.farm + '.static.flickr.com/' +
-            photo.server + '/' + photo.id + '_';
-        zoom = base + photo.secret + '_m.jpg';
+    function flickrThumb(d) {
+        var base,
+            owner,
+            photo = d.photo,
+            zoom;
 
-        if (photo.originalsecret) {
-            zoom = base + photo.originalsecret + '_o.' + photo.originalformat;
+        if (d.stat === 'ok') {
+            base = 'http://farm' + photo.farm + '.static.flickr.com/' +
+                photo.server + '/' + photo.id + '_';
+            zoom = base + photo.secret + '_m.jpg';
+
+            if (photo.originalsecret) {
+                zoom = base + photo.originalsecret + '_o.' +
+                    photo.originalformat;
+            }
+
+            owner = photo.owner;
+            return img(base + photo.secret + '_s.jpg', photo.title._content +
+                (owner && owner.username ? ' by ' + owner.username : '')
+                ).addClass('thumb flickr').data('zoom', zoom);
         }
+    }
 
-        owner = photo.owner;
-        return Murlsh.img(base + photo.secret + '_s.jpg',
-            photo.title._content +
-            (owner && owner.username ? ' by ' + owner.username : '')
-            ).addClass('thumb flickr').data('zoom', zoom);
+    function imgClick() {
+        closerAdd(img($(this).data('href')));
     }
-};
 
-Murlsh.flickrClick = function() {
-    Murlsh.closerAdd(Murlsh.img($(this).data('zoom')));
-};
+    function imgThumb() {
+        var i,
+            lastIndex,
+            urlParts = [];
 
-Murlsh.imgThumb = function() {
-    var lastIndex;
-    var urlParts = [];
+        for (i = 0; i < arguments.length; i += 1) {
+            urlParts.push(arguments[i]);
+        }
 
-    for (var i = 0; i < arguments.length; i += 1) {
-        urlParts.push(arguments[i]);
-    }
+        lastIndex = urlParts.length - 1;
 
-    lastIndex = urlParts.length - 1;
+        // if pdf the thumbnail will be .png
+        if (urlParts[lastIndex].match(/^pdf$/i)) {
+            urlParts.splice(lastIndex, 1, 'png');
+        }
 
-    // if pdf the thumbnail will be .png
-    if (urlParts[lastIndex].match(/^pdf$/i)) {
-        urlParts.splice(lastIndex, 1, 'png');
+        return img(urlParts.join('')).addClass('thumb');
     }
 
-    return Murlsh.img(urlParts.join('')).addClass('thumb');
-};
+    function thumbInsert(img, clickFunction, a) {
+        if (img) {
+            if (my.isIphone()) {
+                a.prepend(img);
+            } else {
+                if (clickFunction) {
+                    img.click(clickFunction);
+                }
+                a.before(img);
+            }
+        }
+    }
 
-Murlsh.imgClick = function() {
-    Murlsh.closerAdd(Murlsh.img($(this).data('href')));
-};
+    function twitterAddLinks(s) {
+        // turn urls into links and Twitter usernames into links to Twitter
+        var result = autoLink(s);
 
-Murlsh.twitterThumb = function(d) {
-    return Murlsh.img(d.user.profile_image_url).addClass('thumb twitter');
-}
+        result = result.replace(
+            /(^|[\s,(])@([0-9a-z_]+)($|[\s,.)])/gi,
+            '$1<a href="http://twitter.com/$2">@$2</a>$3');
 
-Murlsh.vimeoThumb = function(d) {
-    return Murlsh.img(d.thumbnail_medium, d.title).addClass('thumb vimeo');
-};
+        return result;
+    }
 
-Murlsh.vimeoClick = function() {
-    Murlsh.closerAdd($(this).data('embedHtml'));
-};
+    function twitterThumb(d) {
+        return img(d.user.profile_image_url).addClass('thumb twitter');
+    }
 
-Murlsh.youtubeThumb = function(id) {
-    return Murlsh.img('http://img.youtube.com/vi/' + id + '/default.jpg',
-        'click to watch').addClass('thumb youtube').data('id', id);
-};
+    function vimeoClick() {
+        closerAdd($(this).data('embedHtml'));
+    }
 
-Murlsh.youtubeClick = function() {
-    var movie = 'http://www.youtube.com/v/' + $(this).data('id') + '?' +
-        $.param({
-            fs : 1,
-            hd : 1,
-            hl : 'en',
-            iv_load_policy : 3,
-            showinfo : 0,
-            showsearch : 0
-        });
+    function vimeoThumb(d) {
+        return img(d.thumbnail_medium, d.title).addClass('thumb vimeo');
+    }
 
-    Murlsh.closerAdd(Murlsh.objectTag(movie, 505, 640,
-      [{ name : 'movie', value : movie }]));
-};
+    function youtubeClick() {
+        var movie = 'http://www.youtube.com/v/' + $(this).data('id') + '?' +
+            $.param({
+                fs : 1,
+                hd : 1,
+                hl : 'en',
+                iv_load_policy : 3,
+                showinfo : 0,
+                showsearch : 0
+            });
 
-Murlsh.thumbInsert = function(img, clickFunction, a) {
-    if (img) {
-        if (Murlsh.isIphone()) {
-            a.prepend(img);
-        } else {
-            if (clickFunction) {
-                img.click(clickFunction);
-            }
-            a.before(img);
-        }
+        closerAdd(objectTag(movie, 505, 640, [{
+            name : 'movie',
+            value : movie
+        }]));
     }
-};
 
-Murlsh.isIphone = function() {
-    return navigator.userAgent.match(/i(phone|pod)/i);
-};
-
-Murlsh.hrefRes = {
-    flickr :
-        /^http:\/\/(?:www\.)?flickr\.com\/photos\/[@\w\-]+?\/([\d]+)/i,
-    imageshack :
-        /^(http:\/\/img\d+\.imageshack\.us\/img\d+\/\d+\/\w+\.)(jpe?g|gif|png)$/i,
-    imgur :
-        /^(http:\/\/(?:i\.)?imgur\.com\/[a-z\d]+)(\.(?:jpe?g|gif|png))$/i,
-    mp3 :
-        /\.mp3$/i,
-    s3 :
-        /^(http:\/\/static\.mmb\.s3\.amazonaws\.com\/[\w\-]+\.)(jpe?g|gif|pdf|png)$/i,
-    twitter :
-        /^https?:\/\/twitter\.com\/\w+\/status(?:es)?\/(\d+)$/i,
-    vimeo :
-        /^http:\/\/(?:www\.)?vimeo\.com\/(\d+)$/i,
-    youtube :
-        /^http:\/\/(?:(?:www|uk)\.)?youtube\.com\/watch\?v=([\w\-]+)(?:&|$)/i
-};
+    function youtubeThumb(id) {
+        return img('http://img.youtube.com/vi/' + id + '/default.jpg',
+            'click to watch').addClass('thumb youtube').data('id', id);
+    }
 
-Murlsh.addExtra = function() {
-    var href = $(this).attr('href');
-    var match = {};
-    var swf = 'swf/player_mp3_mini.swf';
-    var thumb;
+    my.addComments = function (link, comments) {
+        var avatar,
+            comment,
+            commentElement,
+            i,
+            ul = $('<ul />').addClass('comments').appendTo(link.parent());
+
+        for (i = 0; i < comments.length; i += 1) {
+            comment = comments[i];
+            commentElement = $('<li />');
+            if (comment.authorAvatar.length > 0) {
+                avatar = img(comment.authorAvatar).appendTo(commentElement);
+                if (comment.authorUrl.length > 0) {
+                    avatar.wrapAll($('<a />').attr('href', comment.authorUrl));
+                }
+                commentElement.append(' ');
+            }
+            commentElement
+                .append($('<span />').append(comment.authorName).addClass(
+                    'comment-name'))
+                .append(' : ')
+                .append($('<span />').append(autoLink(comment.comment)).
+                    addClass('comment-comment'))
+                .appendTo(ul);
+        }
+    };
 
-    $.each(Murlsh.hrefRes, function(x, re) {
-        return !(match[x] = re.exec(href));
-    });
+    my.addExtra = function () {
+        var host,
+            hostMatch,
+            href = $(this).attr('href'),
+            match = {},
+            swf = 'swf/player_mp3_mini.swf',
+            thumb;
 
-    if (match.flickr) {
-        $.ajax({
-            // url : 'http://api.flickr.com/services/rest/',
-            url : 'flickr',
-            data : {
-                format : 'json',
-                method : 'flickr.photos.getinfo',
-                photo_id : match.flickr[1]
-            },
-            dataType : 'jsonp',
-            jsonp : 'jsoncallback',
-            success : function(d) {
-                Murlsh.thumbInsert(Murlsh.flickrThumb(d),
-                    Murlsh.flickrClick, $(this));
-            },
-            context : $(this),
-            jsonpCallback : 'flickrCallback' + match.flickr[1]
+        $.each(hrefRes, function (x, re) {
+            return !(match[x] = re.exec(href));
         });
-    } else if (match.imageshack) {
-        Murlsh.thumbInsert(
-            Murlsh.imgThumb(match.imageshack[1], 'th.', match.imageshack[2]).data(
-                'href', match.imageshack[0]),
-            Murlsh.imgClick, $(this).html('imageshack.us'));
-    } else if (match.imgur) {
-        Murlsh.thumbInsert(
-            Murlsh.imgThumb(match.imgur[1], 's', match.imgur[2]).data('href', match.imgur[0]),
-            Murlsh.imgClick, $(this).html('imgur.com'));
-    } else if (match.mp3) {
-        $(this).before(Murlsh.objectTag(swf, 20, 200, [
-            { name : 'bgcolor', value : '#000000' },
-            { name : 'FlashVars', value : 'mp3=' + href },
-            { name : 'movie', value : swf }
-        ]));
-    } else if (match.s3) {
-        thumb = Murlsh.imgThumb(match.s3[1], 'th.', match.s3[2]);
-
-        if (match.s3[2].match(/^pdf$/i)) {
-            $(this).before(thumb).html('pdf');
-        } else {
-            if (Murlsh.isIphone()) {
-                $(this).html(thumb);
+
+        if (match.flickr) {
+            $.ajax({
+                // url : 'http://api.flickr.com/services/rest/',
+                url : 'flickr',
+                data : {
+                    format : 'json',
+                    method : 'flickr.photos.getinfo',
+                    photo_id : match.flickr[1]
+                },
+                dataType : 'jsonp',
+                jsonp : 'jsoncallback',
+                success : function (d) {
+                    thumbInsert(flickrThumb(d), flickrClick, $(this));
+                },
+                context : $(this),
+                jsonpCallback : 'flickrCallback' + match.flickr[1]
+            });
+        } else if (match.imageshack) {
+            thumbInsert(imgThumb(match.imageshack[1], 'th.',
+                match.imageshack[2]).data('href', match.imageshack[0]),
+                    imgClick, $(this).html('imageshack.us'));
+        } else if (match.imgur) {
+            thumbInsert(imgThumb(match.imgur[1], 's', match.imgur[2]).data(
+                'href', match.imgur[0]), imgClick, $(this).html('imgur.com'));
+        } else if (match.mp3) {
+            $(this).before(objectTag(swf, 20, 200, [
+                { name : 'bgcolor', value : '#000000' },
+                { name : 'FlashVars', value : 'mp3=' + href },
+                { name : 'movie', value : swf }
+            ]));
+        } else if (match.s3) {
+            thumb = imgThumb(match.s3[1], 'th.', match.s3[2]);
+
+            if (match.s3[2].match(/^pdf$/i)) {
+                $(this).before(thumb).html('pdf');
             } else {
-                $(this).html('link');
-                $(this).before(thumb.data('href', match.s3[0]).click(
-                    Murlsh.imgClick));
+                if (my.isIphone()) {
+                    $(this).html(thumb);
+                } else {
+                    $(this).html('link');
+                    $(this).before(thumb.data('href', match.s3[0]).click(
+                        imgClick));
+                }
+            }
+        } else if (match.twitter) {
+            $.ajax({
+                // url : 'http://api.twitter.com/1/statuses/show/' +
+                url : '/twitter/1/statuses/show/' +
+                    match.twitter[1] + '.json',
+                dataType : 'jsonp',
+                success : function (d) {
+                    var nameLink = $('<a />', {
+                        href: 'http://twitter.com/' + d.user.screen_name +
+                            '/status/' + d.id,
+                        text: '@' + d.user.screen_name
+                    }),
+                        tweet = $('<span />').addClass('tweet').append(
+                            nameLink).append(': ').append(twitterAddLinks(
+                            d.text));
+
+                    thumbInsert(twitterThumb(d), null, nameLink);
+
+                    $(this).replaceWith(tweet);
+                },
+                context : $(this),
+                jsonpCallback : 'twitterCallback' + match.twitter[1]
+            });
+        } else if (match.vimeo) {
+            $.ajax({
+                url : 'http://vimeo.com/api/v2/video/' + match.vimeo[1] +
+                    '.json',
+                dataType : 'jsonp',
+                success : function (d) {
+                    var video = d[0],
+                        movie = 'http://vimeo.com/moogaloop.swf?clip_id=' +
+                        video.id;
+
+                    thumbInsert(vimeoThumb(video).data('embedHtml',
+                        objectTag(movie, video.height, video.width, [
+                            { name : 'movie', value : movie }
+                        ])), vimeoClick, $(this));
+                },
+                context : $(this),
+                jsonpCallback : 'vimeoCallback' + match.vimeo[1]
+            });
+        } else if (match.youtube) {
+            thumbInsert(youtubeThumb(match.youtube[1]), youtubeClick, $(this));
+        } else {
+            // Apple touch icon if available
+            hostMatch = hostRe.exec(href);
+            if (hostMatch) {
+                host = hostMatch[1];
+                if ($.inArray(host, config.apple_icon_hosts) > -1) {
+                    thumbInsert(appleThumb(host), null, $(this));
+                }
             }
         }
-    } else if (match.twitter) {
-        $.ajax({
-            // url : 'http://api.twitter.com/1/statuses/show/' +
-            url : '/twitter/1/statuses/show/' +
-                match.twitter[1] + '.json',
-            dataType : 'jsonp',
-            success : function(d) {
-                var nameLink = $('<a />', {
-                    href: 'http://twitter.com/' + d.user.screen_name,
-                    text: d.user.screen_name
-                });
+    };
 
-                $(this).html(d.text).before(nameLink).before(
-                    document.createTextNode(': '));
+    my.formatLi = function (d) {
+        var iconSize = 32,
+            li = $('<li />').append($('<a />', {
+                href : d.url,
+                text : d.title
+            }));
 
-                Murlsh.thumbInsert(Murlsh.twitterThumb(d), null, nameLink);
-            },
-            context : $(this),
-            jsonpCallback : 'twitterCallback' + match.twitter[1]
-        });
-    } else if (match.vimeo) {
-        $.ajax({
-            url : 'http://vimeo.com/api/v2/video/' + match.vimeo[1] + '.json',
-            dataType : 'jsonp',
-            success : function(d) {
-                var video = d[0];
-                var movie = 'http://vimeo.com/moogaloop.swf?clip_id=' + video.id;
-
-                Murlsh.thumbInsert(Murlsh.vimeoThumb(video).data(
-                    'embedHtml',
-                    Murlsh.objectTag(movie, video.height, video.width, [
-                        { name : 'movie', value : movie }
-                    ])), Murlsh.vimeoClick, $(this));
-            },
-            context : $(this),
-            jsonpCallback : 'vimeoCallback' + match.vimeo[1]
-        });
-    } else if (match.youtube) {
-        Murlsh.thumbInsert(Murlsh.youtubeThumb(match.youtube[1]),
-            Murlsh.youtubeClick, $(this));
-    }
-};
+        if (d.name) {
+            li.prepend($('<div />', { text : d.name }).addClass('name'));
+        }
 
-Murlsh.formatLi = function(d) {
-    var iconSize = 32;
-    var li = $('<li />').append($('<a />', {
-        href : d.url,
-        text : d.title
-    }));
+        if (d.email) {
+            li.prepend($('<div />').addClass('icon').append(
+                img('http://www.gravatar.com/avatar/' + d.email + '?s=' +
+                    iconSize, d.name).attr({
+                    width : iconSize,
+                    height : iconSize
+                })));
+        }
 
-    if (d.name) {
-        li.prepend($('<div />', { text : d.name }).addClass('name'));
-    }
+        return li;
+    };
 
-    if (d.email) {
-        li.prepend($('<div />').addClass('icon').append(
-        Murlsh.img(
-            'http://www.gravatar.com/avatar/' + d.email + '?s=' + iconSize,
-            d.name).attr({
-            width : iconSize,
-            height : iconSize
-        })));
-    }
+    my.iphoneInit = function () {
+        window.onorientationchange = function () {
+            var width = 450;
+            if (window.orientation === 0 || window.orientation === 180) {
+                width = 290;
+            }
+            $('#urls').width(width);
+        };
 
-    return li;
-};
+        window.onorientationchange();
 
-Murlsh.iphoneInit = function() {
-    window.onorientationchange = function() {
-        var width = 450;
-        if (window.orientation === 0 || window.orientation === 180) {
-            width = 290;
-        }
-        $('#urls').width(width);
+        $('a.feed').replaceWith($('<a />', {
+            href : '#bottom',
+            text : 'bottom'
+        }));
     };
 
-    window.onorientationchange();
+    my.isIphone = function () {
+        return navigator.userAgent.match(/i(phone|pod)/i);
+    };
 
-    $('a.feed').replaceWith($('<a />', {
-        href : '#bottom',
-        text : 'bottom'
-    }));
+    return my;
 };
 
-$(document).ready(function() {
-    if (Murlsh.isIphone()) {
-        Murlsh.iphoneInit();
-    }
-    $('a.m').map(Murlsh.addExtra);
-
-    $('#submit').click(function() {
-        $.post('url', {
-            url : $('#url').val(),
-            via : $('#via').val(),
-            auth : $('#auth').val()
-        }, function (d) {
-            $.each(d, function(i, v) {
-                var li = Murlsh.formatLi(v);
-                $('#urls > li:first').after(li);
-                $(li).children('a:first').map(Murlsh.addExtra);
+$(document).ready(function () {
+    $.getJSON('config', function (config) {
+        var murlsh = new Murlsh(config, $, navigator, window),
+            urls;
+
+        if (murlsh.isIphone()) {
+            murlsh.iphoneInit();
+        }
+
+        $('#submit').click(function () {
+            $.post('url', {
+                url : $('#url').val(),
+                via : $('#via').val(),
+                auth : $('#auth').val()
+            }, function (d) {
+                $.each(d, function (i, v) {
+                    var li = murlsh.formatLi(v);
+                    $('#urls > li:first').after(li);
+                    $(li).children('a:first').each(murlsh.addExtra);
+                });
+                $('#url').val('');
+                $('#via').val('');
+            }, 'json');
+        });
+
+        urls = $('a.m');
+
+        urls.each(murlsh.addExtra);
+
+        /*
+        // experimental comment support, to enable uncomment and edit comments.json
+        $.getJSON('/js/comments.json', function (data) {
+            urls.each(function () {
+                var href = $(this).attr('href');
+                if (href in data) {
+                    murlsh.addComments($(this), data[href]);
+                }
             });
-            $('#url').val('');
-            $('#via').val('');
-        }, 'json');
+        });
+        */
     });
-
 });

data/spec/auth_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 tempfile
 

data/spec/dispatch_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 rack/test
 

data/spec/doc_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 hpricot
 

data/spec/markup_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 murlsh
 }.each { |m| require m }

data/spec/unwrap_json_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 murlsh
 }.each { |m| require m }

data/spec/uri_ask_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 uri
 

data/spec/uri_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 murlsh
 }.each { |m| require m }

data/spec/xhtml_response_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 murlsh
 }.each { |m| require m }

data/spec/yaml_ordered_hash_spec.rb

@@ -1,5 +1,3 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 %w{
 murlsh
 }.each { |m| require m }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: false
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 -04:00
+date: 2010-08-05 00:00:00 -04:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,9 +115,25 @@ dependencies:
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: push-notify
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +145,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack-cache
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,11 +161,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rack-throttle
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,11 +177,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,11 +193,11 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: tinyatom
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,7 +209,7 @@ dependencies:
         - 1
         version: 0.1.1
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 description: url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding
 email: matthewm@boedicker.org
 executables: 
@@ -214,6 +230,7 @@ files:
 - config.yaml
 - lib/murlsh.rb
 - lib/murlsh/auth.rb
+- lib/murlsh/config_server.rb
 - lib/murlsh/dispatch.rb
 - lib/murlsh/doc.rb
 - lib/murlsh/etag_add_encoding.rb
@@ -248,6 +265,7 @@ files:
 - plugins/via_50_domain.rb
 - public/css/jquery.jgrowl.css
 - public/css/screen.css
+- public/js/comments.json
 - public/js/jquery-1.4.2.min.js
 - public/js/jquery.jgrowl_compressed.js
 - public/js/js.js