murlsh 1.3.1 → 1.4.0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: murlsh
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Matthew M. Boedicker
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-01-31 00:00:00 -05:00
 default_executable: murlsh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,26 +66,10 @@ dependencies:
         version: 2.1.2
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  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: htmlentities
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -97,11 +81,11 @@ dependencies:
         - 0
         version: 4.2.0
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,11 +97,11 @@ dependencies:
         - 3
         version: 1.2.3
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,11 +112,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: plumnailer
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,6 +128,21 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: postrank-uri
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
+  type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: public_suffix_service
@@ -257,19 +256,18 @@ dependencies:
   type: :runtime
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: sqlite3
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 9
         segments: 
         - 1
-        - 2
-        - 1
-        version: 1.2.1
+        - 3
+        version: "1.3"
   type: :runtime
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
@@ -289,9 +287,24 @@ dependencies:
   type: :runtime
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: twitter
+  name: treetop
   prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        version: "1.4"
+  type: :runtime
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: twitter
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -303,27 +316,26 @@ dependencies:
         - 12
         version: 0.9.12
   type: :runtime
-  version_requirements: *id018
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: vimeo
+  name: fakeweb
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 9
         segments: 
         - 1
-        - 2
-        - 2
-        version: 1.2.2
-  type: :runtime
-  version_requirements: *id019
+        - 3
+        version: "1.3"
+  type: :development
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: flog
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -335,11 +347,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -350,11 +362,11 @@ dependencies:
         - 5
         version: "0.5"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -365,8 +377,8 @@ dependencies:
         - 0
         version: "2.0"
   type: :development
-  version_requirements: *id022
-description: url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding
+  version_requirements: *id023
+description: Host your bookmarks or maintain a link blog
 email: matthewm@boedicker.org
 executables: 
 - murlsh
@@ -384,9 +396,11 @@ files:
 - config.ru
 - config.yaml
 - lib/murlsh.rb
+- lib/murlsh/ask.rb
 - lib/murlsh/auth.rb
 - lib/murlsh/build_md5.rb
 - lib/murlsh/build_query.rb
+- lib/murlsh/cp_r_safe.rb
 - lib/murlsh/delicious_parse.rb
 - lib/murlsh/dispatch.rb
 - lib/murlsh/doc.rb
@@ -396,6 +410,7 @@ files:
 - lib/murlsh/head_from_get.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
@@ -404,7 +419,8 @@ files:
 - lib/murlsh/openlock.rb
 - lib/murlsh/plugin.rb
 - lib/murlsh/search_conditions.rb
-- lib/murlsh/sqlite3_adapter.rb
+- lib/murlsh/search_grammar.rb
+- lib/murlsh/search_grammar.treetop
 - lib/murlsh/time_ago.rb
 - lib/murlsh/uri_ask.rb
 - lib/murlsh/uri_domain.rb
@@ -416,26 +432,25 @@ files:
 - 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_41_unajax_twitter.rb
 - plugins/add_pre_45_supplied_thumbnail.rb
 - plugins/add_pre_50_lookup_content_type_title.rb
 - plugins/add_pre_50_media_thumbnail.rb
 - plugins/add_pre_50_open_graph_image.rb
-- 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_imgur.rb
 - plugins/add_pre_60_s3_image.rb
 - plugins/add_pre_60_twitter.rb
-- plugins/add_pre_60_vimeo.rb
 - plugins/add_pre_65_html_thumb.rb
 - plugins/add_pre_65_img_thumb.rb
 - plugins/avatar_50_gravatar.rb
-- plugins/html_parse_50_nokogiri.rb
 - plugins/url_display_add_45_audio.rb
 - plugins/url_display_add_50_hostrec.rb
 - plugins/url_display_add_55_content_type.rb
@@ -444,11 +459,10 @@ files:
 - public/css/jquery.jgrowl.css
 - public/css/screen.css
 - public/img/thumb/.gitignore
-- public/js/comments.json
-- public/js/jquery-1.4.4.min.js
+- public/js/jquery-1.5.min.js
 - public/js/jquery.jgrowl_compressed.js
 - public/js/js.js
-- public/js/twitter-text-1.0.4.js
+- public/js/twitter-text-1.3.1.js
 - spec/auth_spec.rb
 - spec/dispatch_spec.rb
 - spec/doc_spec.rb
@@ -491,7 +505,7 @@ rubyforge_project:
 rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
-summary: url sharing site framework
+summary: Host your bookmarks or maintain a link blog
 test_files: 
 - spec/auth_spec.rb
 - spec/dispatch_spec.rb

data/lib/murlsh/sqlite3_adapter.rb

@@ -1,13 +0,0 @@
-require 'active_record/connection_adapters/sqlite3_adapter'
-
-class ActiveRecord::ConnectionAdapters::SQLite3Adapter
-
-  # Add MURLSHMATCH function for regex matching.
-  def initialize(connection, logger, config)
-    super
-    @connection.create_function('MURLSHMATCH', 2) do |func,search_in,search_for|
-      func.result = search_in.to_s.match(/#{search_for}/i) ? 1 : nil
-    end
-  end
-
-end

data/plugins/add_pre_60_flickr.rb

@@ -1,27 +0,0 @@
-require 'flickraw'
-
-require 'murlsh'
-
-module Murlsh
-
-  # Set the title of Flickr photos.
-  class AddPre60Flickr < Plugin
-
-    @hook = 'add_pre'
-
-    FlickrRe = %r{^http://(?:www\.)?flickr\.com/photos/[@\w\-]+?/([\d]+)}i
-
-    def self.run(url, config)
-      unless url.user_supplied_title? or config['flickr_api_key'].to_s.empty?
-        if photo_id = url.url[FlickrRe, 1]
-          FlickRaw.api_key = config['flickr_api_key']
-          info = flickr.photos.getInfo(:photo_id => photo_id)
-
-          url.title = "#{info.title} by #{info.owner.username}"
-        end
-      end
-    end
-
-  end
-
-end

data/plugins/add_pre_60_vimeo.rb

@@ -1,38 +0,0 @@
-require 'cgi'
-
-require 'vimeo'
-
-require 'murlsh'
-
-module Murlsh
-
-  # Set title and thumbnail url for Vimeo urls.
-  class AddPre60Vimeo < Plugin
-
-    @hook = 'add_pre'
-
-    VimeoRe = %r{^http://(?:www\.)?vimeo\.com/(\d+)$}i
-    StorageDir = File.join(File.dirname(__FILE__), '..', 'public', 'img',
-      'thumb')
-
-    def self.run(url, config)
-      if id = url.url[VimeoRe, 1]
-        info = Vimeo::Simple::Video.info(id)[0]
-
-        unless url.user_supplied_title?
-          url.title = "#{info['title']} by #{info['user_name']}"
-        end
-
-        thumb_storage = Murlsh::ImgStore.new(StorageDir,
-          :user_agent => config['user_agent'])
-        stored_filename = thumb_storage.store_url(info['thumbnail_small']) 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)}"
-      end
-    end
-
-  end
-
-end

data/plugins/html_parse_50_nokogiri.rb

@@ -1,16 +0,0 @@
-require 'nokogiri'
-
-require 'murlsh'
-
-module Murlsh
-
-  # Parse HTML with Nokogiri and return a Nokogiri doc.
-  class HtmlParse50Nokogiri < Plugin
-
-    @hook = 'html_parse'
-
-    def self.run(x); Nokogiri(x); end
-
-  end
-
-end

data/public/js/comments.json

@@ -1 +0,0 @@
-{"http://www.youtube.com/watch?v=KrfpnbGXL70":[{"createdTime":1277520298,"updatedTime":1277520298,"authorAvatar":"http://www.gravatar.com/avatar/355af1bc931baca530e66571923286b4?s=16","authorName":"mmb","authorUrl":"http://matthewm.boedicker.org/","comment":"Through SOAP!"},{"createdTime":1277520298,"updatedTime":1277520298,"authorAvatar":"http://www.gravatar.com/avatar/355af1bc931baca530e66571923286b4?s=16","authorName":"mmb","authorUrl":"http://matthewm.boedicker.org/","comment":"dead, can be seen at http://jz10.java.no/java-4-ever-trailer.html"}]}