murlsh 1.0.0 → 1.1.0

data/lib/murlsh/markup.rb

@@ -9,8 +9,8 @@ module Murlsh
     # * :prefix - prefix to append to all script urls
     def javascript(sources, options={})
       [*sources].each do |src|
-        script('', :type => 'text/javascript',
-          :src => "#{options[:prefix]}#{src}")
+        script '', :type => 'text/javascript',
+          :src => "#{options[:prefix]}#{src}"
       end
     end
 
@@ -24,23 +24,24 @@ module Murlsh
     #
     # Any other options in hash will be added as attributes.
     def murlsh_img(options={})
-      img_convert_prefix(options)
-      img_convert_size(options)
-      img_convert_text(options)
+      img_convert_prefix options
+      img_convert_size options
+      img_convert_text options
+      img_convert_data_uri options
 
       if options[:href]
         a(:href => options[:href]) {
-          options.delete(:href)
-          img(options)
+          options.delete :href
+          img options
         }
       else
-        img(options)
+        img options
       end
     end
 
     # ATOM feed link builder.
     def atom(href)
-      link(:rel => 'alternate', :type => 'application/atom+xml', :href => href)
+      link :rel => 'alternate', :type => 'application/atom+xml', :href => href
     end
 
     # CSS link builder.
@@ -54,14 +55,14 @@ module Murlsh
           :href => "#{options[:prefix]}#{href}",
           :rel => 'stylesheet',
         }
-        attrs[:media] = options[:media] if options[:media]
-        link(attrs)
+        attrs[:media] = options[:media]  if options[:media]
+        link attrs
       end
     end
 
     # Meta tag builder. Takes a hash of name => content.
     def metas(tags)
-      tags.each { |k,v| meta(:name => k, :content => v) }
+      tags.each { |k,v| meta :name => k, :content => v }
     end
 
     # Gravatar builder. Takes MD5 hash of email address.
@@ -76,19 +77,19 @@ module Murlsh
         (k == 'r' and %w{g pg r x}.include?(v)))
       end
 
-      return if query['s'] and query['s'] < 1
+      return  if query['s'] and query['s'] < 1
 
-      options.reject! { |k,v| %w{d s r}.include?(k) }
+      options.reject! { |k,v| %w{d s r}.include? k }
       options[:src] = URI.join('http://www.gravatar.com/avatar/',
         email_hash + build_query(query))
 
-      murlsh_img(options)
+      murlsh_img options
     end
 
     # Query string builder. Takes hash of query string variables.
     def build_query(h)
       h.empty? ? '' :
-        '?' + h.map { |k,v| URI.escape("#{k}=#{v}") }.join('&')
+        '?' + h.map { |k,v| URI.escape "#{k}=#{v}" }.join('&')
     end
 
     # Form input builder.
@@ -101,7 +102,7 @@ module Murlsh
         options[:name] ||= options[:id]
       end
 
-      options.delete(:label)
+      options.delete :label
 
       input({
         :type => 'text',
@@ -113,7 +114,7 @@ module Murlsh
     def img_convert_prefix(options)
       if options.has_key?(:prefix) and options.has_key?(:src)
         options[:src] = options[:prefix] + options[:src]
-        options.delete(:prefix)
+        options.delete :prefix
       end
     end
 
@@ -124,14 +125,46 @@ module Murlsh
         else
           options[:width] = options[:height] = options[:size]
         end
-        options.delete(:size)
+        options.delete :size
       end
     end
 
     def img_convert_text(options)
       if options.has_key?(:text)
         options[:alt] = options[:title] = options[:text]
-        options.delete(:text)
+        options.delete :text
+      end
+    end
+
+    # If given options[:data_uri_prefix], render the image as a data uri with
+    # the base64 encoded image data directly in the src attribute.
+    #
+    # Only works if options[:src] is a relative url.
+    #
+    # Local image file path is site root (current working directory) +
+    # options[:data_uri_prefix] + options[:src].
+    #
+    # Options:
+    # * :src - image src
+    # * :data_uri_prefix - prefix for finding images on local filesystem
+    # * :max_size - images larger than this will not be converted to data uris
+    def img_convert_data_uri(options)
+      if options[:data_uri_prefix]
+        Murlsh::failproof do
+          # try to prevent getting outside current working directory
+          img_path = File.join(Dir.getwd, File.expand_path(
+            File.join(options[:data_uri_prefix], options[:src]), '/'))
+          img_size = File.size(img_path)
+
+          unless size == 0 or 
+            (options[:max_size] and size > options[:max_size])
+            options[:src] = Magick::ImageList.new(img_path).extend(
+              Murlsh::ImageList).data_uri
+
+            options.delete :data_uri_prefix
+            options.delete :max_size
+          end
+        end
       end
     end
 

data/lib/murlsh/must_revalidate.rb

@@ -1,7 +1,5 @@
-%w{
-rack
-rack/utils
-}.each { |m| require m }
+require 'rack'
+require 'rack/utils'
 
 module Murlsh
 

data/lib/murlsh/plugin.rb

@@ -21,7 +21,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.find_all { |p| p.hook == name }.
         sort { |a,b| a.to_s <=> b.to_s }
 
       if block_given?

data/lib/murlsh/sqlite3_adapter.rb

@@ -1,10 +1,8 @@
-%w{
-active_record/connection_adapters/sqlite3_adapter
-}.each { |m| require m }
+require 'active_record/connection_adapters/sqlite3_adapter'
 
 class ActiveRecord::ConnectionAdapters::SQLite3Adapter
 
-  # Add MATCH function for regex matching.
+  # Add MURLSHMATCH function for regex matching.
   def initialize(connection, logger, config)
     super
     @connection.create_function('MURLSHMATCH', 2) do |func,search_in,search_for|

data/lib/murlsh/time_ago.rb

@@ -1,6 +1,4 @@
-%w{
-time
-}.each { |m| require m }
+require 'time'
 
 module Murlsh
 
@@ -13,11 +11,11 @@ module Murlsh
        days_ago = (Time.now.to_i - to_i) / 86400
 
        case days_ago
-         when 0 then 'today'
-         when 1 then 'yesterday'
-         when (2..4) then "#{days_ago} days ago"
-         when (5..7) then strftime('%a %e %b')
-         when (8..180) then strftime('%e %b').strip
+         when 0; 'today'
+         when 1; 'yesterday'
+         when (2..4); "#{days_ago} days ago"
+         when (5..7); strftime('%a %e %b')
+         when (8..180); strftime('%e %b').strip
          else strftime('%e %b %Y').strip
       end
     end

data/lib/murlsh/uri.rb

@@ -1,6 +1,4 @@
-%w{
-uri
-}.each { |m| require m }
+require 'uri'
 
 # Extra methods added to URI class.
 class URI::Generic

data/lib/murlsh/uri_ask.rb

@@ -1,13 +1,11 @@
-%w{
-net/http
-net/https
-open-uri
-uri
+require 'net/http'
+require 'net/https'
+require 'open-uri'
+require 'uri'
 
-hpricot
-htmlentities
-iconv
-}.each { |m| require m }
+require 'hpricot'
+require 'htmlentities'
+require 'iconv'
 
 module Murlsh
 
@@ -19,14 +17,14 @@ module Murlsh
     # Options:
     # * :failproof - if true hide all exceptions and return empty string on failure
     # * :headers - hash of headers to send in request
-    def content_length(options={}); header('content-length', options); end
+    def content_length(options={}); header 'content-length', options; end
 
     # Get the content type.
     #
     # Options:
     # * :failproof - if true hide all exceptions and return empty string on failure
     # * :headers - hash of headers to send in request
-    def content_type(options={}); header('content-type', options); end
+    def content_type(options={}); header 'content-type', options; end
 
     # Get the HTML title.
     #
@@ -34,15 +32,13 @@ module Murlsh
     # * :failproof - if true hide all exceptions and return url on failure
     # * :headers - hash of headers to send in request
     def title(options={})
-      return @title if defined?(@title)
+      return @title  if defined?(@title)
 
       @title = to_s
 
       d = doc(options)
 
-      if d and d.title and !d.title.empty?
-        @title = decode(d.title)
-      end
+      if d and d.title and not d.title.empty?; @title = decode(d.title); end
 
       @title
     end
@@ -53,13 +49,13 @@ module Murlsh
     # * :failproof - if true hide all exceptions and return empty string on failure
     # * :headers - hash of headers to send in request
     def description(options={})
-      return @description if defined?(@description)
+      return @description  if defined?(@description)
 
       @description = ''
 
       d = doc(options)
 
-      if d and d.description and !d.description.empty?
+      if d and d.description and not d.description.empty?
         @description = decode(d.description)
       end
 
@@ -75,7 +71,7 @@ module Murlsh
     # * :failproof - if true hide all exceptions and return empty string on failure
     # * :headers - hash of headers to send in request
     def doc(options={})
-      return @doc if defined?(@doc)
+      return @doc  if defined?(@doc)
       options[:headers] = default_headers.merge(options.fetch(:headers, {}))
 
       @doc = nil
@@ -93,6 +89,7 @@ module Murlsh
           end
         end
       end
+
       @doc
     end
 
@@ -109,10 +106,10 @@ module Murlsh
       result
     end
 
+    HtmlContentTypePattern = %r{^text/html}i
+
     # Return true if the content type is HTML.
-    def html?(options={})
-      content_type(options)[/^text\/html/]
-    end
+    def html?(options={}); content_type(options)[HtmlContentTypePattern]; end
 
     # Convert from the character set of this url to utf-8 and decode HTML
     # entities.
@@ -127,7 +124,7 @@ module Murlsh
     # * :headers - hash of headers to send in request
     def header(header_name, options={})
       result = [*head_headers(options)[header_name]][0]
-      result = get_headers(options)[header_name] if !result or result.empty?
+      result = get_headers(options)[header_name]  if not result or result.empty?
       result || ''
     end
 
@@ -139,7 +136,7 @@ module Murlsh
     # * :failproof - if true hide all exceptions and return empty hash on failure
     # * :headers - hash of headers to send in request
     def head_headers(options={})
-      return @head_headers if defined?(@head_headers)
+      return @head_headers  if defined?(@head_headers)
 
       request_headers = default_headers.merge(options.fetch(:headers, {}))
 
@@ -153,8 +150,8 @@ module Murlsh
         if Net::HTTPSuccess === resp
           response_headers = resp.to_hash
         end
-
       end
+
       @head_headers = response_headers
     end
 
@@ -166,7 +163,7 @@ module Murlsh
     # * :failproof - if true hide all exceptions and return empty hash on failure
     # * :headers - hash of headers to send in request
     def get_headers(options={})
-      return @get_headers if defined?(@get_headers)
+      return @get_headers  if defined?(@get_headers)
 
       request_headers = default_headers.merge(options.fetch(:headers, {}))
 
@@ -175,6 +172,7 @@ module Murlsh
       Murlsh::failproof(options) do
         response_headers = self.open(request_headers) { |f| f.meta }
       end
+
       @get_headers = response_headers
     end
 

data/lib/murlsh/url.rb

@@ -1,8 +1,6 @@
-%w{
-uri
+require 'uri'
 
-active_record
-}.each { |m| require m }
+require 'active_record'
 
 module Murlsh
 
@@ -13,10 +11,10 @@ module Murlsh
     # Get the title of this url.
     def title
       ta = read_attribute(:title)
-      ta = nil if ta and ta.empty?
+      ta = nil  if ta and ta.empty?
       
       ua = read_attribute(:url)
-      ua = nil if ua and ua.empty?
+      ua = nil  if ua and ua.empty?
 
       ta || ua || 'title missing'
     end

data/lib/murlsh/url_body.rb

@@ -1,6 +1,4 @@
-%w{
-builder
-}.each { |m| require m }
+require 'builder'
 
 module Murlsh
 
@@ -14,7 +12,7 @@ module Murlsh
       super(:indent => @config['html_indent'] || 0)
     end
 
-    # Fetch urls base on query string parameters.
+    # Fetch urls based on query string parameters.
     def urls
       Murlsh::Url.all(:conditions => search_conditions, :order => 'id DESC',
         :limit =>  @req.params['n'] ? @req.params['n'].to_i :
@@ -50,20 +48,20 @@ module Murlsh
                 unless mu.same_author?(last)
                   div(:class => 'icon') {
                     gravatar(mu.email, 's' => gravatar_size, :text => mu.name)
-                  } if mu.email and gravatar_size > 0
-                  div(mu.name, :class => 'name') if
+                  }  if mu.email and gravatar_size > 0
+                  div(mu.name, :class => 'name')  if
                     @config.fetch('show_names', false) and mu.name
                 end
 
                 if mu.thumbnail_url
-                  murlsh_img(:src => mu.thumbnail_url,
-                    :text => mu.title_stripped, :class => 'thumb')
+                  murlsh_img :src => mu.thumbnail_url,
+                    :text => mu.title_stripped, :class => 'thumb'
                 end
 
-                a(mu.title_stripped, :href => mu.url, :class => 'm')
+                a mu.title_stripped, :href => mu.url, :class => 'm'
 
                 Murlsh::Plugin.hooks('url_display_add') do |p|
-                  p.run(self, mu, @config)
+                  p.run self, mu, @config
                 end
 
                 last = mu
@@ -76,7 +74,7 @@ module Murlsh
           clear
           powered_by
           js
-          div('', :id => 'bottom')
+          div '', :id => 'bottom'
         }
       }
     end
@@ -86,10 +84,10 @@ module Murlsh
       head {
         titlee
         meta :'http-equiv' => 'Content-Type', :content => @content_type
-        metas(@config.select { |k,v| k =~ /^meta_tag_/ and v }.
+        metas(@config.find_all { |k,v| k =~ /^meta_tag_/ and v }.
           map { |k,v| [k.sub('meta_tag_', ''), v] })
         css(@config['css_compressed'] || @config['css_files'])
-        atom(@config.fetch('feed_file'))
+        atom @config.fetch('feed_file')
       }
     end
 
@@ -109,8 +107,8 @@ module Murlsh
     def search_form
       form(:action => '', :method => 'get') {
         fieldset {
-          form_input(:id => 'q', :size => 32, :value => @q)
-          form_input(:type => 'submit', :value => 'Regex Search')
+          form_input :id => 'q', :size => 32, :value => @q
+          form_input :type => 'submit', :value => 'Regex Search'
         }
       }
     end
@@ -119,12 +117,12 @@ module Murlsh
     def add_form
       form(:action => '', :method => 'post') {
         fieldset(:id => 'add') {
-          self.p { form_input(:id => 'url', :label => 'Add URL', :size => 32) }
-          self.p { form_input(:id => 'via', :label => 'Via', :size => 32) }
+          self.p { form_input :id => 'url', :label => 'Add URL', :size => 32 }
+          self.p { form_input :id => 'via', :label => 'Via', :size => 32 }
           self.p {
-            form_input(:id => 'auth', :label => 'Password', :size => 16,
-              :type => 'password')
-            form_input(:id => 'submit', :type => 'button', :value => 'Add')
+            form_input :type => 'password', :id => 'auth', :label => 'Password',
+              :size => 16
+            form_input :id => 'submit', :type => 'button', :value => 'Add'
           }
         }
       }
@@ -137,7 +135,7 @@ module Murlsh
     def powered_by
       self.p {
         text! 'powered by '
-        a('murlsh', :href => 'http://github.com/mmb/murlsh/')
+        a 'murlsh', :href => 'http://github.com/mmb/murlsh/'
       }
     end
 

data/lib/murlsh/url_server.rb

@@ -1,7 +1,5 @@
-%w{
-active_record
-rack
-}.each { |m| require m }
+require 'active_record'
+require 'rack'
 
 module Murlsh
 
@@ -39,23 +37,23 @@ module Murlsh
       auth = req.params['auth']
       if user = auth.empty? ? nil : Murlsh::Auth.new(
         @config.fetch('auth_file')).auth(auth)
-        ActiveRecord::Base.establish_connection(:adapter => 'sqlite3',
-          :database => @config.fetch('db_file'))
+        ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
+          :database => @config.fetch('db_file')
 
         mu = Murlsh::Url.new do |u|
           u.time = Time.now.gmtime
           u.url = req.params['url']
           u.email = user[:email]
           u.name = user[:name]
-          u.via = req.params['via'] unless (req.params['via'] || []).empty?
+          u.via = req.params['via']  unless (req.params['via'] || []).empty?
         end
 
         begin
           # validate before add_pre plugins have run and also after (in save!)
-          raise ActiveRecord::RecordInvalid.new(mu) unless mu.valid?
-          Murlsh::Plugin.hooks('add_pre') { |p| p.run(mu, @config) }
+          raise ActiveRecord::RecordInvalid.new(mu)  unless mu.valid?
+          Murlsh::Plugin.hooks('add_pre') { |p| p.run mu, @config }
           mu.save!
-          Murlsh::Plugin.hooks('add_post') { |p| p.run(mu, @config) }
+          Murlsh::Plugin.hooks('add_post') { |p| p.run mu, @config }
           response_body, response_code = [mu], 200
         rescue ActiveRecord::RecordInvalid => error
           response_body = {

data/lib/murlsh/yaml_ordered_hash.rb

@@ -1,6 +1,4 @@
-%w{
-yaml
-}.each { |m| require m }
+require 'yaml'
 
 module Murlsh
 
@@ -11,7 +9,7 @@ module Murlsh
       YAML::quick_emit(self, opts) do |out|
         out.map(taguri, to_yaml_style) do |map|
           sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |k, v|
-            map.add( k, v )
+            map.add k, v
           end
         end
       end

data/lib/murlsh.rb

@@ -1,6 +1,23 @@
 require 'murlsh/head_from_get'
 
-Dir.glob(File.join(File.dirname(__FILE__), 'murlsh', '*.rb')).
-  map { |f| File.join('murlsh', File.basename(f, '.rb')) }.
-  sort.
-  each { |m| require m }
+require 'murlsh/auth'
+require 'murlsh/config_server'
+require 'murlsh/dispatch'
+require 'murlsh/doc'
+require 'murlsh/etag_add_encoding'
+require 'murlsh/failproof'
+require 'murlsh/far_future_expires'
+require 'murlsh/image_list'
+require 'murlsh/img_store'
+require 'murlsh/markup'
+require 'murlsh/must_revalidate'
+require 'murlsh/openlock'
+require 'murlsh/plugin'
+require 'murlsh/sqlite3_adapter'
+require 'murlsh/time_ago'
+require 'murlsh/uri_ask'
+require 'murlsh/uri'
+require 'murlsh/url_body'
+require 'murlsh/url'
+require 'murlsh/url_server'
+require 'murlsh/yaml_ordered_hash'