murlsh 0.8.1 → 0.9.0

data/.htaccess

@@ -8,4 +8,5 @@ AddOutputFilterByType DEFLATE text/html
 
 <FilesMatch "\.gen\.(css|js)$">
   Header add Expires "Wed, 22 Jun 2019 20:07:00 GMT"
+  FileETag None
 </FilesMatch>

data/README.textile

@@ -26,14 +26,8 @@ h2. Phusion Passenger
 <code>
 gem sources -a http://gemcutter.org/
 gem install murlsh
-</code>
-</pre>
-
-In the web directory:
-
-<pre>
-<code>
-murlsh
+murlsh DESTINATION_DIRECTORY
+cd DESTINATION_DIRECTORY
 edit config.yaml
 rake init
 </code>
@@ -56,4 +50,13 @@ pubsubhubbub_hubs:
 publish_url is where the notifications get sent
 subscribe_url is what gets put in the feed as link rel="hub"
 
+This will make updates to your feed show up in Google Reader instantly.
+
+h1. Updating
+
+If you are using the gem and it gets updated to a new version you should run
+the murlsh command again from your web directory to update plugins, javascript
+and css. It will prompt before overwriting anything in case you have made
+modifications.
+
 Questions and comments: "matthewm@boedicker.org":mailto:matthewm@boedicker.org

data/Rakefile

@@ -303,8 +303,10 @@ begin
       json 1.2.3
       rack 1.0.0
       rack-cache 0.5.2
+      rack-throttle 0.3.0
       sqlite3-ruby 1.2.1
-     }.each_slice(2) { |g,v| gemspec.add_dependency(g, ">= #{v}") }
+      tinyatom 0.1.1
+      }.each_slice(2) { |g,v| gemspec.add_dependency(g, ">= #{v}") }
 
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/bin/murlsh

@@ -2,9 +2,18 @@
 
 require 'fileutils'
 
+def usage
+  puts <<-eos
+Initialize a murlsh site instance in a web directory.
+
+usage: murlsh DESTINATION_DIRECTORY
+
+eos
+end
+
 def ask(prompt, default)
   print "#{prompt} [#{default}] "
-  answer = gets.strip
+  answer = $stdin.gets.strip
   answer = default if answer.empty?
   answer
 end
@@ -31,15 +40,20 @@ def cp_r_safe(sources, dest, options)
 
 end
 
+if ARGV.empty?; usage; exit 1; end
+
+dest_dir = ARGV[0]
+
 cp_r_safe(
   %w{.htaccess config.ru config.yaml plugins/ public/ Rakefile}.map { |x| 
-    File.join(File.dirname(__FILE__), '..', x) }, '.', :verbose => true)
+    File.join(File.dirname(__FILE__), '..', x) }, dest_dir, :verbose => true)
 
 FileUtils.mkdir_p('tmp', :verbose => true)
 
 puts <<eos
 Next steps:
 
+cd #{dest_dir}
 edit config.yaml
 rake init
 eos

data/config.ru

@@ -4,6 +4,7 @@ $:.unshift(File.join(File.dirname(__FILE__), 'lib'))
 yaml
 
 rack/cache
+rack/throttle
 
 murlsh
 }.each { |m| require m }
@@ -11,10 +12,14 @@ murlsh
 config = YAML.load_file('config.yaml')
 
 # use Rack::ShowExceptions
-use Rack::Cache,
-  :verbose => true,
-  :metastore => 'file:tmp/cache/rack/meta',
-  :entitystore => 'file:tmp/cache/rack/body'
+# no more than 1024 requests per day per ip
+use Rack::Throttle::Daily, :max => 1024
+if config.key?('cache_metastore') and config.key?('cache_entitystore')
+  use Rack::Cache,
+    :verbose => true,
+    :metastore => config['cache_metastore'],
+    :entitystore => config['cache_entitystore']
+end
 use Rack::ConditionalGet
 use Murlsh::EtagAddEncoding
 use Rack::Deflater

data/config.yaml

@@ -1,5 +1,7 @@
 --- 
 auth_file: murlsh_users
+cache_entitystore: file:tmp/cache/rack/body
+cache_metastore: file:tmp/cache/rack/meta
 css_files: 
 - css/jquery.jgrowl.css
 - css/screen.css

data/lib/murlsh/doc.rb

@@ -1,7 +1,3 @@
-%w{
-hpricot
-}.each { |m| require m }
-
 module Murlsh
 
   # Hpricot:Doc mixin.

data/lib/murlsh/flickr_server.rb

@@ -2,8 +2,9 @@
 digest/sha1
 open-uri
 
-json
 rack
+
+murlsh
 }.each { |m| require m }
 
 module Murlsh
@@ -29,9 +30,7 @@ module Murlsh
           f.read
         end
 
-        json = /.+?\((.+)\)/.match(json_wrapped)[1]
-
-        json_parsed = JSON.parse(json)
+        json_parsed = Murlsh::unwrap_jsonp(json_wrapped)
 
         resp['Cache-Control'] = 'max-age=86400'
         resp['Content-Type'] = 'application/json'

data/lib/murlsh/plugin.rb

@@ -9,8 +9,12 @@ module Murlsh
   #   run arguments (config hash)
   # * hostrec - called to post process the domain that shows after links
   #   run arguments (domain, url, title)
+  # * html_parse - called to parse HTML using something like Hpricot or Nokogiri
+  #   run arguments (parseable)
   # * time - called to convert the time of a post into a string for display
   #   run arguments (time)
+  # * via - called to convert a via url into a string for display
+  #   run arguments (via url)
   class Plugin
 
     # Called when a plugin class inherits from this class (the way plugins
@@ -21,7 +25,7 @@ module Murlsh
 
     # Get registered plugins by hook (add_pre, add_post, etc.)
     def self.hooks(name)
-      matches = registered.select { |p| p::Hook == name }.
+      matches = registered.select { |p| p.hook == name }.
         sort { |a,b| a.to_s <=> b.to_s }
 
       if block_given?
@@ -31,7 +35,10 @@ module Murlsh
     end
 
     @registered = []
-    class << self; attr_reader :registered end
+    class << self;
+      attr_reader :hook
+      attr_reader :registered
+    end
 
   end
 

data/lib/murlsh/twitter_server.rb

@@ -2,8 +2,9 @@
 digest/sha1
 open-uri
 
-json
 rack
+
+murlsh
 }.each { |m| require m }
 
 module Murlsh
@@ -26,9 +27,7 @@ module Murlsh
         f.read
       end
 
-      json = /.+?\((.+)\)/.match(json_wrapped)[1]
-
-      json_parsed = JSON.parse(json)
+      json_parsed = Murlsh::unwrap_jsonp(json_wrapped)
 
       resp['Cache-Control'] = 'max-age=86400'
       resp['ETag'] = "\"#{Digest::SHA1.hexdigest(json_wrapped)}\""

data/lib/murlsh/unwrap_jsonp.rb

@@ -0,0 +1,15 @@
+%w{
+json
+}.each { |m| require m }
+
+module Murlsh
+
+  module_function
+
+  # Unwrap jsonp to standard json and parse it.
+  def unwrap_jsonp(jsonp)
+    json = /.+?\((.+)\)/m.match(jsonp)[1]
+    JSON.parse(json)
+  end
+
+end

data/lib/murlsh/uri_ask.rb

@@ -4,7 +4,6 @@ net/https
 open-uri
 uri
 
-hpricot
 htmlentities
 iconv
 }.each { |m| require m }
@@ -76,7 +75,10 @@ module Murlsh
       @description
     end
 
-    # Get the parsed Hpricot doc at this url.
+    # Get the parsed doc at this url.
+    #
+    # Doc can be an Hpricot or Nokogiri doc or anything that supports the
+    # methods in Murlsh::Doc.
     #
     # Options:
     # * :failproof - if true hide all exceptions and return empty string on failure
@@ -89,7 +91,8 @@ module Murlsh
       if html?(options)
         Murlsh::failproof(options) do
           self.open(options[:headers]) do |f|
-            @doc = Hpricot(f).extend(Murlsh::Doc)
+            @doc = Murlsh::Plugin.hooks('html_parse').first.run(f).extend(
+              Murlsh::Doc)
 
             @charset = @doc.charset || f.charset
           end

data/murlsh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{murlsh}
-  s.version = "0.8.1"
+  s.version = "0.9.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-04-30}
+  s.date = %q{2010-06-03}
   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,7 +28,6 @@ Gem::Specification.new do |s|
      "config.ru",
      "config.yaml",
      "lib/murlsh.rb",
-     "lib/murlsh/atom_feed.rb",
      "lib/murlsh/auth.rb",
      "lib/murlsh/dispatch.rb",
      "lib/murlsh/doc.rb",
@@ -43,6 +42,7 @@ Gem::Specification.new do |s|
      "lib/murlsh/sqlite3_adapter.rb",
      "lib/murlsh/time_ago.rb",
      "lib/murlsh/twitter_server.rb",
+     "lib/murlsh/unwrap_jsonp.rb",
      "lib/murlsh/uri.rb",
      "lib/murlsh/uri_ask.rb",
      "lib/murlsh/url.rb",
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
      "plugins/add_pre_60_github_title.rb",
      "plugins/hostrec_50_redundant.rb",
      "plugins/hostrec_60_skip.rb",
+     "plugins/html_parse_50_hpricot.rb",
      "plugins/time_50_ago.rb",
      "plugins/via_50_domain.rb",
      "public/css/jquery.jgrowl.css",
@@ -66,11 +67,11 @@ Gem::Specification.new do |s|
      "public/js/jquery.jgrowl_compressed.js",
      "public/js/js.js",
      "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/unwrap_json_spec.rb",
      "spec/uri_ask_spec.rb",
      "spec/uri_spec.rb",
      "spec/url_spec.rb",
@@ -80,13 +81,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/mmb/murlsh}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{url sharing site framework}
   s.test_files = [
     "spec/xhtml_response_spec.rb",
-     "spec/atom_feed_spec.rb",
      "spec/auth_spec.rb",
      "spec/yaml_ordered_hash_spec.rb",
+     "spec/unwrap_json_spec.rb",
      "spec/uri_ask_spec.rb",
      "spec/dispatch_spec.rb",
      "spec/markup_spec.rb",
@@ -99,7 +100,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.3.4"])
       s.add_runtime_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
       s.add_runtime_dependency(%q<builder>, [">= 2.1.2"])
@@ -108,7 +109,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.2.3"])
       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-throttle>, [">= 0.3.0"])
       s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.1"])
+      s.add_runtime_dependency(%q<tinyatom>, [">= 0.1.1"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.3.4"])
       s.add_dependency(%q<bcrypt-ruby>, [">= 2.1.2"])
@@ -118,7 +121,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json>, [">= 1.2.3"])
       s.add_dependency(%q<rack>, [">= 1.0.0"])
       s.add_dependency(%q<rack-cache>, [">= 0.5.2"])
+      s.add_dependency(%q<rack-throttle>, [">= 0.3.0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.1"])
+      s.add_dependency(%q<tinyatom>, [">= 0.1.1"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.3.4"])
@@ -129,7 +134,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json>, [">= 1.2.3"])
     s.add_dependency(%q<rack>, [">= 1.0.0"])
     s.add_dependency(%q<rack-cache>, [">= 0.5.2"])
+    s.add_dependency(%q<rack-throttle>, [">= 0.3.0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.1"])
+    s.add_dependency(%q<tinyatom>, [">= 0.1.1"])
   end
 end
 

data/plugins/add_post_50_update_feed.rb

@@ -1,4 +1,6 @@
 %w{
+tinyatom
+
 murlsh
 }.each { |m| require m }
 
@@ -7,18 +9,48 @@ module Murlsh
   # regenerate atom feed after a new url has been added
   class AddPost50UpdateFeed < Plugin
 
-    Hook = 'add_post'
+    @hook = 'add_post'
 
     def self.run(config)
+      feed = TinyAtom::Feed.new(config['root_url'], config.fetch('page_title'),
+        URI.join(config['root_url'], config['feed_file']),
+        :hubs => config.fetch('pubsubhubbub_hubs', []).
+          map { |x| x['subscribe_url'] } )
+
       latest = Murlsh::Url.all(:order => 'id DESC',
         :limit => config.fetch('num_posts_feed', 25))
 
-      feed = Murlsh::AtomFeed.new(config.fetch('root_url'),
-        :filename => config.fetch('feed_file'),
-        :title => config.fetch('page_title', ''),
-        :hubs => config.fetch('pubsubhubbub_hubs', []).map { |x| x['subscribe_url'] } )
+      latest.each do |mu|
+        options = {
+          :author_name => mu.name,
+          :summary => mu.title_stripped
+        }
+
+        if mu.is_image?
+          options.merge!(
+            :enclosure_type => mu.content_type,
+            :enclosure_href => mu.url,
+            :enclosure_title => 'Full-size'
+            )
+        end
+
+        Murlsh::failproof do
+          if mu.via
+            options.merge!(
+              :via_type => 'text/html',
+              :via_href => mu.via,
+              :via_title => URI(mu.via).domain
+              )
+          end
+        end
+
+        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)
+      end
 
-      feed.write(latest, config.fetch('feed_file'))
     end
 
   end

data/plugins/add_post_50_update_rss.rb

@@ -9,7 +9,7 @@ module Murlsh
   # Regenerate RSS feed after a new url has been added.
   class AddPost50UpdateRss < Plugin
 
-    Hook = 'add_post'
+    @hook = 'add_post'
 
     def self.run(config)
       output_file = 'rss.xml'

data/plugins/add_post_60_notify_hubs.rb

@@ -7,7 +7,7 @@ module Murlsh
   # notify PubSubHubbub hubs that feed has been updated
   class AddPost60NotifyHubs < Plugin
 
-    Hook = 'add_post'
+    @hook = 'add_post'
 
     def self.run(config)
       hubs = config.fetch('pubsubhubbub_hubs', [])

data/plugins/add_pre_50_lookup_content_type_title.rb

@@ -7,7 +7,7 @@ module Murlsh
   # try to fetch the content type and title of a url
   class AddPre50LookupContentTypeTitle < Plugin
 
-    Hook = 'add_pre'
+    @hook = 'add_pre'
 
     def self.run(url, config)
       ask = URI(url.url).extend(Murlsh::UriAsk)

data/plugins/add_pre_60_github_title.rb

@@ -8,7 +8,7 @@ module Murlsh
   # to title.
   class AddPre60GithubTitle < Plugin
 
-    Hook = 'add_pre'
+    @hook = 'add_pre'
 
     def self.run(url, config)
       if url.url[%r{http://github.com/\w+/\w+}]

data/plugins/hostrec_50_redundant.rb

@@ -3,7 +3,7 @@ module Murlsh
   # skip showing host record if domain is contained in title
   class Hostrec50Redundant < Plugin
 
-    Hook = 'hostrec'
+    @hook = 'hostrec'
 
     def self.run(domain, url, title)
       domain unless (title and domain and title.downcase.index(domain))

data/plugins/hostrec_60_skip.rb

@@ -1,15 +1,15 @@
 module Murlsh
 
-  # skip showing host record for some domains
+  # Skip showing host record for some domains.
   class Hostrec60Skip < Plugin
 
-    Hook = 'hostrec'
+    @hook = 'hostrec'
 
     def self.run(domain, url, title)
-      domain unless Skips.include?(domain)
+      domain unless skips.include?(domain)
     end
 
-    Skips = %w{
+    @skips = %w{
       wikipedia.org
       flickr.com
       github.com
@@ -17,6 +17,7 @@ module Murlsh
       vimeo.com
       youtube.com
       }
+    class << self; attr_reader :skips; end
 
   end
 

data/plugins/html_parse_50_hpricot.rb

@@ -0,0 +1,19 @@
+%w{
+hpricot
+}.each { |m| require m }
+
+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/plugins/time_50_ago.rb

@@ -7,7 +7,7 @@ module Murlsh
   # show the time as the fuzzy amount of time that has elapsed since then
   class Time50Ago < Plugin
 
-    Hook = 'time'
+    @hook = 'time'
 
     def self.run(time); time.extend(Murlsh::TimeAgo).ago if time; end
 

data/plugins/via_50_domain.rb

@@ -9,7 +9,7 @@ module Murlsh
   # For most urls the domain is displayed, but for some return custom text.
   class Via50Domain < Plugin
 
-    Hook = 'via'
+    @hook = 'via'
 
     def self.run(via)
       search = via.to_s.gsub(%r{^http://}, '')

data/public/css/screen.css

@@ -54,6 +54,11 @@ img.thumb, li object {
   -webkit-border-radius : 5px;
 }
 
+img.thumb.twitter {
+  height : 48px;
+  width : 48px;
+}
+
 span.host {
   color : #808080;
   font-family : monospace;

data/public/js/js.js

@@ -103,7 +103,7 @@ Murlsh.imgThumb = function() {
 
     // if pdf the thumbnail will be .png
     if (urlParts[lastIndex].match(/^pdf$/i)) {
-        urlParts.lastIndex = 'png';
+        urlParts.splice(lastIndex, 1, 'png');
     }
 
     return Murlsh.img(urlParts.join('')).addClass('thumb');
@@ -113,6 +113,10 @@ Murlsh.imgClick = function() {
     Murlsh.closerAdd(Murlsh.img($(this).data('href')));
 };
 
+Murlsh.twitterThumb = function(d) {
+    return Murlsh.img(d.user.profile_image_url).addClass('thumb twitter');
+}
+
 Murlsh.vimeoThumb = function(d) {
     return Murlsh.img(d.thumbnail_medium, d.title).addClass('thumb vimeo');
 };
@@ -170,7 +174,7 @@ Murlsh.hrefRes = {
     s3 :
         /^(http:\/\/static\.mmb\.s3\.amazonaws\.com\/[\w\-]+\.)(jpe?g|gif|pdf|png)$/i,
     twitter :
-        /^http:\/\/twitter\.com\/\w+\/status(?:es)?\/(\d+)$/i,
+        /^https?:\/\/twitter\.com\/\w+\/status(?:es)?\/(\d+)$/i,
     vimeo :
         /^http:\/\/(?:www\.)?vimeo\.com\/(\d+)$/i,
     youtube :
@@ -249,11 +253,7 @@ Murlsh.addExtra = function() {
                 $(this).html(d.text).before(nameLink).before(
                     document.createTextNode(': '));
 
-                Murlsh.thumbInsert(
-                    Murlsh.imgThumb(d.user.profile_image_url).attr({
-                        height : '48',
-                        width : '48'
-                    }), null, nameLink);
+                Murlsh.thumbInsert(Murlsh.twitterThumb(d), null, nameLink);
             },
             context : $(this),
             jsonpCallback : 'twitterCallback' + match.twitter[1]

data/spec/unwrap_json_spec.rb

@@ -0,0 +1,23 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+%w{
+murlsh
+}.each { |m| require m }
+
+describe Murlsh.method(:unwrap_jsonp) do
+
+  subject do
+    jsonp = <<eos
+jsonp1270266100192 ({
+  "key" : {
+    "v1" : "value 1",
+    "v2" : "value 2"
+    }
+}
+)
+eos
+    Murlsh::unwrap_jsonp(jsonp)
+  end
+
+  it { should == { 'key' => { 'v1' => 'value 1', 'v2' => 'value 2' } } }
+end

data/spec/uri_ask_spec.rb

@@ -6,6 +6,8 @@ uri
 murlsh
 }.each { |m| require m }
 
+Dir['plugins/*.rb'].each { |p| load p }
+
 describe Murlsh::UriAsk do
 
   def asker(s)
@@ -49,9 +51,9 @@ describe Murlsh::UriAsk do
     content_type('http://x.boedicker.org/', :failproof => true).should be_empty
   end
 
-  it 'should raise a SocketError when getting the content type of an invalid URI when given failproof option false' do
+  it 'should raise a NoMethodError when getting the content type of an invalid URI when given failproof option false' do
     lambda { content_type('http://x.boedicker.org/', :failproof => false)
-      }.should raise_error(SocketError)
+      }.should raise_error(NoMethodError)
   end
 
   it 'should limit redirects when getting content type' do
@@ -87,9 +89,9 @@ describe Murlsh::UriAsk do
       ).should == 'http://x.boedicker.org/'
   end
 
-  it 'should raise a SocketError when trying to get the title of an invalid URI when given failproof option false' do
+  it 'should raise a NoMethodError when trying to get the title of an invalid URI when given failproof option false' do
     lambda { title('http://x.boedicker.org/', :failproof => false)
-      }.should raise_error(SocketError)
+      }.should raise_error(NoMethodError)
   end
 
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
+  hash: 59
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 1
-  version: 0.8.1
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-30 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 2
         - 3
@@ -35,9 +38,11 @@ dependencies:
   name: bcrypt-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -49,9 +54,11 @@ dependencies:
   name: builder
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 1
@@ -63,9 +70,11 @@ dependencies:
   name: hpricot
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 61
         segments: 
         - 0
         - 8
@@ -77,9 +86,11 @@ dependencies:
   name: htmlentities
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 4
         - 2
@@ -91,9 +102,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 2
@@ -105,9 +118,11 @@ dependencies:
   name: rack
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -119,9 +134,11 @@ dependencies:
   name: rack-cache
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 5
@@ -130,19 +147,53 @@ dependencies:
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: rack-throttle
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 1
         - 2
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: tinyatom
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id011
 description: url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding
 email: matthewm@boedicker.org
 executables: 
@@ -162,7 +213,6 @@ files:
 - config.ru
 - config.yaml
 - lib/murlsh.rb
-- lib/murlsh/atom_feed.rb
 - lib/murlsh/auth.rb
 - lib/murlsh/dispatch.rb
 - lib/murlsh/doc.rb
@@ -177,6 +227,7 @@ files:
 - lib/murlsh/sqlite3_adapter.rb
 - lib/murlsh/time_ago.rb
 - lib/murlsh/twitter_server.rb
+- lib/murlsh/unwrap_jsonp.rb
 - lib/murlsh/uri.rb
 - lib/murlsh/uri_ask.rb
 - lib/murlsh/url.rb
@@ -192,6 +243,7 @@ files:
 - plugins/add_pre_60_github_title.rb
 - plugins/hostrec_50_redundant.rb
 - plugins/hostrec_60_skip.rb
+- plugins/html_parse_50_hpricot.rb
 - plugins/time_50_ago.rb
 - plugins/via_50_domain.rb
 - public/css/jquery.jgrowl.css
@@ -200,11 +252,11 @@ files:
 - public/js/jquery.jgrowl_compressed.js
 - public/js/js.js
 - 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/unwrap_json_spec.rb
 - spec/uri_ask_spec.rb
 - spec/uri_spec.rb
 - spec/url_spec.rb
@@ -220,31 +272,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: url sharing site framework
 test_files: 
 - spec/xhtml_response_spec.rb
-- spec/atom_feed_spec.rb
 - spec/auth_spec.rb
 - spec/yaml_ordered_hash_spec.rb
+- spec/unwrap_json_spec.rb
 - spec/uri_ask_spec.rb
 - spec/dispatch_spec.rb
 - spec/markup_spec.rb

data/lib/murlsh/atom_feed.rb

@@ -1,84 +0,0 @@
-%w{
-uri
-
-builder
-}.each { |m| require m }
-
-module Murlsh
-
-  # ATOM feed builder.
-  class AtomFeed
-
-    # root_url is the base url for the feed items.
-    #
-    # Options:
-    # * :filename - the file name of the feed (atom.xml)
-    # * :title - the feed title
-    def initialize(root_url, options={})
-      options = {
-        :filename => 'atom.xml',
-        :title => 'Atom feed',
-        :hubs => []}.merge(options)
-      @root_url = root_url
-      @filename = options[:filename]
-      @title = options[:title]
-      @hubs = options[:hubs]
-
-      root_uri = URI(@root_url)
-
-      @host, @domain, @path = root_uri.host, root_uri.domain, root_uri.path
-    end
-
-    # Generate the feed and write it to the filesystem with locking.
-    def write(entries, path)
-      Murlsh::openlock(path, 'w') { |f| make(entries, :target => f) }
-    end
-
-    # Build the feed using XML builder. Options are passed to
-    # Builder::XmlMarkup.new.
-    def make(entries, options={})
-      xm = Builder::XmlMarkup.new(options)
-      xm.instruct!(:xml)
-
-      xm.feed(:xmlns => 'http://www.w3.org/2005/Atom') {
-        xm.id(@root_url)
-        xm.link(:href => URI.join(@root_url, @filename), :rel => 'self')
-        @hubs.each { |hub| xm.link(:href => hub, :rel => 'hub') }
-        xm.title(@title)
-        xm.updated(entries.map(&:time).max.xmlschema)
-        entries.each do |mu|
-          xm.entry {
-            xm.author { xm.name(mu.name) }
-            xm.title(mu.title_stripped)
-            xm.id(entry_id(mu))
-            xm.summary(mu.title_stripped)
-            xm.updated(mu.time.xmlschema)
-            xm.link(:href => mu.url)
-            enclosure(xm, mu)
-            via(xm, mu)
-          }
-        end
-      }
-    end
-
-    # Build the entry's id.
-    def entry_id(url)
-      "tag:#{@domain},#{url.time.strftime('%Y-%m-%d')}:#{@host}#{@path}#{url.id}"
-    end
-
-    # Add an ATOM enclosure if the url is an image.
-    def enclosure(xm, mu)
-      xm.link(:rel => 'enclosure', :type => mu.content_type, :href => mu.url,
-        :title => 'Full-size') if mu.is_image?
-    end
-
-    def via(xm, mu)
-      Murlsh::failproof do
-        xm.link(:rel => 'via', :type => 'text/html', :href => mu.via,
-          :title => URI(mu.via).domain) if mu.via
-      end
-    end
-
-  end
-
-end

data/spec/atom_feed_spec.rb

@@ -1,80 +0,0 @@
-$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-%w{
-tempfile
-time
-
-murlsh
-}.each { |m| require m }
-
-describe Murlsh::AtomFeed do
-
-  before do
-    @url1 = stub('Url', 
-      :content_type => 'text/html',
-      :id => 1,
-      :is_image? => false,
-      :name => 'test 1',
-      :time => Time.parse('dec 19 2009 12:34:56pm').utc,
-      :title_stripped => 'test title',
-      :url => 'http://matthewm.boedicker.org/',
-      :via => 'http://www.google.com')
-
-    @url2 = stub('Url',
-      :content_type => 'image/jpeg',
-      :id => 2,
-      :is_image? => true,
-      :name => 'test 2',
-      :time => Time.parse('dec 20 2009 10:10:10am').utc,
-      :title_stripped => 'image test',
-      :url => 'http://matthewm.boedicker.org/test.jpg',
-      :via => nil)
-
-    @feed = Murlsh::AtomFeed.new('http://test.com/test/', :title => 'test')
-
-    @expected = Regexp.new(<<EOS, Regexp::MULTILINE)
-<\\?xml version="1\.0" encoding="UTF-8"\\?>
-<feed xmlns="http://www\\.w3\\.org/2005/Atom">
-  <id>http://test\\.com/test/</id>
-  <link href="http://test\\.com/test/atom\\.xml" rel="self"/>
-  <title>test</title>
-  <updated>2009-12-20T15:10:10Z</updated>
-  <entry>
-    <author>
-      <name>test 1</name>
-    </author>
-    <title>test title</title>
-    <id>tag:test\\.com,2009-12-19:test\\.com/test/1</id>
-    <summary>test title</summary>
-    <updated>2009-12-19T17:34:56Z</updated>
-    <link href="http://matthewm\\.boedicker\\.org/"/>
-    <link type=".*"/>
-  </entry>
-  <entry>
-    <author>
-      <name>test 2</name>
-    </author>
-    <title>image test</title>
-    <id>tag:test\\.com,2009-12-20:test\\.com/test/2</id>
-    <summary>image test</summary>
-    <updated>2009-12-20T15:10:10Z</updated>
-    <link href="http://matthewm\\.boedicker\\.org/test\\.jpg"/>
-    <link type=".*"/>
-  </entry>
-</feed>
-EOS
-
-  end
-
-  it 'should generate the correct atom feed' do
-    @feed.make([@url1, @url2], :indent => 2).should match @expected
-  end
-
-  it 'should write the correct atom feed to a file' do
-    tempfile = Tempfile.open('test_atom_feed')
-    @feed.make([@url1, @url2], :indent => 2, :target => tempfile)
-
-    open(tempfile) { |f| f.read.should match @expected }
-  end
-
-end