typeout 1.4.5 → 1.4.6

data/lib/typeout.js

@@ -5,39 +5,39 @@ var regexpEscape = function(text) {
 var Typeout = new Class({
     initialize: function(content) {
         var self = this;
-        
+
         self.content = content;
     },
-    
+
     toHTML: function() {
         var self = this;
-        
+
         var text = self.content;
-    
+
         text = self.cleanWhitespace(text);
         text = '\n\n' + text + '\n\n'; // a few guaranteed newlines
-    
+
         self.archive = [];
-        
+
         text = self.archiveHtml(text);
-    
+
         text = self.htmlEscape(text);
-        
+
         text = self.archiveCode(text);
-        
+
         text = self.makeBlockquotes(text);
         text = self.makeHeadings(text);
         text = self.makeLists(text);
         text = self.makeParagraphs(text);
         text = self.makeInlines(text);
-        
+
         text = self.removeExcessNewlines(text);
-    
+
         text = self.retrieveArchive(text);
-    
+
         return text;
     },
-    
+
     htmlEscape: function(text) {
         return text.
             replace(/&/g, '&').
@@ -45,107 +45,107 @@ var Typeout = new Class({
             replace(/>/g, '>').
             replace(/"/g, '"')
     },
-    
+
     cleanWhitespace: function(text) {
         return text.
             replace(/\r\n/g, '\n').
             replace(/\r/g, '\n').
             replace(/^ +$/gm, '');
     },
-    
+
     removeExcessNewlines: function(text) {
         return text.replace(/\n{3,}/g, '\n\n');
     },
-    
+
     archiveHtml: function(text) {
         var self = this;
-        
+
         return text.replace(/\[html\]([\s\S]*?)\[\/html\]/gmi, function(wholeMatch, m1) {
             return self.addToArchive(m1);
         });
     },
-    
+
     archiveCode: function(text) {
         var self = this;
-        
+
         text = text.replace(/^-{3,}\n([\s\S]+?)\n-{3,}$/gm, function(wholeMatch, m1) {
             return self.addToArchive('<pre><code>' + m1 +'</code></pre>');
         });
-        
+
         return text.replace(/`(?!\s)((?:\s*\S)+?)`/g, function(wholeMatch, m1) {
             return self.addToArchive('<code>' + m1 + '</code>');
         });
     },
-    
+
     addToArchive: function(text) {
         var self = this;
-        
+
         var index = self.archive.push(text) - 1;
         return '!a!r!c!h!i!v!e!' + index + '!a!r!c!h!i!v!e!'; // nobody's going to type that!
     },
-    
+
     retrieveArchive: function(text) {
         var self = this;
-        
+
         self.archive.each(function(content, index) {
             text = text.replace(new RegExp('!a!r!c!h!i!v!e!' + index + '!a!r!c!h!i!v!e!'), content); // the block is so gsub won't substitute \&
         });
         return text;
     },
-    
+
     makeBlockquotes: function(text) {
         return text.replace(/^~{3,}\n([\s\S]+?)\n~{3,}$/gm, '\n\n<blockquote>\n\n$1\n\n</blockquote>\n\n');
     },
-    
+
     makeHeadings: function(text) {
         return text.replace(/^(={1,6})(.+?)=*?$/gm, function(wholeMatch, m1, m2) {
             var depth = m1.length;
             return '\n\n<h' + depth + '>' + m2.trim() + '</h' + depth + '>\n\n';
         });
     },
-    
+
     makeLists: function(text, baseLevel) {
         var self = this;
-        
+
         if (baseLevel == undefined) {
             baseLevel = '';
         }
-        
+
         return text.replace(new RegExp('^(' + regexpEscape(baseLevel) + '[\\*\\#])[\\*\\#]* [^\n]+?\n(?:\\1[\\*\\#]* (?:[^\n])+?\n)*', 'gm'), function(content, level) {
             content = self.makeLists(content, level);
             content = content.replace(new RegExp('^' + regexpEscape(level) + ' (.+)$', 'gm'), '<li>$1</li>');
             content = content.replace(/<\/li>\n<([uo])l>/gm, '<$1l>');
-            
+
             if (level.slice(-1) == '*') { // its an unordered list
                 content = '<ul>\n' + content + '</ul>';
             } else {
                 content = '<ol>\n' + content + '</ol>';
             }
-            
+
             if (baseLevel) {
                 content += '</li>\n';
             } else {
                 content += '\n';
             }
             return content;
-        }); 
+        });
     },
-    
+
     makeParagraphs: function(text) {
         var self = this;
-        
+
         return text.replace(/^(?!<|!a!r!c!h!i!v!e!)([^\n]+\n)+\n/gm, function(content) {
             return '\n\n<p>\n' + self.makeBreaks(content.trim()) + '</p>\n\n';
         });
     },
-    
+
     makeBreaks: function(text) {
         return text.replace(/([^\n])\n(?!\n)/gm, '$1<br />\n');
     },
-    
+
     makeInlines: function(text) {
         var self = this;
-        
+
         text = text.
             replace(/^((?: ?[\w\(\)']){3,}:) (?!\s*$)/gm, '<b>$1</b> '). // spaces are not allowed directly in front of the colon, there must be a space after it, and the rest of the line can't be blank
             replace(/!\((.+?)\)(?:\:([a-zA-Z0-9\_]+))?/g, function(wholeMatch, m1, m2) {
@@ -165,7 +165,7 @@ var Typeout = new Class({
             replace(/([a-z0-9\.\-\_\+]+)@((?:[a-z0-9\-]{2,}\.)*)([a-z0-9\-]+\.)(com|org|net|biz|edu|info|gov|co\.uk|co\.us)/gi, function(wholeMatch, address, subdomain, domain, tld) {
                 return '<a href="mailto:' + self.addToArchive(address + '@' + subdomain + domain + tld) + '">' + self.addToArchive(address + '@' + subdomain + domain + tld) + '</a>';
             }).
-            replace(/(https?:\/\/)?((?:[a-z0-9\-]{2,}\.)*)([a-z0-9\-]+\.)(com|org|net|biz|edu|info|gov|co\.uk|co\.us)((?:\/[a-z0-9\-\._=\?&;\%#]+)*\/?)/gi, function(wholeMatch, protocol, subdomain, domain, tld, file) {
+            replace(/(https?:\/\/)?((?:[a-z0-9\-]{2,}\.)*)([a-z0-9\-]+\.)(com|org|net|biz|edu|info|gov|co\.uk|co\.us)((?:\/(?:\.?[a-z0-9\-_=\?&;\%#]+)+)*\/?)/gi, function(wholeMatch, protocol, subdomain, domain, tld, file) {
                 if (!protocol) {
                     protocol = 'http://';
                 }
@@ -179,77 +179,77 @@ var Typeout = new Class({
             ['^', 'sup'],
             ['~', 'sub']
         ];
-    
+
         inlines.each(function(pair) {
             var char = regexpEscape(pair[0]);
             var tag = pair[1];
             text = text.replace(new RegExp(char + '(?!\\s)((?:\\s*\\S)+?)' + char, 'g'), '<' + tag + '>$1</' + tag + '>');
         });
-    
+
         return text;
     }
 });
 
 var TypeoutPreview = new Class({
     Implements: Options,
-    
+
     options: {
         frequency: 500
     },
-    
+
     initialize: function(textArea, previewDiv, options) {
         var self = this;
-        
+
         self.textArea = $(textArea);
         self.previewDiv = $(previewDiv);
-        
+
         self.setOptions(options);
-        
+
         self.typeOut = new Typeout;
         self.dirty = true;
         self.ready = false;
-        
+
         self.textArea.addEvent('keyup', self.setDirty.bind(self));
         self.setReady();
     },
-    
+
     setDirty: function() {
         var self = this;
-        
+
         self.dirty = true;
         if (self.ready) {
             self.setUnReady();
             self.preview();
         }
     },
-    
+
     setUnReady: function() {
         var self = this;
-        
+
         self.ready = false;
         self.setReady.delay(self.options.frequency, self);
     },
-    
+
     setReady: function() {
         var self = this;
-        
+
         self.ready = true;
         if (self.dirty) {
             self.setUnReady();
             self.preview();
         }
     },
-    
+
     render: function(text) {
         var self = this;
-        
+
         self.typeOut.content = text;
         return self.typeOut.toHTML();
     },
-    
+
     preview: function() {
         var self = this;
-        
+
         self.previewDiv.set('html', self.render(self.textArea.value));
         self.dirty = false;
     }
@@ -257,17 +257,17 @@ var TypeoutPreview = new Class({
 
 TypeoutTemplatePreview = new Class({
     Extends: TypeoutPreview,
-    
+
     initialize: function(textArea, previewDiv, template, options) {
         var self = this;
-        
+
         self.template = template;
         self.parent(textArea, previewDiv, options);
     },
-    
+
     render: function(content) {
         var self = this;
-        
+
         self.template.tags.each(function(tag) {
             content = content.replace(RegExp(regexpEscape(tag.name), 'gi'), tag.example);
         });

data/lib/typeout.rb

@@ -1,43 +1,44 @@
 require 'sanitize'
+require 'erb'
 
 class Typeout < String
   VERSION = '1.4.5'
-  
+
   include ERB::Util
-  
+
   def self.convert(text, sanitize = true)
     self.new(text.to_s).to_html(sanitize)
   end
-  
+
   def to_html(sanitize = true)
     @sanitize = sanitize
-    
+
     text = self.dup
-    
+
     text = clean_whitespace text
     text = "\n\n#{text}\n\n" # a few guaranteed newlines
-    
+
     @archive = []
-    
+
     text = archive_html text
-    
+
     text = html_escape text
-    
+
     text = archive_code text
     text = archive_blockquotes text
-    
+
     text = make_headings text
     text = make_lists text
     text = make_paragraphs text
     text = make_inlines text
-    
+
     text = remove_excess_newlines text
-    
+
     text = retrieve_archive text
-    
+
     text
   end
-  
+
   def sanitize_html(text)
     if @sanitize
       Sanitize.clean(text, Sanitize::Config::RELAXED)
@@ -45,66 +46,66 @@ class Typeout < String
       text
     end
   end
-  
+
   def clean_whitespace(text)
     text.gsub(/\r\n/, "\n").
       gsub(/\r/, "\n").
       gsub(/^ +$/, '')
   end
-  
+
   def remove_excess_newlines(text)
     text.gsub(/\n{3,}/, "\n\n")
   end
-  
+
   def archive_html(text)
     text.gsub(/\[html\](.*?)\[\/html\]/mi) { archive(sanitize_html($1)) }
   end
-  
+
   def archive_code(text)
     text = text.gsub(/^-{3,}\n(.+?)\n-{3,}$/m) { archive("<pre><code>#{$1}</code></pre>") }
     text.gsub(/`(?!\s)((?:\s*\S)+?)`/) { archive("<code>#{$1}</code>") }
   end
-  
+
   def archive_blockquotes(text)
     text.gsub(/^~{3,}\n(.+?)\n~{3,}$/m) do
       content = remove_excess_newlines(make_paragraphs(make_lists("\n\n#{$1}\n\n"))) # blockquotes support paragraphs and lists
       archive("<blockquote>#{content}</blockquote>")
     end
   end
-  
+
   def archive(text)
     @archive << text
     "!a!r!c!h!i!v!e!#{@archive.length-1}!a!r!c!h!i!v!e!" # nobody's going to type that!
   end
-  
+
   def retrieve_archive(text)
     @archive.each_with_index do |content, index|
       text = text.sub("!a!r!c!h!i!v!e!#{index}!a!r!c!h!i!v!e!") { content } # the block is so gsub won't substitute \&
     end
     text
   end
-  
+
   def make_headings(text)
     text.gsub(/^(={1,6})(.+?)=*?$/) do
       depth = $1.length
       "\n\n<h#{depth}>#{$2.strip}</h#{depth}>\n\n"
     end
   end
-  
+
   def make_lists(text, base_level = nil)
     text.gsub(/^(#{Regexp.escape(base_level.to_s)}[\*\#])[\*\#]* [^\n]+?\n(?:\1[\*\#]* (?:[^\n])+?\n)*/m) do |content|
       level = $1
-      
+
       content = make_lists(content, level)
       content = content.gsub(/^#{Regexp.escape(level)} (.+)$/, '<li>\1</li>')
       content = content.gsub(/<\/li>\n<([uo])l>/m, '<\1l>')
-      
+
       if level.last == "*" # its an unordered list
         content = "<ul>\n#{content}</ul>"
       else
         content = "<ol>\n#{content}</ol>"
       end
-      
+
       if base_level
         content += "</li>\n"
       else
@@ -113,15 +114,15 @@ class Typeout < String
       content
     end
   end
-  
+
   def make_paragraphs(text)
     text.gsub(/^(?!<|!a!r!c!h!i!v!e!)([^\n]+\n)+\n/m) { |content| "\n\n<p>\n#{make_breaks(content.strip)}</p>\n\n" }
   end
-  
+
   def make_breaks(text)
     text.gsub(/([^\n])\n(?!\n)/m, "\\1<br />\n")
   end
-  
+
   def make_inlines(text)
     text = text.
       gsub(/^((?: ?[\w\(\)']){3,}:) (?!\s*$)/, '<b>\1</b> '). # spaces are not allowed directly in front of the colon, there must be a space after it, and the rest of the line can't be blank
@@ -142,7 +143,7 @@ class Typeout < String
       gsub(/([a-z0-9\.\-\_\+]+)@((?:[a-z0-9\-]{2,}\.)*)([a-z0-9\-]+\.)(com|org|net|biz|edu|info|gov|co\.uk|co\.us)/i) do
         "<a href=\"mailto:#{archive($1 + '@' + $2 + $3 + $4)}\">#{archive($1 + '@' + $2 + $3 + $4)}</a>"
       end.
-      gsub(/(https?:\/\/)?((?:[a-z0-9\-]{2,}\.)*)([a-z0-9\-]+\.)(com|org|net|biz|edu|info|gov|co\.uk|co\.us)((?:\/[a-z0-9\-\._=\?&;\%#]+)*\/?)/i) do
+      gsub(/(https?:\/\/)?((?:[a-z0-9\-]{2,}\.)*)([a-z0-9\-]+\.)(com|org|net|biz|edu|info|gov|co\.uk|co\.us)((?:\/(?:\.?[a-z0-9\-_=\?&;\%#]+)+)*\/?)/i) do # some of the magic in here is to not grab periods at the end of URLs
         if $1.nil?
           protocol = 'http://'
         else
@@ -150,7 +151,7 @@ class Typeout < String
         end
         "<a href=\"#{archive(protocol + $2 + $3 + $4 + $5)}\">#{archive(protocol + $2 + $3 + $4 + $5)}</a>"
       end
-    
+
     inlines = [
       ['*', 'strong'],
       ['_', 'em'],
@@ -158,7 +159,7 @@ class Typeout < String
       ['^', 'sup'],
       ['~', 'sub']
     ]
-    
+
     inlines.each do |char, tag|
       char = Regexp.escape(char)
       re = /#{char}         # the opening character
@@ -170,7 +171,7 @@ class Typeout < String
       #re = /#{char}(.+?)#{char}/
       text.gsub!(re, "<#{tag}>\\1</#{tag}>")
     end
-    
+
     text
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: typeout
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Connor McKay
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 Z
+date: 2013-09-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sanitize
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: typeout
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Dead simple plain text to HTML converter