murlsh 1.0.0 → 1.1.0

data/murlsh.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.0.0"
+  s.version = "1.1.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-03}
+  s.date = %q{2010-11-21}
   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}
@@ -18,93 +18,92 @@ Gem::Specification.new do |s|
     "README.textile"
   ]
   s.files = [
-    ".gitignore",
-     ".htaccess",
-     "COPYING",
-     "README.textile",
-     "Rakefile",
-     "VERSION",
-     "bin/murlsh",
-     "config.ru",
-     "config.yaml",
-     "lib/murlsh.rb",
-     "lib/murlsh/auth.rb",
-     "lib/murlsh/config_server.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/img_store.rb",
-     "lib/murlsh/markup.rb",
-     "lib/murlsh/must_revalidate.rb",
-     "lib/murlsh/openlock.rb",
-     "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/url.rb",
-     "lib/murlsh/url_body.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_podcast.rb",
-     "plugins/add_post_50_update_rss.rb",
-     "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_60_flickr.rb",
-     "plugins/add_pre_60_github_title.rb",
-     "plugins/add_pre_60_google_code_title.rb",
-     "plugins/add_pre_60_imageshack.rb",
-     "plugins/add_pre_60_imgur.rb",
-     "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/html_parse_50_hpricot.rb",
-     "plugins/url_display_add_45_mp3.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/README",
-     "public/js/comments.json",
-     "public/js/jquery-1.4.3.min.js",
-     "public/js/jquery.jgrowl_compressed.js",
-     "public/js/js.js",
-     "public/js/twitter-text-1.0.3.js",
-     "public/swf/player_mp3_mini.swf",
-     "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_spec.rb",
-     "spec/url_spec.rb",
-     "spec/yaml_ordered_hash_spec.rb"
+    ".htaccess",
+    "COPYING",
+    "README.textile",
+    "Rakefile",
+    "VERSION",
+    "bin/murlsh",
+    "config.ru",
+    "config.yaml",
+    "lib/murlsh.rb",
+    "lib/murlsh/auth.rb",
+    "lib/murlsh/config_server.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/markup.rb",
+    "lib/murlsh/must_revalidate.rb",
+    "lib/murlsh/openlock.rb",
+    "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/url.rb",
+    "lib/murlsh/url_body.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_podcast.rb",
+    "plugins/add_post_50_update_rss.rb",
+    "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_60_flickr.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_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/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/comments.json",
+    "public/js/jquery-1.4.4.min.js",
+    "public/js/jquery.jgrowl_compressed.js",
+    "public/js/js.js",
+    "public/js/twitter-text-1.0.4.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_spec.rb",
+    "spec/url_spec.rb",
+    "spec/yaml_ordered_hash_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.7}
   s.summary = %q{url sharing site framework}
   s.test_files = [
     "spec/auth_spec.rb",
-     "spec/yaml_ordered_hash_spec.rb",
-     "spec/uri_ask_spec.rb",
-     "spec/img_store_spec.rb",
-     "spec/dispatch_spec.rb",
-     "spec/markup_spec.rb",
-     "spec/url_spec.rb",
-     "spec/uri_spec.rb",
-     "spec/doc_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_spec.rb",
+    "spec/url_spec.rb",
+    "spec/yaml_ordered_hash_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -116,38 +115,42 @@ 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<flog>, [">= 2.5.0"])
       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<plumnailer>, [">= 0.1.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-ruby>, [">= 1.2.1"])
-      s.add_runtime_dependency(%q<tinyatom>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<tinyatom>, [">= 0.3.3"])
       s.add_runtime_dependency(%q<twitter>, [">= 0.9.12"])
       s.add_runtime_dependency(%q<vimeo>, [">= 1.2.2"])
-      s.add_runtime_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<flog>, [">= 2.5.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     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<flickraw>, [">= 0.8.3"])
-      s.add_dependency(%q<flog>, [">= 2.5.0"])
       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<plumnailer>, [">= 0.1.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-ruby>, [">= 1.2.1"])
-      s.add_dependency(%q<tinyatom>, [">= 0.2.0"])
+      s.add_dependency(%q<tinyatom>, [">= 0.3.3"])
       s.add_dependency(%q<twitter>, [">= 0.9.12"])
       s.add_dependency(%q<vimeo>, [">= 1.2.2"])
+      s.add_dependency(%q<flog>, [">= 2.5.0"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
@@ -155,19 +158,21 @@ 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<flog>, [">= 2.5.0"])
     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<plumnailer>, [">= 0.1.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-ruby>, [">= 1.2.1"])
-    s.add_dependency(%q<tinyatom>, [">= 0.2.0"])
+    s.add_dependency(%q<tinyatom>, [">= 0.3.3"])
     s.add_dependency(%q<twitter>, [">= 0.9.12"])
     s.add_dependency(%q<vimeo>, [">= 1.2.2"])
+    s.add_dependency(%q<flog>, [">= 2.5.0"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/plugins/add_post_50_update_feed.rb

@@ -1,19 +1,17 @@
-%w{
-uri
+require 'uri'
 
-tinyatom
+require 'tinyatom'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-  # regenerate atom feed after a new url has been added
+  # Regenerate atom feed after a new url has been added.
   class AddPost50UpdateFeed < Plugin
 
     @hook = 'add_post'
 
-    # content types to add an enclosure for
+    # Content types to add an enclosure for.
     EnclosureContentTypes = %w{
       application/pdf
       audio/mpeg
@@ -44,7 +42,21 @@ module Murlsh
             :enclosure_title => mu.title
             )
           if mu.content_length
-            options.merge!(:enclosure_length => mu.content_length)
+            options.merge! :enclosure_length => mu.content_length
+          end
+        end
+
+        if mu.thumbnail_url
+          begin
+            # Add root url to relative urls.
+            tu = URI(mu.thumbnail_url)
+            abs_url = if tu.is_a?(URI::HTTP)
+              tu
+            else
+              URI.join config['root_url'], tu
+            end
+            options.merge! :media_thumbnail_url => abs_url
+          rescue URI::InvalidURIError
           end
         end
 
@@ -58,11 +70,11 @@ module Murlsh
           end
         end
 
-        feed.add_entry(mu.id, mu.title_stripped, mu.time, mu.url, options)
+        feed.add_entry mu.id, mu.title_stripped, mu.time, mu.url, options
       end
 
       Murlsh::openlock(config.fetch('feed_file'), 'w') do |f|
-        feed.make(:target => f)
+        feed.make :target => f
       end
 
     end

data/plugins/add_post_50_update_podcast.rb

@@ -1,9 +1,7 @@
-%w{
-rss/maker
-uri
+require 'rss/maker'
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 

data/plugins/add_post_50_update_rss.rb

@@ -1,9 +1,7 @@
-%w{
-rss/maker
-uri
+require 'rss/maker'
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
@@ -12,7 +10,7 @@ module Murlsh
 
     @hook = 'add_post'
 
-    # content types to add an enclosure for
+    # Content types to add an enclosure for.
     EnclosureContentTypes = %w{
       application/pdf
       audio/mpeg

data/plugins/add_post_60_notify_hubs.rb

@@ -1,12 +1,10 @@
-%w{
-uri
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-  # notify PubSubHubbub hubs that feed has been updated
+  # Notify PubSubHubbub hubs that feed has been updated.
   class AddPost60NotifyHubs < Plugin
 
     @hook = 'add_post'

data/plugins/add_pre_40_convert_mobile.rb

@@ -1,10 +1,7 @@
-%w{
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-
   # Convert urls specifically for use on mobile devices into their non-mobile
   # equivalents.
   class AddPre40ConvertMobile < Plugin
@@ -16,12 +13,9 @@ module Murlsh
 
     def self.run(url, config)
       url.url = case
-        when match = TwitterRe.match(url.url)
-          "#{match[1]}#{match[2]}"
-        when match = WikipediaRe.match(url.url)
-          "#{match[1]}#{match[2]}"
-        else
-          url.url
+        when match = TwitterRe.match(url.url); "#{match[1]}#{match[2]}"
+        when match = WikipediaRe.match(url.url); "#{match[1]}#{match[2]}"
+        else; url.url
       end
     end
 

data/plugins/add_pre_50_lookup_content_type_title.rb

@@ -1,12 +1,10 @@
-%w{
-uri
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-  # try to fetch the content length, content type and title of a url
+  # Try to fetch the content length, content type and title of a url.
   class AddPre50LookupContentTypeTitle < Plugin
 
     @hook = 'add_pre'
@@ -14,7 +12,7 @@ module Murlsh
     def self.run(url, config)
       ask = URI(url.url).extend(Murlsh::UriAsk)
       headers = {}
-      headers['User-Agent'] = config['user_agent'] if config['user_agent']
+      headers['User-Agent'] = config['user_agent']  if config['user_agent']
 
       content_length = ask.content_length(:headers => headers)
       if content_length and not content_length.empty?

data/plugins/add_pre_60_flickr.rb

@@ -1,21 +1,15 @@
-%w{
-cgi
+require 'flickraw'
 
-flickraw
-
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-  # Set the title and thumbnail url of Flickr photos.
+  # Set the title of Flickr photos.
   class AddPre60Flickr < Plugin
 
     @hook = 'add_pre'
 
     FlickrRe = %r{^http://(?:www\.)?flickr\.com/photos/[@\w\-]+?/([\d]+)}i
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
 
     def self.run(url, config)
       if config['flickr_api_key'] and not config['flickr_api_key'].empty?
@@ -24,11 +18,6 @@ module Murlsh
           info = flickr.photos.getInfo(:photo_id => photo_id)
 
           url.title = "#{info.title} by #{info.owner.username}"
-
-          thumb_storage = Murlsh::ImgStore.new(StorageDir,
-            :user_agent => config['user_agent'])
-          stored_filename = thumb_storage.store(FlickRaw.url_s(info))
-          url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
         end
       end
     end

data/plugins/add_pre_60_github_title.rb

@@ -1,8 +1,6 @@
-%w{
-uri
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
@@ -12,12 +10,12 @@ module Murlsh
 
     @hook = 'add_pre'
 
-    GithubRe = %r{^http://github\.com/\w+/[\w.-]+$}i
+    GithubRe = %r{^https?://github\.com/\w+/[\w.-]+$}i
 
     def self.run(url, config)
       if url.url[GithubRe]
         ask = URI(url.url).extend(Murlsh::UriAsk)
-        url.title << " - #{ask.description}" unless ask.description.empty?
+        url.title << " - #{ask.description}"  unless ask.description.empty?
       end
     end
 

data/plugins/add_pre_60_google_code_title.rb

@@ -1,13 +1,11 @@
-%w{
-uri
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
   # Google Code project page titles are not very descriptive so add summary
-  # from page
+  # from page.
   class AddPre60GoogleCodeTitle < Plugin
 
     @hook = 'add_pre'
@@ -19,7 +17,7 @@ module Murlsh
         ask = URI(url.url).extend(Murlsh::UriAsk)
         ask.doc.xpath_search("//a[@id='project_summary_link']") do |node|
           summary = node ? node.inner_html : nil
-          url.title << " - #{ask.decode(summary)}" unless !summary or
+          url.title << " - #{ask.decode(summary)}"  unless not summary or
             summary.empty?
         end
       end

data/plugins/add_pre_60_imgur.rb

@@ -1,29 +1,17 @@
-%w{
-cgi
-
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-  # Add YouTube thumbnail.
+  # Set the title of imgur images.
   class AddPre60Imgur < Plugin
 
     @hook = 'add_pre'
 
-    ImgurRe = %r{^(http://(?:i\.)?imgur\.com/)([a-z\d]+)(\.(?:jpe?g|gif|png))$}i
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
+    ImgurRe = %r{^http://(?:i\.)?imgur\.com/([a-z\d]+)(\.(?:jpe?g|gif|png))$}i
 
     def self.run(url, config)
       if match = ImgurRe.match(url.url)
-        url.title = "imgur/#{match[2]}s#{match[3]}"
-
-        thumb_storage = Murlsh::ImgStore.new(StorageDir,
-          :user_agent => config['user_agent'])
-        stored_filename = thumb_storage.store(
-          "#{match[1]}#{match[2]}s#{match[3]}")
-        url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
+        url.title = "imgur/#{match[1]}s#{match[2]}"
       end
     end
 

data/plugins/add_pre_60_s3_image.rb

@@ -1,8 +1,6 @@
-%w{
-cgi
+require 'cgi'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
@@ -21,8 +19,11 @@ module Murlsh
 
         thumb_storage = Murlsh::ImgStore.new(StorageDir,
           :user_agent => config['user_agent'])
-        stored_filename = thumb_storage.store(
-          "#{match[1]}#{match[2]}.th.#{extension}")
+        stored_filename = thumb_storage.store_url(
+          "#{match[1]}#{match[2]}.th.#{extension}") 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)}"
         url.title = match[2]

data/plugins/add_pre_60_twitter.rb

@@ -1,32 +1,21 @@
-%w{
-cgi
+require 'twitter'
 
-twitter
-
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
-  # Set title to entire tweet and set thumbnail url.
+  # Set title of twitter status urls to entire tweet.
   class AddPre60Twitter < Plugin
 
     @hook = 'add_pre'
 
     TwitterRe = %r{^https?://twitter\.com/\w+/status(?:es)?/(\d+)$}i
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
 
     def self.run(url, config)
       if tweet_id = url.url[TwitterRe, 1]
         tweet = Twitter.status(tweet_id)
 
         url.title = "@#{tweet.user.screen_name}: #{tweet.text}"
-
-        thumb_storage = Murlsh::ImgStore.new(StorageDir,
-          :user_agent => config['user_agent'])
-        stored_filename = thumb_storage.store(tweet.user.profile_image_url)
-        url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
       end
     end
 

data/plugins/add_pre_60_vimeo.rb

@@ -1,10 +1,8 @@
-%w{
-cgi
+require 'cgi'
 
-vimeo
+require 'vimeo'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 module Murlsh
 
@@ -25,7 +23,10 @@ module Murlsh
 
         thumb_storage = Murlsh::ImgStore.new(StorageDir,
           :user_agent => config['user_agent'])
-        stored_filename = thumb_storage.store(info['thumbnail_small'])
+        stored_filename = thumb_storage.store_url(info['thumbnail_small']) 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