murlsh 1.4.1 → 1.5.0

data/plugins/add_pre_45_supplied_thumbnail.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 require 'murlsh'
 
 module Murlsh
@@ -9,20 +7,17 @@ module Murlsh
 
     @hook = 'add_pre'
 
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
-
     def self.run(url, config)
       if url.thumbnail_url
         Murlsh::failproof do
-          thumb_storage = Murlsh::ImgStore.new(StorageDir,
-            :user_agent => config['user_agent'])
+          thumb_storage = Murlsh::ImgStore.new(config)
 
-          stored_filename = thumb_storage.store_url(url.thumbnail_url) do |i|
+          stored_url = thumb_storage.store_url(url.thumbnail_url) 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.thumbnail_url = stored_url  if stored_url
         end
       end
     end

data/plugins/add_pre_50_media_thumbnail.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 require 'murlsh'
 
 module Murlsh
@@ -9,9 +7,6 @@ module Murlsh
 
     @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(%w{
@@ -20,14 +15,14 @@ module Murlsh
           }) do |node|
           if node and not node['href'].to_s.empty?
             Murlsh::failproof do
-              thumb_storage = Murlsh::ImgStore.new(StorageDir,
-                :user_agent => config['user_agent'])
+              thumb_storage = Murlsh::ImgStore.new(config)
 
-              stored_filename = thumb_storage.store_url(node['href']) do |i|
+              stored_url = 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)}"
+
+              url.thumbnail_url = stored_url  if stored_url
             end
           end
         end

data/plugins/add_pre_50_open_graph_image.rb

@@ -1,4 +1,3 @@
-require 'cgi'
 require 'uri'
 
 require 'murlsh'
@@ -10,9 +9,6 @@ module Murlsh
 
     @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|
@@ -23,14 +19,14 @@ module Murlsh
               if og_image_url[%r{^//}]
                 og_image_url = "#{URI(url.url).scheme}:#{og_image_url}"
               end
-              thumb_storage = Murlsh::ImgStore.new(StorageDir,
-                :user_agent => config['user_agent'])
+              thumb_storage = Murlsh::ImgStore.new(config)
 
-              stored_filename = thumb_storage.store_url(og_image_url) do |i|
+              stored_url = thumb_storage.store_url(og_image_url) 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.thumbnail_url = stored_url  if stored_url
             end
           end
         end

data/plugins/add_pre_60_github_title.rb

@@ -10,7 +10,7 @@ module Murlsh
 
     @hook = 'add_pre'
 
-    GithubRe = %r{^https?://github\.com/\w+/[\w.-]+$}i
+    GithubRe = %r{^https?://github\.com/\w+/[\w.-]+/?$}i
 
     def self.run(url, config)
       if not url.user_supplied_title? and url.url.to_s[GithubRe]

data/plugins/add_pre_65_html_thumb.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 require 'plumnailer'
 
 require 'murlsh'
@@ -11,9 +9,6 @@ module Murlsh
 
     @hook = 'add_pre'
 
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
-
     def self.run(url, config)
       if not url.thumbnail_url and url.content_type and
         url.content_type[Murlsh::UriAsk::HtmlContentTypeRe]
@@ -25,10 +20,10 @@ module Murlsh
             max_side = config.fetch('thumbnail_max_side', 90)
             choice.extend(Murlsh::ImageList).resize_down!(max_side)
 
-            thumb_storage = Murlsh::ImgStore.new(StorageDir)
+            thumb_storage = Murlsh::ImgStore.new(config)
 
-            stored_filename = thumb_storage.store_img(choice)
-            url.thumbnail_url = "img/thumb/#{CGI.escape(stored_filename)}"
+            stored_url = thumb_storage.store_img(choice)
+            url.thumbnail_url = stored_url  if stored_url
           end
         end
       end

data/plugins/add_pre_65_img_thumb.rb

@@ -1,5 +1,3 @@
-require 'cgi'
-
 require 'murlsh'
 
 module Murlsh
@@ -9,9 +7,6 @@ module Murlsh
 
     @hook = 'add_pre'
 
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
-
     ImageContentType = %w{
       image/gif
       image/jpeg
@@ -22,14 +17,14 @@ module Murlsh
       if not url.thumbnail_url and url.content_type and
         ImageContentType.include?(url.content_type)
         Murlsh::failproof do
-          thumb_storage = Murlsh::ImgStore.new(StorageDir,
-            :user_agent => config['user_agent'])
+          thumb_storage = Murlsh::ImgStore.new(config)
 
-          stored_filename = thumb_storage.store_url(url.url) do |i|
+          stored_url = thumb_storage.store_url(url.url) 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.thumbnail_url = stored_url  if stored_url
         end
       end
     end

data/plugins/avatar_50_gravatar.rb

@@ -13,7 +13,8 @@ module Murlsh
       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))
+        URI.join('http://www.gravatar.com/avatar/', url.email,
+          Murlsh::build_query(query))
       end
     end
 

data/plugins/store_asset_40_s3.rb

@@ -0,0 +1,40 @@
+require 'time'
+
+require 'aws/s3'
+
+module Murlsh
+
+  # Store assets in Amazon S3.
+  #
+  # Depends on 's3_id', 's3_secret', and 's3_bucket' in config.
+  class StoreAsset40S3 < Plugin
+
+    @hook = 'store_asset'
+
+    def self.run(name, data, config)
+      if !config['s3_id'].to_s.empty? and
+        !config['s3_secret'].to_s.empty? and
+        !config['s3_bucket'].to_s.empty?
+        AWS::S3::Base.establish_connection!(
+          :access_key_id => config['s3_id'],
+          :secret_access_key => config['s3_secret']
+        )
+
+        bucket = begin
+          AWS::S3::Bucket.find config['s3_bucket']
+        rescue AWS::S3::NoSuchBucket
+          AWS::S3::Bucket.create config['s3_bucket'], :access => :public_read
+        end
+
+        AWS::S3::S3Object.store name, data, bucket.name,
+          :access => :public_read,
+          # 100 years
+          :expires => (Time.now + (31536000000)).httpdate
+
+        AWS::S3::S3Object.url_for(name, bucket.name, :authenticated => false)
+      end
+    end
+
+  end
+
+end

data/plugins/store_asset_50_local.rb

@@ -0,0 +1,22 @@
+require 'murlsh'
+
+module Murlsh
+
+  # Store assets on the local filesystem in the public directory.
+  class StoreAsset50Local < Plugin
+
+    @hook = 'store_asset'
+
+    def self.run(name, data, config)
+      # break apart and rejoin to use os path separator
+      name_parts = name.split('/')
+      local_path = File.join('public', name_parts)
+
+      Murlsh::openlock(local_path, 'w') { |fout| fout.write data }
+
+      name
+    end
+
+  end
+
+end

data/public/js/js.js

@@ -9,8 +9,6 @@ var Murlsh = function ($, navigator, window, twtter) {
                 /^http:\/\/img\d+\.imageshack\.us\/img\d+\/\d+\/\w+\.(?:jpe?g|gif|png)$/i,
             imgur :
                 /^http:\/\/(?:i\.)?imgur\.com\/[a-z\d]+\.(?:jpe?g|gif|png)$/i,
-            s3 :
-                /^http:\/\/static\.mmb\.s3\.amazonaws\.com\/[\w\-]+\.(jpe?g|gif|pdf|png)$/i,
             twitter :
                 /^https?:\/\/twitter\.com\/\w+\/status(?:es)?\/\d+$/i,
             vimeo :
@@ -119,11 +117,6 @@ var Murlsh = function ($, navigator, window, twtter) {
 
         if (match.imageshack || match.imgur) {
             setupClickHandler(thisA.siblings('img'), 'href', href, imgClick);
-        } else if (match.s3) {
-            if (!(match.s3[1].match(/^pdf$/i))) {
-                setupClickHandler(thisA.siblings('img'), 'href', href,
-                    imgClick);
-            }
         } else if (match.twitter) {
             thisA.siblings('img').addClass('twitter');
             tweetMatch = /^(@[0-9a-z_]+?): (.+)$/i.exec(thisA.text());

data/spec/auth_spec.rb

@@ -30,4 +30,11 @@ describe Murlsh::Auth do
     @a.auth('not there').should be_nil
   end
 
+  it 'should be able to find user by email address' do
+    @a.by_email('test1@test.com').should == {
+      :name => 'test1',
+      :email => Digest::MD5.hexdigest('test1@test.com')
+      }
+  end
+
 end

data/spec/cat_files_spec.rb

@@ -0,0 +1,49 @@
+require 'tempfile'
+
+require 'murlsh'
+
+describe Murlsh do
+
+  describe :cat_files do
+
+    context 'when all files are there' do
+
+      before do
+        @f1 = Tempfile.new('f1')
+        (1..2).each { |i| @f1.write "#{i}\n" }
+        @f1.close
+
+        @f2 = Tempfile.new('f2')
+        (1..3).each { |i| @f2.write "#{i}\n" }
+        @f2.close
+      end
+
+      after do
+        @f1.unlink
+        @f2.unlink
+      end
+
+      it 'should cat the files together and return the result' do
+        Murlsh.cat_files([@f1.path, @f2.path]).should == <<eos
+1
+2
+1
+2
+3
+eos
+      end
+
+    end
+
+    context 'when one or more files are missing' do
+
+      it 'should raise no such file or directory' do
+        lambda { Murlsh.cat_files(['does_not_exist']) }.should raise_error(
+          Errno::ENOENT)
+      end
+
+    end
+
+  end
+
+end

data/spec/img_store_spec.rb

@@ -7,12 +7,28 @@ require 'RMagick'
 
 require 'murlsh'
 
+module Murlsh
+
+  class StoreAsset50Test < Plugin
+
+    @hook = 'store_asset'
+
+    def self.run(name, data, config)
+      local_path = File.join(Dir::tmpdir, 'img_store_test', name)
+      FileUtils.mkdir_p(File.dirname(local_path))
+      Murlsh::openlock(local_path, 'w') { |fout| fout.write data }
+      name
+    end
+
+  end
+
+end
+
 describe Murlsh::ImgStore do
 
   before(:all) do
     @thumb_dir = File.join(Dir::tmpdir, 'img_store_test')
-    FileUtils.mkdir_p @thumb_dir
-    @img_store = Murlsh::ImgStore.new(@thumb_dir)
+    @img_store = Murlsh::ImgStore.new({})
   end
 
   describe :store_url do
@@ -22,13 +38,13 @@ describe Murlsh::ImgStore do
       before(:all) do
         image_url =
           'http://static.mmb.s3.amazonaws.com/2010_10_8_bacon_pancakes.jpg'
-        @local_file = @img_store.store_url(image_url)
-        @local_path = File.join(@thumb_dir, @local_file)
+        @stored_url = @img_store.store_url(image_url)
+        @local_path = File.join(@thumb_dir, @stored_url)
       end
 
       it 'should be named with the md5 sum of its contents' do
         md5 = Digest::MD5.file(@local_path).hexdigest
-        @local_file.should == "#{md5}.jpg"
+        @stored_url.should == "img/thumb/#{md5}.jpg"
       end
 
     end
@@ -54,13 +70,13 @@ describe Murlsh::ImgStore do
           'http://static.mmb.s3.amazonaws.com/2010_10_8_bacon_pancakes.jpg') do |f|
           f.read
         end
-        @local_file = @img_store.store_img_data(img_data)
-        @local_path = File.join(@thumb_dir, @local_file)
+        @stored_url = @img_store.store_img_data(img_data)
+        @local_path = File.join(@thumb_dir, @stored_url)
       end
 
       it 'should be named with the md5 sum of its contents' do
         md5 = Digest::MD5.file(@local_path).hexdigest
-        @local_file.should == "#{md5}.jpg"
+        @stored_url.should == "img/thumb/#{md5}.jpg"
       end
 
     end