murlsh 0.3.0 → 0.4.0

data/.gitignore

@@ -1 +1,3 @@
 *~
+public/css/*.gen.css
+public/js/*.gen.js

data/.htaccess

@@ -5,3 +5,7 @@ AddOutputFilterByType DEFLATE application/xhtml+xml
 AddOutputFilterByType DEFLATE application/xml
 AddOutputFilterByType DEFLATE text/css
 AddOutputFilterByType DEFLATE text/html
+
+<FilesMatch "\.gen\.(css|js)$">
+  Header add Expires "Wed, 22 Jun 2019 20:07:00 GMT"
+</FilesMatch>

data/README.textile

@@ -30,3 +30,5 @@ edit config.yaml
 rake db:init user:add
 </code>
 </pre>
+
+Questions and comments: "matthewm@boedicker.org":mailto:matthewm@boedicker.org

data/Rakefile

@@ -1,21 +1,27 @@
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
-require 'rubygems'
+%w{
+cgi
+digest/md5
+net/http
+pp
+uri
+yaml
 
-require 'murlsh'
+rubygems
 
-require 'flog'
-require 'rake/testtask'
-require 'sqlite3'
+flog
+rake/testtask
+sqlite3
 
-require 'pp'
-require 'yaml'
+murlsh
+}.each { |d| require d }
 
 config = YAML.load_file('config.yaml')
 
 desc "Test remote content type fetch for a URL and show errors."
 task :content_type, :url do |t, args|
-  puts Murlsh.get_content_type(args.url, :failproof => false)
+  puts Murlsh.get_content_type(args.url, :failproof => false, :debug => STDOUT)
 end
 
 namespace :db do
@@ -56,7 +62,8 @@ namespace :db do
       email TEXT,
       name TEXT,
       title TEXT,
-      content_type TEXT);
+      content_type TEXT,
+      via TEXT);
       ")
   end
 
@@ -67,10 +74,12 @@ namespace :db do
 
 end
 
-namespace :dreamhost do
+directory 'tmp'
 
-  desc "Restart Passenger."
-  task :restart do
+namespace :passenger do
+
+  desc 'Restart Passenger.'
+  task :restart => ['tmp'] do
     open('tmp/restart.txt', 'w') { |f| }
   end
 
@@ -92,7 +101,7 @@ end
 
 desc "Test remote title fetch for a URL and show errors."
 task :title, :url do |t, args|
-  puts Murlsh.get_title(args.url, :failproof => false)
+  puts Murlsh.get_title(args.url, :failproof => false, :debug => STDOUT)
 end
 
 desc 'Try to fetch the title for a url and update it in the database.'
@@ -124,9 +133,6 @@ end
 
 desc "Validate XHTML."
 task :validate do
-  require 'cgi'
-  require 'net/http'
-
   net_http = Net::HTTP.new('validator.w3.org', 80)
   #net_http.set_debug_output(STDOUT)
 
@@ -152,15 +158,93 @@ task :post_sh do
 #!/bin/sh
 
 URL="$1"
-AUTH="$2" # password can be passed as second parameter or hardcoded here
+VIA="$2"
+AUTH="$3" # password can be passed as second parameter or hardcoded here
 
 curl \\
   --data-urlencode "url=${URL}" \\
   --data-urlencode "auth=${AUTH}" \\
+  --data-urlencode "via=${VIA}" \\
   #{config.fetch('root_url')}
 EOS
 end
 
+# Concatenate some files and return the result as a string.
+def cat(in_files, sep=nil)
+  result = ''
+  in_files.each do |fname|
+    open(fname) do |h|
+      while (line = h.gets) do; result << line; end
+      result << sep if sep
+    end
+  end
+  result
+end
+
+directory 'public/css'
+
+namespace :css do
+
+  desc 'Combine and compress css.'
+  task :compress => ['public/css'] do
+    combined = cat(config['css_files'].collect { |x| "public/#{x}" }, "\n")
+
+    md5sum = Digest::MD5.hexdigest(combined)
+
+    filename = "#{md5sum}.gen.css"
+
+    out = "public/css/#{filename}"
+
+    open(out, 'w') { |f| f.write(combined) }
+    puts "generated #{out}"
+
+    compressed_url = "css/#{filename}"
+
+    unless config['css_compressed'] == compressed_url
+      config['css_compressed'] = compressed_url
+      open('config.yaml', 'w') { |f| YAML.dump(config, f) }
+      puts "updated config with css_compressed = #{compressed_url}"
+    end
+  end
+
+end
+
+directory 'public/js'
+
+namespace :js do
+
+  desc 'Combine and compress javascript.'
+  task :compress => ['public/js'] do
+    combined = cat(config['js_files'].collect { |x| "public/#{x}" } )
+
+    compressed = Net::HTTP.post_form(
+      URI.parse('http://closure-compiler.appspot.com/compile'), {
+      'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
+      'js_code' => combined,
+      'output_format' => 'text',
+      'output_info' => 'compiled_code',
+      }).body
+
+    md5sum = Digest::MD5.hexdigest(compressed)
+
+    filename = "#{md5sum}.gen.js"
+
+    out = "public/js/#{filename}"
+
+    open(out, 'w') { |f| f.write(compressed) }
+    puts "generated #{out}"
+
+    compressed_url = "js/#{filename}"
+
+    unless config['js_compressed'] == compressed_url
+      config['js_compressed'] = compressed_url
+      open('config.yaml', 'w') { |f| YAML.dump(config, f) }
+      puts "updated config with js_compressed = #{compressed_url}"
+    end
+  end
+
+end
+
 def ask(prompt, sep=':')
   print "#{prompt}#{sep} "
   return STDIN.gets.chomp

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/config.yaml

@@ -9,10 +9,11 @@ num_posts_feed: 25
 num_posts_page: 100
 page_title: mmb url share
 root_url: http://urls.matthewm.boedicker.org/
-css_prefix: css/
-img_prefix: img/
-js_prefix: js/
-swf_prefix: swf/
 css_files:
-- jquery.jgrowl.css
-- screen.css
+- css/jquery.jgrowl.css
+- css/screen.css
+js_files:
+- js/jquery-1.3.2.min.js
+- js/jquery.cookie.js
+- js/jquery.jgrowl_compressed.js
+- js/js.js

data/lib/murlsh/atom_feed.rb

@@ -37,20 +37,14 @@ module Murlsh
 
     # Generate the feed and write it to the filesystem with locking.
     def write(entries, path)
-      open(path, 'w') do |f|
-        f.flock(File::LOCK_EX)
-
-        make(entries, :target => f)
-
-        f.flock(File::LOCK_UN)
-      end
+      Murlsh::openlock(path, 'w') { |f| make(entries, :target => f) }
     end
 
     # Build the feed using XML builder. Options are passed to
     # Builder::XmlMarkup.new.
     def make(entries, options={})
       xm = Builder::XmlMarkup.new(options)
-      xm.instruct! :xml
+      xm.instruct!(:xml)
 
       xm.feed(:xmlns => 'http://www.w3.org/2005/Atom') {
         xm.id(@root_url)

data/lib/murlsh/auth.rb

@@ -30,11 +30,9 @@ module Murlsh
 
     # Add a user to the authentication file.
     def add_user(username, email, password)
-      open(@file, 'a') do |f|
-        f.flock(File::LOCK_EX)
+      Murlsh::openlock(@file, 'a') do |f|
         f.write("#{[username, Digest::MD5.hexdigest(email),
           BCrypt::Password.create(password)].join(',')}\n")
-        f.flock(File::LOCK_UN)
       end
     end
 

data/lib/murlsh/openlock.rb

@@ -0,0 +1,12 @@
+module Murlsh
+
+  module_function
+
+  # Open a file with an exclusive lock.
+  def openlock(*args)
+    open(*args) do |f|
+      f.flock(File::LOCK_EX) ; yield f ; f.flock(File::LOCK_UN)
+    end
+  end
+
+end

data/lib/murlsh/referrer.rb

@@ -38,7 +38,7 @@ module Murlsh
 
     # Regex host match to name of query string parameter.
     Qmap = {
-      /^www\.google\.(bs|ca|com|cz|dk|es|fi|nl)(\/m)?\/search$/ => 'q',
+      /^www\.google\.(bs|ca|com|cz|dk|es|fi|it|nl|no)(\/m)?\/search$/ => 'q',
       /^www\.bing\.com\/search$/ => 'q',
     }
 

data/lib/murlsh/url.rb

@@ -3,6 +3,10 @@ require 'active_record'
 
 require 'uri'
 
+module URI
+  def domain; host[/[a-z\d-]+\.[a-z]{2,}(\.[a-z]{2})?$/].downcase; end
+end
+
 module Murlsh
 
   # URL ActiveRecord.
@@ -21,11 +25,7 @@ module Murlsh
 
     # Return text showing what domain a link goes to.
     def hostrec
-      begin
-        domain = URI(url).host[/[a-z\d-]+\.[a-z]{2,}(\.[a-z]{2})?$/].downcase
-      rescue Exception => e
-        domain = nil
-      end
+      domain = begin; URI(url).domain; rescue Exception; end
 
       domain = Murlsh::Plugin.hooks('hostrec').inject(domain) {
         |result,plugin| plugin.run(result, url, title) }
@@ -33,6 +33,16 @@ module Murlsh
       yield domain if domain
     end
 
+    # Yield the url that the url came from.
+    def viarec
+      if via
+        begin
+          yield URI(via)
+        rescue Exception
+        end
+      end
+    end
+
     # Return true if this url is an image.
     def is_image?
       %w{image/gif image/jpeg image/png}.include?(content_type)

data/lib/murlsh/url_body.rb

@@ -6,7 +6,7 @@ module Murlsh
 
     def initialize(config, db, req)
       @config, @db, @req, @q = config, db, req, req.params['q']
-      super(:indent => 2)
+      super(:indent => @config['xhtml_indent'] || 0)
     end
 
     # Fetch urls base on query string parameters.
@@ -56,7 +56,15 @@ module Murlsh
 
                 a(mu.title.strip.gsub(/\s+/, ' '), :href => mu.url)
 
-                mu.hostrec { |hostrec| span(hostrec, :class => 'host') }
+                mu.hostrec do |hostrec|
+                  text!(' ')
+                  span(hostrec, :class => 'host')
+                end
+                mu.viarec do |via|
+                  span(:class => 'via') {
+                    text!(' (via '); a(via.domain, :href => via); text!(')')
+                  }
+                end
                 span(", #{mu.time.fuzzy}", :class => 'date') if
                   @config.fetch('show_dates', true) and mu.time
                 last = mu
@@ -82,10 +90,7 @@ module Murlsh
           :viewport =>
             'width=device-width,minimum-scale=1.0,maximum-scale=1.0')
         google_verify
-        css(@config.fetch('css_files', []),
-          :prefix => @config.fetch('css_prefix', ''))
-        css('phone.css', :media => 'only screen and (max-device-width: 480px)',
-          :prefix => @config.fetch('css_prefix', ''))
+        css(@config['css_compressed'] || @config['css_files'])
         atom(@config.fetch('feed_file'))
       }
     end
@@ -128,6 +133,7 @@ module Murlsh
       form(:action => '', :method => 'post') {
         fieldset(:id => 'add') {
           self.p { add_form_input('Add URL:', 'url', 32) }
+          self.p { add_form_input('Via:', 'via', 32) }
           self.p {
             add_form_input('Password:', 'auth', 16, 'password')
             input(:type => 'button', :id => 'submit', :value => 'Add')
@@ -156,14 +162,7 @@ module Murlsh
     end
 
     # Required javascript builder.
-    def js
-      javascript(%w{
-        jquery-1.3.2.min.js
-        jquery.cookie.js
-        jquery.jgrowl_compressed.js
-        js.js
-        }, :prefix => @config.fetch('js_prefix', ''))
-    end
+    def js; javascript(@config['js_compressed'] || @config['js_files']); end
 
   end
 

data/lib/murlsh/url_server.rb

@@ -10,8 +10,7 @@ module Murlsh
   class UrlServer
 
     def initialize(config, db)
-      @config = config
-      @db = db
+      @config, @db = config, db
       ActiveRecord::Base.default_timezone = :utc
 
       Dir['plugins/*.rb'].each { |p| load p }
@@ -35,11 +34,7 @@ module Murlsh
 
     # Respond to a POST request. Add the new url and return json.
     def post(req)
-      resp = Rack::Response.new
-
-      url = req.params['url']
-
-      unless url.empty?
+      unless req.params['url'].empty?
         auth = req.params['auth']
         if user = auth.empty? ? nil : Murlsh::Auth.new(
           @config.fetch('auth_file')).auth(auth)
@@ -48,9 +43,10 @@ module Murlsh
 
           mu = Murlsh::Url.new do |u|
             u.time = Time.now.gmtime
-            u.url = url
+            u.url = req.params['url']
             u.email = user[:email]
             u.name = user[:name]
+            u.via = req.params['via'] unless (req.params['via'] || []).empty?
           end
 
           Murlsh::Plugin.hooks('add_pre') { |p| p.run(mu, @config) }
@@ -59,25 +55,22 @@ module Murlsh
 
           Murlsh::Plugin.hooks('add_post') { |p| p.run(@config) }
 
-          resp['Content-Type'] = 'application/json'
+          resp = Rack::Response.new([mu].to_json, 200, {
+            'Content-Type' => 'application/json' })
 
           resp.set_cookie('auth',
             :expires => Time.mktime(2015, 6, 22),
             :path => '/',
             :value => auth)
 
-          resp.body = [mu].to_json
+          resp
         else
-          resp.status = 403
-          resp['Content-Type'] = 'text/plain'
-          resp.write('Permission denied')
+          Rack::Response.new('Permission denied', 403, {
+            'Content-Type' => 'text/plain' })
         end
       else
-        resp.status = 500
-        resp['Content-Type'] = 'text/plain'
-        resp.write('No url')
+        Rack::Response.new('No url', 500, { 'Content-Type' => 'text/plain' })
       end
-      resp
     end
 
   end

data/lib/murlsh.rb

@@ -2,6 +2,7 @@ require 'murlsh/auth'
 require 'murlsh/dispatch'
 require 'murlsh/get_content_type'
 require 'murlsh/get_title'
+require 'murlsh/openlock'
 require 'murlsh/plugin'
 require 'murlsh/referrer'
 require 'murlsh/sqlite3_adapter'

data/murlsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murlsh}
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matthew M. Boedicker"]
-  s.date = %q{2009-11-05}
+  s.date = %q{2009-12-13}
   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}
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/murlsh/get_content_type.rb",
      "lib/murlsh/get_title.rb",
      "lib/murlsh/markup.rb",
+     "lib/murlsh/openlock.rb",
      "lib/murlsh/plugin.rb",
      "lib/murlsh/referrer.rb",
      "lib/murlsh/sqlite3_adapter.rb",
@@ -48,7 +49,6 @@ Gem::Specification.new do |s|
      "plugins/lookup_content_type_title.rb",
      "plugins/update_feed.rb",
      "public/css/jquery.jgrowl.css",
-     "public/css/phone.css",
      "public/css/screen.css",
      "public/js/jquery-1.3.2.min.js",
      "public/js/jquery.cookie.js",

data/public/css/screen.css

@@ -1,5 +1,6 @@
 body {
-  font-family : sans-serif;
+  font-size : 1em;
+  line-height : 1.5em;
 }
 
 img {
@@ -8,7 +9,7 @@ img {
 
 #urls {
   list-style-type : none;
-  width : 480px;
+  width : 600px;
 }
 
 li {
@@ -16,13 +17,6 @@ li {
   float : left;
   padding : 10px 20px 10px 10px;
   width : 100%;
-  border-bottom : 1px solid #f6f6f6;
-}
-
-li.even {
-  background-color : #eee;
-  border-right : 1px solid #ddd;
-  border-bottom : 1px solid #ccc;
 }
 
 div.icon {
@@ -30,10 +24,12 @@ div.icon {
   margin : 0 0.5em 0 0;
 }
 
-div.name {
-  float : left;
-  font-style : italic;
-  margin-right : 0.5em;
+a:link {
+  color : #000;
+}
+
+a:visited {
+  color : #808080;
 }
 
 a:link, a:visited, a:active {
@@ -44,6 +40,12 @@ a:hover {
   text-decoration : underline;
 }
 
+div.name {
+  float : left;
+  font-style : italic;
+  margin-right : 0.5em;
+}
+
 img.thumb, li object {
   float : left;
   margin-right : 10px;
@@ -92,3 +94,35 @@ div.jGrowl div.jGrowl-closer {
   float : right;
   width : auto;
 }
+
+/* iphone */
+@media screen and (max-device-width : 480px) {
+
+  a.feed {
+    display : none;
+  }
+
+  body {
+    margin : 0;
+    padding : 0;
+  }
+
+  #urls {
+    margin : 0;
+    padding-left : 0;
+    width : 290px;
+  }
+
+  #urls li {
+    overflow : hidden;
+  }
+
+  input#q {
+    width : 130px;
+  }
+
+  input#url {
+    width : 160px;
+  }
+
+}

data/public/js/js.js

@@ -1,23 +1,46 @@
+"use strict";
+
 var Murlsh = {};
 
-Murlsh.new_img = function(src, text) {
-  return $('<img />').attr({
+Murlsh.tag = function(name, attr, text) {
+  var klass;
+  var result = $('<' + name + ' />');
+
+  if (attr) {
+    if (attr.klass) {
+      klass = attr.klass;
+      delete attr.klass;
+    }
+    result.attr(attr);
+  }
+
+  if (text) {
+    result.text(text);
+  }
+
+  if (klass) {
+    result.addClass(klass);
+  }
+
+  return result;
+};
+
+Murlsh.img = function(src, text) {
+  text = text || '';
+  return Murlsh.tag('img', { 
     src : src,
     alt : text,
     title : text
   });
 };
 
-Murlsh.close = function() {
-  $(this).parent().remove();
-};
-
-Murlsh.closer_add = function(x) {
-  var html = (typeof x == 'object') ? $('<div />').append(x).html() : x;
+Murlsh.closer_add = function(x, header) {
+  var html = (typeof x == 'object') ? Murlsh.tag('div').append(x).html() : x;
 
   $.jGrowl(html, {
     closeTemplate : 'X',
     glue :'before',
+    header : header,
     sticky : true
     });
 };
@@ -33,34 +56,40 @@ Murlsh.object_tag = function(data, height, width, params) {
 };
 
 Murlsh.flickr_thumb = function(d) {
-  var base = 'http://farm' + d.photo.farm + '.static.flickr.com/' +
-    d.photo.server + '/' + d.photo.id + '_';
-  var zoom;
-  if (d.photo.originalsecret) {
-    zoom = base + d.photo.originalsecret + '_o.' + d.photo.originalformat;
-  } else {
-    zoom = base + d.photo.secret + '_m.jpg';
-  }
+  var photo = d.photo;
+  if (d.stat == 'ok') {
+    var base = 'http://farm' + photo.farm + '.static.flickr.com/' +
+      photo.server + '/' + photo.id + '_';
+    var zoom;
+    if (photo.originalsecret) {
+      zoom = base + photo.originalsecret + '_o.' + photo.originalformat;
+    } else {
+    zoom = base + photo.secret + '_m.jpg';
+    }
 
-  return Murlsh.new_img(base + d.photo.secret + '_s.jpg',
-    d.photo.title._content).addClass(
-    'thumb flickr').data('zoom', zoom);
+    var 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);
+  }
 };
 
 Murlsh.flickr_click = function() {
-  Murlsh.closer_add(Murlsh.new_img($(this).data('zoom'), ''));
+  Murlsh.closer_add(Murlsh.img($(this).data('zoom')));
 };
 
-Murlsh.imageshack_thumb = function(prefix, ext) {
-  return Murlsh.new_img(prefix + 'th.' + ext, '').addClass('thumb imgshack');
+Murlsh.img_thumb = function(prefix, ext) {
+  return Murlsh.img(prefix + 'th.' +
+    (ext.match(/^pdf$/i) ? 'png' : ext)).addClass('thumb');
 };
 
-Murlsh.imageshack_click = function() {
-  Murlsh.closer_add(Murlsh.new_img($(this).data('href'), ''));
+Murlsh.img_click = function() {
+  Murlsh.closer_add(Murlsh.img($(this).data('href')));
 };
 
 Murlsh.vimeo_thumb = function(d) {
-  return Murlsh.new_img(d.thumbnail_url, d.title).addClass('thumb vimeo').attr({
+  return Murlsh.img(d.thumbnail_url, d.title).addClass('thumb vimeo').attr({
     height : d.thumbnail_height,
     width : d.thumbnail_width
   });
@@ -71,7 +100,7 @@ Murlsh.vimeo_click = function() {
 };
 
 Murlsh.youtube_thumb = function(id) {
-  return Murlsh.new_img('http://img.youtube.com/vi/' + id + '/1.jpg',
+  return Murlsh.img('http://img.youtube.com/vi/' + id + '/1.jpg',
     'click to watch').addClass('thumb youtube').data('id', id);
 };
 
@@ -81,109 +110,99 @@ Murlsh.youtube_click = function() {
   Murlsh.closer_add(Murlsh.object_tag(movie, 344, 425, [{ name : 'movie', value : movie }]));
 };
 
+Murlsh.thumb_insert = function(img, click_function, a) {
+  if (img) {
+    if (Murlsh.is_iphone()) {
+      a.prepend(img);
+    } else {
+      a.before(img.click(click_function));
+    }
+  }
+};
+
 Murlsh.is_iphone = function() {
   return navigator.userAgent.match(/i(phone|pod)/i);
 };
 
+Murlsh.href_res = {
+  flickr :
+    /^http:\/\/(?:www\.)?flickr\.com\/photos\/[^\/]+?\/([0-9]+)/i,
+  imageshack :
+    /^(http:\/\/img\d+\.imageshack\.us\/img\d+\/\d+\/\w+\.)(jpe?g|gif|png)$/i,
+  mp3 :
+    /.*\.mp3$/i,
+  s3 :
+    /^(http:\/\/static\.mmb\.s3\.amazonaws.com\/.*\.)(jpe?g|gif|pdf|png)$/i,
+  vimeo :
+    /^http:\/\/(?:www\.)?vimeo\.com\/([0-9]+)$/i,
+  youtube :
+    /^http:\/\/(?:(?:www|uk)\.)?youtube\.com\/watch\?v=(.+?)(?:&|$)/i
+};
+
 Murlsh.add_extra = function() {
   var this_a = $(this);
 
   var href = $(this).attr('href');
 
-  var flickr_match =
-    /^http:\/\/(?:www\.)?flickr\.com\/photos\/[^\/]+?\/([0-9]+)/i.exec(
-    href);
-
-  var imageshack_match =
-    /^(http:\/\/img\d+\.imageshack\.us\/img\d+\/\d+\/\w+\.)(jpg|gif|png)$/i.exec(
-    href);
-
-  var mp3_match = /.*\.mp3$/i.exec(href);
-
-  var s3_match =
-    /^(http:\/\/static\.mmb\.s3\.amazonaws.com\/.*\.)(jpg|gif|png)$/i.exec(
-    href);
-
-  var vimeo_match = /^http:\/\/(?:www\.)?vimeo\.com\/([0-9]+)$/i.exec(href);
-
-  var youtube_match =
-    /^http:\/\/(?:(?:www|uk)\.)?youtube\.com\/watch\?v=(.+?)(?:&|$)/i.exec(
-    href);
+  var match = {};
+  $.each(Murlsh.href_res, function(x, re) { return !(match[x] = re.exec(href)); });
 
   var thumb;
-  var thumb_insert_func;
 
-  if (flickr_match) {
-    thumb_insert_func = function flickr_thumb_insert(d) {
-      var img = Murlsh.flickr_thumb(d);
-      if (Murlsh.is_iphone()) {
-        this_a.prepend(img);
-      } else {
-        this_a.before(img.click(Murlsh.flickr_click));
-      }
+  if (match.flickr) {
+    var callback = function(d) {
+      Murlsh.thumb_insert(Murlsh.flickr_thumb(d), Murlsh.flickr_click, this_a);
     };
     $.getJSON('http://api.flickr.com/services/rest/?api_key=d04e574aaf11bf2e1c03cba4ee7e5725&method=flickr.photos.getinfo&format=json&photo_id=' +
-      flickr_match[1] + '&jsoncallback=?', thumb_insert_func);
-  } else if (imageshack_match) {
-    thumb = Murlsh.imageshack_thumb(imageshack_match[1], imageshack_match[2]);
-    this_a.html('imageshack.us');
-    if (Murlsh.is_iphone()) {
-      this_a.prepend(thumb);
-    } else {
-      this_a.before(thumb.data('href', imageshack_match[0]).click(
-        Murlsh.imageshack_click));
-    }
-  } else if (mp3_match) {
+      match.flickr[1] + '&jsoncallback=?', callback);
+  } else if (match.imageshack) {
+    thumb = Murlsh.img_thumb(match.imageshack[1], match.imageshack[2]).data(
+      'href', match.imageshack[0]);
+    Murlsh.thumb_insert(thumb, Murlsh.img_click, this_a.html('imageshack.us'));
+  } else if (match.mp3) {
     var swf = 'swf/player_mp3_mini.swf';
     $(this).before(Murlsh.object_tag(swf, 20, 200, [
       { name : 'bgcolor', value : '#000000' },
-      { name : 'FlashVars', value : 'mp3=' + mp3_match[0] },
+      { name : 'FlashVars', value : 'mp3=' + match.mp3[0] },
       { name : 'movie', value : swf }
     ]));
-  } else if (s3_match) {
-    thumb = Murlsh.imageshack_thumb(s3_match[1], s3_match[2]);
-    if (Murlsh.is_iphone()) {
-      this_a.html(thumb);
+  } else if (match.s3) {
+    thumb = Murlsh.img_thumb(match.s3[1], match.s3[2]);
+    if (match.s3[2].match(/^pdf$/i)) {
+	this_a.before(thumb).html('pdf');
     } else {
-      this_a.html('link');
-      this_a.before(thumb.data('href', s3_match[0]).click(
-        Murlsh.imageshack_click));
-    }
-  } else if (vimeo_match) {
-    thumb_insert_func = function vimeo_thumb_insert(d) {
-      var img = Murlsh.vimeo_thumb(d);
       if (Murlsh.is_iphone()) {
-        this_a.prepend(img);
+        this_a.html(thumb);
       } else {
-        this_a.before(img.data('embed_html', d.html).click(
-          Murlsh.vimeo_click));
+        this_a.html('link');
+        this_a.before(thumb.data('href', match.s3[0]).click(Murlsh.img_click));
       }
+    }
+  } else if (match.vimeo) {
+    var callback = function(d) {
+      var thumb = Murlsh.vimeo_thumb(d).data('embed_html', d.html);
+      Murlsh.thumb_insert(thumb, Murlsh.vimeo_click, this_a);
     };
     $.getJSON('http://vimeo.com/api/oembed.json?url=http%3A//vimeo.com/' +
-      vimeo_match[1] + '&callback=?', thumb_insert_func);
-  } else if (youtube_match) {
-    var img = Murlsh.youtube_thumb(youtube_match[1]);
-    if (Murlsh.is_iphone()) {
-      $(this).prepend(img);
-    } else {
-      $(this).before(img.click(Murlsh.youtube_click));
-    }
+      match.vimeo[1] + '&callback=?', callback);
+  } else if (match.youtube) {
+    thumb = Murlsh.youtube_thumb(match.youtube[1]);
+    Murlsh.thumb_insert(thumb, Murlsh.youtube_click, this_a);
   }
 };
 
 Murlsh.format_li = function(d) {
-  var li = $('<li />').append($('<a />').attr('href', d.url).text(
-    d.title));
+  var li = Murlsh.tag('li').append(Murlsh.tag('a', { href : d.url }, d.title));
 
   if (d.name) {
-    li.prepend($('<div />').addClass('name').text(d.name));
+    li.prepend(Murlsh.tag('div', { klass : 'name' }, d.name));
   }
 
   var icon_size = 32;
 
   if (d.email) {
-    li.prepend($('<div />').addClass('icon').append(
-      Murlsh.new_img(
+    li.prepend(Murlsh.tag('div', { klass : 'icon' }).append(
+      Murlsh.img(
         'http://www.gravatar.com/avatar/' + d.email + '?s=' + icon_size,
         d.name).attr({
         width : icon_size,
@@ -194,29 +213,31 @@ Murlsh.format_li = function(d) {
   return li;
 };
 
-Murlsh.orientation_changed = function() {
-  if (window.orientation === 0 || window.orientation == 180) {
-    $('#urls').width(290);
-  } else {
-    $('#urls').width(450);
-  }
-};
+Murlsh.iphone_init = function() {
+  window.onorientationchange = function() {
+    if (window.orientation === 0 || window.orientation == 180) {
+      $('#urls').width(290);
+    } else {
+      $('#urls').width(450);
+    }
+  };
+
+  window.onorientationchange();
 
-window.onorientationchange = Murlsh.orientation_changed;
+  $('#urls li:first').prepend(Murlsh.tag('a', { href : '#bottom' }, 'bottom'));
+  $('#urls li:last').append(Murlsh.tag('a', { href : '#urls' }, 'top'));
+};
 
 $(document).ready(function() {
   if (Murlsh.is_iphone()) {
-    Murlsh.orientation_changed();
-    $('#urls li:first').prepend($('<a />').attr('href', '#bottom').text(
-      'bottom'));
-    $('#urls li:last').append($('<a />').attr('href', '#urls').text('top'));
+    Murlsh.iphone_init();
   }
-  $('a').map(Murlsh.add_extra);
-  $('#urls li:even').addClass('even');
+  $('#urls a').map(Murlsh.add_extra);
 
   $('#submit').click(function() {
     $.post('url', {
       url : $('#url').val(),
+      via : $('#via').val(),
       auth : $('#auth').val()
       }, function(d) {
         $.each(d, function(i, v) {
@@ -225,6 +246,7 @@ $(document).ready(function() {
           $(li).children('a:first').map(Murlsh.add_extra);
         });
         $('#url').val('');
+        $('#via').val('');
       }, 'json');
   });
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-05 00:00:00 -05:00
+date: 2009-12-13 00:00:00 -05:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - lib/murlsh/get_content_type.rb
 - lib/murlsh/get_title.rb
 - lib/murlsh/markup.rb
+- lib/murlsh/openlock.rb
 - lib/murlsh/plugin.rb
 - lib/murlsh/referrer.rb
 - lib/murlsh/sqlite3_adapter.rb
@@ -121,7 +122,6 @@ files:
 - plugins/lookup_content_type_title.rb
 - plugins/update_feed.rb
 - public/css/jquery.jgrowl.css
-- public/css/phone.css
 - public/css/screen.css
 - public/js/jquery-1.3.2.min.js
 - public/js/jquery.cookie.js

data/public/css/phone.css

@@ -1,26 +0,0 @@
-a.feed {
-  display : none;
-}
-
-body {
-  margin : 0;
-  padding : 0;
-}
-
-#urls {
-  margin : 0;
-  padding-left : 0;
-  width : 290px;
-}
-
-#urls li {
-  overflow : hidden;
-}
-
-input#q {
-  width : 130px;
-}
-
-input#url {
-  width : 160px;
-}