marked-rails 0.2.9.0 → 0.2.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8d2471985670bca2c17ed2632cddcd9794e43b48
+  data.tar.gz: 318ebc6d89847852c17f9c8c3fa5f45a813ffb3e
+SHA512:
+  metadata.gz: 19979f3886f448b47aa5235165b63f5fd463c9eb9ee37df0eb6eb0fb9a3686803c68d45ca4abeca59395cc206b62176dbebc0e86b87d83572cdf5326b9a2ab13
+  data.tar.gz: b0bb207fd15400780620d0e0d096e597dc5558f916c680c611817694dbde1704edc16c42e99cfa2e85c09e38994624ea5afa6d502b91a7f67fec1087e5e87dcd

data/README.md

@@ -32,15 +32,14 @@ _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
+For example: marked-rails 0.2.8.0 tracks marked 0.2.8 - if we make a mistake in the gem, without
+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:
+Feel free to open an issue if you find something that could be improved. A couple notes:
 
 * If it's an issue pertaining to the marked javascript, please report it to the [marked project](https://github.com/chjj/marked).
-
 * If the marked scripts are outdated (i.e. maybe a new version of marked was released yesterday), feel free to open an issue and prod us to get that thing updated.
 
 ## Acknowledgements

data/lib/marked-rails/version.rb

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

data/vendor/assets/javascripts/marked.js

@@ -17,7 +17,7 @@ var block = {
   hr: /^( *[-*_]){3,} *(?:\n+|$)/,
   heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
   nptable: noop,
-  lheading: /^([^\n]+)\n *(=|-){3,} *\n*/,
+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
   blockquote: /^( *>[^\n]+(\n[^\n]+)*\n*)+/,
   list: /^( *)(bull) [\s\S]+?(?:hr|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
   html: /^ *(?:comment|closed|closing) *(?:\n{2,}|\s*$)/,
@@ -75,7 +75,9 @@ block.gfm = merge({}, block.normal, {
 });
 
 block.gfm.paragraph = replace(block.paragraph)
-  ('(?!', '(?!' + block.gfm.fences.source.replace('\\1', '\\2') + '|')
+  ('(?!', '(?!'
+    + block.gfm.fences.source.replace('\\1', '\\2') + '|'
+    + block.list.source.replace('\\1', '\\3') + '|')
   ();
 
 /**
@@ -308,7 +310,7 @@ Lexer.prototype.token = function(src, top) {
         // Determine whether the next list item belongs here.
         // Backpedal if it does not belong in this list.
         if (this.options.smartLists && i !== l - 1) {
-          b = block.bullet.exec(cap[i+1])[0];
+          b = block.bullet.exec(cap[i + 1])[0];
           if (bull !== b && !(bull.length > 1 && b.length > 1)) {
             src = cap.slice(i + 1).join('\n') + src;
             i = l - 1;
@@ -320,7 +322,7 @@ Lexer.prototype.token = function(src, top) {
         // for discount behavior.
         loose = next || /\n\n(?!\s*$)/.test(item);
         if (i !== l - 1) {
-          next = item[item.length-1] === '\n';
+          next = item.charAt(item.length - 1) === '\n';
           if (!loose) loose = next;
         }
 
@@ -352,7 +354,7 @@ Lexer.prototype.token = function(src, top) {
         type: this.options.sanitize
           ? 'paragraph'
           : 'html',
-        pre: cap[1] === 'pre' || cap[1] === 'script',
+        pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
         text: cap[0]
       });
       continue;
@@ -407,7 +409,7 @@ Lexer.prototype.token = function(src, top) {
       src = src.substring(cap[0].length);
       this.tokens.push({
         type: 'paragraph',
-        text: cap[1][cap[1].length-1] === '\n'
+        text: cap[1].charAt(cap[1].length - 1) === '\n'
           ? cap[1].slice(0, -1)
           : cap[1]
       });
@@ -454,8 +456,8 @@ var inline = {
   text: /^[\s\S]+?(?=[\\<!\[_*`]| {2,}\n|$)/
 };
 
-inline._inside = /(?:\[[^\]]*\]|[^\]]|\](?=[^\[]*\]))*/;
-inline._href = /\s*<?([^\s]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
+inline._inside = /(?:\[[^\]]*\]|[^\[\]]|\](?=[^\[]*\]))*/;
+inline._href = /\s*<?([\s\S]*?)>?(?:\s+['"]([\s\S]*?)['"])?\s*/;
 
 inline.link = replace(inline.link)
   ('inside', inline._inside)
@@ -567,7 +569,7 @@ InlineLexer.prototype.output = function(src) {
     if (cap = this.rules.autolink.exec(src)) {
       src = src.substring(cap[0].length);
       if (cap[2] === '@') {
-        text = cap[1][6] === ':'
+        text = cap[1].charAt(6) === ':'
           ? this.mangle(cap[1].substring(7))
           : this.mangle(cap[1]);
         href = this.mangle('mailto:') + text;
@@ -622,7 +624,7 @@ InlineLexer.prototype.output = function(src) {
       link = (cap[2] || cap[1]).replace(/\s+/g, ' ');
       link = this.links[link.toLowerCase()];
       if (!link || !link.href) {
-        out += cap[0][0];
+        out += cap[0].charAt(0);
         src = cap[0].substring(1) + src;
         continue;
       }
@@ -694,7 +696,7 @@ InlineLexer.prototype.output = function(src) {
  */
 
 InlineLexer.prototype.outputLink = function(cap, link) {
-  if (cap[0][0] !== '!') {
+  if (cap[0].charAt(0) !== '!') {
     return '<a href="'
       + escape(link.href)
       + '"'
@@ -728,9 +730,17 @@ InlineLexer.prototype.outputLink = function(cap, link) {
 InlineLexer.prototype.smartypants = function(text) {
   if (!this.options.smartypants) return text;
   return text
+    // em-dashes
     .replace(/--/g, '\u2014')
-    .replace(/'([^']*)'/g, '\u2018$1\u2019')
-    .replace(/"([^"]*)"/g, '\u201C$1\u201D')
+    // opening singles
+    .replace(/(^|[-\u2014/(\[{"\s])'/g, '$1\u2018')
+    // closing singles & apostrophes
+    .replace(/'/g, '\u2019')
+    // opening doubles
+    .replace(/(^|[-\u2014/(\[{\u2018\s])"/g, '$1\u201c')
+    // closing doubles
+    .replace(/"/g, '\u201d')
+    // ellipses
     .replace(/\.{3}/g, '\u2026');
 };
 
@@ -803,7 +813,7 @@ Parser.prototype.next = function() {
  */
 
 Parser.prototype.peek = function() {
-  return this.tokens[this.tokens.length-1] || 0;
+  return this.tokens[this.tokens.length - 1] || 0;
 };
 
 /**
@@ -835,7 +845,9 @@ Parser.prototype.tok = function() {
     case 'heading': {
       return '<h'
         + this.token.depth
-        + '>'
+        + ' id="'
+        + this.token.text.toLowerCase().replace(/[^\w]+/g, '-')
+        + '">'
         + this.inline.output(this.token.text)
         + '</h'
         + this.token.depth
@@ -877,9 +889,11 @@ Parser.prototype.tok = function() {
       body += '<thead>\n<tr>\n';
       for (i = 0; i < this.token.header.length; i++) {
         heading = this.inline.output(this.token.header[i]);
-        body += this.token.align[i]
-          ? '<th align="' + this.token.align[i] + '">' + heading + '</th>\n'
-          : '<th>' + heading + '</th>\n';
+        body += '<th';
+        if (this.token.align[i]) {
+          body += ' style="text-align:' + this.token.align[i] + '"';
+        }
+        body += '>' + heading + '</th>\n';
       }
       body += '</tr>\n</thead>\n';
 
@@ -890,9 +904,11 @@ Parser.prototype.tok = function() {
         body += '<tr>\n';
         for (j = 0; j < row.length; j++) {
           cell = this.inline.output(row[j]);
-          body += this.token.align[j]
-            ? '<td align="' + this.token.align[j] + '">' + cell + '</td>\n'
-            : '<td>' + cell + '</td>\n';
+          body += '<td';
+          if (this.token.align[j]) {
+            body += ' style="text-align:' + this.token.align[j] + '"';
+          }
+          body += '>' + cell + '</td>\n';
         }
         body += '</tr>\n';
       }
@@ -1027,7 +1043,7 @@ function marked(src, opt, callback) {
       opt = null;
     }
 
-    if (opt) opt = merge({}, marked.defaults, opt);
+    opt = merge({}, marked.defaults, opt || {});
 
     var highlight = opt.highlight
       , tokens
@@ -1042,13 +1058,9 @@ function marked(src, opt, callback) {
 
     pending = tokens.length;
 
-    var done = function(hi) {
+    var done = function() {
       var out, err;
 
-      if (hi !== true) {
-        delete opt.highlight;
-      }
-
       try {
         out = Parser.parse(tokens, opt);
       } catch (e) {
@@ -1063,9 +1075,11 @@ function marked(src, opt, callback) {
     };
 
     if (!highlight || highlight.length < 3) {
-      return done(true);
+      return done();
     }
 
+    delete opt.highlight;
+
     if (!pending) return done();
 
     for (; i < tokens.length; i++) {
@@ -1148,4 +1162,4 @@ if (typeof exports === 'object') {
 
 }).call(function() {
   return this || (typeof window !== 'undefined' ? window : global);
-}());
+}());

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marked-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.9.0
-  prerelease: 
+  version: 0.2.10.0
 platform: ruby
 authors:
 - nodanaonlyzuul
@@ -10,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies: []
-description: ! 'A gemified verison of the chjj/marked: "A full-featured markdown parser
+description: 'A gemified verison of the chjj/marked: "A full-featured markdown parser
   and compiler, written in javascript."'
 email:
 - stephen@eastmedia.com
@@ -32,26 +31,25 @@ files:
 - vendor/assets/javascripts/marked.js
 homepage: https://github.com/eastmedia/marked-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A gemified verison of the chjj/marked
 test_files: []