murlsh 1.4.1 → 1.5.0

data/lib/murlsh/rss_body.rb

@@ -0,0 +1,46 @@
+require 'rss/maker'
+
+require 'murlsh'
+
+module Murlsh
+
+  # Rss feed builder.
+  class RssBody
+    include Murlsh::FeedBody
+
+    # Rss feed builder.
+    def build
+      if defined?(@body)
+        @body
+      else
+        feed = RSS::Maker.make('2.0') do |f|
+          f.channel.title = f.channel.description = feed_title
+          f.channel.link = feed_url
+
+          f.items.do_sort = true
+
+          urls.each do |mu|
+            Murlsh::Plugin.hooks('url_display_pre') do |p|
+              p.run mu, req, config
+            end
+
+            i = f.items.new_item
+            i.title = mu.title_stripped
+            i.link = mu.url
+            i.date = mu.time
+
+            if EnclosureContentTypes.include? mu.content_type
+              i.enclosure.url = mu.url
+              i.enclosure.type = mu.content_type
+              i.enclosure.length = mu.content_length
+            end
+          end
+        end
+
+        @body = feed
+      end
+    end
+
+  end
+
+end

data/lib/murlsh/rss_server.rb

@@ -0,0 +1,38 @@
+require 'uri'
+
+require 'rack'
+
+require 'murlsh'
+
+module Murlsh
+
+  # Serve RSS feed.
+  class RssServer
+
+    def initialize(config); @config = config; end
+
+    # Respond to a GET request for RSS feed.
+    def get(req)
+      conditions = Murlsh::SearchConditions.new(req['q']).conditions
+      page = 1
+      per_page = config.fetch('num_posts_feed', 25)
+
+      result_set = Murlsh::UrlResultSet.new(conditions, page, per_page)
+      urls = result_set.results
+
+      feed_url = URI.join(config.fetch('root_url'), 'rss.rss')
+      body = Murlsh::RssBody.new(config, req, feed_url, urls)
+
+      resp = Rack::Response.new(body, 200,
+        'Cache-Control' => 'must-revalidate, max-age=0',
+        'Content-Type' => 'application/rss+xml')
+      if u = body.updated
+        resp['Last-Modified'] = u.httpdate
+      end
+      resp
+    end
+
+    attr_reader :config
+  end
+
+end

data/lib/murlsh/search_conditions.rb

@@ -17,8 +17,8 @@ module Murlsh
         likes = []
         params = []
         search_cols.product(tokens).each do |col,tok|
-          likes << "#{col} LIKE ?"
-          params << "%#{tok}%"
+          likes << "LOWER(#{col}) LIKE ?"
+          params << "%#{tok.downcase}%"
         end
         [likes.join(' OR ')].push(*params)
       else

data/lib/murlsh/uri_ask.rb

@@ -17,14 +17,14 @@ module Murlsh
     # Options:
     # * :failproof - if true hide all exceptions and return empty string on failure
     # * :headers - hash of headers to send in request
-    def content_length(options={}); header 'content-length', options; end
+    def content_length(options={}); header('content-length', options); end
 
     # Get the content type.
     #
     # Options:
     # * :failproof - if true hide all exceptions and return empty string on failure
     # * :headers - hash of headers to send in request
-    def content_type(options={}); header 'content-type', options; end
+    def content_type(options={}); header('content-type', options); end
 
     # Get the HTML title.
     #

data/lib/murlsh/url_body.rb

@@ -5,7 +5,6 @@ module Murlsh
 
   # Url list page builder.
   class UrlBody < Builder::XmlMarkup
-    include Murlsh::BuildMd5
     include Murlsh::Markup
 
     def initialize(config, req, result_set, content_type='text/html')
@@ -44,18 +43,22 @@ module Murlsh
         @body = html(:lang => 'en') {
           headd
           body {
-            self.p(:id => 'menu') { home_link ; text! ' | ' ; feed_link }
+            menu
             search_form
             quick_search
             ul(:id => 'urls') {
               last = nil
 
               @result_set.results.each do |mu|
+                Murlsh::Plugin.hooks('url_display_pre') do |p|
+                  p.run mu, @req, @config
+                end
+
                 li {
                   unless mu.same_author?(last)
                     avatar_url = Murlsh::Plugin.hooks('avatar').inject(
                       nil) do |url_so_far,plugin|
-                      plugin.run(url_so_far, mu, @config)
+                      plugin.run url_so_far, mu, @config
                     end
                     div(:class => 'icon') {
                       murlsh_img :src => avatar_url, :text => mu.name
@@ -119,6 +122,15 @@ module Murlsh
         (@req['q'] ? " /#{@req['q']}" : ''))
     end
 
+    # Menu builder.
+    def menu
+      self.p(:id => 'menu') {
+        home_link ; text! ' | '
+        feed_link ; text! ' | '
+        random_link
+      }
+    end
+
     # Home link builder.
     def home_link; a 'Home', :href => @config.fetch('root_url'); end
 
@@ -127,6 +139,9 @@ module Murlsh
       a 'Feed', :href => @config.fetch('feed_file'), :class => 'feed'
     end
 
+    # Random link builder.
+    def random_link; a 'Random', :href => 'random', :rel => 'nofollow'; end
+
     # Quick search list builder.
     def quick_search
       if @config['quick_search']
@@ -148,7 +163,7 @@ module Murlsh
 
     # Search form builder.
     def search_form
-      form(:action => '', :method => 'get') {
+      form(:action => @config.fetch('root_url'), :method => 'get') {
         fieldset {
           form_input :id => 'q', :size => 32, :value => @req['q']
           form_input :type => 'submit', :value => 'Search'
@@ -171,7 +186,7 @@ module Murlsh
 
     # Url add form builder.
     def add_form
-      form(:action => '', :method => 'post') {
+      form(:action => 'url', :method => 'post') {
         fieldset(:id => 'add') {
           self.p { form_input :id => 'url', :label => 'Add URL', :size => 32 }
           self.p { form_input :id => 'via', :label => 'Via', :size => 32 }
@@ -191,7 +206,7 @@ module Murlsh
     def powered_by
       self.p {
         text! 'Powered by '
-        a 'murlsh', :href => 'http://github.com/mmb/murlsh/'
+        a 'murlsh', :href => 'https://github.com/mmb/murlsh'
       }
     end
 

data/lib/murlsh/url_result_set.rb

@@ -23,14 +23,14 @@ module Murlsh
     end
 
     def prev_page
-      unless instance_variable_defined? :@prev_page
+      unless instance_variable_defined?(:@prev_page)
         @prev_page = page - 1  if (2..total_pages) === page
       end
       @prev_page
     end
 
     def next_page
-      unless instance_variable_defined? :@next_page
+      unless instance_variable_defined?(:@next_page)
         @next_page = page + 1  if page < total_pages
       end
       @next_page

data/lib/murlsh/url_server.rb

@@ -6,8 +6,6 @@ module Murlsh
   # Build responses for HTTP requests.
   class UrlServer
 
-    include HeadFromGet
-
     def initialize(config); @config = config; end
 
     # Respond to a GET request. Return a page of urls based on the query
@@ -16,28 +14,24 @@ module Murlsh
       conditions = Murlsh::SearchConditions.new(req['q']).conditions
       page = [req['p'].to_i, 1].max
       per_page = req['pp'] ? req['pp'].to_i :
-        @config.fetch('num_posts_page', 25)
+        config.fetch('num_posts_page', 25)
 
+      content_type = 'text/html; charset=utf-8'
       result_set = Murlsh::UrlResultSet.new(conditions, page, per_page)
 
-      resp = Rack::Response.new
-
-      resp['Content-Type'] = 'text/html; charset=utf-8'
-      resp.body = Murlsh::UrlBody.new(@config, req, result_set,
-        resp['Content-Type'])
+      body = Murlsh::UrlBody.new(config, req, result_set, content_type)
 
+      resp = Rack::Response.new
+      resp.write(body.build)
       resp['Cache-Control'] = 'must-revalidate, max-age=0'
-      resp['ETag'] = "\"#{resp.body.md5}\""
+      resp['Content-Type'] = content_type
 
       resp
     end
 
     # Respond to a POST request. Add the new url and return json.
     def post(req)
-      auth = req['auth']
-      if user = auth.empty? ? nil : Murlsh::Auth.new(
-        @config.fetch('auth_file')).auth(auth)
-
+      if user = auth_from_req(req)
         mu = Murlsh::Url.new do |u|
           u.url = req['url']
           u.email = user[:email]
@@ -45,7 +39,7 @@ module Murlsh
 
           # optional parameters
           unless req['thumbnail'].to_s.empty?
-            u.thumbnail_url = req['thumbnail']
+              u.thumbnail_url = req['thumbnail']
           end
 
           u.time = if req['time']
@@ -65,9 +59,9 @@ module Murlsh
         begin
           # validate before add_pre plugins have run and also after (in save!)
           raise ActiveRecord::RecordInvalid.new(mu)  unless mu.valid?
-          Murlsh::Plugin.hooks('add_pre') { |p| p.run mu, @config }
+          Murlsh::Plugin.hooks('add_pre') { |p| p.run mu, config }
           mu.save!
-          Murlsh::Plugin.hooks('add_post') { |p| p.run mu, @config }
+          Murlsh::Plugin.hooks('add_post') { |p| p.run mu, config }
           response_body, response_code = [mu], 200
         rescue ActiveRecord::RecordInvalid => error
           response_body = {
@@ -84,6 +78,15 @@ module Murlsh
         'Content-Type' => 'application/json' })
     end
 
+    # Authorize a user from a request.
+    def auth_from_req(req)
+      secret = req['auth']
+ 
+      secret.to_s.empty? ? nil : Murlsh::Auth.new(
+        config.fetch('auth_file')).auth(secret)
+    end
+
+    attr_reader :config
   end
 
 end

data/lib/murlsh/write_ordered_hash.rb

@@ -0,0 +1,17 @@
+require 'murlsh'
+
+module Murlsh
+
+  module_function
+
+  # Sort a hash by key and write it to a file as YAML.
+  def write_ordered_hash(h, path)
+    h.extend(Murlsh::YamlOrderedHash)
+    h.each_value do |v|
+      v.extend(Murlsh::YamlOrderedHash)  if v.is_a?(Hash)
+    end
+
+    open(path, 'w') { |f| YAML.dump(h, f) }
+  end
+
+end

data/lib/murlsh.rb

@@ -1,10 +1,10 @@
-require 'murlsh/head_from_get'
 require 'murlsh/search_conditions'
 
+require 'murlsh/atom_server'
 require 'murlsh/ask'
 require 'murlsh/auth'
-require 'murlsh/build_md5'
 require 'murlsh/build_query'
+require 'murlsh/cat_files'
 require 'murlsh/cp_r_safe'
 require 'murlsh/delicious_parse'
 require 'murlsh/dispatch'
@@ -12,16 +12,24 @@ require 'murlsh/doc'
 require 'murlsh/etag_add_encoding'
 require 'murlsh/failproof'
 require 'murlsh/far_future_expires'
+require 'murlsh/feed_body'
 require 'murlsh/image_list'
 require 'murlsh/img_store'
 require 'murlsh/install'
 require 'murlsh/json_body'
 require 'murlsh/json_server'
 require 'murlsh/jsonp_body'
+require 'murlsh/m3u_body'
+require 'murlsh/m3u_server'
 require 'murlsh/markup'
 require 'murlsh/must_revalidate'
 require 'murlsh/openlock'
+require 'murlsh/podcast_server'
 require 'murlsh/plugin'
+require 'murlsh/pop_server'
+require 'murlsh/random_server'
+require 'murlsh/rss_body'
+require 'murlsh/rss_server'
 require 'murlsh/search_grammar'
 require 'murlsh/time_ago'
 require 'murlsh/uri_ask'
@@ -31,4 +39,7 @@ require 'murlsh/url_body'
 require 'murlsh/url'
 require 'murlsh/url_result_set'
 require 'murlsh/url_server'
+require 'murlsh/write_ordered_hash'
 require 'murlsh/yaml_ordered_hash'
+
+require 'murlsh/atom_body'

data/murlsh.gemspec

@@ -1,201 +1,48 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{murlsh}
-  s.version = "1.4.1"
+  s.name = 'murlsh'
+  s.version = '1.5.0'
+  s.summary = 'Host your bookmarks or maintain a link blog'
+  s.description = s.summary
+  s.homepage = 'https://github.com/mmb/murlsh'
+  s.authors = ['Matthew M. Boedicker']
+  s.email = %w{matthewm@boedicker.org}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matthew M. Boedicker"]
-  s.date = %q{2011-02-01}
-  s.default_executable = %q{murlsh}
-  s.description = %q{Host your bookmarks or maintain a link blog}
-  s.email = %q{matthewm@boedicker.org}
-  s.executables = ["murlsh"]
-  s.extra_rdoc_files = [
-    "README.textile"
-  ]
-  s.files = [
-    ".htaccess",
-    "COPYING",
-    "README.textile",
-    "Rakefile",
-    "VERSION",
-    "bin/murlsh",
-    "config.ru",
-    "config.yaml",
-    "lib/murlsh.rb",
-    "lib/murlsh/ask.rb",
-    "lib/murlsh/auth.rb",
-    "lib/murlsh/build_md5.rb",
-    "lib/murlsh/build_query.rb",
-    "lib/murlsh/cp_r_safe.rb",
-    "lib/murlsh/delicious_parse.rb",
-    "lib/murlsh/dispatch.rb",
-    "lib/murlsh/doc.rb",
-    "lib/murlsh/etag_add_encoding.rb",
-    "lib/murlsh/failproof.rb",
-    "lib/murlsh/far_future_expires.rb",
-    "lib/murlsh/head_from_get.rb",
-    "lib/murlsh/image_list.rb",
-    "lib/murlsh/img_store.rb",
-    "lib/murlsh/install.rb",
-    "lib/murlsh/json_body.rb",
-    "lib/murlsh/json_server.rb",
-    "lib/murlsh/jsonp_body.rb",
-    "lib/murlsh/markup.rb",
-    "lib/murlsh/must_revalidate.rb",
-    "lib/murlsh/openlock.rb",
-    "lib/murlsh/plugin.rb",
-    "lib/murlsh/search_conditions.rb",
-    "lib/murlsh/search_grammar.rb",
-    "lib/murlsh/search_grammar.treetop",
-    "lib/murlsh/time_ago.rb",
-    "lib/murlsh/uri_ask.rb",
-    "lib/murlsh/uri_domain.rb",
-    "lib/murlsh/uri_get_path_query.rb",
-    "lib/murlsh/url.rb",
-    "lib/murlsh/url_body.rb",
-    "lib/murlsh/url_result_set.rb",
-    "lib/murlsh/url_server.rb",
-    "lib/murlsh/yaml_ordered_hash.rb",
-    "murlsh.gemspec",
-    "plugins/add_post_50_update_feed.rb",
-    "plugins/add_post_50_update_m3u.rb",
-    "plugins/add_post_50_update_podcast.rb",
-    "plugins/add_post_50_update_rss.rb",
-    "plugins/add_post_60_notify_hubs.rb",
-    "plugins/add_pre_30_unajax_twitter.rb",
-    "plugins/add_pre_35_url_clean.rb",
-    "plugins/add_pre_40_convert_mobile.rb",
-    "plugins/add_pre_45_supplied_thumbnail.rb",
-    "plugins/add_pre_50_lookup_content_type_title.rb",
-    "plugins/add_pre_50_media_thumbnail.rb",
-    "plugins/add_pre_50_open_graph_image.rb",
-    "plugins/add_pre_60_github_title.rb",
-    "plugins/add_pre_60_google_code_title.rb",
-    "plugins/add_pre_60_imgur.rb",
-    "plugins/add_pre_60_s3_image.rb",
-    "plugins/add_pre_60_twitter.rb",
-    "plugins/add_pre_65_html_thumb.rb",
-    "plugins/add_pre_65_img_thumb.rb",
-    "plugins/avatar_50_gravatar.rb",
-    "plugins/url_display_add_45_audio.rb",
-    "plugins/url_display_add_50_hostrec.rb",
-    "plugins/url_display_add_55_content_type.rb",
-    "plugins/url_display_add_60_via.rb",
-    "plugins/url_display_add_65_time.rb",
-    "public/css/jquery.jgrowl.css",
-    "public/css/screen.css",
-    "public/img/thumb/.gitignore",
-    "public/js/jquery-1.5.min.js",
-    "public/js/jquery.jgrowl_compressed.js",
-    "public/js/js.js",
-    "public/js/twitter-text-1.3.1.js",
-    "spec/auth_spec.rb",
-    "spec/dispatch_spec.rb",
-    "spec/doc_spec.rb",
-    "spec/img_store_spec.rb",
-    "spec/markup_spec.rb",
-    "spec/uri_ask_spec.rb",
-    "spec/uri_domain_spec.rb",
-    "spec/url_spec.rb",
-    "spec/yaml_ordered_hash_spec.rb"
-  ]
-  s.homepage = %q{http://github.com/mmb/murlsh}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{Host your bookmarks or maintain a link blog}
-  s.test_files = [
-    "spec/auth_spec.rb",
-    "spec/dispatch_spec.rb",
-    "spec/doc_spec.rb",
-    "spec/img_store_spec.rb",
-    "spec/markup_spec.rb",
-    "spec/uri_ask_spec.rb",
-    "spec/uri_domain_spec.rb",
-    "spec/url_spec.rb",
-    "spec/yaml_ordered_hash_spec.rb"
-  ]
+  s.required_rubygems_version = '>= 1.3.6'
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  %w{
+    activerecord >= 2.3.4
+    aws-s3 ~> 0.6
+    bcrypt-ruby >= 2.1.2
+    builder > 0
+    htmlentities >= 4.2.0
+    json >= 1.2.3
+    nokogiri ~> 1.0
+    plumnailer >= 0.1.3
+    postrank-uri ~> 1.0
+    public_suffix_service ~> 0.0
+    push-notify >= 0.1.0
+    rack >= 1.0.0
+    rack-cache >= 0.5.2
+    rack-rewrite >= 1.0.2
+    rack-throttle >= 0.3.0
+    rmagick >= 1.15.14
+    rmail ~> 1.0
+    sqlite3 ~> 1.3
+    tinyatom >= 0.3.4
+    treetop ~> 1.4
+    twitter >= 0.9.12
+    }.each_slice(3) { |g,o,v| s.add_dependency(g, "#{o} #{v}") }
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
-      s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
-      s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_runtime_dependency(%q<htmlentities>, [">= 4.2.0"])
-      s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
-      s.add_runtime_dependency(%q<nokogiri>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<plumnailer>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<postrank-uri>, ["~> 1.0"])
-      s.add_runtime_dependency(%q<public_suffix_service>, ["~> 0.0"])
-      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-rewrite>, [">= 1.0.2"])
-      s.add_runtime_dependency(%q<rack-throttle>, [">= 0.3.0"])
-      s.add_runtime_dependency(%q<rmagick>, [">= 1.15.14"])
-      s.add_runtime_dependency(%q<sqlite3>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<tinyatom>, [">= 0.3.3"])
-      s.add_runtime_dependency(%q<treetop>, ["~> 1.4"])
-      s.add_runtime_dependency(%q<twitter>, [">= 0.9.12"])
-      s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
-      s.add_development_dependency(%q<flog>, [">= 2.5.0"])
-      s.add_development_dependency(%q<rack-test>, ["~> 0.5"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 2.3.4"])
-      s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
-      s.add_dependency(%q<builder>, [">= 2.1.2"])
-      s.add_dependency(%q<htmlentities>, [">= 4.2.0"])
-      s.add_dependency(%q<json>, [">= 1.2.3"])
-      s.add_dependency(%q<nokogiri>, ["~> 1.0"])
-      s.add_dependency(%q<plumnailer>, [">= 0.1.0"])
-      s.add_dependency(%q<postrank-uri>, ["~> 1.0"])
-      s.add_dependency(%q<public_suffix_service>, ["~> 0.0"])
-      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-rewrite>, [">= 1.0.2"])
-      s.add_dependency(%q<rack-throttle>, [">= 0.3.0"])
-      s.add_dependency(%q<rmagick>, [">= 1.15.14"])
-      s.add_dependency(%q<sqlite3>, ["~> 1.3"])
-      s.add_dependency(%q<tinyatom>, [">= 0.3.3"])
-      s.add_dependency(%q<treetop>, ["~> 1.4"])
-      s.add_dependency(%q<twitter>, [">= 0.9.12"])
-      s.add_dependency(%q<fakeweb>, ["~> 1.3"])
-      s.add_dependency(%q<flog>, [">= 2.5.0"])
-      s.add_dependency(%q<rack-test>, ["~> 0.5"])
-      s.add_dependency(%q<rspec>, ["~> 2.0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 2.3.4"])
-    s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
-    s.add_dependency(%q<builder>, [">= 2.1.2"])
-    s.add_dependency(%q<htmlentities>, [">= 4.2.0"])
-    s.add_dependency(%q<json>, [">= 1.2.3"])
-    s.add_dependency(%q<nokogiri>, ["~> 1.0"])
-    s.add_dependency(%q<plumnailer>, [">= 0.1.0"])
-    s.add_dependency(%q<postrank-uri>, ["~> 1.0"])
-    s.add_dependency(%q<public_suffix_service>, ["~> 0.0"])
-    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-rewrite>, [">= 1.0.2"])
-    s.add_dependency(%q<rack-throttle>, [">= 0.3.0"])
-    s.add_dependency(%q<rmagick>, [">= 1.15.14"])
-    s.add_dependency(%q<sqlite3>, ["~> 1.3"])
-    s.add_dependency(%q<tinyatom>, [">= 0.3.3"])
-    s.add_dependency(%q<treetop>, ["~> 1.4"])
-    s.add_dependency(%q<twitter>, [">= 0.9.12"])
-    s.add_dependency(%q<fakeweb>, ["~> 1.3"])
-    s.add_dependency(%q<flog>, [">= 2.5.0"])
-    s.add_dependency(%q<rack-test>, ["~> 0.5"])
-    s.add_dependency(%q<rspec>, ["~> 2.0"])
-  end
-end
+  %w{
+    fakeweb ~> 1.3
+    flog >= 2.5.0
+    rack-test ~> 0.5
+    rspec ~> 2.0
+    }.each_slice(3) { |g,o,v| s.add_development_dependency(g, "#{o} #{v}") }
 
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files spec/*`.split("\n")
+  s.executables = %w{murlsh}
+end

data/plugins/add_post_60_notify_hubs.rb

@@ -15,9 +15,10 @@ module Murlsh
       unless hubs.empty?
         require 'push-notify'
 
-        feed_url = URI.join(config['root_url'], config['feed_file'])
+        feed_url = URI.join(config.fetch('root_url'), config.fetch('feed_file'))
         begin
-          PushNotify::Content.new(feed_url).tell(*hubs.map { |h| h['publish_url'] })
+          PushNotify::Content.new(feed_url).tell(
+            *hubs.map { |h| h.fetch('publish_url') })
         rescue Exception
         end
       end

data/plugins/add_pre_30_unajax_twitter.rb

@@ -10,7 +10,7 @@ module Murlsh
     TwitterAjaxRe = %r{^(https?://twitter\.com/)#!/}i
 
     def self.run(url, config)
-      url.url.sub!(TwitterAjaxRe, '\1')
+      url.url.sub! TwitterAjaxRe, '\1'
       url.via.sub!(TwitterAjaxRe, '\1')  if url.via
     end
 

data/plugins/add_pre_40_thumbnail_shortcuts.rb

@@ -0,0 +1,23 @@
+module Murlsh
+
+  # Shortcuts for user-specified thumbnail urls.
+  #
+  # These keys can be passed in as the 'thumbnail' parameter when adding a url
+  # and they will be converted to the corresponding url.
+  class AddPre40ThumbnailShortcuts < Plugin
+
+    @hook = 'add_pre'
+
+    Shortcuts = {
+      # 'trollin' => 'http://imagehost.com/trollface.jpg',
+    }
+
+    def self.run(url, config)
+      if Shortcuts.key?(url.thumbnail_url)
+        url.thumbnail_url = Shortcuts[url.thumbnail_url]
+      end
+    end
+
+  end
+
+end