murlsh 1.4.1 → 1.5.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 1
-  version: 1.4.1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -05:00
-default_executable: murlsh
+date: 2011-02-21 00:00:00 -05:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -35,23 +35,22 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bcrypt-ruby
+  name: aws-s3
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 7
         segments: 
-        - 2
-        - 1
-        - 2
-        version: 2.1.2
+        - 0
+        - 6
+        version: "0.6"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: bcrypt-ruby
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -67,9 +66,23 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: htmlentities
+  name: builder
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: htmlentities
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,11 +94,11 @@ dependencies:
         - 0
         version: 4.2.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +110,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,27 +125,27 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: plumnailer
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 29
         segments: 
         - 0
         - 1
-        - 0
-        version: 0.1.0
+        - 3
+        version: 0.1.3
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: postrank-uri
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -143,11 +156,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: public_suffix_service
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,11 +171,11 @@ dependencies:
         - 0
         version: "0.0"
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: push-notify
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -174,11 +187,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -190,11 +203,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rack-cache
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -206,11 +219,11 @@ dependencies:
         - 2
         version: 0.5.2
   type: :runtime
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rack-rewrite
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -222,11 +235,11 @@ dependencies:
         - 2
         version: 1.0.2
   type: :runtime
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rack-throttle
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -238,11 +251,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: rmagick
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -254,11 +267,26 @@ dependencies:
         - 14
         version: 1.15.14
   type: :runtime
-  version_requirements: *id015
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: rmail
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -269,27 +297,27 @@ dependencies:
         - 3
         version: "1.3"
   type: :runtime
-  version_requirements: *id016
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
   name: tinyatom
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 27
         segments: 
         - 0
         - 3
-        - 3
-        version: 0.3.3
+        - 4
+        version: 0.3.4
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
   name: treetop
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -300,11 +328,11 @@ dependencies:
         - 4
         version: "1.4"
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: twitter
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -316,11 +344,11 @@ dependencies:
         - 12
         version: 0.9.12
   type: :runtime
-  version_requirements: *id019
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -331,11 +359,11 @@ dependencies:
         - 3
         version: "1.3"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: flog
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -347,11 +375,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id021
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -362,11 +390,11 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id022
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -377,29 +405,34 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id023
+  version_requirements: *id025
 description: Host your bookmarks or maintain a link blog
-email: matthewm@boedicker.org
+email: 
+- matthewm@boedicker.org
 executables: 
 - murlsh
 extensions: []
 
-extra_rdoc_files: 
-- README.textile
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - .htaccess
 - COPYING
+- Gemfile
 - README.textile
 - Rakefile
-- VERSION
 - bin/murlsh
 - config.ru
 - config.yaml
+- db/migrate/20110213023123_init.rb
 - lib/murlsh.rb
 - lib/murlsh/ask.rb
+- lib/murlsh/atom_body.rb
+- lib/murlsh/atom_server.rb
 - lib/murlsh/auth.rb
-- lib/murlsh/build_md5.rb
 - lib/murlsh/build_query.rb
+- lib/murlsh/cat_files.rb
 - lib/murlsh/cp_r_safe.rb
 - lib/murlsh/delicious_parse.rb
 - lib/murlsh/dispatch.rb
@@ -407,17 +440,24 @@ files:
 - lib/murlsh/etag_add_encoding.rb
 - lib/murlsh/failproof.rb
 - lib/murlsh/far_future_expires.rb
-- lib/murlsh/head_from_get.rb
+- lib/murlsh/feed_body.rb
 - lib/murlsh/image_list.rb
 - lib/murlsh/img_store.rb
 - lib/murlsh/install.rb
 - lib/murlsh/json_body.rb
 - lib/murlsh/json_server.rb
 - lib/murlsh/jsonp_body.rb
+- lib/murlsh/m3u_body.rb
+- lib/murlsh/m3u_server.rb
 - lib/murlsh/markup.rb
 - lib/murlsh/must_revalidate.rb
 - lib/murlsh/openlock.rb
 - lib/murlsh/plugin.rb
+- lib/murlsh/podcast_server.rb
+- lib/murlsh/pop_server.rb
+- lib/murlsh/random_server.rb
+- lib/murlsh/rss_body.rb
+- lib/murlsh/rss_server.rb
 - lib/murlsh/search_conditions.rb
 - lib/murlsh/search_grammar.rb
 - lib/murlsh/search_grammar.treetop
@@ -429,16 +469,14 @@ files:
 - lib/murlsh/url_body.rb
 - lib/murlsh/url_result_set.rb
 - lib/murlsh/url_server.rb
+- lib/murlsh/write_ordered_hash.rb
 - lib/murlsh/yaml_ordered_hash.rb
 - murlsh.gemspec
-- plugins/add_post_50_update_feed.rb
-- plugins/add_post_50_update_m3u.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_30_unajax_twitter.rb
 - plugins/add_pre_35_url_clean.rb
 - plugins/add_pre_40_convert_mobile.rb
+- plugins/add_pre_40_thumbnail_shortcuts.rb
 - plugins/add_pre_45_supplied_thumbnail.rb
 - plugins/add_pre_50_lookup_content_type_title.rb
 - plugins/add_pre_50_media_thumbnail.rb
@@ -446,11 +484,12 @@ files:
 - 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_65_html_thumb.rb
 - plugins/add_pre_65_img_thumb.rb
 - plugins/avatar_50_gravatar.rb
+- plugins/store_asset_40_s3.rb
+- plugins/store_asset_50_local.rb
 - plugins/url_display_add_45_audio.rb
 - plugins/url_display_add_50_hostrec.rb
 - plugins/url_display_add_55_content_type.rb
@@ -464,6 +503,7 @@ files:
 - public/js/js.js
 - public/js/twitter-text-1.3.1.js
 - spec/auth_spec.rb
+- spec/cat_files_spec.rb
 - spec/dispatch_spec.rb
 - spec/doc_spec.rb
 - spec/img_store_spec.rb
@@ -473,7 +513,7 @@ files:
 - spec/url_spec.rb
 - spec/yaml_ordered_hash_spec.rb
 has_rdoc: true
-homepage: http://github.com/mmb/murlsh
+homepage: https://github.com/mmb/murlsh
 licenses: []
 
 post_install_message: 
@@ -495,19 +535,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Host your bookmarks or maintain a link blog
 test_files: 
 - spec/auth_spec.rb
+- spec/cat_files_spec.rb
 - spec/dispatch_spec.rb
 - spec/doc_spec.rb
 - spec/img_store_spec.rb

data/VERSION

@@ -1 +0,0 @@
-1.4.1

data/lib/murlsh/build_md5.rb

@@ -1,12 +0,0 @@
-require 'digest/md5'
-
-module Murlsh
-
-  module BuildMd5
-
-    # Return the md5 sum of the result of the build method.
-    def md5; Digest::MD5.hexdigest(build); end
-
-  end
-
-end

data/lib/murlsh/head_from_get.rb

@@ -1,15 +0,0 @@
-module Murlsh
-
-  # Mixin for adding head() that calls get() and removed the body.
-  module HeadFromGet
-
-    # Call get() and remove the body.
-    def head(req)
-      resp = get(req)
-      resp.body = ''
-      resp
-    end
-
-  end
-
-end

data/plugins/add_post_50_update_feed.rb

@@ -1,84 +0,0 @@
-require 'uri'
-
-require 'tinyatom'
-
-require 'murlsh'
-
-module Murlsh
-
-  # Regenerate atom feed after a new url has been added.
-  class AddPost50UpdateFeed < Plugin
-
-    @hook = 'add_post'
-
-    # Content types to add an enclosure for.
-    EnclosureContentTypes = %w{
-      application/pdf
-      audio/mpeg
-      image/gif
-      image/jpeg
-      image/png
-      }
-
-    def self.run(url, 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 => 'time DESC',
-        :limit => config.fetch('num_posts_feed', 25))
-
-      latest.each do |mu|
-        options = {
-          :author_name => mu.name,
-          :summary => mu.title_stripped
-        }
-
-        if EnclosureContentTypes.include?(mu.content_type)
-          options.merge!(
-            :enclosure_type => mu.content_type,
-            :enclosure_href => mu.url,
-            :enclosure_title => mu.title
-            )
-          if 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
-
-        Murlsh::failproof do
-          if mu.via
-            options.merge!(
-              :via_type => 'text/html',
-              :via_href => mu.via,
-              :via_title => URI(mu.via).extend(Murlsh::URIDomain).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
-
-    end
-
-  end
-
-end

data/plugins/add_post_50_update_m3u.rb

@@ -1,35 +0,0 @@
-require 'murlsh'
-
-module Murlsh
-
-  # Regenerate m3u file after a new audio url has been added.
-  class AddPost50UpdateM3u < Plugin
-
-    @hook = 'add_post'
-
-    AudioContentTypes = %w{
-      application/ogg
-      audio/mpeg
-      audio/ogg
-      }
-
-    OutputFile = 'm3u.m3u'
-
-    def self.run(url, config)
-      if AudioContentTypes.include?(url.content_type) or
-        not File.exists?(OutputFile)
-
-        Murlsh::openlock(OutputFile, 'w') do |f|
-          f.write "# #{config['root_url']}\r\n\r\n"
-          Murlsh::Url.all(:conditions =>
-            ["content_type IN (?)", AudioContentTypes],
-            :order => 'time DESC').each do |mu|
-            f.write "#{mu.url}\r\n"
-          end
-        end
-      end
-    end
-
-  end
-
-end