murlsh 1.1.0 → 1.2.0

data/README.textile

@@ -56,6 +56,7 @@ Plugin hooks
 |Hook|Description|run() arguments|Returns|
 |add_pre|called before a new url is saved|url, config hash|undefined|
 |add_post|called after a new url is saved|url, config hash|undefined|
+|avatar|called to get an avatar url from an email md5 sum|avatar url, url, config hash|avatar url|
 |html_parse|parse HTML using something like Hpricot or Nokogiri|parseable|parsed HTML, only first plugin is run (cannot be chained)|
 |url_display_add|called to display additional information after urls|markup builder, url, config hash|undefined|
 

data/Rakefile

@@ -404,10 +404,11 @@ begin
       bcrypt-ruby >= 2.1.2
       builder >= 2.1.2
       flickraw >= 0.8.3
-      hpricot >= 0.8.1
       htmlentities >= 4.2.0
       json >= 1.2.3
+      nokogiri ~> 1.0
       plumnailer >= 0.1.0
+      public_suffix_service ~> 0.0
       push-notify >= 0.1.0
       rack >= 1.0.0
       rack-cache >= 0.5.2

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/config.ru

@@ -1,5 +1,6 @@
 $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 
+require 'uri'
 require 'yaml'
 
 require 'rack/cache'
@@ -40,4 +41,6 @@ end
 
 # use Rack::Lint
 
+Dir['plugins/*.rb'].each { |p| require p }
+
 run Murlsh::Dispatch.new(config)

data/lib/murlsh/build_query.rb

@@ -0,0 +1,10 @@
+module Murlsh
+
+  module_function
+
+  # Query string builder. Takes hash of query string variables.
+  def build_query(h)
+    h.empty? ? '' : '?' + h.map { |k,v| URI.escape "#{k}=#{v}" }.join('&')
+  end
+
+end

data/lib/murlsh/dispatch.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 require 'active_record'
 require 'rack'
 
@@ -12,29 +14,32 @@ module Murlsh
     def initialize(config)
       @config = config
 
-      ActiveRecord::Base.establish_connection(
-        :adapter => 'sqlite3', :database => @config.fetch('db_file'))
-      ActiveRecord::Base.include_root_in_json = false
-
-      db = ActiveRecord::Base.connection.instance_variable_get(:@connection)
-
-      url_server = Murlsh::UrlServer.new(@config, db)
-      config_server = Murlsh::ConfigServer.new(@config)
-
-      root_path = URI(@config.fetch('root_url')).path
+      url_server = Murlsh::UrlServer.new(config)
+      config_server = Murlsh::ConfigServer.new(config)
+      root_path = URI(config.fetch('root_url')).path
 
-      @dispatch = [
+      @routes = [
         [%r{^HEAD #{root_path}(url)?$}, url_server.method(:head)],
         [%r{^GET #{root_path}(url)?$}, url_server.method(:get)],
         [%r{^POST #{root_path}(url)?$}, url_server.method(:post)],
         [%r{^HEAD #{root_path}config$}, config_server.method(:head)],
         [%r{^GET #{root_path}config$}, config_server.method(:get)],
       ]
+
+      db_init
+    end
+
+    def db_init
+      ActiveRecord::Base.establish_connection(
+        :adapter => 'sqlite3', :database => @config.fetch('db_file'))
+
+      ActiveRecord::Base.default_timezone = :utc
+      ActiveRecord::Base.include_root_in_json = false
     end
 
     # Figure out which method will handle request.
     def dispatch(req)
-      method_match = @dispatch.find do |rule|
+      method_match = routes.find do |rule|
         rule[0].match("#{req.request_method} #{req.path}")
       end
 
@@ -56,6 +61,7 @@ module Murlsh
         404, { 'Content-Type' => 'text/html' }
     end
 
+    attr_accessor :routes
   end
 
 end

data/lib/murlsh/doc.rb

@@ -1,6 +1,6 @@
 module Murlsh
 
-  # Hpricot:Doc mixin.
+  # Nokogiri / Hpricot doc mixin.
   module Doc
 
     # Get the character set of the document.

data/lib/murlsh/markup.rb

@@ -65,33 +65,6 @@ module Murlsh
       tags.each { |k,v| meta :name => k, :content => v }
     end
 
-    # Gravatar builder. Takes MD5 hash of email address.
-    # Options:
-    # * 'd' - default Gravatar (identicon, monsterid, or wavatar)
-    # * 's' - size (0 - 512)
-    # * 'r' - rating (g, pg, r or x)
-    def gravatar(email_hash, options={})
-      query = options.reject do |k,v|
-        not ((k == 'd' and %w{identicon monsterid wavatar}.include?(v)) or
-        (k =='s' and (0..512).include?(v)) or
-        (k == 'r' and %w{g pg r x}.include?(v)))
-      end
-
-      return  if query['s'] and query['s'] < 1
-
-      options.reject! { |k,v| %w{d s r}.include? k }
-      options[:src] = URI.join('http://www.gravatar.com/avatar/',
-        email_hash + build_query(query))
-
-      murlsh_img options
-    end
-
-    # Query string builder. Takes hash of query string variables.
-    def build_query(h)
-      h.empty? ? '' :
-        '?' + h.map { |k,v| URI.escape "#{k}=#{v}" }.join('&')
-    end
-
     # Form input builder.
     def form_input(options)
       if options[:id]

data/lib/murlsh/plugin.rb

@@ -7,6 +7,8 @@ module Murlsh
   #   run arguments (url, config hash)
   # * add_post - called after a new url is saved
   #   run arguments (config hash)
+  # * avatar - called to get an avatar url from an email md5 sum
+  #   run arguments (avatar url, url, config hash)
   # * html_parse - called to parse HTML using something like Hpricot or Nokogiri
   #   run arguments (parseable)
   # * url_display_add - called to display additional information after urls

data/lib/murlsh/uri_ask.rb

@@ -3,7 +3,7 @@ require 'net/https'
 require 'open-uri'
 require 'uri'
 
-require 'hpricot'
+require 'nokogiri'
 require 'htmlentities'
 require 'iconv'
 
@@ -80,7 +80,7 @@ module Murlsh
           self.open(options[:headers]) do |f|
             html_parse_plugins = Murlsh::Plugin.hooks('html_parse')
             @doc = if html_parse_plugins.empty?
-              Hpricot(f).extend(Murlsh::Doc)
+              Nokogiri(f).extend(Murlsh::Doc)
             else
               html_parse_plugins.first.run(f).extend(Murlsh::Doc)
             end
@@ -145,7 +145,8 @@ module Murlsh
         http = Net::HTTP.new(host, port)
         http.use_ssl = (scheme == 'https')
 
-        resp = http.request_head(path_query, request_headers)
+        extend(Murlsh::URIGetPathQuery)
+        resp = http.request_head(get_path_query, request_headers)
 
         if Net::HTTPSuccess === resp
           response_headers = resp.to_hash

data/lib/murlsh/uri_domain.rb

@@ -0,0 +1,22 @@
+require 'public_suffix_service'
+
+require 'murlsh'
+
+# URI mixin that adds method to get domain.
+module Murlsh
+
+  module URIDomain
+
+    # Return the domain.
+    def domain
+      if host
+        Murlsh::failproof do
+          parsed = PublicSuffixService.parse(host.downcase)
+          "#{parsed.sld}.#{parsed.tld}"
+        end
+      end
+    end
+
+  end
+
+end

data/lib/murlsh/uri_get_path_query.rb

@@ -0,0 +1,11 @@
+module Murlsh
+
+  # URI mixin that adds method to get path and query string.
+  module URIGetPathQuery
+
+    # Return the path and query string.
+    def get_path_query; path + (query ? "?#{query}" : ''); end
+
+  end
+
+end

data/lib/murlsh/url.rb

@@ -29,6 +29,13 @@ module Murlsh
         email and name and email == other.email and name == other.name
     end
 
+    def ask
+      if !defined?(@ask) or @ask.to_s != url
+        @ask = URI(url).extend(Murlsh::UriAsk)
+      end
+      @ask
+    end
+
   end
 
 end

data/lib/murlsh/url_body.rb

@@ -6,9 +6,9 @@ module Murlsh
   class UrlBody < Builder::XmlMarkup
     include Murlsh::Markup
 
-    def initialize(config, db, req, content_type='text/html')
-      @config, @db, @req, @q, @content_type =
-        config, db, req, req.params['q'], content_type
+    def initialize(config, req, content_type='text/html')
+      @config, @req, @q, @content_type =
+        config, req, req.params['q'], content_type
       super(:indent => @config['html_indent'] || 0)
     end
 
@@ -40,15 +40,17 @@ module Murlsh
           ul(:id => 'urls') {
             li { feed_icon ; search_form }
 
-            gravatar_size = @config.fetch('gravatar_size', 0)
-
             last = nil
             urls.each do |mu|
               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)
+                  end
                   div(:class => 'icon') {
-                    gravatar(mu.email, 's' => gravatar_size, :text => mu.name)
-                  }  if mu.email and gravatar_size > 0
+                    murlsh_img :src => avatar_url, :text => mu.name
+                  }  if avatar_url
                   div(mu.name, :class => 'name')  if
                     @config.fetch('show_names', false) and mu.name
                 end

data/lib/murlsh/url_server.rb

@@ -8,11 +8,8 @@ module Murlsh
 
     include HeadFromGet
 
-    def initialize(config, db)
-      @config, @db = config, db
-      ActiveRecord::Base.default_timezone = :utc
-
-      Dir['plugins/*.rb'].each { |p| load p }
+    def initialize(config)
+      @config = config
     end
 
     # Respond to a GET request. Return a page of urls based on the query
@@ -27,7 +24,7 @@ module Murlsh
       resp['ETag'] = "W/\"#{last_db_update.to_i}#{req.params.sort}\""
       resp['Last-Modified'] = last_db_update.httpdate
 
-      resp.body = Murlsh::UrlBody.new(@config, @db, req, resp['Content-Type'])
+      resp.body = Murlsh::UrlBody.new(@config, req, resp['Content-Type'])
 
       resp
     end
@@ -37,8 +34,6 @@ module Murlsh
       auth = req.params['auth']
       if user = auth.empty? ? nil : Murlsh::Auth.new(
         @config.fetch('auth_file')).auth(auth)
-        ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
-          :database => @config.fetch('db_file')
 
         mu = Murlsh::Url.new do |u|
           u.time = Time.now.gmtime

data/lib/murlsh.rb

@@ -1,6 +1,7 @@
 require 'murlsh/head_from_get'
 
 require 'murlsh/auth'
+require 'murlsh/build_query'
 require 'murlsh/config_server'
 require 'murlsh/dispatch'
 require 'murlsh/doc'
@@ -16,7 +17,8 @@ require 'murlsh/plugin'
 require 'murlsh/sqlite3_adapter'
 require 'murlsh/time_ago'
 require 'murlsh/uri_ask'
-require 'murlsh/uri'
+require 'murlsh/uri_domain'
+require 'murlsh/uri_get_path_query'
 require 'murlsh/url_body'
 require 'murlsh/url'
 require 'murlsh/url_server'

data/murlsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murlsh}
-  s.version = "1.1.0"
+  s.version = "1.2.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-11-21}
+  s.date = %q{2010-12-16}
   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}
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "config.yaml",
     "lib/murlsh.rb",
     "lib/murlsh/auth.rb",
+    "lib/murlsh/build_query.rb",
     "lib/murlsh/config_server.rb",
     "lib/murlsh/dispatch.rb",
     "lib/murlsh/doc.rb",
@@ -43,8 +44,9 @@ Gem::Specification.new do |s|
     "lib/murlsh/plugin.rb",
     "lib/murlsh/sqlite3_adapter.rb",
     "lib/murlsh/time_ago.rb",
-    "lib/murlsh/uri.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_server.rb",
@@ -56,6 +58,8 @@ Gem::Specification.new do |s|
     "plugins/add_post_60_notify_hubs.rb",
     "plugins/add_pre_40_convert_mobile.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_flickr.rb",
     "plugins/add_pre_60_github_title.rb",
     "plugins/add_pre_60_google_code_title.rb",
@@ -63,10 +67,10 @@ Gem::Specification.new do |s|
     "plugins/add_pre_60_s3_image.rb",
     "plugins/add_pre_60_twitter.rb",
     "plugins/add_pre_60_vimeo.rb",
-    "plugins/add_pre_60_youtube.rb",
     "plugins/add_pre_65_html_thumb.rb",
     "plugins/add_pre_65_img_thumb.rb",
-    "plugins/html_parse_50_hpricot.rb",
+    "plugins/avatar_50_gravatar.rb",
+    "plugins/html_parse_50_nokogiri.rb",
     "plugins/url_display_add_45_audio.rb",
     "plugins/url_display_add_50_hostrec.rb",
     "plugins/url_display_add_55_content_type.rb",
@@ -86,7 +90,7 @@ Gem::Specification.new do |s|
     "spec/img_store_spec.rb",
     "spec/markup_spec.rb",
     "spec/uri_ask_spec.rb",
-    "spec/uri_spec.rb",
+    "spec/uri_domain_spec.rb",
     "spec/url_spec.rb",
     "spec/yaml_ordered_hash_spec.rb"
   ]
@@ -101,7 +105,7 @@ Gem::Specification.new do |s|
     "spec/img_store_spec.rb",
     "spec/markup_spec.rb",
     "spec/uri_ask_spec.rb",
-    "spec/uri_spec.rb",
+    "spec/uri_domain_spec.rb",
     "spec/url_spec.rb",
     "spec/yaml_ordered_hash_spec.rb"
   ]
@@ -115,10 +119,11 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<flickraw>, [">= 0.8.3"])
-      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<nokogiri>, ["~> 1.0"])
       s.add_runtime_dependency(%q<plumnailer>, [">= 0.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"])
@@ -136,10 +141,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
       s.add_dependency(%q<builder>, [">= 2.1.2"])
       s.add_dependency(%q<flickraw>, [">= 0.8.3"])
-      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<nokogiri>, ["~> 1.0"])
       s.add_dependency(%q<plumnailer>, [">= 0.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"])
@@ -158,10 +164,11 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
     s.add_dependency(%q<builder>, [">= 2.1.2"])
     s.add_dependency(%q<flickraw>, [">= 0.8.3"])
-    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<nokogiri>, ["~> 1.0"])
     s.add_dependency(%q<plumnailer>, [">= 0.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"])

data/plugins/add_post_50_update_feed.rb

@@ -65,7 +65,7 @@ module Murlsh
             options.merge!(
               :via_type => 'text/html',
               :via_href => mu.via,
-              :via_title => URI(mu.via).domain
+              :via_title => URI(mu.via).extend(Murlsh::URIDomain).domain
               )
           end
         end

data/plugins/add_pre_50_lookup_content_type_title.rb

@@ -10,17 +10,16 @@ module Murlsh
     @hook = 'add_pre'
 
     def self.run(url, config)
-      ask = URI(url.url).extend(Murlsh::UriAsk)
       headers = {}
       headers['User-Agent'] = config['user_agent']  if config['user_agent']
 
-      content_length = ask.content_length(:headers => headers)
+      content_length = url.ask.content_length(:headers => headers)
       if content_length and not content_length.empty?
         url.content_length = content_length
       end
 
-      url.content_type = ask.content_type(:headers => headers)
-      url.title = ask.title(:headers => headers)
+      url.content_type = url.ask.content_type(:headers => headers)
+      url.title = url.ask.title(:headers => headers)
     end
 
   end

data/plugins/add_pre_50_media_thumbnail.rb

@@ -0,0 +1,36 @@
+require 'cgi'
+
+require 'murlsh'
+
+module Murlsh
+
+  # If document has <meta rel="media:thumbnail"> use it as the thumbnail.
+  class AddPre50MediaThumbnail < Plugin
+
+    @hook = 'add_pre'
+
+    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
+      'thumb')
+
+    def self.run(url, config)
+      if not url.thumbnail_url and url.ask.doc
+        url.ask.doc.xpath_search("//meta[@rel='media:thumbnail']") do |node|
+          if node and node['href'] and not node['href'].empty?
+            Murlsh::failproof do
+              thumb_storage = Murlsh::ImgStore.new(StorageDir,
+                :user_agent => config['user_agent'])
+
+              stored_filename = thumb_storage.store_url(node['href']) do |i|
+                max_side = config.fetch('thumbnail_max_side', 90)
+                i.extend(Murlsh::ImageList).resize_down!(max_side)
+              end
+              url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
+            end
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/plugins/add_pre_50_open_graph_image.rb

@@ -0,0 +1,36 @@
+require 'cgi'
+
+require 'murlsh'
+
+module Murlsh
+
+  # If document has <meta property="og:image"> use it as the thumbnail.
+  class AddPre50OpenGraphImage < Plugin
+
+    @hook = 'add_pre'
+
+    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
+      'thumb')
+
+    def self.run(url, config)
+      if not url.thumbnail_url and url.ask.doc
+        url.ask.doc.xpath_search("//meta[@property='og:image']") do |node|
+          if node and node['content'] and not node['content'].empty?
+            Murlsh::failproof do
+              thumb_storage = Murlsh::ImgStore.new(StorageDir,
+                :user_agent => config['user_agent'])
+
+              stored_filename = thumb_storage.store_url(node['content']) do |i|
+                max_side = config.fetch('thumbnail_max_side', 90)
+                i.extend(Murlsh::ImageList).resize_down!(max_side)
+              end
+              url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
+            end
+          end
+        end
+      end
+    end
+
+  end
+
+end

data/plugins/add_pre_60_github_title.rb

@@ -14,8 +14,9 @@ module Murlsh
 
     def self.run(url, config)
       if url.url[GithubRe]
-        ask = URI(url.url).extend(Murlsh::UriAsk)
-        url.title << " - #{ask.description}"  unless ask.description.empty?
+        unless url.ask.description.empty?
+          url.title << " - #{url.ask.description}"
+        end
       end
     end
 

data/plugins/add_pre_60_google_code_title.rb

@@ -13,11 +13,10 @@ module Murlsh
     GoogleCodeRe = %r{^http://code\.google\.com/p/[\w-]+/$}i
 
     def self.run(url, config)
-      if url.url[GoogleCodeRe]
-        ask = URI(url.url).extend(Murlsh::UriAsk)
-        ask.doc.xpath_search("//a[@id='project_summary_link']") do |node|
+      if url.url[GoogleCodeRe] and url.ask.doc
+        url.ask.doc.xpath_search("//a[@id='project_summary_link']") do |node|
           summary = node ? node.inner_html : nil
-          url.title << " - #{ask.decode(summary)}"  unless not summary or
+          url.title << " - #{url.ask.decode(summary)}"  unless not summary or
             summary.empty?
         end
       end

data/plugins/avatar_50_gravatar.rb

@@ -0,0 +1,22 @@
+require 'uri'
+
+require 'murlsh'
+
+module Murlsh
+
+  # Get Gravatar url from a url.
+  class Avatar50Gravatar < Plugin
+
+    @hook = 'avatar'
+
+    def self.run(avatar_url, url, config)
+      if url.email and not url.email.empty? and
+        (gravatar_size = config.fetch('gravatar_size', 0)) > 0
+        query = { :s => gravatar_size }
+        URI.join('http://www.gravatar.com/avatar/', url.email, Murlsh::build_query(query))
+      end
+    end
+
+  end
+
+end

data/plugins/html_parse_50_nokogiri.rb

@@ -0,0 +1,16 @@
+require 'nokogiri'
+
+require 'murlsh'
+
+module Murlsh
+
+  # Parse HTML with Nokogiri and return a Nokogiri doc.
+  class HtmlParse50Nokogiri < Plugin
+
+    @hook = 'html_parse'
+
+    def self.run(x); Nokogiri(x); end
+
+  end
+
+end

data/plugins/url_display_add_50_hostrec.rb

@@ -21,7 +21,10 @@ module Murlsh
 
     # Show the domain of the url.
     def self.run(markup, url, config)
-      if domain = Murlsh::failproof { URI(url.url).domain }
+      domain = Murlsh::failproof do
+        URI(url.url).extend(Murlsh::URIDomain).domain
+      end
+      if domain
         # show domain if not already contained in title and not on skip list
         unless (url.title and url.title.downcase.index(domain)) or
           SkipDomains.include?(domain)

data/plugins/url_display_add_60_via.rb

@@ -29,7 +29,7 @@ module Murlsh
             when m = search.match(DeliciousRe); "delicious/#{m[1]}"
             when m = search.match(TwitterRe); "twitter/#{m[1]}"
             when m = search.match(TumblrRe); "#{m[1]}.tumblr"
-            else via_uri.domain || via_uri_s
+            else via_uri.extend(Murlsh::URIDomain).domain || via_uri_s
           end
 
           markup.span(:class => 'via') do

data/spec/doc_spec.rb

@@ -1,4 +1,4 @@
-require 'hpricot'
+require 'nokogiri'
 
 require 'murlsh'
 
@@ -18,7 +18,7 @@ describe Murlsh::Doc do
 </body>
 </html>
 eos
-      Hpricot(html).extend(Murlsh::Doc)
+      Nokogiri(html).extend(Murlsh::Doc)
     end
 
     its(:charset) { should == 'utf-8' }
@@ -37,7 +37,7 @@ eos
 </body>
 </html>
 eos
-      Hpricot(html).extend(Murlsh::Doc)
+      Nokogiri(html).extend(Murlsh::Doc)
     end
 
     its(:charset) { should be_nil }

data/spec/markup_spec.rb

@@ -80,52 +80,4 @@ describe MarkupMixer do
     ].each { |r| @m.target!.should match(/#{r}/) }
   end
 
-  it 'should correctly render a gravatar tag' do
-    @m.gravatar 'xxx'
-    @m.target!.should == '<img src="http://www.gravatar.com/avatar/xxx"/>'
-  end
-
-  it 'should correctly render a gravatar tag with a valid default' do
-    @m.gravatar 'xxx', 'd' => 'identicon'
-    @m.target!.should ==
-      '<img src="http://www.gravatar.com/avatar/xxx?d=identicon"/>'
-  end
-
-  it 'should not pass the default parameter to gravatar if the default is invalid' do
-    @m.gravatar 'xxx', 'd' => 'bad'
-    @m.target!.should == '<img src="http://www.gravatar.com/avatar/xxx"/>'
-  end
-
-  it 'should correctly render a gravatar tag with a valid rating' do
-    @m.gravatar 'xxx', 'r' => 'x'
-    @m.target!.should == '<img src="http://www.gravatar.com/avatar/xxx?r=x"/>'
-  end
-
-  it 'should not pass the rating parameter to gravatar if the rating is invalid' do
-    @m.gravatar 'xxx', 'r' => 'foo'
-    @m.target!.should == '<img src="http://www.gravatar.com/avatar/xxx"/>'
-  end
-
-  it 'should correctly render a gravatar tag with a valid size' do
-    @m.gravatar 'xxx', 's' => 100
-    @m.target!.should ==
-      '<img src="http://www.gravatar.com/avatar/xxx?s=100"/>'
-  end
-
-  it 'should not pass the size parameter to gravatar if the size is invalid' do
-    @m.gravatar 'xxx', 's' => 1000
-    @m.target!.should == '<img src="http://www.gravatar.com/avatar/xxx"/>'
-  end
-
-  it 'should return an empty string for a gravatar with size 0' do
-    @m.gravatar 'xxx', 's' => 0
-    @m.target!.should be_empty
-  end
-
-  it 'should correctly render a gravatar tag with an href' do
-    @m.gravatar 'xxx', :href => '/test/'
-    @m.target!.should == 
-      '<a href="/test/"><img src="http://www.gravatar.com/avatar/xxx"/></a>'
-  end
-
 end

data/spec/uri_ask_spec.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 require 'murlsh'
 
-Dir['plugins/*.rb'].each { |p| load p }
+Dir['plugins/*.rb'].each { |p| require p }
 
 describe Murlsh::UriAsk do
 

data/spec/uri_domain_spec.rb

@@ -0,0 +1,22 @@
+require 'uri'
+
+require 'murlsh'
+
+describe Murlsh::URIDomain do
+
+  def uri_domain(s); URI(s).extend(Murlsh::URIDomain).domain; end
+
+  it 'should have its domain set to the domain of its URI if it is a valid HTTP URI' do
+    uri_domain('http://foo.com/').should == 'foo.com'
+  end
+
+  it 'should have its domain set nil if it is not a valid HTTP URI' do
+    uri_domain('foo').should be_nil
+    uri_domain('http://foo.bar/').should be_nil
+  end
+
+  it 'should handle two letter top-level domains' do
+    uri_domain('http://www.linux.fm/').should == 'linux.fm'
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 -05:00
+date: 2010-12-16 00:00:00 -05:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,51 +83,50 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: htmlentities
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 61
+        hash: 55
         segments: 
+        - 4
+        - 2
         - 0
-        - 8
-        - 1
-        version: 0.8.1
+        version: 4.2.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: htmlentities
+  name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 55
+        hash: 25
         segments: 
-        - 4
+        - 1
         - 2
-        - 0
-        version: 4.2.0
+        - 3
+        version: 1.2.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: nokogiri
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 15
         segments: 
         - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        version: "1.0"
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -147,9 +146,24 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: push-notify
+  name: public_suffix_service
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 0
+        - 0
+        version: "0.0"
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: push-notify
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,11 +175,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,11 +191,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rack-cache
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,11 +207,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rack-rewrite
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -209,11 +223,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rack-throttle
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -225,11 +239,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -241,11 +255,11 @@ dependencies:
         - 14
         version: 1.15.14
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -257,11 +271,11 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: tinyatom
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -273,11 +287,11 @@ dependencies:
         - 3
         version: 0.3.3
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: twitter
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -289,11 +303,11 @@ dependencies:
         - 12
         version: 0.9.12
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: vimeo
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -305,11 +319,11 @@ dependencies:
         - 2
         version: 1.2.2
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: flog
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -321,11 +335,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -336,7 +350,7 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 description: url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding
 email: matthewm@boedicker.org
 executables: 
@@ -356,6 +370,7 @@ files:
 - config.yaml
 - lib/murlsh.rb
 - lib/murlsh/auth.rb
+- lib/murlsh/build_query.rb
 - lib/murlsh/config_server.rb
 - lib/murlsh/dispatch.rb
 - lib/murlsh/doc.rb
@@ -371,8 +386,9 @@ files:
 - lib/murlsh/plugin.rb
 - lib/murlsh/sqlite3_adapter.rb
 - lib/murlsh/time_ago.rb
-- lib/murlsh/uri.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_server.rb
@@ -384,6 +400,8 @@ files:
 - plugins/add_post_60_notify_hubs.rb
 - plugins/add_pre_40_convert_mobile.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_flickr.rb
 - plugins/add_pre_60_github_title.rb
 - plugins/add_pre_60_google_code_title.rb
@@ -391,10 +409,10 @@ files:
 - plugins/add_pre_60_s3_image.rb
 - plugins/add_pre_60_twitter.rb
 - plugins/add_pre_60_vimeo.rb
-- plugins/add_pre_60_youtube.rb
 - plugins/add_pre_65_html_thumb.rb
 - plugins/add_pre_65_img_thumb.rb
-- plugins/html_parse_50_hpricot.rb
+- plugins/avatar_50_gravatar.rb
+- plugins/html_parse_50_nokogiri.rb
 - plugins/url_display_add_45_audio.rb
 - plugins/url_display_add_50_hostrec.rb
 - plugins/url_display_add_55_content_type.rb
@@ -414,7 +432,7 @@ files:
 - spec/img_store_spec.rb
 - spec/markup_spec.rb
 - spec/uri_ask_spec.rb
-- spec/uri_spec.rb
+- spec/uri_domain_spec.rb
 - spec/url_spec.rb
 - spec/yaml_ordered_hash_spec.rb
 has_rdoc: true
@@ -458,6 +476,6 @@ test_files:
 - spec/img_store_spec.rb
 - spec/markup_spec.rb
 - spec/uri_ask_spec.rb
-- spec/uri_spec.rb
+- spec/uri_domain_spec.rb
 - spec/url_spec.rb
 - spec/yaml_ordered_hash_spec.rb

data/lib/murlsh/uri.rb

@@ -1,16 +0,0 @@
-require 'uri'
-
-# Extra methods added to URI class.
-class URI::Generic
-
-  # Return the domain.
-  def domain
-    if (host and (d = host[/[a-z\d-]+\.[a-z]{2,}(\.[a-z]{2})?$/]))
-      d.downcase
-    end
-  end
-
-  # Return the path and query string.
-  def path_query; path + (query ? "?#{query}" : ''); end
-
-end

data/plugins/add_pre_60_youtube.rb

@@ -1,32 +0,0 @@
-require 'cgi'
-
-require 'murlsh'
-
-module Murlsh
-
-  # Set the thumbnail url for youtube urls.
-  class AddPre60Youtube < Plugin
-
-    @hook = 'add_pre'
-
-    YoutubeRe =
-      %r{^http://(?:(?:www|uk)\.)?youtube\.com/watch\?v=([\w\-]+)(?:&|$)}i
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
-
-    def self.run(url, config)
-      if youtube_id = url.url[YoutubeRe, 1]
-        thumb_storage = Murlsh::ImgStore.new(StorageDir,
-          :user_agent => config['user_agent'])
-        stored_filename = thumb_storage.store_url(
-          "http://img.youtube.com/vi/#{youtube_id}/default.jpg") do |i|
-          max_side = config.fetch('thumbnail_max_side', 90)
-          i.extend(Murlsh::ImageList).resize_down!(max_side)
-        end
-        url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
-      end
-    end
-
-  end
-
-end

data/plugins/html_parse_50_hpricot.rb

@@ -1,19 +0,0 @@
-require 'hpricot'
-
-require 'murlsh'
-
-module Murlsh
-
-  # Parse HTML with Hpricot and return an Hpricot doc.
-  class HtmlParse50Hpricot < Plugin
-
-    @hook = 'html_parse'
-
-    def self.run(x)
-      Hpricot(x)
-      # Nokogiri(x) also works.
-    end
-
-  end
-
-end

data/spec/uri_spec.rb

@@ -1,14 +0,0 @@
-require 'murlsh'
-
-describe URI do
-
-  it 'should have its domain set to the domain of its URI if it is a valid HTTP URI' do
-    URI('http://foo.com/').domain.should == 'foo.com'
-  end
-
-  it 'should have its domain set nil if it is not a valid HTTP URI' do
-    URI('foo').domain.should be_nil
-    URI('http://foo.com.').domain.should be_nil
-  end
-
-end