murlsh 1.3.1 → 1.4.0

data/.htaccess

@@ -5,6 +5,7 @@ AddOutputFilterByType DEFLATE application/javascript
 AddOutputFilterByType DEFLATE application/rss+xml
 AddOutputFilterByType DEFLATE application/xhtml+xml
 AddOutputFilterByType DEFLATE application/xml
+AddOutputFilterByType DEFLATE audio/x-mpegurl
 AddOutputFilterByType DEFLATE text/css
 AddOutputFilterByType DEFLATE text/html
 

data/README.textile

@@ -1,11 +1,12 @@
-Site for sharing and archiving links.
+Host your bookmarks or maintain a link blog.
 
-* fetches url titles and generates thumbnails
-* jGrowls embedded versions of Imageshack, Vimeo and YouTube urls
+* fetches url titles and generates thumbnails from page
+* jGrowls embedded versions of Imageshack, Imgur, Vimeo and YouTube urls
 * converts Twitter status urls to their full text and adds user thumbnail
 * generates Atom and RSS feeds
+* generates podcast RSS feed and m3u file for all audio urls
 * generates json and jsonp feeds for client-side inclusion in other sites
-* regex search
+* search
 * uses HTML5 audio for mp3 and ogg urls
 * looks good on iPhone
 * PubSubHubbub notification
@@ -55,6 +56,7 @@ h2. Recent urls
 * http://your_root/atom.atom
 * http://your_root/rss.rss
 * http://your_root/podcast.rss (urls with audio/mpeg content type)
+* http://your_root/m3u.m3u (urls with audio content types)
 * http://your_root/json.json
 * http://your_root/json.json?callback=x (jsonp)
 
@@ -77,7 +79,6 @@ Plugin hooks
 |add_pre|called before a new url is saved|url, config hash|undefined|
 |add_post|called after a new url is saved|url, config hash|undefined|
 |avatar|called to get an avatar url from an email md5 sum|avatar url, url, config hash|avatar url|
-|html_parse|parse HTML using something like Hpricot or Nokogiri|parseable|parsed HTML, only first plugin is run (cannot be chained)|
 |url_display_add|called to display additional information after urls|markup builder, url, config hash|undefined|
 
 h1. PubSubHubbub
@@ -99,11 +100,4 @@ 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. Design Goals
-
-* low effort required to add a url, get metadata programatically instead of requiring user to specify
-* allow customization with config and plugins
-* full regex search for finding saved urls
-* simple security (no sessions, no cookies)
-
 Questions and comments: "matthewm@boedicker.org":mailto:matthewm@boedicker.org

data/Rakefile

@@ -51,7 +51,7 @@ namespace :db do
 
     last = Murlsh::Url.find(:last, :order => 'time')
     pp last
-    response = ask('Delete this url', '?')
+    response = Murlsh.ask('Delete this url?', 'n')
     last.destroy  if %w{y yes}.include?(response.downcase)
   end
 
@@ -98,9 +98,9 @@ namespace :db do
     ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
       :database => config.fetch('db_file'))
 
-    Murlsh::Url.all(:conditions => [
-      'MURLSHMATCH(title, :search) OR MURLSHMATCH(url, :search)',
-      { :search => args.search }]).each do |url|
+    like = "%#{args.search}%"
+    Murlsh::Url.all(:conditions =>
+      ['title LIKE ? OR url LIKE ?', like, like]).each do |url|
       puts "#{url.id} #{url.url} #{url.title}"
     end
   end
@@ -164,9 +164,9 @@ namespace :user do
   desc 'Add a new user.'
   task :add do
     puts "adding to #{config.fetch('auth_file')}"
-    username = ask(:username)
-    email = ask(:email)
-    password = ask(:password)
+    username = Murlsh.ask('Username:')
+    email = Murlsh.ask('Email:')
+    password = Murlsh.ask('Password:')
 
     Murlsh::Auth.new(config.fetch('auth_file')).add_user(username, email,
       password)
@@ -270,6 +270,9 @@ namespace :css do
     unless config['css_compressed'] == compressed_url
       config['css_compressed'] = compressed_url
       config.extend(Murlsh::YamlOrderedHash)
+      config.each_value do |v|
+        v.extend(Murlsh::YamlOrderedHash)  if v.is_a?(Hash)
+      end
       open('config.yaml', 'w') { |f| YAML.dump(config, f) }
       puts "updated config with css_compressed = #{compressed_url}"
     end
@@ -309,6 +312,9 @@ namespace :js do
     unless config['js_compressed'] == compressed_url
       config['js_compressed'] = compressed_url
       config.extend(Murlsh::YamlOrderedHash)
+      config.each_value do |v|
+        v.extend(Murlsh::YamlOrderedHash)  if v.is_a?(Hash)
+      end
       open('config.yaml', 'w') { |f| YAML.dump(config, f) }
       puts "updated config with js_compressed = #{compressed_url}"
     end
@@ -416,17 +422,12 @@ EOS
 
 end
 
-def ask(prompt, sep=':')
-  print "#{prompt}#{sep} "
-  STDIN.gets.chomp
-end
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = 'murlsh'
-    gemspec.summary = 'url sharing site framework'
-    gemspec.description = 'url sharing site framework with easy adding, title lookup, atom feed, thumbnails and embedding'
+    gemspec.summary = 'Host your bookmarks or maintain a link blog'
+    gemspec.description = 'Host your bookmarks or maintain a link blog'
     gemspec.email = 'matthewm@boedicker.org'
     gemspec.homepage = 'http://github.com/mmb/murlsh'
     gemspec.authors = ['Matthew M. Boedicker']
@@ -439,11 +440,11 @@ begin
       activerecord >= 2.3.4
       bcrypt-ruby >= 2.1.2
       builder >= 2.1.2
-      flickraw >= 0.8.3
       htmlentities >= 4.2.0
       json >= 1.2.3
       nokogiri ~> 1.0
       plumnailer >= 0.1.0
+      postrank-uri ~> 1.0
       public_suffix_service ~> 0.0
       push-notify >= 0.1.0
       rack >= 1.0.0
@@ -451,12 +452,13 @@ begin
       rack-rewrite >= 1.0.2
       rack-throttle >= 0.3.0
       rmagick >= 1.15.14
-      sqlite3-ruby >= 1.2.1
+      sqlite3 ~> 1.3
       tinyatom >= 0.3.3
+      treetop ~> 1.4
       twitter >= 0.9.12
-      vimeo >= 1.2.2
       }.each_slice(3) { |g,o,v| gemspec.add_dependency(g, "#{o} #{v}") }
     %w{
+      fakeweb ~> 1.3
       flog >= 2.5.0
       rack-test ~> 0.5
       rspec ~> 2.0

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/bin/murlsh

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'fileutils'
+require 'murlsh'
 
 def usage
   puts <<-eos
@@ -11,44 +11,11 @@ usage: murlsh DESTINATION_DIRECTORY
 eos
 end
 
-def ask(prompt, default)
-  print "#{prompt} [#{default}] "
-  answer = $stdin.gets.strip
-  answer = default if answer.empty?
-  answer
-end
-
-def cp_r_safe(sources, dest, options)
-  sources.each do |source|
-    new = File.join(dest, File.split(File.expand_path(source)).last)
-
-    if File.directory?(source)
-      FileUtils.mkdir_p(new, options)
-      cp_r_safe(Dir.entries(source).
-        reject { |f| %w{. ..}.include?(f) }.
-        map { |f| File.join(source, f) }, new, options)
-    else
-      answer = if File.exists?(new)
-        ask("#{new} exists. Overwrite?", 'n')
-      else
-        'y'
-      end
-
-      FileUtils.copy(source, new, options) if answer == 'y'
-    end
-  end
-
-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) }, dest_dir, :verbose => true)
-
-FileUtils.mkdir_p('tmp', :verbose => true)
+Murlsh.install(dest_dir)
 
 cd_command = File.expand_path(dest_dir) == Dir.pwd ? '' : "cd #{dest_dir}\n"
 

data/config.ru

@@ -32,7 +32,7 @@ feed_url = URI.join(config.fetch('root_url'), config.fetch('feed_file'))
 use Murlsh::MustRevalidate, :patterns => %r{^#{Regexp.escape(feed_url.path)}$}
 
 use Rack::Static, :urls => %w{/css/ /img/ /js/}, :root => 'public'
-use Rack::Static, :urls => %w{/atom.atom /podcast.rss /rss.rss}
+use Rack::Static, :urls => %w{/atom.atom /m3u.m3u /podcast.rss /rss.rss}
 
 use Rack::Rewrite do
   r301 '/atom.xml', feed_url.to_s

data/config.yaml

@@ -7,12 +7,11 @@ css_files:
 - css/screen.css
 db_file: murlsh.db
 feed_file: atom.atom
-flickr_api_key: 
 gravatar_size: 32
 js_files: 
-- js/jquery-1.4.4.min.js
+- js/jquery-1.5.min.js
 - js/jquery.jgrowl_compressed.js
-- js/twitter-text-1.0.4.js
+- js/twitter-text-1.3.1.js
 - js/js.js
 meta_tag_description: URLs found interesting by Matthew M. Boedicker
 meta_tag_verify-v1: 
@@ -22,13 +21,14 @@ num_posts_page: 25
 page_title: mmb url share
 pubsubhubbub_hubs: []
 
+quick_search: 
+  audio: .mp3 .ogg
+  code: code.google.com github.com
+  images: .png .gif .jpeg .jpg
+  tweets: twitter.com
+  video: hulu.com vimeo.com www.ted.com youtube.com
+  wikipedia: wikipedia.org
 root_url: http://urls.matthewm.boedicker.org/
 show_names: true
 thumbnail_max_side: 90
 user_agent: murlsh (http://github.com/mmb/murlsh)
-predefined_searches:
-  audio: \.(mp3|ogg)$
-  code: (code\.google|github)\.com/
-  images: \.(png|gif|jpe?g)$
-  tweets: twitter\.com/
-  video: (youtube|vimeo)\.com/

data/lib/murlsh/ask.rb

@@ -0,0 +1,15 @@
+module Murlsh
+
+  module_function
+
+  # Ask the user a question and return the answer.
+  def ask(prompt, default=nil)
+    default_given = !default.to_s.empty?
+    print "#{prompt} "
+    print "[#{default}] "  if default_given
+    answer = $stdin.gets.strip
+    answer = default  if answer.empty? and default_given
+    answer
+  end
+
+end

data/lib/murlsh/cp_r_safe.rb

@@ -0,0 +1,33 @@
+require 'fileutils'
+
+require 'murlsh'
+
+module Murlsh
+
+  module_function
+
+  # Recursive copy from sources to destination but ask before overwriting.
+  #
+  # Options are passed into FileUtils.mkdir_p FileUtils.copy.
+  def cp_r_safe(sources, dest, options)
+    sources.each do |source|
+      new = File.join(dest, File.split(File.expand_path(source)).last)
+
+      if File.directory?(source)
+        FileUtils.mkdir_p(new, options)
+        cp_r_safe(Dir.entries(source).
+          reject { |f| %w{. ..}.include?(f) }.
+          map { |f| File.join(source, f) }, new, options)
+      else
+        answer = if File.exists?(new)
+          Murlsh.ask("#{new} exists. Overwrite?", 'n')
+        else
+          'y'
+        end
+
+        FileUtils.copy(source, new, options)  if answer == 'y'
+      end
+    end
+  end
+
+end

data/lib/murlsh/doc.rb

@@ -1,23 +1,8 @@
 module Murlsh
 
-  # Nokogiri / Hpricot doc mixin.
+  # Nokogiri doc mixin.
   module Doc
 
-    # Get the character set of the document.
-    def charset
-      %w{content-type Content-Type}.each do |ct|
-        content_type = at("meta[@http-equiv='#{ct}']")
-        unless content_type.nil?
-          content = content_type['content']
-          unless content.nil?
-            charset = content[/charset=([\w.:-]+)/, 1]
-            return charset  if charset
-          end
-        end
-      end
-      nil
-    end
-
     # Check a list of xpaths in order and yield and return the node matching
     # the first one that is not nil
     def xpath_search(xpaths)

data/lib/murlsh/install.rb

@@ -0,0 +1,28 @@
+require 'fileutils'
+
+require 'murlsh'
+
+module Murlsh
+
+  MurlshRoot = File.join(File.dirname(__FILE__), '..', '..')
+
+  module_function
+
+  # Install a murlsh site to a web directory.
+  #
+  # Copies files that are different per-site to make a site instance.
+  def install(dest_dir)
+    Murlsh.cp_r_safe(
+      %w{
+        .htaccess
+        Rakefile
+        config.ru
+        config.yaml
+        plugins/
+        public/
+      }.map { |x| File.join(MurlshRoot, x) }, dest_dir, :verbose => true)
+
+    FileUtils.mkdir_p(File.join(dest_dir, 'tmp'), :verbose => true)
+  end
+
+end

data/lib/murlsh/plugin.rb

@@ -9,8 +9,6 @@ module Murlsh
   #   run arguments (config hash)
   # * avatar - called to get an avatar url from an email md5 sum
   #   run arguments (avatar url, url, config hash)
-  # * html_parse - called to parse HTML using something like Hpricot or Nokogiri
-  #   run arguments (parseable)
   # * url_display_add - called to display additional information after urls
   #   run arguments (markup builder, url, config hash)
   class Plugin

data/lib/murlsh/search_conditions.rb

@@ -1,3 +1,5 @@
+require 'treetop'
+
 module Murlsh
 
   # Search conditions builder for ActiveRecord conditions.
@@ -8,9 +10,17 @@ module Murlsh
     # Search conditions builder for ActiveRecord conditions.
     def conditions
       if q
+        parser = Murlsh::SearchGrammarParser.new
+        tokens = parser.parse(q).content
         search_cols = %w{name title url}
-        [search_cols.map { |x| "MURLSHMATCH(#{x}, ?)" }.join(' OR ')].push(
-          *[q] * search_cols.size)
+
+        likes = []
+        params = []
+        search_cols.product(tokens).each do |col,tok|
+          likes << "#{col} LIKE ?"
+          params << "%#{tok}%"
+        end
+        [likes.join(' OR ')].push(*params)
       else
         []
       end

data/lib/murlsh/search_grammar.rb

@@ -0,0 +1,225 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Murlsh
+
+  module SearchGrammar
+    include Treetop::Runtime
+
+    def root
+      @root ||= :query
+    end
+
+    module Query0
+      def content; elements.map { |e| e.content }.compact.uniq; end
+    end
+
+    def _nt_query
+      start_index = index
+      if node_cache[:query].has_key?(index)
+        cached = node_cache[:query][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        i1 = index
+        r2 = _nt_quoted_string
+        if r2
+          r1 = r2
+        else
+          r3 = _nt_whitespace
+          if r3
+            r1 = r3
+          else
+            r4 = _nt_string
+            if r4
+              r1 = r4
+            else
+              @index = i1
+              r1 = nil
+            end
+          end
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(Query0)
+
+      node_cache[:query][start_index] = r0
+
+      r0
+    end
+
+    module QuotedString0
+    end
+
+    module QuotedString1
+      def content
+        result = text_value[1..-2]
+        result.empty? ? nil : result
+      end
+    end
+
+    def _nt_quoted_string
+      start_index = index
+      if node_cache[:quoted_string].has_key?(index)
+        cached = node_cache[:quoted_string][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      i0, s0 = index, []
+      if has_terminal?('"', false, index)
+        r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('"')
+        r1 = nil
+      end
+      s0 << r1
+      if r1
+        s2, i2 = [], index
+        loop do
+          if has_terminal?('\G[^"]', true, index)
+            r3 = true
+            @index += 1
+          else
+            r3 = nil
+          end
+          if r3
+            s2 << r3
+          else
+            break
+          end
+        end
+        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        s0 << r2
+        if r2
+          if has_terminal?('"', false, index)
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure('"')
+            r4 = nil
+          end
+          s0 << r4
+        end
+      end
+      if s0.last
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(QuotedString0)
+        r0.extend(QuotedString1)
+      else
+        @index = i0
+        r0 = nil
+      end
+
+      node_cache[:quoted_string][start_index] = r0
+
+      r0
+    end
+
+    module Whitespace0
+      def content; end;
+    end
+
+    def _nt_whitespace
+      start_index = index
+      if node_cache[:whitespace].has_key?(index)
+        cached = node_cache[:whitespace][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        if has_terminal?('\G[\\s]', true, index)
+          r1 = true
+          @index += 1
+        else
+          r1 = nil
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(Whitespace0)
+      end
+
+      node_cache[:whitespace][start_index] = r0
+
+      r0
+    end
+
+    module String0
+      def content; text_value; end
+    end
+
+    def _nt_string
+      start_index = index
+      if node_cache[:string].has_key?(index)
+        cached = node_cache[:string][index]
+        if cached
+          cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+          @index = cached.interval.end
+        end
+        return cached
+      end
+
+      s0, i0 = [], index
+      loop do
+        if has_terminal?('\G[^\\s]', true, index)
+          r1 = true
+          @index += 1
+        else
+          r1 = nil
+        end
+        if r1
+          s0 << r1
+        else
+          break
+        end
+      end
+      if s0.empty?
+        @index = i0
+        r0 = nil
+      else
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(String0)
+      end
+
+      node_cache[:string][start_index] = r0
+
+      r0
+    end
+
+  end
+
+  class SearchGrammarParser < Treetop::Runtime::CompiledParser
+    include SearchGrammar
+  end
+
+
+end

data/lib/murlsh/search_grammar.treetop

@@ -0,0 +1,34 @@
+module Murlsh
+
+  grammar SearchGrammar
+
+    rule query
+      (quoted_string / whitespace / string)* {
+        def content; elements.map { |e| e.content }.compact.uniq; end
+      }
+    end
+
+    rule quoted_string
+      '"' [^"]* '"' {
+        def content
+          result = text_value[1..-2]
+          result.empty? ? nil : result
+        end
+      }
+    end
+
+    rule whitespace
+      [\s]+ {
+        def content; end;
+      }
+    end
+
+    rule string
+      [^\s]+ {
+        def content; text_value; end
+      }
+    end
+
+  end
+
+end