murlsh 1.0.0 → 1.1.0

data/spec/markup_spec.rb

@@ -1,6 +1,4 @@
-%w{
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 class MarkupMixer < Builder::XmlMarkup
   include Murlsh::Markup
@@ -9,40 +7,40 @@ end
 describe MarkupMixer do
 
   before do
-    @m = MarkupMixer.new()
+    @m = MarkupMixer.new
   end
 
   it 'should correctly render a single javascript tag' do
-    @m.javascript('test.js')
+    @m.javascript 'test.js'
     @m.target!.should ==
       '<script type="text/javascript" src="test.js"></script>'
   end
 
   it 'should correctly render a list of javascript tags' do
-    @m.javascript(['test1.js', 'test2.js'])
+    @m.javascript ['test1.js', 'test2.js']
     @m.target!.should ==
       '<script type="text/javascript" src="test1.js"></script><script type="text/javascript" src="test2.js"></script>'
   end
 
   it 'should correctly render a single javascript tag with a prefix' do
-    @m.javascript('test.js', :prefix => 'http://static.com/js/')
+    @m.javascript 'test.js', :prefix => 'http://static.com/js/'
     @m.target!.should ==
       '<script type="text/javascript" src="http://static.com/js/test.js"></script>'
   end
 
   it 'should correctly render a list of javascripts tag with a prefix' do
-    @m.javascript(['test1.js', 'test2.js'], :prefix => 'js/')
+    @m.javascript ['test1.js', 'test2.js'], :prefix => 'js/'
     @m.target!.should ==
       '<script type="text/javascript" src="js/test1.js"></script><script type="text/javascript" src="js/test2.js"></script>'
   end
 
   it 'should correctly render a murlsh_img tag' do
-    @m.murlsh_img(:src => 'foo.png', :prefix => 'http://static.com/img/')
+    @m.murlsh_img :src => 'foo.png', :prefix => 'http://static.com/img/'
     @m.target!.should == '<img src="http://static.com/img/foo.png"/>'
   end
 
   it 'should correctly render a murlsh_img tag with a single size value' do
-    @m.murlsh_img(:src => 'foo.png', :size => 32)
+    @m.murlsh_img :src => 'foo.png', :size => 32
     [
       /height="32"/,
       /src="foo\.png"/,
@@ -51,7 +49,7 @@ describe MarkupMixer do
   end
 
   it 'should correctly render a murlsh_img tag with two size values' do
-    @m.murlsh_img(:src => 'foo.png', :size => [100, 200])
+    @m.murlsh_img :src => 'foo.png', :size => [100, 200]
     [
       /height="200"/,
       /src="foo\.png"/,
@@ -60,7 +58,7 @@ describe MarkupMixer do
   end
 
   it 'should correctly render a murlsh_img tag with text' do
-    @m.murlsh_img(:src => 'foo.png', :text => 'test')
+    @m.murlsh_img :src => 'foo.png', :text => 'test'
     [
       /alt="test"/,
       /src="foo\.png"/,
@@ -69,63 +67,63 @@ describe MarkupMixer do
   end
 
   it 'should correctly render a murlsh_img tag with an href' do
-    @m.murlsh_img(:href => '/test/', :src => 'foo.png')
+    @m.murlsh_img :href => '/test/', :src => 'foo.png'
     @m.target!.should == '<a href="/test/"><img src="foo.png"/></a>'
   end
 
   it 'should correctly render meta tags' do
-    @m.metas(:a => '1', :b => '2', :c => '3')
+    @m.metas :a => '1', :b => '2', :c => '3'
     [
       '<meta (name="a" content="1"|content="1" name="a")/>',
       '<meta (name="b" content="2"|content="2" name="b")/>',
       '<meta (name="c" content="3"|content="3" name="c")/>',
-    ].each { |r| @m.target!.should match /#{r}/ }
+    ].each { |r| @m.target!.should match(/#{r}/) }
   end
 
   it 'should correctly render a gravatar tag' do
-    @m.gravatar('xxx')
+    @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.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.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.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.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.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.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.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.gravatar 'xxx', :href => '/test/'
     @m.target!.should == 
       '<a href="/test/"><img src="http://www.gravatar.com/avatar/xxx"/></a>'
   end

data/spec/uri_ask_spec.rb

@@ -1,8 +1,6 @@
-%w{
-uri
+require 'uri'
 
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 Dir['plugins/*.rb'].each { |p| load p }
 
@@ -32,17 +30,17 @@ describe Murlsh::UriAsk do
   end
 
   it 'should return text/html for the content type of a valid URI that is text/html' do
-    content_type('http://www.google.com/').should match /^text\/html/
+    content_type('http://www.google.com/').should match(/^text\/html/)
   end
 
   it 'should return text/html for the content type of a valid https URI that is text/html' do
     content_type('https://msp.f-secure.com/web-test/common/test.html'
-      ).should match /^text\/html/
+      ).should match(/^text\/html/)
   end
 
   it 'should return text/html for the content type of a URI that returns HTTP 203' do
     content_type('http://www.youtube.com/watch?v=Vxq9yj2pVWk'
-      ).should match /^text\/html/
+      ).should match(/^text\/html/)
   end
 
   it 'should return an empty string for the content type of an invalid URI when given failproof option true' do

data/spec/uri_spec.rb

@@ -1,6 +1,4 @@
-%w{
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 describe URI do
 
@@ -8,7 +6,7 @@ describe URI do
     URI('http://foo.com/').domain.should == 'foo.com'
   end
 
-  it 'should have its domain set nil if it is no a valid HTTP URI' do
+  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

data/spec/url_spec.rb

@@ -1,12 +1,8 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'tempfile'
 
-%w{
-tempfile
+require 'sqlite3'
 
-sqlite3
-
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 describe Murlsh::Url do
 
@@ -25,8 +21,8 @@ describe Murlsh::Url do
       via TEXT);
       ")
 
-    ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
-      :database => @db_file.path)
+    ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
+      :database => @db_file.path
 
     @url = Murlsh::Url.new
   end

data/spec/yaml_ordered_hash_spec.rb

@@ -1,6 +1,4 @@
-%w{
-murlsh
-}.each { |m| require m }
+require 'murlsh'
 
 describe Murlsh::YamlOrderedHash do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2010-11-21 00:00:00 -05:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,67 +83,67 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: flog
+  name: hpricot
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 61
         segments: 
-        - 2
-        - 5
         - 0
-        version: 2.5.0
+        - 8
+        - 1
+        version: 0.8.1
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: htmlentities
   prerelease: false
   requirement: &id006 !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: *id006
 - !ruby/object:Gem::Dependency 
-  name: htmlentities
+  name: json
   prerelease: false
   requirement: &id007 !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: *id007
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: plumnailer
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 27
         segments: 
+        - 0
         - 1
-        - 2
-        - 3
-        version: 1.2.3
+        - 0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -227,9 +227,25 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rmagick
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 1
+        - 15
+        - 14
+        version: 1.15.14
+  type: :runtime
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -241,27 +257,27 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: tinyatom
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 21
         segments: 
         - 0
-        - 2
-        - 0
-        version: 0.2.0
+        - 3
+        - 3
+        version: 0.3.3
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: twitter
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -273,11 +289,11 @@ dependencies:
         - 12
         version: 0.9.12
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: vimeo
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -289,11 +305,27 @@ dependencies:
         - 2
         version: 1.2.2
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: flog
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :development
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -303,8 +335,8 @@ dependencies:
         - 1
         - 3
         version: "1.3"
-  type: :runtime
-  version_requirements: *id018
+  type: :development
+  version_requirements: *id020
 description: url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding
 email: matthewm@boedicker.org
 executables: 
@@ -314,7 +346,6 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
-- .gitignore
 - .htaccess
 - COPYING
 - README.textile
@@ -332,6 +363,7 @@ files:
 - 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
@@ -355,27 +387,27 @@ files:
 - 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/add_pre_65_html_thumb.rb
+- plugins/add_pre_65_img_thumb.rb
 - plugins/html_parse_50_hpricot.rb
-- plugins/url_display_add_45_mp3.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/README
+- public/img/thumb/.gitignore
 - public/js/comments.json
-- public/js/jquery-1.4.3.min.js
+- public/js/jquery-1.4.4.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
+- public/js/twitter-text-1.0.4.js
 - spec/auth_spec.rb
 - spec/dispatch_spec.rb
 - spec/doc_spec.rb
@@ -390,8 +422,8 @@ homepage: http://github.com/mmb/murlsh
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -421,11 +453,11 @@ specification_version: 3
 summary: url sharing site framework
 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/doc_spec.rb
+- spec/img_store_spec.rb
 - spec/markup_spec.rb
-- spec/url_spec.rb
+- spec/uri_ask_spec.rb
 - spec/uri_spec.rb
-- spec/doc_spec.rb
+- spec/url_spec.rb
+- spec/yaml_ordered_hash_spec.rb

data/.gitignore

@@ -1,6 +0,0 @@
-*~
-\#*#
-\.#*
-*\.gem
-public/css/*.gen.css
-public/js/*.gen.js

data/plugins/add_pre_60_imageshack.rb

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

data/plugins/url_display_add_45_mp3.rb

@@ -1,30 +0,0 @@
-%w{
-murlsh
-}.each { |m| require m }
-
-module Murlsh
-
-  # Add Flash mp3 player to mp3 urls.
-  class UrlDisplayAdd45Mp3 < Plugin
-
-    @hook = 'url_display_add'
-
-    def self.run(markup, url, config)
-      if url.content_type == 'audio/mpeg'
-        swf = 'swf/player_mp3_mini.swf'
-
-        markup.object(
-          :type => 'application/x-shockwave-flash',
-          :data => swf,
-          :width => 200,
-          :height => 20) {
-          markup.param(:name => 'bgcolor', :value => '#000000')
-          markup.param(:name => 'FlashVars', :value => "mp3=#{url.url}")
-          markup.param(:name => 'movie', :value => swf)
-        }
-      end
-    end
-
-  end
-
-end