murlsh 0.11.0 → 1.0.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 23
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 11
   - 0
-  version: 0.11.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,9 +67,41 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: flickraw
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
+        version: 0.8.3
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: flog
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
+        version: 2.5.0
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +113,11 @@ dependencies:
         - 1
         version: 0.8.1
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: htmlentities
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +129,11 @@ dependencies:
         - 0
         version: 4.2.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +145,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: push-notify
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,11 +161,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -145,11 +177,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack-cache
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,11 +193,27 @@ dependencies:
         - 2
         version: 0.5.2
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rack-rewrite
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :runtime
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rack-throttle
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,11 +225,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,23 +241,70 @@ dependencies:
         - 1
         version: 1.2.1
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: tinyatom
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 23
         segments: 
         - 0
+        - 2
+        - 0
+        version: 0.2.0
+  type: :runtime
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: twitter
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 35
+        segments: 
+        - 0
+        - 9
+        - 12
+        version: 0.9.12
+  type: :runtime
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: vimeo
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
         - 1
+        - 2
+        - 2
+        version: 1.2.2
+  type: :runtime
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
         - 1
-        version: 0.1.1
+        - 3
+        version: "1.3"
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id018
 description: url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding
 email: matthewm@boedicker.org
 executables: 
@@ -236,51 +331,59 @@ files:
 - lib/murlsh/etag_add_encoding.rb
 - lib/murlsh/failproof.rb
 - lib/murlsh/far_future_expires.rb
-- lib/murlsh/flickr_server.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/twitter_server.rb
-- lib/murlsh/unwrap_jsonp.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/xhtml_response.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/hostrec_50_redundant.rb
-- plugins/hostrec_60_skip.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/time_50_ago.rb
-- plugins/via_50_domain.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.2.min.js
+- 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/unwrap_json_spec.rb
 - spec/uri_ask_spec.rb
 - spec/uri_spec.rb
 - spec/url_spec.rb
-- spec/xhtml_response_spec.rb
 - spec/yaml_ordered_hash_spec.rb
 has_rdoc: true
 homepage: http://github.com/mmb/murlsh
@@ -317,11 +420,10 @@ signing_key:
 specification_version: 3
 summary: url sharing site framework
 test_files: 
-- spec/xhtml_response_spec.rb
 - spec/auth_spec.rb
 - spec/yaml_ordered_hash_spec.rb
-- spec/unwrap_json_spec.rb
 - spec/uri_ask_spec.rb
+- spec/img_store_spec.rb
 - spec/dispatch_spec.rb
 - spec/markup_spec.rb
 - spec/url_spec.rb

data/lib/murlsh/flickr_server.rb

@@ -1,55 +0,0 @@
-%w{
-digest/sha1
-open-uri
-
-rack
-
-murlsh
-}.each { |m| require m }
-
-module Murlsh
-
-  # Proxy for Flickr rest API to support conditional get and caching.
-  #
-  # Passes along query string with api key added, returns result from Flickr
-  # with cache-control, etag and last-modified headers set.
-  class FlickrServer
-
-    include HeadFromGet
-
-    def initialize(config); @config = config; end
-
-    # Proxy a request to the Flickr API.
-    def get(req)
-      resp = Rack::Response.new
-
-      if @config['flickr_api_key']
-        params = req.params.merge('api_key' => @config['flickr_api_key'])
-
-        q = params.map { |k,v| "#{URI.encode(k)}=#{URI.encode(v)}" }.join('&')
-
-        json_wrapped = open("http://api.flickr.com/services/rest/?#{q}") do |f|
-          f.read
-        end
-
-        json_parsed = Murlsh::unwrap_jsonp(json_wrapped)
-
-        resp['Cache-Control'] = 'max-age=86400'
-        resp['Content-Type'] = 'application/json'
-        resp['ETag'] = "\"#{Digest::SHA1.hexdigest(json_wrapped)}\""
-        resp['Last-Modified'] = Time.at(
-          json_parsed['photo']['dates']['lastupdate'].to_i).httpdate
-
-        resp.body = json_wrapped
-
-        resp
-      else
-        Rack::Response.new('flickr_api_key not set in config.yaml', 500,
-          { 'Content-Type' => 'text/plain' })
-      end
-
-    end
-
-  end
-
-end

data/lib/murlsh/twitter_server.rb

@@ -1,45 +0,0 @@
-%w{
-digest/sha1
-open-uri
-
-rack
-
-murlsh
-}.each { |m| require m }
-
-module Murlsh
-
-  # Proxy for Twitter rest API to support conditional get and caching.
-  #
-  # Passes along path and query string, returns result from Twitter with
-  # cache-control, etag and last-modified headers set.
-  class TwitterServer
-
-    include HeadFromGet
-
-    # Proxy a request to the Twitter API.
-    def get(req)
-      resp = Rack::Response.new
-
-      twitter_url = URI.join('http://api.twitter.com',
-        req.fullpath[/twitter\/(.+)/, 1])
-
-      json_wrapped = open(twitter_url) do |f|
-        resp['Content-Type'] = f.content_type
-        f.read
-      end
-
-      json_parsed = Murlsh::unwrap_jsonp(json_wrapped)
-
-      resp['Cache-Control'] = 'max-age=86400'
-      resp['ETag'] = "\"#{Digest::SHA1.hexdigest(json_wrapped)}\""
-      resp['Last-Modified'] = Time.parse(json_parsed['created_at']).httpdate
-
-      resp.body = json_wrapped
-
-      resp
-    end
-
-  end
-
-end

data/lib/murlsh/unwrap_jsonp.rb

@@ -1,15 +0,0 @@
-%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/xhtml_response.rb

@@ -1,20 +0,0 @@
-module Murlsh
-
-  # Set the content type correctly based on accept header and user agent.
-  class XhtmlResponse < Rack::Response
-
-    # Set the content type to application/xhtml+xml for anything that
-    # claims to accept it, for anything else or IE use text/html.
-    def set_content_type(http_accept, http_user_agent)
-      self['Content-Type'] = if http_accept and
-        http_accept[/((\*|application)\/\*|application\/xhtml\+xml)/i] and
-        (!http_user_agent or !http_user_agent[/ msie /i])
-        'application/xhtml+xml'
-      else
-       'text/html'
-      end
-    end
-
-  end
-
-end

data/plugins/hostrec_50_redundant.rb

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

data/plugins/hostrec_60_skip.rb

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

data/plugins/time_50_ago.rb

@@ -1,16 +0,0 @@
-%w{
-murlsh
-}.each { |m| require m }
-
-module Murlsh
-
-  # show the time as the fuzzy amount of time that has elapsed since then
-  class Time50Ago < Plugin
-
-    @hook = 'time'
-
-    def self.run(time); time.extend(Murlsh::TimeAgo).ago if time; end
-
-  end
-
-end

data/plugins/via_50_domain.rb

@@ -1,36 +0,0 @@
-%w{
-murlsh
-}.each { |m| require m }
-
-module Murlsh
-
-  # Convert a via url to its display text.
-  #
-  # For most urls the domain is displayed, but for some return custom text.
-  class Via50Domain < Plugin
-
-    @hook = 'via'
-
-    def self.run(via)
-      search = via.to_s.gsub(%r{^http://}, '')
-
-      case
-      when m = search.match(%r{^news\.ycombinator\.com}i)
-        'hacker news'
-      when m = search.match(%r{^www\.reddit\.com/r/([a-z\d]+?)/}i)
-        "#{m[1]}.reddit"
-      when m = search.match(%r{^delicious\.com/(\w+)}i)
-        "delicious/#{m[1]}"
-      when m = search.match(%r{^twitter\.com/(\w+)}i)
-        "twitter/#{m[1]}"
-      when m = search.match(%r{^([a-z\d][a-z\d-]{0,61}[a-z\d])\.tumblr\.com/}i)
-        "#{m[1]}.tumblr"
-      else
-        via.domain || via
-      end
-
-    end
-
-  end
-
-end