marked-rails 0.2.8.0 → 0.2.9.0

data/README.md

@@ -5,8 +5,6 @@
   Marked is also available through Node Package Manager, but if you're working in Rails it's nice
   to have in gem form for simple integration into your rails apps.
 
-  We are currently tracking marked version 0.2.7
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -31,6 +29,12 @@ Or install it yourself as:
 
 _Coming ...Eventually_
 
+## Versioning Conventions
+
+The least significant digits are gem-specific. Everything before those digits are marked versions.
+For example: marked-rails 0.2.8.0 tracks marked 0.2.8 - if we make a mistake in the gem, withoug
+having to touch the library - we'd release 0.2.8.1
+
 ## Contributing
 
 Feel free to open an issue ticket if you find something that could be improved. A couple notes:

data/lib/marked-rails/version.rb

@@ -1,5 +1,5 @@
 module Marked
   module Rails
-    VERSION = "0.2.8.0"
+    VERSION = "0.2.9.0"
   end
 end

data/vendor/assets/javascripts/marked.js

@@ -676,7 +676,7 @@ InlineLexer.prototype.output = function(src) {
     // text
     if (cap = this.rules.text.exec(src)) {
       src = src.substring(cap[0].length);
-      out += escape(cap[0]);
+      out += escape(this.smartypants(cap[0]));
       continue;
     }
 
@@ -728,10 +728,10 @@ InlineLexer.prototype.outputLink = function(cap, link) {
 InlineLexer.prototype.smartypants = function(text) {
   if (!this.options.smartypants) return text;
   return text
-    .replace(/--/g, '—')
-    .replace(/'([^']*)'/g, '‘$1’')
-    .replace(/"([^"]*)"/g, '“$1”')
-    .replace(/\.{3}/g, '…');
+    .replace(/--/g, '\u2014')
+    .replace(/'([^']*)'/g, '\u2018$1\u2019')
+    .replace(/"([^"]*)"/g, '\u201C$1\u201D')
+    .replace(/\.{3}/g, '\u2026');
 };
 
 /**
@@ -1029,27 +1029,50 @@ function marked(src, opt, callback) {
 
     if (opt) opt = merge({}, marked.defaults, opt);
 
-    var tokens = Lexer.lex(tokens, opt)
-      , highlight = opt.highlight
-      , pending = 0
-      , l = tokens.length
+    var highlight = opt.highlight
+      , tokens
+      , pending
       , i = 0;
 
-    if (!highlight || highlight.length < 3) {
-      return callback(null, Parser.parse(tokens, opt));
+    try {
+      tokens = Lexer.lex(src, opt)
+    } catch (e) {
+      return callback(e);
     }
 
-    var done = function() {
-      delete opt.highlight;
-      var out = Parser.parse(tokens, opt);
+    pending = tokens.length;
+
+    var done = function(hi) {
+      var out, err;
+
+      if (hi !== true) {
+        delete opt.highlight;
+      }
+
+      try {
+        out = Parser.parse(tokens, opt);
+      } catch (e) {
+        err = e;
+      }
+
       opt.highlight = highlight;
-      return callback(null, out);
+
+      return err
+        ? callback(err)
+        : callback(null, out);
     };
 
-    for (; i < l; i++) {
+    if (!highlight || highlight.length < 3) {
+      return done(true);
+    }
+
+    if (!pending) return done();
+
+    for (; i < tokens.length; i++) {
       (function(token) {
-        if (token.type !== 'code') return;
-        pending++;
+        if (token.type !== 'code') {
+          return --pending || done();
+        }
         return highlight(token.text, token.lang, function(err, code) {
           if (code == null || code === token.text) {
             return --pending || done();
@@ -1096,7 +1119,8 @@ marked.defaults = {
   smartLists: false,
   silent: false,
   highlight: null,
-  langPrefix: 'lang-'
+  langPrefix: 'lang-',
+  smartypants: false
 };
 
 /**
@@ -1124,4 +1148,4 @@ if (typeof exports === 'object') {
 
 }).call(function() {
   return this || (typeof window !== 'undefined' ? window : global);
-}());
+}());

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marked-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.8.0
+  version: 0.2.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies: []
 description: ! 'A gemified verison of the chjj/marked: "A full-featured markdown parser
   and compiler, written in javascript."'