written 0.1.2 → 0.1.3

data/lib/written/app/assets/javascripts/written/parsers/block/paragraph.coffee

@@ -1,22 +1,20 @@
 class Paragraph
-  @parserName: 'Paragraph'
   multiline: false
 
   constructor: (match) ->
     @match = match
 
-  processContent: (callback) =>
-    if @content?
-      throw "Content Error: The content was already processed"
-      return
+  equals: (current, rendered) ->
+    current.outerHTML == rendered.outerHTML
 
-    @content = callback(@match[0])
+  text: =>
+    @match[0]
 
-  identical: (current, rendered) ->
-    current.outerHTML == rendered.outerHTML
+  raw: =>
+    @match[0]
 
   markdown: =>
-    node = "<p is='written-p'>".toHTML()
+    node = "<p>".toHTML()
     for text in @content
       if text.markdown?
         node.appendChild(text.markdown())
@@ -39,31 +37,29 @@ class Paragraph
 
 Paragraph.rule = /.*/i
 
-Written.Parsers.Block.register Paragraph, true
-
-prototype = Object.create(HTMLParagraphElement.prototype)
-
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
+Written.Parsers.register {
+  parser: Paragraph
+  node: 'p'
+  type: 'block'
+  default: true
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
+    if !node.firstChild?
+      range.setStart(node, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-      range.setStart(walker.currentNode, offset)
-      break
+        range.setStart(walker.currentNode, offset)
+        break
 
-  range.collapse(true)
-  range
+    range.collapse(true)
+    range
 
-prototype.toString = ->
-  @textContent
+  toString: (node) ->
+    node.textContent
 
-document.registerElement('written-p', {
-  prototype: prototype
-  extends: 'p'
-})
+}

data/lib/written/app/assets/javascripts/written/parsers/block/quote.coffee

@@ -1,5 +1,4 @@
 class Quote
-  @parserName: 'Quote'
   multiline: true
 
   constructor: (match) ->
@@ -12,21 +11,23 @@ class Quote
   append: (text) ->
     @matches.push(Quote.rule.exec(text))
 
-  processContent: (callback) =>
-    if @content?
-      throw "Content Error: The content was already processed"
-      return
+  raw: ->
+    lines = @matches.map (match) ->
+      match[0]
+
+    lines.join('\n')
 
+  text: =>
     lines = @matches.map (match) ->
       match[2]
-    
-    @content = callback(lines)
 
-  identical: (current, rendered) ->
+    lines.join('\n')
+
+  equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
   markdown: =>
-    node = "<blockquote is='written-blockquote'></blockquote>".toHTML()
+    node = "<blockquote></blockquote>".toHTML()
     for line, index in @content
       p = "<p>".toHTML()
       p.appendChild(document.createTextNode(@matches[index][1]))
@@ -63,31 +64,28 @@ class Quote
 
 Quote.rule = /^(>\s)(.*)/i
 
-Written.Parsers.Block.register Quote
-
-prototype = Object.create(HTMLQuoteElement.prototype)
-
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
+Written.Parsers.register {
+  parser: Quote
+  node: 'blockquote'
+  type: 'block'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
+    if !node.firstChild?
+      range.setStart(this, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-      range.setStart(walker.currentNode, offset)
-      break
+        range.setStart(walker.currentNode, offset)
+        break
 
-  range.collapse(true)
-  range
+    range.collapse(true)
+    range
 
-prototype.toString = ->
-  @textContent
+  toString: (node) ->
+    node.textContent
 
-document.registerElement('written-blockquote', {
-  prototype: prototype
-  extends: 'blockquote'
-})
+}

data/lib/written/app/assets/javascripts/written/parsers/block/ulist.coffee

@@ -1,5 +1,4 @@
 class UList
-  @parserName: 'UList'
   multiline: true
 
   constructor: (match) ->
@@ -10,26 +9,28 @@ class UList
 
     @opened
 
-  append: (text) ->
-    @matches.push(UList.rule.exec(text))
+  raw: ->
+    texts = @matches.map (match) ->
+      match[0]
 
-  processContent: (callback) =>
-    if @content?
-      throw "Content Error: The content was already processed"
-      return
+    texts.join('\n')
 
-    lines = @matches.map (match) ->
+  text: ->
+    texts = @matches.map (match) ->
       match[2]
-    
-    @content = callback(lines)
 
-  identical: (current, rendered) ->
+    texts.join('\n')
+
+  append: (text) ->
+    @matches.push(UList.rule.exec(text))
+
+  equals: (current, rendered) ->
     current.outerHTML == rendered.outerHTML
 
   markdown: =>
-    node = "<ul is='written-ul'></ul>".toHTML()
+    node = "<ul></ul>".toHTML()
     for line, index in @content
-      li = "<li is='written-li'>".toHTML()
+      li = "<li>".toHTML()
       li.appendChild(document.createTextNode(@matches[index][1]))
 
       for text in line
@@ -59,41 +60,38 @@ class UList
 
 UList.rule = /^(-\s)(.*)/i
 
-Written.Parsers.Block.register UList
-
-prototype = Object.create(HTMLUListElement.prototype)
-
-prototype.toString = ->
-  texts = Array.prototype.slice.call(@children).map (li) ->
-    li.toString()
-  texts.join("\n")
+Written.Parsers.register {
+  parser: UList
+  node: 'ul'
+  type: 'block'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
+    if !node.firstChild?
+      range.setStart(node, 0)
+      return
 
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
-  if !@firstChild?
-    range.setStart(this, 0)
-    return
+    li = node.firstElementChild
 
-  li = this.firstElementChild
+    while walker.nextNode()
+      if !li.contains(walker.currentNode)
+        newList = walker.currentNode
+        while newList? && !(newList instanceof HTMLLIElement)
+          newList = newList.parentElement
+        li = newList
+        offset--
 
-  while walker.nextNode()
-    if !li.contains(walker.currentNode)
-      newList = walker.currentNode
-      while newList? && !(newList instanceof HTMLLIElement)
-        newList = newList.parentElement
-      li = newList
-      offset--
+      if walker.currentNode.length < offset
+        offset -= walker.currentNode.length
+        continue
+      range.setStart(walker.currentNode, offset)
+      break
 
-    if walker.currentNode.length < offset
-      offset -= walker.currentNode.length
-      continue
-    range.setStart(walker.currentNode, offset)
-    break
+    range.collapse(true)
+    range
 
-  range.collapse(true)
-  range
+  toString: (node) ->
+    texts = Array.prototype.slice.call(node.children).map (li) ->
+      li.textContent
+    texts.join("\n")
 
-document.registerElement('written-ul', {
-  prototype: prototype
-  extends: 'ul'
-})
+}

data/lib/written/app/assets/javascripts/written/parsers/inline/code.coffee

@@ -1,5 +1,4 @@
 class Code
-  @parserName: 'Code'
   constructor: (match) ->
     @match = match
 
@@ -10,7 +9,7 @@ class Code
     @match[0].length
 
   markdown: =>
-    node = "<code is='written-code'>#{this.match[0]}</code>".toHTML()
+    node = "<code>#{this.match[0]}</code>".toHTML()
     if @match[3]?
       node.classList.add("language-#{@match[3]}")
 
@@ -28,31 +27,30 @@ class Code
 
 Code.rule = /((~{3})([a-z]+)?)\s(.+)?(~{3})/gi
 
-Written.Parsers.Inline.register Code
-
-prototype = Object.create(HTMLElement.prototype)
-
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
-
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
-
-      range.setStart(walker.currentNode, offset)
-      break
-
-  range.collapse(true)
-  range
-
-prototype.toString = ->
-  @textContent
-
-document.registerElement('written-code', {
-  prototype: prototype
-  extends: 'code'
-})
+Written.Parsers.register {
+  parser: Code
+  node: 'code'
+  type: 'inline'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
+
+    if !@firstChild?
+      range.setStart(this, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
+
+        range.setStart(walker.currentNode, offset)
+        break
+
+    range.collapse(true)
+    range
+
+  toString: (node) ->
+    node.textContent
+
+  highlightWith: (callback) ->
+    Code.prototype.highlight = callback
+}

data/lib/written/app/assets/javascripts/written/parsers/inline/italic.coffee

@@ -1,5 +1,4 @@
 class Italic
-  @parserName: 'Italic'
   constructor: (match) ->
     @match = match
 
@@ -10,38 +9,35 @@ class Italic
     @match[0].length
 
   markdown: =>
-    "<em is='written-em'>#{this.match[1]}</em>".toHTML()
+    "<em>#{this.match[1]}</em>".toHTML()
 
   html: ->
     "<em>#{this.match[3]}</em>".toHTML()
 
 Italic.rule = /((_{1})([^_]+)(_{1}))/gi
 
-Written.Parsers.Inline.register Italic
 
-prototype = Object.create(HTMLElement.prototype)
+Written.Parsers.register {
+  parser: Italic
+  node: 'em'
+  type: 'inline'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
+    if !node.firstChild?
+      range.setStart(this, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
+        range.setStart(walker.currentNode, offset)
+        break
 
-      range.setStart(walker.currentNode, offset)
-      break
+    range.collapse(true)
+    range
 
-  range.collapse(true)
-  range
-
-prototype.toString = ->
-  @textContent
-
-document.registerElement('written-em', {
-  prototype: prototype
-  extends: 'em'
-})
+  toString: (node) ->
+    node.textContent
+}

data/lib/written/app/assets/javascripts/written/parsers/inline/link.coffee

@@ -1,5 +1,4 @@
 class Link
-  @parserName: 'Link'
   constructor: (match) ->
     @match = match
 
@@ -10,38 +9,35 @@ class Link
     @match[0].length
 
   markdown: =>
-    "<a is='written-a' href='javascript:void(0)'><strong>#{@match[1]}</strong>#{@match[3]}</a>".toHTML()
+    "<a href='javascript:void(0)'><strong>#{@match[1]}</strong>#{@match[3]}</a>".toHTML()
 
   html: =>
     "<a href='#{@match[4]}'>#{@match[2]}</a>".toHTML()
 
 Link.rule = /!{0}(\[([^\]]+)\])(\(([^\)]+)\))/gi
 
-Written.Parsers.Inline.register Link
 
-prototype = Object.create(HTMLAnchorElement.prototype)
+Written.Parsers.register {
+  parser: Link
+  node: 'a'
+  type: 'inline'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
+    if !node.firstChild?
+      range.setStart(this, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
+        range.setStart(walker.currentNode, offset)
+        break
 
-      range.setStart(walker.currentNode, offset)
-      break
+    range.collapse(true)
+    range
 
-  range.collapse(true)
-  range
-
-prototype.toString = ->
-  @textContent
-
-document.registerElement('written-a', {
-  prototype: prototype
-  extends: 'a'
-})
+  toString: (node) ->
+    node.textContent
+}

data/lib/written/app/assets/javascripts/written/parsers/inline/strong.coffee

@@ -1,5 +1,4 @@
 class Strong
-  @parserName: 'Strong'
   constructor: (match) ->
     @match = match
 
@@ -10,38 +9,35 @@ class Strong
     @match[0].length
 
   markdown: =>
-    "<strong is='written-strong'>#{@match[0]}</strong>".toHTML()
+    "<strong>#{@match[0]}</strong>".toHTML()
 
   html: =>
     "<strong>#{@match[3]}</strong>".toHTML()
 
 Strong.rule = /((\*{1})([^\*]+)(\*{1}))/gi
 
-Written.Parsers.Inline.register Strong
+Written.Parsers.register {
+  parser: Strong
+  node: 'strong'
+  type: 'inline'
+  getRange: (node, offset, walker) ->
+    range = document.createRange()
 
-prototype = Object.create(HTMLElement.prototype)
+    if !node.firstChild?
+      range.setStart(this, 0)
+    else
+      while walker.nextNode()
+        if walker.currentNode.length < offset
+          offset -= walker.currentNode.length
+          continue
 
-prototype.getRange = (offset, walker) ->
-  range = document.createRange()
+        range.setStart(walker.currentNode, offset)
+        break
 
-  if !@firstChild?
-    range.setStart(this, 0)
-  else
-    while walker.nextNode()
-      if walker.currentNode.length < offset
-        offset -= walker.currentNode.length
-        continue
+    range.collapse(true)
+    range
 
-      range.setStart(walker.currentNode, offset)
-      break
+  toString: (node) ->
+    node.textContent
 
-  range.collapse(true)
-  range
-
-prototype.toString = ->
-  @textContent
-
-document.registerElement('written-strong', {
-  prototype: prototype
-  extends: 'strong'
-})
+}

data/lib/written/app/assets/javascripts/written/parsers/parsers.coffee

@@ -1,27 +1,95 @@
-class @Written.Parsers
+@Written.Parsers = new class
   constructor: ->
-    @block = new Written.Parsers.Block()
-    @inline = new Written.Parsers.Inline()
+    @blocks = []
+    @inlines = []
+    @nodes = {}
 
-  use: (type, name) ->
-    if type != 'block' && type != 'inline'
+    @blocks.parse = @parseBlocks.bind(this, @blocks)
+    @inlines.parse = @parseInlines.bind(this, @inlines)
+
+  register: (struct) ->
+    type = undefined
+    if struct.type == 'block'
+      type = @blocks
+    else if struct.type == 'inline'
+      type = @inlines
+    else
       raise 'error: Written.Parsers can either be "block" or "inline"'
       return
 
-    @[type].use(name)
+    if struct.default
+      type.default = struct.parser
+    else
+      type.push struct.parser
+
+    @nodes[struct.node] = struct
+
+  parse: (parsers, text) ->
+    parsers.parse(text)
+
+  parseBlocks: (parsers, text) ->
+    parsers = [parsers.default].concat(parsers).reverse()
+    blocks = []
+    lines = text.split('\n').reverse()
+    while (line = lines.pop()) != undefined
+      str = line
+      block = blocks[blocks.length - 1]
+
+      if block? && block.multiline && block.accepts(line)
+        block.append(line)
+        continue
+
+      blocks.push(@find(parsers, str))
+
+    blocks
+
+  parseInlines: (parsers, text) ->
+    buffer = ''
+    content = []
+    matches = []
+    index = 0
+
+    for p in parsers
+      p.rule.lastIndex = 0
+
+      while match = p.rule.exec(text)
+        parser = new p(match)
+        matches[parser.index()] = parser
+
+    while text[index]?
+      if parser = matches[index]
+        content.push buffer.slice(0)
+        content.push parser
+        buffer = ''
+        index += parser.length()
+      else
+        buffer += text[index]
+        index += 1
+
+    if buffer.length > 0
+      content.push buffer
+
+    content
+
+  find: (parsers, str) ->
+    parser = undefined
+    for p in parsers
+      if match = p.rule.exec(str)
+        parser = new p(match)
+        break
+
+    return parser
+
+  get: (name) ->
+    @nodes[name]
 
-  available: ->
-    {
-      block: Written.Parsers.Block.parsers.available,
-      inline: Written.Parsers.Inline.parsers.available
-    }
+  getRange: (node, offset, walker) ->
+    @nodes[node.nodeName.toLowerCase()].getRange(node, offset, walker)
 
-  freeze: ->
-    @block.freeze()
-    @inline.freeze()
+  toString: (node) ->
+    struct = @nodes[node.nodeName.toLowerCase()]
+    if struct?
+      struct.toString(node)
+    else
+      node.textContent
 
-@Written.Parsers.default = ->
-  parsers = new Written.Parsers()
-  parsers.use('inline', 'all')
-  parsers.use('block', 'all')
-  parsers

data/lib/written/app/assets/javascripts/written.coffee

@@ -1,4 +1,3 @@
-#= require ./written/polyfills/base
 #= require_tree ./written/core
 #= require_tree ./written/parsers
 #= require_tree ./written/uploaders

data/lib/written/version.rb

@@ -1,3 +1,3 @@
 module Written
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end