murlsh 0.6.1 → 0.7.0

data/lib/murlsh/url_body.rb

@@ -20,7 +20,7 @@ module Murlsh
     def search_conditions
       if @q
         search_cols = %w{name title url}
-        [search_cols.collect { |x| "MATCH(#{x}, ?)" }.join(' OR ')].push(
+        [search_cols.map { |x| "MATCH(#{x}, ?)" }.join(' OR ')].push(
           *[@q] * search_cols.size)
       else
         []
@@ -51,21 +51,26 @@ module Murlsh
                   div(:class => 'icon') {
                     gravatar(mu.email, 's' => gravatar_size, :text => mu.name)
                   } if mu.email and gravatar_size > 0
-                  div(mu.name, :class => 'name') if mu.name
+                  div(mu.name, :class => 'name') if
+                    @config.fetch('show_names', false) and mu.name
                 end
 
-                a(mu.title_stripped, :href => mu.url)
+                a(mu.title_stripped, :href => mu.url, :class => 'm')
 
                 mu.hostrec do |hostrec|
                   self.span(" [#{hostrec}]", :class => 'host')
                 end
                 mu.viarec do |via|
+                  display_via = Murlsh::Plugin.hooks('via').inject(
+                    via) { |result,plugin| plugin.run(result) }
                   span(:class => 'via') {
-                    text!(' via '); a(via.domain || via, :href => via)
+                    text!(' via '); a(display_via, :href => via)
                   }
                 end
-                span(", #{mu.time.fuzzy}", :class => 'date') if
-                  @config.fetch('show_dates', true) and mu.time
+
+                display_time = Murlsh::Plugin.hooks('time').inject(
+                  mu.time) { |result,plugin| plugin.run(result) }
+                span(", #{display_time}", :class => 'date') if display_time
                 last = mu
               }
             end
@@ -85,10 +90,8 @@ module Murlsh
     def headd
       head {
         titlee
-        metas(:description => @config.fetch('description', ''),
-          :viewport =>
-            'width=device-width,minimum-scale=1.0,maximum-scale=1.0')
-        google_verify
+        metas(@config.select { |k,v| k =~ /^meta_tag_/ and v }.
+          map { |k,v| [k.sub('meta_tag_', ''), v] })
         css(@config['css_compressed'] || @config['css_files'])
         atom(@config.fetch('feed_file'))
       }
@@ -99,11 +102,6 @@ module Murlsh
       title(@config.fetch('page_title', '') + (@q ? " /#{@q}" : ''))
     end
 
-    # Google verification link builder.
-    def google_verify
-      (gv = @config.fetch('google_verify')) and metas('verify-v1' => gv)
-    end
-
     # Feed icon builder.
     def feed_icon
       div(:class => 'icon') {
@@ -115,9 +113,8 @@ module Murlsh
     def search_form
       form(:action => '', :method => 'get') {
         fieldset {
-          input(:type => 'text', :id => 'q', :name => 'q', :size => 32,
-            :value => @q)
-          input(:type => 'submit', :value=> 'Regex Search')
+          form_input(:id => 'q', :size => 32, :value => @q)
+          form_input(:type => 'submit', :value => 'Regex Search')
         }
       }
     end
@@ -126,26 +123,19 @@ module Murlsh
     def add_form
       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 { form_input(:id => 'url', :label => 'Add URL', :size => 32) }
+          self.p { form_input(:id => 'via', :label => 'Via', :size => 32) }
           self.p {
-            add_form_input('Password:', 'auth', 16, 'password')
-            input(:type => 'button', :id => 'submit', :value => 'Add')
+            form_input(:id => 'auth', :label => 'Password', :size => 16,
+              :type => 'password')
+            form_input(:id => 'submit', :type => 'button', :value => 'Add')
           }
         }
       }
     end
 
-    # Url add form input builder.
-    def add_form_input(label, id, size, tipe='text')
-      label(label, :for => id)
-      input(:type => tipe, :id => id, :name => id, :size => size)
-    end
-
     # Clear div builder.
-    def clear
-      div(:style => 'clear : both')
-    end
+    def clear; div(:style => 'clear : both'); end
 
     # Powered by builder.
     def powered_by

data/lib/murlsh/url_server.rb

@@ -1,5 +1,4 @@
 %w{
-rubygems
 active_record
 rack
 }.each { |m| require m }
@@ -25,7 +24,7 @@ module Murlsh
 
       last_db_update = File::Stat.new(@config['db_file']).mtime
       resp['Last-Modified'] = last_db_update.httpdate
-      resp['ETag'] = "#{last_db_update.to_i}#{req.params.sort}"
+      resp['ETag'] = "W/\"#{last_db_update.to_i}#{req.params.sort}\""
 
       resp.body = Murlsh::UrlBody.new(@config, @db, req)
 

data/lib/murlsh/yaml_ordered_hash.rb

@@ -0,0 +1,22 @@
+%w{
+yaml
+}.each { |m| require m }
+
+module Murlsh
+
+  # Hash mixin to generate yaml with hash keys in sorted order.
+  module YamlOrderedHash
+
+    def to_yaml(opts={})
+      YAML::quick_emit(self, opts) do |out|
+        out.map(taguri, to_yaml_style) do |map|
+          sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |k, v|
+            map.add( k, v )
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/lib/murlsh.rb

@@ -1,18 +1,4 @@
-require 'murlsh/doc'
-require 'murlsh/uri'
-require 'murlsh/auth'
-require 'murlsh/dispatch'
-require 'murlsh/failproof'
-require 'murlsh/openlock'
-require 'murlsh/plugin'
-require 'murlsh/sqlite3_adapter'
-require 'murlsh/time'
-require 'murlsh/url_server'
-require 'murlsh/url'
-require 'murlsh/uri_ask'
-require 'murlsh/xhtml_response'
-
-# requiring builder before active_record blows up
-require 'murlsh/atom_feed'
-require 'murlsh/markup'
-require 'murlsh/url_body'
+Dir.glob(File.join(File.dirname(__FILE__), 'murlsh', '*.rb')).
+  map { |f| File.join('murlsh', File.basename(f, '.rb')) }.
+  sort.
+  each { |m| require m }

data/murlsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murlsh}
-  s.version = "0.6.1"
+  s.version = "0.7.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-03-10}
+  s.date = %q{2010-04-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}
@@ -32,24 +32,30 @@ Gem::Specification.new do |s|
      "lib/murlsh/auth.rb",
      "lib/murlsh/dispatch.rb",
      "lib/murlsh/doc.rb",
+     "lib/murlsh/etag_add_encoding.rb",
      "lib/murlsh/failproof.rb",
+     "lib/murlsh/flickr_server.rb",
      "lib/murlsh/markup.rb",
      "lib/murlsh/openlock.rb",
      "lib/murlsh/plugin.rb",
      "lib/murlsh/sqlite3_adapter.rb",
-     "lib/murlsh/time.rb",
+     "lib/murlsh/time_ago.rb",
      "lib/murlsh/uri.rb",
      "lib/murlsh/uri_ask.rb",
      "lib/murlsh/url.rb",
      "lib/murlsh/url_body.rb",
      "lib/murlsh/url_server.rb",
      "lib/murlsh/xhtml_response.rb",
+     "lib/murlsh/yaml_ordered_hash.rb",
      "murlsh.gemspec",
      "plugins/add_post_50_update_feed.rb",
+     "plugins/add_post_50_update_rss.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",
+     "plugins/time_50_ago.rb",
+     "plugins/via_50_domain.rb",
      "public/css/jquery.jgrowl.css",
      "public/css/screen.css",
      "public/js/jquery-1.4.2.min.js",
@@ -59,10 +65,14 @@ Gem::Specification.new do |s|
      "public/swf/player_mp3_mini.swf",
      "spec/atom_feed_spec.rb",
      "spec/auth_spec.rb",
+     "spec/dispatch_spec.rb",
+     "spec/doc_spec.rb",
      "spec/markup_spec.rb",
      "spec/uri_ask_spec.rb",
      "spec/uri_spec.rb",
-     "spec/xhtml_response_spec.rb"
+     "spec/url_spec.rb",
+     "spec/xhtml_response_spec.rb",
+     "spec/yaml_ordered_hash_spec.rb"
   ]
   s.homepage = %q{http://github.com/mmb/murlsh}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -73,9 +83,13 @@ Gem::Specification.new do |s|
     "spec/xhtml_response_spec.rb",
      "spec/atom_feed_spec.rb",
      "spec/auth_spec.rb",
+     "spec/yaml_ordered_hash_spec.rb",
      "spec/uri_ask_spec.rb",
+     "spec/dispatch_spec.rb",
      "spec/markup_spec.rb",
-     "spec/uri_spec.rb"
+     "spec/url_spec.rb",
+     "spec/uri_spec.rb",
+     "spec/doc_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -88,6 +102,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       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<rack>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.1"])
     else
@@ -96,6 +111,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       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<rack>, [">= 1.0.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.1"])
     end
@@ -105,6 +121,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     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<rack>, [">= 1.0.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.1"])
   end

data/plugins/add_post_50_update_feed.rb

@@ -1,4 +1,6 @@
-require 'murlsh'
+%w{
+murlsh
+}.each { |m| require m }
 
 module Murlsh
 
@@ -14,7 +16,7 @@ module Murlsh
       feed = Murlsh::AtomFeed.new(config.fetch('root_url'),
         :filename => config.fetch('feed_file'),
         :title => config.fetch('page_title', ''),
-        :hubs => config.fetch('pubsubhubbub_hubs', []).collect { |x| x['subscribe_url'] } )
+        :hubs => config.fetch('pubsubhubbub_hubs', []).map { |x| x['subscribe_url'] } )
 
       feed.write(latest, config.fetch('feed_file'))
     end

data/plugins/add_post_50_update_rss.rb

@@ -0,0 +1,37 @@
+%w{
+rss/maker
+
+murlsh
+}.each { |m| require m }
+
+module Murlsh
+
+  # Regenerate RSS feed after a new url has been added.
+  class AddPost50UpdateRss < Plugin
+
+    Hook = 'add_post'
+
+    def self.run(config)
+      output_file = 'rss.xml'
+
+      feed = RSS::Maker.make('2.0') do |f|
+        f.channel.title = f.channel.description = config.fetch('page_title', '')
+        f.channel.link = URI.join(config.fetch('root_url'), output_file)
+        f.items.do_sort = true
+  
+        Murlsh::Url.all(:order => 'id DESC',
+          :limit => config.fetch('num_posts_feed', 25)).each do |mu|
+          i = f.items.new_item
+          i.title = mu.title_stripped
+          i.link = mu.url
+          i.date = mu.time
+        end
+
+      end
+
+      Murlsh::openlock(output_file, 'w') { |f| f.write(feed) }
+    end
+
+  end
+
+end

data/plugins/add_post_60_notify_hubs.rb

@@ -1,4 +1,6 @@
-require 'murlsh'
+%w{
+murlsh
+}.each { |m| require m }
 
 module Murlsh
 
@@ -11,7 +13,6 @@ module Murlsh
       hubs = config.fetch('pubsubhubbub_hubs', [])
 
       unless hubs.empty?
-        require 'rubygems'
         require 'eventmachine'
         require 'pubsubhubbub'
 

data/plugins/add_pre_50_lookup_content_type_title.rb

@@ -1,4 +1,6 @@
-require 'murlsh'
+%w{
+murlsh
+}.each { |m| require m }
 
 module Murlsh
 

data/plugins/time_50_ago.rb

@@ -0,0 +1,16 @@
+%w{
+murlsh
+}.each { |m| require m }
+
+module Murlsh
+
+  # show the time as the fuzzy amount of time that has elapsed since then
+  class Time50Ago < Plugin
+
+    Hook = 'time'
+
+    def self.run(time); time.extend(Murlsh::TimeAgo).ago if time; end
+
+  end
+
+end

data/plugins/via_50_domain.rb

@@ -0,0 +1,36 @@
+%w{
+murlsh
+}.each { |m| require m }
+
+module Murlsh
+
+  # Convert a via url to its display text.
+  #
+  # For most urls the domain is displayed, but for some return custom text.
+  class Via50Domain < Plugin
+
+    Hook = 'via'
+
+    def self.run(via)
+      search = via.to_s.gsub(%r{^http://}, '')
+
+      case
+      when m = search.match(%r{^news\.ycombinator\.com}i)
+        'hacker news'
+      when m = search.match(%r{^www\.reddit\.com/r/([a-z\d]+?)/}i)
+        "#{m[1]}.reddit"
+      when m = search.match(%r{^delicious\.com/(\w+)}i)
+        "delicious/#{m[1]}"
+      when m = search.match(%r{^twitter\.com/(\w+)/}i)
+        "twitter/#{m[1]}"
+      when m = search.match(%r{^([a-z\d][a-z\d-]{0,61}[a-z\d])\.tumblr\.com/}i)
+        "#{m[1]}.tumblr"
+      else
+        via.domain || via
+      end
+
+    end
+
+  end
+
+end

data/public/css/screen.css

@@ -92,6 +92,8 @@ a.feed {
   font-weight : bold;
   font-size : 0.75em;
   padding : 2px 4px 2px 4px;
+  -moz-border-radius : 5px;
+  -webkit-border-radius : 5px;
 }
 
 span.date {
@@ -109,15 +111,11 @@ div.jGrowl div.jGrowl-closer {
 /* iphone */
 @media screen and (max-device-width : 480px) {
 
-  a.feed {
-    display : none;
-  }
-
   body {
     margin : 0;
     padding : 0;
     font-size : 1.25em;
-    line-height : 1.875em;
+    line-height : normal;
   }
 
   #urls {
@@ -128,10 +126,11 @@ div.jGrowl div.jGrowl-closer {
 
   #urls li {
     overflow : hidden;
+    border-bottom : 1px solid #ccc;
   }
 
   input#q {
-    width : 130px;
+    width : 110px;
   }
 
   input#url, input#via {