murlsh 0.5.2 → 0.6.0

data/README.textile

@@ -9,6 +9,7 @@ Simple site for a small group of people to share or archive urls.
 * looks good on iPhone
 * rack interface
 * plug-in interface
+* PubSubHubbub notification
 
 See "http://urls.matthewm.boedicker.org/":http://urls.matthewm.boedicker.org/ for example.
 

data/Rakefile

@@ -11,7 +11,7 @@ yaml
 rubygems
 
 flog
-rake/testtask
+spec/rake/spectask
 sqlite3
 
 murlsh
@@ -94,8 +94,8 @@ task :flog do
 end
 
 desc "Run test suite."
-Rake::TestTask.new do |t|
-  t.pattern = 'test/*_test.rb'
+Spec::Rake::SpecTask.new('test') do |t|
+  t.spec_files = FileList['spec/*_spec.rb']
   t.verbose = true
   t.warning = true
 end

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/bin/murlsh

@@ -2,7 +2,36 @@
 
 require 'fileutils'
 
-FileUtils.cp_r(
+def ask(prompt, default)
+  print "#{prompt} [#{default}] "
+  answer = gets.strip
+  answer = default if answer.empty?
+  answer
+end
+
+def cp_r_safe(sources, dest, options)
+  sources.each do |source|
+    new = File.join(dest, File.split(File.expand_path(source)).last)
+
+    if File.directory?(source)
+      FileUtils.mkdir_p(new, options)
+      cp_r_safe(Dir.foreach(source).
+        reject { |f| %w{. ..}.include?(f) }.
+        collect { |f| File.join(source, f) }, new, options)
+    else
+      answer = if File.exists?(new)
+        ask("#{new} exists. Overwrite?", 'n')
+      else
+        'y'
+      end
+
+      FileUtils.copy(source, new, options) if answer == 'y'
+    end
+  end
+
+end
+
+cp_r_safe(
   %w{.htaccess config.ru config.yaml plugins/ public/ Rakefile}.collect { |x| 
     File.join(File.dirname(__FILE__), '..', x) }, '.', :verbose => true)
 

data/config.yaml

@@ -13,7 +13,8 @@ css_files:
 - css/jquery.jgrowl.css
 - css/screen.css
 js_files:
-- js/jquery-1.4.min.js
+- js/jquery-1.4.2.min.js
 - js/jquery.cookie.js
 - js/jquery.jgrowl_compressed.js
 - js/js.js
+pubsubhubbub_hubs: []

data/lib/murlsh/atom_feed.rb

@@ -16,10 +16,12 @@ module Murlsh
     def initialize(root_url, options={})
       options = {
         :filename => 'atom.xml',
-        :title => 'Atom feed' }.merge(options)
+        :title => 'Atom feed',
+        :hubs => []}.merge(options)
       @root_url = root_url
       @filename = options[:filename]
       @title = options[:title]
+      @hubs = options[:hubs]
 
       root_uri = URI(@root_url)
 
@@ -40,6 +42,7 @@ module Murlsh
       xm.feed(:xmlns => 'http://www.w3.org/2005/Atom') {
         xm.id(@root_url)
         xm.link(:href => URI.join(@root_url, @filename), :rel => 'self')
+        @hubs.each { |hub| xm.link(:href => hub, :rel => 'hub') }
         xm.title(@title)
         xm.updated(entries.collect { |mu| mu.time }.max.xmlschema)
         entries.each do |mu|
@@ -69,10 +72,9 @@ module Murlsh
     end
 
     def via(xm, mu)
-      begin
+      Murlsh::failproof do
         xm.link(:rel => 'via', :type => 'text/html', :href => mu.via,
           :title => URI(mu.via).domain) if mu.via
-      rescue Exception
       end
     end
 

data/lib/murlsh/url.rb

@@ -25,7 +25,7 @@ module Murlsh
 
     # Return text showing what domain a link goes to.
     def hostrec
-      domain = begin; URI(url).domain; rescue Exception; end
+      domain = Murlsh::failproof { URI(url).domain }
 
       domain = Murlsh::Plugin.hooks('hostrec').inject(domain) {
         |result,plugin| plugin.run(result, url, title) }
@@ -34,14 +34,7 @@ module Murlsh
     end
 
     # Yield the url that the url came from.
-    def viarec
-      if via
-        begin
-          yield URI(via)
-        rescue Exception
-        end
-      end
-    end
+    def viarec; Murlsh::failproof { yield URI(via) } if via; end
 
     # Return true if this url is an image.
     def is_image?

data/lib/murlsh/url_body.rb

@@ -57,7 +57,7 @@ module Murlsh
                 a(mu.title_stripped, :href => mu.url)
 
                 mu.hostrec do |hostrec|
-                  self.sub(" [#{hostrec}]", :class => 'host')
+                  self.span(" [#{hostrec}]", :class => 'host')
                 end
                 mu.viarec do |via|
                   span(:class => 'via') {

data/murlsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murlsh}
-  s.version = "0.5.2"
+  s.version = "0.6.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-01-17}
+  s.date = %q{2010-03-10}
   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}
@@ -45,36 +45,37 @@ Gem::Specification.new do |s|
      "lib/murlsh/url_server.rb",
      "lib/murlsh/xhtml_response.rb",
      "murlsh.gemspec",
-     "plugins/hostrec_redundant.rb",
-     "plugins/hostrec_skip.rb",
-     "plugins/lookup_content_type_title.rb",
-     "plugins/update_feed.rb",
+     "plugins/add_post_50_update_feed.rb",
+     "plugins/add_post_60_notify_hubs.rb",
+     "plugins/add_pre_50_lookup_content_type_title.rb",
+     "plugins/hostrec_50_redundant.rb",
+     "plugins/hostrec_60_skip.rb",
      "public/css/jquery.jgrowl.css",
      "public/css/screen.css",
-     "public/js/jquery-1.4.min.js",
+     "public/js/jquery-1.4.2.min.js",
      "public/js/jquery.cookie.js",
      "public/js/jquery.jgrowl_compressed.js",
      "public/js/js.js",
      "public/swf/player_mp3_mini.swf",
-     "test/atom_feed_test.rb",
-     "test/auth_test.rb",
-     "test/markup_test.rb",
-     "test/uri_ask_test.rb",
-     "test/uri_test.rb",
-     "test/xhtml_response_test.rb"
+     "spec/atom_feed_spec.rb",
+     "spec/auth_spec.rb",
+     "spec/markup_spec.rb",
+     "spec/uri_ask_spec.rb",
+     "spec/uri_spec.rb",
+     "spec/xhtml_response_spec.rb"
   ]
   s.homepage = %q{http://github.com/mmb/murlsh}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{url sharing site framework}
   s.test_files = [
-    "test/xhtml_response_test.rb",
-     "test/uri_ask_test.rb",
-     "test/markup_test.rb",
-     "test/uri_test.rb",
-     "test/atom_feed_test.rb",
-     "test/auth_test.rb"
+    "spec/xhtml_response_spec.rb",
+     "spec/atom_feed_spec.rb",
+     "spec/auth_spec.rb",
+     "spec/uri_ask_spec.rb",
+     "spec/markup_spec.rb",
+     "spec/uri_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

data/plugins/{update_feed.rb → add_post_50_update_feed.rb}

@@ -3,7 +3,7 @@ require 'murlsh'
 module Murlsh
 
   # regenerate atom feed after a new url has been added
-  class UpdateFeed < Plugin
+  class AddPost50UpdateFeed < Plugin
 
     Hook = 'add_post'
 
@@ -13,7 +13,8 @@ module Murlsh
 
       feed = Murlsh::AtomFeed.new(config.fetch('root_url'),
         :filename => config.fetch('feed_file'),
-        :title => config.fetch('page_title', ''))
+        :title => config.fetch('page_title', ''),
+        :hubs => config.fetch('pubsubhubbub_hubs', []).collect { |x| x['subscribe_url'] } )
 
       feed.write(latest, config.fetch('feed_file'))
     end

data/plugins/add_post_60_notify_hubs.rb

@@ -0,0 +1,36 @@
+require 'murlsh'
+
+module Murlsh
+
+  # notify PubSubHubbub hubs that feed has been updated
+  class AddPost60NotifyHubs < Plugin
+
+    Hook = 'add_post'
+
+    def self.run(config)
+      hubs = config.fetch('pubsubhubbub_hubs', [])
+
+      unless hubs.empty?
+        require 'rubygems'
+        require 'eventmachine'
+        require 'pubsubhubbub'
+
+        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 }
+          }
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/plugins/{lookup_content_type_title.rb → add_pre_50_lookup_content_type_title.rb}

@@ -3,7 +3,7 @@ require 'murlsh'
 module Murlsh
 
   # try to fetch the content type and title of a url
-  class LookupContentTypeTitle < Plugin
+  class AddPre50LookupContentTypeTitle < Plugin
 
     Hook = 'add_pre'
 

data/plugins/{hostrec_redundant.rb → hostrec_50_redundant.rb}

@@ -1,7 +1,7 @@
 module Murlsh
 
   # skip showing host record if domain is contained in title
-  class HostrecRedundant < Plugin
+  class Hostrec50Redundant < Plugin
 
     Hook = 'hostrec'
 

data/plugins/{hostrec_skip.rb → hostrec_60_skip.rb}

@@ -1,7 +1,7 @@
 module Murlsh
 
   # skip showing host record for some domains
-  class HostrecSkip < Plugin
+  class Hostrec60Skip < Plugin
 
     Hook = 'hostrec'
 

data/public/css/screen.css

@@ -49,9 +49,12 @@ div.name {
 img.thumb, li object {
   float : left;
   margin-right : 10px;
+  border : 1px solid #808080;
+  -moz-border-radius : 5px;
+  -webkit-border-radius : 5px;
 }
 
-sub.host {
+span.host {
   color : #808080;
   font-family : monospace;
 }
@@ -113,6 +116,8 @@ div.jGrowl div.jGrowl-closer {
   body {
     margin : 0;
     padding : 0;
+    font-size : 1.25em;
+    line-height : 1.875em;
   }
 
   #urls {