murlsh 0.6.1 → 0.7.0

data/public/js/js.js

@@ -4,7 +4,7 @@
 
 var Murlsh = {};
 
-Murlsh.img = function (src, text) {
+Murlsh.img = function(src, text) {
     text = text || '';
     return $('<img />', {
         src : src,
@@ -13,18 +13,19 @@ Murlsh.img = function (src, text) {
     });
 };
 
-Murlsh.make_fit = function (e, max_width, max_height) {
-    var width = e.width(),
-        height = e.height(),
-        scale;
-    if (width > max_width || height > max_height) {
-        scale = Math.min(max_width / width, max_height / height);
+Murlsh.makeFit = function(e, maxWidth, maxHeight) {
+    var height = e.height();
+    var scale;
+    var 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.closer_add = function (x, header) {
+Murlsh.closerAdd = function(x, header) {
     var html = (typeof x === 'object') ? $('<div />').append(x).html() : x;
 
     $.jGrowl(html, {
@@ -32,9 +33,9 @@ Murlsh.closer_add = function (x, header) {
         glue : 'before',
         header : header,
         sticky : true,
-        beforeOpen : function (e) {
-            e.find('.message img').load(function () {
-                Murlsh.make_fit($(this),
+        beforeOpen : function(e) {
+            e.find('.message img').load(function() {
+                Murlsh.makeFit($(this),
                     Math.round($(window).width() / 2),
                     Math.round($(window).height() - 100));
             });
@@ -42,20 +43,20 @@ Murlsh.closer_add = function (x, header) {
     });
 };
 
-Murlsh.escape_xml = function (s) {
+Murlsh.escapeXml = function(s) {
     return s.replace(/&/g, '&amp;');
 };
 
-Murlsh.object_tag = function (data, height, width, params) {
+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.escape_xml(data) +
+    var result = '<object data="' + Murlsh.escapeXml(data) +
         '" height="' + height +
         '" type="application/x-shockwave-flash" width="' + width + '">';
 
-    $.each(params, function (i, v) {
+    $.each(params, function(i, v) {
         result += '<param name="' + v.name + '" value="' +
-            Murlsh.escape_xml(v.value) + '" />';
+            Murlsh.escapeXml(v.value) + '" />';
     });
 
     result += '</object>';
@@ -63,11 +64,12 @@ Murlsh.object_tag = function (data, height, width, params) {
     return result;
 };
 
-Murlsh.flickr_thumb = function (d) {
-    var photo = d.photo,
-        base,
-        owner,
-        zoom;
+Murlsh.flickrThumb = function(d) {
+    var base;
+    var owner;
+    var photo = d.photo;
+    var zoom;
+
     if (d.stat === 'ok') {
         base = 'http://farm' + photo.farm + '.static.flickr.com/' +
             photo.server + '/' + photo.id + '_';
@@ -85,36 +87,46 @@ Murlsh.flickr_thumb = function (d) {
     }
 };
 
-Murlsh.flickr_click = function () {
-    Murlsh.closer_add(Murlsh.img($(this).data('zoom')));
+Murlsh.flickrClick = function() {
+    Murlsh.closerAdd(Murlsh.img($(this).data('zoom')));
 };
 
-Murlsh.img_thumb = function (prefix, ext) {
-    return Murlsh.img(prefix + 'th.' +
-        (ext.match(/^pdf$/i) ? 'png' : ext)).addClass('thumb');
+Murlsh.imgThumb = function() {
+    var lastIndex;
+    var urlParts = [];
+
+    for (var i = 0; i < arguments.length; i += 1) {
+        urlParts.push(arguments[i]);
+    }
+
+    lastIndex = urlParts.length - 1;
+
+    // if pdf the thumbnail will be .png
+    if (urlParts[lastIndex].match(/^pdf$/i)) {
+        urlParts.lastIndex = 'png';
+    }
+
+    return Murlsh.img(urlParts.join('')).addClass('thumb');
 };
 
-Murlsh.img_click = function () {
-    Murlsh.closer_add(Murlsh.img($(this).data('href')));
+Murlsh.imgClick = function() {
+    Murlsh.closerAdd(Murlsh.img($(this).data('href')));
 };
 
-Murlsh.vimeo_thumb = function (d) {
-    return Murlsh.img(d.thumbnail_url, d.title).addClass('thumb vimeo').attr({
-        height : d.thumbnail_height,
-        width : d.thumbnail_width
-    });
+Murlsh.vimeoThumb = function(d) {
+    return Murlsh.img(d.thumbnail_medium, d.title).addClass('thumb vimeo');
 };
 
-Murlsh.vimeo_click = function () {
-    Murlsh.closer_add($(this).data('embed_html'));
+Murlsh.vimeoClick = function() {
+    Murlsh.closerAdd($(this).data('embedHtml'));
 };
 
-Murlsh.youtube_thumb = function (id) {
+Murlsh.youtubeThumb = function(id) {
     return Murlsh.img('http://img.youtube.com/vi/' + id + '/default.jpg',
         'click to watch').addClass('thumb youtube').data('id', id);
 };
 
-Murlsh.youtube_click = function () {
+Murlsh.youtubeClick = function() {
     var movie = 'http://www.youtube.com/v/' + $(this).data('id') + '?' +
         $.param({
             fs : 1,
@@ -124,115 +136,155 @@ Murlsh.youtube_click = function () {
             showinfo : 0,
             showsearch : 0
         });
-    Murlsh.closer_add(Murlsh.object_tag(movie, 505, 640,
+
+    Murlsh.closerAdd(Murlsh.objectTag(movie, 505, 640,
       [{ name : 'movie', value : movie }]));
 };
 
-Murlsh.thumb_insert = function (img, click_function, a) {
+Murlsh.thumbInsert = function(img, clickFunction, a) {
     if (img) {
-        if (Murlsh.is_iphone()) {
+        if (Murlsh.isIphone()) {
             a.prepend(img);
         } else {
-            a.before(img.click(click_function));
+            if (clickFunction) {
+                img.click(clickFunction);
+            }
+            a.before(img);
         }
     }
 };
 
-Murlsh.is_iphone = function () {
+Murlsh.isIphone = function() {
     return navigator.userAgent.match(/i(phone|pod)/i);
 };
 
-Murlsh.href_res = {
+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,
+        /^(http:\/\/static\.mmb\.s3\.amazonaws\.com\/[\w\-]+\.)(jpe?g|gif|pdf|png)$/i,
+    twitter :
+        /^http:\/\/twitter\.com\/\w+\/statuses\/(\d+)$/i,
     vimeo :
         /^http:\/\/(?:www\.)?vimeo\.com\/(\d+)$/i,
     youtube :
         /^http:\/\/(?:(?:www|uk)\.)?youtube\.com\/watch\?v=([\w\-]+)(?:&|$)/i
 };
 
-Murlsh.add_extra = function () {
-    var href = $(this).attr('href'),
-        match = {},
-        swf = 'swf/player_mp3_mini.swf',
-        thumb;
+Murlsh.addExtra = function() {
+    var href = $(this).attr('href');
+    var match = {};
+    var swf = 'swf/player_mp3_mini.swf';
+    var thumb;
 
-    $.each(Murlsh.href_res, function (x, re) {
+    $.each(Murlsh.hrefRes, function(x, re) {
         return !(match[x] = re.exec(href));
     });
 
     if (match.flickr) {
         $.ajax({
-            url : 'http://api.flickr.com/services/rest/',
+            // url : 'http://api.flickr.com/services/rest/',
+            url : 'flickr',
             data : {
-                api_key : 'd04e574aaf11bf2e1c03cba4ee7e5725',
                 format : 'json',
                 method : 'flickr.photos.getinfo',
                 photo_id : match.flickr[1]
             },
             dataType : 'jsonp',
             jsonp : 'jsoncallback',
-            success : function (d) {
-                Murlsh.thumb_insert(Murlsh.flickr_thumb(d),
-                    Murlsh.flickr_click, $(this));
+            success : function(d) {
+                Murlsh.thumbInsert(Murlsh.flickrThumb(d),
+                    Murlsh.flickrClick, $(this));
             },
-            context : $(this)
+            context : $(this),
+            jsonpCallback : 'flickrCallback' + match.flickr[1]
         });
     } else if (match.imageshack) {
-        Murlsh.thumb_insert(
-            Murlsh.img_thumb(match.imageshack[1], match.imageshack[2]).data(
+        Murlsh.thumbInsert(
+            Murlsh.imgThumb(match.imageshack[1], 'th.', match.imageshack[2]).data(
                 'href', match.imageshack[0]),
-        Murlsh.img_click, $(this).html('imageshack.us'));
+            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.object_tag(swf, 20, 200, [
+        $(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.img_thumb(match.s3[1], match.s3[2]);
+        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.is_iphone()) {
+            if (Murlsh.isIphone()) {
                 $(this).html(thumb);
             } else {
                 $(this).html('link');
                 $(this).before(thumb.data('href', match.s3[0]).click(
-                    Murlsh.img_click));
+                    Murlsh.imgClick));
             }
         }
-    } else if (match.vimeo) {
+    } else if (match.twitter) {
         $.ajax({
-            url : 'http://vimeo.com/api/oembed.json',
-            data : { url : 'http://vimeo.com/' + match.vimeo[1] },
+            url : 'http://api.twitter.com/1/statuses/show/' + match.twitter[1] +
+                '.json',
             dataType : 'jsonp',
-            success : function (d) {
-                Murlsh.thumb_insert(Murlsh.vimeo_thumb(d).data('embed_html',
-                    Murlsh.escape_xml(d.html)),
-                    Murlsh.vimeo_click, $(this));
+            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(': '));
+
+                Murlsh.thumbInsert(
+                    Murlsh.imgThumb(d.user.profile_image_url).attr({
+                        height : '48',
+                        width : '48'
+                    }), null, nameLink);
             },
             context : $(this)
         });
+    } 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.thumb_insert(Murlsh.youtube_thumb(match.youtube[1]),
-            Murlsh.youtube_click, $(this));
+        Murlsh.thumbInsert(Murlsh.youtubeThumb(match.youtube[1]),
+            Murlsh.youtubeClick, $(this));
     }
 };
 
-Murlsh.format_li = function (d) {
+Murlsh.formatLi = function(d) {
+    var iconSize = 32;
     var li = $('<li />').append($('<a />', {
         href : d.url,
         text : d.title
-    })),
-        icon_size = 32;
+    }));
 
     if (d.name) {
         li.prepend($('<div />', { text : d.name }).addClass('name'));
@@ -241,18 +293,18 @@ Murlsh.format_li = function (d) {
     if (d.email) {
         li.prepend($('<div />').addClass('icon').append(
         Murlsh.img(
-            'http://www.gravatar.com/avatar/' + d.email + '?s=' + icon_size,
+            'http://www.gravatar.com/avatar/' + d.email + '?s=' + iconSize,
             d.name).attr({
-            width : icon_size,
-            height : icon_size
+            width : iconSize,
+            height : iconSize
         })));
     }
 
     return li;
 };
 
-Murlsh.iphone_init = function () {
-    window.onorientationchange = function () {
+Murlsh.iphoneInit = function() {
+    window.onorientationchange = function() {
         var width = 450;
         if (window.orientation === 0 || window.orientation === 180) {
             width = 290;
@@ -262,32 +314,28 @@ Murlsh.iphone_init = function () {
 
     window.onorientationchange();
 
-    $('#urls li:first').prepend($('<a />', {
+    $('a.feed').replaceWith($('<a />', {
         href : '#bottom',
         text : 'bottom'
     }));
-    $('#urls li:last').append($('<a />', {
-        href : '#urls',
-        text : 'top'
-    }));
 };
 
-$(document).ready(function () {
-    if (Murlsh.is_iphone()) {
-        Murlsh.iphone_init();
+$(document).ready(function() {
+    if (Murlsh.isIphone()) {
+        Murlsh.iphoneInit();
     }
-    $('#urls a').map(Murlsh.add_extra);
+    $('a.m').map(Murlsh.addExtra);
 
-    $('#submit').click(function () {
+    $('#submit').click(function() {
         $.post('url', {
             url : $('#url').val(),
             via : $('#via').val(),
             auth : $('#auth').val()
         }, function (d) {
-            $.each(d, function (i, v) {
-                var li = Murlsh.format_li(v);
+            $.each(d, function(i, v) {
+                var li = Murlsh.formatLi(v);
                 $('#urls > li:first').after(li);
-                $(li).children('a:first').map(Murlsh.add_extra);
+                $(li).children('a:first').map(Murlsh.addExtra);
             });
             $('#url').val('');
             $('#via').val('');

data/spec/atom_feed_spec.rb

@@ -1,9 +1,11 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'tempfile'
-require 'time'
+%w{
+tempfile
+time
 
-require 'murlsh'
+murlsh
+}.each { |m| require m }
 
 describe Murlsh::AtomFeed do
 
@@ -30,11 +32,11 @@ describe Murlsh::AtomFeed do
 
     @feed = Murlsh::AtomFeed.new('http://test.com/test/', :title => 'test')
 
-    @expected = <<EOS
-<?xml version="1.0" encoding="UTF-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <id>http://test.com/test/</id>
-  <link href="http://test.com/test/atom.xml" rel="self"/>
+    @expected = Regexp.new(<<EOS, Regexp::MULTILINE)
+<\\?xml version="1\.0" encoding="UTF-8"\\?>
+<feed xmlns="http://www\\.w3\\.org/2005/Atom">
+  <id>http://test\\.com/test/</id>
+  <link href="http://test\\.com/test/atom\\.xml" rel="self"/>
   <title>test</title>
   <updated>2009-12-20T15:10:10Z</updated>
   <entry>
@@ -42,38 +44,37 @@ describe Murlsh::AtomFeed do
       <name>test 1</name>
     </author>
     <title>test title</title>
-    <id>tag:test.com,2009-12-19:test.com/test/1</id>
+    <id>tag:test\\.com,2009-12-19:test\\.com/test/1</id>
     <summary>test title</summary>
     <updated>2009-12-19T17:34:56Z</updated>
-    <link href="http://matthewm.boedicker.org/"/>
-    <link type="text/html" title="google.com" href="http://www.google.com" rel="via"/>
+    <link href="http://matthewm\\.boedicker\\.org/"/>
+    <link type=".*"/>
   </entry>
   <entry>
     <author>
       <name>test 2</name>
     </author>
     <title>image test</title>
-    <id>tag:test.com,2009-12-20:test.com/test/2</id>
+    <id>tag:test\\.com,2009-12-20:test\\.com/test/2</id>
     <summary>image test</summary>
     <updated>2009-12-20T15:10:10Z</updated>
-    <link href="http://matthewm.boedicker.org/test.jpg"/>
-    <link type="image/jpeg" title="Full-size" href="http://matthewm.boedicker.org/test.jpg" rel="enclosure"/>
+    <link href="http://matthewm\\.boedicker\\.org/test\\.jpg"/>
+    <link type=".*"/>
   </entry>
 </feed>
 EOS
+
   end
 
   it 'should generate the correct atom feed' do
-    @feed.make([@url1, @url2], :indent => 2).should == @expected
+    @feed.make([@url1, @url2], :indent => 2).should match @expected
   end
 
   it 'should write the correct atom feed to a file' do
-    f = Tempfile.open('test_atom_feed')
-    @feed.make([@url1, @url2], :indent => 2, :target => f)
+    tempfile = Tempfile.open('test_atom_feed')
+    @feed.make([@url1, @url2], :indent => 2, :target => tempfile)
 
-    f.open
-    f.read.should == @expected
-    f.close
+    open(tempfile) { |f| f.read.should match @expected }
   end
 
 end

data/spec/auth_spec.rb

@@ -1,21 +1,23 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'murlsh'
+%w{
+tempfile
+
+murlsh
+}.each { |m| require m }
 
 describe Murlsh::Auth do
 
   before do
-    @f = '/tmp/murlsh_users_test'
+    @f = Tempfile.new('murlsh_users_test')
 
-    @a = Murlsh::Auth.new(@f)
+    @a = Murlsh::Auth.new(@f.path)
 
     @a.add_user('test1', 'test1@test.com', 'secret1')
     @a.add_user('test2', 'test2@test.com', 'secret2')
   end
 
-  after do
-    File.delete(@f)
-  end
+  after do; @f.close!; end
 
   it 'should authorize valid credentials' do
     @a.auth('secret1').should == {

data/spec/dispatch_spec.rb

@@ -0,0 +1,26 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+%w{
+rack/test
+
+murlsh
+}.each { |m| require m }
+
+describe Murlsh::Dispatch do
+  include Rack::Test::Methods
+
+  def app
+    config = YAML.load_file('config.yaml')
+    Murlsh::Dispatch.new(config)
+  end
+
+  it 'should return ok for GET /' do
+    get '/'
+    last_response.should be_ok
+  end
+
+  it 'should return 404 for an invalid request' do
+    get '/foo'
+    last_response.should_not be_ok
+  end
+end

data/spec/doc_spec.rb

@@ -0,0 +1,27 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+%w{
+hpricot
+
+murlsh
+}.each { |m| require m }
+
+describe Murlsh::Doc do
+
+  it 'should get the right title from an HTML page that has one' do
+    html = <<eos
+<html>
+  <head>
+    <title>the title</title>
+  </head>
+<body>
+  <h1>hi</h1>
+</body>
+</html>
+eos
+
+    doc = Hpricot(html).extend(Murlsh::Doc)
+    doc.title.should == 'the title'
+  end
+
+end

data/spec/markup_spec.rb

@@ -1,6 +1,8 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'murlsh'
+%w{
+murlsh
+}.each { |m| require m }
 
 class MarkupMixer < Builder::XmlMarkup
   include Murlsh::Markup

data/spec/uri_ask_spec.rb

@@ -1,8 +1,10 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'murlsh'
+%w{
+uri
 
-require 'uri'
+murlsh
+}.each { |m| require m }
 
 describe Murlsh::UriAsk do
 
@@ -24,7 +26,7 @@ describe Murlsh::UriAsk do
     content_type('http://a.b/test/').should be_empty
   end
 
-  it 'should return an empty string for the content type of a URI with a nonexistant path' do
+  it 'should return an empty string for the content type of a URI with a nonexistent path' do
     content_type(
       'http://matthewm.boedicker.org/does_not_exist/').should be_empty
   end

data/spec/uri_spec.rb

@@ -1,6 +1,8 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'murlsh'
+%w{
+murlsh
+}.each { |m| require m }
 
 describe URI do
 

data/spec/url_spec.rb

@@ -0,0 +1,52 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+%w{
+tempfile
+
+sqlite3
+
+murlsh
+}.each { |m| require m }
+
+describe Murlsh::Url do
+
+  before do
+    @db_file = Tempfile.open('murlsh_test_db')
+
+    db = SQLite3::Database.new(@db_file.path)
+    db.execute("CREATE TABLE urls (
+      id INTEGER PRIMARY KEY,
+      time TIMESTAMP,
+      url TEXT,
+      email TEXT,
+      name TEXT,
+      title TEXT,
+      content_type TEXT,
+      via TEXT);
+      ")
+
+    ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
+      :database => @db_file.path)
+
+    @url = Murlsh::Url.new
+  end
+
+  after do
+    @db_file.close
+  end
+
+  it 'should return the url for the title if the title is nil' do
+    @url.url = 'http://matthewm.boedicker.org/'
+    @url.title = nil
+
+    @url.title.should == @url.url
+  end
+
+  it 'should return the url for the title if the title is empty' do
+    @url.url = 'http://matthewm.boedicker.org/'
+    @url.title = ''
+
+    @url.title.should == @url.url
+  end
+
+end